diff --git a/src/client.c b/src/client.c
index 15ccd88978f676f64a6edf02e124c4c6d64f35e2..c59f0481856729b4158d748669a035c6a321bf2f 100644
--- a/src/client.c
+++ b/src/client.c
@@ -424,26 +424,19 @@ void clientGetNetWmType(Client * c)
if(!get_atom_list(dpy, c->window, net_wm_window_type, &atoms, &n_atoms))
{
- if (c->transient_for)
- {
- c->type_atom = net_wm_window_type_dialog;
- }
- else
- {
- switch (c->win_layer)
- {
- case WIN_LAYER_DESKTOP:
- c->type_atom = net_wm_window_type_desktop;
- break;
- case WIN_LAYER_DOCK:
- c->type_atom = net_wm_window_type_dock;
- break;
- case WIN_LAYER_NORMAL:
- default:
- c->type_atom = net_wm_window_type_normal;
- break;
- }
- }
+ switch (c->win_layer)
+ {
+ case WIN_LAYER_DESKTOP:
+ c->type_atom = net_wm_window_type_desktop;
+ break;
+ case WIN_LAYER_DOCK:
+ c->type_atom = net_wm_window_type_dock;
+ break;
+ case WIN_LAYER_NORMAL:
+ default:
+ c->type_atom = net_wm_window_type_normal;
+ break;
+ }
}
else
{
@@ -605,9 +598,9 @@ static void clientWindowType(Client * c)
c->sticky = True;
c->skip_pager = True;
c->skip_taskbar = True;
- c->has_hide = False;
- c->has_maximize = False;
- c->has_menu = False;
+ c->has_hide = False;
+ c->has_maximize = False;
+ c->has_menu = False;
layer = WIN_LAYER_DESKTOP;
}
else if(c->type_atom == net_wm_window_type_dock)
@@ -615,18 +608,18 @@ static void clientWindowType(Client * c)
DBG("atom net_wm_window_type_dock detected\n");
c->type = WINDOW_DOCK;
layer = WIN_LAYER_DOCK;
- c->has_hide = False;
- c->has_maximize = False;
- c->has_menu = False;
+ c->has_hide = False;
+ c->has_maximize = False;
+ c->has_menu = False;
}
else if(c->type_atom == net_wm_window_type_toolbar)
{
DBG("atom net_wm_window_type_toolbar detected\n");
c->type = WINDOW_TOOLBAR;
layer = WIN_LAYER_NORMAL;
- c->has_hide = False;
- c->has_maximize = False;
- c->has_menu = False;
+ c->has_hide = False;
+ c->has_maximize = False;
+ c->has_menu = False;
}
else if(c->type_atom == net_wm_window_type_menu)
{
@@ -642,18 +635,18 @@ static void clientWindowType(Client * c)
*/
c->skip_pager = True;
c->skip_taskbar = True;
- c->has_hide = False;
- c->has_maximize = False;
- c->has_menu = False;
+ c->has_hide = False;
+ c->has_maximize = False;
+ c->has_menu = False;
}
else if(c->type_atom == net_wm_window_type_dialog)
{
DBG("atom net_wm_window_type_dialog detected\n");
c->type = WINDOW_DIALOG;
layer = WIN_LAYER_ONTOP;
- c->has_hide = False;
- c->has_menu = False;
- c->has_maximize = False;
+ c->has_hide = False;
+ c->has_menu = False;
+ c->has_maximize = False;
}
else if(c->type_atom == net_wm_window_type_normal)
{
@@ -667,7 +660,7 @@ static void clientWindowType(Client * c)
c->type = WINDOW_UTILITY;
layer = WIN_LAYER_NORMAL;
c->has_border = False;
- c->has_hide = False;
+ c->has_hide = False;
}
else if(c->type_atom == net_wm_window_type_splashscreen)
{
@@ -677,7 +670,7 @@ static void clientWindowType(Client * c)
c->has_border = False;
c->has_resize = False;
c->has_move = False;
- c->has_hide = False;
+ c->has_hide = False;
}
}
else
@@ -692,10 +685,13 @@ static void clientWindowType(Client * c)
DBG("Window is a transient\n");
c2 = clientGetFromWindow(c->transient_for, WINDOW);
- if(c2)
+ if (c2)
{
layer = c2->win_layer;
}
+ c->has_hide = False;
+ c->has_menu = False;
+ c->has_maximize = False;
}
if((old_type != c->type) || (layer != c->win_layer))
{
@@ -771,8 +767,6 @@ void clientGrabKeys(Client * c)
grabKey(dpy, &keys[KEY_MAXIMIZE_HORIZ], c->window);
grabKey(dpy, &keys[KEY_SHADE_WINDOW], c->window);
grabKey(dpy, &keys[KEY_CYCLE_WINDOWS], c->window);
- grabKey(dpy, &keys[KEY_LOWER_WINDOW_LAYER], c->window);
- grabKey(dpy, &keys[KEY_RAISE_WINDOW_LAYER], c->window);
grabKey(dpy, &keys[KEY_NEXT_WORKSPACE], c->window);
grabKey(dpy, &keys[KEY_PREV_WORKSPACE], c->window);
grabKey(dpy, &keys[KEY_ADD_WORKSPACE], c->window);
@@ -1286,16 +1280,16 @@ static void clientInitPosition(Client * c)
clientKeepVisible(c);
}
- return;
+ return;
}
else if ((c->transient_for) && (c2 = clientGetFromWindow(c->transient_for, WINDOW)))
{
/* Center transient relative to their parent window */
- c->x = c2->x + (c2->width - c->width) / 2;
- c->y = c2->y + (c2->height - c->height) / 2;
+ c->x = c2->x + (c2->width - c->width) / 2;
+ c->y = c2->y + (c2->height - c->height) / 2;
clientKeepVisible(c);
-
- return;
+
+ return;
}
xmax = XDisplayWidth(dpy, screen) - frameWidth(c) - (int)margins[MARGIN_RIGHT];
@@ -1547,49 +1541,49 @@ void clientUpdateMWMHints(Client *c)
c->has_border = ((mwm_hints->decorations & (MWM_DECOR_TITLE | MWM_DECOR_BORDER)) ? True : False);
c->has_menu = ((mwm_hints->decorations & (MWM_DECOR_MENU)) ? True : False);
/*
- c->has_hide = ((mwm_hints->decorations & (MWM_DECOR_MINIMIZE)) ? True : False);
+ c->has_hide = ((mwm_hints->decorations & (MWM_DECOR_MINIMIZE)) ? True : False);
c->has_maximize = ((mwm_hints->decorations & (MWM_DECOR_MAXIMIZE)) ? True : False);
*/
- }
+ }
/* The following is from Metacity : */
if (mwm_hints->flags & MWM_HINTS_FUNCTIONS)
{
- if (!(mwm_hints->functions & MWM_FUNC_ALL))
+ if (!(mwm_hints->functions & MWM_FUNC_ALL))
{
- toggle_value = True;
+ toggle_value = True;
- c->has_close = False;
- c->has_hide = False;
- c->has_maximize = False;
- c->has_move = False;
- c->has_resize = False;
+ c->has_close = False;
+ c->has_hide = False;
+ c->has_maximize = False;
+ c->has_move = False;
+ c->has_resize = False;
}
- else
+ else
{
- toggle_value = False;
+ toggle_value = False;
}
- if (mwm_hints->functions & MWM_FUNC_CLOSE)
+ if (mwm_hints->functions & MWM_FUNC_CLOSE)
{
- c->has_close = toggle_value;
+ c->has_close = toggle_value;
}
- if (mwm_hints->functions & MWM_FUNC_MINIMIZE)
+ if (mwm_hints->functions & MWM_FUNC_MINIMIZE)
{
- c->has_hide = toggle_value;
+ c->has_hide = toggle_value;
}
- if (mwm_hints->functions & MWM_FUNC_MAXIMIZE)
+ if (mwm_hints->functions & MWM_FUNC_MAXIMIZE)
{
- c->has_maximize = toggle_value;
+ c->has_maximize = toggle_value;
}
- if (mwm_hints->functions & MWM_FUNC_RESIZE)
+ if (mwm_hints->functions & MWM_FUNC_RESIZE)
{
- c->has_resize = toggle_value;
+ c->has_resize = toggle_value;
}
- if (mwm_hints->functions & MWM_FUNC_MOVE)
+ if (mwm_hints->functions & MWM_FUNC_MOVE)
{
- c->has_move = toggle_value;
+ c->has_move = toggle_value;
}
- }
+ }
XFree(mwm_hints);
}
}
@@ -2008,7 +2002,7 @@ void clientHide(Client * c, int change_state)
{
DBG("cowardly refusing to hide a client that is not shown is the taskbar\n");
gdk_beep ();
- return;
+ return;
}
XUnmapWindow(dpy, c->window);
XUnmapWindow(dpy, c->frame);
@@ -2836,9 +2830,9 @@ static GtkToXEventFilterStatus clientResize_event_filter(XEvent * xevent, gpoint
}
passdata->oldw = c->width;
passdata->oldh = c->height;
- /* Store previous values in case the resize puts the window title off bounds */
- prev_y = c->y;
- prev_height = c->height;
+ /* Store previous values in case the resize puts the window title off bounds */
+ prev_y = c->y;
+ prev_height = c->height;
if(!(c->win_state & WIN_STATE_MAXIMIZED_HORIZ))
{
if((passdata->corner == CORNER_TOP_LEFT) || (passdata->corner == CORNER_BOTTOM_LEFT) || (passdata->corner == 4 + SIDE_LEFT))
@@ -2871,12 +2865,12 @@ static GtkToXEventFilterStatus clientResize_event_filter(XEvent * xevent, gpoint
{
c->y = c->y - (c->height - passdata->oldh);
}
- if (frameY(c) < (int)margins[MARGIN_TOP])
- {
- /* We've made an illegal move, revert... */
+ if (frameY(c) < (int)margins[MARGIN_TOP])
+ {
+ /* We've made an illegal move, revert... */
c->y = prev_y;
- c->height = prev_height;
- }
+ c->height = prev_height;
+ }
if(box_resize)
{
clientDrawOutline(c);
diff --git a/src/client.h b/src/client.h
index aeab1faa819a71c21165f950ae026c30dfb24c98..a5ef78fb9e2e25081065729fb901c0529bc08941 100644
--- a/src/client.h
+++ b/src/client.h
@@ -107,34 +107,32 @@
#define KEY_MAXIMIZE_VERT 12
#define KEY_MAXIMIZE_HORIZ 13
#define KEY_SHADE_WINDOW 14
-#define KEY_RAISE_WINDOW_LAYER 15
-#define KEY_LOWER_WINDOW_LAYER 16
-#define KEY_NEXT_WORKSPACE 17
-#define KEY_PREV_WORKSPACE 18
-#define KEY_ADD_WORKSPACE 19
-#define KEY_DEL_WORKSPACE 20
-#define KEY_STICK_WINDOW 21
-#define KEY_WORKSPACE_1 22
-#define KEY_WORKSPACE_2 23
-#define KEY_WORKSPACE_3 24
-#define KEY_WORKSPACE_4 25
-#define KEY_WORKSPACE_5 26
-#define KEY_WORKSPACE_6 27
-#define KEY_WORKSPACE_7 28
-#define KEY_WORKSPACE_8 29
-#define KEY_WORKSPACE_9 30
-#define KEY_MOVE_NEXT_WORKSPACE 31
-#define KEY_MOVE_PREV_WORKSPACE 32
-#define KEY_MOVE_WORKSPACE_1 33
-#define KEY_MOVE_WORKSPACE_2 34
-#define KEY_MOVE_WORKSPACE_3 35
-#define KEY_MOVE_WORKSPACE_4 36
-#define KEY_MOVE_WORKSPACE_5 37
-#define KEY_MOVE_WORKSPACE_6 38
-#define KEY_MOVE_WORKSPACE_7 39
-#define KEY_MOVE_WORKSPACE_8 40
-#define KEY_MOVE_WORKSPACE_9 41
-#define KEY_COUNT 42
+#define KEY_NEXT_WORKSPACE 15
+#define KEY_PREV_WORKSPACE 16
+#define KEY_ADD_WORKSPACE 17
+#define KEY_DEL_WORKSPACE 18
+#define KEY_STICK_WINDOW 19
+#define KEY_WORKSPACE_1 20
+#define KEY_WORKSPACE_2 21
+#define KEY_WORKSPACE_3 22
+#define KEY_WORKSPACE_4 23
+#define KEY_WORKSPACE_5 24
+#define KEY_WORKSPACE_6 25
+#define KEY_WORKSPACE_7 26
+#define KEY_WORKSPACE_8 27
+#define KEY_WORKSPACE_9 28
+#define KEY_MOVE_NEXT_WORKSPACE 29
+#define KEY_MOVE_PREV_WORKSPACE 30
+#define KEY_MOVE_WORKSPACE_1 31
+#define KEY_MOVE_WORKSPACE_2 32
+#define KEY_MOVE_WORKSPACE_3 33
+#define KEY_MOVE_WORKSPACE_4 34
+#define KEY_MOVE_WORKSPACE_5 35
+#define KEY_MOVE_WORKSPACE_6 36
+#define KEY_MOVE_WORKSPACE_7 37
+#define KEY_MOVE_WORKSPACE_8 38
+#define KEY_MOVE_WORKSPACE_9 39
+#define KEY_COUNT 40
#define ALIGN_LEFT 0
#define ALIGN_RIGHT 1
diff --git a/src/events.c b/src/events.c
index 700509abf80c56d778d482b311dca8b2392ead9a..5a27b7a20717cb67db185df39d113968dc4745a3 100644
--- a/src/events.c
+++ b/src/events.c
@@ -208,12 +208,6 @@ static inline void handleKeyPress(XKeyEvent * ev)
case KEY_SHADE_WINDOW:
clientToggleShaded(c);
break;
- case KEY_RAISE_WINDOW_LAYER:
- clientSetLayer(c, c->win_layer + 1);
- break;
- case KEY_LOWER_WINDOW_LAYER:
- clientSetLayer(c, c->win_layer - 1);
- break;
case KEY_NEXT_WORKSPACE:
workspaceSwitch(workspace + 1, NULL);
break;
diff --git a/src/settings.c b/src/settings.c
index 68180fd0319de45b5e2216260481ffcdba38624a..89f1799938408bff29ce21700a66c0033245507c 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -109,8 +109,6 @@ void loadSettings()
{"maximize_vert_key", NULL, TRUE},
{"maximize_horiz_key", NULL, TRUE},
{"shade_window_key", NULL, TRUE},
- {"lower_window_layer_key", NULL, TRUE},
- {"raise_window_layer_key", NULL, TRUE},
{"cycle_windows_key", NULL, TRUE},
{"move_window_up_key", NULL, TRUE},
{"move_window_down_key", NULL, TRUE},
@@ -390,8 +388,6 @@ void loadSettings()
parseKeyString(dpy, &keys[KEY_MAXIMIZE_VERT], getValue("maximize_vert_key", rc));
parseKeyString(dpy, &keys[KEY_MAXIMIZE_HORIZ], getValue("maximize_horiz_key", rc));
parseKeyString(dpy, &keys[KEY_SHADE_WINDOW], getValue("shade_window_key", rc));
- parseKeyString(dpy, &keys[KEY_LOWER_WINDOW_LAYER], getValue("lower_window_layer_key", rc));
- parseKeyString(dpy, &keys[KEY_RAISE_WINDOW_LAYER], getValue("raise_window_layer_key", rc));
parseKeyString(dpy, &keys[KEY_NEXT_WORKSPACE], getValue("next_workspace_key", rc));
parseKeyString(dpy, &keys[KEY_PREV_WORKSPACE], getValue("prev_workspace_key", rc));
parseKeyString(dpy, &keys[KEY_ADD_WORKSPACE], getValue("add_workspace_key", rc));
diff --git a/themes/default.keys/keythemerc b/themes/default.keys/keythemerc
index 1b42a884a7259d55dff77ee8ec6a4cd38adf1d2c..49a85a7e70866d5a024a7d3822e1849c7805bc77 100644
--- a/themes/default.keys/keythemerc
+++ b/themes/default.keys/keythemerc
@@ -5,8 +5,6 @@ maximize_vert_key=Alt+F6
maximize_horiz_key=Alt+F7
shade_window_key=Alt+F2
cycle_windows_key=Alt+Tab
-raise_window_layer_key=Alt+Page_Up
-lower_window_layer_key=Alt+Page_Down
move_window_up_key=Control+Shift+Alt+Up
move_window_down_key=Control+Shift+Alt+Down
move_window_left_key=Control+Shift+Alt+Left