Fix search bar close button, stale results on reopen, and drag-select auto-scroll

- Add clickable X button to the Find bar so it can be closed without keyboard
- Recalculate search matches when reopening Find bar with existing query text
- Add TIMER_DRAG_SCROLL so selecting text by dragging above/below the editor
  auto-scrolls the document proportionally to mouse distance

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: asystemoffields

prose_code.h

@@ -135,6 +135,7 @@ typedef struct {
 #define TIMER_BLINK      1
 #define TIMER_SMOOTH     2
 #define TIMER_AUTOSAVE   3
+#define TIMER_DRAG_SCROLL 4
 
 /* ═══════════════════════════════════════════════════════════════
  * DATA STRUCTURES

render.c

@@ -233,6 +233,14 @@ void render_searchbar(HDC hdc) {
     draw_text(hdc, x + bar_w - DPI(90), y + DPI(12), mc, (int)wcslen(mc),
               g_editor.search.match_count > 0 ? CLR_SUBTEXT : CLR_RED);
 
+    /* Close (X) button */
+    {
+        int btn_size = DPI(20);
+        int bx = x + bar_w - DPI(12) - btn_size;
+        int by = y + DPI(10);
+        draw_text(hdc, bx + DPI(4), by + DPI(1), L"\x2715", 1, CLR_OVERLAY0);
+    }
+
     if (g_editor.search.replace_active) {
         draw_text(hdc, x + DPI(12), y + DPI(43), L"\x21C6", 1, CLR_OVERLAY0);
         int rlen = (int)wcslen(g_editor.search.replace_text);

search.c

@@ -64,6 +64,9 @@ void toggle_search(void) {
         free(g_editor.search.match_positions);
         g_editor.search.match_positions = NULL;
         g_editor.search.replace_focused = 0;
+    } else {
+        if (g_editor.search.query[0] != 0)
+            search_update_matches();
     }
 }
 

wndproc.c

@@ -475,6 +475,44 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
         if (wParam == TIMER_AUTOSAVE) {
             autosave_tick();
         }
+        if (wParam == TIMER_DRAG_SCROLL) {
+            Document *doc = current_doc();
+            if (doc && g_editor.mouse_captured) {
+                POINT pt;
+                GetCursorPos(&pt);
+                ScreenToClient(hwnd, &pt);
+                int edit_top = DPI(TITLEBAR_H + MENUBAR_H + TABBAR_H);
+                int edit_bot = g_editor.client_h - DPI(STATUSBAR_H);
+                int lh = g_editor.line_height;
+                int scroll_amt = 0;
+                if (pt.y < edit_top) {
+                    scroll_amt = -lh * (1 + (edit_top - pt.y) / (lh * 2));
+                } else if (pt.y > edit_bot) {
+                    scroll_amt = lh * (1 + (pt.y - edit_bot) / (lh * 2));
+                }
+                if (scroll_amt != 0) {
+                    doc->target_scroll_y += scroll_amt;
+                    if (doc->target_scroll_y < 0) doc->target_scroll_y = 0;
+                    int total_vl = (int)((doc->mode == MODE_PROSE && doc->wc.count > 0) ? doc->wc.count : doc->lc.count);
+                    int max_scroll = total_vl * lh - (edit_bot - edit_top);
+                    if (max_scroll > 0 && doc->target_scroll_y > max_scroll)
+                        doc->target_scroll_y = max_scroll;
+                    doc->scroll_y = doc->target_scroll_y;
+                    /* Clamp mx to text area */
+                    int clamp_mx = pt.x;
+                    int max_text_x = g_editor.client_w - DPI(SCROLLBAR_W);
+                    if (g_editor.show_minimap) max_text_x -= DPI(MINIMAP_W);
+                    if (clamp_mx > max_text_x) clamp_mx = max_text_x;
+                    bpos pos = mouse_to_pos(clamp_mx, pt.y);
+                    if (doc->sel_anchor < 0) doc->sel_anchor = doc->cursor;
+                    doc->cursor = pos;
+                    InvalidateRect(hwnd, NULL, FALSE);
+                }
+            } else {
+                KillTimer(hwnd, TIMER_DRAG_SCROLL);
+            }
+            return 0;
+        }
         if (wParam == TIMER_SMOOTH) {
             Document *doc = current_doc();
             int needs_invalidate = 0;
@@ -684,6 +722,22 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
             return 0;
         }
 
+        /* Search bar close button */
+        if (g_editor.search.active) {
+            int bar_h = g_editor.search.replace_active ? DPI(72) : DPI(40);
+            int bar_w = DPI(460);
+            int sb_x = g_editor.client_w - bar_w - DPI(24);
+            int sb_y = DPI(TITLEBAR_H + MENUBAR_H + TABBAR_H) + DPI(8);
+            int btn_size = DPI(20);
+            int bx = sb_x + bar_w - DPI(12) - btn_size;
+            int by = sb_y + DPI(10);
+            if (mx >= bx && mx < bx + btn_size && my >= by && my < by + btn_size) {
+                toggle_search();
+                InvalidateRect(hwnd, NULL, FALSE);
+                return 0;
+            }
+        }
+
         /* Editor area */
         if (my >= DPI(TITLEBAR_H + MENUBAR_H + TABBAR_H) && my < g_editor.client_h - DPI(STATUSBAR_H)) {
             int sb_x = g_editor.client_w - DPI(SCROLLBAR_W);
@@ -924,6 +978,15 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
                 editor_ensure_cursor_visible();
                 InvalidateRect(hwnd, NULL, FALSE);
             }
+
+            /* Start/stop auto-scroll timer when dragging above/below editor */
+            int edit_top = DPI(TITLEBAR_H + MENUBAR_H + TABBAR_H);
+            int edit_bot = g_editor.client_h - DPI(STATUSBAR_H);
+            if (my < edit_top || my > edit_bot) {
+                SetTimer(hwnd, TIMER_DRAG_SCROLL, 30, NULL);
+            } else {
+                KillTimer(hwnd, TIMER_DRAG_SCROLL);
+            }
         }
 
         /* Track titlebar button hover */
@@ -959,6 +1022,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) {
         }
         if (g_editor.mouse_captured) {
             g_editor.mouse_captured = 0;
+            KillTimer(hwnd, TIMER_DRAG_SCROLL);
             ReleaseCapture();
         }
         return 0;