Changeset 9d6f096a15a4e7d1b84d40b0c4e0a7ae65e45fdd

Timestamp:

05/14/07 15:52:33 (1 year ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1179150753 +0000

git-parent:

[6f0954b727fec5bcea9ac0483900e58fc51e3ddc]

git-author:

Damien Fouilleul <damienf@videolan.org> 1179150753 +0000

Message:

- hotkeys: leave full screenscreen hotkey (defaulted to ESC), patch by Sergey Volk

Files:

• include/vlc_keys.h (modified) (2 diffs)
• modules/control/hotkeys.c (modified) (2 diffs)
• src/libvlc-module.c (modified) (5 diffs)

include/vlc_keys.h

@@ -231 +231 @@
-#define ACTIONID_SLOWER                8
-#define ACTIONID_FASTER                9
-FULLSCREEN       
+TOGGLE_FULLSCREEN
-#define ACTIONID_VOL_UP                11
-#define ACTIONID_VOL_DOWN              12
@@ -309 +309 @@
-#define ACTIONID_LOOP                  82
-#define ACTIONID_WALLPAPER             83
+#define ACTIONID_LEAVE_FULLSCREEN      84

modules/control/hotkeys.c

@@ -284 +284 @@
-            if( p_vout ) vout_Control( p_vout, VOUT_SNAPSHOT );
-        }
-
+TOGGLE_
-        {
-            if( p_vout )
@@ -297 +297 @@
-                val.b_bool = !val.b_bool;
-                var_Set( p_playlist, "fullscreen", val );
+            }
+        }
+        else if( i_action == ACTIONID_LEAVE_FULLSCREEN )
+        {
+            if( p_vout && var_GetBool( p_vout, "fullscreen" ) )
+            {
+                var_SetBool( p_vout, "fullscreen", VLC_FALSE );
-            }
-        }

src/libvlc-module.c

@@ -1022 +1022 @@
-    "bindings, known as \"hotkeys\"." )
-
-
-
+
+
+
+
-#define PLAY_PAUSE_KEY_TEXT N_("Play/Pause")
-#define PLAY_PAUSE_KEY_LONGTEXT N_("Select the hotkey to use to swap paused state.")
@@ -1808 +1810 @@
- *  help                          KEY_MODIFIER_COMMAND|'?'
- */
-
+
+
-#   define KEY_PLAY_PAUSE         KEY_MODIFIER_COMMAND|'p'
-#   define KEY_PAUSE              KEY_UNSET
@@ -1893 +1896 @@
-
-#else
-
+
+
-#   define KEY_PLAY_PAUSE         KEY_SPACE
-#   define KEY_PAUSE              KEY_UNSET
@@ -1979 +1983 @@
-#endif
-
-
-
+
+
+
+
-    add_key( "key-play-pause", KEY_PLAY_PAUSE, NULL, PLAY_PAUSE_KEY_TEXT,
-             PLAY_PAUSE_KEY_LONGTEXT, VLC_FALSE );
@@ -2286 +2292 @@
-    { "key-faster", ACTIONID_FASTER, 0, 0, 0, 0 },
-    { "key-slower", ACTIONID_SLOWER, 0, 0, 0, 0 },
-
+
+
-    { "key-vol-up", ACTIONID_VOL_UP, 0, 0, 0, 0 },
-    { "key-vol-down", ACTIONID_VOL_DOWN, 0, 0, 0, 0 },