summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2016-09-12 13:47:01 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2016-09-12 13:47:01 +0000
commit0489be5bf970a3da3e52b1b4f9a6b4712013da70 (patch)
treeffda382bcb3f7f6cf1b6d87d24e29d54a8beb561
parentedc165426da72afc72abdd16647e8f5c7e6067bf (diff)
change 'sticky' to 'stick' to toggle client stickiness (seems the
default binding worked for everyone for a long time!); conflict with group sticky found by Ali Farzanrad - thanks!
-rw-r--r--app/cwm/conf.c6
-rw-r--r--app/cwm/cwmrc.56
2 files changed, 6 insertions, 6 deletions
diff --git a/app/cwm/conf.c b/app/cwm/conf.c
index 45a13c982..bdf079c10 100644
--- a/app/cwm/conf.c
+++ b/app/cwm/conf.c
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: conf.c,v 1.204 2016/08/13 09:59:48 matthieu Exp $
+ * $OpenBSD: conf.c,v 1.205 2016/09/12 13:47:00 okan Exp $
*/
#include <sys/types.h>
@@ -207,7 +207,7 @@ static const struct {
{ "CM-g", "grouptoggle" },
{ "CM-f", "fullscreen" },
{ "CM-m", "maximize" },
- { "CM-s", "sticky" },
+ { "CM-s", "stick" },
{ "CM-equal", "vmaximize" },
{ "CMS-equal", "hmaximize" },
{ "CMS-f", "freeze" },
@@ -408,7 +408,7 @@ static const struct {
{.i = (CWM_CLIENT_RCYCLE | CWM_CLIENT_CYCLE_INGRP)} },
{ "grouptoggle", kbfunc_client_grouptoggle, CWM_CONTEXT_CLIENT,
{.i = CWM_KBD}},
- { "sticky", kbfunc_client_toggle_sticky, CWM_CONTEXT_CLIENT, {0} },
+ { "stick", kbfunc_client_toggle_sticky, CWM_CONTEXT_CLIENT, {0} },
{ "fullscreen", kbfunc_client_toggle_fullscreen, CWM_CONTEXT_CLIENT,
{0} },
{ "maximize", kbfunc_client_toggle_maximize, CWM_CONTEXT_CLIENT, {0} },
diff --git a/app/cwm/cwmrc.5 b/app/cwm/cwmrc.5
index 13ec7e3b6..2bf99e114 100644
--- a/app/cwm/cwmrc.5
+++ b/app/cwm/cwmrc.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cwmrc.5,v 1.61 2015/07/12 14:31:47 okan Exp $
+.\" $OpenBSD: cwmrc.5,v 1.62 2016/09/12 13:47:00 okan Exp $
.\"
.\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
.\"
@@ -14,7 +14,7 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: July 12 2015 $
+.Dd $Mdocdate: September 12 2016 $
.Dt CWMRC 5
.Os
.Sh NAME
@@ -301,7 +301,7 @@ Raise current window.
Label current window.
.It freeze
Freeze current window geometry.
-.It sticky
+.It stick
Stick current window to all groups (same as assigning to nogroup).
.It fullscreen
Full-screen current window (gap + border removed).