Browse Source

libobs: Add more X.org / Unix hotkey defines

René Rebe 6 years ago
parent
commit
fcbe593134
2 changed files with 30 additions and 0 deletions
  1. 7 0
      libobs/obs-hotkeys.h
  2. 23 0
      libobs/obs-nix.c

+ 7 - 0
libobs/obs-hotkeys.h

@@ -476,3 +476,10 @@ OBS_MOUSE_BUTTON(OBS_KEY_MOUSE29)
 #endif
 #endif
 
 
 OBS_HOTKEY(OBS_KEY_BACKSLASH_RT102)
 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 - 0
libobs/obs-nix.c

@@ -35,6 +35,8 @@
 #include <X11/Xlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xutil.h>
 #include <X11/Xlib-xcb.h>
 #include <X11/Xlib-xcb.h>
+#include <X11/XF86keysym.h>
+#include <X11/Sunkeysym.h>
 #include <inttypes.h>
 #include <inttypes.h>
 
 
 const char *get_module_extension(void)
 const char *get_module_extension(void)
@@ -501,9 +503,30 @@ static int get_keysym(obs_key_t key)
 		return XK_Hyper_R;
 		return XK_Hyper_R;
 	case OBS_KEY_HELP:
 	case OBS_KEY_HELP:
 		return XK_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:
 	case OBS_KEY_SPACE:
 		return XK_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:
 	case OBS_KEY_EXCLAM:
 		return XK_exclam;
 		return XK_exclam;
 	case OBS_KEY_QUOTEDBL:
 	case OBS_KEY_QUOTEDBL: