Diff of /trunk/src/main.c

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

revision 237 by harbaum, Thu Dec 10 21:24:43 2009 UTC revision 238 by harbaum, Sat Dec 12 12:54:37 2009 UTC
# Line 256  typedef struct { Line 256  typedef struct {
256    appdata_t *appdata;    appdata_t *appdata;
257    GtkTreePath *path;    GtkTreePath *path;
258    gboolean done;    gboolean done;
259  } cachelist_expose_t;  } cachelist_context_t;
260    
261  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,  static gboolean cachelist_expose(GtkWidget *widget, GdkEventExpose *event,
262                                   gpointer user_data) {                                   gpointer user_data) {
263    cachelist_expose_t *ce = (cachelist_expose_t*)user_data;    cachelist_context_t *ce = (cachelist_context_t*)user_data;
264    
265    if(event->type == GDK_EXPOSE) {    if(event->type == GDK_EXPOSE) {
266      if(ce->path && !ce->done) {      if(ce->path && !ce->done) {
# Line 275  static gboolean cachelist_expose(GtkWidg Line 275  static gboolean cachelist_expose(GtkWidg
275  }  }
276    
277  static void cachelist_destroy(GtkWidget *widget, gpointer user_data) {  static void cachelist_destroy(GtkWidget *widget, gpointer user_data) {
   cachelist_expose_t *ce = (cachelist_expose_t*)user_data;  
278    
279    printf("cachelist timer removed\n");    guint handler_id =
280    g_assert(ce->appdata->cachelist_handler_id);      (guint)g_object_get_data(G_OBJECT(user_data), "handler_id");
   gtk_timeout_remove(ce->appdata->cachelist_handler_id);  
   ce->appdata->cachelist_handler_id = 0;  
281    
282    free(user_data);    if(handler_id) {
283        gtk_timeout_remove(handler_id);
284        g_object_set_data(G_OBJECT(user_data), "handler_id", NULL);
285    
286        printf("cachelist timer removed\n");
287      }
288    
289      gpointer *ce =
290        g_object_get_data(G_OBJECT(user_data), "ce");
291      g_assert(ce);
292    
293      free(ce);
294  }  }
295    
296  #define CACHELIST_UPDATE_TIMEOUT (30000)  #define CACHELIST_UPDATE_TIMEOUT (30000)
# Line 291  static GtkWidget *cachelist_create(appda Line 299  static GtkWidget *cachelist_create(appda
299                                     cache_t *sel_cache);                                     cache_t *sel_cache);
300    
301  void cachelist_redraw(appdata_t *appdata) {  void cachelist_redraw(appdata_t *appdata) {
302      printf("redrawing cachelist\n");
303    
304    if(!appdata->cur_view) {    if(!appdata->cur_view) {
305      printf("cachelist redraw: no active view\n");      printf("cachelist redraw: no active view\n");
306      return;      return;
# Line 337  void cachelist_redraw(appdata_t *appdata Line 347  void cachelist_redraw(appdata_t *appdata
347    
348    
349  static gboolean cachelist_update(gpointer data) {  static gboolean cachelist_update(gpointer data) {
350      appdata_t *appdata =
351        (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
352      g_assert(appdata);
353    
354    printf("cachelist timer fired!\n");    printf("cachelist timer fired!\n");
355    
356    appdata_t *appdata = (appdata_t*)data;    /* check if the widget the timer fired for is the currently */
357      /* visible one (if a search result is being shown, a cachlist */
358      /* may also be present below it) */
359      if(appdata->cur_view != data) {
360        printf("-> widget is not the one currently on top, don't redraw\n");
361        return TRUE;
362      }
363    
364    if(appdata->cur_cache)    if(appdata->cur_cache)
365      return TRUE;      return TRUE;
# Line 353  static gboolean cachelist_update(gpointe Line 372  static gboolean cachelist_update(gpointe
372    
373    if(appdata->cachelist_update)    if(appdata->cachelist_update)
374      cachelist_redraw(appdata);      cachelist_redraw(appdata);
375      else
376        printf("update disabled\n");
377    
378    return TRUE;    return TRUE;
379  }  }
380    
381  static void cachelist_timer_reset(appdata_t *appdata) {  static void cachelist_timer_reset(GtkWidget *widget) {
382      guint handler_id =
383        (guint)g_object_get_data(G_OBJECT(widget), "handler_id");
384      g_assert(handler_id);
385    
386      appdata_t *appdata =
387        (appdata_t*)g_object_get_data(G_OBJECT(widget), "appdata");
388      g_assert(appdata);
389    
390    printf("cachelist timer reset\n");    printf("cachelist timer reset\n");
391    g_assert(appdata->cachelist_handler_id);    gtk_timeout_remove(handler_id);
392    gtk_timeout_remove(appdata->cachelist_handler_id);    g_object_set_data(G_OBJECT(widget), "handler_id", (gpointer)
393    appdata->cachelist_handler_id =      gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, widget));
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
394  }  }
395    
396  static gboolean cachelist_update_reset0(GtkWidget *widget,  static gboolean cachelist_update_reset0(GtkWidget *widget,
397                                          GdkEventButton *event,                                          GdkEventButton *event,
398                                          gpointer user_data) {                                          gpointer user_data) {
399    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
400    return FALSE;    return FALSE;
401  }  }
402    
403  static void cachelist_update_reset1(GtkAdjustment *adj,  static void cachelist_update_reset1(GtkAdjustment *adj,
404                                      gpointer user_data) {                                      gpointer user_data) {
405    cachelist_timer_reset((appdata_t*)user_data);    cachelist_timer_reset(GTK_WIDGET(user_data));
406  }  }
407    
408    static gboolean on_cachelist_focus_in(GtkWidget *widget, GdkEventFocus *event,
409                                          gpointer data) {
410    
411    
412      /* we don't want a runnign timer yet */
413      if(!g_object_get_data(G_OBJECT(data), "handler_id")) {
414        printf("focus received: restarting cachelist timer\n");
415    
416        appdata_t *appdata =
417          (appdata_t*)g_object_get_data(G_OBJECT(data), "appdata");
418        g_assert(appdata);
419    
420        g_object_set_data(G_OBJECT(data), "handler_id", (gpointer)
421          gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, data));
422      }
423    
424      return FALSE;
425    }
426    
427    static gboolean on_cachelist_focus_out(GtkWidget *widget, GdkEventFocus *event,
428                                           gpointer data) {
429    
430      guint handler_id =
431        (guint)g_object_get_data(G_OBJECT(data), "handler_id");
432      g_assert(handler_id);
433    
434      gtk_timeout_remove(handler_id);
435      g_object_set_data(G_OBJECT(data), "handler_id", NULL);
436    
437      printf("focus lost: cachelist timer removed\n");
438    
439      return FALSE;
440    }
441    
442  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,  static GtkWidget *cachelist_create(appdata_t *appdata, gpx_t *gpx,
443                                     cache_t *sel_cache) {                                     cache_t *sel_cache) {
444    GtkCellRenderer *renderer;    GtkCellRenderer *renderer;
# Line 522  static GtkWidget *cachelist_create(appda Line 584  static GtkWidget *cachelist_create(appda
584    g_signal_connect(view, "row-activated",    g_signal_connect(view, "row-activated",
585                     (GCallback)cachelist_view_onRowActivated, appdata);                     (GCallback)cachelist_view_onRowActivated, appdata);
586    
587    cachelist_expose_t *ce = malloc(sizeof(cachelist_expose_t));    cachelist_context_t *ce = g_new0(cachelist_context_t, 1);
588    ce->appdata = appdata;    ce->appdata = appdata;
589    ce->path = path;    ce->path = path;
590    ce->done = FALSE;    ce->done = FALSE;
591    
592    g_signal_connect(view, "expose-event",    g_signal_connect(view, "expose-event",
593                     (GCallback)cachelist_expose, ce);                     (GCallback)cachelist_expose, ce);
   g_signal_connect(view, "destroy",  
                    (GCallback)cachelist_destroy, ce);  
594    
595    /* put this inside a scrolled view */    /* put this inside a scrolled view */
596  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
597    GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);    GtkWidget *container = gtk_scrolled_window_new (NULL, NULL);
598    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(container),
599                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
600    gtk_container_add(GTK_CONTAINER(scrolled_window), view);    gtk_container_add(GTK_CONTAINER(container), view);
601  #else  #else
602    GtkWidget *pannable_area = hildon_pannable_area_new();    GtkWidget *container = hildon_pannable_area_new();
603      gtk_container_add(GTK_CONTAINER(container), view);
   gtk_container_add(GTK_CONTAINER(pannable_area), view);  
604  #endif  #endif
605    
606    /* add a timer for automatic update */    g_signal_connect(view, "destroy",
607    g_assert(!appdata->cachelist_handler_id);                     (GCallback)cachelist_destroy, container);
   appdata->cachelist_handler_id =  
     gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, appdata);  
608    
609    /* update timer is being reset if the user scrolls or selects */    /* update timer is being reset if the user scrolls or selects */
610    g_signal_connect(view, "button-press-event",    g_signal_connect(view, "button-press-event",
611                     (GCallback)cachelist_update_reset0, appdata);                     (GCallback)cachelist_update_reset0, container);
612    
613      /* add a timer for automatic update */
614      g_object_set_data(G_OBJECT(container), "handler_id", (gpointer)
615        gtk_timeout_add(CACHELIST_UPDATE_TIMEOUT, cachelist_update, container));
616    
617      printf("cachelist timer created\n");
618    
619      g_object_set_data(G_OBJECT(container), "appdata", (gpointer)appdata);
620    
621      g_object_set_data(G_OBJECT(container), "ce", (gpointer)ce);
622    
623      /* the timer is removed and re-enabled on every focus change event */
624      /* for the main top window */
625      //  GtkWidget *root = gtk_widget_get_toplevel(GTK_WIDGET(button)))
626    
627      g_signal_connect(G_OBJECT(view), "focus-in-event",
628                       G_CALLBACK(on_cachelist_focus_in), container);
629    
630      g_signal_connect(G_OBJECT(view), "focus-out-event",
631                       G_CALLBACK(on_cachelist_focus_out), container);
632    
633  #ifndef USE_PANNABLE_AREA  #ifndef USE_PANNABLE_AREA
634    g_signal_connect(gtk_scrolled_window_get_vadjustment(    g_signal_connect(gtk_scrolled_window_get_vadjustment(
635                         GTK_SCROLLED_WINDOW(scrolled_window)),                 GTK_SCROLLED_WINDOW(container)),
636                             "value-changed",                 "value-changed",
637                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
   return scrolled_window;  
638  #else  #else
639    g_signal_connect(hildon_pannable_area_get_vadjustment(    g_signal_connect(hildon_pannable_area_get_vadjustment(
640                         HILDON_PANNABLE_AREA(pannable_area)),                 HILDON_PANNABLE_AREA(container)),
641                             "value-changed",                 "value-changed",
642                             (GCallback)cachelist_update_reset1, appdata);                 (GCallback)cachelist_update_reset1, container);
   
643    
   return pannable_area;  
644  #endif  #endif
645      return container;
646  }  }
647    
648  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 820  static void gpxlist_view_onRowActivated( Line 894  static void gpxlist_view_onRowActivated(
894    
895        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);        GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
896    
       gtk_box_pack_start(GTK_BOX(hbox),  
          gtk_image_new_from_stock( GTK_STOCK_DIALOG_QUESTION,  
                                    GTK_ICON_SIZE_DIALOG),  
                          FALSE, FALSE, 0);  
   
897        GtkWidget *label = gtk_label_new(        GtkWidget *label = gtk_label_new(
898                    _("Do you want to close this entry only or do "                    _("Do you want to close this entry only or do "
899                      "you want to remove it completely from the list?"));                      "you want to remove it completely from the list?"));
# Line 1785  HildonAppMenu *menu_create(appdata_t *ap Line 1854  HildonAppMenu *menu_create(appdata_t *ap
1854      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1855                             G_CALLBACK(on_export_clicked), appdata);                             G_CALLBACK(on_export_clicked), appdata);
1856      hildon_app_menu_append(menu, GTK_BUTTON(button));      hildon_app_menu_append(menu, GTK_BUTTON(button));
1857      }
1858    
1859      if((mode == MENU_GPXLIST) || (mode == MENU_CACHELIST)) {
1860      button = gtk_button_new_with_label(_("Search"));      button = gtk_button_new_with_label(_("Search"));
1861      g_signal_connect_after(button, "clicked",      g_signal_connect_after(button, "clicked",
1862                             G_CALLBACK(cb_menu_search), appdata);                             G_CALLBACK(cb_menu_search), appdata);
Legend:
Removed from v.237  
changed lines
  Added in v.238