X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=a302828baf1a7a293d87dc995e6efce2cbb687a5;hb=66d6e1120ec4e66433ecec673258856def164070;hp=3809e05aacac25e128b33020674dc4096051684a;hpb=854da68d0f5bed8c85c101fd6895244d60183ff5;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index 3809e05a..a302828b 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -1,24 +1,40 @@ +/* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*- + + screen.c for the Openbox window manager + Copyright (c) 2006 Mikael Magnusson + Copyright (c) 2003-2007 Dana 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 "mainloop.h" #include "dock.h" #include "xerror.h" #include "prop.h" -#include "startup.h" #include "grab.h" +#include "startupnotify.h" +#include "moveresize.h" #include "config.h" #include "screen.h" #include "client.h" #include "frame.h" +#include "event.h" #include "focus.h" #include "popup.h" #include "extensions.h" #include "render/render.h" - -#ifdef USE_LIBSN -# define SN_API_NOT_YET_FROZEN -# include -#endif +#include "gettext.h" #include #ifdef HAVE_UNISTD_H @@ -29,9 +45,9 @@ /*! The event mask to grab on the root window */ #define ROOT_EVENTMASK (StructureNotifyMask | PropertyChangeMask | \ - EnterWindowMask | LeaveWindowMask | \ - SubstructureNotifyMask | SubstructureRedirectMask | \ - ButtonPressMask | ButtonReleaseMask | ButtonMotionMask) + EnterWindowMask | LeaveWindowMask | \ + SubstructureRedirectMask | FocusChangeMask | \ + ButtonPressMask | ButtonReleaseMask | ButtonMotionMask) guint screen_num_desktops; guint screen_num_monitors; @@ -40,26 +56,18 @@ guint screen_last_desktop; Size screen_physical_size; gboolean screen_showing_desktop; DesktopLayout screen_desktop_layout; -char **screen_desktop_names; +gchar **screen_desktop_names; Window screen_support_win; +Time screen_desktop_user_time = CurrentTime; static Rect **area; /* array of desktop holding array of xinerama areas */ static Rect *monitor_area; -static Popup *desktop_cycle_popup; - -#ifdef USE_LIBSN -static SnMonitorContext *sn_context; -static int sn_busy_cnt; - -static void sn_event_func(SnMonitorEvent *event, void *data); -#endif - -static void set_root_cursor(); +static ObPagerPopup *desktop_cycle_popup; static gboolean replace_wm() { - char *wm_sn; + gchar *wm_sn; Atom wm_sn_atom; Window current_wm_sn_owner; Time timestamp; @@ -69,9 +77,11 @@ static gboolean replace_wm() g_free(wm_sn); current_wm_sn_owner = XGetSelectionOwner(ob_display, wm_sn_atom); + if (current_wm_sn_owner == screen_support_win) + current_wm_sn_owner = None; if (current_wm_sn_owner) { if (!ob_replace_wm) { - g_warning("A window manager is already running on screen %d", + g_message(_("A window manager is already running on screen %d"), ob_screen); return FALSE; } @@ -108,7 +118,7 @@ static gboolean replace_wm() timestamp); if (XGetSelectionOwner(ob_display, wm_sn_atom) != screen_support_win) { - g_warning("Could not acquire window manager selection on screen %d", + g_message(_("Could not acquire window manager selection on screen %d"), ob_screen); return FALSE; } @@ -129,16 +139,15 @@ static gboolean replace_wm() } if (wait >= timeout) { - g_warning("Timeout expired while waiting for the current WM to die " - "on screen %d", ob_screen); + g_message(_("The WM on screen %d is not exiting"), ob_screen); return FALSE; } } /* Send client message indicating that we are now the WM */ prop_message(RootWindow(ob_display, ob_screen), prop_atoms.manager, - timestamp, wm_sn_atom, 0, 0, SubstructureNotifyMask); - + timestamp, wm_sn_atom, screen_support_win, 0, + SubstructureNotifyMask); return TRUE; } @@ -148,7 +157,7 @@ gboolean screen_annex() XSetWindowAttributes attrib; pid_t pid; gint i, num_support; - guint32 *supported; + gulong *supported; /* create the netwm support window */ attrib.override_redirect = TRUE; @@ -158,7 +167,7 @@ gboolean screen_annex() CopyFromParent, InputOutput, CopyFromParent, CWOverrideRedirect, &attrib); - XMapRaised(ob_display, screen_support_win); + XMapWindow(ob_display, screen_support_win); if (!replace_wm()) { XDestroyWindow(ob_display, screen_support_win); @@ -171,15 +180,15 @@ gboolean screen_annex() ROOT_EVENTMASK); xerror_set_ignore(FALSE); if (xerror_occured) { - g_warning("A window manager is already running on screen %d", + g_message(_("A window manager is already running on screen %d"), ob_screen); XDestroyWindow(ob_display, screen_support_win); - return FALSE; + return FALSE; } - set_root_cursor(); + screen_set_root_cursor(); /* set the OPENBOX_PID hint */ pid = getpid(); @@ -196,9 +205,13 @@ gboolean screen_annex() window, screen_support_win); /* set the _NET_SUPPORTED_ATOMS hint */ - num_support = 50; + num_support = 55; +#ifdef SYNC + num_support += 2; +#endif i = 0; - supported = g_new(guint32, num_support); + supported = g_new(gulong, num_support); + supported[i++] = prop_atoms.net_wm_full_placement; supported[i++] = prop_atoms.net_current_desktop; supported[i++] = prop_atoms.net_number_of_desktops; supported[i++] = prop_atoms.net_desktop_geometry; @@ -247,12 +260,17 @@ gboolean screen_annex() supported[i++] = prop_atoms.net_wm_state_fullscreen; supported[i++] = prop_atoms.net_wm_state_above; supported[i++] = prop_atoms.net_wm_state_below; + supported[i++] = prop_atoms.net_wm_state_demands_attention; supported[i++] = prop_atoms.net_moveresize_window; supported[i++] = prop_atoms.net_wm_moveresize; + supported[i++] = prop_atoms.net_wm_user_time; + supported[i++] = prop_atoms.net_frame_extents; +#ifdef SYNC + supported[i++] = prop_atoms.net_wm_sync_request; + supported[i++] = prop_atoms.net_wm_sync_request_counter; +#endif + supported[i++] = prop_atoms.ob_wm_state_undecorated; g_assert(i == num_support); -/* - supported[] = prop_atoms.net_wm_action_stick; -*/ PROP_SETA32(RootWindow(ob_display, ob_screen), net_supported, atom, supported, num_support); @@ -261,20 +279,21 @@ gboolean screen_annex() return TRUE; } -void screen_startup() +void screen_startup(gboolean reconfig) { GSList *it; guint i; - desktop_cycle_popup = popup_new(FALSE); + desktop_cycle_popup = pager_popup_new(FALSE); - /* get the initial size */ - screen_resize(); + if (!reconfig) + /* get the initial size */ + screen_resize(); /* set the names */ - screen_desktop_names = g_new(char*, + screen_desktop_names = g_new(gchar*, g_slist_length(config_desktops_names) + 1); - for (i = 0, it = config_desktops_names; it; ++i, it = it->next) + for (i = 0, it = config_desktops_names; it; ++i, it = g_slist_next(it)) screen_desktop_names[i] = it->data; /* dont strdup */ screen_desktop_names[i] = NULL; PROP_SETSS(RootWindow(ob_display, ob_screen), @@ -282,56 +301,64 @@ void screen_startup() g_free(screen_desktop_names); /* dont free the individual strings */ screen_desktop_names = NULL; - screen_num_desktops = 0; + if (!reconfig) + screen_num_desktops = 0; screen_set_num_desktops(config_desktops_num); - if (startup_desktop >= screen_num_desktops) - startup_desktop = 0; - screen_desktop = startup_desktop; - screen_set_desktop(startup_desktop); - - /* don't start in showing-desktop mode */ - screen_showing_desktop = FALSE; - PROP_SET32(RootWindow(ob_display, ob_screen), - net_showing_desktop, cardinal, screen_showing_desktop); - - screen_update_layout(); - -#ifdef USE_LIBSN - sn_context = sn_monitor_context_new(ob_sn_display, ob_screen, - sn_event_func, NULL, NULL); - sn_busy_cnt = 0; -#endif + if (!reconfig) { + guint32 d; + /* start on the current desktop when a wm was already running */ + if (PROP_GET32(RootWindow(ob_display, ob_screen), + net_current_desktop, cardinal, &d) && + d < screen_num_desktops) + { + screen_set_desktop(d); + } else + screen_set_desktop(MIN(config_screen_firstdesk, + screen_num_desktops) - 1); + + /* don't start in showing-desktop mode */ + screen_showing_desktop = FALSE; + PROP_SET32(RootWindow(ob_display, ob_screen), + net_showing_desktop, cardinal, screen_showing_desktop); + + screen_update_layout(); + } } -void screen_shutdown() +void screen_shutdown(gboolean reconfig) { Rect **r; - popup_free(desktop_cycle_popup); + pager_popup_free(desktop_cycle_popup); - XSelectInput(ob_display, RootWindow(ob_display, ob_screen), NoEventMask); + if (!reconfig) { + XSelectInput(ob_display, RootWindow(ob_display, ob_screen), + NoEventMask); - /* we're not running here no more! */ - PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid); - /* not without us */ - PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported); - /* don't keep this mode */ - PROP_ERASE(RootWindow(ob_display, ob_screen), net_showing_desktop); + /* we're not running here no more! */ + PROP_ERASE(RootWindow(ob_display, ob_screen), openbox_pid); + /* not without us */ + PROP_ERASE(RootWindow(ob_display, ob_screen), net_supported); + /* don't keep this mode */ + PROP_ERASE(RootWindow(ob_display, ob_screen), net_showing_desktop); - XDestroyWindow(ob_display, screen_support_win); + XDestroyWindow(ob_display, screen_support_win); + } g_strfreev(screen_desktop_names); + screen_desktop_names = NULL; for (r = area; *r; ++r) g_free(*r); g_free(area); + area = NULL; } void screen_resize() { - static int oldw = 0, oldh = 0; - int w, h; + static gint oldw = 0, oldh = 0; + gint w, h; GList *it; - guint32 geometry[2]; + gulong geometry[2]; w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen)); h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen)); @@ -347,30 +374,32 @@ void screen_resize() net_desktop_geometry, cardinal, geometry, 2); if (ob_state() == OB_STATE_STARTING) - return; + return; screen_update_areas(); dock_configure(); - for (it = client_list; it; it = it->next) + for (it = client_list; it; it = g_list_next(it)) client_move_onscreen(it->data, FALSE); } void screen_set_num_desktops(guint num) { - guint i, old; - guint32 *viewport; + guint old; + gulong *viewport; GList *it; 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), net_number_of_desktops, cardinal, num); /* set the viewport hint */ - viewport = g_new0(guint32, num * 2); + viewport = g_new0(gulong, num * 2); PROP_SETA32(RootWindow(ob_display, ob_screen), net_desktop_viewport, cardinal, viewport, num * 2); g_free(viewport); @@ -381,36 +410,26 @@ 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) { + for (it = client_list; it; it = g_list_next(it)) { 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); + screen_set_desktop(num - 1); } void screen_set_desktop(guint num) { + ObClient *c; GList *it; guint old; - XEvent e; g_assert(num < screen_num_desktops); @@ -425,36 +444,40 @@ 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 */ - for (it = stacking_list; it != NULL; it = it->next) { + /* show/hide windows from top to bottom */ + for (it = stacking_list; it; it = g_list_next(it)) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; - if (!c->frame->visible && client_should_show(c)) - frame_show(c->frame); + client_show(c); } } /* hide windows from bottom to top */ - for (it = g_list_last(stacking_list); it != NULL; it = it->prev) { + for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *c = it->data; - if (c->frame->visible && !client_should_show(c)) - frame_hide(c->frame); + client_hide(c); } } - /* 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 + /* have to try focus here because when you leave an empty desktop + there is no focus out to watch for */ + if ((c = focus_fallback_target(TRUE, focus_client))) { + /* reduce flicker by hiliting now rather than waiting for the server + FocusIn event */ + frame_adjust_focus(c->frame, TRUE); + client_focus(c); + } + + event_ignore_queued_enters(); + + if (event_curtime != CurrentTime) + screen_desktop_user_time = event_curtime; } static void get_row_col(guint d, guint *r, guint *c) @@ -565,24 +588,20 @@ static guint translate_row_col(guint r, guint c) return 0; } -static void popup_cycle(guint d, gboolean show) +void screen_desktop_popup(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); - /* XXX the size and the font extents need to be related on some level - */ - popup_size(desktop_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT); - - popup_set_text_align(desktop_cycle_popup, RR_JUSTIFY_CENTER); + pager_popup_position(desktop_cycle_popup, CenterGravity, + a->x + a->width / 2, a->y + a->height / 2); + pager_popup_width(desktop_cycle_popup, MAX(a->width/3, POPUP_WIDTH)); + pager_popup_height(desktop_cycle_popup, POPUP_HEIGHT); - popup_show(desktop_cycle_popup, - screen_desktop_names[d], NULL); + pager_popup_show(desktop_cycle_popup, screen_desktop_names[d], d); } } @@ -590,7 +609,6 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, gboolean dialog, gboolean done, gboolean cancel) { static gboolean first = TRUE; - static gboolean lin; static guint origd, d; guint r, c; @@ -602,13 +620,12 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, } if (first) { first = FALSE; - lin = linear; d = origd = screen_desktop; } get_row_col(d, &r, &c); - if (lin) { + if (linear) { switch (dir) { case OB_DIRECTION_EAST: if (d < screen_num_desktops - 1) @@ -631,49 +648,81 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, case OB_DIRECTION_EAST: ++c; if (c >= screen_desktop_layout.columns) { - if (!wrap) return d = screen_desktop; - c = 0; + if (wrap) { + c = 0; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { - if (!wrap) return d = screen_desktop; - ++c; + if (wrap) { + ++c; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } break; case OB_DIRECTION_WEST: --c; if (c >= screen_desktop_layout.columns) { - if (!wrap) return d = screen_desktop; - c = screen_desktop_layout.columns - 1; + if (wrap) { + c = screen_desktop_layout.columns - 1; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { - if (!wrap) return d = screen_desktop; - --c; + if (wrap) { + --c; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } break; case OB_DIRECTION_SOUTH: ++r; if (r >= screen_desktop_layout.rows) { - if (!wrap) return d = screen_desktop; - r = 0; + if (wrap) { + r = 0; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { - if (!wrap) return d = screen_desktop; - ++r; + if (wrap) { + ++r; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } break; case OB_DIRECTION_NORTH: --r; if (r >= screen_desktop_layout.rows) { - if (!wrap) return d = screen_desktop; - r = screen_desktop_layout.rows - 1; + if (wrap) { + r = screen_desktop_layout.rows - 1; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } d = translate_row_col(r, c); if (d >= screen_num_desktops) { - if (!wrap) return d = screen_desktop; - --r; + if (wrap) { + --r; + } else { + d = screen_desktop; + goto show_cycle_dialog; + } } break; default: @@ -684,15 +733,16 @@ guint screen_cycle_desktop(ObDirection dir, gboolean wrap, gboolean linear, d = translate_row_col(r, c); } +show_cycle_dialog: if (dialog) { - popup_cycle(d, TRUE); + screen_desktop_popup(d, TRUE); return d; } done_cycle: first = TRUE; - popup_cycle(0, FALSE); + screen_desktop_popup(0, FALSE); return d; } @@ -733,31 +783,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; @@ -794,11 +852,11 @@ void screen_update_desktop_names() else i = 0; if (i <= screen_num_desktops) { - screen_desktop_names = g_renew(char*, screen_desktop_names, + screen_desktop_names = g_renew(gchar*, screen_desktop_names, screen_num_desktops + 1); screen_desktop_names[screen_num_desktops] = NULL; for (; i < screen_num_desktops; ++i) - screen_desktop_names[i] = g_strdup("Unnamed Desktop"); + screen_desktop_names[i] = g_strdup_printf("Desktop %i", i + 1); } } @@ -811,33 +869,39 @@ void screen_show_desktop(gboolean show) screen_showing_desktop = show; if (show) { - /* bottom to top */ - for (it = g_list_last(stacking_list); it != NULL; it = it->prev) { + /* bottom to top */ + for (it = g_list_last(stacking_list); it; it = g_list_previous(it)) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *client = it->data; - if (client->frame->visible && !client_should_show(client)) - frame_hide(client->frame); + client_showhide(client); } - } + } } else { /* top to bottom */ - for (it = stacking_list; it != NULL; it = it->next) { + for (it = stacking_list; it; it = g_list_next(it)) { if (WINDOW_IS_CLIENT(it->data)) { ObClient *client = it->data; - if (!client->frame->visible && client_should_show(client)) - frame_show(client->frame); + client_showhide(client); } - } + } } if (show) { /* focus desktop */ - for (it = focus_order[screen_desktop]; it; it = it->next) - if (((ObClient*)it->data)->type == OB_CLIENT_TYPE_DESKTOP && + for (it = focus_order; it; it = g_list_next(it)) { + ObClient *c = it->data; + if (c->type == OB_CLIENT_TYPE_DESKTOP && + (c->desktop == screen_desktop || c->desktop == DESKTOP_ALL) && client_focus(it->data)) break; + } } else { - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); + ObClient *c; + + /* use NULL for the "old" argument because the desktop was focused + and we don't want to fallback to the desktop by default */ + if ((c = focus_fallback_target(TRUE, NULL))) + client_focus(c); } show = !!show; /* make it boolean */ @@ -847,31 +911,72 @@ void screen_show_desktop(gboolean show) void screen_install_colormap(ObClient *client, gboolean install) { - XWindowAttributes wa; - if (client == NULL) { - if (install) - XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); - else - XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); + if (install) + XInstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); + else + XUninstallColormap(RrDisplay(ob_rr_inst), RrColormap(ob_rr_inst)); } else { - if (XGetWindowAttributes(ob_display, client->window, &wa) && - wa.colormap != None) { - xerror_set_ignore(TRUE); - if (install) - XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap); - else - XUninstallColormap(RrDisplay(ob_rr_inst), wa.colormap); - xerror_set_ignore(FALSE); - } + xerror_set_ignore(TRUE); + if (install) { + if (client->colormap != None) + XInstallColormap(RrDisplay(ob_rr_inst), client->colormap); + } else + XUninstallColormap(RrDisplay(ob_rr_inst), client->colormap); + xerror_set_ignore(FALSE); } } +static inline void +screen_area_add_strut_left(const StrutPartial *s, const Rect *monitor_area, + gint edge, Strut *ret) +{ + if (s->left && + ((s->left_end <= s->left_start) || + (RECT_TOP(*monitor_area) < s->left_end && + RECT_BOTTOM(*monitor_area) > s->left_start))) + ret->left = MAX(ret->left, edge); +} + +static inline void +screen_area_add_strut_top(const StrutPartial *s, const Rect *monitor_area, + gint edge, Strut *ret) +{ + if (s->top && + ((s->top_end <= s->top_start) || + (RECT_LEFT(*monitor_area) < s->top_end && + RECT_RIGHT(*monitor_area) > s->top_start))) + ret->top = MAX(ret->top, edge); +} + +static inline void +screen_area_add_strut_right(const StrutPartial *s, const Rect *monitor_area, + gint edge, Strut *ret) +{ + if (s->right && + ((s->right_end <= s->right_start) || + (RECT_TOP(*monitor_area) < s->right_end && + RECT_BOTTOM(*monitor_area) > s->right_start))) + ret->right = MAX(ret->right, edge); +} + +static inline void +screen_area_add_strut_bottom(const StrutPartial *s, const Rect *monitor_area, + gint edge, Strut *ret) +{ + if (s->bottom && + ((s->bottom_end <= s->bottom_start) || + (RECT_LEFT(*monitor_area) < s->bottom_end && + RECT_RIGHT(*monitor_area) > s->bottom_start))) + ret->bottom = MAX(ret->bottom, edge); +} + void screen_update_areas() { guint i, x; - guint32 *dims; + gulong *dims; GList *it; + gint o; g_free(monitor_area); extensions_xinerama_screens(&monitor_area, &screen_num_monitors); @@ -884,14 +989,16 @@ void screen_update_areas() area = g_new(Rect*, screen_num_desktops + 2); for (i = 0; i < screen_num_desktops + 1; ++i) - area[i] = g_new(Rect, screen_num_monitors + 1); + area[i] = g_new0(Rect, screen_num_monitors + 1); area[i] = NULL; - dims = g_new(guint32, 4 * screen_num_desktops); + dims = g_new(gulong, 4 * screen_num_desktops); for (i = 0; i < screen_num_desktops + 1; ++i) { - Strut s; - int l, r, t, b; + Strut *struts; + gint l, r, t, b; + + struts = g_new0(Strut, screen_num_monitors); /* calc the xinerama areas */ for (x = 0; x < screen_num_monitors; ++x) { @@ -910,111 +1017,120 @@ void screen_update_areas() } RECT_SET(area[i][x], l, t, r - l + 1, b - t + 1); - /* apply struts */ - STRUT_SET(s, 0, 0, 0, 0); - for (it = client_list; it; it = it->next) - STRUT_ADD(s, ((ObClient*)it->data)->strut); - STRUT_ADD(s, dock_strut); - - if (s.left) { - int o; - - /* find the left-most xin heads, i do this in 2 loops :| */ - o = area[i][0].x; - for (x = 1; x < screen_num_monitors; ++x) - o = MIN(o, area[i][x].x); - - for (x = 0; x < screen_num_monitors; ++x) { - int edge = o + s.left - area[i][x].x; - if (edge > 0) { - area[i][x].x += edge; - area[i][x].width -= edge; - } - } + /* apply the struts */ - area[i][screen_num_monitors].x += s.left; - area[i][screen_num_monitors].width -= s.left; - } - if (s.top) { - int o; - - /* find the left-most xin heads, i do this in 2 loops :| */ - o = area[i][0].y; - for (x = 1; x < screen_num_monitors; ++x) - o = MIN(o, area[i][x].y); - - for (x = 0; x < screen_num_monitors; ++x) { - int edge = o + s.top - area[i][x].y; - if (edge > 0) { - area[i][x].y += edge; - area[i][x].height -= edge; - } - } + /* find the left-most xin heads, i do this in 2 loops :| */ + o = area[i][0].x; + for (x = 1; x < screen_num_monitors; ++x) + o = MIN(o, area[i][x].x); - area[i][screen_num_monitors].y += s.top; - area[i][screen_num_monitors].height -= s.top; - } - if (s.right) { - int o; - - /* find the bottom-most xin heads, i do this in 2 loops :| */ - o = area[i][0].x + area[i][0].width - 1; - for (x = 1; x < screen_num_monitors; ++x) - o = MAX(o, area[i][x].x + area[i][x].width - 1); - - for (x = 0; x < screen_num_monitors; ++x) { - int edge = (area[i][x].x + area[i][x].width - 1) - - (o - s.right); - if (edge > 0) - area[i][x].width -= edge; + for (x = 0; x < screen_num_monitors; ++x) { + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + screen_area_add_strut_left(&c->strut, + &monitor_area[x], + o + c->strut.left - area[i][x].x, + &struts[x]); } + screen_area_add_strut_left(&dock_strut, + &monitor_area[x], + o + dock_strut.left - area[i][x].x, + &struts[x]); - area[i][screen_num_monitors].width -= s.right; + area[i][x].x += struts[x].left; + area[i][x].width -= struts[x].left; } - if (s.bottom) { - int o; - - /* find the bottom-most xin heads, i do this in 2 loops :| */ - o = area[i][0].y + area[i][0].height - 1; - for (x = 1; x < screen_num_monitors; ++x) - o = MAX(o, area[i][x].y + area[i][x].height - 1); - - for (x = 0; x < screen_num_monitors; ++x) { - int edge = (area[i][x].y + area[i][x].height - 1) - - (o - s.bottom); - if (edge > 0) - area[i][x].height -= edge; - } - area[i][screen_num_monitors].height -= s.bottom; - } + /* find the top-most xin heads, i do this in 2 loops :| */ + o = area[i][0].y; + for (x = 1; x < screen_num_monitors; ++x) + o = MIN(o, area[i][x].y); - /* XXX when dealing with partial struts, if its in a single - xinerama area, then only subtract it from that area's space for (x = 0; x < screen_num_monitors; ++x) { - GList *it; - + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + screen_area_add_strut_top(&c->strut, + &monitor_area[x], + o + c->strut.top - area[i][x].y, + &struts[x]); + } + screen_area_add_strut_top(&dock_strut, + &monitor_area[x], + o + dock_strut.top - area[i][x].y, + &struts[x]); - do something smart with it for the 'all xinerama areas' one... + area[i][x].y += struts[x].top; + area[i][x].height -= struts[x].top; + } - for (it = client_list; it; it = it->next) { + /* find the right-most xin heads, i do this in 2 loops :| */ + o = area[i][0].x + area[i][0].width - 1; + for (x = 1; x < screen_num_monitors; ++x) + o = MAX(o, area[i][x].x + area[i][x].width - 1); - XXX if gunna test this shit, then gotta worry about when - the client moves between xinerama heads.. + for (x = 0; x < screen_num_monitors; ++x) { + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + screen_area_add_strut_right(&c->strut, + &monitor_area[x], + (area[i][x].x + + area[i][x].width - 1) - + (o - c->strut.right), + &struts[x]); + } + screen_area_add_strut_right(&dock_strut, + &monitor_area[x], + (area[i][x].x + + area[i][x].width - 1) - + (o - dock_strut.right), + &struts[x]); + + area[i][x].width -= struts[x].right; + } - if (RECT_CONTAINS_RECT(((ObClient*)it->data)->frame->area, - area[i][x])) { + /* find the bottom-most xin heads, i do this in 2 loops :| */ + o = area[i][0].y + area[i][0].height - 1; + for (x = 1; x < screen_num_monitors; ++x) + o = MAX(o, area[i][x].y + area[i][x].height - 1); - } + for (x = 0; x < screen_num_monitors; ++x) { + for (it = client_list; it; it = g_list_next(it)) { + ObClient *c = it->data; + screen_area_add_strut_bottom(&c->strut, + &monitor_area[x], + (area[i][x].y + + area[i][x].height - 1) - \ + (o - c->strut.bottom), + &struts[x]); } + screen_area_add_strut_bottom(&dock_strut, + &monitor_area[x], + (area[i][x].y + + area[i][x].height - 1) - \ + (o - dock_strut.bottom), + &struts[x]); + + area[i][x].height -= struts[x].bottom; + } + + l = RECT_LEFT(area[i][0]); + t = RECT_TOP(area[i][0]); + r = RECT_RIGHT(area[i][0]); + b = RECT_BOTTOM(area[i][0]); + for (x = 1; x < screen_num_monitors; ++x) { + l = MIN(l, RECT_LEFT(area[i][x])); + t = MIN(l, RECT_TOP(area[i][x])); + r = MAX(r, RECT_RIGHT(area[i][x])); + b = MAX(b, RECT_BOTTOM(area[i][x])); } - */ + RECT_SET(area[i][screen_num_monitors], l, t, + r - l + 1, b - t + 1); /* XXX optimize when this is run? */ /* the area has changed, adjust all the maximized windows */ - for (it = client_list; it; it = it->next) { + for (it = client_list; it; it = g_list_next(it)) { ObClient *c = it->data; if (i < screen_num_desktops) { if (c->desktop == i) @@ -1029,7 +1145,10 @@ void screen_update_areas() dims[(i * 4) + 2] = area[i][screen_num_monitors].width; dims[(i * 4) + 3] = area[i][screen_num_monitors].height; } + + g_free(struts); } + PROP_SETA32(RootWindow(ob_display, ob_screen), net_workarea, cardinal, dims, 4 * screen_num_desktops); @@ -1046,13 +1165,37 @@ Rect *screen_area_monitor(guint desktop, guint head) if (head > screen_num_monitors) return NULL; if (desktop >= screen_num_desktops) { - if (desktop == DESKTOP_ALL) - return &area[screen_num_desktops][head]; - return NULL; + if (desktop == DESKTOP_ALL) + return &area[screen_num_desktops][head]; + return NULL; } return &area[desktop][head]; } +guint screen_find_monitor(Rect *search) +{ + guint i; + guint most = 0; + guint mostv = 0; + + for (i = 0; i < screen_num_monitors; ++i) { + Rect *area = screen_physical_area_monitor(i); + if (RECT_INTERSECTS_RECT(*area, *search)) { + Rect r; + guint v; + + RECT_SET_INTERSECTION(r, *area, *search); + v = r.width * r.height; + + if (v > mostv) { + mostv = v; + most = i; + } + } + } + return most; +} + Rect *screen_physical_area() { return screen_physical_area_monitor(screen_num_monitors); @@ -1065,71 +1208,20 @@ Rect *screen_physical_area_monitor(guint head) return &monitor_area[head]; } -static void set_root_cursor() -{ -#ifdef USE_LIBSN - if (sn_busy_cnt) - XDefineCursor(ob_display, RootWindow(ob_display, ob_screen), - ob_cursor(OB_CURSOR_BUSY)); - else -#endif - XDefineCursor(ob_display, RootWindow(ob_display, ob_screen), - ob_cursor(OB_CURSOR_POINTER)); -} - -#ifdef USE_LIBSN -static gboolean sn_timeout(gpointer data) -{ - sn_busy_cnt = 0; - - set_root_cursor(); - - return FALSE; /* don't repeat */ -} - -static void sn_event_func(SnMonitorEvent *ev, void *data) +void screen_set_root_cursor() { - SnStartupSequence *seq; - const char *seq_id, *bin_name; - int cnt = sn_busy_cnt; - - if (!(seq = sn_monitor_event_get_startup_sequence(ev))) - return; - - seq_id = sn_startup_sequence_get_id(seq); - bin_name = sn_startup_sequence_get_binary_name(seq); - - if (!(seq_id && bin_name)) - return; - - switch (sn_monitor_event_get_type(ev)) { - case SN_MONITOR_EVENT_INITIATED: - ++sn_busy_cnt; - ob_main_loop_timeout_remove(ob_main_loop, sn_timeout); - /* 30 second timeout for apps to start */ - ob_main_loop_timeout_add(ob_main_loop, 30 * G_USEC_PER_SEC, - sn_timeout, NULL, NULL); - break; - case SN_MONITOR_EVENT_CHANGED: - break; - case SN_MONITOR_EVENT_COMPLETED: - if (sn_busy_cnt) --sn_busy_cnt; - ob_main_loop_timeout_remove(ob_main_loop, sn_timeout); - break; - case SN_MONITOR_EVENT_CANCELED: - if (sn_busy_cnt) --sn_busy_cnt; - ob_main_loop_timeout_remove(ob_main_loop, sn_timeout); - }; - - if (sn_busy_cnt != cnt) - set_root_cursor(); + if (sn_app_starting()) + XDefineCursor(ob_display, RootWindow(ob_display, ob_screen), + ob_cursor(OB_CURSOR_BUSY)); + else + XDefineCursor(ob_display, RootWindow(ob_display, ob_screen), + ob_cursor(OB_CURSOR_POINTER)); } -#endif -gboolean screen_pointer_pos(int *x, int *y) +gboolean screen_pointer_pos(gint *x, gint *y) { Window w; - int i; + gint i; guint u; return !!XQueryPointer(ob_display, RootWindow(ob_display, ob_screen),