X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=9ce25dde546da3669067dc0996ad73ce88582bff;hb=9960ef2ff99a8d39b35518e178a624b19f758525;hp=38ad8978d7cf32a56fc3e1637a46c8d4c210dd8e;hpb=7416313cad8d0dc51d5a5ea31b20296755f3049d;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index 38ad8978..9ce25dde 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -1,3 +1,21 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + screen.c for the Openbox window manager + Copyright (c) 2003 Ben Jansens + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + See the COPYING file for a copy of the GNU General Public License. +*/ + #include "debug.h" #include "openbox.h" #include "dock.h" @@ -5,6 +23,7 @@ #include "prop.h" #include "grab.h" #include "startupnotify.h" +#include "moveresize.h" #include "config.h" #include "screen.h" #include "client.h" @@ -40,7 +59,7 @@ Window screen_support_win; static Rect **area; /* array of desktop holding array of xinerama areas */ static Rect *monitor_area; -static Popup *desktop_cycle_popup; +static ObPagerPopup *desktop_cycle_popup; static gboolean replace_wm() { @@ -251,7 +270,7 @@ void screen_startup(gboolean reconfig) GSList *it; guint i; - desktop_cycle_popup = popup_new(FALSE); + desktop_cycle_popup = pager_popup_new(FALSE); if (!reconfig) /* get the initial size */ @@ -287,7 +306,7 @@ void screen_shutdown(gboolean reconfig) { Rect **r; - popup_free(desktop_cycle_popup); + pager_popup_free(desktop_cycle_popup); if (!reconfig) { XSelectInput(ob_display, RootWindow(ob_display, ob_screen), @@ -349,6 +368,8 @@ void screen_set_num_desktops(guint num) g_assert(num > 0); + if (screen_num_desktops == num) return; + old = screen_num_desktops; screen_num_desktops = num; PROP_SET32(RootWindow(ob_display, ob_screen), @@ -366,36 +387,35 @@ 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; - /* move windows on desktops that will no longer exist! */ for (it = client_list; it != NULL; it = it->next) { ObClient *c = it->data; if (c->desktop >= num && c->desktop != DESKTOP_ALL) client_set_desktop(c, num - 1, FALSE); } - + /* change our struts/area to match (after moving windows) */ screen_update_areas(); /* change our desktop if we're on one that no longer exists! */ if (screen_desktop >= screen_num_desktops) screen_set_desktop(num - 1); + + /* 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; } void screen_set_desktop(guint num) { GList *it; guint old; - XEvent e; g_assert(num < screen_num_desktops); @@ -410,6 +430,9 @@ void screen_set_desktop(guint num) ob_debug("Moving to desktop %d\n", num+1); + if (moveresize_client) + client_set_desktop(moveresize_client, num, TRUE); + /* show windows before hiding the rest to lessen the enter/leave events */ /* show windows from top to bottom */ @@ -430,16 +453,8 @@ void screen_set_desktop(guint num) } } - /* focus the last focused window on the desktop, and ignore enter events - from the switch so it doesnt mess with the focus */ - while (XCheckTypedEvent(ob_display, EnterNotify, &e)); -#ifdef DEBUG_FOCUS - ob_debug("switch fallback\n"); -#endif - focus_fallback(OB_FOCUS_FALLBACK_DESKTOP); -#ifdef DEBUG_FOCUS - ob_debug("/switch fallback\n"); -#endif + if (!focus_client) + focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); } static void get_row_col(guint d, guint *r, guint *c) @@ -555,19 +570,18 @@ static void popup_cycle(guint d, gboolean show) Rect *a; if (!show) { - popup_hide(desktop_cycle_popup); + pager_popup_hide(desktop_cycle_popup); } else { a = screen_physical_area_monitor(0); - popup_position(desktop_cycle_popup, CenterGravity, - a->x + a->width / 2, a->y + a->height / 2); + pager_popup_position(desktop_cycle_popup, CenterGravity, + a->x + a->width / 2, a->y + a->height / 2); /* XXX the size and the font extents need to be related on some level */ - popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); + pager_popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); - popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER); + pager_popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER); - popup_show(desktop_cycle_popup, - screen_desktop_names[d], NULL); + pager_popup_show(desktop_cycle_popup, screen_desktop_names[d], d); } } @@ -718,31 +732,39 @@ void screen_update_layout() goto screen_update_layout_bail; } + cols = data[1]; + rows = data[2]; + /* fill in a zero rows/columns */ - if ((data[1] == 0 && data[2] == 0) || /* both 0's is bad data.. */ - (data[1] != 0 && data[2] != 0)) { /* no 0's is bad data.. */ + if ((cols == 0 && rows == 0)) { /* both 0's is bad data.. */ goto screen_update_layout_bail; } else { - if (data[1] == 0) { - data[1] = (screen_num_desktops + - screen_num_desktops % data[2]) / data[2]; - } else if (data[2] == 0) { - data[2] = (screen_num_desktops + - screen_num_desktops % data[1]) / data[1]; + if (cols == 0) { + cols = screen_num_desktops / rows; + if (rows * cols < screen_num_desktops) + cols++; + if (rows * cols >= screen_num_desktops + cols) + rows--; + } else if (rows == 0) { + rows = screen_num_desktops / cols; + if (cols * rows < screen_num_desktops) + rows++; + if (cols * rows >= screen_num_desktops + rows) + cols--; } - cols = data[1]; - rows = data[2]; } /* bounds checking */ if (orient == OB_ORIENTATION_HORZ) { - rows = MIN(rows, screen_num_desktops); - cols = MIN(cols, ((screen_num_desktops + - (screen_num_desktops % rows)) / rows)); + cols = MIN(screen_num_desktops, cols); + rows = MIN(rows, (screen_num_desktops + cols - 1) / cols); + cols = screen_num_desktops / rows + + !!(screen_num_desktops % rows); } else { - cols = MIN(cols, screen_num_desktops); - rows = MIN(rows, ((screen_num_desktops + - (screen_num_desktops % cols)) / cols)); + rows = MIN(screen_num_desktops, rows); + cols = MIN(cols, (screen_num_desktops + rows - 1) / rows); + rows = screen_num_desktops / cols + + !!(screen_num_desktops % cols); } valid = TRUE;