This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via ff0dc088ad0e31060e426df42bb3913ffed3cab3 (commit) from 7c52b64476504ecd7788a3ad4f59ac6af996751e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/ff0dc088ad0e31060e426df42bb3913ffed3c... commit ff0dc088ad0e31060e426df42bb3913ffed3cab3 Author: Cyril Hrubis <metan@ucw.cz> Date: Thu Jan 31 11:35:52 2013 +0100 input: Map mute + volume multimedia keys. More to come. diff --git a/include/input/GP_Event.h b/include/input/GP_Event.h index 162a5d2..ef21afb 100644 --- a/include/input/GP_Event.h +++ b/include/input/GP_Event.h @@ -163,6 +163,10 @@ enum GP_EventKeyValue { GP_KEY_INSERT = 110, GP_KEY_DELETE = 111, + GP_KEY_MUTE = 113, + GP_KEY_VOLUMEDOWN = 114, + GP_KEY_VOLUMEUP = 115, + GP_KEY_KP_EQUAL = 117, GP_KEY_KP_PLUS_MINUS = 118, GP_KEY_PAUSE = 119, @@ -173,6 +177,10 @@ enum GP_EventKeyValue { GP_KEY_RIGHT_META = 126, GP_KEY_COMPOSE = 127, + GP_KEY_NEXTSONG = 163, + GP_KEY_PLAYPAUSE = 164, + GP_KEY_PREVIOUSSONG = 165, + GP_KEY_F13 = 183, GP_KEY_F14 = 184, GP_KEY_F15 = 185, diff --git a/libs/input/GP_Event.c b/libs/input/GP_Event.c index 13c400b..9066540 100644 --- a/libs/input/GP_Event.c +++ b/libs/input/GP_Event.c @@ -62,8 +62,8 @@ static char *key_names[] = { "?", "KP Enter", "RightCtrl", "KP Slash", "SysRq", "RightAlt", "?", "Home", "Up", "PageUp", "Left", "Right", "End", "Down", "PageDown", - "Insert", "Delete", "?", "?", "?", - "?", "?", "KP Equal", "KP PlusMinus", "Pause", + "Insert", "Delete", "?", "Mute", "VolumeDown", + "VolumeUp", "?", "KP Equal", "KP PlusMinus", "Pause", "?", "KP Comma", "?", "?", "?", "LeftMeta", "RightMeta", "Compose", }; @@ -149,12 +149,8 @@ static void dump_key(struct GP_Event *ev) { const char *name = GP_EventKeyName(ev->val.key.key); - if (ev->val.key.key < key_names_size) - name = key_names[ev->val.key.key]; - printf("Key %i (Key%s) %sn", ev->val.key.key, name, ev->code ? "down" : "up"); - } static void dump_abs(struct GP_Event *ev) diff --git a/libs/input/GP_InputDriverX11.c b/libs/input/GP_InputDriverX11.c index a1702a2..2b537fa 100644 --- a/libs/input/GP_InputDriverX11.c +++ b/libs/input/GP_InputDriverX11.c @@ -59,7 +59,7 @@ static uint16_t keycode_table[] = { 0, GP_KEY_HOME, GP_KEY_UP, GP_KEY_PAGE_UP, GP_KEY_LEFT, GP_KEY_RIGHT, GP_KEY_END, GP_KEY_DOWN, GP_KEY_PAGE_DOWN, GP_KEY_INSERT, GP_KEY_DELETE, 0, - 0, 0, 0, 0, + GP_KEY_MUTE, GP_KEY_VOLUMEDOWN, GP_KEY_VOLUMEUP, 0, 0, 0, GP_KEY_PAUSE, 0, 0, 0, 0, 0, GP_KEY_LEFT_META, GP_KEY_RIGHT_META, GP_KEY_COMPOSE, ----------------------------------------------------------------------- Summary of changes: include/input/GP_Event.h | 8 ++++++++ libs/input/GP_Event.c | 8 ++------ libs/input/GP_InputDriverX11.c | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")