aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorokan2013-06-17 00:57:47 +0000
committerokan2013-06-17 00:57:47 +0000
commite78c9a30305d2ace976050b5abadd6c314f8b001 (patch)
tree3fe42605d67860b3224837c8afc941f01c46fd2d
parentd4e68ce6f6bb6effbb27c5607734c3da30e7baa9 (diff)
downloadcwm-e78c9a30305d2ace976050b5abadd6c314f8b001.tar.gz
allow mouse button4 and button5; from Rodrigo Mosconi
-rw-r--r--conf.c8
-rw-r--r--cwmrc.58
2 files changed, 11 insertions, 5 deletions
diff --git a/conf.c b/conf.c
index c0e6314..f0f17a4 100644
--- a/conf.c
+++ b/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.133 2013/05/23 16:52:39 okan Exp $
+ * $OpenBSD: conf.c,v 1.134 2013/06/17 00:57:47 okan Exp $
*/
#include <sys/param.h>
@@ -545,7 +545,9 @@ static struct {
{ "menu_cmd", mousefunc_menu_cmd, MOUSEBIND_CTX_ROOT },
};
-static unsigned int mouse_btns[] = { Button1, Button2, Button3 };
+static unsigned int mouse_btns[] = {
+ Button1, Button2, Button3, Button4, Button5
+};
int
conf_mousebind(struct conf *c, char *name, char *binding)
@@ -571,7 +573,7 @@ conf_mousebind(struct conf *c, char *name, char *binding)
} else
substring = name;
- button = strtonum(substring, 1, 3, &errstr);
+ button = strtonum(substring, 1, 5, &errstr);
if (errstr)
warnx("button number is %s: %s", errstr, substring);
diff --git a/cwmrc.5 b/cwmrc.5
index c86b122..5f86fcc 100644
--- a/cwmrc.5
+++ b/cwmrc.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cwmrc.5,v 1.52 2013/01/08 15:16:05 okan Exp $
+.\" $OpenBSD: cwmrc.5,v 1.53 2013/06/17 00:57:47 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: January 8 2013 $
+.Dd $Mdocdate: June 17 2013 $
.Dt CWMRC 5
.Os
.Sh NAME
@@ -206,6 +206,10 @@ Left mouse button.
Middle mouse button.
.It 3
Right mouse button.
+.It 4
+Scroll up mouse button.
+.It 5
+Scroll down mouse button.
.El
.Pp
The