[vlc-commits] hotkeys: handle FSC toggling

Rémi Denis-Courmont git at videolan.org
Thu May 31 20:45:39 CEST 2018


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May 31 20:56:19 2018 +0300| [0dbffe88b70a88efb11631dcc105a444b049d919] | committer: Rémi Denis-Courmont

hotkeys: handle FSC toggling

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0dbffe88b70a88efb11631dcc105a444b049d919
---

 modules/control/hotkeys.c | 6 +++++-
 src/video_output/event.h  | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c
index 70d4286a6c..fe062ca8a6 100644
--- a/modules/control/hotkeys.c
+++ b/modules/control/hotkeys.c
@@ -154,7 +154,7 @@ static int ButtonEvent( vlc_object_t *p_this, char const *psz_var,
     intf_thread_t *p_intf = p_data;
     intf_sys_t *p_sys = p_intf->p_sys;
 
-    (void) psz_var; (void) oldval;
+    (void) psz_var;
 
     if (newval.i_int & (1 << MOUSE_BUTTON_LEFT))
     {
@@ -168,6 +168,10 @@ static int ButtonEvent( vlc_object_t *p_this, char const *psz_var,
     else
         p_sys->vrnav.b_button_pressed = false;
 
+    if ((newval.i_int & (1 << MOUSE_BUTTON_CENTER))
+     && !(oldval.i_int & (1 << MOUSE_BUTTON_CENTER)))
+        var_ToggleBool(p_intf->obj.libvlc, "intf-toggle-fscontrol");
+
     return VLC_SUCCESS;
 }
 
diff --git a/src/video_output/event.h b/src/video_output/event.h
index 63323fc719..a3727d2f06 100644
--- a/src/video_output/event.h
+++ b/src/video_output/event.h
@@ -70,7 +70,6 @@ static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
         return;
     }
     case MOUSE_BUTTON_CENTER:
-        var_ToggleBool(vout->obj.libvlc, "intf-toggle-fscontrol");
         return;
     case MOUSE_BUTTON_RIGHT:
 #if !defined(_WIN32)



More information about the vlc-commits mailing list