Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 08:19:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove Carbon from Mac Auto-Type (#3347)"

Browse Source 
This reverts commit ce1f19cacc.
This commit is contained in:
Jonathan White 2019-11-03 21:26:19 -05:00 committed by Janek Bevendorff
parent 035823e414
commit 440331d319
9 changed files with 310 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

267
src/autotype/mac/AutoTypeMac.cpp
View File

@ -17,43 +17,47 @@
*/ */
#include "AutoTypeMac.h" #include "AutoTypeMac.h"
#include "AutoTypeMacKeyCodes.h"
#include "gui/macutils/MacUtils.h" #include "gui/macutils/MacUtils.h"
#include <ApplicationServices/ApplicationServices.h>
#define HOTKEY_ID 1
#define MAX_WINDOW_TITLE_LENGTH 1024 #define MAX_WINDOW_TITLE_LENGTH 1024
#define INVALID_KEYCODE 0xFFFF #define INVALID_KEYCODE 0xFFFF
AutoTypePlatformMac::AutoTypePlatformMac() AutoTypePlatformMac::AutoTypePlatformMac()
: m_globalMonitor(nullptr) : m_hotkeyRef(nullptr)
, m_hotkeyId({ 'kpx2', HOTKEY_ID })
{ {
EventTypeSpec eventSpec;
eventSpec.eventClass = kEventClassKeyboard;
eventSpec.eventKind = kEventHotKeyPressed;
::InstallApplicationEventHandler(AutoTypePlatformMac::hotkeyHandler, 1, &eventSpec, this, nullptr);
} }
/** //
* Request accessibility permissions required for keyboard control // Keepassx requires mac os 10.7
* //
* @return true on success
*/
bool AutoTypePlatformMac::isAvailable() bool AutoTypePlatformMac::isAvailable()
{ {
return macUtils()->enableAccessibility(); return true;
} }
/** //
* Get a list of the currently open window titles // Get list of visible window titles
* // see: Quartz Window Services
* @return list of window titles //
*/
QStringList AutoTypePlatformMac::windowTitles() QStringList AutoTypePlatformMac::windowTitles()
{ {
QStringList list; QStringList list;
auto windowList = ::CGWindowListCopyWindowInfo( CFArrayRef windowList = ::CGWindowListCopyWindowInfo(kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements, kCGNullWindowID);
kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements, kCGNullWindowID); if (windowList != nullptr) {
if (windowList) { CFIndex count = ::CFArrayGetCount(windowList);
auto count = ::CFArrayGetCount(windowList);
for (CFIndex i = 0; i < count; i++) { for (CFIndex i = 0; i < count; i++) {
auto window = static_cast<CFDictionaryRef>(::CFArrayGetValueAtIndex(windowList, i)); CFDictionaryRef window = static_cast<CFDictionaryRef>(::CFArrayGetValueAtIndex(windowList, i));
if (windowLayer(window) != 0) { if (windowLayer(window) != 0) {
continue; continue;
} }
@ -70,28 +74,24 @@ QStringList AutoTypePlatformMac::windowTitles()
return list; return list;
} }
/** //
* Get active window ID // Get active window process id
* //
* @return window ID
*/
WId AutoTypePlatformMac::activeWindow() WId AutoTypePlatformMac::activeWindow()
{ {
return macUtils()->activeWindow(); return macUtils()->activeWindow();
} }
/** //
* Get active window title // Get active window title
* // see: Quartz Window Services
* @return window title //
*/
QString AutoTypePlatformMac::activeWindowTitle() QString AutoTypePlatformMac::activeWindowTitle()
{ {
QString title; QString title;
CFArrayRef windowList = ::CGWindowListCopyWindowInfo( CFArrayRef windowList = ::CGWindowListCopyWindowInfo(kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements, kCGNullWindowID);
kCGWindowListOptionOnScreenOnly | kCGWindowListExcludeDesktopElements, kCGNullWindowID); if (windowList != nullptr) {
if (windowList) {
CFIndex count = ::CFArrayGetCount(windowList); CFIndex count = ::CFArrayGetCount(windowList);
for (CFIndex i = 0; i < count; i++) { for (CFIndex i = 0; i < count; i++) {
@ -111,62 +111,41 @@ QString AutoTypePlatformMac::activeWindowTitle()
return title; return title;
} }
/** //
* Register global hotkey using NS global event monitor. // Register global hotkey
* Note that this hotkey is not trapped and may trigger //
* actions in the local application where it is issued.
*
* @param key key used for hotkey
* @param modifiers modifiers required in addition to key
* @return true on success
*/
bool AutoTypePlatformMac::registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) bool AutoTypePlatformMac::registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers)
{ {
auto nativeKeyCode = qtToNativeKeyCode(key); uint16 nativeKeyCode = qtToNativeKeyCode(key);
if (nativeKeyCode == INVALID_KEYCODE) { if (nativeKeyCode == INVALID_KEYCODE) {
qWarning("Invalid key code"); qWarning("Invalid key code");
return false; return false;
} }
auto nativeModifiers = qtToNativeModifiers(modifiers); CGEventFlags nativeModifiers = qtToNativeModifiers(modifiers, false);
m_globalMonitor = if (::RegisterEventHotKey(nativeKeyCode, nativeModifiers, m_hotkeyId, GetApplicationEventTarget(), 0, &m_hotkeyRef) != noErr) {
macUtils()->addGlobalMonitor(nativeKeyCode, nativeModifiers, this, AutoTypePlatformMac::hotkeyHandler); qWarning("Register hotkey failed");
return false;
}
return true; return true;
} }
/** //
* Handle global hotkey presses by emitting the trigger signal // Unregister global hotkey
* //
* @param userData pointer to AutoTypePlatform
*/
void AutoTypePlatformMac::hotkeyHandler(void* userData)
{
auto* self = static_cast<AutoTypePlatformMac*>(userData);
emit self->globalShortcutTriggered();
}
/**
* Unregister a previously registered global hotkey
*
* @param key unused
* @param modifiers unused
*/
void AutoTypePlatformMac::unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) void AutoTypePlatformMac::unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers)
{ {
Q_UNUSED(key); Q_UNUSED(key);
Q_UNUSED(modifiers); Q_UNUSED(modifiers);
if (m_globalMonitor) {
macUtils()->removeGlobalMonitor(m_globalMonitor); ::UnregisterEventHotKey(m_hotkeyRef);
m_globalMonitor = nullptr;
}
} }
/**
* Unused
*/
int AutoTypePlatformMac::platformEventFilter(void* event) int AutoTypePlatformMac::platformEventFilter(void* event)
{ {
Q_UNUSED(event); Q_UNUSED(event);
Q_ASSERT(false); Q_ASSERT(false);
return -1; return -1;
} }
@ -175,21 +154,17 @@ AutoTypeExecutor* AutoTypePlatformMac::createExecutor()
return new AutoTypeExecutorMac(this); return new AutoTypeExecutorMac(this);
} }
/** //
* Raise the given window ID // Activate window by process id
* //
* @return true on success
*/
bool AutoTypePlatformMac::raiseWindow(WId pid) bool AutoTypePlatformMac::raiseWindow(WId pid)
{ {
return macUtils()->raiseWindow(pid); return macUtils()->raiseWindow(pid);
} }
/** //
* Hide the KeePassXC window // Activate last active window
* //
* @return true on success
*/
bool AutoTypePlatformMac::hideOwnWindow() bool AutoTypePlatformMac::hideOwnWindow()
{ {
return macUtils()->hideOwnWindow(); return macUtils()->hideOwnWindow();
@ -203,55 +178,46 @@ bool AutoTypePlatformMac::raiseOwnWindow()
return macUtils()->raiseOwnWindow(); return macUtils()->raiseOwnWindow();
} }
/** //
* Send provided character as key event to the active window // Send unicode character to active window
* // see: Quartz Event Services
* @param ch unicode character //
* @param isKeyDown whether the key is pressed
*/
void AutoTypePlatformMac::sendChar(const QChar& ch, bool isKeyDown) void AutoTypePlatformMac::sendChar(const QChar& ch, bool isKeyDown)
{ {
auto keyEvent = ::CGEventCreateKeyboardEvent(nullptr, 0, isKeyDown); CGEventRef keyEvent = ::CGEventCreateKeyboardEvent(nullptr, 0, isKeyDown);
if (keyEvent) { if (keyEvent != nullptr) {
auto unicode = ch.unicode(); UniChar unicode = ch.unicode();
::CGEventKeyboardSetUnicodeString(keyEvent, 1, &unicode); ::CGEventKeyboardSetUnicodeString(keyEvent, 1, &unicode);
::CGEventPost(kCGSessionEventTap, keyEvent); ::CGEventPost(kCGSessionEventTap, keyEvent);
::CFRelease(keyEvent); ::CFRelease(keyEvent);
} }
} }
/** //
* Send provided Qt key as key event to the active window // Send key code to active window
* // see: Quartz Event Services
* @param key Qt key code //
* @param isKeyDown whether the key is pressed void AutoTypePlatformMac::sendKey(Qt::Key key, bool isKeyDown, Qt::KeyboardModifiers modifiers = 0)
* @param modifiers any modifiers to apply to key
*/
void AutoTypePlatformMac::sendKey(Qt::Key key, bool isKeyDown, Qt::KeyboardModifiers modifiers)
{ {
auto keyCode = qtToNativeKeyCode(key); uint16 keyCode = qtToNativeKeyCode(key);
if (keyCode == INVALID_KEYCODE) { if (keyCode == INVALID_KEYCODE) {
return; return;
} }
auto keyEvent = ::CGEventCreateKeyboardEvent(nullptr, keyCode, isKeyDown); CGEventRef keyEvent = ::CGEventCreateKeyboardEvent(nullptr, keyCode, isKeyDown);
auto nativeModifiers = qtToNativeModifiers(modifiers); CGEventFlags nativeModifiers = qtToNativeModifiers(modifiers, true);
if (keyEvent) { if (keyEvent != nullptr) {
::CGEventSetFlags(keyEvent, nativeModifiers); ::CGEventSetFlags(keyEvent, nativeModifiers);
::CGEventPost(kCGSessionEventTap, keyEvent); ::CGEventPost(kCGSessionEventTap, keyEvent);
::CFRelease(keyEvent); ::CFRelease(keyEvent);
} }
} }
/** //
* Translate Qt key to macOS key code provided by // Translate qt key code to mac os key code
* AutoTypeMacKeyCodes.h which are derived from // see: HIToolbox/Events.h
* legacy Carbon "HIToolbox/Events.h" //
* uint16 AutoTypePlatformMac::qtToNativeKeyCode(Qt::Key key)
* @param key key to translate
* @returns macOS key code
*/
CGKeyCode AutoTypePlatformMac::qtToNativeKeyCode(Qt::Key key)
{ {
switch (key) { switch (key) {
case Qt::Key_A: case Qt::Key_A:
@ -422,74 +388,99 @@ CGKeyCode AutoTypePlatformMac::qtToNativeKeyCode(Qt::Key key)
return kVK_F16; return kVK_F16;
default: default:
Q_ASSERT(false);
return INVALID_KEYCODE; return INVALID_KEYCODE;
} }
} }
/** //
* Translate Qt key modifiers to macOS key modifiers // Translate qt key modifiers to mac os modifiers
* provided by the Core Graphics component // see: https://doc.qt.io/qt-5/osx-issues.html#special-keys
* //
* @param modifiers Qt keyboard modifier(s) CGEventFlags AutoTypePlatformMac::qtToNativeModifiers(Qt::KeyboardModifiers modifiers, bool native)
* @returns macOS key modifier(s)
*/
CGEventFlags AutoTypePlatformMac::qtToNativeModifiers(Qt::KeyboardModifiers modifiers)
{ {
auto nativeModifiers = CGEventFlags(0); CGEventFlags nativeModifiers = CGEventFlags(0);
CGEventFlags shiftMod = CGEventFlags(shiftKey);
CGEventFlags cmdMod = CGEventFlags(cmdKey);
CGEventFlags optionMod = CGEventFlags(optionKey);
CGEventFlags controlMod = CGEventFlags(controlKey);
if (native) {
shiftMod = kCGEventFlagMaskShift;
cmdMod = kCGEventFlagMaskCommand;
optionMod = kCGEventFlagMaskAlternate;
controlMod = kCGEventFlagMaskControl;
}
if (modifiers & Qt::ShiftModifier) { if (modifiers & Qt::ShiftModifier) {
nativeModifiers = CGEventFlags(nativeModifiers | kCGEventFlagMaskShift); nativeModifiers = CGEventFlags(nativeModifiers | shiftMod);
} }
if (modifiers & Qt::ControlModifier) { if (modifiers & Qt::ControlModifier) {
nativeModifiers = CGEventFlags(nativeModifiers | kCGEventFlagMaskCommand); nativeModifiers = CGEventFlags(nativeModifiers | cmdMod);
} }
if (modifiers & Qt::AltModifier) { if (modifiers & Qt::AltModifier) {
nativeModifiers = CGEventFlags(nativeModifiers | kCGEventFlagMaskAlternate); nativeModifiers = CGEventFlags(nativeModifiers | optionMod);
} }
if (modifiers & Qt::MetaModifier) { if (modifiers & Qt::MetaModifier) {
nativeModifiers = CGEventFlags(nativeModifiers | kCGEventFlagMaskControl); nativeModifiers = CGEventFlags(nativeModifiers | controlMod);
} }
return nativeModifiers; return nativeModifiers;
} }
/** //
* Get window layer / level // Get window layer/level
* //
* @param window macOS window ref
* @returns layer number or -1 if window not found
*/
int AutoTypePlatformMac::windowLayer(CFDictionaryRef window) int AutoTypePlatformMac::windowLayer(CFDictionaryRef window)
{ {
int layer; int layer;
auto layerRef = static_cast<CFNumberRef>(::CFDictionaryGetValue(window, kCGWindowLayer)); CFNumberRef layerRef = static_cast<CFNumberRef>(::CFDictionaryGetValue(window, kCGWindowLayer));
if (layerRef && ::CFNumberGetValue(layerRef, kCFNumberIntType, &layer)) { if (layerRef != nullptr
&& ::CFNumberGetValue(layerRef, kCFNumberIntType, &layer)) {
return layer; return layer;
} }
return -1; return -1;
} }
/** //
* Get window title for macOS window ref // Get window title
* //
* @param window macOS window ref
* @returns window title if found
*/
QString AutoTypePlatformMac::windowTitle(CFDictionaryRef window) QString AutoTypePlatformMac::windowTitle(CFDictionaryRef window)
{ {
char buffer[MAX_WINDOW_TITLE_LENGTH]; char buffer[MAX_WINDOW_TITLE_LENGTH];
QString title; QString title;
auto titleRef = static_cast<CFStringRef>(::CFDictionaryGetValue(window, kCGWindowName)); CFStringRef titleRef = static_cast<CFStringRef>(::CFDictionaryGetValue(window, kCGWindowName));
if (titleRef && ::CFStringGetCString(titleRef, buffer, MAX_WINDOW_TITLE_LENGTH, kCFStringEncodingUTF8)) { if (titleRef != nullptr
&& ::CFStringGetCString(titleRef, buffer, MAX_WINDOW_TITLE_LENGTH, kCFStringEncodingUTF8)) {
title = QString::fromUtf8(buffer); title = QString::fromUtf8(buffer);
} }
return title; return title;
} }
//
// Carbon hotkey handler
//
OSStatus AutoTypePlatformMac::hotkeyHandler(EventHandlerCallRef nextHandler, EventRef theEvent, void* userData)
{
Q_UNUSED(nextHandler);
AutoTypePlatformMac* self = static_cast<AutoTypePlatformMac*>(userData);
EventHotKeyID hotkeyId;
if (::GetEventParameter(theEvent, kEventParamDirectObject, typeEventHotKeyID, nullptr, sizeof(hotkeyId), nullptr, &hotkeyId) == noErr
&& hotkeyId.id == HOTKEY_ID) {
emit self->globalShortcutTriggered();
}
return noErr;
}
// //
// ------------------------------ AutoTypeExecutorMac ------------------------------ // ------------------------------ AutoTypeExecutorMac ------------------------------
// //
@ -511,7 +502,7 @@ void AutoTypeExecutorMac::execKey(AutoTypeKey* action)
m_platform->sendKey(action->key, false); m_platform->sendKey(action->key, false);
} }
void AutoTypeExecutorMac::execClearField(AutoTypeClearField* action) void AutoTypeExecutorMac::execClearField(AutoTypeClearField* action = nullptr)
{ {
Q_UNUSED(action); Q_UNUSED(action);

17
src/autotype/mac/AutoTypeMac.h
View File

@ -19,12 +19,12 @@
#ifndef KEEPASSX_AUTOTYPEMAC_H #ifndef KEEPASSX_AUTOTYPEMAC_H
#define KEEPASSX_AUTOTYPEMAC_H #define KEEPASSX_AUTOTYPEMAC_H
#include <ApplicationServices/ApplicationServices.h> #include <Carbon/Carbon.h>
#include <QtPlugin> #include <QtPlugin>
#include <memory> #include <memory>
#include "autotype/AutoTypeAction.h"
#include "autotype/AutoTypePlatformPlugin.h" #include "autotype/AutoTypePlatformPlugin.h"
#include "autotype/AutoTypeAction.h"
class AutoTypePlatformMac : public QObject, public AutoTypePlatformInterface class AutoTypePlatformMac : public QObject, public AutoTypePlatformInterface
{ {
@ -48,19 +48,20 @@ public:
bool raiseOwnWindow() override; bool raiseOwnWindow() override;
void sendChar(const QChar& ch, bool isKeyDown); void sendChar(const QChar& ch, bool isKeyDown);
void sendKey(Qt::Key key, bool isKeyDown, Qt::KeyboardModifiers modifiers = 0); void sendKey(Qt::Key key, bool isKeyDown, Qt::KeyboardModifiers modifiers);
signals: signals:
void globalShortcutTriggered(); void globalShortcutTriggered();
private: private:
static void hotkeyHandler(void* userData); EventHotKeyRef m_hotkeyRef;
static CGKeyCode qtToNativeKeyCode(Qt::Key key); EventHotKeyID m_hotkeyId;
static CGEventFlags qtToNativeModifiers(Qt::KeyboardModifiers modifiers);
static uint16 qtToNativeKeyCode(Qt::Key key);
static CGEventFlags qtToNativeModifiers(Qt::KeyboardModifiers modifiers, bool native);
static int windowLayer(CFDictionaryRef window); static int windowLayer(CFDictionaryRef window);
static QString windowTitle(CFDictionaryRef window); static QString windowTitle(CFDictionaryRef window);
static OSStatus hotkeyHandler(EventHandlerCallRef nextHandler, EventRef theEvent, void* userData);
void* m_globalMonitor;
}; };
class AutoTypeExecutorMac : public AutoTypeExecutor class AutoTypeExecutorMac : public AutoTypeExecutor

160
src/autotype/mac/AutoTypeMacKeyCodes.h
View File

@ -1,160 +0,0 @@
//
// Taken from HIToolbox/Events.h
//
/*
* Summary:
* Virtual keycodes
*
* Discussion:
* These constants are the virtual keycodes defined originally in
* Inside Mac Volume V, pg. V-191. They identify physical keys on a
* keyboard. Those constants with "ANSI" in the name are labeled
* according to the key position on an ANSI-standard US keyboard.
* For example, kVK_ANSI_A indicates the virtual keycode for the key
* with the letter 'A' in the US keyboard layout. Other keyboard
* layouts may have the 'A' key label on a different physical key;
* in this case, pressing 'A' will generate a different virtual
* keycode.
*/
#ifndef KEEPASSXC_AUTOTYPEMAC_KEYCODES_H
#define KEEPASSXC_AUTOTYPEMAC_KEYCODES_H
// clang-format off
enum {
kVK_ANSI_A = 0x00,
kVK_ANSI_S = 0x01,
kVK_ANSI_D = 0x02,
kVK_ANSI_F = 0x03,
kVK_ANSI_H = 0x04,
kVK_ANSI_G = 0x05,
kVK_ANSI_Z = 0x06,
kVK_ANSI_X = 0x07,
kVK_ANSI_C = 0x08,
kVK_ANSI_V = 0x09,
kVK_ANSI_B = 0x0B,
kVK_ANSI_Q = 0x0C,
kVK_ANSI_W = 0x0D,
kVK_ANSI_E = 0x0E,
kVK_ANSI_R = 0x0F,
kVK_ANSI_Y = 0x10,
kVK_ANSI_T = 0x11,
kVK_ANSI_1 = 0x12,
kVK_ANSI_2 = 0x13,
kVK_ANSI_3 = 0x14,
kVK_ANSI_4 = 0x15,
kVK_ANSI_6 = 0x16,
kVK_ANSI_5 = 0x17,
kVK_ANSI_Equal = 0x18,
kVK_ANSI_9 = 0x19,
kVK_ANSI_7 = 0x1A,
kVK_ANSI_Minus = 0x1B,
kVK_ANSI_8 = 0x1C,
kVK_ANSI_0 = 0x1D,
kVK_ANSI_RightBracket = 0x1E,
kVK_ANSI_O = 0x1F,
kVK_ANSI_U = 0x20,
kVK_ANSI_LeftBracket = 0x21,
kVK_ANSI_I = 0x22,
kVK_ANSI_P = 0x23,
kVK_ANSI_L = 0x25,
kVK_ANSI_J = 0x26,
kVK_ANSI_Quote = 0x27,
kVK_ANSI_K = 0x28,
kVK_ANSI_Semicolon = 0x29,
kVK_ANSI_Backslash = 0x2A,
kVK_ANSI_Comma = 0x2B,
kVK_ANSI_Slash = 0x2C,
kVK_ANSI_N = 0x2D,
kVK_ANSI_M = 0x2E,
kVK_ANSI_Period = 0x2F,
kVK_ANSI_Grave = 0x32,
kVK_ANSI_KeypadDecimal = 0x41,
kVK_ANSI_KeypadMultiply = 0x43,
kVK_ANSI_KeypadPlus = 0x45,
kVK_ANSI_KeypadClear = 0x47,
kVK_ANSI_KeypadDivide = 0x4B,
kVK_ANSI_KeypadEnter = 0x4C,
kVK_ANSI_KeypadMinus = 0x4E,
kVK_ANSI_KeypadEquals = 0x51,
kVK_ANSI_Keypad0 = 0x52,
kVK_ANSI_Keypad1 = 0x53,
kVK_ANSI_Keypad2 = 0x54,
kVK_ANSI_Keypad3 = 0x55,
kVK_ANSI_Keypad4 = 0x56,
kVK_ANSI_Keypad5 = 0x57,
kVK_ANSI_Keypad6 = 0x58,
kVK_ANSI_Keypad7 = 0x59,
kVK_ANSI_Keypad8 = 0x5B,
kVK_ANSI_Keypad9 = 0x5C
};
/* keycodes for keys that are independent of keyboard layout*/
enum {
kVK_Return = 0x24,
kVK_Tab = 0x30,
kVK_Space = 0x31,
kVK_Delete = 0x33,
kVK_Escape = 0x35,
kVK_Command = 0x37,
kVK_Shift = 0x38,
kVK_CapsLock = 0x39,
kVK_Option = 0x3A,
kVK_Control = 0x3B,
kVK_RightCommand = 0x36,
kVK_RightShift = 0x3C,
kVK_RightOption = 0x3D,
kVK_RightControl = 0x3E,
kVK_Function = 0x3F,
kVK_F17 = 0x40,
kVK_VolumeUp = 0x48,
kVK_VolumeDown = 0x49,
kVK_Mute = 0x4A,
kVK_F18 = 0x4F,
kVK_F19 = 0x50,
kVK_F20 = 0x5A,
kVK_F5 = 0x60,
kVK_F6 = 0x61,
kVK_F7 = 0x62,
kVK_F3 = 0x63,
kVK_F8 = 0x64,
kVK_F9 = 0x65,
kVK_F11 = 0x67,
kVK_F13 = 0x69,
kVK_F16 = 0x6A,
kVK_F14 = 0x6B,
kVK_F10 = 0x6D,
kVK_F12 = 0x6F,
kVK_F15 = 0x71,
kVK_Help = 0x72,
kVK_Home = 0x73,
kVK_PageUp = 0x74,
kVK_ForwardDelete = 0x75,
kVK_F4 = 0x76,
kVK_End = 0x77,
kVK_F2 = 0x78,
kVK_PageDown = 0x79,
kVK_F1 = 0x7A,
kVK_LeftArrow = 0x7B,
kVK_RightArrow = 0x7C,
kVK_DownArrow = 0x7D,
kVK_UpArrow = 0x7E
};
/* ISO keyboards only*/
enum {
kVK_ISO_Section = 0x0A
};
/* JIS keyboards only*/
enum {
kVK_JIS_Yen = 0x5D,
kVK_JIS_Underscore = 0x5E,
kVK_JIS_KeypadComma = 0x5F,
kVK_JIS_Eisu = 0x66,
kVK_JIS_Kana = 0x68
};
// clang-format on
#endif

2
src/autotype/mac/CMakeLists.txt
View File

@ -1,7 +1,7 @@
set(autotype_mac_SOURCES AutoTypeMac.cpp) set(autotype_mac_SOURCES AutoTypeMac.cpp)
add_library(keepassx-autotype-cocoa MODULE ${autotype_mac_SOURCES}) add_library(keepassx-autotype-cocoa MODULE ${autotype_mac_SOURCES})
set_target_properties(keepassx-autotype-cocoa PROPERTIES LINK_FLAGS "-framework Foundation -framework AppKit") set_target_properties(keepassx-autotype-cocoa PROPERTIES LINK_FLAGS "-framework Foundation -framework AppKit -framework Carbon")
target_link_libraries(keepassx-autotype-cocoa ${PROGNAME} Qt5::Core Qt5::Widgets) target_link_libraries(keepassx-autotype-cocoa ${PROGNAME} Qt5::Core Qt5::Widgets)
if(WITH_APP_BUNDLE) if(WITH_APP_BUNDLE)

4
src/gui/macutils/AppKit.h
View File

@ -20,7 +20,7 @@
#define KEEPASSX_APPKIT_H #define KEEPASSX_APPKIT_H
#include <QObject> #include <QObject>
#include <CoreGraphics/CGEvent.h> #include <unistd.h>
class AppKit : public QObject class AppKit : public QObject
{ {
@ -37,8 +37,6 @@ public:
bool hideProcess(pid_t pid); bool hideProcess(pid_t pid);
bool isHidden(pid_t pid); bool isHidden(pid_t pid);
bool isDarkMode(); bool isDarkMode();
void* addGlobalMonitor(CGKeyCode keycode, CGEventFlags modifier, void* userData, void (*handler)(void*));
void removeGlobalMonitor(void* monitor);
bool enableAccessibility(); bool enableAccessibility();
signals: signals:

3
src/gui/macutils/AppKitImpl.h
View File

@ -19,7 +19,6 @@
#import "AppKit.h" #import "AppKit.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <AppKit/NSEvent.h>
#import <AppKit/NSRunningApplication.h> #import <AppKit/NSRunningApplication.h>
@interface AppKitImpl : NSObject @interface AppKitImpl : NSObject
@ -37,8 +36,6 @@
- (bool) isHidden:(pid_t) pid; - (bool) isHidden:(pid_t) pid;
- (bool) isDarkMode; - (bool) isDarkMode;
- (void) userSwitchHandler:(NSNotification*) notification; - (void) userSwitchHandler:(NSNotification*) notification;
- (id) addGlobalMonitor:(NSEventMask) mask handler:(void (^)(NSEvent*)) handler;
- (void) removeGlobalMonitor:(id) monitor;
- (bool) enableAccessibility; - (bool) enableAccessibility;
@end @end

30
src/gui/macutils/AppKitImpl.mm
View File

@ -123,22 +123,6 @@ static const NSEventMask NSEventMaskKeyDown = NSKeyDownMask;
} }
} }
//
// Add global event monitor
//
- (id) addGlobalMonitor:(NSEventMask) mask handler:(void (^)(NSEvent*)) handler
{
return [NSEvent addGlobalMonitorForEventsMatchingMask:mask handler:handler];
}
//
// Remove global event monitor
//
- (void) removeGlobalMonitor:(id) monitor
{
[NSEvent removeMonitor:monitor];
}
// //
// Check if accessibility is enabled, may show an popup asking for permissions // Check if accessibility is enabled, may show an popup asking for permissions
// //
@ -211,20 +195,6 @@ bool AppKit::isDarkMode()
return [static_cast<id>(self) isDarkMode]; return [static_cast<id>(self) isDarkMode];
} }
void* AppKit::addGlobalMonitor(CGKeyCode keycode, CGEventFlags modifier, void* userData, void (*handler)(void*))
{
return [static_cast<id>(self) addGlobalMonitor:NSEventMaskKeyDown handler:^(NSEvent* event) {
if (event.keyCode == keycode && (event.modifierFlags & modifier) == modifier) {
handler(userData);
}
}];
}
void AppKit::removeGlobalMonitor(void* monitor)
{
[static_cast<id>(self) removeGlobalMonitor:static_cast<id>(monitor)];
}
bool AppKit::enableAccessibility() bool AppKit::enableAccessibility()
{ {
return [static_cast<id>(self) enableAccessibility]; return [static_cast<id>(self) enableAccessibility];

14
src/gui/macutils/MacUtils.cpp
View File

@ -21,7 +21,8 @@
MacUtils* MacUtils::m_instance = nullptr; MacUtils* MacUtils::m_instance = nullptr;
MacUtils::MacUtils(QObject* parent) : QObject(parent) MacUtils::MacUtils(QObject* parent)
: QObject(parent)
, m_appkit(new AppKit()) , m_appkit(new AppKit())
{ {
connect(m_appkit.data(), SIGNAL(lockDatabases()), SIGNAL(lockDatabases())); connect(m_appkit.data(), SIGNAL(lockDatabases()), SIGNAL(lockDatabases()));
@ -29,7 +30,6 @@ MacUtils::MacUtils(QObject* parent) : QObject(parent)
MacUtils::~MacUtils() MacUtils::~MacUtils()
{ {
} }
MacUtils* MacUtils::instance() MacUtils* MacUtils::instance()
@ -76,16 +76,6 @@ bool MacUtils::isDarkMode()
return m_appkit->isDarkMode(); return m_appkit->isDarkMode();
} }
void* MacUtils::addGlobalMonitor(CGKeyCode keycode, CGEventFlags modifier, void* userData, void (*handler)(void*))
{
return m_appkit->addGlobalMonitor(keycode, modifier, userData, handler);
}
void MacUtils::removeGlobalMonitor(void* monitor)
{
m_appkit->removeGlobalMonitor(monitor);
}
bool MacUtils::enableAccessibility() bool MacUtils::enableAccessibility()
{ {
return m_appkit->enableAccessibility(); return m_appkit->enableAccessibility();

4
src/gui/macutils/MacUtils.h
View File

@ -19,9 +19,9 @@
#ifndef KEEPASSXC_MACUTILS_H #ifndef KEEPASSXC_MACUTILS_H
#define KEEPASSXC_MACUTILS_H #define KEEPASSXC_MACUTILS_H
#include "AppKit.h"
#include <QObject> #include <QObject>
#include <QWidget> #include <QWidget>
#include "AppKit.h"
class MacUtils : public QObject class MacUtils : public QObject
{ {
@ -38,8 +38,6 @@ public:
bool hideOwnWindow(); bool hideOwnWindow();
bool isHidden(); bool isHidden();
bool isDarkMode(); bool isDarkMode();
void* addGlobalMonitor(CGKeyCode keycode, CGEventFlags modifier, void* userData, void (*handler)(void*));
void removeGlobalMonitor(void* monitor);
bool enableAccessibility(); bool enableAccessibility();
signals: signals: