diff options
| author | Vincent Torri <Vincent.Torri@iecn.u-nancy.fr> | 2006-01-14 11:32:45 +0000 |
|---|---|---|
| committer | Vincent Torri <Vincent.Torri@iecn.u-nancy.fr> | 2006-01-14 11:32:45 +0000 |
| commit | 7ad946c01e7f4399d554a33e95f701d27c082f69 (patch) | |
| tree | 8f2d0d4daf0474704c16575f4a88da2f6a89909e | |
| parent | cb7b0b2ca49469e2e04710a0f4b28745094ea86f (diff) | |
XCBConnectBasic is deprecated and xcbint must not be used anymore
| -rw-r--r-- | xcb-util/wm/Makefile.am | 3 | ||||
| -rw-r--r-- | xcb-util/wm/xcbwm-test.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/xcb-util/wm/Makefile.am b/xcb-util/wm/Makefile.am index d4745aa..994aec6 100644 --- a/xcb-util/wm/Makefile.am +++ b/xcb-util/wm/Makefile.am @@ -6,8 +6,9 @@ lib_LTLIBRARIES = libXCBWM.la xcbinclude_HEADERS = xcb_wm.h AM_CFLAGS = -Wall -INCLUDES = $(XCB_CFLAGS) -I../atom -I../event -I../property -I../icccm +INCLUDES = $(XCB_CFLAGS) -I../convenient -I../atom -I../event -I../property -I../icccm LDADD = $(XCB_LIBS) \ + -L../convenient -lXCBAux \ -L../atom -lXCBAtom \ -L../event -lXCBEvent \ -L../property -lXCBProperty \ diff --git a/xcb-util/wm/xcbwm-test.c b/xcb-util/wm/xcbwm-test.c index 285819d..1de4ac2 100644 --- a/xcb-util/wm/xcbwm-test.c +++ b/xcb-util/wm/xcbwm-test.c @@ -5,8 +5,8 @@ #include <assert.h> #include <X11/XCB/xcb.h> -#include <X11/XCB/xcbint.h> #include "reply_formats.h" +#include "xcb_aux.h" #include "xcb_event.h" #include "xcb_atom.h" #include "xcb_icccm.h" @@ -180,12 +180,13 @@ int main(int argc, char **argv) PropertyHandlers *prophs; XCBWINDOW root; pthread_t event_thread; + int screen_nbr; int i; byChild = AllocTable(); byParent = AllocTable(); - c = XCBConnectBasic(); + c = XCBConnect(NULL, &screen_nbr); evenths = allocEventHandlers(c); @@ -207,7 +208,7 @@ int main(int argc, char **argv) pthread_create(&event_thread, 0, (void *(*)(void *))eventLoop, evenths); } - root = XCBConnSetupSuccessRepRootsIter(XCBGetSetup(c)).data->root; + root = XCBAuxGetScreen(c, screen_nbr)->root; { CARD32 mask = XCBCWEventMask; |