[vlc-devel] commit: XCB: code factorization ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sat Dec 12 13:14:35 CET 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Dec 10 23:01:37 2009 +0200| [356981857c34b3f16b25f737fb7e6c8b4c2cdbc3] | committer: Rémi Denis-Courmont
XCB: code factorization
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=356981857c34b3f16b25f737fb7e6c8b4c2cdbc3
---
modules/video_output/xcb/common.c | 103 ++++++++++++++++++------------------
modules/video_output/xcb/events.c | 22 ++++++++
modules/video_output/xcb/xcb_vlc.h | 1 +
3 files changed, 74 insertions(+), 52 deletions(-)
diff --git a/modules/video_output/xcb/common.c b/modules/video_output/xcb/common.c
index 5787f5f..d1ce9be 100644
--- a/modules/video_output/xcb/common.c
+++ b/modules/video_output/xcb/common.c
@@ -65,6 +65,51 @@ static xcb_connection_t *Connect (vlc_object_t *obj, const char *display)
return conn;
}
+/**
+ * Find screen matching a given root window.
+ */
+static const xcb_screen_t *FindScreen (vlc_object_t *obj,
+ xcb_connection_t *conn,
+ xcb_window_t root)
+{
+ /* Find the selected screen */
+ const xcb_setup_t *setup = xcb_get_setup (conn);
+ const xcb_screen_t *screen = NULL;
+ for (xcb_screen_iterator_t i = xcb_setup_roots_iterator (setup);
+ i.rem > 0 && screen == NULL; xcb_screen_next (&i))
+ {
+ if (i.data->root == root)
+ screen = i.data;
+ }
+
+ if (screen == NULL)
+ {
+ msg_Err (obj, "parent window screen not found");
+ return NULL;
+ }
+ msg_Dbg (obj, "using screen 0x%"PRIx32, root);
+ return screen;
+}
+
+static const xcb_screen_t *FindWindow (vlc_object_t *obj,
+ xcb_connection_t *conn,
+ xcb_window_t xid,
+ uint8_t *restrict pdepth)
+{
+ xcb_get_geometry_reply_t *geo =
+ xcb_get_geometry_reply (conn, xcb_get_geometry (conn, xid), NULL);
+ if (geo == NULL)
+ {
+ msg_Err (obj, "parent window not valid");
+ return NULL;
+ }
+
+ const xcb_screen_t *screen = FindScreen (obj, conn, geo->root);
+ *pdepth = geo->depth;
+ free (geo);
+ return screen;
+}
+
/**
* Create a VLC video X window object, connect to the corresponding X server,
@@ -76,7 +121,6 @@ vout_window_t *GetWindow (vout_display_t *vd,
uint8_t *restrict pdepth)
{
/* Get window */
- xcb_window_t root;
vout_window_cfg_t wnd_cfg;
memset( &wnd_cfg, 0, sizeof(wnd_cfg) );
@@ -93,65 +137,20 @@ vout_window_t *GetWindow (vout_display_t *vd,
xcb_connection_t *conn = Connect (VLC_OBJECT(vd), wnd->x11_display);
if (conn == NULL)
- {
- vout_display_DeleteWindow (vd, wnd);
- return NULL;
- }
- else
- {
- xcb_get_geometry_reply_t *geo;
- xcb_get_geometry_cookie_t ck;
-
- ck = xcb_get_geometry (conn, wnd->xid);
- geo = xcb_get_geometry_reply (conn, ck, NULL);
- if (geo == NULL)
- {
- msg_Err (vd, "parent window not valid");
- goto error;
- }
- root = geo->root;
- *pdepth = geo->depth;
- free (geo);
-
- /* Subscribe to parent window resize events */
- uint32_t value = XCB_EVENT_MASK_POINTER_MOTION
- | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
- xcb_change_window_attributes (conn, wnd->xid,
- XCB_CW_EVENT_MASK, &value);
- /* Try to subscribe to click events */
- /* (only one X11 client can get them, so might not work) */
- if (var_CreateGetBool (vd, "mouse-events"))
- {
- value |= XCB_EVENT_MASK_BUTTON_PRESS
- | XCB_EVENT_MASK_BUTTON_RELEASE;
- xcb_change_window_attributes (conn, wnd->xid,
- XCB_CW_EVENT_MASK, &value);
- }
- }
-
- /* Find the selected screen */
- const xcb_setup_t *setup = xcb_get_setup (conn);
- const xcb_screen_t *screen = NULL;
- for (xcb_screen_iterator_t i = xcb_setup_roots_iterator (setup);
- i.rem > 0 && screen == NULL; xcb_screen_next (&i))
- {
- if (i.data->root == root)
- screen = i.data;
- }
+ goto error;
+ *pconn = conn;
- if (screen == NULL)
+ *pscreen = FindWindow (VLC_OBJECT(vd), conn, wnd->xid, pdepth);
+ if (*pscreen == NULL)
{
- msg_Err (vd, "parent window screen not found");
+ xcb_disconnect (conn);
goto error;
}
- msg_Dbg (vd, "using screen 0x%"PRIx32, root);
- *pconn = conn;
- *pscreen = screen;
+ RegisterMouseEvents (VLC_OBJECT(vd), conn, wnd->xid);
return wnd;
error:
- xcb_disconnect (conn);
vout_display_DeleteWindow (vd, wnd);
return NULL;
}
diff --git a/modules/video_output/xcb/events.c b/modules/video_output/xcb/events.c
index 4ad765f..9c70bd6 100644
--- a/modules/video_output/xcb/events.c
+++ b/modules/video_output/xcb/events.c
@@ -91,6 +91,28 @@ xcb_cursor_t CreateBlankCursor (xcb_connection_t *conn,
return cur;
}
+/**
+ * (Try to) register to mouse events on a window if needed.
+ */
+void RegisterMouseEvents (vlc_object_t *obj, xcb_connection_t *conn,
+ xcb_window_t wnd)
+{
+ /* Subscribe to parent window resize events */
+ uint32_t value = XCB_EVENT_MASK_POINTER_MOTION
+ | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
+ xcb_change_window_attributes (conn, wnd, XCB_CW_EVENT_MASK, &value);
+ /* Try to subscribe to click events */
+ /* (only one X11 client can get them, so might not work) */
+ if (var_CreateGetBool (obj, "mouse-events"))
+ {
+ value |= XCB_EVENT_MASK_BUTTON_PRESS
+ | XCB_EVENT_MASK_BUTTON_RELEASE;
+ xcb_change_window_attributes (conn, wnd,
+ XCB_CW_EVENT_MASK, &value);
+ }
+ var_Destroy (obj, "mouse-events");
+}
+
/* NOTE: we assume no other thread will be _setting_ our video output events
* variables. Afterall, only this plugin is supposed to know when these occur.
* Otherwise, we'd var_OrInteger() and var_NandInteger() functions...
diff --git a/modules/video_output/xcb/xcb_vlc.h b/modules/video_output/xcb/xcb_vlc.h
index f744738..4a286c5 100644
--- a/modules/video_output/xcb/xcb_vlc.h
+++ b/modules/video_output/xcb/xcb_vlc.h
@@ -46,6 +46,7 @@ int GetWindowSize (struct vout_window_t *wnd, xcb_connection_t *conn,
unsigned *restrict width, unsigned *restrict height);
void CheckSHM (vlc_object_t *obj, xcb_connection_t *conn, bool *restrict pshm);
xcb_cursor_t CreateBlankCursor (xcb_connection_t *, const xcb_screen_t *);
+void RegisterMouseEvents (vlc_object_t *, xcb_connection_t *, xcb_window_t);
int CheckError (vout_display_t *, xcb_connection_t *conn,
const char *str, xcb_void_cookie_t);
More information about the vlc-devel
mailing list