From 7a74fae56a800e10fd34cd1e172b040e2a41f61d Mon Sep 17 00:00:00 2001 From: Bert Münnich Date: Sat, 31 May 2014 10:59:00 +0200 Subject: Use integers for mouse mappings and buttons 6+7 for horizontal scrolling Fixes issue #143 --- Makefile | 2 +- config.def.h | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 855284e..9c7afcd 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = git-20140525 +VERSION = git-20140531 PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man diff --git a/config.def.h b/config.def.h index 03d05bb..3fd459d 100644 --- a/config.def.h +++ b/config.def.h @@ -152,15 +152,17 @@ static const keymap_t keys[] = { /* mouse button mappings for image mode: */ static const button_t buttons[] = { /* modifiers button function argument */ - { 0, Button1, i_navigate, (arg_t) +1 }, - { 0, Button3, i_navigate, (arg_t) -1 }, - { 0, Button2, i_drag, (arg_t) None }, - { 0, Button4, it_scroll_move, (arg_t) DIR_UP }, - { 0, Button5, it_scroll_move, (arg_t) DIR_DOWN }, - { ShiftMask, Button4, it_scroll_move, (arg_t) DIR_LEFT }, - { ShiftMask, Button5, it_scroll_move, (arg_t) DIR_RIGHT }, - { ControlMask, Button4, i_zoom, (arg_t) +1 }, - { ControlMask, Button5, i_zoom, (arg_t) -1 }, + { 0, 1, i_navigate, (arg_t) +1 }, + { 0, 3, i_navigate, (arg_t) -1 }, + { 0, 2, i_drag, (arg_t) None }, + { 0, 4, it_scroll_move, (arg_t) DIR_UP }, + { 0, 5, it_scroll_move, (arg_t) DIR_DOWN }, + { ShiftMask, 4, it_scroll_move, (arg_t) DIR_LEFT }, + { ShiftMask, 5, it_scroll_move, (arg_t) DIR_RIGHT }, + { 0, 6, it_scroll_move, (arg_t) DIR_LEFT }, + { 0, 7, it_scroll_move, (arg_t) DIR_RIGHT }, + { ControlMask, 4, i_zoom, (arg_t) +1 }, + { ControlMask, 5, i_zoom, (arg_t) -1 }, }; #endif -- cgit v1.2.3-54-g00ecf