QoL enhancements: Recent databases and queries (per-session, no registry) and command bar button to toggle execute-at-cursor mode for large query files. Empty query buffer no longer disables the execute button permanently, and shows a message in the status bar when there's nothing to execute.

nfinit · nfinit · commit f1b1bc998bd0 · 2026-01-10T15:35:34.000-07:00
diff --git a/src/sqlite-ce-edit/database.c b/src/sqlite-ce-edit/database.c
@@ -136,6 +136,7 @@ int OpenDatabase(const wchar_t *path) {
     }
     
     lstrcpyW(g_szDbPath, path);
+    AddRecentFile(path);
     UpdateTitle();
     UpdateDbSize();
     SetStatusResult(L"");
diff --git a/src/sqlite-ce-edit/dialogs.c b/src/sqlite-ce-edit/dialogs.c
@@ -255,6 +255,9 @@ void DoOptions(void) {
         g_showErrorMsgBox = g_optErrorMsgBox;
         lstrcpyW(g_szDefaultDbPath, g_optDbPath);
         
+        /* Sync toolbar button state */
+        SendMessage(g_hwndCB, TB_CHECKBUTTON, IDM_EXECATCURSOR, g_execAtCursor);
+        
         /* Handle line numbers toggle */
         if (g_optLineNums != g_showLineNumbers) {
             g_showLineNumbers = g_optLineNums;
diff --git a/src/sqlite-ce-edit/editor.c b/src/sqlite-ce-edit/editor.c
@@ -118,6 +118,8 @@ void SwitchView(int mode) {
     ShowWindow(g_hwndQuery, mode == 0 ? SW_SHOW : SW_HIDE);
     if (g_hwndLineNum) ShowWindow(g_hwndLineNum, (mode == 0 && g_showLineNumbers) ? SW_SHOW : SW_HIDE);
     ShowWindow(g_hwndResult, mode == 1 ? SW_SHOW : SW_HIDE);
+    /* Disable exec-at-cursor button in results view */
+    SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECATCURSOR, mode == 0);
     SetFocus(mode == 0 ? g_hwndQuery : g_hwndResult);
     if (mode == 0) {
         UpdateLineCount();
diff --git a/src/sqlite-ce-edit/execute.c b/src/sqlite-ce-edit/execute.c
@@ -179,6 +179,8 @@ void ExecuteQuery(void) {
         if (!wsql || !sql) {
             if (wsql) LocalFree(wsql);
             if (sql) LocalFree(sql);
+            EnableMenuItem(g_hMenu, IDM_EXECUTE, MF_ENABLED);
+            SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECUTE, TRUE);
             return;
         }
         SendMessage(g_hwndQuery, EM_SETSEL, selStart, selEnd);
@@ -211,7 +213,11 @@ void ExecuteQuery(void) {
         }
         
         full = (wchar_t *)LocalAlloc(LMEM_FIXED, (fullLen + 1) * sizeof(wchar_t));
-        if (!full) return;
+        if (!full) {
+            EnableMenuItem(g_hMenu, IDM_EXECUTE, MF_ENABLED);
+            SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECUTE, TRUE);
+            return;
+        }
         GetWindowTextW(g_hwndQuery, full, fullLen + 1);
         
         /* Find statement boundaries */
@@ -253,13 +259,18 @@ void ExecuteQuery(void) {
     } else {
         /* Execute entire buffer */
         len = GetWindowTextLengthW(g_hwndQuery);
-        if (len == 0) return;
+        if (len == 0 || g_showingHint) {
+            SendMessageW(g_hwndStatus, SB_SETTEXTW, 1, (LPARAM)L"Nothing to execute");
+            return;
+        }
         
         wsql = (wchar_t *)LocalAlloc(LMEM_FIXED, (len + 1) * sizeof(wchar_t));
         sql = (char *)LocalAlloc(LMEM_FIXED, (len + 1) * 3);
         if (!wsql || !sql) {
             if (wsql) LocalFree(wsql);
             if (sql) LocalFree(sql);
+            EnableMenuItem(g_hMenu, IDM_EXECUTE, MF_ENABLED);
+            SendMessage(g_hwndCB, TB_ENABLEBUTTON, IDM_EXECUTE, TRUE);
             return;
         }
         GetWindowTextW(g_hwndQuery, wsql, len + 1);
diff --git a/src/sqlite-ce-edit/fileops.c b/src/sqlite-ce-edit/fileops.c
@@ -64,19 +64,149 @@ void DoFileOpen(void) {
     }
 }
 
+/*============================================================================
+** Recent Files
+**============================================================================*/
+
+void AddRecentFile(const wchar_t *path) {
+    int i, j;
+    /* Don't add :memory: */
+    if (lstrcmpW(path, L":memory:") == 0) return;
+    /* Check if already in list, move to top if so */
+    for (i = 0; i < g_recentCount; i++) {
+        if (lstrcmpiW(g_recentFiles[i], path) == 0) {
+            /* Move to top */
+            for (j = i; j > 0; j--)
+                lstrcpyW(g_recentFiles[j], g_recentFiles[j-1]);
+            lstrcpyW(g_recentFiles[0], path);
+            UpdateRecentMenu();
+            return;
+        }
+    }
+    /* Shift down and add at top */
+    for (i = MAX_RECENT_FILES - 1; i > 0; i--)
+        lstrcpyW(g_recentFiles[i], g_recentFiles[i-1]);
+    lstrcpyW(g_recentFiles[0], path);
+    if (g_recentCount < MAX_RECENT_FILES) g_recentCount++;
+    UpdateRecentMenu();
+}
+
+void UpdateRecentMenu(void) {
+    int i, j;
+    
+    if (!g_hRecentDbMenu) return;
+    
+    /* Clear and rebuild */
+    while (RemoveMenu(g_hRecentDbMenu, 0, MF_BYPOSITION));
+    
+    if (g_recentCount == 0) {
+        AppendMenuW(g_hRecentDbMenu, MF_STRING | MF_GRAYED, 0, L"(none)");
+    } else {
+        for (i = 0; i < g_recentCount; i++) {
+            wchar_t item[MAX_PATH + 8];
+            const wchar_t *name = g_recentFiles[i];
+            int len = lstrlenW(name);
+            for (j = len - 1; j >= 0; j--)
+                if (name[j] == '\\') { name = &g_recentFiles[i][j+1]; break; }
+            wsprintfW(item, L"&%d %s", i + 1, name);
+            AppendMenuW(g_hRecentDbMenu, MF_STRING, IDM_RECENT_BASE + i, item);
+        }
+    }
+}
+
+void AddRecentQuery(const wchar_t *path) {
+    int i, j;
+    /* Check if already in list, move to top if so */
+    for (i = 0; i < g_recentQueryCount; i++) {
+        if (lstrcmpiW(g_recentQueries[i], path) == 0) {
+            for (j = i; j > 0; j--)
+                lstrcpyW(g_recentQueries[j], g_recentQueries[j-1]);
+            lstrcpyW(g_recentQueries[0], path);
+            UpdateRecentQueryMenu();
+            return;
+        }
+    }
+    /* Shift down and add at top */
+    for (i = MAX_RECENT_FILES - 1; i > 0; i--)
+        lstrcpyW(g_recentQueries[i], g_recentQueries[i-1]);
+    lstrcpyW(g_recentQueries[0], path);
+    if (g_recentQueryCount < MAX_RECENT_FILES) g_recentQueryCount++;
+    UpdateRecentQueryMenu();
+}
+
+void UpdateRecentQueryMenu(void) {
+    int i, j;
+    
+    if (!g_hRecentQueryMenu) return;
+    
+    while (RemoveMenu(g_hRecentQueryMenu, 0, MF_BYPOSITION));
+    
+    if (g_recentQueryCount == 0) {
+        AppendMenuW(g_hRecentQueryMenu, MF_STRING | MF_GRAYED, 0, L"(none)");
+    } else {
+        for (i = 0; i < g_recentQueryCount; i++) {
+            wchar_t item[MAX_PATH + 8];
+            const wchar_t *name = g_recentQueries[i];
+            int len = lstrlenW(name);
+            for (j = len - 1; j >= 0; j--)
+                if (name[j] == '\\') { name = &g_recentQueries[i][j+1]; break; }
+            wsprintfW(item, L"&%d %s", i + 1, name);
+            AppendMenuW(g_hRecentQueryMenu, MF_STRING, IDM_RECENT_QUERY_BASE + i, item);
+        }
+    }
+}
+
 /*============================================================================
 ** Query File Operations
 **============================================================================*/
 
-void DoOpenQuery(void) {
-    CE_OPENFILENAME ofn;
-    wchar_t szFile[MAX_PATH] = L"";
+void OpenQueryFile(const wchar_t *path) {
     HANDLE hFile;
     DWORD dwSize, dwRead;
     char *buf;
     wchar_t *wbuf;
     int i, j, extraCR;
     
+    hFile = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
+    if (hFile != INVALID_HANDLE_VALUE) {
+        dwSize = GetFileSize(hFile, NULL);
+        if (dwSize < 65536) {
+            buf = (char*)LocalAlloc(LMEM_FIXED, dwSize + 1);
+            if (buf && ReadFile(hFile, buf, dwSize, &dwRead, NULL)) {
+                buf[dwRead] = '\0';
+                extraCR = 0;
+                for (i = 0; i < (int)dwRead; i++)
+                    if (buf[i] == '\n' && (i == 0 || buf[i-1] != '\r')) extraCR++;
+                wbuf = (wchar_t*)LocalAlloc(LMEM_FIXED, (dwRead + extraCR + 1) * sizeof(wchar_t));
+                if (wbuf) {
+                    for (i = 0, j = 0; i < (int)dwRead; i++) {
+                        if (buf[i] == '\n' && (i == 0 || buf[i-1] != '\r'))
+                            wbuf[j++] = '\r';
+                        wbuf[j++] = (wchar_t)(unsigned char)buf[i];
+                    }
+                    wbuf[j] = 0;
+                    g_showingHint = 0;
+                    SetWindowTextW(g_hwndQuery, wbuf);
+                    UpdateWindow(g_hwndQuery);
+                    lstrcpyW(g_szQueryPath, path);
+                    AddRecentQuery(path);
+                    g_queryDirty = 0;
+                    UpdateTitle();
+                    UpdateLineNumbers();
+                    LocalFree(wbuf);
+                }
+            }
+            if (buf) LocalFree(buf);
+        }
+        CloseHandle(hFile);
+    }
+}
+
+void DoOpenQuery(void) {
+    CE_OPENFILENAME ofn;
+    wchar_t szFile[MAX_PATH] = L"";
+    int i;
+    
     memset(&ofn, 0, sizeof(ofn));
     ofn.lStructSize = sizeof(ofn);
     ofn.hwndOwner = g_hwndMain;
@@ -94,40 +224,7 @@ void DoOpenQuery(void) {
             if (g_szLastQueryDir[i] == '\\') { g_szLastQueryDir[i] = 0; break; }
         }
         if (g_szLastQueryDir[0] == 0) lstrcpyW(g_szLastQueryDir, L"\\");
-        
-        hFile = CreateFileW(szFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-        if (hFile != INVALID_HANDLE_VALUE) {
-            dwSize = GetFileSize(hFile, NULL);
-            if (dwSize < 65536) {
-                buf = (char*)LocalAlloc(LMEM_FIXED, dwSize + 1);
-                if (buf && ReadFile(hFile, buf, dwSize, &dwRead, NULL)) {
-                    buf[dwRead] = '\0';
-                    /* Count LFs not preceded by CR */
-                    extraCR = 0;
-                    for (i = 0; i < (int)dwRead; i++)
-                        if (buf[i] == '\n' && (i == 0 || buf[i-1] != '\r')) extraCR++;
-                    wbuf = (wchar_t*)LocalAlloc(LMEM_FIXED, (dwRead + extraCR + 1) * sizeof(wchar_t));
-                    if (wbuf) {
-                        for (i = 0, j = 0; i < (int)dwRead; i++) {
-                            if (buf[i] == '\n' && (i == 0 || buf[i-1] != '\r'))
-                                wbuf[j++] = '\r';
-                            wbuf[j++] = (wchar_t)(unsigned char)buf[i];
-                        }
-                        wbuf[j] = 0;
-                        g_showingHint = 0;
-                        SetWindowTextW(g_hwndQuery, wbuf);
-                        UpdateWindow(g_hwndQuery);
-                        lstrcpyW(g_szQueryPath, szFile);
-                        g_queryDirty = 0;
-                        UpdateTitle();
-                        UpdateLineNumbers();
-                        LocalFree(wbuf);
-                    }
-                }
-                if (buf) LocalFree(buf);
-            }
-            CloseHandle(hFile);
-        }
+        OpenQueryFile(szFile);
     }
 }
 
diff --git a/src/sqlite-ce-edit/globals.c b/src/sqlite-ce-edit/globals.c
@@ -13,6 +13,8 @@ HWND g_hwndMain;
 HWND g_hwndCB;
 HWND g_hwndStatus;
 HMENU g_hMenu;
+HMENU g_hRecentDbMenu;
+HMENU g_hRecentQueryMenu;
 HACCEL g_hAccel;
 HBRUSH g_hBrushWhite = NULL;
 HWND g_hwndQuery;
@@ -49,3 +51,7 @@ wchar_t g_szLastQueryDir[MAX_PATH] = L"\\";
 int g_queryDirty = 0;
 int g_showErrorMsgBox = 0;
 wchar_t g_szDefaultDbPath[MAX_PATH] = L"\\My Documents\\Data";
+wchar_t g_recentFiles[MAX_RECENT_FILES][MAX_PATH] = {0};
+int g_recentCount = 0;
+wchar_t g_recentQueries[MAX_RECENT_FILES][MAX_PATH] = {0};
+int g_recentQueryCount = 0;
diff --git a/src/sqlite-ce-edit/globals.h b/src/sqlite-ce-edit/globals.h
@@ -85,12 +85,17 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 #define IDM_FIND     202
 #define IDM_FINDNEXT 203
 #define IDM_EXECATCURSOR 204
+#define IDM_EXECATCURSOR_PLACEHOLDER 205
 #define IDM_CLEAR    301
 #define IDM_VIEWQUERY  401
 #define IDM_VIEWRESULT 402
 #define IDM_FONTSIZE   403
 #define IDM_OPTIONS    404
 #define IDM_ABOUT    501
+#define IDM_RECENT_BASE 600
+#define IDM_RECENT_MAX  604
+#define IDM_RECENT_QUERY_BASE 610
+#define IDM_RECENT_QUERY_MAX  614
 
 /*============================================================================
 ** Resource IDs
@@ -105,13 +110,15 @@ BOOL WINAPI GetSaveFileNameW(CE_OPENFILENAME*);
 **============================================================================*/
 
 #define TB_PLAY    0
-#define TB_QUERY   1
-#define TB_RESULTS 2
-#define TB_GRID    3
-#define TB_OPEN    4
-#define TB_CLOSE   5
-#define TB_NEW     6
-#define TB_STD_BASE 7
+#define TB_EXECAT  1
+#define TB_STOP    2
+#define TB_QUERY   3
+#define TB_RESULTS 4
+#define TB_GRID    5
+#define TB_OPEN    6
+#define TB_CLOSE   7
+#define TB_NEW     8
+#define TB_STD_BASE 9
 #define TB_VIEW_BASE (TB_STD_BASE + 15)
 
 /*============================================================================
@@ -123,6 +130,8 @@ extern HWND g_hwndMain;
 extern HWND g_hwndCB;
 extern HWND g_hwndStatus;
 extern HMENU g_hMenu;
+extern HMENU g_hRecentDbMenu;
+extern HMENU g_hRecentQueryMenu;
 extern HACCEL g_hAccel;
 extern HBRUSH g_hBrushWhite;
 extern HWND g_hwndQuery;
@@ -160,6 +169,12 @@ extern int g_queryDirty;
 extern int g_showErrorMsgBox;
 extern wchar_t g_szDefaultDbPath[MAX_PATH];
 
+#define MAX_RECENT_FILES 5
+extern wchar_t g_recentFiles[MAX_RECENT_FILES][MAX_PATH];
+extern int g_recentCount;
+extern wchar_t g_recentQueries[MAX_RECENT_FILES][MAX_PATH];
+extern int g_recentQueryCount;
+
 /*============================================================================
 ** Function Declarations - Output (output.c)
 **============================================================================*/
@@ -214,6 +229,11 @@ void DoExportCSV(void);
 void DoExportDb(void);
 void DoImportCSV(void);
 void DoImportCEDB(void);
+void AddRecentFile(const wchar_t *path);
+void UpdateRecentMenu(void);
+void AddRecentQuery(const wchar_t *path);
+void UpdateRecentQueryMenu(void);
+void OpenQueryFile(const wchar_t *path);
 
 /*============================================================================
 ** Function Declarations - Find (find.c)
diff --git a/src/sqlite-ce-edit/main.c b/src/sqlite-ce-edit/main.c
diff --git a/src/sqlite-ce-edit/toolbar.bmp b/src/sqlite-ce-edit/toolbar.bmp

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ int OpenDatabase(const wchar_t *path) {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`lstrcpyW(g_szDbPath, path);`
	`139`	`+ AddRecentFile(path);`
`139`	`140`	`UpdateTitle();`
`140`	`141`	`UpdateDbSize();`
`141`	`142`	`SetStatusResult(L"");`