address a bunch of feature requests

Author: jaredly

swift/qmoji/AppDelegate.swift

@@ -28,6 +28,7 @@ func fourCharCodeValue(string: String) -> Int {
 }
 
 let showAtMouseKey = "showAtMouse"
+let shortcutKeyKey = "shortcutKey"
 
 @main
 class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
@@ -41,13 +42,25 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     var popover: NSPopover!
     var window: NSWindow!
     var statusBarItem: NSStatusItem!
-    var hotKeyRef: UnsafeMutablePointer<EventHotKeyRef?>!
+//    var hotKeyRef: UnsafeMutablePointer<EventHotKeyRef?>?
     var showAtMouse: Bool = UserDefaults.standard.bool(forKey: showAtMouseKey)
+    var shortcutKey: Int = {
+        if UserDefaults.standard.string(forKey: shortcutKeyKey) == nil {
+            return 0x31
+        }
+        return UserDefaults.standard.integer(forKey: shortcutKeyKey)
+    }()
+    var hotKeyRef: EventHotKeyRef?
 
     @objc func onClick() {
         print("Hello")
     }
 
+    func setShortcutKey(key: Int) {
+        registerHotkey(keyCode: key)
+        UserDefaults.standard.set(key, forKey: shortcutKeyKey)
+    }
+    
     func toggleShowAtMouse() {
         self.showAtMouse = !self.showAtMouse
         UserDefaults.standard.set(self.showAtMouse, forKey: showAtMouseKey)
@@ -91,15 +104,21 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
              button.action = #selector(toggle(_:))
         }
 
-        let keyCode = 0x1F // 0x31
-        registerHotkey(keyCode: keyCode)
+//        let keyCode = 0x1F // 0x31
+        registerHotkey(keyCode: shortcutKey)
     }
 
     func windowDidResignKey(_ notification: Notification) {
         NSApp.hide(nil)
     }
 
     func registerHotkey(keyCode: Int) {
+        if let current = hotKeyRef {
+            UnregisterEventHotKey(current)
+        }
+
+        let hotKeyRef = UnsafeMutablePointer<EventHotKeyRef?>.allocate(capacity: 1)
+        
         var gMyHotKeyID = EventHotKeyID()
         gMyHotKeyID.signature = OSType(fourCharCodeValue(string: "hotk"))
         gMyHotKeyID.id = UInt32(keyCode)
@@ -109,7 +128,6 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         eventType.eventClass = OSType(kEventClassKeyboard)
         eventType.eventKind = OSType(kEventHotKeyPressed)
 
-        hotKeyRef = UnsafeMutablePointer<EventHotKeyRef?>.allocate(capacity: 1)
         // Install handler.
         InstallEventHandler(GetApplicationEventTarget(), {(nextHanlder, theEvent, userData) -> OSStatus in
             var hkCom = EventHotKeyID()
@@ -130,6 +148,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
         // Register hotkey.
         let status = RegisterEventHotKey(UInt32(keyCode), UInt32(cmdKey + optionKey), gMyHotKeyID, GetApplicationEventTarget(), 0, hotKeyRef)
         print("The status", status)
+        
+        self.hotKeyRef = hotKeyRef.pointee
     }
 
     func togglePopover(_ sender: AnyObject?) {

swift/qmoji/CustomView.swift

@@ -71,6 +71,14 @@ func sendKeystrokesToFrontmostApp(_ string: String) {
     keyup.postToPid(pid)
 }
 
+func sortUsages(one: Usage, two: Usage) -> Bool {
+    if one.count == two.count {
+        return one.date > two.date
+    } else {
+        return one.count > two.count
+    }
+}
+
 struct Cache {
     var cached: [Emoji]
     var searchTerm: String
@@ -81,15 +89,7 @@ struct Cache {
             var used = emojis.filter({emoji in usages[emoji.id] != nil})
             let unused = emojis.filter({emoji in usages[emoji.id] == nil})
             used.sort(by: { one, two in
-                let oc = usages[one.id]!.count
-                let od = usages[one.id]!.date
-                let tc = usages[two.id]!.count
-                let td = usages[two.id]!.date
-                if oc == tc {
-                    return od > td
-                } else {
-                    return oc > tc
-                }
+                return sortUsages(one: usages[one.id]!, two: usages[two.id]!)
             })
             used.append(contentsOf: unused)
             cached = used
@@ -205,15 +205,36 @@ class CustomView: NSView {
             usage.date = Date.init().timeIntervalSince1970
             self.usages[id] = usage
         } else {
+            // Bring it down to 20 if needed
+            if self.usages.count >= 20 {
+                let ids = self.usages.keys.sorted(by: {one, two in sortUsages(one: self.usages[one]!, two: self.usages[two]!)})
+                for i in 19...ids.count - 1 {
+                    self.usages.remove(at: self.usages.index(forKey: ids[i])!)
+                }
+            }
             self.usages[id] = Usage(name: id, count: 1, date: Date.init().timeIntervalSince1970)
         }
+        saveUsages()
+    }
+    
+    func saveUsages() {
         self.filterCache = Cache(searchTerm: _searchTerm, usages: usages)
         self.setNeedsDisplay(self.bounds)
         let encoder = JSONEncoder()
         if let encoded = try? encoder.encode(self.usages) {
             UserDefaults.standard.set(encoded, forKey: usageKey)
         }
     }
+    
+    func removeUsage() {
+        let filtered = sortedEmoijs()
+        if filtered.isEmpty || self.selected > filtered.count {
+            return
+        }
+        let emoji = filtered[self.selected]
+        self.usages.remove(at: self.usages.index(forKey: emoji.id)!)
+        saveUsages()
+    }
 
     func sendKey() {
         let filtered = sortedEmoijs()
@@ -233,6 +254,10 @@ class CustomView: NSView {
         onClear()
         searchTerm = ""
     }
+    
+    override func rightMouseDown(with event: NSEvent) {
+        removeUsage()
+    }
 
     override func mouseDown(with event: NSEvent) {
         sendKey()

swift/qmoji/ViewController.swift

@@ -19,6 +19,69 @@ struct Usage: Codable {
     var date: Double
 }
 
+class MyText: NSTextField {
+    
+    
+    override func keyDown(with event: NSEvent) {
+        print("WHAT", event.keyCode)
+    }
+}
+
+class NewShortcutKey: NSViewController, NSTextFieldDelegate {
+    var label: NSTextField!
+    var onDismiss: (() -> ())!
+    var currentCode: Int = AppDelegate.shared.shortcutKey
+    
+    override func loadView() {
+        self.view = NSView()
+    }
+    
+    @objc func onSet() {
+        AppDelegate.shared.setShortcutKey(key: currentCode)
+        onDismiss()
+    }
+    
+    override func viewDidLoad() {
+        self.view.setFrameSize(NSSize(width: width, height: 60))
+        
+        NSEvent.addLocalMonitorForEvents(matching: .keyDown, handler: {event in
+            print("Event", event.keyCode)
+            if event.keyCode == 53 {
+                self.onDismiss()
+            }
+            self.currentCode = Int(event.keyCode)
+            self.label.stringValue = "Key code: \(self.currentCode)"
+            return nil
+        })
+        
+        let button = NSButton()
+        button.title = "Update shortcut key"
+        button.setFrameOrigin(NSPoint(x: margin, y: 0))
+        button.setFrameSize(NSSize(width: width - margin * 2, height: 20))
+        button.action = #selector(onSet)
+        button.target = self
+        
+        label = NSTextField(labelWithString: "Key code: \(currentCode)")
+        label.lineBreakMode = .byWordWrapping
+        label.setFrameOrigin(NSPoint(x: 0, y: 20))
+        label.setFrameSize(NSSize(width: width - margin * 2, height: 20))
+        self.view.addSubview(label)
+        
+        let description = NSTextField(labelWithString: "Type any key. Escape to cancel.")
+        description.setFrameOrigin(NSPoint(x: 0, y: 40))
+        description.setFrameSize(NSSize(width: width - margin * 2, height: 20))
+        self.view.addSubview(description)
+        
+        self.view.addSubview(button)
+        self.view.becomeFirstResponder()
+    }
+    
+    override func keyDown(with event: NSEvent) {
+        label.stringValue = "\(event.keyCode)"
+        print("OK")
+    }
+}
+
 class MyVC: NSViewController, NSTextFieldDelegate {
     var textField: NSTextField!
     var customView: CustomView!
@@ -29,6 +92,8 @@ class MyVC: NSViewController, NSTextFieldDelegate {
     var showAtCursor: NSMenuItem!
     var menuButton: NSButton!
 
+    var shortcutPopover: NSPopover!
+    
     override func loadView() {
         self.view = NSView()
     }
@@ -48,6 +113,13 @@ class MyVC: NSViewController, NSTextFieldDelegate {
         NSApp.terminate(nil)
     }
 
+    @objc func setShortcutKey() {
+        print("Set shortcut key")
+//        AppDelegate.shared.registerHotkey(keyCode: 0x31)
+        shortcutPopover.show(relativeTo: menuButton.bounds, of: menuButton, preferredEdge: NSRectEdge.minY)
+//        shortcutPopover.pres
+    }
+    
     override func viewDidLoad() {
         let buttonSize = 20
 
@@ -73,9 +145,16 @@ class MyVC: NSViewController, NSTextFieldDelegate {
         showAtCursor = NSMenuItem(title: "Show at cursor", action: #selector(toggleShowAtCursor), keyEquivalent: "")
         showAtCursor.state = AppDelegate.shared.showAtMouse ? .on : .off
         optionsMenu.addItem(showAtCursor)
+        optionsMenu.addItem(withTitle: "Change shortcut key", action: #selector(setShortcutKey), keyEquivalent: "")
         optionsMenu.addItem(withTitle: "Quit", action: #selector(onQuit), keyEquivalent: "")
 
 
+        shortcutPopover = NSPopover()
+        let ksvc = NewShortcutKey()
+        ksvc.onDismiss = {
+            self.shortcutPopover.performClose(nil)
+        }
+        shortcutPopover.contentViewController = ksvc
 
         let decoder = JSONDecoder()
         if let data = UserDefaults.standard.data(forKey: usageKey),
@@ -124,30 +203,36 @@ class MyVC: NSViewController, NSTextFieldDelegate {
         customView.searchTerm = textField.stringValue
     }
 
-    func textField(_ textField: NSTextField, textView: NSTextView, shouldSelectCandidateAt index: Int) -> Bool {
-        print("Text field select", index)
-        return true
-    }
-    
     func control(_ control: NSControl, textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {
         print("Selector", commandSelector)
+        if commandSelector == #selector(moveRight(_:)) {
+            self.customView.setSelected(proposed: self.customView.selected + 1)
+            return true
+        }
+        if commandSelector == #selector(moveLeft(_:)) {
+            self.customView.setSelected(proposed: self.customView.selected - 1)
+            return true
+        }
+        if commandSelector == #selector(moveDown(_:)) {
+            self.customView.setSelected(proposed: self.customView.selected + 10)
+            return true
+        }
+        if commandSelector == #selector(moveUp(_:)) {
+            self.customView.setSelected(proposed: self.customView.selected - 10)
+            return true
+        }
         if commandSelector == #selector(insertTab(_:)) {
-            print("tab")
             self.customView.setSelected(proposed: self.customView.selected + 1)
+            return true
         }
         if commandSelector == #selector(insertBacktab(_:)) {
-            print("back tab")
             self.customView.setSelected(proposed: self.customView.selected - 1)
+            return true
         }
         if commandSelector == #selector(cancelOperation(_:)) {
-            print("Escape")
             NSApp.hide(nil)
             return true
         }
         return false
     }
-    
-    override func keyDown(with event: NSEvent) {
-        print(event.keyCode, "Key down here")
-    }
 }