#include "xcb_vlc.h"
-/**
- * Check for an error
- */
-int CheckError (vout_display_t *vd, xcb_connection_t *conn,
- const char *str, xcb_void_cookie_t ck)
-{
- xcb_generic_error_t *err;
-
- err = xcb_request_check (conn, ck);
- if (err)
- {
- msg_Err (vd, "%s: X11 error %d", str, err->error_code);
- free (err);
- return VLC_EGENERIC;
- }
- return VLC_SUCCESS;
-}
-
/**
* Connect to the X server.
*/
-xcb_connection_t *Connect (vlc_object_t *obj)
+static xcb_connection_t *Connect (vlc_object_t *obj, const char *display)
{
- char *display = var_CreateGetNonEmptyString (obj, "x11-display");
xcb_connection_t *conn = xcb_connect (display, NULL);
-
- free (display);
if (xcb_connection_has_error (conn) /*== NULL*/)
{
- msg_Err (obj, "cannot connect to X server");
+ msg_Err (obj, "cannot connect to X server (%s)",
+ display ? display : "default");
xcb_disconnect (conn);
return NULL;
}
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, find the corresponding X server screen,
- * and probe the MIT-SHM extension.
+ * Create a VLC video X window object, connect to the corresponding X server,
+ * find the corresponding X server screen.
*/
vout_window_t *GetWindow (vout_display_t *vd,
- xcb_connection_t *conn,
+ xcb_connection_t **restrict pconn,
const xcb_screen_t **restrict pscreen,
- bool *restrict pshm)
+ uint8_t *restrict pdepth)
{
/* Get window */
- xcb_window_t root;
vout_window_cfg_t wnd_cfg;
memset( &wnd_cfg, 0, sizeof(wnd_cfg) );
wnd_cfg.type = VOUT_WINDOW_TYPE_XID;
+ wnd_cfg.x = var_InheritInteger (vd, "video-x");
+ wnd_cfg.y = var_InheritInteger (vd, "video-y");
wnd_cfg.width = vd->cfg->display.width;
wnd_cfg.height = vd->cfg->display.height;
msg_Err (vd, "parent window not available");
return NULL;
}
- else
- {
- xcb_get_geometry_reply_t *geo;
- xcb_get_geometry_cookie_t ck;
-
- ck = xcb_get_geometry (conn, wnd->handle.xid);
- geo = xcb_get_geometry_reply (conn, ck, NULL);
- if (geo == NULL)
- {
- msg_Err (vd, "parent window not valid");
- goto error;
- }
- root = geo->root;
- 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->handle.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->handle.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;
- }
+ xcb_connection_t *conn = Connect (VLC_OBJECT(vd), wnd->display.x11);
+ if (conn == NULL)
+ goto error;
+ *pconn = conn;
- if (screen == NULL)
+ *pscreen = FindWindow (VLC_OBJECT(vd), conn, wnd->handle.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);
- /* Check MIT-SHM shared memory support */
- bool shm = var_CreateGetBool (vd, "x11-shm") > 0;
+ RegisterMouseEvents (VLC_OBJECT(vd), conn, wnd->handle.xid);
+ return wnd;
+
+error:
+ vout_display_DeleteWindow (vd, wnd);
+ return NULL;
+}
+
+/** Check MIT-SHM shared memory support */
+void CheckSHM (vlc_object_t *obj, xcb_connection_t *conn, bool *restrict pshm)
+{
+ bool shm = var_InheritBool (obj, "x11-shm") > 0;
if (shm)
{
xcb_shm_query_version_cookie_t ck;
r = xcb_shm_query_version_reply (conn, ck, NULL);
if (!r)
{
- msg_Err (vd, "shared memory (MIT-SHM) not available");
- msg_Warn (vd, "display will be slow");
+ msg_Err (obj, "shared memory (MIT-SHM) not available");
+ msg_Warn (obj, "display will be slow");
shm = false;
}
free (r);
}
-
- *pscreen = screen;
*pshm = shm;
- return wnd;
-
-error:
- vout_display_DeleteWindow (vd, wnd);
- return NULL;
-}
-
-/**
- * Gets the size of an X window.
- */
-int GetWindowSize (struct vout_window_t *wnd, xcb_connection_t *conn,
- unsigned *restrict width, unsigned *restrict height)
-{
- xcb_get_geometry_cookie_t ck = xcb_get_geometry (conn, wnd->handle.xid);
- xcb_get_geometry_reply_t *geo = xcb_get_geometry_reply (conn, ck, NULL);
-
- if (!geo)
- return -1;
-
- *width = geo->width;
- *height = geo->height;
- free (geo);
- return 0;
-}
-
-/**
- * Create a blank cursor.
- * Note that the pixmaps are leaked (until the X disconnection). Hence, this
- * function should be called no more than once per X connection.
- * @param conn XCB connection
- * @param scr target XCB screen
- */
-xcb_cursor_t CreateBlankCursor (xcb_connection_t *conn,
- const xcb_screen_t *scr)
-{
- xcb_cursor_t cur = xcb_generate_id (conn);
- xcb_pixmap_t pix = xcb_generate_id (conn);
-
- xcb_create_pixmap (conn, 1, pix, scr->root, 1, 1);
- xcb_create_cursor (conn, cur, pix, pix, 0, 0, 0, 1, 1, 1, 0, 0);
- return cur;
}
/**