X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=21fff19b6d8a41be507158c01a4a16305c0bee33;hb=e442c6cc56813ac2d80ddf956603b6d0123d8145;hp=d077c495e74b1f7c79b67f96ec028de4cc4ea228;hpb=f8a47de5ec444c452093371e3db16857eb39a490;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index d077c495..21fff19b 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -2,7 +2,11 @@ #include "prop.h" #include "screen.h" #include "client.h" +#include "frame.h" +#include "engine.h" #include "focus.h" +#include "dispatch.h" +#include "../render/render.h" #include #ifdef HAVE_UNISTD_H @@ -16,7 +20,7 @@ SubstructureNotifyMask | SubstructureRedirectMask | \ ButtonPressMask | ButtonReleaseMask | ButtonMotionMask) -guint screen_num_desktops = 1; +guint screen_num_desktops = 0; guint screen_desktop = 0; Size screen_physical_size; gboolean screen_showing_desktop; @@ -25,6 +29,7 @@ GPtrArray *screen_desktop_names; static Rect *area = NULL; static Strut *strut = NULL; +static Window support_window = None; static void screen_update_area(); @@ -41,7 +46,6 @@ static int another_running(Display *d, XErrorEvent *e) gboolean screen_annex() { XErrorHandler old; - Window support; pid_t pid; int i, num_support; Atom *supported; @@ -64,14 +68,14 @@ gboolean screen_annex() PROP_SET32(ob_root, openbox_pid, cardinal, pid); /* create the netwm support window */ - support = XCreateSimpleWindow(ob_display, ob_root, 0, 0, 1, 1, 0, 0, 0); + support_window = XCreateSimpleWindow(ob_display, ob_root, 0,0,1,1,0,0,0); /* set supporting window */ - PROP_SET32(ob_root, net_supporting_wm_check, window, support); + PROP_SET32(ob_root, net_supporting_wm_check, window, support_window); /* set properties on the supporting window */ - PROP_SETS(support, net_wm_name, utf8, "Openbox"); - PROP_SET32(support, net_supporting_wm_check, window, support); + PROP_SETS(support_window, net_wm_name, utf8, "Openbox"); + PROP_SET32(support_window, net_supporting_wm_check, window,support_window); /* set the _NET_SUPPORTED_ATOMS hint */ num_support = 48; @@ -162,6 +166,15 @@ void screen_startup() void screen_shutdown() { guint i; + + XSelectInput(ob_display, ob_root, NoEventMask); + + PROP_ERASE(ob_root, openbox_pid); /* we're not running here no more! */ + PROP_ERASE(ob_root, net_supported); /* not without us */ + PROP_ERASE(ob_root, net_showing_desktop); /* don't keep this mode */ + + XDestroyWindow(ob_display, support_window); + for (i = 0; i < screen_desktop_names->len; ++i) g_free(g_ptr_array_index(screen_desktop_names, i)); g_ptr_array_free(screen_desktop_names, TRUE); @@ -171,10 +184,10 @@ void screen_shutdown() void screen_resize() { - /* Set the _NET_DESKTOP_GEOMETRY hint */ /* XXX RandR support here? */ int geometry[2]; + /* Set the _NET_DESKTOP_GEOMETRY hint */ geometry[0] = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)); geometry[1] = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)); PROP_SET32A(ob_root, net_desktop_geometry, cardinal, geometry, 2); @@ -191,7 +204,8 @@ void screen_resize() void screen_set_num_desktops(guint num) { - unsigned long *viewport; + guint i, old; + gulong *viewport; g_assert(num > 0); @@ -214,11 +228,12 @@ void screen_set_num_desktops(guint num) } */ + old = screen_num_desktops; screen_num_desktops = num; PROP_SET32(ob_root, net_number_of_desktops, cardinal, num); /* set the viewport hint */ - viewport = g_new0(unsigned long, num * 2); + viewport = g_new0(gulong, num * 2); PROP_SET32A(ob_root, net_desktop_viewport, cardinal, viewport, num * 2); g_free(viewport); @@ -231,6 +246,18 @@ void screen_set_num_desktops(guint num) /* may be some unnamed desktops that we need to fill in with names */ screen_update_desktop_names(); + /* update the focus lists */ + /* free our lists for the desktops which have disappeared */ + for (i = num; i < old; ++i) + g_list_free(focus_order[i]); + /* realloc the array */ + focus_order = g_renew(GList*, focus_order, num); + /* set the new lists to be empty */ + for (i = old; i < num; ++i) + focus_order[i] = NULL; + + dispatch_ob(Event_Ob_NumDesktops, num, old); + /* change our desktop if we're on one that no longer exists! */ if (screen_desktop >= screen_num_desktops) screen_set_desktop(num - 1); @@ -239,24 +266,33 @@ void screen_set_num_desktops(guint num) void screen_set_desktop(guint num) { GList *it; - - guint old = screen_desktop; + guint old; g_assert(num < screen_num_desktops); g_message("Moving to desktop %u", num); + old = screen_desktop; screen_desktop = num; PROP_SET32(ob_root, net_current_desktop, cardinal, num); if (old == num) return; - for (it = stacking_list; it != NULL; it = it->next) - client_showhide(it->data, FALSE); + /* hide windows from bottom to top */ + for (it = g_list_last(stacking_list); it != NULL; it = it->prev) { + Client *c = it->data; + if (c->frame->visible && !client_should_show(c)) + engine_frame_hide(c->frame); + } - /* force the callbacks to fire */ - if (focus_client == NULL) - focus_set_client(NULL); + /* show windows from top to bottom */ + for (it = stacking_list; it != NULL; it = it->next) { + Client *c = it->data; + if (!c->frame->visible && client_should_show(c)) + engine_frame_show(c->frame); + } + + dispatch_ob(Event_Ob_Desktop, num, old); } void screen_update_layout() @@ -356,15 +392,15 @@ void screen_show_desktop(gboolean show) Client *client = it->data; if (client->type == Type_Desktop) client_focus(client); - else - client_showhide(client, FALSE); + else if (client->frame->visible && !client_should_show(client)) + engine_frame_hide(client->frame); } } else { /* top to bottom */ for (it = stacking_list; it != NULL; it = it->next) { Client *client = it->data; - if (client->type != Type_Desktop) - client_showhide(client, FALSE); + if (!client->frame->visible && client_should_show(client)) + engine_frame_show(client->frame); } } @@ -377,20 +413,19 @@ void screen_show_desktop(gboolean show) } } - show = show ? 1 : 0; /* make it boolean */ + show = !!show; /* make it boolean */ PROP_SET32(ob_root, net_showing_desktop, cardinal, show); + + dispatch_ob(Event_Ob_ShowDesktop, show, 0); } void screen_install_colormap(Client *client, gboolean install) { if (client == NULL) { - /* XXX DONT USE THE DEFAULT SHIT HERE */ if (install) - XInstallColormap(ob_display, - DefaultColormap(ob_display, ob_screen)); + XInstallColormap(ob_display, render_colormap); else - XUninstallColormap(ob_display, - DefaultColormap(ob_display, ob_screen)); + XUninstallColormap(ob_display, render_colormap); } else { XWindowAttributes wa; if (XGetWindowAttributes(ob_display, client->window, &wa)) {