use the number for sendtodesktop

[chaz/openbox] / plugins / keyboard / keysrc.yacc

diff --git a/plugins/keyboard/keysrc.yacc b/plugins/keyboard/keysrc.yacc
index d779da838464daec914ee6caf555d71c15ccbc90..24297d3b63d3907194c3b5adc188eedc77b292b7 100644 (file)
--- a/plugins/keyboard/keysrc.yacc
+++ b/plugins/keyboard/keysrc.yacc
@@ -22,7 +22,7 @@ static char *path;
     GList *list;
 }
 
-%token <integer> INTEGER;
+%token <integer> INTEGER
 %token <string> STRING
 %token <string> FIELD
 %token <string> DESKTOP
@@ -39,8 +39,8 @@ config:
   ;
 
 fields:
-  FIELD { $$ = g_list_prepend(NULL, $1); }
-  | fields FIELD { $$ = g_list_prepend($1, $2); }
+  FIELD { $$ = g_list_append(NULL, $1); }
+  | fields FIELD { $$ = g_list_append($1, $2); }
   ;
 
 %%
@@ -88,8 +88,8 @@ static void addbinding(GList *keylist, char *action, char *apath, int num)
         a->data.execute.path = apath;
     else
         g_free(apath);
-    if (a->func == action_desktop)
-        a->data.desktop.desk = (unsigned) num + 1;
+    if (a->func == action_desktop || a->func == action_send_to_desktop)
+        a->data.desktop.desk = (unsigned) num - 1;
     if (a->func == action_move_relative_horz ||
         a->func == action_move_relative_vert ||
         a->func == action_resize_relative_horz ||