From: Mikael Magnusson Date: Fri, 29 Feb 2008 03:21:02 +0000 (+0100) Subject: Merge branch 'backport' into work X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=173b9b764887929b7ff5d30b3e33f0602b0afda6;p=chaz%2Fopenbox Merge branch 'backport' into work Conflicts: openbox/client.c openbox/screen.c --- 173b9b764887929b7ff5d30b3e33f0602b0afda6 diff --cc openbox/client.c index 67d2290a,816fa922..bf1d4f9c --- a/openbox/client.c +++ b/openbox/client.c @@@ -4022,10 -4145,10 +4031,10 @@@ static void detect_edge(Rect area, ObDi g_assert_not_reached(); } - ob_debug("my head %d size %d\n", my_head, my_size); - ob_debug("head %d tail %d dest %d\n", head, tail, *dest); + ob_debug("my head %d size %d", my_head, my_size); - ob_debug("head %d tail %d deest %d", head, tail, *dest); ++ ob_debug("head %d tail %d dest %d", head, tail, *dest); if (!skip_head) { - ob_debug("using near edge %d\n", head); + ob_debug("using near edge %d", head); *dest = head; *near_edge = TRUE; } diff --cc openbox/focus_cycle.c index dbf79c9a,c7fc42ee..4d793777 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@@ -69,10 -70,9 +69,9 @@@ void focus_cycle_stop(ObClient *ifclien ObClient* focus_cycle(gboolean forward, gboolean all_desktops, gboolean dock_windows, gboolean desktop_windows, gboolean linear, gboolean interactive, - gboolean showbar, gboolean dialog, + gboolean showbar, ObFocusCyclePopupMode mode, gboolean done, gboolean cancel) { - static ObClient *t = NULL; static GList *order = NULL; GList *it, *start, *list; ObClient *ft = NULL; diff --cc openbox/frame.c index e8a532cc,0b764a4c..25c47048 --- a/openbox/frame.c +++ b/openbox/frame.c @@@ -98,15 -99,16 +98,15 @@@ ObFrame *frame_new(ObClient *client mask = 0; if (visual) { /* client has a 32-bit visual */ - mask |= CWColormap | CWBackPixel | CWBorderPixel; + mask = CWColormap | CWBackPixel | CWBorderPixel; /* create a colormap with the visual */ self->colormap = attrib.colormap = - XCreateColormap(ob_display, - RootWindow(ob_display, ob_screen), + XCreateColormap(obt_display, obt_root(ob_screen), visual, AllocNone); - attrib.background_pixel = BlackPixel(ob_display, ob_screen); - attrib.border_pixel = BlackPixel(ob_display, ob_screen); + attrib.background_pixel = BlackPixel(obt_display, ob_screen); + attrib.border_pixel = BlackPixel(obt_display, ob_screen); } - self->window = createWindow(RootWindow(ob_display, ob_screen), visual, + self->window = createWindow(obt_root(ob_screen), visual, mask, &attrib); /* create the visible decor windows */ diff --cc openbox/screen.c index 221e338d,2e48f85c..60638a83 --- a/openbox/screen.c +++ b/openbox/screen.c @@@ -327,14 -337,14 +327,14 @@@ static void screen_tell_ksplash(void hear it anyways. perhaps it is for old ksplash. or new ksplash. or something. oh well. */ e.xclient.type = ClientMessage; - e.xclient.display = ob_display; - e.xclient.window = RootWindow(ob_display, ob_screen); + e.xclient.display = obt_display; + e.xclient.window = obt_root(ob_screen); e.xclient.message_type = - XInternAtom(obt_display, "_KDE_SPLASH_PROGRESS", False ); - XInternAtom(ob_display, "_KDE_SPLASH_PROGRESS", False); ++ XInternAtom(obt_display, "_KDE_SPLASH_PROGRESS", False); e.xclient.format = 8; strcpy(e.xclient.data.b, "wm started"); - XSendEvent(ob_display, RootWindow(ob_display, ob_screen), - False, SubstructureNotifyMask, &e ); + XSendEvent(obt_display, obt_root(ob_screen), + False, SubstructureNotifyMask, &e); } void screen_startup(gboolean reconfig)