From b73dcec3975877fd374b55b425c99bb1d6921b53 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Thu, 4 Oct 2007 22:37:35 +0000 Subject: added mousewheel support. added next/prev weapon support --- src/engine/client/inp.c | 12 +++++++++++- src/engine/keynames.c | 4 ++-- src/engine/keys.h | 2 ++ 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'src/engine') diff --git a/src/engine/client/inp.c b/src/engine/client/inp.c index 6583c53f..55cebbfe 100644 --- a/src/engine/client/inp.c +++ b/src/engine/client/inp.c @@ -80,7 +80,7 @@ void inp_update() keyboard_first = 0; inp_update(); } - + keyboard_current = keyboard_current^1; int i, v; for(i = 0; i < KEY_LAST; i++) @@ -92,4 +92,14 @@ void inp_update() keyboard_state[keyboard_current][i] = v; } + // handle mouse wheel + i = glfwGetMouseWheel(); + keyboard_state[keyboard_current][KEY_MOUSE_WHEEL_UP] = 0; + keyboard_state[keyboard_current][KEY_MOUSE_WHEEL_DOWN] = 0; + if(i > 0) + keyboard_state[keyboard_current][KEY_MOUSE_WHEEL_UP] = 1; + if(i < 0) + keyboard_state[keyboard_current][KEY_MOUSE_WHEEL_DOWN] = 1; + glfwSetMouseWheel(0); + } diff --git a/src/engine/keynames.c b/src/engine/keynames.c index 326e2a38..43cea52c 100644 --- a/src/engine/keynames.c +++ b/src/engine/keynames.c @@ -386,8 +386,8 @@ static const char key_strings[512][16] = "#379", "#380", "#381", - "#382", - "#383", + "mousewheeldown", + "mousewheelup", "mouse1", "mouse2", "mouse3", diff --git a/src/engine/keys.h b/src/engine/keys.h index fd8d9cbf..9670f1a0 100644 --- a/src/engine/keys.h +++ b/src/engine/keys.h @@ -70,6 +70,8 @@ enum KEY_KP_EQUAL = (KEY_SPECIAL+61), KEY_KP_ENTER = (KEY_SPECIAL+62), KEY_REPEAT = 0x00030005, + KEY_MOUSE_WHEEL_DOWN = 382, + KEY_MOUSE_WHEEL_UP = 383, KEY_MOUSE_FIRST = 384, KEY_MOUSE_1 = KEY_MOUSE_FIRST+0, KEY_MOUSE_2 = KEY_MOUSE_FIRST+1, -- cgit 1.4.1