From: Dana Jansens Date: Sun, 13 May 2007 22:33:52 +0000 (+0000) Subject: merge r6484-6489 from trunk X-Git-Tag: openbox-3_3_991-RELEASE~49 X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=fb9b3eb51b5e5c226edf9aedfba21027f6cfe332 merge r6484-6489 from trunk --- diff --git a/README b/README index fbcb5a6..9c66864 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ Openbox -Copyright (C) 2004-2005 Mikael Magnusson +Copyright (C) 2004-2007 Mikael Magnusson Copyright (C) 2002-2007 Dana Jansens ---- diff --git a/data/rc.xml b/data/rc.xml index 7818578..d4b5328 100644 --- a/data/rc.xml +++ b/data/rc.xml @@ -229,7 +229,7 @@ - + diff --git a/openbox/action.c b/openbox/action.c index 0f1a04d..8c8064f 100644 --- a/openbox/action.c +++ b/openbox/action.c @@ -1309,7 +1309,7 @@ void action_focus(union ActionData *data) void action_unfocus (union ActionData *data) { if (data->client.any.c == focus_client) - focus_fallback(FALSE); + focus_fallback(TRUE); } void action_iconify(union ActionData *data) diff --git a/openbox/client.c b/openbox/client.c index 3d6ae52..dd47fff 100644 --- a/openbox/client.c +++ b/openbox/client.c @@ -1181,7 +1181,7 @@ static void client_get_state(ObClient *self) self->below = TRUE; else if (state[i] == prop_atoms.net_wm_state_demands_attention) self->demands_attention = TRUE; - else if (state[i] == prop_atoms.openbox_wm_state_undecorated) + else if (state[i] == prop_atoms.ob_wm_state_undecorated) self->undecorated = TRUE; } @@ -2296,7 +2296,7 @@ static void client_change_state(ObClient *self) if (self->demands_attention) netstate[num++] = prop_atoms.net_wm_state_demands_attention; if (self->undecorated) - netstate[num++] = prop_atoms.openbox_wm_state_undecorated; + netstate[num++] = prop_atoms.ob_wm_state_undecorated; PROP_SETA32(self->window, net_wm_state, atom, netstate, num); if (self->frame) @@ -3224,7 +3224,7 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) action = self->demands_attention ? prop_atoms.net_wm_state_remove : prop_atoms.net_wm_state_add; - else if (state == prop_atoms.openbox_wm_state_undecorated) + else if (state == prop_atoms.ob_wm_state_undecorated) action = undecorated ? prop_atoms.net_wm_state_remove : prop_atoms.net_wm_state_add; } @@ -3254,7 +3254,7 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) below = TRUE; } else if (state == prop_atoms.net_wm_state_demands_attention) { demands_attention = TRUE; - } else if (state == prop_atoms.openbox_wm_state_undecorated) { + } else if (state == prop_atoms.ob_wm_state_undecorated) { undecorated = TRUE; } @@ -3281,7 +3281,7 @@ void client_set_state(ObClient *self, Atom action, glong data1, glong data2) below = FALSE; } else if (state == prop_atoms.net_wm_state_demands_attention) { demands_attention = FALSE; - } else if (state == prop_atoms.openbox_wm_state_undecorated) { + } else if (state == prop_atoms.ob_wm_state_undecorated) { undecorated = FALSE; } } diff --git a/openbox/event.c b/openbox/event.c index e431e8f..3acb5d1 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -681,7 +681,7 @@ static void event_handle_root(XEvent *e) screen_set_num_desktops(d); } else if (msgtype == prop_atoms.net_showing_desktop) { screen_show_desktop(e->xclient.data.l[0] != 0, NULL); - } else if (msgtype == prop_atoms.openbox_control) { + } else if (msgtype == prop_atoms.ob_control) { if (e->xclient.data.l[0] == 1) ob_reconfigure(); else if (e->xclient.data.l[0] == 2) diff --git a/openbox/focus.c b/openbox/focus.c index f947fe3..0c32df6 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -28,6 +28,7 @@ #include "screen.h" #include "group.h" #include "prop.h" +#include "keyboard.h" #include "focus.h" #include "stacking.h" #include "popup.h" diff --git a/openbox/openbox.c b/openbox/openbox.c index d550156..2de1f7e 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -150,7 +150,7 @@ gint main(gint argc, gchar **argv) * remote_control = 1 -> reconfigure * remote_control = 2 -> restart */ PROP_MSG(RootWindow(ob_display, ob_screen), - openbox_control, remote_control, 0, 0, 0); + ob_control, remote_control, 0, 0, 0); XCloseDisplay(ob_display); exit(EXIT_SUCCESS); } @@ -242,7 +242,7 @@ gint main(gint argc, gchar **argv) if (config_type != NULL) PROP_SETS(RootWindow(ob_display, ob_screen), - openbox_config, config_type); + ob_config, config_type); /* we're done with parsing now, kill it */ parse_shutdown(i); diff --git a/openbox/prop.c b/openbox/prop.c index 5b611f2..36e5201 100644 --- a/openbox/prop.c +++ b/openbox/prop.c @@ -171,9 +171,9 @@ void prop_startup() */ CREATE(openbox_pid, "_OPENBOX_PID"); - CREATE(openbox_config, "_OPENBOX_CONFIG"); - CREATE(openbox_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED"); - CREATE(openbox_control, "_OPENBOX_CONTROL"); + CREATE(ob_config, "_OB_CONFIG"); + CREATE(ob_wm_state_undecorated, "_OB_WM_STATE_UNDECORATED"); + CREATE(ob_control, "_OB_CONTROL"); } #include diff --git a/openbox/prop.h b/openbox/prop.h index 8f81eff..35eb197 100644 --- a/openbox/prop.h +++ b/openbox/prop.h @@ -190,10 +190,10 @@ typedef struct Atoms { /* Openbox specific atoms */ - Atom openbox_wm_state_undecorated; - Atom openbox_pid; - Atom openbox_config; - Atom openbox_control; + Atom ob_wm_state_undecorated; + Atom openbox_pid; /* this is depreecated in favour of ob_control */ + Atom ob_config; + Atom ob_control; } Atoms; Atoms prop_atoms; diff --git a/openbox/screen.c b/openbox/screen.c index 97fa884..d71c9ea 100644 --- a/openbox/screen.c +++ b/openbox/screen.c @@ -289,10 +289,10 @@ gboolean screen_annex(const gchar *program_name) supported[i++] = prop_atoms.kde_net_wm_frame_strut; supported[i++] = prop_atoms.kde_net_wm_window_type_override; - supported[i++] = prop_atoms.openbox_wm_state_undecorated; + supported[i++] = prop_atoms.ob_wm_state_undecorated; supported[i++] = prop_atoms.openbox_pid; - supported[i++] = prop_atoms.openbox_config; - supported[i++] = prop_atoms.openbox_control; + supported[i++] = prop_atoms.ob_config; + supported[i++] = prop_atoms.ob_control; g_assert(i == num_support); PROP_SETA32(RootWindow(ob_display, ob_screen),