Select by clicking

Squirrel.xcodeproj/project.pbxproj

@@ -625,7 +625,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.17.0;
+				CURRENT_PROJECT_VERSION = 0.17.1;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -674,7 +674,7 @@
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 0.17.0;
+				CURRENT_PROJECT_VERSION = 0.17.1;
 				DEAD_CODE_STRIPPING = YES;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

SquirrelInputController.h

@@ -2,5 +2,5 @@
 #import <InputMethodKit/InputMethodKit.h>
 
 @interface SquirrelInputController : IMKInputController
-
+- (BOOL)selectCandidate:(NSInteger)index;
 @end

SquirrelInputController.m

@@ -155,9 +155,6 @@ - (BOOL)handleEvent:(NSEvent*)event client:(id)sender
           [self rimeUpdate];
         }
       } break;
-      case NSEventTypeLeftMouseDown: {
-        [self commitComposition:_currentClient];
-      } break;
       default:
         break;
     }
@@ -222,6 +219,12 @@ -(BOOL)processKey:(int)rime_keycode modifiers:(int)rime_modifiers
   return handled;
 }
 
+- (BOOL)selectCandidate:(NSInteger)index {
+  BOOL success = rime_get_api()->select_candidate_on_current_page(_session, (int) index);
+  [self rimeUpdate];
+  return success;
+}
+
 -(void)onChordTimer:(NSTimer *)timer
 {
   // chord release triggered by timer
@@ -285,7 +288,7 @@ -(void)clearChord
 -(NSUInteger)recognizedEvents:(id)sender
 {
   //NSLog(@"recognizedEvents:");
-  return NSEventMaskKeyDown | NSEventMaskFlagsChanged | NSEventMaskLeftMouseDown;
+  return NSEventMaskKeyDown | NSEventMaskFlagsChanged;
 }
 
 -(void)activateServer:(id)sender
@@ -449,6 +452,7 @@ -(void)showPanelWithPreedit:(NSString*)preedit
   [_currentClient attributesForCharacterIndex:0 lineHeightRectangle:&inputPos];
   SquirrelPanel* panel = NSApp.squirrelAppDelegate.panel;
   panel.position = inputPos;
+  panel.inputController = self;
   [panel showPreedit:preedit
             selRange:selRange
             caretPos:caretPos

SquirrelPanel.h

@@ -1,8 +1,9 @@
 #import <Cocoa/Cocoa.h>
+#import "SquirrelInputController.h"
 
 @class SquirrelConfig;
 
-@interface SquirrelPanel : NSWindow
+@interface SquirrelPanel : NSPanel
 
 // Linear candidate list, as opposed to stacked candidate list.
 @property(nonatomic, readonly) BOOL linear;
@@ -15,6 +16,8 @@
 
 // position of input caret on screen.
 @property(nonatomic, assign) NSRect position;
+// position of input caret on screen.
+@property(nonatomic, assign) SquirrelInputController *inputController;
 
 -(void)showPreedit:(NSString*)preedit
           selRange:(NSRange)selRange

SquirrelPanel.m

@@ -857,6 +857,36 @@ - (void)drawRect:(NSRect)dirtyRect {
   [_textView setTextContainerInset:NSMakeSize(textFieldOrigin.x, textFieldOrigin.y)];
 }
 
+- (BOOL)clickAtPoint:(NSPoint)_point index:(NSInteger *)_index {
+  if (CGPathContainsPoint(_shape.path, nil, _point, NO)) {
+    NSPoint point = NSMakePoint(_point.x - self.textView.textContainerInset.width,
+                                _point.y - self.textView.textContainerInset.height);
+    NSTextLayoutFragment *fragment = [self.layoutManager textLayoutFragmentForPosition:point];
+    point = NSMakePoint(point.x - NSMinX(fragment.layoutFragmentFrame),
+                        point.y - NSMinY(fragment.layoutFragmentFrame));
+    NSInteger index = [self.layoutManager offsetFromLocation: self.layoutManager.documentRange.location toLocation: fragment.rangeInElement.location];
+    for (NSUInteger i = 0; i < fragment.textLineFragments.count; i += 1) {
+      NSTextLineFragment *lineFragment = fragment.textLineFragments[i];
+      if (CGRectContainsPoint(lineFragment.typographicBounds, point)) {
+        point = NSMakePoint(point.x - NSMinX(lineFragment.typographicBounds),
+                            point.y - NSMinY(lineFragment.typographicBounds));
+        index += [lineFragment characterIndexForPoint:point];
+        for (NSUInteger i = 0; i < _candidateRanges.count; i += 1) {
+          NSRange range = [_candidateRanges[i] rangeValue];
+          if (index >= range.location && index < NSMaxRange(range)) {
+            *_index = i;
+            break;
+          }
+        }
+        break;
+      }
+    }
+    return YES;
+  } else {
+    return NO;
+  }
+}
+
 @end
 
 @implementation SquirrelPanel {
@@ -954,10 +984,7 @@ - (void)initializeUIStyleForDarkMode:(BOOL)isDark {
 }
 
 - (instancetype)init {
-  self = [super initWithContentRect:_position
-                          styleMask:NSWindowStyleMaskBorderless
-                            backing:NSBackingStoreBuffered
-                              defer:YES];
+  self = [super initWithContentRect:_position styleMask:NSWindowStyleMaskNonactivatingPanel backing:NSBackingStoreBuffered defer:YES];
   if (self) {
     self.alphaValue = 1.0;
     // _window.level = NSScreenSaverWindowLevel + 1;
@@ -986,6 +1013,19 @@ - (instancetype)init {
   return self;
 }
 
+- (void)sendEvent:(NSEvent *)event {
+  if (event.type == NSEventTypeLeftMouseDown) {
+    NSPoint point = NSEvent.mouseLocation;
+    point = [self convertPointFromScreen:point];
+    point = [_view convertPoint:point fromView:nil];
+    NSInteger index = -1;
+    [_view clickAtPoint: point index:&index];
+    if (index >= 0) {
+      [self.inputController selectCandidate:index];
+    }
+  }
+}
+
 - (void)getCurrentScreen {
   // get current screen
   _screenRect = [NSScreen mainScreen].frame;