Freetype: fallback to arial.ttf on Win32

[vlc] / include / vlc_keys.h

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index 1a0b29f5bda0ce0254c3f20711e29f44a81bd10b..0a28db3f0f3fa30f69faa268d09f6e17d637b32a 100644 (file)
--- a/include/vlc_keys.h
+++ b/include/vlc_keys.h
@@ -37,12 +37,15 @@
 #define KEY_MODIFIER_COMMAND 0x10000000
 
 #define KEY_UNSET            0x00000000
+#define KEY_BACKSPACE              0x08
+#define KEY_TAB                    0x09
+#define KEY_ENTER                  0x0D
+#define KEY_ESC                    0x1B
 /* End of Unicode range:     0x0010FFFF */
 #define KEY_LEFT             0x00210000
 #define KEY_RIGHT            0x00220000
 #define KEY_UP               0x00230000
 #define KEY_DOWN             0x00240000
-#define KEY_ENTER            0x00260000
 #define KEY_F1               0x00270000
 #define KEY_F2               0x00280000
 #define KEY_F3               0x00290000
@@ -60,11 +63,8 @@
 #define KEY_INSERT           0x00350000
 #define KEY_DELETE           0x00360000
 #define KEY_MENU             0x00370000
-#define KEY_ESC              0x00380000
 #define KEY_PAGEUP           0x00390000
 #define KEY_PAGEDOWN         0x003A0000
-#define KEY_TAB              0x003B0000
-#define KEY_BACKSPACE        0x003C0000
 
 #define KEY_BROWSER_BACK     0x003F0000
 #define KEY_BROWSER_FORWARD  0x00400000
@@ -86,11 +86,12 @@
 #define KEY_MOUSEWHEELLEFT   0x00F20000
 #define KEY_MOUSEWHEELRIGHT  0x00F30000
 
-VLC_EXPORT( char *, KeyToString, (uint_fast32_t i_key) ) LIBVLC_USED;
-VLC_EXPORT( uint_fast32_t, StringToKey,  (char *psz_key) ) LIBVLC_USED;
+VLC_API char *vlc_keycode2str(uint_fast32_t i_key) VLC_USED;
+VLC_API uint_fast32_t vlc_str2keycode(const char *str) VLC_USED;
 
-typedef enum vlc_key {
-    ACTIONID_QUIT = 1,
+typedef enum vlc_action {
+    ACTIONID_NONE = 0,
+    ACTIONID_QUIT,
     ACTIONID_PLAY_PAUSE,
     ACTIONID_PLAY,
     ACTIONID_PAUSE,
@@ -144,14 +145,11 @@ typedef enum vlc_key {
     ACTIONID_SUBDELAY_DOWN,
     ACTIONID_SUBPOS_UP,
     ACTIONID_SUBPOS_DOWN,
-    ACTIONID_HISTORY_BACK,
-    ACTIONID_HISTORY_FORWARD,
     ACTIONID_AUDIO_TRACK,
     ACTIONID_SUBTITLE_TRACK,
-    ACTIONID_CUBESPEED_UP,
-    ACTIONID_CUBESPEED_DOWN,
-    ACTIONID_INTF_SHOW,
+    ACTIONID_INTF_TOGGLE_FSC,
     ACTIONID_INTF_HIDE,
+    ACTIONID_INTF_BOSS,
     /* chapter and title navigation */
     ACTIONID_TITLE_PREV,
     ACTIONID_TITLE_NEXT,
@@ -176,7 +174,6 @@ typedef enum vlc_key {
     ACTIONID_UNCROP_BOTTOM,
     ACTIONID_CROP_RIGHT,
     ACTIONID_UNCROP_RIGHT,
-    ACTIONID_DUMP,
     ACTIONID_RANDOM,
     ACTIONID_LOOP,
     ACTIONID_WALLPAPER,
@@ -204,8 +201,13 @@ typedef enum vlc_key {
     ACTIONID_RATE_SLOWER_FINE,
     ACTIONID_RATE_FASTER_FINE,
 
-} vlc_key_t;
+} vlc_action_t;
 
-VLC_EXPORT( vlc_key_t, vlc_GetActionId, (const char *psz_key) ) LIBVLC_USED;
+VLC_API vlc_action_t vlc_GetActionId(const char *psz_key) VLC_USED;
+
+struct hotkey
+{
+    const char *psz_action;
+};
 
 #endif