From d7ef078c027d717c85d47909eb121601f9fa9ab1 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires Date: Thu, 10 Sep 2015 08:49:51 -0400 Subject: [PATCH] tools: Now, we have foo and bar as macro Still not a parsing of the user input... Signed-off-by: Benjamin Tissoires --- tools/ratbag-command.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/tools/ratbag-command.c b/tools/ratbag-command.c index 85f4a6e9..560e0823 100644 --- a/tools/ratbag-command.c +++ b/tools/ratbag-command.c @@ -376,19 +376,35 @@ str_to_macro(const char *action_arg, struct macro *m) if (!action_arg) return -EINVAL; - m->name = "foo"; - m->events[0].type = RATBAG_MACRO_EVENT_KEY_PRESSED; - m->events[0].data = KEY_F; - m->events[1].type = RATBAG_MACRO_EVENT_KEY_RELEASED; - m->events[1].data = KEY_F; - m->events[2].type = RATBAG_MACRO_EVENT_KEY_PRESSED; - m->events[2].data = KEY_O; - m->events[3].type = RATBAG_MACRO_EVENT_KEY_RELEASED; - m->events[3].data = KEY_O; - m->events[4].type = RATBAG_MACRO_EVENT_KEY_PRESSED; - m->events[4].data = KEY_O; - m->events[5].type = RATBAG_MACRO_EVENT_KEY_RELEASED; - m->events[5].data = KEY_O; + if (action_arg[0] == 'f') { + m->name = "foo"; + m->events[0].type = RATBAG_MACRO_EVENT_KEY_PRESSED; + m->events[0].data = KEY_F; + m->events[1].type = RATBAG_MACRO_EVENT_KEY_RELEASED; + m->events[1].data = KEY_F; + m->events[2].type = RATBAG_MACRO_EVENT_KEY_PRESSED; + m->events[2].data = KEY_O; + m->events[3].type = RATBAG_MACRO_EVENT_KEY_RELEASED; + m->events[3].data = KEY_O; + m->events[4].type = RATBAG_MACRO_EVENT_KEY_PRESSED; + m->events[4].data = KEY_O; + m->events[5].type = RATBAG_MACRO_EVENT_KEY_RELEASED; + m->events[5].data = KEY_O; + } else if (action_arg[0] == 'b') { + m->name = "bar"; + m->events[0].type = RATBAG_MACRO_EVENT_KEY_PRESSED; + m->events[0].data = KEY_B; + m->events[1].type = RATBAG_MACRO_EVENT_KEY_RELEASED; + m->events[1].data = KEY_B; + m->events[2].type = RATBAG_MACRO_EVENT_KEY_PRESSED; + m->events[2].data = KEY_A; + m->events[3].type = RATBAG_MACRO_EVENT_KEY_RELEASED; + m->events[3].data = KEY_A; + m->events[4].type = RATBAG_MACRO_EVENT_KEY_PRESSED; + m->events[4].data = KEY_R; + m->events[5].type = RATBAG_MACRO_EVENT_KEY_RELEASED; + m->events[5].data = KEY_R; + } return 0; }