X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=08c22a75082c4da5209986f5b4062b96b39e0cf4;hb=da24f9156bdd4758fa803c73769d3dec0c5d2895;hp=249309094209cdab75f6b2d96e6a3c415beb2373;hpb=36231e5cb39e7f38c20cceebf26d0be66a17a112;p=chaz%2Fopenbox diff --git a/openbox/client.c b/openbox/client.c index 24930909..08c22a75 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -290,11 +290,11 @@ void client_manage(Window window) screen_update_struts(); + dispatch_client(Event_Client_New, self, 0, 0); + /* make sure the window is visible */ client_move_onscreen(self); - dispatch_client(Event_Client_New, self, 0, 0); - client_showhide(self); if (activate) client_activate(self); @@ -587,12 +587,13 @@ static void client_get_area(Client *self) static void client_get_desktop(Client *self) { - guint32 d; + guint32 d = screen_num_desktops; /* an always-invalid value */ if (PROP_GET32(self->window, net_wm_desktop, cardinal, &d)) { if (d >= screen_num_desktops && d != DESKTOP_ALL) - d = screen_num_desktops - 1; - self->desktop = d; + self->desktop = screen_num_desktops - 1; + else + self->desktop = d; } else { gboolean trdesk = FALSE; @@ -616,6 +617,8 @@ static void client_get_desktop(Client *self) /* defaults to the current desktop */ self->desktop = screen_desktop; + } + if (self->desktop != d) { /* set the desktop hint, to make sure that it always exists */ PROP_SET32(self->window, net_wm_desktop, cardinal, self->desktop); } @@ -1027,10 +1030,7 @@ void client_setup_decor_and_functions(Client *self) if (self->type == Type_Desktop && self->desktop != DESKTOP_ALL) client_set_desktop(self, DESKTOP_ALL, FALSE); - /* change the decors on the frame, and with more/less decorations, - we may also need to be repositioned */ - frame_adjust_area(self->frame, TRUE, TRUE); - /* with new decor, the window's maximized size may change */ + /* adjust the client's decorations, etc. */ client_reconfigure(self); } else { /* this makes sure that these windows appear on all desktops */ @@ -1091,8 +1091,11 @@ static void client_change_allowed_actions(Client *self) void client_reconfigure(Client *self) { + /* by making this pass FALSE for user, we avoid the emacs event storm where + every configurenotify causes an update in its normal hints, i think this + is generally what we want anyways... */ client_configure(self, Corner_TopLeft, self->area.x, self->area.y, - self->area.width, self->area.height, TRUE, TRUE); + self->area.width, self->area.height, FALSE, TRUE); } void client_update_wmhints(Client *self) @@ -1333,17 +1336,17 @@ void client_update_icons(Client *self) if (w*h == 0) continue; - self->icons[j].data = g_new(pixel32, w * h); + self->icons[j].data = g_new(RrPixel32, w * h); for (x = 0, y = 0, t = 0; t < w * h; ++t, ++x, ++i) { if (x >= w) { x = 0; ++y; } self->icons[j].data[t] = - (((data[i] >> 24) & 0xff) << default_alpha_offset) + - (((data[i] >> 16) & 0xff) << default_red_offset) + - (((data[i] >> 8) & 0xff) << default_green_offset) + - (((data[i] >> 0) & 0xff) << default_blue_offset); + (((data[i] >> 24) & 0xff) << RrDefaultAlphaOffset) + + (((data[i] >> 16) & 0xff) << RrDefaultRedOffset) + + (((data[i] >> 8) & 0xff) << RrDefaultGreenOffset) + + (((data[i] >> 0) & 0xff) << RrDefaultBlueOffset); } g_assert(i <= num); } @@ -1355,10 +1358,11 @@ void client_update_icons(Client *self) self->nicons++; self->icons = g_new(Icon, self->nicons); xerror_set_ignore(TRUE); - if (!render_pixmap_to_rgba(data[0], data[1], - &self->icons[self->nicons-1].width, - &self->icons[self->nicons-1].height, - &self->icons[self->nicons-1].data)) { + if (!RrPixmapToRGBA(ob_rr_inst, + data[0], data[1], + &self->icons[self->nicons-1].width, + &self->icons[self->nicons-1].height, + &self->icons[self->nicons-1].data)) { g_free(&self->icons[self->nicons-1]); self->nicons--; } @@ -1373,12 +1377,13 @@ void client_update_icons(Client *self) self->nicons++; self->icons = g_new(Icon, self->nicons); xerror_set_ignore(TRUE); - if (!render_pixmap_to_rgba(hints->icon_pixmap, - (hints->flags & IconMaskHint ? - hints->icon_mask : None), - &self->icons[self->nicons-1].width, - &self->icons[self->nicons-1].height, - &self->icons[self->nicons-1].data)){ + if (!RrPixmapToRGBA(ob_rr_inst, + hints->icon_pixmap, + (hints->flags & IconMaskHint ? + hints->icon_mask : None), + &self->icons[self->nicons-1].width, + &self->icons[self->nicons-1].height, + &self->icons[self->nicons-1].data)){ g_free(&self->icons[self->nicons-1]); self->nicons--; } @@ -1502,8 +1507,11 @@ static void calc_recursive(Client *self, Client *orig, StackLayer l, calc_recursive(it->data, orig, l, raised ? raised : l != old); if (!raised && l != old) - if (orig->frame) /* only restack if the original window is managed */ - stacking_raise(CLIENT_AS_WINDOW(self)); + if (orig->frame) { /* only restack if the original window is managed */ + /* XXX add_non_intrusive ever? */ + stacking_remove(CLIENT_AS_WINDOW(self)); + stacking_add(CLIENT_AS_WINDOW(self)); + } } void client_calc_layer(Client *self) @@ -1770,6 +1778,9 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, /* move/resize the frame to match the request */ if (self->frame) { + if (self->decorations != self->frame->decorations) + moved = resized = TRUE; + if (moved || resized) frame_adjust_area(self->frame, moved, resized); @@ -1777,7 +1788,7 @@ void client_configure(Client *self, Corner anchor, int x, int y, int w, int h, clients (emacs) freaking out, cuz they send back a configure every time they receive this event, which resends them this event... etc. */ - if ((moved || resized) && (!user || final)) { + if ((!user && moved) || (user && final)) { XEvent event; event.type = ConfigureNotify; event.xconfigure.display = ob_display;