Changeset 82e29c9ba1135639fe10881591e6261bc3396ae4

Timestamp:

11/15/07 14:38:32 (10 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1195133912 +0000

git-parent:

[9d6bf51a76aa5877fbdce794b0a7ffd267ef1e5a]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1195133912 +0000

Message:

Implement clickable osdmenu. The clickable positioning and scaling guessing is not complete (the whole spu region is now clickable with current configurations).

Files:

• include/vlc_osd.h (modified) (5 diffs)
• modules/misc/osd/osd_menu.c (modified) (1 diff)
• modules/misc/osd/osd_menu.h (modified) (1 diff)
• modules/misc/osd/simple.c (modified) (3 diffs)
• modules/video_filter/osdmenu.c (modified) (9 diffs)
• src/osd/osd.c (modified) (16 diffs)

include/vlc_osd.h

@@ -286 +286 @@
-#define OSD_BUTTON_PRESSED  2
-
-static const char *ppsz_button_states[] = { "unselect", "select", "pressed" };
-
-/**
- * OSD State object
@@ -303 +301 @@
-    char        *psz_state; /*< state name */
-    int          i_state;   /*< state index */
+
+    int     i_x;            /*< x-position of button state image */
+    int     i_y;            /*< y-position of button state image */
+    int     i_width;        /*< width of button state image */
+    int     i_height;       /*< height of button state image */
-};
-
@@ -331 +334 @@
-    int     i_x;            /*< x-position of button visible state image */
-    int     i_y;            /*< y-position of button visible state image */
+    int     i_width;        /*< width of button visible state image */
+    int     i_height;       /*< height of button visible state image */
-
-    /* range style button */
@@ -390 +395 @@
-    int     i_height;   /*< height of OSD Menu on the video screen */
-    int     i_style;    /*< style of spu region generation */
+    int     i_position; /*< display position */
-
-    char             *psz_path;  /*< directory where OSD menu images are stored */
@@ -422 +428 @@
-VLC_EXPORT( void, __osd_MenuDelete, ( vlc_object_t *, osd_menu_t * ) );
-
-/**
- * Change state on an osd_button_t.
- *
- * This function selects the specified state and returns a pointer to it. The
- * following states are currently supported:
- * \see OSD_BUTTON_UNSELECT
- * \see OSD_BUTTON_SELECT
- * \see OSD_BUTTON_PRESSED
- */
-VLC_EXPORT( osd_state_t *, __osd_StateChange, ( osd_state_t *, const int ) );
-
-#define osd_MenuCreate(object,file) __osd_MenuCreate( VLC_OBJECT(object), file )
-#define osd_MenuDelete(object,osd)  __osd_MenuDelete( VLC_OBJECT(object), osd )
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/**

modules/misc/osd/osd_menu.c

@@ -219 +219 @@
-        p_state->p_pic = image_ReadUrl( p_menu->p_image, psz_file,
-                                        &fmt_in, &fmt_out );
+
+        p_state->i_width  = p_state->p_pic->p[Y_PLANE].i_visible_pitch;
+        p_state->i_height = p_state->p_pic->p[Y_PLANE].i_visible_lines;
-    }
-

modules/misc/osd/osd_menu.h

@@ -25 +25 @@
-#define _OSD_MENU_PARSER_H_
-
+static const char *ppsz_button_states[] = { "unselect", "select", "pressed" };
+
-/* OSD Menu structure support routines for internal use by
- * OSD Menu configuration file parsers only.

modules/misc/osd/simple.c

@@ -270 +270 @@
-                            goto error;
-
+                        p_range_current->i_x = i_x;
+                        p_range_current->i_y = i_y;
+
-                        /* increment the number of ranges for this button */
-                        p_up->i_ranges++;
@@ -367 +370 @@
-                        goto error;
-
+                    p_range_current->i_x = i_x;
+                    p_range_current->i_y = i_y;
+
-                    /* increment the number of ranges for this button */
-                    p_current->i_ranges++;
@@ -434 +440 @@
-                goto error;
-
+            p_state_current->i_x = i_x;
+            p_state_current->i_y = i_y;
+
-            if( p_state_prev )
-                p_state_prev->p_next = p_state_current;

modules/video_filter/osdmenu.c

@@ -85 +85 @@
-static void DestroyFilter( vlc_object_t * );
-static subpicture_t *Filter( filter_t *, mtime_t );
+
-static int OSDMenuUpdateEvent( vlc_object_t *, char const *,
-                    vlc_value_t, vlc_value_t, void * );
@@ -91 +92 @@
-static int OSDMenuCallback( vlc_object_t *, char const *,
-                            vlc_value_t, vlc_value_t, void * );
+
+static int MouseEvent( vlc_object_t *, char const *,
+                        vlc_value_t , vlc_value_t , void * );
-
-#define OSD_CFG "osdmenu-"
@@ -158 +162 @@
-    char        *psz_path;      /* Path to OSD Menu pictures */
-    osd_menu_t  *p_menu;        /* pointer to OSD Menu object */
+
+    /* menu interaction */
+    vout_thread_t *p_vout;
+    vlc_bool_t  b_clicked;
+    uint32_t    i_mouse_x;
+    uint32_t    i_mouse_y;
-};
-
@@ -207 +217 @@
-        goto error;
-
+    p_sys->p_menu->i_position = p_sys->i_position;
+
-    /* Check if menu position was overridden */
-    p_sys->b_absolute = VLC_TRUE;
@@ -234 +246 @@
-    p_sys->b_update  = VLC_FALSE;
-    p_sys->b_visible = VLC_FALSE;
+    p_sys->b_clicked = VLC_FALSE;
-
-    /* Listen to osd menu core updates/visible settings. */
@@ -244 +257 @@
-    p_filter->pf_sub_filter = Filter;
-
+    p_sys->p_vout = vlc_object_find( p_this, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+    if( p_sys->p_vout )
+    {
+        var_AddCallback( p_sys->p_vout, "mouse-x",
+                        MouseEvent, p_sys );
+        var_AddCallback( p_sys->p_vout, "mouse-y",
+                        MouseEvent, p_sys );
+        var_AddCallback( p_sys->p_vout, "mouse-clicked",
+                        MouseEvent, p_sys );
+    }
+
-    es_format_Init( &p_filter->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
-    p_filter->fmt_out.i_priority = 0;
@@ -276 +300 @@
-    var_DelCallback( p_sys->p_menu, "osd-menu-visible",
-                     OSDMenuVisibleEvent, p_filter );
+
+    if( p_sys->p_vout )
+    {
+        var_DelCallback( p_sys->p_vout, "mouse-x",
+                        MouseEvent, p_sys );
+        var_DelCallback( p_sys->p_vout, "mouse-y",
+                        MouseEvent, p_sys );
+        var_DelCallback( p_sys->p_vout, "mouse-clicked",
+                        MouseEvent, p_sys );
+
+        vlc_object_release( p_sys->p_vout );
+        p_sys->p_vout = NULL;
+    }
-
-    var_Destroy( p_this, OSD_CFG "file-path" );
@@ -469 +506 @@
-    }
-
+    if( p_sys->p_vout && p_sys->b_clicked )
+    {
+        p_sys->b_clicked = VLC_FALSE;
+        osd_MenuActivate( p_filter );
+    }
-    /* Create new spu regions
-    */
@@ -607 +649 @@
-    return VLC_SUCCESS;
-}
+
+/*****************************************************************************
+ * MouseEvent: callback for mouse events
+ *****************************************************************************/
+static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
+                       vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    filter_sys_t *p_sys = (filter_sys_t *)p_data;
+    vout_thread_t *p_vout = (vout_thread_t*)p_sys->p_vout;
+    int i_x, i_y;
+    int i_v;
+
+#define MOUSE_DOWN    1
+#define MOUSE_CLICKED 2
+#define MOUSE_MOVE_X  4
+#define MOUSE_MOVE_Y  8
+#define MOUSE_MOVE    12
+    uint8_t mouse= 0;
+
+    int v_h = p_vout->output.i_height;
+    int v_w = p_vout->output.i_width;
+
+    if( psz_var[6] == 'x' ) mouse |= MOUSE_MOVE_X;
+    if( psz_var[6] == 'y' ) mouse |= MOUSE_MOVE_Y;
+    if( psz_var[6] == 'c' ) mouse |= MOUSE_CLICKED;
+
+    i_v = var_GetInteger( p_sys->p_vout, "mouse-button-down" );
+    if( i_v & 0x1 ) mouse |= MOUSE_DOWN;
+    i_y = var_GetInteger( p_sys->p_vout, "mouse-y" );
+    i_x = var_GetInteger( p_sys->p_vout, "mouse-x" );
+
+    if( i_y < 0 || i_x < 0 || i_y >= v_h || i_x >= v_w )
+        return VLC_SUCCESS;
+
+    if( mouse & MOUSE_CLICKED )
+    {
+        int i_scale_width, i_scale_height;
+        osd_button_t *p_button = NULL;
+
+        i_scale_width = p_vout->fmt_out.i_visible_width * 1000 /
+            p_vout->fmt_in.i_visible_width;
+        i_scale_height = p_vout->fmt_out.i_visible_height * 1000 /
+            p_vout->fmt_in.i_visible_height;
+
+        p_button = osd_ButtonFind( p_this, i_x, i_y, v_h, v_w,
+                                   i_scale_width, i_scale_height );
+        if( p_button )
+        {
+            osd_ButtonSelect( p_this, p_button );
+            p_sys->b_update = p_sys->b_visible ? VLC_TRUE : VLC_FALSE;
+            p_sys->b_clicked = VLC_TRUE;
+            msg_Dbg( p_this, "mouse clicked %s (%d,%d)\n", p_button->psz_name, i_x, i_y );
+        }
+    }
+    return VLC_SUCCESS;
+}

src/osd/osd.c

@@ -35 +35 @@
-#undef OSD_MENU_DEBUG
-
+static const char *ppsz_button_states[] = { "unselect", "select", "pressed" };
+
-/*****************************************************************************
- * Local prototypes
@@ -114 +116 @@
-}
-
+/**
+ * Change state on an osd_button_t.
+ *
+ * This function selects the specified state and returns a pointer to it. The
+ * following states are currently supported:
+ * \see OSD_BUTTON_UNSELECT
+ * \see OSD_BUTTON_SELECT
+ * \see OSD_BUTTON_PRESSED
+ */
+static osd_state_t *osd_StateChange( osd_button_t *p_button, const int i_state )
+{
+    osd_state_t *p_current = p_button->p_states;
+    osd_state_t *p_temp = NULL;
+    int i = 0;
+
+    for( i=0; p_current != NULL; i++ )
+    {
+        if( p_current->i_state == i_state )
+        {
+            p_button->i_x = p_current->i_x;
+            p_button->i_y = p_current->i_y;
+            p_button->i_width = p_current->i_width;
+            p_button->i_height = p_current->i_height;
+            return p_current;
+        }
+        p_temp = p_current->p_next;
+        p_current = p_temp;
+    }
+    return p_button->p_states;
+}
+
-/*****************************************************************************
- * OSD menu Funtions
@@ -142 +175 @@
-        p_osd->p_state->p_visible = p_osd->p_button;
-        p_osd->p_state->p_visible->p_current_state =
-->p_states
+
-        p_osd->i_width  = p_osd->p_state->p_visible->p_current_state->p_pic->p[Y_PLANE].i_visible_pitch;
-        p_osd->i_height = p_osd->p_state->p_visible->p_current_state->p_pic->p[Y_PLANE].i_visible_lines;
@@ -207 +240 @@
-}
-
-osd_state_t *__osd_StateChange( osd_state_t *p_states, const int i_state )
-{
-    osd_state_t *p_current = p_states;
-    osd_state_t *p_temp = NULL;
-    int i = 0;
-
-    for( i=0; p_current != NULL; i++ )
-    {
-        if( p_current->i_state == i_state )
-            return p_current;
-        p_temp = p_current->p_next;
-        p_current = p_temp;
-    }
-    return p_states;
-}
-
-/* The volume can be modified in another interface while the OSD Menu
- * has not been instantiated yet. This routines updates the "volume OSD menu item"
@@ -277 +294 @@
-    {
-        if( !p_button->b_range )
-->p_states
+
-        p_osd->p_state->p_visible = p_osd->p_button;
-
-        if( !p_osd->p_state->p_visible->b_range )
-            p_osd->p_state->p_visible->p_current_state =
-->p_states
+
-
-        osd_UpdateState( p_osd->p_state,
-                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
-p_pic->p[Y_PLANE].i_visible_pitc
-p_pic->p[Y_PLANE].i_visible_lines
+i_widt
+i_height
-                p_osd->p_state->p_visible->p_current_state->p_pic );
-        osd_SetMenuUpdate( p_osd, VLC_TRUE );
@@ -370 +387 @@
-    if( p_button && !p_button->b_range )
-    {
-->p_states
+
-        osd_UpdateState( p_osd->p_state,
-                p_button->i_x, p_button->i_y,
-p_pic->p[Y_PLANE].i_visible_pitc
-p_pic->p[Y_PLANE].i_visible_lines
+i_widt
+i_height
-                p_button->p_current_state->p_pic );
-        osd_SetMenuUpdate( p_osd, VLC_TRUE );
@@ -413 +430 @@
-    {
-        if( !p_button->b_range )
-->p_states
+
-        if( p_button->p_next )
-            p_osd->p_state->p_visible = p_button->p_next;
@@ -421 +438 @@
-        if( !p_osd->p_state->p_visible->b_range )
-            p_osd->p_state->p_visible->p_current_state =
-->p_states
+
-
-        osd_UpdateState( p_osd->p_state,
-                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
-p_pic->p[Y_PLANE].i_visible_pitc
-p_pic->p[Y_PLANE].i_visible_lines
+i_widt
+i_height
-                p_osd->p_state->p_visible->p_current_state->p_pic );
-        osd_SetMenuUpdate( p_osd, VLC_TRUE );
@@ -464 +481 @@
-    {
-        if( !p_button->b_range )
-->p_states
+
-        if( p_button->p_prev )
-            p_osd->p_state->p_visible = p_button->p_prev;
@@ -472 +489 @@
-        if( !p_osd->p_state->p_visible->b_range )
-            p_osd->p_state->p_visible->p_current_state =
-->p_states
+
-
-        osd_UpdateState( p_osd->p_state,
-                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
-p_pic->p[Y_PLANE].i_visible_pitc
-p_pic->p[Y_PLANE].i_visible_lines
+i_widt
+i_height
-                p_osd->p_state->p_visible->p_current_state->p_pic );
-        osd_SetMenuUpdate( p_osd, VLC_TRUE );
@@ -518 +535 @@
-        if( !p_button->b_range )
-        {
-->p_states
+
-            if( p_button->p_up )
-                p_osd->p_state->p_visible = p_button->p_up;
@@ -532 +549 @@
-        {
-            p_osd->p_state->p_visible->p_current_state =
-->p_states
+
-        }
-
-        osd_UpdateState( p_osd->p_state,
-                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
-p_pic->p[Y_PLANE].i_visible_pitc
-p_pic->p[Y_PLANE].i_visible_lines
+i_widt
+i_height
-                p_osd->p_state->p_visible->p_current_state->p_pic );
-        osd_SetMenuUpdate( p_osd, VLC_TRUE );
@@ -590 +607 @@
-        if( !p_button->b_range )
-        {
-->p_states
+
-            if( p_button->p_down )
-                p_osd->p_state->p_visible = p_button->p_down;
@@ -604 +621 @@
-        {
-            p_osd->p_state->p_visible->p_current_state =
-->p_states
+
-        }
-
-        osd_UpdateState( p_osd->p_state,
-                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
-p_pic->p[Y_PLANE].i_visible_pitc
-p_pic->p[Y_PLANE].i_visible_lines
+i_widt
+i_height
-                p_osd->p_state->p_visible->p_current_state->p_pic );
-        osd_SetMenuUpdate( p_osd, VLC_TRUE );
@@ -679 +696 @@
-            osd_UpdateState( p_osd->p_state,
-                    p_button->i_x, p_button->i_y,
-p_pic->p[Y_PLANE].i_visible_pitc
-p_pic->p[Y_PLANE].i_visible_lines
+i_widt
+i_height
-                    p_button->p_current_state->p_pic );
-            osd_SetMenuUpdate( p_osd, VLC_TRUE );
@@ -689 +706 @@
-    }
-}
+
+osd_button_t *__osd_ButtonFind( vlc_object_t *p_this, int i_x, int i_y,
+    int i_window_height, int i_window_width,
+    int i_scale_width, int i_scale_height )
+{
+    osd_menu_t *p_osd;
+    osd_button_t *p_button, *p_start, *p_end;
+    vlc_value_t lockval;
+
+    p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
+    if( p_osd == NULL )
+    {
+        msg_Err( p_this, "OSD menu button find failed" );
+        return NULL;
+    }
+
+    if( osd_isVisible( p_osd ) == VLC_FALSE )
+    {
+        vlc_object_release( (vlc_object_t*) p_osd );
+        return NULL;
+    }
+
+    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+    vlc_mutex_lock( lockval.p_address );
+
+    p_button = p_osd->p_button;
+    for( ; p_button != NULL; p_button = p_button->p_next )
+    {
+        int i_source_video_width  = ( i_window_width  * 1000 ) / i_scale_width;
+        int i_source_video_height = ( i_window_height * 1000 ) / i_scale_height;
+        int i_y_offset = p_button->i_y;
+        int i_x_offset = p_button->i_x;
+        int i_width = p_button->i_width;
+        int i_height = p_button->i_height;
+
+        if( p_osd->i_position > 0 )
+        {
+            int i_inv_scale_y = i_source_video_height;
+            int i_inv_scale_x = i_source_video_width;
+            int pi_x = 0;
+
+            if( p_osd->i_position & SUBPICTURE_ALIGN_BOTTOM )
+            {
+                i_y_offset = i_window_height - p_button->i_height -
+                    (p_osd->i_y + p_button->i_y) * i_inv_scale_y / 1000;
+            }
+            else if ( !(p_osd->i_position & SUBPICTURE_ALIGN_TOP) )
+            {
+                i_y_offset = i_window_height / 2 - p_button->i_height / 2;
+            }
+
+            if( p_osd->i_position & SUBPICTURE_ALIGN_RIGHT )
+            {
+                i_x_offset = i_window_width - p_button->i_width -
+                    (pi_x + p_button->i_x)
+                    * i_inv_scale_x / 1000;
+            }
+            else if ( !(p_osd->i_position & SUBPICTURE_ALIGN_LEFT) )
+            {
+                i_x_offset = i_window_width / 2 - p_button->i_width / 2;
+            }
+
+            i_width = i_window_width - p_button->i_width - i_inv_scale_x / 1000;
+            i_height = i_window_height - p_button->i_height - i_inv_scale_y / 1000;
+        }
+
+        // TODO: write for Up / Down case too.
+        // TODO: handle absolute positioning case
+        if( ( i_x >= i_x_offset ) && ( i_x <= i_x_offset + i_width ) &&
+            ( i_y >= i_y_offset ) && ( i_y <= i_y_offset + i_height ) )
+        {
+            vlc_object_release( (vlc_object_t*) p_osd );
+            vlc_mutex_unlock( lockval.p_address );
+            return p_button;
+        }
+    }
+
+    vlc_object_release( (vlc_object_t*) p_osd );
+    vlc_mutex_unlock( lockval.p_address );
+    return NULL;
+}
+
+/**
+ * Select the button provided as the new active button
+ */
+void __osd_ButtonSelect( vlc_object_t *p_this, osd_button_t *p_button )
+{
+    osd_menu_t *p_osd;
+    osd_button_t *p_old;
+    vlc_value_t lockval;
+
+    p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE );
+    if( p_osd == NULL )
+    {
+        msg_Err( p_this, "OSD menu button select failed" );
+        return;
+    }
+
+    if( osd_isVisible( p_osd ) == VLC_FALSE )
+    {
+        vlc_object_release( (vlc_object_t*) p_osd );
+        return;
+    }
+
+    var_Get( p_this->p_libvlc, "osd_mutex", &lockval );
+    vlc_mutex_lock( lockval.p_address );
+
+    p_old = p_osd->p_state->p_visible;
+    if( p_old )
+    {
+        if( !p_old->b_range )
+            p_old->p_current_state = osd_StateChange( p_old, OSD_BUTTON_UNSELECT );
+        p_osd->p_state->p_visible = p_button;
+
+        if( !p_osd->p_state->p_visible->b_range )
+            p_osd->p_state->p_visible->p_current_state =
+                osd_StateChange( p_osd->p_state->p_visible, OSD_BUTTON_SELECT );
+
+        osd_UpdateState( p_osd->p_state,
+                p_osd->p_state->p_visible->i_x, p_osd->p_state->p_visible->i_y,
+                p_osd->p_state->p_visible->p_current_state->i_width,
+                p_osd->p_state->p_visible->p_current_state->i_height,
+                p_osd->p_state->p_visible->p_current_state->p_pic );
+        osd_SetMenuUpdate( p_osd, VLC_TRUE );
+    }
+#if defined(OSD_MENU_DEBUG)
+    msg_Dbg( p_osd, "button selected is [button %s]", p_osd->p_state->p_visible->psz_action );
+#endif
+
+    vlc_object_release( (vlc_object_t*) p_osd );
+    vlc_mutex_unlock( lockval.p_address );
+}