X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=5d640a90950e13e0ff111b5dea29e21133e1794c;hb=174de91c343dfbdfe866e566393bf4790ae22596;hp=1295ccaae1f33196b7b4e0814fed9e2d1673ba3b;hpb=3c38171fde2e134f93eef137d7a816338e6fd0f2;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index 1295ccaa..5d640a90 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" @@ -10,6 +28,7 @@ #include "screen.h" #include "client.h" #include "frame.h" +#include "event.h" #include "focus.h" #include "popup.h" #include "extensions.h" @@ -35,7 +54,7 @@ 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; static Rect **area; /* array of desktop holding array of xinerama areas */ @@ -45,7 +64,7 @@ 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; @@ -55,6 +74,8 @@ 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", @@ -182,7 +203,7 @@ gboolean screen_annex() window, screen_support_win); /* set the _NET_SUPPORTED_ATOMS hint */ - num_support = 50; + num_support = 51; i = 0; supported = g_new(guint32, num_support); supported[i++] = prop_atoms.net_current_desktop; @@ -235,6 +256,7 @@ gboolean screen_annex() supported[i++] = prop_atoms.net_wm_state_below; supported[i++] = prop_atoms.net_moveresize_window; supported[i++] = prop_atoms.net_wm_moveresize; + supported[i++] = prop_atoms.ob_wm_state_undecorated; g_assert(i == num_support); /* supported[] = prop_atoms.net_wm_action_stick; @@ -259,9 +281,9 @@ void screen_startup(gboolean reconfig) 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), @@ -314,8 +336,8 @@ void screen_shutdown(gboolean reconfig) 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]; @@ -338,7 +360,7 @@ void screen_resize() 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); } @@ -370,7 +392,7 @@ void screen_set_num_desktops(guint num) screen_update_desktop_names(); /* 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); @@ -418,16 +440,16 @@ void screen_set_desktop(guint num) /* 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) { + 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)) + if (client_should_show(c)) frame_show(c->frame); } } /* 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)) @@ -435,8 +457,20 @@ void screen_set_desktop(guint num) } } - if (!focus_client) - focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS); + event_ignore_queued_enters(); + + focus_hilite = focus_fallback_target(OB_FOCUS_FALLBACK_NOFOCUS); + if (focus_hilite) { + frame_adjust_focus(focus_hilite->frame, TRUE); + + /*! + When this focus_client check is not used, you can end up with races, + as demonstrated with gnome-panel, sometmies the window you click on + another desktop ends up losing focus cuz of the focus change here. + */ + /*if (!focus_client)*/ + client_focus(focus_hilite); + } } static void get_row_col(guint d, guint *r, guint *c) @@ -547,7 +581,7 @@ 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; @@ -612,49 +646,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: @@ -665,15 +731,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; } @@ -783,7 +850,7 @@ 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) @@ -800,28 +867,28 @@ 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); } - } + } } 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); } - } + } } if (show) { /* focus desktop */ - for (it = focus_order[screen_desktop]; it; it = it->next) + for (it = focus_order[screen_desktop]; it; it = g_list_next(it)) if (((ObClient*)it->data)->type == OB_CLIENT_TYPE_DESKTOP && client_focus(it->data)) break; @@ -839,28 +906,73 @@ 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) && + 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); + if (install) + XInstallColormap(RrDisplay(ob_rr_inst), wa.colormap); + else + XUninstallColormap(RrDisplay(ob_rr_inst), wa.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; GList *it; + gint o; g_free(monitor_area); extensions_xinerama_screens(&monitor_area, &screen_num_monitors); @@ -873,14 +985,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); 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) { @@ -899,111 +1013,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) @@ -1018,7 +1141,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); @@ -1064,10 +1190,10 @@ void screen_set_root_cursor() ob_cursor(OB_CURSOR_POINTER)); } -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),