OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-08 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Add local event monitor for hotkey thread

Browse source 
To avoid a mismatch between the state of pressed keys as held by the
hotkey thread and keys pressed while the application is in focus, local
key events need to be monitored as well (even though they are already
handled by Cocoa's main event loop).
This commit is contained in:
PatTheMav 2023-08-04 19:52:51 +02:00 committed by Lain
parent d00068cb6c
commit 1b194c8ebd
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libobs/obs-cocoa.m
View file

@ -160,6 +160,7 @@ static bool dstr_from_cfstring(struct dstr *str, CFStringRef ref)
struct obs_hotkeys_platform {
volatile long refs;
CFTypeRef monitor;
CFTypeRef local_monitor;
bool is_key_down[OBS_KEY_LAST_VALUE];
TISInputSourceRef tis;
CFDataRef layout_data;
@ -674,6 +675,16 @@ static bool init_hotkeys_platform(obs_hotkeys_platform_t **plat_)
[NSEvent addGlobalMonitorForEventsMatchingMask:NSEventMaskKeyDown | NSEventMaskKeyUp | NSEventMaskFlagsChanged
handler:handler];
NSEvent *_Nullable (^local_handler)(NSEvent *event) = ^NSEvent *_Nullable(NSEvent *event)
{
handle_monitor_event(plat, event);
return event;
};
plat->local_monitor = (__bridge CFTypeRef)
[NSEvent addLocalMonitorForEventsMatchingMask:NSEventMaskKeyDown | NSEventMaskKeyUp | NSEventMaskFlagsChanged
handler:local_handler];
plat->tis = TISCopyCurrentKeyboardLayoutInputSource();
plat->layout_data = (CFDataRef) TISGetInputSourceProperty(plat->tis, kTISPropertyUnicodeKeyLayoutData);
@ -699,10 +710,15 @@ static inline void free_hotkeys_platform(obs_hotkeys_platform_t *plat)
return;
if (plat->monitor) {
CFRelease(plat->monitor);
[NSEvent removeMonitor:(__bridge id _Nonnull)(plat->monitor)];
plat->monitor = NULL;
}
if (plat->local_monitor) {
[NSEvent removeMonitor:(__bridge id _Nonnull)(plat->local_monitor)];
plat->local_monitor = NULL;
}
if (plat->tis) {
CFRelease(plat->tis);
plat->tis = NULL;