From: Eric Petit <titer@videolan.org>
Date: Mon, 6 Sep 2004 21:28:07 +0000 (+0000)
Subject:  Fixed OpenGL mouse events
X-Git-Tag: 0.8.0~459
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=06a696f88681b66c7fa26810594a25747c7afbfb;p=vlc

 Fixed OpenGL mouse events
---

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 2f63f3fc26..34990bc1a5 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -197,9 +197,13 @@ static int CreateVout( vlc_object_t *p_this )
     p_vout->pf_display = DisplayVideo;
     p_vout->pf_control = Control;
 
-    var_Create( p_sys->p_vout, "video-on-top", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
     /* Forward events from the opengl provider */
+    var_Create( p_sys->p_vout, "mouse-x", VLC_VAR_INTEGER );
+    var_Create( p_sys->p_vout, "mouse-y", VLC_VAR_INTEGER );
+    var_Create( p_sys->p_vout, "mouse-moved", VLC_VAR_BOOL );
+    var_Create( p_sys->p_vout, "mouse-clicked", VLC_VAR_INTEGER );
+    var_Create( p_sys->p_vout, "video-on-top", VLC_VAR_BOOL );
+
     var_AddCallback( p_sys->p_vout, "mouse-x", SendEvents, p_vout );
     var_AddCallback( p_sys->p_vout, "mouse-y", SendEvents, p_vout );
     var_AddCallback( p_sys->p_vout, "mouse-moved", SendEvents, p_vout );
diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 6507c3a909..77ff92ce97 100644
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -223,13 +223,6 @@ void vout_IntfInit( vout_thread_t *p_vout )
     }
     var_AddCallback( p_vout, "fullscreen", FullscreenCallback, NULL );
 
-    /* Mouse coordinates */
-    var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
-    var_Create( p_vout, "mouse-y", VLC_VAR_INTEGER );
-    var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
-    var_Create( p_vout, "mouse-moved", VLC_VAR_BOOL );
-    var_Create( p_vout, "mouse-clicked", VLC_VAR_INTEGER );
-
     var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
     val.b_bool = VLC_TRUE;
     var_Set( p_vout, "intf-change", val );