Xephyr: some more hostx.c xcb-ification

Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Julien Cristau <jcristau@debian.org>
This commit is contained in:
Julien Cristau 2010-06-24 23:45:16 +01:00 committed by Eric Anholt
parent 9b55f76a26
commit ff26845252

View File

@ -368,9 +368,9 @@ hostx_init(void)
HostX.conn = XGetXCBConnection(HostX.dpy); HostX.conn = XGetXCBConnection(HostX.dpy);
HostX.screen = DefaultScreen(HostX.dpy); HostX.screen = DefaultScreen(HostX.dpy);
screen = xcb_aux_get_screen(HostX.conn, HostX.screen); screen = xcb_aux_get_screen(HostX.conn, HostX.screen);
HostX.winroot = RootWindow(HostX.dpy, HostX.screen); HostX.winroot = screen->root;
HostX.gc = xcb_generate_id(HostX.conn); HostX.gc = xcb_generate_id(HostX.conn);
HostX.depth = DefaultDepth(HostX.dpy, HostX.screen); HostX.depth = screen->root_depth;
HostX.visual = xcb_aux_find_visual_by_id(screen, screen->root_visual); HostX.visual = xcb_aux_find_visual_by_id(screen, screen->root_visual);
xcb_create_gc(HostX.conn, HostX.gc, HostX.winroot, 0, NULL); xcb_create_gc(HostX.conn, HostX.gc, HostX.winroot, 0, NULL);
@ -439,8 +439,8 @@ hostx_init(void)
"(ctrl+shift grabs mouse and keyboard)"); "(ctrl+shift grabs mouse and keyboard)");
if (HostX.use_fullscreen) { if (HostX.use_fullscreen) {
host_screen->win_width = DisplayWidth(HostX.dpy, HostX.screen); host_screen->win_width = screen->width_in_pixels;
host_screen->win_height = DisplayHeight(HostX.dpy, HostX.screen); host_screen->win_height = screen->height_in_pixels;
hostx_set_fullscreen_hint(); hostx_set_fullscreen_hint();
} }
@ -1123,7 +1123,7 @@ hostx_get_xcbconn(void)
int int
hostx_get_screen(void) hostx_get_screen(void)
{ {
return DefaultScreen(HostX.dpy); return HostX.screen;
} }
int int