diff options
Diffstat (limited to 'navit/gui')
23 files changed, 157 insertions, 157 deletions
diff --git a/navit/gui/gtk/datawindow.c b/navit/gui/gtk/datawindow.c index 8a1327332..ea5dc6e73 100644 --- a/navit/gui/gtk/datawindow.c +++ b/navit/gui/gtk/datawindow.c @@ -48,7 +48,7 @@ select_row(GtkTreeView *tree, GtkTreePath *path, GtkTreeViewColumn *column, stru GtkTreeModel *model; int i; - dbg(0,"win=%p\n", win); + dbg(lvl_error,"win=%p\n", win); model=gtk_tree_view_get_model(tree); gtk_tree_model_get_iter(model, &iter, path); diff --git a/navit/gui/gtk/destination.c b/navit/gui/gtk/destination.c index 4cac3bf65..f5bffd068 100644 --- a/navit/gui/gtk/destination.c +++ b/navit/gui/gtk/destination.c @@ -164,7 +164,7 @@ static void row_activated(GtkWidget *widget, GtkTreePath *p1, GtkTreeViewColumn char *str; int column; - dbg(0,"enter\n"); + dbg(lvl_error,"enter\n"); gtk_tree_view_get_cursor(GTK_TREE_VIEW(search->treeview), &path, &focus_column); if(!path) return; @@ -184,11 +184,11 @@ static void row_activated(GtkWidget *widget, GtkTreePath *p1, GtkTreeViewColumn column=4; break; default: - dbg(0,"Unknown mode\n"); + dbg(lvl_error,"Unknown mode\n"); return; } gtk_tree_model_get(search->liststore2, &iter, column, &str, -1); - dbg(0,"str=%s\n", str); + dbg(lvl_error,"str=%s\n", str); search->partial=0; gtk_entry_set_text(GTK_ENTRY(entry_widget), str); } @@ -222,13 +222,13 @@ static void changed(GtkWidget *widget, struct search_param *search) printf("changed %s partial %d\n", search->attr.u.str, search->partial); if (widget == search->entry_country) { gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (search->liststore2), 3, GTK_SORT_ASCENDING); - dbg(0,"country\n"); + dbg(lvl_error,"country\n"); search->attr.type=attr_country_all; set_columns(search, 0); } if (widget == search->entry_postal) { gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (search->liststore2), 1, GTK_SORT_ASCENDING); - dbg(0,"postal\n"); + dbg(lvl_error,"postal\n"); search->attr.type=attr_town_postal; if (strlen(search->attr.u.str) < 2) return; @@ -236,14 +236,14 @@ static void changed(GtkWidget *widget, struct search_param *search) } if (widget == search->entry_city) { gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (search->liststore2), 2, GTK_SORT_ASCENDING); - dbg(0,"town\n"); + dbg(lvl_error,"town\n"); search->attr.type=attr_town_name; if (strlen(search->attr.u.str) < 3) return; set_columns(search, 1); } if (widget == search->entry_street) { - dbg(0,"street\n"); + dbg(lvl_error,"street\n"); search->attr.type=attr_street_name; // Searching for a street by just its first letter generates too many hits to be useful, // plus it causes the GUI to become unresponsive because the search is single-threaded. @@ -575,7 +575,7 @@ int destination_address(struct navit *nav) gtk_entry_set_text(GTK_ENTRY(search->entry_country), country_name.u.str); country_search_destroy(cs); } else { - dbg(0,"warning: no default country found\n"); + dbg(lvl_error,"warning: no default country found\n"); } search->partial=1; return 0; diff --git a/navit/gui/gtk/gui_gtk_action.c b/navit/gui/gtk/gui_gtk_action.c index 17597f0c1..951f1138a 100644 --- a/navit/gui/gtk/gui_gtk_action.c +++ b/navit/gui/gtk/gui_gtk_action.c @@ -110,7 +110,7 @@ cursor_action(GtkWidget *w, struct gui_priv *gui, void *dummy) attr.type=attr_cursor; attr.u.num=gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w)); if(!navit_set_attr(gui->nav, &attr)) { - dbg(0, "Failed to set attr_cursor\n"); + dbg(lvl_error, "Failed to set attr_cursor\n"); } } @@ -122,7 +122,7 @@ tracking_action(GtkWidget *w, struct gui_priv *gui, void *dummy) attr.type=attr_tracking; attr.u.num=gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w)); if(!navit_set_attr(gui->nav, &attr)) { - dbg(0, "Failed to set attr_tracking\n"); + dbg(lvl_error, "Failed to set attr_tracking\n"); } } @@ -134,7 +134,7 @@ orient_north_action(GtkWidget *w, struct gui_priv *gui, void *dummy) attr.type=attr_orientation; attr.u.num=gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w)) ? 0:-1; if(!navit_set_attr(gui->nav, &attr)) { - dbg(0, "Failed to set attr_orientation\n"); + dbg(lvl_error, "Failed to set attr_orientation\n"); } } diff --git a/navit/gui/gtk/gui_gtk_poi.c b/navit/gui/gtk/gui_gtk_poi.c index 198b91f78..fa73c5ff8 100644 --- a/navit/gui/gtk/gui_gtk_poi.c +++ b/navit/gui/gtk/gui_gtk_poi.c @@ -55,7 +55,7 @@ geticon(const char *name){ GError *error=NULL; icon=gdk_pixbuf_new_from_file(graphics_icon_path(name),&error); if (error) { - dbg(0, "failed to load icon '%s': %s\n", name, error->message); + dbg(lvl_error, "failed to load icon '%s': %s\n", name, error->message); } return icon; } @@ -228,7 +228,7 @@ button_destination_clicked(GtkWidget *widget, struct gtk_poi_search *search) dest.y=lon; dest.pro=1; navit_set_destination(search->nav, &dest, buffer, 1); - dbg(1,_("Set destination to %ld, %ld \n"),lat,lon); + dbg(lvl_warning,_("Set destination to %ld, %ld \n"),lat,lon); } /* Show the POI's position in the map. */ @@ -251,7 +251,7 @@ button_map_clicked(GtkWidget *widget, struct gtk_poi_search *search) dest.y=lon; dest.pro=1; navit_set_center(search->nav, &dest,1); - dbg(1,_("Set map to %ld, %ld \n"),lat,lon); + dbg(lvl_warning,_("Set map to %ld, %ld \n"),lat,lon); } /** Set POI as the first "visit before". */ @@ -268,7 +268,7 @@ button_visit_clicked(GtkWidget *widget, struct gtk_poi_search *search) if(!gtk_tree_model_get_iter(GTK_TREE_MODEL(search->store_poi_sorted), &iter, path)) return; gtk_tree_model_get(GTK_TREE_MODEL(search->store_poi_sorted), &iter, 3, &lat, -1); gtk_tree_model_get(GTK_TREE_MODEL(search->store_poi_sorted), &iter, 4, &lon, -1); - dbg(1,_("Set next visit to %ld, %ld \n"),lat,lon); + dbg(lvl_warning,_("Set next visit to %ld, %ld \n"),lat,lon); struct pcoord dest; dest.x=lat; diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c index e9e55551a..8bca142d9 100644 --- a/navit/gui/gtk/gui_gtk_window.c +++ b/navit/gui/gtk/gui_gtk_window.c @@ -85,7 +85,7 @@ keypress(GtkWidget *widget, GdkEventKey *event, struct gui_priv *this) struct point p; if (event->type != GDK_KEY_PRESS) return FALSE; - dbg(1,"keypress 0x%x\n", event->keyval); + dbg(lvl_warning,"keypress 0x%x\n", event->keyval); transform_get_size(navit_get_trans(this->nav), &w, &h); switch (event->keyval) { case GDK_KP_Enter: @@ -313,19 +313,19 @@ gui_gtk_toggle_init(struct gui_priv *this) toggle_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(this->base_group, "CursorAction")); gtk_toggle_action_set_active(toggle_action, attr.u.num); } else { - dbg(1, "Unable to locate CursorAction\n"); + dbg(lvl_warning, "Unable to locate CursorAction\n"); } if (navit_get_attr(this->nav, attr_orientation, &attr, NULL)) { toggle_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(this->base_group, "OrientationAction")); gtk_toggle_action_set_active(toggle_action, attr.u.num != -1); } else { - dbg(0, "Unable to locate OrientationAction\n"); + dbg(lvl_error, "Unable to locate OrientationAction\n"); } if (navit_get_attr(this->nav, attr_tracking, &attr, NULL)) { toggle_action = GTK_TOGGLE_ACTION(gtk_action_group_get_action(this->base_group, "TrackingAction")); gtk_toggle_action_set_active(toggle_action, attr.u.num); } else { - dbg(0, "Unable to locate TrackingAction\n"); + dbg(lvl_error, "Unable to locate TrackingAction\n"); } } @@ -478,7 +478,7 @@ gui_gtk_vehicles_update(struct gui_priv *this) char *name; GList *curr; struct gui_menu_info *meninfo; - dbg(1,"enter\n"); + dbg(lvl_warning,"enter\n"); curr = g_list_first(this->vehicle_menuitems); diff --git a/navit/gui/internal/gui_internal.c b/navit/gui/internal/gui_internal.c index f426c033d..7c2f35290 100644 --- a/navit/gui/internal/gui_internal.c +++ b/navit/gui/internal/gui_internal.c @@ -130,10 +130,10 @@ image_new_scaled(struct gui_priv *this, const char *name, int w, int h) char *full_path=NULL; full_path=graphics_icon_path(name); ret=graphics_image_new_scaled(this->gra, full_path, w, h); - dbg(1,"Trying to load image '%s' (w=%d, h=%d): %s\n", name, w, h, ret ? "OK" : "NOT FOUND"); + dbg(lvl_warning,"Trying to load image '%s' (w=%d, h=%d): %s\n", name, w, h, ret ? "OK" : "NOT FOUND"); g_free(full_path); if (!ret) { - dbg(0,"Failed to load image for '%s' (w=%d, h=%d)\n", name, w, h); + dbg(lvl_error,"Failed to load image for '%s' (w=%d, h=%d)\n", name, w, h); full_path=graphics_icon_path("unknown"); ret=graphics_image_new_scaled(this->gra, full_path, w, h); g_free(full_path); @@ -498,7 +498,7 @@ gui_internal_apply_config(struct gui_priv *this) { struct gui_config_settings * current_config=0; - dbg(1,"w=%d h=%d\n", this->root.w, this->root.h); + dbg(lvl_warning,"w=%d h=%d\n", this->root.w, this->root.h); /** * Select default values from profile based on the screen. */ @@ -583,7 +583,7 @@ static void gui_internal_cmd_set_destination(struct gui_priv *this, struct widget *wm, void *data) { char *name=data; - dbg(2,"c=%d:0x%x,0x%x\n", wm->c.pro, wm->c.x, wm->c.y); + dbg(lvl_info,"c=%d:0x%x,0x%x\n", wm->c.pro, wm->c.x, wm->c.y); navit_set_destination(this->nav, &wm->c, name, 1); if (this->flags & 512) { struct attr follow; @@ -837,13 +837,13 @@ gui_internal_cmd_view_attributes(struct gui_priv *this, struct widget *wm, void char *text; int count=0; - dbg(2,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo); + dbg(lvl_info,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo); wb=gui_internal_menu(this, "Attributes"); w=gui_internal_box_new(this, gravity_top_center|orientation_vertical|flags_expand|flags_fill); gui_internal_widget_append(wb, w); mr=map_rect_new(wm->item.map, NULL); item = map_rect_get_item_byid(mr, wm->item.id_hi, wm->item.id_lo); - dbg(2,"item=%p\n", item); + dbg(lvl_info,"item=%p\n", item); if (item) { text=g_strdup_printf("%s:%s", _("Item type"), item_to_name(item->type)); gui_internal_widget_append(w, @@ -885,10 +885,10 @@ gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void char *cmd=NULL; if (!wm->name) { - dbg(2,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo); + dbg(lvl_info,"item=%p 0x%x 0x%x\n", wm->item.map,wm->item.id_hi, wm->item.id_lo); mr=map_rect_new(wm->item.map, NULL); item = map_rect_get_item_byid(mr, wm->item.id_hi, wm->item.id_lo); - dbg(2,"item=%p\n", item); + dbg(lvl_info,"item=%p\n", item); if (item) { while(item_attr_get(item, attr_url_local, &attr)) { if (! cmd) @@ -903,7 +903,7 @@ gui_internal_cmd_view_in_browser(struct gui_priv *this, struct widget *wm, void #ifdef HAVE_SYSTEM system(cmd); #else - dbg(0,"Error: External commands were disabled during compilation, cannot call '%s'.\n",cmd); + dbg(lvl_error,"Error: External commands were disabled during compilation, cannot call '%s'.\n",cmd); #endif g_free(cmd); } @@ -993,7 +993,7 @@ gui_internal_cmd_results_to_map(struct gui_priv *this, struct widget *wm, void * if(!w) { map_rect_destroy(mr); - dbg(1,"Can't find the results table - only map clean up is done.\n"); + dbg(lvl_warning,"Can't find the results table - only map clean up is done.\n"); return; } @@ -1005,7 +1005,7 @@ gui_internal_cmd_results_to_map(struct gui_priv *this, struct widget *wm, void * struct item* it; if(wi->name==NULL) continue; - dbg(2,"%s\n",wi->name); + dbg(lvl_info,"%s\n",wi->name); it=map_rect_create_item(mr,type_found_item); if(it) { struct coord c; @@ -1106,7 +1106,7 @@ gui_internal_cmd_position_do(struct gui_priv *this, struct pcoord *pc_in, struct pc=*pc_in; c.x=pc.x; c.y=pc.y; - dbg(2,"x=0x%x y=0x%x\n", c.x, c.y); + dbg(lvl_info,"x=0x%x y=0x%x\n", c.x, c.y); transform_to_geo(pc.pro, &c, &g); } else if (g_in) { struct attr attr; @@ -1551,7 +1551,7 @@ gui_internal_cmd_bookmarks(struct gui_priv *this, struct widget *wm, void *data) while ((item=bookmarks_get_item(mattr.u.bookmarks))) { if (!item_attr_get(item, attr_label, &attr)) continue; label_full=map_convert_string_tmp(item->map,attr.u.str); - dbg(2,"full_labled: %s\n",label_full); + dbg(lvl_info,"full_labled: %s\n",label_full); // hassub == 1 if the item type is a sub-folder if (item->type == type_bookmark_folder) { @@ -1624,7 +1624,7 @@ gui_internal_keypress_do(struct gui_priv *this, char *key) } return; } else if (*key == NAVIT_KEY_BACKSPACE) { - dbg(1,"backspace\n"); + dbg(lvl_warning,"backspace\n"); if (wi->text && wi->text[0]) { len=g_utf8_prev_char(wi->text+strlen(wi->text))-wi->text; wi->text[len]='\0'; @@ -1632,11 +1632,11 @@ gui_internal_keypress_do(struct gui_priv *this, char *key) } } else { if (wi->state & STATE_CLEAR) { - dbg(2,"wi->state=0x%x\n", wi->state); + dbg(lvl_info,"wi->state=0x%x\n", wi->state); g_free(wi->text); wi->text=NULL; wi->state &= ~STATE_CLEAR; - dbg(2,"wi->state=0x%x\n", wi->state); + dbg(lvl_info,"wi->state=0x%x\n", wi->state); } text=g_strdup_printf("%s%s", wi->text ? wi->text : "", key); } @@ -1720,7 +1720,7 @@ gui_internal_set(char *remove, char *add) int len=strlen(line); if (len > 0 && line[len-1] == '\n') line[len-1]='\0'; - dbg(1,"line=%s\n",line); + dbg(lvl_warning,"line=%s\n",line); if (!gui_internal_match(remove, line)) fprintf(fo,"%s\n",line); } @@ -1779,12 +1779,12 @@ gui_internal_cmd_map_download_do(struct gui_priv *this, struct widget *wm, void sel.range.max=type_last; mr=map_rect_new(map, &sel); while ((item=map_rect_get_item(mr))) { - dbg(2,"item\n"); + dbg(lvl_info,"item\n"); } map_rect_destroy(mr); } - dbg(2,"bbox=%s\n",wm->prefix); + dbg(lvl_info,"bbox=%s\n",wm->prefix); gui_internal_menu_render(this); } @@ -1798,7 +1798,7 @@ gui_internal_cmd_map_download(struct gui_priv *this, struct widget *wm, void *da char *search,buffer[256]; int found,sp_match=0; - dbg(1,"wm=%p prefix=%s\n",wm,wm->prefix); + dbg(lvl_warning,"wm=%p prefix=%s\n",wm,wm->prefix); search=wm->prefix; if (search) { @@ -2007,14 +2007,14 @@ gui_internal_cmd_set_active_profile(struct gui_priv *this, struct vehicle_get_attr(v, attr_name, &vehicle_name_attr, NULL); vehicle_name = vehicle_name_attr.u.str; - dbg(1, "Changing vehicle %s to profile %s\n", vehicle_name, + dbg(lvl_warning, "Changing vehicle %s to profile %s\n", vehicle_name, profilename); // Change the profile name profilename_attr.type = attr_profilename; profilename_attr.u.str = profilename; if(!vehicle_set_attr(v, &profilename_attr)) { - dbg(0, "Unable to set the vehicle's profile name\n"); + dbg(lvl_error, "Unable to set the vehicle's profile name\n"); } // Notify Navit that the routing should be re-done if this is the @@ -2056,7 +2056,7 @@ gui_internal_add_vehicle_profile(struct gui_priv *this, struct widget // Figure out the profile name attr = attr_search(profile->attrs, NULL, attr_name); if (!attr) { - dbg(0, "Adding vehicle profile failed. attr==NULL"); + dbg(lvl_error, "Adding vehicle profile failed. attr==NULL"); return; } name = attr->u.str; @@ -2066,7 +2066,7 @@ gui_internal_add_vehicle_profile(struct gui_priv *this, struct widget active_profile = profile_attr.u.str; active = active_profile != NULL && !strcmp(name, active_profile); - dbg(1, "Adding vehicle profile %s, active=%s/%i\n", name, + dbg(lvl_warning, "Adding vehicle profile %s, active=%s/%i\n", name, active_profile, active); // Build a translatable label. @@ -2213,7 +2213,7 @@ gui_internal_set_click_coord(struct gui_priv *this, struct point *p) if (p) { trans=navit_get_trans(this->nav); transform_reverse(trans, p, &c); - dbg(1,"x=0x%x y=0x%x\n", c.x, c.y); + dbg(lvl_warning,"x=0x%x y=0x%x\n", c.x, c.y); this->clickp.pro=transform_get_projection(trans); this->clickp.x=c.x; this->clickp.y=c.y; @@ -2254,7 +2254,7 @@ gui_internal_enter_setup(struct gui_priv *this) void gui_internal_cmd_menu(struct gui_priv *this, int ignore, char *href) { - dbg(1,"enter\n"); + dbg(lvl_warning,"enter\n"); gui_internal_enter(this, ignore); gui_internal_enter_setup(this); // draw menu @@ -2374,7 +2374,7 @@ gui_internal_set_attr(struct gui_priv *this, struct attr *attr) this->on_map_click=g_strdup(attr->u.str); return 1; default: - dbg(0,"Unknown attribute: %s\n",attr_to_name(attr->type)); + dbg(lvl_error,"Unknown attribute: %s\n",attr_to_name(attr->type)); return 1; } } @@ -2442,7 +2442,7 @@ gui_internal_coordinate_parse(char *s, char plus, char minus, double *x) sscanf(degree, "%lf", x); if(strchr(degree, plus) || strchr(degree, minus)) { - dbg(3,"degree %c/%c found\n",plus,minus); + dbg(lvl_debug,"degree %c/%c found\n",plus,minus); } else {/* DEGREES_MINUTES */ if(!minute) return 0; @@ -2450,7 +2450,7 @@ gui_internal_coordinate_parse(char *s, char plus, char minus, double *x) sscanf(minute, "%lf", &tmp); *x+=tmp/60; if(strchr(minute, plus) || strchr(minute, minus)) { - dbg(3,"minute %c/%c found\n",plus,minus); + dbg(lvl_debug,"minute %c/%c found\n",plus,minus); } else { /* DEGREES_MINUTES_SECONDS */ second=strtok(NULL,""); if(!second) @@ -2474,7 +2474,7 @@ gui_internal_cmd_enter_coord_do(struct gui_priv *this, struct widget *widget) char *lat, *lng; char *widgettext; double latitude, longitude; - dbg(1,"text entered:%s\n", widget->text); + dbg(lvl_warning,"text entered:%s\n", widget->text); /* possible entry can be identical to coord_format output but only space between lat and lng is allowed */ widgettext=g_ascii_strup(widget->text,-1); @@ -2507,7 +2507,7 @@ gui_internal_cmd_enter_coord_do(struct gui_priv *this, struct widget *widget) void gui_internal_cmd_enter_coord_clicked(struct gui_priv *this, struct widget *widget, void *data) { - dbg(1,"entered\n"); + dbg(lvl_warning,"entered\n"); gui_internal_cmd_enter_coord_do(this, widget->data); } @@ -2527,18 +2527,18 @@ static void gui_internal_button(void *data, int pressed, int button, struct poin struct gui_priv *this=data; struct graphics *gra=this->gra; - dbg(1,"enter %d %d\n", pressed, button); + dbg(lvl_warning,"enter %d %d\n", pressed, button); // if still on the map (not in the menu, yet): - dbg(1,"children=%p ignore_button=%d\n",this->root.children,this->ignore_button); + dbg(lvl_warning,"children=%p ignore_button=%d\n",this->root.children,this->ignore_button); if (!this->root.children || this->ignore_button) { this->ignore_button=0; // check whether the position of the mouse changed during press/release OR if it is the scrollwheel if (!navit_handle_button(this->nav, pressed, button, p, NULL)) { - dbg(1,"navit has handled button\n"); + dbg(lvl_warning,"navit has handled button\n"); return; } - dbg(1,"menu_on_map_click=%d\n",this->menu_on_map_click); + dbg(lvl_warning,"menu_on_map_click=%d\n",this->menu_on_map_click); if (button != 1) return; if (this->on_map_click || this->menu_on_map_click) { @@ -2639,7 +2639,7 @@ static void gui_internal_resize(void *data, int w, int h) this->root.h=h; changed=1; } - dbg(1,"w=%d h=%d children=%p\n", w, h, this->root.children); + dbg(lvl_warning,"w=%d h=%d children=%p\n", w, h, this->root.children); navit_handle_resize(this->nav, w, h); if (this->root.children) { if (changed) { @@ -2688,7 +2688,7 @@ gui_internal_keynav_find_closest(struct widget *wi, struct point *p, int dx, int if (dist1 < 0) dist1=-dist1; } - dbg(1,"checking %d,%d %d %d against %d,%d-%d,%d result %d,%d\n", p->x, p->y, dx, dy, wi->p.x, wi->p.y, wi->p.x+wi->w, wi->p.y+wi->h, dist1, dist2); + dbg(lvl_warning,"checking %d,%d %d %d against %d,%d-%d,%d result %d,%d\n", p->x, p->y, dx, dy, wi->p.x, wi->p.y, wi->p.x+wi->w, wi->p.y+wi->h, dist1, dist2); if (dist1 >= 0) { if (dist2 < 0) dist1-=dist2; @@ -2723,13 +2723,13 @@ gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy) gui_internal_keynav_find_closest(menu, &p, 0, 0, &distance, &result); if (result) { gui_internal_keynav_point(result, dx, dy, &p); - dbg(1,"result origin=%p p=%d,%d\n", result, p.x, p.y); + dbg(lvl_warning,"result origin=%p p=%d,%d\n", result, p.x, p.y); } } result=NULL; distance=INT_MAX; gui_internal_keynav_find_closest(menu, &p, dx, dy, &distance, &result); - dbg(1,"result=%p\n", result); + dbg(lvl_warning,"result=%p\n", result); if (! result) { if (dx < 0) p.x=this->root.w; @@ -2742,7 +2742,7 @@ gui_internal_keynav_highlight_next(struct gui_priv *this, int dx, int dy) result=NULL; distance=INT_MAX; gui_internal_keynav_find_closest(menu, &p, dx, dy, &distance, &result); - dbg(1,"wraparound result=%p\n", result); + dbg(lvl_warning,"wraparound result=%p\n", result); } gui_internal_highlight_do(this, result); if (result) @@ -3003,9 +3003,9 @@ line_intersection(struct coord* a1, struct coord *a2, struct coord * b1, struct if (a > n || b > n) return 0; if (n == 0) { - dbg(2,"a=%d b=%d n=%d\n", a, b, n); - dbg(2,"a1=0x%x,0x%x ad %d,%d\n", a1->x, a1->y, adx, ady); - dbg(2,"b1=0x%x,0x%x bd %d,%d\n", b1->x, b1->y, bdx, bdy); + dbg(lvl_info,"a=%d b=%d n=%d\n", a, b, n); + dbg(lvl_info,"a1=0x%x,0x%x ad %d,%d\n", a1->x, a1->y, adx, ady); + dbg(lvl_info,"b1=0x%x,0x%x bd %d,%d\n", b1->x, b1->y, bdx, bdy); dbg_assert(n != 0); } res->x = a1->x + a * adx / n; diff --git a/navit/gui/internal/gui_internal_bookmark.c b/navit/gui/internal/gui_internal_bookmark.c index 26d338f96..64351b323 100644 --- a/navit/gui/internal/gui_internal_bookmark.c +++ b/navit/gui/internal/gui_internal_bookmark.c @@ -21,7 +21,7 @@ gui_internal_cmd_add_bookmark_do(struct gui_priv *this, struct widget *widget) { GList *l; struct attr attr; - dbg(1,"text='%s'\n", widget->text); + dbg(lvl_warning,"text='%s'\n", widget->text); if (widget->text && strlen(widget->text)){ navit_get_attr(this->nav, attr_bookmarks, &attr, NULL); bookmarks_add_bookmark(attr.u.bookmarks, &widget->c, widget->text); @@ -37,7 +37,7 @@ gui_internal_cmd_add_bookmark_folder_do(struct gui_priv *this, struct widget *wi { GList *l; struct attr attr; - dbg(1,"text='%s'\n", widget->text); + dbg(lvl_warning,"text='%s'\n", widget->text); if (widget->text && strlen(widget->text)){ navit_get_attr(this->nav, attr_bookmarks, &attr, NULL); bookmarks_add_bookmark(attr.u.bookmarks, NULL, widget->text); @@ -66,7 +66,7 @@ gui_internal_cmd_rename_bookmark_clicked(struct gui_priv *this, struct widget *w struct widget *w=(struct widget*)widget->data; GList *l; struct attr attr; - dbg(1,"text='%s'\n", w->text); + dbg(lvl_warning,"text='%s'\n", w->text); if (w->text && strlen(w->text)){ navit_get_attr(this->nav, attr_bookmarks, &attr, NULL); bookmarks_rename_bookmark(attr.u.bookmarks, w->name, w->text); diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c index 2d1e13cd2..9c7b33609 100644 --- a/navit/gui/internal/gui_internal_command.c +++ b/navit/gui/internal/gui_internal_command.c @@ -134,11 +134,11 @@ gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, { struct attr escaped; if (!in || !in[0]) { - dbg(0,"first parameter missing or wrong type\n"); + dbg(lvl_error,"first parameter missing or wrong type\n"); return; } if (!out) { - dbg(0,"output missing\n"); + dbg(lvl_error,"output missing\n"); return; } if (ATTR_IS_STRING(in[0]->type)) { @@ -148,10 +148,10 @@ gui_internal_cmd_escape(struct gui_priv *this, char *function, struct attr **in, escaped.type=attr_type_string_begin; escaped.u.str=g_strdup_printf("%ld",in[0]->u.num); } else { - dbg(0,"first parameter wrong type\n"); + dbg(lvl_error,"first parameter wrong type\n"); return; } - dbg(1,"in %s result %s\n",in[0]->u.str,escaped.u.str); + dbg(lvl_warning,"in %s result %s\n",in[0]->u.str,escaped.u.str); *out=attr_generic_add_attr(*out, attr_dup(&escaped)); g_free(escaped.u.str); } @@ -514,7 +514,7 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st diagram_point->c.y=heightline->height; diagram_point->next=diagram_points; diagram_points=diagram_point; - dbg(2,"%d %d\n", diagram_point->c.x, diagram_point->c.y); + dbg(lvl_info,"%d %d\n", diagram_point->c.x, diagram_point->c.y); } } } @@ -548,12 +548,12 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st coord_rect_extend(&dbbox, &diagram_point->c); diagram_point=diagram_point->next; } - dbg(2,"%d %d %d %d\n", dbbox.lu.x, dbbox.lu.y, dbbox.rl.x, dbbox.rl.y); + dbg(lvl_info,"%d %d %d %d\n", dbbox.lu.x, dbbox.lu.y, dbbox.rl.x, dbbox.rl.y); if (dbbox.rl.x > dbbox.lu.x && dbbox.lu.x*100/(dbbox.rl.x-dbbox.lu.x) <= 25) dbbox.lu.x=0; if (dbbox.lu.y > dbbox.rl.y && dbbox.rl.y*100/(dbbox.lu.y-dbbox.rl.y) <= 25) dbbox.rl.y=0; - dbg(2,"%d,%d %dx%d\n", box->p.x, box->p.y, box->w, box->h); + dbg(lvl_info,"%d,%d %dx%d\n", box->p.x, box->p.y, box->w, box->h); x=dbbox.lu.x; first=1; for (;;) { @@ -569,7 +569,7 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st break; p[1].x=(min->c.x-dbbox.lu.x)*(box->w-10)/(dbbox.rl.x-dbbox.lu.x)+box->p.x+5; p[1].y=(min->c.y-dbbox.rl.y)*(box->h-10)/(dbbox.lu.y-dbbox.rl.y)+box->p.y+5; - dbg(2,"%d,%d=%d,%d\n",min->c.x, min->c.y, p[1].x,p[1].y); + dbg(lvl_info,"%d,%d=%d,%d\n",min->c.x, min->c.y, p[1].x,p[1].y); graphics_draw_circle(this->gra, this->foreground, &p[1], 2); if (first) first=0; @@ -630,7 +630,7 @@ gui_internal_cmd2_pois(struct gui_priv *this, char *function, struct attr **in, struct attr pro; struct coord c; - dbg(1,"enter\n"); + dbg(lvl_warning,"enter\n"); if (!in || !in[0]) return; if (!ATTR_IS_COORD_GEO(in[0]->type)) @@ -871,7 +871,7 @@ gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr ** const char *name=_("Position"); int flags=-1; - dbg(1,"enter\n"); + dbg(lvl_warning,"enter\n"); if (!in || !in[0]) return; if (!ATTR_IS_COORD_GEO(in[0]->type)) @@ -881,7 +881,7 @@ gui_internal_cmd2_position(struct gui_priv *this, char *function, struct attr ** if (in[2] && ATTR_IS_INT(in[2]->type)) flags=in[2]->u.num; } - dbg(1,"flags=0x%x\n",flags); + dbg(lvl_warning,"flags=0x%x\n",flags); gui_internal_cmd_position_do(this, NULL, in[0]->u.coord_geo, NULL, name, flags); } @@ -904,14 +904,14 @@ gui_internal_cmd2_set(struct gui_priv *this, char *function, struct attr **in, s { char *pattern,*command=NULL; if (!in || !in[0] || !ATTR_IS_STRING(in[0]->type)) { - dbg(0,"first parameter missing or wrong type\n"); + dbg(lvl_error,"first parameter missing or wrong type\n"); return; } pattern=in[0]->u.str; - dbg(1,"pattern %s\n",pattern); + dbg(lvl_warning,"pattern %s\n",pattern); if (in[1]) { command=gui_internal_cmd_match_expand(pattern, in+1); - dbg(1,"expand %s\n",command); + dbg(lvl_warning,"expand %s\n",command); gui_internal_set(pattern, command); command_evaluate(&this->self, command); g_free(command); @@ -955,7 +955,7 @@ static void gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid) { char *str=NULL; - dbg(1,"enter %s %p %p %p\n",function,in,out,valid); + dbg(lvl_warning,"enter %s %p %p %p\n",function,in,out,valid); if (!in) return; while (*in) { @@ -965,7 +965,7 @@ gui_internal_cmd_write(struct gui_priv * this, char *function, struct attr **in, if (str) { str=g_strdup_printf("<html>%s</html>\n",str); #if 0 - dbg(0,"%s\n",str); + dbg(lvl_error,"%s\n",str); #endif gui_internal_html_parse_text(this, str); } @@ -988,11 +988,11 @@ gui_internal_onclick(struct attr ***in, char **onclick, char *set) char format[4],*end=strchr(c+2,'}'),*replacement=NULL,*new_str; int is_arg; if (!end) { - dbg(0,"Missing closing brace in format string %s\n",c); + dbg(lvl_error,"Missing closing brace in format string %s\n",c); goto error; } if (end-c > sizeof(format)) { - dbg(0,"Invalid format string %s\n",c); + dbg(lvl_error,"Invalid format string %s\n",c); goto error; } strncpy(format, c+2, end-c-2); @@ -1019,7 +1019,7 @@ gui_internal_onclick(struct attr ***in, char **onclick, char *set) } } if (!replacement) { - dbg(0,"Unsupported format string %s\n",format); + dbg(lvl_error,"Unsupported format string %s\n",format); goto error; } new_str=g_strconcat(str, replacement, end+1, NULL); @@ -1063,7 +1063,7 @@ gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, s str=gui_internal_append_attr(str, escape_mode_string|escape_mode_html, " class=", *in, ""); in++; } else { - dbg(0,"argument error: class argument not string\n"); + dbg(lvl_error,"argument error: class argument not string\n"); goto error; } if (ATTR_IS_STRING((*in)->type) && (*in)->u.str) { @@ -1072,7 +1072,7 @@ gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, s } in++; } else { - dbg(0,"argument error: image argument not string\n"); + dbg(lvl_error,"argument error: image argument not string\n"); goto error; } if (ATTR_IS_STRING((*in)->type) && (*in)->u.str) { @@ -1083,7 +1083,7 @@ gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, s } in++; } else { - dbg(0,"argument error: text argument not string\n"); + dbg(lvl_error,"argument error: text argument not string\n"); goto error; } gui_internal_onclick(&in,&onclick,NULL); @@ -1096,7 +1096,7 @@ gui_internal_cmd_img(struct gui_priv * this, char *function, struct attr **in, s } g_free(onclick); html=g_strdup_printf("<html>%s%s</html>\n",str,suffix); - dbg(1,"return %s",html); + dbg(lvl_warning,"return %s",html); gui_internal_html_parse_text(this, html); g_free(html); error: @@ -1109,16 +1109,16 @@ static void gui_internal_cmd_debug(struct gui_priv * this, char *function, struct attr **in, struct attr ***out, int *valid) { char *str; - dbg(0,"begin\n"); + dbg(lvl_error,"begin\n"); if (in) { while (*in) { str=attr_to_text(*in, NULL, 0); - dbg(0,"%s:%s\n",attr_to_name((*in)->type),str); + dbg(lvl_error,"%s:%s\n",attr_to_name((*in)->type),str); in++; g_free(str); } } - dbg(0,"done\n"); + dbg(lvl_error,"done\n"); } static void diff --git a/navit/gui/internal/gui_internal_gesture.c b/navit/gui/internal/gui_internal_gesture.c index 5eec83da9..d0f129b7d 100644 --- a/navit/gui/internal/gui_internal_gesture.c +++ b/navit/gui/internal/gui_internal_gesture.c @@ -61,7 +61,7 @@ gui_internal_gesture_ring_add(struct gui_priv *this, struct point *p) } this->gesture_ring[this->gesture_ring_last].p=*p; this->gesture_ring[this->gesture_ring_last].msec=msec; - dbg(2,"msec="LONGLONG_FMT" x=%d y=%d\n",msec,p->x,p->y); + dbg(lvl_info,"msec="LONGLONG_FMT" x=%d y=%d\n",msec,p->x,p->y); }; int @@ -89,7 +89,7 @@ gui_internal_gesture_get_vector(struct gui_priv *this, long long msec, struct po *p0=g->p; } msec=g->msec; - dbg(2,LONGLONG_FMT" %d %d\n",g->msec, g->p.x, g->p.y); + dbg(lvl_info,LONGLONG_FMT" %d %d\n",g->msec, g->p.x, g->p.y); for(i=1;(g=gui_internal_gesture_ring_get(this,i))!=NULL;i++) { if( msec-g->msec > 1000 ) break; @@ -99,7 +99,7 @@ gui_internal_gesture_get_vector(struct gui_priv *this, long long msec, struct po if(p0) { *p0=g->p; } - dbg(2,LONGLONG_FMT" %d %d\n",g->msec, g->p.x, g->p.y); + dbg(lvl_info,LONGLONG_FMT" %d %d\n",g->msec, g->p.x, g->p.y); } return dt; } @@ -114,7 +114,7 @@ gui_internal_gesture_do(struct gui_priv *this) if( abs(dx) > this->icon_s*3 && abs(dy) < this->icon_s ) { struct widget *wt; - dbg(1,"horizontal dx=%d dy=%d\n",dx,dy); + dbg(lvl_warning,"horizontal dx=%d dy=%d\n",dx,dy); /* Prevent swiping if widget was scrolled beforehand */ if(this->pressed==2) @@ -133,11 +133,11 @@ gui_internal_gesture_do(struct gui_priv *this) gui_internal_table_button_prev(this,NULL,wt); return 1; } else if( abs(dy) > this->icon_s*3 && abs(dx) < this->icon_s ) { - dbg(1,"vertical dx=%d dy=%d\n",dx,dy); + dbg(lvl_warning,"vertical dx=%d dy=%d\n",dx,dy); } else if (dt>300 && abs(dx) <this->icon_s && abs(dy) <this->icon_s ) { - dbg(1,"longtap dx=%d dy=%d\n",dx,dy); + dbg(lvl_warning,"longtap dx=%d dy=%d\n",dx,dy); } else { - dbg(1,"none dx=%d dy=%d\n",dx,dy); + dbg(lvl_warning,"none dx=%d dy=%d\n",dx,dy); } return 0; diff --git a/navit/gui/internal/gui_internal_html.c b/navit/gui/internal/gui_internal_html.c index b87c6c230..291b1701d 100644 --- a/navit/gui/internal/gui_internal_html.c +++ b/navit/gui/internal/gui_internal_html.c @@ -96,7 +96,7 @@ gui_internal_html_submit(struct gui_priv *this, struct widget *w, void *data) struct widget *menu; GList *l; - dbg(1,"enter form %p %s\n",w->form,w->form->onsubmit); + dbg(lvl_warning,"enter form %p %s\n",w->form,w->form->onsubmit); l=g_list_last(this->root.children); menu=l->data; graphics_draw_mode(this->gra, draw_mode_begin); @@ -113,7 +113,7 @@ gui_internal_html_load_href(struct gui_priv *this, char *href, int replace) if (replace) gui_internal_prune_menu_count(this, 1, 0); if (href && href[0] == '#') { - dbg(1,"href=%s\n",href); + dbg(lvl_warning,"href=%s\n",href); g_free(this->href); this->href=g_strdup(href); gui_internal_html_menu(this, this->html_text, href+1); @@ -376,22 +376,22 @@ gui_internal_refresh_callback_called(struct gui_priv *this, struct menu_data *me static void gui_internal_set_refresh_callback(struct gui_priv *this, char *cond) { - dbg(2,"cond=%s\n",cond); + dbg(lvl_info,"cond=%s\n",cond); if (cond) { enum attr_type type; struct object_func *func; struct menu_data *menu_data=gui_internal_menu_data(this); - dbg(2,"navit=%p\n",this->nav); + dbg(lvl_info,"navit=%p\n",this->nav); type=command_evaluate_to_attr(&this->self, cond, NULL, &menu_data->refresh_callback_obj); if (type == attr_none) { - dbg(0,"can't get type of '%s'\n",cond); + dbg(lvl_error,"can't get type of '%s'\n",cond); return; } func=object_func_lookup(menu_data->refresh_callback_obj.type); if (!func) - dbg(0,"'%s' has no functions\n",cond); + dbg(lvl_error,"'%s' has no functions\n",cond); if (func && !func->add_attr) - dbg(0,"'%s' has no add_attr function\n",cond); + dbg(lvl_error,"'%s' has no add_attr function\n",cond); if (!func || !func->add_attr) return; menu_data->refresh_callback.type=attr_callback; @@ -461,7 +461,7 @@ gui_internal_html_text(xml_context *dummy, const char *text, gsize len, void *da } break; case html_tag_script: - dbg(1,"execute %s\n",text_stripped); + dbg(lvl_warning,"execute %s\n",text_stripped); gui_internal_evaluate(this,text_stripped); break; default: diff --git a/navit/gui/internal/gui_internal_menu.c b/navit/gui/internal/gui_internal_menu.c index b72b00aea..3777d124c 100644 --- a/navit/gui/internal/gui_internal_menu.c +++ b/navit/gui/internal/gui_internal_menu.c @@ -118,7 +118,7 @@ gui_internal_menu(struct gui_priv *this, const char *label) struct widget *wlb,*wb,*wm=w; wm->flags=gravity_center|orientation_vertical|flags_expand|flags_fill; w=gui_internal_box_new(this, gravity_center|orientation_horizontal|flags_expand|flags_fill); - dbg(2,"topbox->menu_data=%p\n", topbox->menu_data); + dbg(lvl_info,"topbox->menu_data=%p\n", topbox->menu_data); gui_internal_widget_append(wm, w); wb=gui_internal_box_new(this, gravity_right_center|orientation_horizontal|flags_fill); wb->bl=6; @@ -260,7 +260,7 @@ gui_internal_top_bar(struct gui_priv *this) use_sep=1; else use_sep=0; - dbg(1,"%d (%s) + %d + %d + %d > %d\n", wcn->w, wc->text, width_used, w->spx, use_sep ? sep_len : 0, width); + dbg(lvl_warning,"%d (%s) + %d + %d + %d > %d\n", wcn->w, wc->text, width_used, w->spx, use_sep ? sep_len : 0, width); if (wcn->w + width_used + w->spx + (use_sep ? sep_len : 0) + (g_list_previous(l) ? dots_len : 0) > width) { incomplete=1; gui_internal_widget_destroy(this, wcn); diff --git a/navit/gui/internal/gui_internal_poi.c b/navit/gui/internal/gui_internal_poi.c index dac6e7e18..261e1646e 100644 --- a/navit/gui/internal/gui_internal_poi.c +++ b/navit/gui/internal/gui_internal_poi.c @@ -122,7 +122,7 @@ gui_internal_poi_icon(struct gui_priv *this, struct item *item) icon=g_strdup(el->u.icon.src); } char *dot=g_strrstr(icon,"."); - dbg(2,"%s %s\n", item_to_name(item->type),icon); + dbg(lvl_info,"%s %s\n", item_to_name(item->type),icon); if(dot) *dot=0; img=image_new_xs(this,icon); @@ -573,7 +573,7 @@ gui_internal_cmd_pois(struct gui_priv *this, struct widget *wm, void *data) char buffer[32]; struct poi_param *paramnew; struct attr route; -dbg(0,"POIs..."); +dbg(lvl_error,"POIs..."); if(data) { param = data; } else { @@ -596,7 +596,7 @@ dbg(0,"POIs..."); items= g_new0( struct item_data, maxitem); - dbg(2, "Params: sel = %i, selnb = %i, pagenb = %i, dist = %i, filterstr = %s, AddressFilterType= %d\n", + dbg(lvl_info, "Params: sel = %i, selnb = %i, pagenb = %i, dist = %i, filterstr = %s, AddressFilterType= %d\n", param->sel, param->selnb, param->pagenb, param->dist, param->filterstr, param->AddressFilterType); wb=gui_internal_menu(this, isel ? isel->name : _("POIs")); @@ -614,7 +614,7 @@ dbg(0,"POIs..."); while ((m=mapset_next(h, 1))) { selm=map_selection_dup_pro(sel, pro, map_projection(m)); mr=map_rect_new(m, selm); - dbg(2,"mr=%p\n", mr); + dbg(lvl_info,"mr=%p\n", mr); if (mr) { while ((item=map_rect_get_item(mr))) { if (gui_internal_cmd_pois_item_selected(param, item) && @@ -685,10 +685,10 @@ dbg(0,"POIs..."); struct item_data *data = fh_extractmin(fh); if (data == NULL) { - dbg(2, "Empty heap: maxitem = %i, it = %i, dist = %i\n", maxitem, it, dist); + dbg(lvl_info, "Empty heap: maxitem = %i, it = %i, dist = %i\n", maxitem, it, dist); break; } - dbg(2, "dist1: %i, dist2: %i\n", data->dist, (-key)>>10); + dbg(lvl_info, "dist1: %i, dist2: %i\n", data->dist, (-key)>>10); if(i==(it-pagesize*pagenb) && data->dist>prevdist) prevdist=data->dist; wi=gui_internal_cmd_pois_item(this, ¢er, &data->item, &data->c, route.u.route, data->dist, data->label); @@ -767,13 +767,13 @@ dbg(0,"POIs..."); while(firstrow>=0) { int currow=g_list_index(wtable->children, td->bottom_row->data) - firstrow; if(currow<0) { - dbg(0,"Can't find bottom row in children list. Stop paging.\n"); + dbg(lvl_error,"Can't find bottom row in children list. Stop paging.\n"); break; } if(currow>=param->count) break; if(!(td->scroll_buttons.next_button->state & STATE_SENSITIVE)) { - dbg(0,"Reached last page but item %i not found. Stop paging.\n",param->count); + dbg(lvl_error,"Reached last page but item %i not found. Stop paging.\n",param->count); break; } gui_internal_table_button_next(this, td->scroll_buttons.next_button, NULL); diff --git a/navit/gui/internal/gui_internal_search.c b/navit/gui/internal/gui_internal_search.c index 0539fcf35..9969e0edb 100644 --- a/navit/gui/internal/gui_internal_search.c +++ b/navit/gui/internal/gui_internal_search.c @@ -87,7 +87,7 @@ gui_internal_search_cmp(gconstpointer _a, gconstpointer _b) sa=removecase(a->text); sb=removecase(b->text); r=strcmp(sa,sb); - dbg(1,"%s %s %d\n",sa,sb,r); + dbg(lvl_warning,"%s %s %d\n",sa,sb,r); g_free(sa); g_free(sb); return r; @@ -202,7 +202,7 @@ gui_internal_find_next_possible_key(char *search_text, char *wm_name, char *poss possible_keys[len]=trunk_name[strlen(search_text)]; possible_keys[len+1]='\0'; } - dbg(2,"searching for %s, found: %s, currently possible_keys: %s \n", search_text, item_name, possible_keys); + dbg(lvl_info,"searching for %s, found: %s, currently possible_keys: %s \n", search_text, item_name, possible_keys); } } } @@ -260,7 +260,7 @@ gui_internal_get_match_quality(char *item_name, char* search_text, int is_house_ if(!exp) continue; if(!strcmp(exp,folded_query)) { - dbg(1,"exact match for the whole string %s\n", exp); + dbg(lvl_warning,"exact match for the whole string %s\n", exp); match_quality=full_string_match; g_free(exp); break; @@ -268,7 +268,7 @@ gui_internal_get_match_quality(char *item_name, char* search_text, int is_house_ if((p=strstr(exp,folded_query))!=NULL) { p+=strlen(folded_query); if(!*p||strchr(LINGUISTICS_WORD_SEPARATORS_ASCII,*p)) { - dbg(1,"exact matching word found inside string %s\n",exp); + dbg(lvl_warning,"exact matching word found inside string %s\n",exp); match_quality=word_match; } } @@ -352,7 +352,7 @@ gui_internal_search_idle(struct gui_priv *this, char *wm_name, struct widget *se widget_name=g_strdup(result_main_label); } if(!item_name) { - dbg(0, "Skipping nameless item in search (search type: %s). Please report this as a bug.\n", wm_name); + dbg(lvl_error, "Skipping nameless item in search (search type: %s). Please report this as a bug.\n", wm_name); return; } @@ -411,13 +411,13 @@ gui_internal_search_changed(struct gui_priv *this, struct widget *wm, void *data param=(void *)5; if (! strcmp(wm->name,"House number")) param=(void *)6; - dbg(1,"%s now '%s'\n", wm->name, wm->text); + dbg(lvl_warning,"%s now '%s'\n", wm->name, wm->text); gui_internal_search_idle_end(this); if (wm->text && g_utf8_strlen(wm->text, -1) >= minlen) { struct attr search_attr; - dbg(1,"process\n"); + dbg(lvl_warning,"process\n"); if (! strcmp(wm->name,"Country")) search_attr.type=attr_country_all; if (! strcmp(wm->name,"Town")) @@ -452,7 +452,7 @@ gui_internal_search_list_set_default_country(struct gui_priv *this) item=country_search_get_item(cs); if (item && item_attr_get(item, attr_country_name, &country_name)) { search_attr.type=attr_country_all; - dbg(1,"country %s\n", country_name.u.str); + dbg(lvl_warning,"country %s\n", country_name.u.str); search_attr.u.str=country_name.u.str; search_list_search(this->sl, &search_attr, 0); while((res=search_list_get_result(this->sl))); @@ -465,9 +465,9 @@ gui_internal_search_list_set_default_country(struct gui_priv *this) } country_search_destroy(cs); } else { - dbg(0,"warning: no default country found\n"); + dbg(lvl_error,"warning: no default country found\n"); if (this->country_iso2) { - dbg(0,"attempting to use country '%s'\n",this->country_iso2); + dbg(lvl_error,"attempting to use country '%s'\n",this->country_iso2); search_attr.type=attr_country_iso2; search_attr.u.str=this->country_iso2; search_list_search(this->sl, &search_attr, 0); @@ -566,7 +566,7 @@ gui_internal_search(struct gui_priv *this, const char *what, const char *type, i void gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget *widget, void *data) { - dbg(2,"id %d\n", widget->selection_id); + dbg(lvl_info,"id %d\n", widget->selection_id); search_list_select(this->sl, attr_street_name, 0, 0); search_list_select(this->sl, attr_street_name, widget->selection_id, 1); gui_internal_search(this,_("House number"),"House number",0); @@ -575,7 +575,7 @@ gui_internal_search_house_number_in_street(struct gui_priv *this, struct widget void gui_internal_search_street_in_town(struct gui_priv *this, struct widget *widget, void *data) { - dbg(2,"id %d\n", widget->selection_id); + dbg(lvl_info,"id %d\n", widget->selection_id); search_list_select(this->sl, attr_town_or_district_name, 0, 0); search_list_select(this->sl, attr_town_or_district_name, widget->selection_id, 1); gui_internal_search(this,_("Street"),"Street",0); @@ -585,7 +585,7 @@ void gui_internal_search_town_in_country(struct gui_priv *this, struct widget *widget) { struct search_list_common *slc; - dbg(2,"id %d\n", widget->selection_id); + dbg(lvl_info,"id %d\n", widget->selection_id); search_list_select(this->sl, attr_country_all, 0, 0); slc=search_list_select(this->sl, attr_country_all, widget->selection_id, 1); if (slc) { diff --git a/navit/gui/internal/gui_internal_widget.c b/navit/gui/internal/gui_internal_widget.c index d677d3ca8..d8888b12e 100644 --- a/navit/gui/internal/gui_internal_widget.c +++ b/navit/gui/internal/gui_internal_widget.c @@ -248,7 +248,7 @@ gui_internal_highlight_do(struct gui_priv *this, struct widget *found) this->highlighted_menu=g_list_last(this->root.children)->data; this->highlighted->state |= STATE_HIGHLIGHTED; gui_internal_widget_render(this, this->highlighted); - dbg(1,"%d,%d %dx%d\n", found->p.x, found->p.y, found->w, found->h); + dbg(lvl_warning,"%d,%d %dx%d\n", found->p.x, found->p.y, found->w, found->h); } graphics_draw_mode(this->gra, draw_mode_end); } @@ -474,7 +474,7 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w) * will be used. */ if(!w->w && !w->h) - dbg(0,"Warning width and height of a widget are 0"); + dbg(lvl_error,"Warning width and height of a widget are 0"); break; } if (! w->w && ! w->h) { @@ -550,7 +550,7 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w) wc->p.x=x-wc->w; #if 0 if (w->flags & flags_scrolly) - dbg(0,"%d - %d vs %d - %d\n",y,y+wc->h,w->p.y,w->p.y+w->h-hb); + dbg(lvl_error,"%d - %d vs %d - %d\n",y,y+wc->h,w->p.y,w->p.y+w->h-hb); if (y+wc->h > w->p.y+w->h-hb || y+wc->h < w->p.y) wc->state |= STATE_OFFSCREEN; else @@ -605,7 +605,7 @@ static void gui_internal_box_pack(struct gui_priv *this, struct widget *w) w->scroll_buttons->button_box->p.x=w->p.x; w->scroll_buttons->button_box->p.y=w->p.y+w->h-w->scroll_buttons->button_box->h; gui_internal_widget_pack(this, w->scroll_buttons->button_box); - dbg(0,"needs buttons %d vs %d\n",y,w->h); + dbg(lvl_error,"needs buttons %d vs %d\n",y,w->h); gui_internal_box_pack(this, w); return; } diff --git a/navit/gui/qml/bookmarksProxy.h b/navit/gui/qml/bookmarksProxy.h index 6fe95bd20..96ed32e8a 100644 --- a/navit/gui/qml/bookmarksProxy.h +++ b/navit/gui/qml/bookmarksProxy.h @@ -72,7 +72,7 @@ public slots: entries.appendChild(entry); } - dbg(2,"%s\n",retDoc.toString().toLocal8Bit().constData()); + dbg(lvl_info,"%s\n",retDoc.toString().toLocal8Bit().constData()); return retDoc.toString(); } QString AddFolder(QString description) { @@ -144,7 +144,7 @@ public slots: if (!item_attr_get(item, attr_label, &attr)) continue; label=QString::fromLocal8Bit(attr.u.str); - dbg(0,"Bookmark is %s\n",bookmark.toStdString().c_str()); + dbg(lvl_error,"Bookmark is %s\n",bookmark.toStdString().c_str()); if (label.compare(bookmark)) continue; item_coord_get(item, &c, 1); if (this->object->currentPoint!=NULL) { diff --git a/navit/gui/qml/gui_qml.cpp b/navit/gui/qml/gui_qml.cpp index 7beca4264..98132c756 100644 --- a/navit/gui/qml/gui_qml.cpp +++ b/navit/gui/qml/gui_qml.cpp @@ -161,11 +161,11 @@ static void gui_qml_button(void *data, int pressed, int button, struct point *p) // check whether the position of the mouse changed during press/release OR if it is the scrollwheel if (!navit_handle_button(this_->nav, pressed, button, p, NULL)) { - dbg(1,"navit has handled button\n"); + dbg(lvl_warning,"navit has handled button\n"); return; } - dbg(1,"enter %d %d\n", pressed, button); + dbg(lvl_warning,"enter %d %d\n", pressed, button); if (this_->signal_on_map_click) { gui_qml_dbus_signal(this_, p); return; @@ -278,7 +278,7 @@ static int gui_qml_set_graphics(struct gui_priv *this_, struct graphics *gra) if (xid.length()>0) { _mainWindow->embedInto(xid.toULong(&ok,0)); }else{ - dbg(0, "\nFATAL: Environment variable NAVIT_XID not set.\n" + dbg(lvl_error, "\nFATAL: Environment variable NAVIT_XID not set.\n" " Please set NAVIT_XID to the window ID of the window to embed into.\n"); exit(1); } @@ -322,7 +322,7 @@ static int gui_qml_set_graphics(struct gui_priv *this_, struct graphics *gra) QString mainQml = QString(this_->source)+"/"+this_->skin+"/main.qml"; if (!QFile(mainQml).exists()){ - dbg(0, "FATAL: QML file %s not found. Navit is not installed correctly.\n", mainQml.toAscii().constData()); + dbg(lvl_error, "FATAL: QML file %s not found. Navit is not installed correctly.\n", mainQml.toAscii().constData()); exit(1); } this_->guiWidget->setSource(QUrl::fromLocalFile(mainQml)); @@ -380,7 +380,7 @@ gui_qml_set_attr(struct gui_priv *this_, struct attr *attr) this_->radius=attr->u.num; return 1; default: - dbg(0,"unknown attr: %s\n",attr_to_name(attr->type)); + dbg(lvl_error,"unknown attr: %s\n",attr_to_name(attr->type)); return 1; } } diff --git a/navit/gui/qml/navitProxy.h b/navit/gui/qml/navitProxy.h index 359009206..48197eeb5 100644 --- a/navit/gui/qml/navitProxy.h +++ b/navit/gui/qml/navitProxy.h @@ -82,7 +82,7 @@ public slots: dropIterFunc(iter); - dbg(0,QString::number(_itemId).toStdString().c_str()); + dbg(lvl_error,QString::number(_itemId).toStdString().c_str()); return retDoc.toString(); } diff --git a/navit/gui/qml/ngqpoint.h b/navit/gui/qml/ngqpoint.h index e7202000d..05142e5bf 100644 --- a/navit/gui/qml/ngqpoint.h +++ b/navit/gui/qml/ngqpoint.h @@ -248,7 +248,7 @@ public slots: } map_selection_destroy(sel); mapset_close(h); - dbg(2,"%s\n",retDoc.toString().toLocal8Bit().constData()); + dbg(lvl_info,"%s\n",retDoc.toString().toLocal8Bit().constData()); return retDoc.toString(); } protected: diff --git a/navit/gui/qml/proxy.h b/navit/gui/qml/proxy.h index ba45cb446..d2e00b95c 100644 --- a/navit/gui/qml/proxy.h +++ b/navit/gui/qml/proxy.h @@ -55,7 +55,7 @@ public slots: struct attr attr_value; double *helper; - dbg(1,"Setting %s to %s\n",attr_name.toStdString().c_str(),attr_string.toStdString().c_str()); + dbg(lvl_warning,"Setting %s to %s\n",attr_name.toStdString().c_str(),attr_string.toStdString().c_str()); getAttrFunc(attr_from_name(attr_name.toStdString().c_str()), &attr_value, NULL); if (ATTR_IS_INT(attr_value.type)) { diff --git a/navit/gui/qml/routeProxy.h b/navit/gui/qml/routeProxy.h index 77defd2d3..2492fda23 100644 --- a/navit/gui/qml/routeProxy.h +++ b/navit/gui/qml/routeProxy.h @@ -30,10 +30,10 @@ public slots: QList<struct attr> destinations=this->_routeDestinations(); for (QList<struct attr>::const_iterator iter=destinations.begin();iter!=destinations.end();iter++) { NGQPoint helperPoint(this->object,iter->u.pcoord,MapPoint); - dbg(0,"Added destination %s\n",helperPoint.coordString().toLocal8Bit().constData()); + dbg(lvl_error,"Added destination %s\n",helperPoint.coordString().toLocal8Bit().constData()); } - //dbg(0,QString::number(_itemId).toStdString().c_str()); + //dbg(lvl_error,QString::number(_itemId).toStdString().c_str()); //return retDoc.toString(); return QString(); diff --git a/navit/gui/qml/searchProxy.h b/navit/gui/qml/searchProxy.h index 19a6c93a9..49fadd5e3 100644 --- a/navit/gui/qml/searchProxy.h +++ b/navit/gui/qml/searchProxy.h @@ -33,7 +33,7 @@ public: item=country_search_get_item(cs); if (item && item_attr_get(item, attr_country_name, &country_name)) { search_attr.type=attr_country_all; - dbg(0,"country %s\n", country_name.u.str); + dbg(lvl_error,"country %s\n", country_name.u.str); this->country_name=QString::fromLocal8Bit(country_name.u.str); search_attr.u.str=country_name.u.str; search_list_search(this->sl, &search_attr, 0); @@ -44,9 +44,9 @@ public: } country_search_destroy(cs); } else { - dbg(0,"warning: no default country found\n"); + dbg(lvl_error,"warning: no default country found\n"); if (!this->country_iso2.isEmpty()) { - dbg(0,"attempting to use country '%s'\n",this->country_iso2.toStdString().c_str()); + dbg(lvl_error,"attempting to use country '%s'\n",this->country_iso2.toStdString().c_str()); search_attr.type=attr_country_iso2; search_attr.u.str=(char*)this->country_iso2.toStdString().c_str(); search_list_search(this->sl, &search_attr, 0); diff --git a/navit/gui/win32/gui_win32.c b/navit/gui/win32/gui_win32.c index 3596496a2..1e7c941ec 100644 --- a/navit/gui/win32/gui_win32.c +++ b/navit/gui/win32/gui_win32.c @@ -185,7 +185,7 @@ static void window_layout( HWND hwnd ) rcClient.top += iToolHeight; - dbg(0, "resize gui to: %d %d %d %d \n", rcClient.left, rcClient.right, rcClient.top, rcClient.bottom ); + dbg(lvl_error, "resize gui to: %d %d %d %d \n", rcClient.left, rcClient.right, rcClient.top, rcClient.bottom ); hChild = GetDlgItem(hwnd, ID_CHILD_GFX); @@ -285,7 +285,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l attr.type=attr_cursor; // TODO attr.u.num=gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w)); if(!navit_set_attr(gui->nav, &attr)) { - dbg(0, "Failed to set attr_cursor\n"); + dbg(lvl_error, "Failed to set attr_cursor\n"); } return 0; } @@ -298,7 +298,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM l // attr.u.num=gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(w)); attr.u.num = 0; // TODO if(!navit_set_attr(gui->nav, &attr)) { - dbg(0, "Failed to set attr_orientation\n"); + dbg(lvl_error, "Failed to set attr_orientation\n"); } return 0; } diff --git a/navit/gui/win32/win32_gui_destination.c b/navit/gui/win32/win32_gui_destination.c index a9465c9a0..196bf7298 100644 --- a/navit/gui/win32/win32_gui_destination.c +++ b/navit/gui/win32/win32_gui_destination.c @@ -200,7 +200,7 @@ static void notify_textchange(struct datawindow_priv *datawindow, int param1, in } break; default: - dbg(0, "Unhandled search type"); + dbg(lvl_error, "Unhandled search type"); } lvI.iItem = listIndex; @@ -212,7 +212,7 @@ static void notify_textchange(struct datawindow_priv *datawindow, int param1, in (void)ListView_InsertItem(datawindow->hwndList, &lvI); ListView_SetItemText(datawindow->hwndList, listIndex, 1, tcharBuffer); g_free(tcharBuffer); - dbg(0,"%s\n", res->country->name); + dbg(lvl_error,"%s\n", res->country->name); listIndex++; } } @@ -307,7 +307,7 @@ BOOL register_destination_window() if (!RegisterClass(&wc)) { - dbg(0, "Window Registration Failed!\n"); + dbg(lvl_error, "Window Registration Failed!\n"); return FALSE; } return TRUE; @@ -339,7 +339,7 @@ HANDLE create_destination_window( struct navit *nav ) if (this_->hwnd == NULL) { - dbg(0, "Window Creation Failed!\n"); + dbg(lvl_error, "Window Creation Failed!\n"); return 0; } |