Diff of /trunk/src/geotoad.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 194 by harbaum, Wed Nov 18 11:40:31 2009 UTC revision 198 by harbaum, Thu Nov 19 12:38:03 2009 UTC
# Line 23  Line 23 
23  #include <sys/types.h>  #include <sys/types.h>
24  #include <sys/wait.h>  #include <sys/wait.h>
25  #include <errno.h>  #include <errno.h>
26    #include <math.h>
27    
28  #define COLOR_ERR  "red"  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR >= 5)
29  #define COLOR_OK   "darkgreen"  #include <hildon/hildon-entry.h>
30    #endif
31    
32    #define GEOTOAD "/usr/bin/geotoad"
33    
34    #define COLOR_ERR     "red"
35    #define COLOR_OK      "darkgreen"
36    #define COLOR_SYSTEM  "darkblue"
37    
38  #define BUFFER_SIZE  1500  #define BUFFER_SIZE  256
39    
40  typedef struct {  typedef struct {
41    appdata_t *appdata;    appdata_t *appdata;
42    
43      GtkWidget *dialog;
44    
45    char buf[BUFFER_SIZE];    char buf[BUFFER_SIZE];
46    int bused;    int bused;
47    
# Line 43  typedef struct { Line 53  typedef struct {
53      GtkTextBuffer *buffer;      GtkTextBuffer *buffer;
54      GtkWidget *view;      GtkWidget *view;
55    } log;    } log;
56    
57      GtkWidget *username, *password, *filename;
58      GtkWidget *lat, *lon, *dst;
59    
60  } gt_context_t;  } gt_context_t;
61    
# Line 53  static void appendf(struct log_s *log, c Line 66  static void appendf(struct log_s *log, c
66    char *buf = g_strdup_vprintf(fmt, args);    char *buf = g_strdup_vprintf(fmt, args);
67    va_end( args );    va_end( args );
68    
69      printf("append: %s", buf);
70    
71    GtkTextTag *tag = NULL;    GtkTextTag *tag = NULL;
72    if(colname)    if(colname)
73      tag = gtk_text_buffer_create_tag(log->buffer, NULL,      tag = gtk_text_buffer_create_tag(log->buffer, NULL,
# Line 68  static void appendf(struct log_s *log, c Line 83  static void appendf(struct log_s *log, c
83    
84    g_free(buf);    g_free(buf);
85    
86      gtk_text_buffer_get_end_iter(log->buffer, &end);
87    gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(log->view),    gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(log->view),
88                                 &end, 0.0, FALSE, 0, 0);                                 &end, 0.0, FALSE, 0, 0);
89  }  }
90    
91  /* watch child process and receive events */  /* watch child process and receive events */
92  static void child_state_cb(GPid pid, gint status, gpointer data) {  static void child_state_cb(GPid pid, gint status, gpointer data) {
93      gt_context_t *context = (gt_context_t*)data;
94    
95    puts("child state");    puts("child state");
96    
# Line 84  static void child_state_cb(GPid pid, gin Line 101  static void child_state_cb(GPid pid, gin
101    
102    puts("gt exited");    puts("gt exited");
103    
104      appendf(&context->log, COLOR_SYSTEM, "GeoToad finished\n");
105    
106      appendf(&context->log, COLOR_SYSTEM, "TODO: free context!!!\n");
107      //    printf("freeing context\n");
108      //    g_free(context);
109    
110    /* Reap child if needed. */    /* Reap child if needed. */
111    waitpid (pid, NULL, WNOHANG);    waitpid (pid, NULL, WNOHANG);
112  }  }
113    
114  static void child_input_cb(gpointer data, int fd, GdkInputCondition cond) {  static gboolean child_input_cb(GIOChannel *source,
115                                   GIOCondition condition,
116                                   gpointer data) {
117    gt_context_t *context = (gt_context_t*)data;    gt_context_t *context = (gt_context_t*)data;
118      int fd = g_io_channel_unix_get_fd(source);
119    ssize_t bytes;    ssize_t bytes;
   int errnosave=0;  
120    
121    if(cond != GDK_INPUT_READ) {    g_assert(condition == G_IO_IN);
     puts("fixme");  
     return;  
   }  
122    
123    /* append to current buffer content */    /* append to current buffer content */
124    while( (bytes = read(fd, context->buf+context->bused,    while( (bytes = read(fd, context->buf+context->bused,
# Line 113  static void child_input_cb(gpointer data Line 134  static void child_input_cb(gpointer data
134        char *p = strchr(ptr, '\n');        char *p = strchr(ptr, '\n');
135        *p = '\0';        *p = '\0';
136    
137        appendf(&context->log, NULL, "%s\n", ptr);        char *color = NULL;
138          if(strstr(ptr, "Saved to ") != NULL)
139            color = COLOR_OK;
140    
141          appendf(&context->log, color, "%s\n", ptr);
142    
143        ptr = p+1;        ptr = p+1;
144      }      }
# Line 129  static void child_input_cb(gpointer data Line 154  static void child_input_cb(gpointer data
154      }      }
155    }    }
156    
157    /* save errno from read */    return TRUE;
   errnosave=errno;  
   
   if(errnosave != EAGAIN && errnosave != 0) {  
     /* we probably hit EOF */  
     puts("removing io");  
   
     // TODO: fixme, make sure process is dead! kill it otherwise, but dont  
     // issue an disconnect(NULL) !!!!  
   
     gdk_input_remove(context->stdout_tag);  
     gdk_input_remove(context->stderr_tag);  
   
     appendf(&context->log, COLOR_OK, "GeoToad finished\n");  
   
     appendf(&context->log, COLOR_ERR, "TODO: free context!!!\n");  
     //    printf("freeing context\n");  
     //    g_free(context);  
   }  
158  }  }
159    
160  static void run(gt_context_t *context) {  static void run(gt_context_t *context) {
# Line 161  static void run(gt_context_t *context) { Line 168  static void run(gt_context_t *context) {
168    
169    /* build list of arguments to call geotoad */    /* build list of arguments to call geotoad */
170    GPtrArray *gt_argv = g_ptr_array_new();    GPtrArray *gt_argv = g_ptr_array_new();
171    g_ptr_array_add (gt_argv, "/usr/bin/geotoad");    g_ptr_array_add (gt_argv, GEOTOAD);
172    g_ptr_array_add (gt_argv, "--distanceMax=1.5");    g_ptr_array_add (gt_argv, "--distanceMax=1.0");
173    g_ptr_array_add (gt_argv, "--output=gtoad.gpx");    g_ptr_array_add (gt_argv, "--output=gtoad.gpx");
174    g_ptr_array_add (gt_argv, "--password=winterblume");    g_ptr_array_add (gt_argv, "--password=winterblume");
175    g_ptr_array_add (gt_argv, "--queryType=coord");    g_ptr_array_add (gt_argv, "--queryType=coord");
# Line 184  static void run(gt_context_t *context) { Line 191  static void run(gt_context_t *context) {
191                                context->appdata->proxy->host,                                context->appdata->proxy->host,
192                                context->appdata->proxy->port);                                context->appdata->proxy->port);
193    
194      appendf(&context->log, COLOR_OK, "Using proxy: %s\n", proxy);      appendf(&context->log, COLOR_SYSTEM, "Using proxy: %s\n", proxy);
195      g_ptr_array_add (gt_argv, proxy);      g_ptr_array_add (gt_argv, proxy);
196    }    }
197    
   
198    g_ptr_array_add (gt_argv, "N49 00.000 E008 23.000");    g_ptr_array_add (gt_argv, "N49 00.000 E008 23.000");
199    g_ptr_array_add (gt_argv, NULL);    g_ptr_array_add (gt_argv, NULL);
200    
# Line 210  static void run(gt_context_t *context) { Line 216  static void run(gt_context_t *context) {
216      g_ptr_array_free(gt_argv, TRUE);      g_ptr_array_free(gt_argv, TRUE);
217      if(proxy) g_free(proxy);      if(proxy) g_free(proxy);
218      appendf(&context->log, COLOR_ERR,      appendf(&context->log, COLOR_ERR,
219              _("GeoToad failed to start: '%s'"), error->message);              _("GeoToad failed to start!\n%s\n"), error->message);
220      g_error_free(error);      g_error_free(error);
221      return;      return;
222    }    }
223    
224    g_ptr_array_free (gt_argv, TRUE);    g_ptr_array_free (gt_argv, TRUE);
225      if(proxy) g_free(proxy);    if(proxy) g_free(proxy);
226    
227    gt_watch = g_child_watch_source_new(pid);    gt_watch = g_child_watch_source_new(pid);
228    g_source_set_callback(gt_watch, (GSourceFunc) child_state_cb, NULL, NULL);    g_source_set_callback(gt_watch, (GSourceFunc) child_state_cb, context, NULL);
229    
230    g_source_attach(gt_watch, NULL);    g_source_attach(gt_watch, NULL);
231    g_source_unref(gt_watch);    g_source_unref(gt_watch);
# Line 230  static void run(gt_context_t *context) { Line 237  static void run(gt_context_t *context) {
237    if(fcntl(context->stderr_fd, F_SETFL, O_NONBLOCK) == -1)    if(fcntl(context->stderr_fd, F_SETFL, O_NONBLOCK) == -1)
238      perror("fcntl failed");      perror("fcntl failed");
239    
240    /* use gdk to monitor read end of stdout */    GIOChannel *ioc = g_io_channel_unix_new(context->stdout_fd);
241    context->stdout_tag = gdk_input_add(context->stdout_fd,    g_io_channel_set_close_on_unref (ioc, TRUE);
242                    GDK_INPUT_READ, child_input_cb, context);    g_io_channel_set_encoding (ioc, NULL, NULL);
243    context->stderr_tag = gdk_input_add(context->stderr_fd,    g_io_add_watch(ioc, G_IO_IN,  child_input_cb, context);
244                    GDK_INPUT_READ, child_input_cb, context);    g_io_channel_unref(ioc);
245    
246      //  ioc = g_io_channel_unix_new(context->stderr_fd);
247      //  g_io_add_watch(ioc, G_IO_IN,  child_input_cb, context);
248      //  g_io_channel_unref(ioc);
249  }  }
250    
251  void geotoad(appdata_t *appdata) {  /* show text window and display output of running geotoad */
252    gt_context_t *context = g_new0(gt_context_t, 1);  static void gui_run(gt_context_t *context) {
253    context->appdata = appdata;    GtkWidget *dialog = gtk_dialog_new_with_buttons(_("GeoToad - Run"),
254                              GTK_WINDOW(context->appdata->window),
   printf("geoToad\n");  
   
   GtkWidget *dialog = gtk_dialog_new_with_buttons(_("GeoToad"),  
                           GTK_WINDOW(appdata->window),  
255                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
256                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,                            GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
257                            NULL);                            NULL);
# Line 286  void geotoad(appdata_t *appdata) { Line 293  void geotoad(appdata_t *appdata) {
293    
294    gtk_widget_show_all(dialog);    gtk_widget_show_all(dialog);
295    
296    appendf(&context->log, COLOR_OK, "Running GeoToad\n");    appendf(&context->log, COLOR_SYSTEM, "Running GeoToad\n");
297    run(context);    run(context);
298    
299    gtk_dialog_run(GTK_DIALOG(dialog));    gtk_dialog_run(GTK_DIALOG(dialog));
300    
301    gtk_widget_destroy(dialog);    gtk_widget_destroy(dialog);
302  }  }
303    
304    static void on_browse(GtkWidget *widget, gpointer data) {
305      gt_context_t *context = (gt_context_t*)data;
306    
307      printf("Browse %p\n", context->dialog);
308    
309    #ifdef USE_MAEMO
310      GtkWidget *dialog = hildon_file_chooser_dialog_new(GTK_WINDOW(context->dialog),
311                                              GTK_FILE_CHOOSER_ACTION_SAVE);
312    #else
313      GtkWidget *dialog = gtk_file_chooser_dialog_new(_("Save GPX file"),
314                                           GTK_WINDOW(context->dialog),
315                                           GTK_FILE_CHOOSER_ACTION_SAVE,
316                                           GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
317                                           GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
318                                           NULL);
319    #endif
320    
321      printf("set filename <%s>\n", context->appdata->gt.filename);
322    
323      if(!g_file_test(context->appdata->gt.filename, G_FILE_TEST_EXISTS)) {
324        char *last_sep = strrchr(context->appdata->gt.filename, '/');
325        if(last_sep) {
326          *last_sep = 0;  // seperate path from file
327    
328          /* the user just created a new document */
329          gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog),
330                                              context->appdata->gt.filename);
331          gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), last_sep+1);
332    
333          /* restore full filename */
334          *last_sep = '/';
335        }
336      } else
337        gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
338                                      context->appdata->gt.filename);
339    
340      if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_FM_OK) {
341        gchar *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
342        gtk_label_set_text(GTK_LABEL(context->filename), name);
343      }
344    
345      gtk_widget_destroy (dialog);
346    }
347    
348    static gboolean gui_setup(gt_context_t *context) {
349      appdata_t *appdata = context->appdata;
350      gboolean ok = FALSE;
351    
352      /* if no filename has been setup yet, create one */
353      if(!appdata->gt.filename && appdata->path) {
354        printf("creating path\n");
355        appdata->gt.filename =
356          g_strdup_printf("%s/gtoad.gpx", appdata->path);
357      }
358    
359      context->dialog = gtk_dialog_new_with_buttons(_("GeoToad - Setup"),
360                            GTK_WINDOW(appdata->window),
361                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
362                            GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
363                            GTK_STOCK_OK,     GTK_RESPONSE_OK,
364                            NULL);
365    
366      /* ------------------- Coordinates ------------------------- */
367      GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
368    
369      GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
370      gtk_box_pack_start_defaults(GTK_BOX(vbox), left_label_new(_("Latitude:")));
371      gtk_box_pack_start_defaults(GTK_BOX(vbox), left_label_new(_("Longitude:")));
372      gtk_box_pack_start_defaults(GTK_BOX(vbox), left_label_new(_("Distance:")));
373      gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
374    
375      /* setup default positions */
376      pos_t *refpos = get_pos(appdata);
377      if((isnan(appdata->gt.lat) || isnan(appdata->gt.lat)) && refpos) {
378        appdata->gt.lat = refpos->lat;
379        appdata->gt.lon = refpos->lon;
380      }
381    
382      vbox = gtk_vbox_new(FALSE, 0);
383      context->lat = lat_entry_new(appdata->gt.lat);
384      gtk_box_pack_start_defaults(GTK_BOX(vbox), context->lat);
385      context->lon = lat_entry_new(appdata->gt.lon);
386      gtk_box_pack_start_defaults(GTK_BOX(vbox), context->lon);
387      context->dst = dist_entry_new(appdata->gt.distance, appdata->imperial);
388      gtk_box_pack_start_defaults(GTK_BOX(vbox), context->dst);
389      gtk_box_pack_start_defaults(GTK_BOX(hbox), vbox);
390    
391      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(context->dialog)->vbox), hbox);
392    
393      /* ------------------- file name ------------------------- */
394      hbox = gtk_hbox_new(FALSE, 0);
395    
396      context->filename = gtk_label_new(appdata->gt.filename);
397      gtk_misc_set_alignment(GTK_MISC(context->filename), 0.f, 0.5f);
398      gtk_label_set_ellipsize(GTK_LABEL(context->filename), PANGO_ELLIPSIZE_MIDDLE);
399      gtk_box_pack_start_defaults(GTK_BOX(hbox), context->filename);
400    
401      GtkWidget *button = gtk_button_new_with_label(_("Browse"));
402      gtk_signal_connect(GTK_OBJECT(button), "clicked",
403                         GTK_SIGNAL_FUNC(on_browse), context);
404      gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);
405    
406      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(context->dialog)->vbox), hbox);
407    
408    
409      /* ------------------- Username/Password ------------------------- */
410      hbox = gtk_hbox_new(FALSE, 0);
411      vbox = gtk_vbox_new(FALSE, 0);
412      gtk_box_pack_start_defaults(GTK_BOX(vbox), left_label_new(_("Username:")));
413      gtk_box_pack_start_defaults(GTK_BOX(vbox), left_label_new(_("Password:")));
414      gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);
415    
416      vbox = gtk_vbox_new(FALSE, 0);
417    #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)
418      context->username = gtk_entry_new();
419      context->password = gtk_entry_new();
420    #else
421      context->username = hildon_entry_new(HILDON_SIZE_AUTO);
422      hildon_gtk_entry_set_input_mode(GTK_ENTRY(context->username),
423                                      HILDON_GTK_INPUT_MODE_FULL);
424      context->password = hildon_entry_new(HILDON_SIZE_AUTO);
425      hildon_gtk_entry_set_input_mode(GTK_ENTRY(context->password),
426                                      HILDON_GTK_INPUT_MODE_FULL);
427    #endif
428      gtk_entry_set_visibility(GTK_ENTRY(context->password), FALSE);
429    
430      /* set saved defaults */
431      if(appdata->gt.username)
432        gtk_entry_set_text(GTK_ENTRY(context->username),
433                           appdata->gt.username);
434    
435      if(appdata->gt.password)
436        gtk_entry_set_text(GTK_ENTRY(context->password),
437                           appdata->gt.password);
438    
439      gtk_box_pack_start_defaults(GTK_BOX(vbox), context->username);
440      gtk_box_pack_start_defaults(GTK_BOX(vbox), context->password);
441      gtk_box_pack_start_defaults(GTK_BOX(hbox), vbox);
442    
443      gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(context->dialog)->vbox), hbox);
444    
445      gtk_dialog_set_default_response(GTK_DIALOG(context->dialog), GTK_RESPONSE_OK);
446    
447      gtk_widget_show_all(context->dialog);
448    
449      if(gtk_dialog_run(GTK_DIALOG(context->dialog)) == GTK_RESPONSE_OK) {
450    
451        /* save values */
452        if(appdata->gt.username) g_free(appdata->gt.username);
453        appdata->gt.username =
454          g_strdup(gtk_entry_get_text(GTK_ENTRY(context->username)));
455    
456        if(appdata->gt.password) g_free(appdata->gt.password);
457        appdata->gt.password =
458          g_strdup(gtk_entry_get_text(GTK_ENTRY(context->password)));
459    
460        if(appdata->gt.filename) g_free(appdata->gt.filename);
461        appdata->gt.filename =
462          g_strdup(gtk_label_get_text(GTK_LABEL(context->filename)));
463    
464        ok = TRUE;
465      }
466    
467      gtk_widget_destroy(context->dialog);
468    
469      return ok;
470    }
471    
472    void geotoad(appdata_t *appdata) {
473      if(!geotoad_available()) {
474        errorf(_("GeoToad is not installed on this device.\n"
475                 "You need to install it in order to be able to use it."));
476        return;
477      }
478    
479      gt_context_t *context = g_new0(gt_context_t, 1);
480      context->appdata = appdata;
481    
482      printf("geoToad\n");
483    
484      if(gui_setup(context))
485        gui_run(context);
486    }
487    
488    gboolean geotoad_available(void) {
489      /* before doing anything make sure geotoad is installed */
490      return g_file_test(GEOTOAD, G_FILE_TEST_IS_EXECUTABLE);
491    }
492    
493    
Legend:
Removed from v.194  
changed lines
  Added in v.198