Changeset 6d9536c7663f926889b44a6deb125152acfb3508

Timestamp:

04/09/08 18:00:29 (3 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1220544029 +0200

git-parent:

[52c11814434e412fed940ffa9b4f1d9f2db56d47]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1220544009 +0200

Message:

Add mouse cursor drawing support in x11 screen.

Files:

• NEWS (modified) (1 diff)
• modules/access/screen/screen.c (modified) (4 diffs)
• modules/access/screen/screen.h (modified) (2 diffs)
• modules/access/screen/x11.c (modified) (5 diffs)

NEWS

@@ -1 +1 @@
-Changes between 0.9.1 and 1.0.0-git:
-------------------------------------
+
+Inputs:
+ * Mouse cursor support in x11 screen module
-
-Decoders:

modules/access/screen/screen.c

@@ -74 +74 @@
-#endif
-
+#ifdef SCREEN_MOUSE
+#define MOUSE_TEXT N_( "Mouse pointer image" )
+#define MOUSE_LONGTEXT N_( \
+    "If specifed, will use the image to draw the mouse pointer on the " \
+    "capture." )
+#endif
+
-static int  Open ( vlc_object_t * );
-static void Close( vlc_object_t * );
@@ -100 +107 @@
-    add_bool( "screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT,
-              FOLLOW_MOUSE_LONGTEXT, true );
+#endif
+
+#ifdef SCREEN_MOUSE
+    add_string( "screen-mouse-image", "", NULL, MOUSE_TEXT, MOUSE_LONGTEXT,
+                true );
-#endif
-
@@ -190 +202 @@
-#endif
-
+#ifdef SCREEN_MOUSE
+    char * psz_mouse = var_CreateGetNonEmptyString( p_demux,
+                                                    "screen-mouse-image" );
+    if( psz_mouse )
+    {
+        image_handler_t *p_image;
+        video_format_t fmt_in, fmt_out;
+        msg_Dbg( p_demux, "Using %s for the mouse pointer image", psz_mouse );
+        memset( &fmt_in, 0, sizeof( fmt_in ) );
+        memset( &fmt_out, 0, sizeof( fmt_out ) );
+        fmt_out.i_chroma = VLC_FOURCC('R','G','B','A');
+        p_image = image_HandlerCreate( p_demux );
+        if( p_image )
+        {
+            p_sys->p_mouse =
+                image_ReadUrl( p_image, psz_mouse, &fmt_in, &fmt_out );
+            image_HandlerDelete( p_image );
+        }
+        if( !p_sys->p_mouse )
+            msg_Err( p_demux, "Failed to open mouse pointer image (%s)",
+                     psz_mouse );
+    }
+#endif
+
-    p_sys->es = es_out_Add( p_demux->out, &p_sys->fmt );
-
@@ -204 +240 @@
-
-    screen_CloseCapture( p_demux );
+#ifdef SCREEN_MOUSE
+    if( p_sys->p_mouse )
+        picture_Release( p_sys->p_mouse );
+#endif
-    free( p_sys );
-}

modules/access/screen/screen.h

@@ -28 +28 @@
-#if !defined( HAVE_WIN32 ) && !defined( HAVE_BEOS ) && !defined( HAVE_DARWIN )
-#   define SCREEN_SUBSCREEN
+#   define SCREEN_MOUSE
+#endif
+
+#ifdef SCREEN_MOUSE
+#   include <vlc_image.h>
-#endif
-
@@ -52 +57 @@
-#endif
-
+#ifdef SCREEN_MOUSE
+    picture_t *p_mouse;
+    filter_t *p_blend;
+    picture_t src;
+    picture_t dst;
+#endif
+
-    screen_data_t *p_data;
-};

modules/access/screen/x11.c

@@ -83 +83 @@
-
-    es_format_Init( &p_sys->fmt, VIDEO_ES, i_chroma );
+    p_sys->fmt.video.i_visible_width =
-    p_sys->fmt.video.i_width  = win_info.width;
+    p_sys->fmt.video.i_visible_height =
-    p_sys->fmt.video.i_height = win_info.height;
-    p_sys->fmt.video.i_bits_per_pixel = win_info.depth;
+    p_sys->fmt.video.i_chroma = i_chroma;
-
-#if 0
@@ -103 +106 @@
-
-    XCloseDisplay( p_display );
+    if( p_sys->p_blend )
+    {
+        module_Unneed( p_sys->p_blend, p_sys->p_blend->p_module );
+        vlc_object_detach( p_sys->p_blend );
+        vlc_object_release( p_sys->p_blend );
+    }
-    return VLC_SUCCESS;
-}
@@ -113 +122 @@
-    XImage *image;
-    int i_size;
-
-
+
+
+
-    {
-        Window root = DefaultRootWindow( p_display ), child;
-        int root_x, root_y;
-        int win_x, win_y;
-        unsigned int mask;
@@ -124 +133 @@
-            &mask ) )
-        {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else
@@ -157 +169 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    XDestroyImage( image );