improve ui and getting caret pos

Author: PeterM45

src/core/config.zig

@@ -3,13 +3,15 @@ pub const UI = struct {
     /// Font height for suggestion window
     pub const SUGGESTION_FONT_HEIGHT = 16;
     /// Window padding
-    pub const WINDOW_PADDING = 2;
+    pub const WINDOW_PADDING = 4;
     /// Background color (white)
-    pub const BG_COLOR = 0x00FFFFFF;
+    pub const BG_COLOR = 0x00FAFAFA;
     /// Selected item background color (light blue)
-    pub const SELECTED_BG_COLOR = 0x00B3D9FF;
+    pub const SELECTED_BG_COLOR = 0x002B5DFC;
     /// Text color (black)
-    pub const TEXT_COLOR = 0x00000000;
+    pub const TEXT_COLOR = 0x00303030;
+    /// Selected item text color (white)
+    pub const SELECTED_TEXT_COLOR = 0x00FFFFFF;
 };
 
 /// Text handling configuration

src/ui/position.zig

@@ -8,21 +8,48 @@ const debug = sysinput.core.debug;
 pub fn getCaretPosition() api.POINT {
     var pt = api.POINT{ .x = 0, .y = 0 };
 
-    // Try getting actual caret position
+    // First try using GUI thread info which is more reliable
     const focus_hwnd = api.getFocus();
     if (focus_hwnd != null) {
-        // First try to get caret position directly
+        // Get thread ID for the window
+        const thread_id = api.getWindowThreadProcessId(focus_hwnd.?, null);
+
+        // Initialize GUITHREADINFO structure
+        var gui_info = api.GUITHREADINFO{
+            .cbSize = @sizeOf(api.GUITHREADINFO),
+            .flags = 0,
+            .hwndActive = null,
+            .hwndFocus = null,
+            .hwndCapture = null,
+            .hwndMenuOwner = null,
+            .hwndMoveSize = null,
+            .hwndCaret = null,
+            .rcCaret = api.RECT{ .left = 0, .top = 0, .right = 0, .bottom = 0 },
+        };
+
+        // Try to get GUI thread info
+        if (api.getGUIThreadInfo(thread_id, &gui_info) != 0) {
+            if (gui_info.hwndCaret != null) {
+                // Use caret rectangle from GUI thread info
+                pt.x = gui_info.rcCaret.left;
+                pt.y = gui_info.rcCaret.bottom; // Use bottom for better positioning
+
+                // Convert to screen coordinates - properly handle the optional
+                _ = api.clientToScreen(gui_info.hwndCaret.?, &pt);
+                debug.debugPrint("Got caret position from GUITHREADINFO: {d},{d}\n", .{ pt.x, pt.y });
+                return applyPositionOffset(pt);
+            }
+        }
+
+        // If GUI thread info failed, try direct caret position
         if (api.getCaretPos(&pt) != 0) {
             // Convert from client to screen coordinates
             _ = api.clientToScreen(focus_hwnd.?, &pt);
             debug.debugPrint("Got caret position directly: {d},{d}\n", .{ pt.x, pt.y });
-
-            // Add slight offset below caret
-            pt.y += 20;
-            return pt;
+            return applyPositionOffset(pt);
         }
 
-        // If that fails, try getting position from selection
+        // Try using EM_POSFROMCHAR as a fallback for Edit controls
         const selection = api.sendMessage(focus_hwnd.?, api.EM_GETSEL, 0, 0);
         const sel_u64: u64 = @bitCast(selection);
         const sel_end: u32 = @truncate((sel_u64 >> 16) & 0xFFFF);
@@ -35,20 +62,23 @@ pub fn getCaretPosition() api.POINT {
             pt.y = @intCast((char_pos >> 16) & 0xFFFF);
             _ = api.clientToScreen(focus_hwnd.?, &pt);
             debug.debugPrint("Got caret position from selection: {d},{d}\n", .{ pt.x, pt.y });
-
-            // Add slight offset below caret
-            pt.y += 20;
-            return pt;
+            return applyPositionOffset(pt);
         }
     }
 
     // Fall back to cursor position if everything else fails
     _ = api.getCursorPos(&pt);
     debug.debugPrint("Falling back to cursor position: {d},{d}\n", .{ pt.x, pt.y });
+    return applyPositionOffset(pt);
+}
+
+fn applyPositionOffset(pt: api.POINT) api.POINT {
+    var result = pt;
+
+    // Simple fixed offset
+    result.y += 20;
 
-    // Add offset to position suggestions below cursor
-    pt.y += 20;
-    return pt;
+    return result;
 }
 
 /// Calculate suggestion window size based on suggestions

src/ui/suggestion_ui.zig

@@ -107,8 +107,9 @@ pub const AutocompleteUI = struct {
         // Add DPI-aware padding below the caret
         suggested_pos.y += @intFromFloat(@as(f32, 20.0 * dpi));
 
-        // Calculate window size based on suggestions
-        const size = position.calculateSuggestionWindowSize(self.suggestions, config.UI.SUGGESTION_FONT_HEIGHT, window.WINDOW_PADDING);
+        // Calculate window size based on suggestions - use constants directly from the file
+        const size = position.calculateSuggestionWindowSize(self.suggestions, config.UI.SUGGESTION_FONT_HEIGHT, // Use the fully qualified path
+            sysinput.ui.window.WINDOW_PADDING);
 
         // Adjust for screen boundaries
         const screen_width = api.GetSystemMetrics(api.SM_CXSCREEN);
@@ -131,9 +132,9 @@ pub const AutocompleteUI = struct {
 
             const new_window = api.CreateWindowExA(
                 api.WS_EX_TOPMOST | api.WS_EX_TOOLWINDOW | api.WS_EX_NOACTIVATE,
-                window.SUGGESTION_WINDOW_CLASS,
+                sysinput.ui.window.SUGGESTION_WINDOW_CLASS,
                 "Suggestions\x00",
-                api.WS_POPUP | api.WS_BORDER,
+                api.WS_POPUP | api.WS_BORDER, // Keep border for now to avoid layout issues
                 suggested_pos.x,
                 suggested_pos.y,
                 size.width,
@@ -163,7 +164,7 @@ pub const AutocompleteUI = struct {
             );
         }
 
-        // Show the window
+        // Simple show without animation for now
         _ = api.ShowWindow(self.suggestion_window.?, api.SW_SHOWNOACTIVATE);
         _ = api.UpdateWindow(self.suggestion_window.?);
     }

src/ui/window.zig

@@ -36,7 +36,7 @@ pub fn suggestionWindowProc(
         api.WM_CREATE => {
             debug.debugPrint("Suggestion window created\n", .{});
 
-            // Create a font for the suggestions
+            // Create a font for the suggestions - using Segoe UI for modern look
             g_ui_state.font = api.CreateFontA(
                 config.UI.SUGGESTION_FONT_HEIGHT, // height
                 0, // width (0 = auto)
@@ -49,7 +49,7 @@ pub fn suggestionWindowProc(
                 api.ANSI_CHARSET, // charset
                 api.OUT_DEFAULT_PRECIS, // output precision
                 api.CLIP_DEFAULT_PRECIS, // clipping precision
-                api.DEFAULT_QUALITY, // quality
+                api.CLEARTYPE_QUALITY, // quality - use ClearType for crisp text
                 api.DEFAULT_PITCH | api.FF_DONTCARE, // pitch and family
                 "Segoe UI\x00", // face name (null-terminated)
             );
@@ -78,13 +78,14 @@ pub fn suggestionWindowProc(
                     _ = api.SelectObject(hdc, font);
                 }
 
-                // Clear background
+                // Set text settings for better appearance
                 _ = api.SetBkMode(hdc, api.TRANSPARENT);
+                _ = api.SetTextColor(hdc, config.UI.TEXT_COLOR);
 
                 // Draw each suggestion
                 var i: usize = 0;
                 var y: i32 = WINDOW_PADDING;
-                const line_height = config.UI.SUGGESTION_FONT_HEIGHT + 4; // Add some padding
+                const line_height = config.UI.SUGGESTION_FONT_HEIGHT + 8; // More padding
 
                 while (i < g_ui_state.suggestions.len) : (i += 1) {
                     const is_selected = g_ui_state.selected_index == @as(i32, @intCast(i));
@@ -98,23 +99,27 @@ pub fn suggestionWindowProc(
                         .bottom = y + line_height,
                     };
 
-                    // Draw background for selection
+                    // Draw background for selection (simplified to avoid errors)
                     if (is_selected) {
                         const brush = api.CreateSolidBrush(config.UI.SELECTED_BG_COLOR);
                         if (brush != null) {
                             defer _ = api.DeleteObject(brush.?);
                             _ = api.FillRect(hdc, &rect, brush.?);
+
+                            // Use white text for selected item with a constant
+                            _ = api.SetTextColor(hdc, 0x00FFFFFF); // White
                         }
+                    } else {
+                        _ = api.SetTextColor(hdc, config.UI.TEXT_COLOR);
                     }
 
                     // Draw suggestion text
-                    _ = api.SetTextColor(hdc, config.UI.TEXT_COLOR);
-
-                    // Convert to wchar if needed or use multibyte version
                     var buffer: [config.TEXT.MAX_SUGGESTION_LEN:0]u8 = undefined;
                     std.mem.copyForwards(u8, &buffer, suggestion);
                     buffer[suggestion.len] = 0; // Null terminate
 
+                    // Add padding for text
+                    rect.left += 8;
                     _ = api.DrawTextA(hdc, &buffer, @intCast(suggestion.len), &rect, api.DT_LEFT | api.DT_SINGLELINE | api.DT_VCENTER);
 
                     y += line_height;

src/win32/api.zig

@@ -135,6 +135,11 @@ pub const DT_SINGLELINE = 0x00000020;
 pub const DT_VCENTER = 0x00000004;
 pub const TRANSPARENT = 1;
 
+// Drawing constants
+pub const NULL_PEN = 8;
+pub const CLEARTYPE_QUALITY = 5;
+pub const BYTE = u8;
+
 // Font constants
 pub const FW_NORMAL = 400;
 pub const ANSI_CHARSET = 0;
@@ -384,6 +389,23 @@ pub extern "user32" fn GetFocus() callconv(.C) ?HWND;
 pub extern "user32" fn SendMessageA(hWnd: HWND, Msg: UINT, wParam: WPARAM, lParam: LPARAM) callconv(.C) LRESULT;
 pub extern "user32" fn PostMessageA(hWnd: HWND, Msg: UINT, wParam: WPARAM, lParam: LPARAM) callconv(.C) BOOL;
 
+pub extern "user32" fn SetLayeredWindowAttributes(
+    hwnd: HWND,
+    crKey: COLORREF,
+    bAlpha: BYTE,
+    dwFlags: DWORD,
+) callconv(.C) BOOL;
+
+pub extern "gdi32" fn RoundRect(
+    hdc: HDC,
+    left: c_int,
+    top: c_int,
+    right: c_int,
+    bottom: c_int,
+    width: c_int,
+    height: c_int,
+) callconv(.C) BOOL;
+
 //=============================================================================
 // INPUT AND CURSOR FUNCTIONS
 //=============================================================================