summaryrefslogtreecommitdiff
path: root/app/cwm
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2011-06-24 06:09:27 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2011-06-24 06:09:27 +0000
commitff7254245e2e456749227c5ffbc43163917d22d7 (patch)
tree338f89e1af33decaae4530ffc6436bc42d7589c7 /app/cwm
parent8a7ff79029d1e2c3902612d407babe0e3cda2dde (diff)
New option to raise a client via the mouse (unbound by default);
opposing action, lower, already exists and bound. Both keyboard mappings already exist. 'no opinion either way' oga@
Diffstat (limited to 'app/cwm')
-rw-r--r--app/cwm/calmwm.h3
-rw-r--r--app/cwm/conf.c3
-rw-r--r--app/cwm/cwmrc.54
-rw-r--r--app/cwm/mousefunc.c8
4 files changed, 14 insertions, 4 deletions
diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 75ef1df1b..bb6aa868f 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -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: calmwm.h,v 1.131 2011/06/24 06:06:24 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.132 2011/06/24 06:09:26 okan Exp $
*/
#ifndef _CALMWM_H_
@@ -405,6 +405,7 @@ void mousefunc_window_grouptoggle(struct client_ctx *,
void mousefunc_window_hide(struct client_ctx *, void *);
void mousefunc_window_lower(struct client_ctx *, void *);
void mousefunc_window_move(struct client_ctx *, void *);
+void mousefunc_window_raise(struct client_ctx *, void *);
void mousefunc_window_resize(struct client_ctx *, void *);
struct menu *menu_filter(struct screen_ctx *, struct menu_q *,
diff --git a/app/cwm/conf.c b/app/cwm/conf.c
index db4005195..a87ef8db6 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.84 2011/06/24 06:06:24 okan Exp $
+ * $OpenBSD: conf.c,v 1.85 2011/06/24 06:09:26 okan Exp $
*/
#include <sys/param.h>
@@ -554,6 +554,7 @@ static struct {
{ "window_grouptoggle", mousefunc_window_grouptoggle,
MOUSEBIND_CTX_WIN },
{ "window_lower", mousefunc_window_lower, MOUSEBIND_CTX_WIN },
+ { "window_raise", mousefunc_window_raise, MOUSEBIND_CTX_WIN },
{ "window_hide", mousefunc_window_hide, MOUSEBIND_CTX_WIN },
{ "menu_group", mousefunc_menu_group, MOUSEBIND_CTX_ROOT },
{ "menu_unhide", mousefunc_menu_unhide, MOUSEBIND_CTX_ROOT },
diff --git a/app/cwm/cwmrc.5 b/app/cwm/cwmrc.5
index 1d8b64b62..24f3e521f 100644
--- a/app/cwm/cwmrc.5
+++ b/app/cwm/cwmrc.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cwmrc.5,v 1.36 2011/06/24 06:06:24 okan Exp $
+.\" $OpenBSD: cwmrc.5,v 1.37 2011/06/24 06:09:26 okan Exp $
.\"
.\" Copyright (c) 2004,2005 Marius Aamodt Eriksen <marius@monkey.org>
.\"
@@ -402,6 +402,8 @@ Move current window.
Resize current window.
.It window_lower
Lower current window.
+.It window_raise
+Raise current window.
.It window_hide
Hide current window.
.It window_grouptoggle
diff --git a/app/cwm/mousefunc.c b/app/cwm/mousefunc.c
index e38873ebf..c296d7512 100644
--- a/app/cwm/mousefunc.c
+++ b/app/cwm/mousefunc.c
@@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $OpenBSD: mousefunc.c,v 1.29 2011/06/24 06:06:24 okan Exp $
+ * $OpenBSD: mousefunc.c,v 1.30 2011/06/24 06:09:26 okan Exp $
*/
#include <sys/param.h>
@@ -197,6 +197,12 @@ mousefunc_window_lower(struct client_ctx *cc, void *arg)
}
void
+mousefunc_window_raise(struct client_ctx *cc, void *arg)
+{
+ client_raise(cc);
+}
+
+void
mousefunc_window_hide(struct client_ctx *cc, void *arg)
{
client_hide(cc);