tool change

Author: pascal-niklaus

gromit-mpx.1

@@ -95,12 +95,19 @@ running Gromit-MPX process, see above for the options available to start Gromit-
 .B \-c, \-\-clear
 will clear the screen.
 .TP
+.B \-l <x1> <y1> <x2> <y2> <color> <width>, \-\-line <x1> <y1> <x2> <y2> <color> <width>
+will draw a line from (x1,y1) to (x2,y2) with color <color> and width <width>.
+.TP
 .B \-q, \-\-quit
 will cause the main Gromit-MPX process to quit.
 .TP
 .B \-t, \-\-toggle
 will toggle the grabbing of the cursor.
 .TP
+.B \-T <definition>, \-\-change-tool <definition>
+will change the definition of a tool. The syntax is as in the .cfg file
+read at startup, except for the trailing semicolon.
+.TP
 .B \-v, \-\-visibility
 will toggle the visibility of the window.
 .TP

src/callbacks.c

@@ -680,7 +680,8 @@ void on_mainapp_selection_received (GtkWidget *widget,
       else if (gtk_selection_data_get_target(selection_data) == GA_CHGTOOLDATA)
         {
           gchar *a = (gchar *)gtk_selection_data_get_data(selection_data);
-          g_printerr("DEFTOOL argument: %s\n", a);
+          if(data->debug)
+            g_printerr("DEBUG: define tool: %s\n", a);
 
           GScanner *scanner;
           scanner = g_scanner_new(NULL);
@@ -690,8 +691,7 @@ void on_mainapp_selection_received (GtkWidget *widget,
           GTokenType token;
           token = g_scanner_get_next_token (scanner);
 
-          gchar *name, *copy;
-          GromitPaintContext *context_template=NULL;
+          gchar *name;
 
           GromitStyleDef style;
 
@@ -702,7 +702,7 @@ void on_mainapp_selection_received (GtkWidget *widget,
                   name = parse_name (scanner);
 
                   if(!name)
-                      goto cleanup;
+                    goto cleanup;
 
                   if (!parse_tool(data, scanner, &style))
                     goto cleanup;
@@ -716,7 +716,6 @@ void on_mainapp_selection_received (GtkWidget *widget,
                       token = g_scanner_cur_token(scanner);
                     }
 
-                  // by now nothing should follow
                   if (token != G_TOKEN_EOF)
                     {
                       g_printerr ("End of tool definition expected !\n");
@@ -729,20 +728,18 @@ void on_mainapp_selection_received (GtkWidget *widget,
                     paint_context_new (data, style.type, style.paint_color,
                                        style.width, style.arrowsize,
                                        style.minwidth, style.maxwidth);
-                  *context = *new_context;
 
+                  g_free(context->paint_color);
+                  *context = *new_context;
                   g_free(new_context);
                 }
-
               token = g_scanner_get_next_token (scanner);
             }
 
         cleanup:
-
           g_scanner_destroy (scanner);
         }
     }
- 
   gtk_main_quit ();
 }
 

src/config.c

@@ -730,7 +730,6 @@ void read_keyfile(GromitData *data)
 {
     gchar *filename = g_strjoin (G_DIR_SEPARATOR_S,
 				 g_get_user_config_dir(), "gromit-mpx.ini", NULL);
-
     /*
       set defaults
     */
@@ -756,7 +755,7 @@ void read_keyfile(GromitData *data)
     if(data->opacity == 0)
 	data->opacity = DEFAULT_OPACITY;
 
- cleanup:
+  cleanup:
     g_free(filename);
     g_key_file_free(key_file);
 }

src/main.c

@@ -599,8 +599,6 @@ void main_do_event (GdkEventAny *event,
 
 
 
-
-
 void setup_main_app (GromitData *data, int argc, char ** argv)
 {
   gboolean activate;
@@ -1060,7 +1058,6 @@ void parse_print_help (gpointer key, gpointer value, gpointer user_data)
 }
 
 
-
 /*
  * Main programs
  */
@@ -1157,13 +1154,13 @@ int main_client (int argc, char **argv, GromitData *data)
          {
            action = GA_REDO;
          }
-       else if (strcmp (arg, "--deftool") == 0)
+       else if (strcmp (arg, "--change-tool") == 0 ||
+                strcmp(arg, "-T") == 0)
          {
-           g_printerr("argc=%d i=%d\n",argc,i);
            if (argc <= i+1)
              {
                wrong_arg = TRUE;
-               g_printerr("--deftool requires an argument\n");
+               g_printerr("--change-tool requires an argument\n");
              }
            else
              {