fix: allow hiding unmatched in grid (#113)

Author: mtraworld

README.md

@@ -804,6 +804,7 @@ live_match_update = true  # Update matched cells in real-time without screen fla
 subgrid_enabled = true    # Enable 3×3 sublayer for precision
 subgrid_rows = 3
 subgrid_cols = 3
+hide_unmatched = true    # Hide unmatched cells during typing to reduce visual clutter
 sublayer_keys = "asdfghjkl"  # Keys for subgrid selection (at least 9 characters for 3×3)
 ```
 

cmd/neru/modes.go

@@ -212,7 +212,13 @@ func (a *App) setupGrid(action Action) error {
 	// Initialize manager with the new grid
 	a.gridManager = grid.NewManager(gridInstance, subRows, subCols, keys, func() {
 		// Update matches only (no full redraw)
-		(*a.gridCtx.gridOverlay).UpdateMatches(a.gridManager.GetInput())
+		input := a.gridManager.GetInput()
+
+		// Set hideUnmatched based on whether we have input and the config setting
+		hideUnmatched := a.config.Grid.HideUnmatched && len(input) > 0
+		(*a.gridCtx.gridOverlay).SetHideUnmatched(hideUnmatched)
+
+		(*a.gridCtx.gridOverlay).UpdateMatches(input)
 	}, func(cell *grid.Cell) {
 		// Draw 3x3 subgrid inside selected cell
 		(*a.gridCtx.gridOverlay).ShowSubgrid(cell)

configs/default-config.toml

@@ -265,12 +265,12 @@ max_cell_size = 200
 # Grid label style
 font_size = 12
 font_family = ""
-opacity = 0.5
+opacity = 0.7
 
 # Colors
 background_color = "#abe9b3"
-text_color = "#ffffff"
-matched_text_color = "#ffffff"
+text_color = "#000000"
+matched_text_color = "#000000"
 matched_background_color = "#f8bd96" # Background color for matched grid cells
 matched_border_color = "#f8bd96"     # Border color for matched grid cells
 border_color = "#abe9b3"
@@ -281,6 +281,7 @@ live_match_update = true      # Update matched highlight per keystroke without f
 subgrid_enabled = true        # Enable precision sublayer after main label selection
 subgrid_rows = 3              # Subgrid rows
 subgrid_cols = 3              # Subgrid columns
+hide_unmatched = true        # Hide unmatched cells during typing
 # Sublayer keys used for subgrid selection (at least rows*cols characters)
 sublayer_keys = "asdfghjkl"
 

internal/bridge/overlay.h

@@ -50,6 +50,7 @@ typedef struct {
     char* label;
     CGRect bounds;  // Cell rectangle
     int isMatched;  // 1 if cell matches current input, 0 otherwise
+    int isSubgrid;  // 1 if cell is part of subgrid, 0 otherwise
 } GridCell;
 
 // Function declarations
@@ -67,5 +68,6 @@ void drawTargetDot(OverlayWindow window, CGPoint center, double radius, const ch
 void drawGridCells(OverlayWindow window, GridCell* cells, int count, GridCellStyle style);
 void drawGridLines(OverlayWindow window, CGRect* lines, int count, char* color, int width, double opacity);
 void updateGridMatchPrefix(OverlayWindow window, const char* prefix);
+void setHideUnmatched(OverlayWindow window, int hide);
 
 #endif // OVERLAY_H

internal/bridge/overlay.m

@@ -438,6 +438,12 @@ - (void)drawGridCells {
         NSString *label = cellDict[@"label"];
         NSValue *boundsValue = cellDict[@"bounds"];
         BOOL isMatched = [cellDict[@"isMatched"] boolValue];
+        BOOL isSubgrid = [cellDict[@"isSubgrid"] boolValue];
+        
+        // Skip drawing unmatched cells if hideUnmatched is enabled AND it's not a subgrid cell
+        if (self.hideUnmatched && !isMatched && !isSubgrid) {
+            continue;
+        }
 
         CGRect bounds = [boundsValue rectValue];
 
@@ -847,7 +853,8 @@ void drawGridCells(OverlayWindow window, GridCell* cells, int count, GridCellSty
         NSDictionary *cellDict = @{
             @"label": cell.label ? @(cell.label) : @"",
             @"bounds": [NSValue valueWithRect:NSRectFromCGRect(cell.bounds)],
-            @"isMatched": @(cell.isMatched)
+            @"isMatched": @(cell.isMatched),
+            @"isSubgrid": @(cell.isSubgrid)
         };
         [cellDicts addObject:cellDict];
     }
@@ -882,8 +889,8 @@ void drawGridCells(OverlayWindow window, GridCell* cells, int count, GridCellSty
         controller.overlayView.gridBackgroundColor = [controller.overlayView colorFromHex:bgHex defaultColor:[NSColor whiteColor]];
         controller.overlayView.gridTextColor = [controller.overlayView colorFromHex:textHex defaultColor:[NSColor blackColor]];
         controller.overlayView.gridMatchedTextColor = [controller.overlayView colorFromHex:matchedTextHex defaultColor:[NSColor blueColor]];
-        controller.overlayView.gridMatchedBackgroundColor = [controller.overlayView colorFromHex:matchedBgHex defaultColor:controller.overlayView.gridMatchedTextColor];
-        controller.overlayView.gridMatchedBorderColor = [controller.overlayView colorFromHex:matchedBorderHex defaultColor:controller.overlayView.gridMatchedTextColor];
+        controller.overlayView.gridMatchedBackgroundColor = [controller.overlayView colorFromHex:matchedBgHex defaultColor:[NSColor blueColor]];
+        controller.overlayView.gridMatchedBorderColor = [controller.overlayView colorFromHex:matchedBorderHex defaultColor:[NSColor blueColor]];
         controller.overlayView.gridBorderColor = [controller.overlayView colorFromHex:borderHex defaultColor:[NSColor grayColor]];
         controller.overlayView.gridBorderWidth = borderWidth > 0 ? borderWidth : 1.0;
         controller.overlayView.gridBackgroundOpacity = (backgroundOpacity >= 0.0 && backgroundOpacity <= 1.0) ? backgroundOpacity : 0.85;
@@ -939,13 +946,27 @@ void updateGridMatchPrefix(OverlayWindow window, const char* prefix) {
                 isMatched = [lblPrefix isEqualToString:prefixStr];
             }
             // Always include the cell, just update its matched state
+            // Preserve the isSubgrid field
+            BOOL isSubgrid = [cellDict[@"isSubgrid"] boolValue];
             NSDictionary *newDict = @{ @"label": label,
                                        @"bounds": cellDict[@"bounds"],
-                                       @"isMatched": @(isMatched) };
+                                       @"isMatched": @(isMatched),
+                                       @"isSubgrid": @(isSubgrid) };
             [updated addObject:newDict];
         }
         [controller.overlayView.gridCells removeAllObjects];
         [controller.overlayView.gridCells addObjectsFromArray:updated];
         [controller.overlayView setNeedsDisplay:YES];
     });
 }
+
+void setHideUnmatched(OverlayWindow window, int hide) {
+    if (!window) return;
+    
+    OverlayWindowController *controller = (OverlayWindowController*)window;
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        controller.overlayView.hideUnmatched = hide ? YES : NO;
+        [controller.overlayView setNeedsDisplay:YES];
+    });
+}

internal/config/config.go

@@ -126,6 +126,7 @@ type GridConfig struct {
 	SubgridRows            int              `toml:"subgrid_rows"`
 	SubgridCols            int              `toml:"subgrid_cols"`
 	Enabled                bool             `toml:"enabled"`
+	HideUnmatched          bool             `toml:"hide_unmatched"`
 	LeftClick              GridActionConfig `toml:"left_click"`
 	RightClick             GridActionConfig `toml:"right_click"`
 	DoubleClick            GridActionConfig `toml:"double_click"`
@@ -306,8 +307,8 @@ func DefaultConfig() *Config {
 			FontFamily:             "SF Mono",
 			Opacity:                0.85,
 			BackgroundColor:        "#abe9b3",
-			TextColor:              "#ffffff",
-			MatchedTextColor:       "#ffffff",
+			TextColor:              "#000000",
+			MatchedTextColor:       "#000000",
 			MatchedBackgroundColor: "#f8bd96",
 			MatchedBorderColor:     "#f8bd96",
 			BorderColor:            "#abe9b3",
@@ -317,6 +318,7 @@ func DefaultConfig() *Config {
 			SubgridRows:            3,
 			SubgridCols:            3,
 			Enabled:                true,
+			HideUnmatched:          true,
 			LeftClick:              GridActionConfig{RestoreCursor: false},
 			RightClick:             GridActionConfig{RestoreCursor: false},
 			DoubleClick:            GridActionConfig{RestoreCursor: false},

internal/grid/grid_overlay.go

@@ -4,9 +4,6 @@ package grid
 #cgo CFLAGS: -x objective-c
 #include "../bridge/overlay.h"
 #include <stdlib.h>
-
-// Explicit declaration to satisfy cgo name resolution
-void drawScrollHighlight(OverlayWindow window, CGRect bounds, char* color, int width);
 */
 import "C"
 
@@ -37,6 +34,19 @@ func (o *GridOverlay) UpdateConfig(cfg config.GridConfig) {
 	o.cfg = cfg
 }
 
+// SetHideUnmatched sets whether to hide unmatched cells
+func (o *GridOverlay) SetHideUnmatched(hide bool) {
+	C.setHideUnmatched(o.window, C.int(boolToInt(hide)))
+}
+
+// boolToInt converts a boolean to an integer (1 for true, 0 for false)
+func boolToInt(b bool) int {
+	if b {
+		return 1
+	}
+	return 0
+}
+
 // Show displays the grid overlay
 func (o *GridOverlay) Show() {
 	C.showOverlayWindow(o.window)
@@ -138,6 +148,7 @@ func (o *GridOverlay) ShowSubgrid(cell *Cell) {
 				size:   C.CGSize{width: C.double(right - left), height: C.double(bottom - top)},
 			},
 			isMatched: C.int(0),
+			isSubgrid: C.int(1), // Mark as subgrid cell
 		}
 	}
 
@@ -150,15 +161,17 @@ func (o *GridOverlay) ShowSubgrid(cell *Cell) {
 	borderColor := C.CString(o.cfg.BorderColor)
 
 	style := C.GridCellStyle{
-		fontSize:          C.int(o.cfg.FontSize),
-		fontFamily:        fontFamily,
-		backgroundColor:   backgroundColor,
-		textColor:         textColor,
-		matchedTextColor:  matchedTextColor,
-		borderColor:       borderColor,
-		borderWidth:       C.int(o.cfg.BorderWidth),
-		backgroundOpacity: C.double(o.cfg.Opacity),
-		textOpacity:       C.double(1.0),
+		fontSize:               C.int(o.cfg.FontSize),
+		fontFamily:             fontFamily,
+		backgroundColor:        backgroundColor,
+		textColor:              textColor,
+		matchedTextColor:       matchedTextColor,
+		matchedBackgroundColor: matchedBackgroundColor,
+		matchedBorderColor:     matchedBorderColor,
+		borderColor:            borderColor,
+		borderWidth:            C.int(o.cfg.BorderWidth),
+		backgroundOpacity:      C.double(o.cfg.Opacity),
+		textOpacity:            C.double(1.0),
 	}
 
 	C.clearOverlay(o.window)
@@ -228,6 +241,7 @@ func (o *GridOverlay) drawGridCells(cellsGo []*Cell, currentInput string) {
 				size:   C.CGSize{width: C.double(cell.Bounds.Dx()), height: C.double(cell.Bounds.Dy())},
 			},
 			isMatched: C.int(isMatched),
+			isSubgrid: C.int(0), // Mark as regular grid cell
 		}
 	}
 
@@ -240,15 +254,17 @@ func (o *GridOverlay) drawGridCells(cellsGo []*Cell, currentInput string) {
 	borderColor := C.CString(o.cfg.BorderColor)
 
 	style := C.GridCellStyle{
-		fontSize:          C.int(o.cfg.FontSize),
-		fontFamily:        fontFamily,
-		backgroundColor:   backgroundColor,
-		textColor:         textColor,
-		matchedTextColor:  matchedTextColor,
-		borderColor:       borderColor,
-		borderWidth:       C.int(o.cfg.BorderWidth),
-		backgroundOpacity: C.double(o.cfg.Opacity),
-		textOpacity:       C.double(1.0),
+		fontSize:               C.int(o.cfg.FontSize),
+		fontFamily:             fontFamily,
+		backgroundColor:        backgroundColor,
+		textColor:              textColor,
+		matchedTextColor:       matchedTextColor,
+		matchedBackgroundColor: matchedBackgroundColor,
+		matchedBorderColor:     matchedBorderColor,
+		borderColor:            borderColor,
+		borderWidth:            C.int(o.cfg.BorderWidth),
+		backgroundOpacity:      C.double(o.cfg.Opacity),
+		textOpacity:            C.double(1.0),
 	}
 
 	C.drawGridCells(o.window, &cGridCells[0], C.int(len(cGridCells)), style)