[vlc-devel] commit: XCB/window: do not depend on xcb-aux for one trivial function call ( Rémi Denis-Courmont )
git version control
git at videolan.org
Thu May 14 17:55:57 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May 13 23:13:10 2009 +0300| [4ad7990248a6e672a422070e5bb274cc08b4dd50] | committer: Rémi Denis-Courmont
XCB/window: do not depend on xcb-aux for one trivial function call
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ad7990248a6e672a422070e5bb274cc08b4dd50
---
configure.ac | 1 -
modules/video_output/xcb/window.c | 21 +++++++++++++++++++--
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index be6e24c..fea513b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4176,7 +4176,6 @@ AS_IF([test "${enable_xcb}" != "no"], [
])
dnl xcb-utils
- PKG_CHECK_MODULES(XCB_AUX, [xcb-aux])
PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms])
VLC_ADD_PLUGIN([xcb])
diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 6b31351..dfc5020 100644
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -31,7 +31,6 @@
#include <limits.h> /* HOST_NAME_MAX */
#include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
typedef xcb_atom_t Atom;
#include <X11/Xatom.h> /* XA_WM_NAME */
@@ -140,8 +139,26 @@ static int Open (vlc_object_t *obj)
if (xcb_connection_has_error (conn) /*== NULL*/)
goto error;
+ /* Find configured screen */
+ const xcb_setup_t *setup = xcb_get_setup (conn);
+ xcb_screen_t *scr = NULL;
+ for (xcb_screen_iterator_t i = xcb_setup_roots_iterator (setup);
+ i.rem > 0; xcb_screen_next (&i))
+ {
+ if (snum == 0)
+ {
+ scr = i.data;
+ break;
+ }
+ snum--;
+ }
+ if (scr == NULL)
+ {
+ msg_Err (wnd, "bad X11 screen number");
+ goto error;
+ }
+
/* Create window */
- xcb_screen_t *scr = xcb_aux_get_screen (conn, snum);
const uint32_t mask = XCB_CW_BACK_PIXEL | XCB_CW_EVENT_MASK;
uint32_t values[2] = {
/* XCB_CW_BACK_PIXEL */
More information about the vlc-devel
mailing list