jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1927 from rxrbln/master

Browse Source 
Just a couple of more X.org / Unix hotkey defines.
This commit is contained in:
Jim 2019-11-10 06:33:22 -08:00 committed by GitHub
commit 8703c85d76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libobs/obs-hotkeys.h
View File

@ -476,3 +476,10 @@ OBS_MOUSE_BUTTON(OBS_KEY_MOUSE29)
#endif
OBS_HOTKEY(OBS_KEY_BACKSLASH_RT102)
OBS_HOTKEY(OBS_KEY_OPEN)
OBS_HOTKEY(OBS_KEY_FIND)
OBS_HOTKEY(OBS_KEY_REDO)
OBS_HOTKEY(OBS_KEY_UNDO)
OBS_HOTKEY(OBS_KEY_FRONT)
OBS_HOTKEY(OBS_KEY_PROPS)

23
libobs/obs-nix.c
View File

@ -35,6 +35,8 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xlib-xcb.h>
#include <X11/XF86keysym.h>
#include <X11/Sunkeysym.h>
#include <inttypes.h>
const char *get_module_extension(void)
@ -501,9 +503,30 @@ static int get_keysym(obs_key_t key)
return XK_Hyper_R;
case OBS_KEY_HELP:
return XK_Help;
case OBS_KEY_CANCEL:
return XK_Cancel;
case OBS_KEY_FIND:
return XK_Find;
case OBS_KEY_REDO:
return XK_Redo;
case OBS_KEY_UNDO:
return XK_Undo;
case OBS_KEY_SPACE:
return XK_space;
case OBS_KEY_COPY:
return XF86XK_Copy;
case OBS_KEY_CUT:
return XF86XK_Cut;
case OBS_KEY_OPEN:
return XF86XK_Open;
case OBS_KEY_PASTE:
return XF86XK_Paste;
case OBS_KEY_FRONT:
return SunXK_Front;
case OBS_KEY_PROPS:
return SunXK_Props;
case OBS_KEY_EXCLAM:
return XK_exclam;
case OBS_KEY_QUOTEDBL: