Rename libvlc_MediaPlayerMouseObject to libvlc_MediaPlayerMouseGrab

- update activex
- update logo video_filter
- update video_output core
- update libvlc events and media_player

include/vlc/libvlc_events.h

@@ -74,7 +74,7 @@ enum libvlc_event_e {
     libvlc_MediaPlayerMouseMoved,
     libvlc_MediaPlayerMouseButton,
     libvlc_MediaPlayerMouseClick,
-    libvlc_MediaPlayerMouseObject,
+    libvlc_MediaPlayerMouseGrab,
 
     libvlc_MediaListItemAdded=0x200,
     libvlc_MediaListWillAddItem,
@@ -234,13 +234,15 @@ typedef struct libvlc_event_t
 
         struct
         {
-            int clicked;
+            int x;
+            int y;
         } media_player_mouse_clicked;
 
         struct
         {
-            int moved;
-        } media_player_mouse_object;
+            int x;
+            int y;
+        } media_player_mouse_grab;
 
     } u; /**< Type-dependent event description */
 } libvlc_event_t;

modules/video_filter/logo.c

@@ -544,8 +544,7 @@ static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse,
 
         if( p_sys->p_vout && p_sys->b_mouse_grab )
         {
-            /* mouse-object: area of interest */
-            var_SetBool( p_sys->p_vout, "mouse-object", true );
+            var_SetCoords( p_sys->p_vout, "mouse-grab", p_sys->i_pos_x, p_sys->i_pos_y );
         }
 
         if( p_sys->b_mouse_grab || b_over )

projects/activex/axvlc.idl

@@ -188,7 +188,7 @@ library AXVLC
     const int DISPID_MouseButtonEvent = 214;
     const int DISPID_MouseMovedEvent = 215;
     const int DISPID_MouseClickedEvent = 216;
-    const int DISPID_MouseObjectEvent = 217;
+    const int DISPID_MouseGrabEvent = 217;
 
     [
       uuid(DF48072F-5EF8-434e-9B40-E2F3AE759B5F),
@@ -243,9 +243,9 @@ library AXVLC
             [id(DISPID_MouseMovedEvent), helpstring("Mouse moved")]
             void MouseMoved([in] long x, [in] long y);
             [id(DISPID_MouseClickedEvent), helpstring("Mouse clicked")]
-            void MouseClicked([in] VARIANT_BOOL clicked);
-            [id(DISPID_MouseObjectEvent), helpstring("Mouse selected holds object")]
-            void MouseObject([in] VARIANT_BOOL moved);
+            void MouseClicked([in] long x, [in] long y);
+            [id(DISPID_MouseGrabEvent), helpstring("Mouse grabs object in video output")]
+            void MouseGrab([in] long x, [in] long y);
     };
 
     [

projects/activex/axvlc_idl.c

-/*** Autogenerated by WIDL 1.1.36 from axvlc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.1.38 from axvlc.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>

projects/activex/axvlc_idl.h

-/*** Autogenerated by WIDL 1.1.36 from axvlc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.1.38 from axvlc.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>
@@ -827,7 +827,7 @@ void __RPC_STUB IVLCControl_put_AutoLoop_Stub(
 
 #define DISPID_MouseClickedEvent (216)
 
-#define DISPID_MouseObjectEvent (217)
+#define DISPID_MouseGrabEvent (217)
 
 /*****************************************************************************
  * DVLCEvents dispinterface

projects/activex/plugin.cpp

@@ -1187,31 +1187,35 @@ void VLCPlugin::fireOnMouseButtonEvent(VARIANT_BOOL btn_right, VARIANT_BOOL btn_
 
 void VLCPlugin::fireOnMouseMovedEvent(long x, long y)
 {
-    VARIANT varMoved[2];
-    DISPPARAMS params = { varMoved, NULL, 3, 0 };
-    varMoved[0].vt = VT_INT;
-    varMoved[0].intVal = x;
-    varMoved[1].vt = VT_INT;
-    varMoved[1].intVal = y;
+    VARIANT varCoords[2];
+    DISPPARAMS params = { varCoords, NULL, 3, 0 };
+    varCoords[0].vt = VT_INT;
+    varCoords[0].intVal = x;
+    varCoords[1].vt = VT_INT;
+    varCoords[1].intVal = y;
     vlcConnectionPointContainer->fireEvent(DISPID_MouseMovedEvent, &params);
 };
 
-void VLCPlugin::fireOnMouseClickedEvent(VARIANT_BOOL clicked)
+void VLCPlugin::fireOnMouseClickedEvent(long x, long y)
 {
-    VARIANT varClicked;
-    DISPPARAMS params = { &varClicked, NULL, 1, 0 };
-    varClicked.vt = VT_BOOL;
-    varClicked.boolVal = clicked;
+    VARIANT varCoords[2];
+    DISPPARAMS params = { varCoords, NULL, 3, 0 };
+    varCoords[0].vt = VT_INT;
+    varCoords[0].intVal = x;
+    varCoords[1].vt = VT_INT;
+    varCoords[1].intVal = y;
     vlcConnectionPointContainer->fireEvent(DISPID_MouseClickedEvent, &params);
 };
 
-void VLCPlugin::fireOnMouseObjectEvent(VARIANT_BOOL moved)
+void VLCPlugin::fireOnMouseGrabEvent(long x, long y)
 {
-    VARIANT varMoved;
-    DISPPARAMS params = { &varMoved, NULL, 1, 0 };
-    varMoved.vt = VT_BOOL;
-    varMoved.boolVal = moved;
-    vlcConnectionPointContainer->fireEvent(DISPID_MouseObjectEvent, &params);
+    VARIANT varCoords[2];
+    DISPPARAMS params = { varCoords, NULL, 3, 0 };
+    varCoords[0].vt = VT_INT;
+    varCoords[0].intVal = x;
+    varCoords[1].vt = VT_INT;
+    varCoords[1].intVal = y;
+    vlcConnectionPointContainer->fireEvent(DISPID_MouseGrabEvent, &params);
 };
 
 #define B(val) ((val) ? 0xFFFF : 0x0000)
@@ -1227,6 +1231,7 @@ static void handle_mouse_button_pressed_event(const libvlc_event_t* event, void
     plugin->fireOnMouseButtonEvent(btn_right, btn_center, btn_left,
                                  btn_wheel_up, btn_wheel_down);
 }
+#undef B
 
 static void handle_mouse_moved_event(const libvlc_event_t* event, void *param)
 {
@@ -1238,15 +1243,16 @@ static void handle_mouse_moved_event(const libvlc_event_t* event, void *param)
 static void handle_mouse_clicked_event(const libvlc_event_t* event, void *param)
 {
     VLCPlugin *plugin = (VLCPlugin*)param;
-    plugin->fireOnMouseClickedEvent(B(event->u.media_player_mouse_clicked.clicked));
+    plugin->fireOnMouseClickedEvent(event->u.media_player_mouse_clicked.x,
+                                    event->u.media_player_mouse_clicked.y);
 }
 
-static void handle_mouse_object_event(const libvlc_event_t* event, void *param)
+static void handle_mouse_grab_event(const libvlc_event_t* event, void *param)
 {
     VLCPlugin *plugin = (VLCPlugin*)param;
-    plugin->fireOnMouseObjectEvent(B(event->u.media_player_mouse_object.moved));
+    plugin->fireOnMouseGrabEvent(event->u.media_player_mouse_grab.x,
+                                 event->u.media_player_mouse_grab.y);
 }
-#undef B
 
 /* */
 
@@ -1347,8 +1353,8 @@ void VLCPlugin::player_register_events()
                             handle_mouse_moved_event, this);
         libvlc_event_attach(eventManager, libvlc_MediaPlayerMouseClick,
                             handle_mouse_clicked_event, this);
-        libvlc_event_attach(eventManager, libvlc_MediaPlayerMouseObject,
-                            handle_mouse_object_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerMouseGrab,
+                            handle_mouse_grab_event, this);
     }
 }
 
@@ -1395,8 +1401,8 @@ void VLCPlugin::player_unregister_events()
                             handle_mouse_moved_event, this);
         libvlc_event_detach(eventManager, libvlc_MediaPlayerMouseClick,
                             handle_mouse_clicked_event, this);
-        libvlc_event_detach(eventManager, libvlc_MediaPlayerMouseObject,
-                            handle_mouse_object_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerMouseGrab,
+                            handle_mouse_grab_event, this);
     }
 }
 

projects/activex/plugin.h

@@ -259,8 +259,8 @@ public:
                 VARIANT_BOOL btn_left, VARIANT_BOOL btn_wheel_up,
                 VARIANT_BOOL bnt_wheel_down);
     void fireOnMouseMovedEvent(long x, long y);
-    void fireOnMouseClickedEvent(VARIANT_BOOL clicked);
-    void fireOnMouseObjectEvent(VARIANT_BOOL moved);
+    void fireOnMouseClickedEvent(long x, long y);
+    void fireOnMouseGrabEvent(long x, long y);
 
     // controlling IUnknown interface
     LPUNKNOWN pUnkOuter;

projects/activex/test.html

@@ -267,35 +267,21 @@ function handleMousePos(event,X,Y)
     document.getElementById("cursorTextField").innerHTML = "(" + X + "," + Y + ")";
 }
 
-function handleMouseClick(event,click)
+function handleMouseClick(event,X,Y)
 {
-    if (click) {
-        document.getElementById("clickTextField").innerHTML = "yes";
-    } else {
-        document.getElementById("clickTextField").innerHTML = "no";
-    }
+   document.getElementById("clickTextField").innerHTML = "(" + X + "," + Y + ")";
 }
 
-function handleMouseObject(event,moved)
+function handleMouseGrab(event,X,Y)
 {
-    var vlc = getVLC("vlc");
-
-    if (vlc && vlc.video) {
     var newpos = "";
-        if (vlc.video.logo) {
-            newpos = "("+ vlc.video.logo.x + "," + vlc.video.logo.y+ ")";
-        }
-        if (moved) {
-            document.getElementById("objectTextField").innerHTML = "yes: " + newpos;
-        } else {
-            document.getElementById("objectTextField").innerHTML = "no: " + newpos;
-        }
-    }
+    newpos = "("+ X + "," + Y + ")";
+    document.getElementById("objectTextField").innerHTML = "grabbed at " + newpos;
 }
 
 registerVLCEvent('MouseMoved', handleMousePos);
 registerVLCEvent('MouseClicked', handleMouseClick);
-registerVLCEvent('MouseObject', handleMouseObject);
+registerVLCEvent('MouseGrab', handleMouseGrab);
 
 function doSetSlider()
 {

src/control/media_player.c

@@ -69,7 +69,7 @@ static int
 mouse_clicked( vlc_object_t *p_this, char const *psz_cmd,
                     vlc_value_t oldval, vlc_value_t newval, void *p_data );
 static int
-mouse_object( vlc_object_t *p_this, char const *psz_cmd,
+mouse_grab( vlc_object_t *p_this, char const *psz_cmd,
                     vlc_value_t oldval, vlc_value_t newval, void *p_data );
 
 /* */
@@ -186,7 +186,7 @@ static vout_thread_t *get_vout_thread( libvlc_media_player_t *p_mi )
         var_AddCallback( p_vout, "mouse-button-down", mouse_button, p_mi );
         var_AddCallback( p_vout, "mouse-moved", mouse_moved, p_mi );
         var_AddCallback( p_vout, "mouse-clicked", mouse_clicked, p_mi );
-        var_AddCallback( p_vout, "mouse-object", mouse_object, p_mi );
+        var_AddCallback( p_vout, "mouse-grab", mouse_grab, p_mi );
     }
 
     return p_vout;
@@ -210,7 +210,7 @@ static void release_vout_thread( libvlc_media_player_t *p_mi )
     var_DelCallback( p_vout, "mouse-button-down", mouse_button, p_mi );
     var_DelCallback( p_vout, "mouse-moved", mouse_moved, p_mi );
     var_DelCallback( p_vout, "mouse-clicked", mouse_clicked, p_mi );
-    var_DelCallback( p_vout, "mouse-object", mouse_object, p_mi );
+    var_DelCallback( p_vout, "mouse-grab", mouse_grab, p_mi );
 
     vlc_object_release( p_vout );
     p_mi->input.p_vout = NULL;
@@ -445,22 +445,24 @@ mouse_clicked( vlc_object_t *p_this, char const *psz_cmd,
     libvlc_media_player_t *mp = p_data;
     libvlc_event_t event;
     event.type = libvlc_MediaPlayerMouseClick;
-    event.u.media_player_mouse_clicked.clicked = newval.b_bool ? 1 : 0;
+    event.u.media_player_mouse_clicked.x = newval.coords.x;
+    event.u.media_player_mouse_clicked.y = newval.coords.y;
     libvlc_event_send(mp->p_event_manager, &event);
 
     return VLC_SUCCESS;
 }
 
 static int
-mouse_object( vlc_object_t *p_this, char const *psz_cmd,
+mouse_grab( vlc_object_t *p_this, char const *psz_cmd,
                     vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
     VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_this);
 
     libvlc_media_player_t *mp = p_data;
     libvlc_event_t event;
-    event.type = libvlc_MediaPlayerMouseObject;
-    event.u.media_player_mouse_object.moved = (newval.b_bool ? 1 : 0);
+    event.type = libvlc_MediaPlayerMouseGrab;
+    event.u.media_player_mouse_grab.x = newval.coords.x;
+    event.u.media_player_mouse_grab.y = newval.coords.y;
     libvlc_event_send(mp->p_event_manager, &event);
 
     return VLC_SUCCESS;
@@ -605,7 +607,7 @@ libvlc_media_player_new( libvlc_instance_t *instance )
     register_event(mp, MouseMoved);
     register_event(mp, MouseButton);
     register_event(mp, MouseClick);
-    register_event(mp, MouseObject);
+    register_event(mp, MouseGrab);
 
     /* Attach a var callback to the global object to provide the glue between
      * vout_thread that generates the event and media_player that re-emits it

src/video_output/video_output.c

@@ -404,7 +404,7 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     var_Create( p_vout, "mouse-moved", VLC_VAR_COORDS );
     var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS );
     /* Mouse object (area of interest in a video filter) */
-    var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );
+    var_Create( p_vout, "mouse-grab", VLC_VAR_COORDS );
 
     /* Attach the new object now so we can use var inheritance below */
     vlc_object_attach( p_vout, p_parent );

src/video_output/vout_intf.c

@@ -366,7 +366,7 @@ void vout_IntfInit( vout_thread_t *p_vout )
     var_Create( p_vout, "mouse-button-down", VLC_VAR_INTEGER );
     var_Create( p_vout, "mouse-moved", VLC_VAR_COORDS );
     var_Create( p_vout, "mouse-clicked", VLC_VAR_COORDS );
-    var_Create( p_vout, "mouse-object", VLC_VAR_BOOL );
+    var_Create( p_vout, "mouse-grab", VLC_VAR_COORDS );
 
     var_Create( p_vout, "intf-change", VLC_VAR_BOOL );
     var_SetBool( p_vout, "intf-change", true );