diff options
| author | Leah Neukirchen <leah@vuxu.org> | 2019-02-25 19:45:12 +0100 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2019-02-25 19:45:12 +0100 |
| commit | f4286ad453f01d79c9825b1b75c629901fb11732 (patch) | |
| tree | 0302f500094bd667b9a2a4c3a59279badc32e429 /conf.c | |
| parent | 544b4da339347c75f56ca2229ffddb4bdcf86fa0 (diff) | |
| parent | a5ba9aa9da9567244d1c3d1d8ccacfdb51b044de (diff) | |
| download | cwm-f4286ad453f01d79c9825b1b75c629901fb11732.tar.gz cwm-f4286ad453f01d79c9825b1b75c629901fb11732.tar.xz cwm-f4286ad453f01d79c9825b1b75c629901fb11732.zip | |
cvsimport
* refs/heads/master: Add 'group-close-[n]' action to close all windows within specified group. simplify screen 'area' usage for initial client placement restore order from before r1.248 (vtile/vtile containment changes). Rename internal functions to delinate between client remove, delete and xproto delete; 'window-close' is now the proper action, but 'window-delete' as an alias will remain until more interesting changes require breaking configs. Limit vtile/htile actions to clients fully within the screen of master client. fix missing includes
Diffstat (limited to 'conf.c')
| -rw-r--r-- | conf.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/conf.c b/conf.c index d6d88d2..22d4fc5 100644 --- a/conf.c +++ b/conf.c @@ -20,7 +20,6 @@ #include <sys/types.h> #include "queue.h" -#include <sys/stat.h> #include <err.h> #include <errno.h> @@ -68,7 +67,8 @@ static const struct { { FUNC_CC(window-lower, client_lower, 0) }, { FUNC_CC(window-raise, client_raise, 0) }, { FUNC_CC(window-hide, client_hide, 0) }, - { FUNC_CC(window-delete, client_delete, 0) }, + { FUNC_CC(window-close, client_close, 0) }, + { FUNC_CC(window-delete, client_close, 0) }, { FUNC_CC(window-htile, client_htile, 0) }, { FUNC_CC(window-vtile, client_vtile, 0) }, { FUNC_CC(window-stick, client_toggle_sticky, 0) }, @@ -143,6 +143,15 @@ static const struct { { FUNC_SC(group-only-7, group_only, 7) }, { FUNC_SC(group-only-8, group_only, 8) }, { FUNC_SC(group-only-9, group_only, 9) }, + { FUNC_SC(group-close-1, group_close, 1) }, + { FUNC_SC(group-close-2, group_close, 2) }, + { FUNC_SC(group-close-3, group_close, 3) }, + { FUNC_SC(group-close-4, group_close, 4) }, + { FUNC_SC(group-close-5, group_close, 5) }, + { FUNC_SC(group-close-6, group_close, 6) }, + { FUNC_SC(group-close-7, group_close, 7) }, + { FUNC_SC(group-close-8, group_close, 8) }, + { FUNC_SC(group-close-9, group_close, 9) }, { FUNC_SC(pointer-move-up, ptrmove, (CWM_UP)) }, { FUNC_SC(pointer-move-down, ptrmove, (CWM_DOWN)) }, @@ -195,7 +204,7 @@ static const struct { { "M-Tab", "window-cycle" }, { "MS-Tab", "window-rcycle" }, { "CM-n", "window-menu-label" }, - { "CM-x", "window-delete" }, + { "CM-x", "window-close" }, { "CM-a", "group-toggle-all" }, { "CM-0", "group-toggle-all" }, { "CM-1", "group-toggle-1" }, |