X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fscreen.c;h=74b8e71db4d8c42f553dadab2427cf9b0e9bebba;hb=d0013c0861e29433de10a849032382534c8e1659;hp=b3bd54accf04339854b087c937f0bde45d68a73c;hpb=d3d4aa29871111737a4f6985da695c8688a05270;p=chaz%2Fopenbox diff --git a/openbox/screen.c b/openbox/screen.c index b3bd54ac..74b8e71d 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -2,7 +2,7 @@ screen.c for the Openbox window manager Copyright (c) 2006 Mikael Magnusson - Copyright (c) 2003 Ben Jansens + 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 @@ -34,6 +34,7 @@ #include "popup.h" #include "extensions.h" #include "render/render.h" +#include "gettext.h" #include #ifdef HAVE_UNISTD_H @@ -45,7 +46,7 @@ /*! The event mask to grab on the root window */ #define ROOT_EVENTMASK (StructureNotifyMask | PropertyChangeMask | \ EnterWindowMask | LeaveWindowMask | \ - SubstructureNotifyMask | SubstructureRedirectMask | \ + SubstructureRedirectMask | FocusChangeMask | \ ButtonPressMask | ButtonReleaseMask | ButtonMotionMask) guint screen_num_desktops; @@ -79,7 +80,7 @@ static gboolean replace_wm() 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; } @@ -116,7 +117,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; } @@ -137,8 +138,8 @@ 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(_("Timeout expired while waiting for the current WM to die" + " on screen %d"), ob_screen); return FALSE; } } @@ -166,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); @@ -179,7 +180,7 @@ 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); @@ -204,9 +205,10 @@ gboolean screen_annex() window, screen_support_win); /* set the _NET_SUPPORTED_ATOMS hint */ - num_support = 51; + num_support = 55; i = 0; 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; @@ -255,8 +257,11 @@ 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; supported[i++] = prop_atoms.ob_wm_state_undecorated; g_assert(i == num_support); /* @@ -296,8 +301,16 @@ void screen_startup(gboolean reconfig) screen_num_desktops = 0; screen_set_num_desktops(config_desktops_num); if (!reconfig) { - screen_set_desktop(MIN(config_screen_firstdesk, screen_num_desktops) - - 1); + 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; @@ -368,7 +381,7 @@ void screen_resize() void screen_set_num_desktops(guint num) { - guint i, old; + guint old; gulong *viewport; GList *it; @@ -406,20 +419,11 @@ void screen_set_num_desktops(guint num) /* 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) { + ObClient *c; GList *it; guint old; @@ -441,12 +445,11 @@ void screen_set_desktop(guint num) /* show windows before hiding the rest to lessen the enter/leave events */ - /* show windows from top to bottom */ + /* 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 (client_should_show(c)) - frame_show(c->frame); + client_show(c); } } @@ -454,25 +457,20 @@ void screen_set_desktop(guint num) 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); } } - 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); + /* 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(); } static void get_row_col(guint d, guint *r, guint *c) @@ -871,8 +869,7 @@ void screen_show_desktop(gboolean show) 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 { @@ -880,20 +877,27 @@ void screen_show_desktop(gboolean show) 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 = g_list_next(it)) - 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 */ @@ -1168,6 +1172,30 @@ Rect *screen_area_monitor(guint desktop, guint head) 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);