Replaced xdo_get_active_modifiers with xdo_active_keys_to_keycode_list

The name was kept for clearity. Also all calls the the functions has been changed accordingly.
jordansissel · May 22, 2012 · 7cf1eaa · 7cf1eaa
1 parent ec65bf4
commit 7cf1eaa
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 131 deletions.
diff --git a/cmd_click.c b/cmd_click.c
@@ -6,7 +6,8 @@ int cmd_click(context_t *context) {
   char *cmd = context->argv[0];
   int ret = 0;
   int clear_modifiers = 0;
-  xdo_active_mods_t *active_mods = NULL;
+  charcodemap_t *active_mods = NULL;
+  int active_mods_n;
   char *window_arg = NULL;
   useconds_t delay = 100000; /* 100ms */
   int repeat = 1;
@@ -86,8 +87,8 @@ int cmd_click(context_t *context) {
 
   window_each(context, window_arg, {
     if (clear_modifiers) {
-      active_mods = xdo_get_active_modifiers(context->xdo);
-      xdo_clear_active_modifiers(context->xdo, window, active_mods);
+      xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
+      xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
     }
 
     ret = xdo_click_multiple(context->xdo, window, button, repeat, delay);
@@ -97,8 +98,8 @@ int cmd_click(context_t *context) {
     }
 
     if (clear_modifiers) {
-      xdo_set_active_modifiers(context->xdo, window, active_mods);
-      xdo_free_active_modifiers(active_mods);
+      xdo_set_active_modifiers(context->xdo, window, active_mods, active_mods_n);
+      free(active_mods);
     }
   }); /* window_each(...) */
 

diff --git a/cmd_key.c b/cmd_key.c
@@ -12,7 +12,8 @@ int cmd_key(context_t *context) {
   int i;
   int c;
   char *cmd = *context->argv;
-  xdo_active_mods_t *active_mods = NULL;
+  charcodemap_t *active_mods = NULL;
+  int active_mods_n;
   useconds_t delay = 12000;
   const char *window_arg = NULL;
   int free_arg = 0;
@@ -98,8 +99,8 @@ int cmd_key(context_t *context) {
   int max_arg = context->argc;
   window_each(context, window_arg, {
     if (clear_modifiers) {
-      active_mods = xdo_get_active_modifiers(context->xdo);
-      xdo_clear_active_modifiers(context->xdo, window, active_mods);
+      xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
+      xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
     }
 
     for (i = 0; i < context->argc; i++) {
@@ -117,8 +118,8 @@ int cmd_key(context_t *context) {
     }
 
     if (clear_modifiers) {
-      xdo_set_active_modifiers(context->xdo, window, active_mods);
-      xdo_free_active_modifiers(active_mods);
+      xdo_set_active_modifiers(context->xdo, window, active_mods, active_mods_n);
+      free(active_mods);
     }
   }); /* window_each(...) */
 

diff --git a/cmd_mousedown.c b/cmd_mousedown.c
@@ -5,7 +5,8 @@ int cmd_mousedown(context_t *context) {
   int ret = 0;
   int button;
   char *cmd = *context->argv;
-  xdo_active_mods_t *active_mods = NULL;
+  charcodemap_t *active_mods = NULL;
+  int active_mods_n;
   int clear_modifiers = 0;
   char *window_arg = NULL;
 
@@ -54,15 +55,15 @@ int cmd_mousedown(context_t *context) {
 
   window_each(context, window_arg, {
     if (clear_modifiers) {
-      active_mods = xdo_get_active_modifiers(context->xdo);
-      xdo_clear_active_modifiers(context->xdo, window, active_mods);
+      xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
+      xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
     }
 
     ret = xdo_mousedown(context->xdo, window, button);
 
     if (clear_modifiers) {
-      xdo_set_active_modifiers(context->xdo, window, active_mods);
-      xdo_free_active_modifiers(active_mods);
+      xdo_set_active_modifiers(context->xdo, window, active_mods, active_mods_n);
+      free(active_mods);
     }
 
     if (ret) {

diff --git a/cmd_mousemove.c b/cmd_mousemove.c
@@ -136,7 +136,8 @@ int cmd_mousemove(context_t *context) {
 
 static int _mousemove(context_t *context, struct mousemove *mousemove) {
   int ret;
-  xdo_active_mods_t *active_mods = NULL;
+  charcodemap_t *active_mods = NULL;
+  int active_mods_n;
 
   int x = mousemove->x;
   int y = mousemove->y;
@@ -190,8 +191,8 @@ static int _mousemove(context_t *context, struct mousemove *mousemove) {
   }
 
   if (mousemove->clear_modifiers) {
-    active_mods = xdo_get_active_modifiers(context->xdo);
-    xdo_clear_active_modifiers(context->xdo, window, active_mods);
+    xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
+    xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
   }
 
   if (mousemove->step == 0) {
@@ -225,8 +226,8 @@ static int _mousemove(context_t *context, struct mousemove *mousemove) {
   }
 
   if (mousemove->clear_modifiers) {
-    xdo_set_active_modifiers(context->xdo, window, active_mods);
-    xdo_free_active_modifiers(active_mods);
+    xdo_set_active_modifiers(context->xdo, window, active_mods, active_mods_n);
+    free(active_mods);
   }
 
   return 0;

diff --git a/cmd_mousemove_relative.c b/cmd_mousemove_relative.c
@@ -10,7 +10,8 @@ int cmd_mousemove_relative(context_t *context) {
   int opsync = 0;
   int origin_x = -1, origin_y = -1;
 
-  xdo_active_mods_t *active_mods = NULL;
+  charcodemap_t *active_mods = NULL;
+  int active_mods_n;
   int c;
   typedef enum {
     opt_unused, opt_help, opt_sync, opt_clearmodifiers, opt_polar
@@ -95,8 +96,8 @@ int cmd_mousemove_relative(context_t *context) {
   }
 
   if (clear_modifiers) {
-    active_mods = xdo_get_active_modifiers(context->xdo);
-    xdo_clear_active_modifiers(context->xdo, CURRENTWINDOW, active_mods);
+    xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
+    xdo_clear_active_modifiers(context->xdo, CURRENTWINDOW, active_mods, active_mods_n);
   }
 
   if (opsync) {
@@ -115,8 +116,8 @@ int cmd_mousemove_relative(context_t *context) {
   }
 
   if (clear_modifiers) {
-    xdo_set_active_modifiers(context->xdo, CURRENTWINDOW, active_mods);
-    xdo_free_active_modifiers(active_mods);
+    xdo_set_active_modifiers(context->xdo, CURRENTWINDOW, active_mods, active_mods_n);
+    free(active_mods);
   }
 
   return ret;

diff --git a/cmd_mouseup.c b/cmd_mouseup.c
@@ -6,7 +6,8 @@ int cmd_mouseup(context_t *context) {
   int button;
   char *cmd = *context->argv;
   char *window_arg = NULL;
-  xdo_active_mods_t *active_mods = NULL;
+  charcodemap_t *active_mods = NULL;
+  int active_mods_n;
   int clear_modifiers = 0;
 
   int c;
@@ -54,15 +55,15 @@ int cmd_mouseup(context_t *context) {
 
   window_each(context, window_arg, {
     if (clear_modifiers) {
-      active_mods = xdo_get_active_modifiers(context->xdo);
-      xdo_clear_active_modifiers(context->xdo, window, active_mods);
+      xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
+      xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
     }
 
     ret = xdo_mouseup(context->xdo, window, button);
 
     if (clear_modifiers) {
-      xdo_set_active_modifiers(context->xdo, window, active_mods);
-      xdo_free_active_modifiers(active_mods);
+      xdo_set_active_modifiers(context->xdo, window, active_mods, active_mods_n);
+      free(active_mods);
     }
 
     if (ret) {

diff --git a/cmd_type.c b/cmd_type.c
@@ -21,7 +21,8 @@ int cmd_type(context_t *context) {
   char **data = NULL; /* stuff to type */
   int data_count = 0;
   int args_count = 0;
-  xdo_active_mods_t *active_mods = NULL;
+  charcodemap_t *active_mods = NULL;
+  int active_mods_n;
 
   /* Options */
   int clear_modifiers = 0;
@@ -177,8 +178,8 @@ int cmd_type(context_t *context) {
 
   window_each(context, window_arg, {
     if (clear_modifiers) {
-      active_mods = xdo_get_active_modifiers(context->xdo);
-      xdo_clear_active_modifiers(context->xdo, window, active_mods);
+      xdo_get_active_modifiers(context->xdo, &active_mods, &active_mods_n);
+      xdo_clear_active_modifiers(context->xdo, window, active_mods, active_mods_n);
     }
 
     for (i = 0; i < data_count; i++) {
@@ -193,8 +194,8 @@ int cmd_type(context_t *context) {
     }
 
     if (clear_modifiers) {
-      xdo_set_active_modifiers(context->xdo, window, active_mods);
-      xdo_free_active_modifiers(active_mods);
+      xdo_set_active_modifiers(context->xdo, window, active_mods, active_mods_n);
+      free(active_mods);
     }
   }); /* window_each(...) */