Use var_Inherit* instead of var_CreateGet*.

[vlc] / src / video_output / event.h

diff --git a/src/video_output/event.h b/src/video_output/event.h
index bf9087c1633538230f9b6b2ce0585a5631c9a12a..0cb1042c556d8a2ee639925774c994e2d800ec4e 100644 (file)
--- a/src/video_output/event.h
+++ b/src/video_output/event.h
@@ -56,9 +56,7 @@ static inline void vout_SendEventKey(vout_thread_t *vout, int key)
 }
 static inline void vout_SendEventMouseMoved(vout_thread_t *vout, int x, int y)
 {
-    var_SetInteger(vout, "mouse-x", x);
-    var_SetInteger(vout, "mouse-y", y);
-    var_TriggerCallback(vout, "mouse-moved");
+    var_SetCoords(vout, "mouse-moved", x, y);
 }
 static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
 {
@@ -67,15 +65,26 @@ static inline void vout_SendEventMousePressed(vout_thread_t *vout, int button)
     switch (button)
     {
     case MOUSE_BUTTON_LEFT:
-                var_SetBool(vout, "mouse-clicked", true);
+    {
+        /* FIXME? */
+        int x, y;
+        var_GetCoords(vout, "mouse-moved", &x, &y);
+        var_SetCoords(vout, "mouse-clicked", x, y);
         var_SetBool(vout->p_libvlc, "intf-popupmenu", false);
         break;
+    }
     case MOUSE_BUTTON_CENTER:
         var_ToggleBool(vout->p_libvlc, "intf-show");
         break;
     case MOUSE_BUTTON_RIGHT:
         var_SetBool(vout->p_libvlc, "intf-popupmenu", true);
         break;
+    case MOUSE_BUTTON_WHEEL_UP:
+        vout_SendEventKey(vout, KEY_MOUSEWHEELUP);
+        break;
+    case MOUSE_BUTTON_WHEEL_DOWN:
+        vout_SendEventKey(vout, KEY_MOUSEWHEELDOWN);
+        break;
     }
 }
 static inline void vout_SendEventMouseReleased(vout_thread_t *vout, int button)