--- navit/navit/graphics.h	2012/08/22 17:01:27	30
+++ navit/navit/graphics.h	2013/02/04 17:41:59	31
@@ -42,7 +42,8 @@
 	draw_mode_begin_clear, // 1
 	draw_mode_end, // 2
 	draw_mode_cursor, // 3
-	draw_mode_end_lazy // 4
+	draw_mode_end_lazy
+// 4
 };
 
 #include "item.h"
@@ -63,7 +64,6 @@
 
 //#define HASH_SIZE_GRAPHICS_ 1024
 #define HASH_SIZE_GRAPHICS_ 2048 // inc. hash size for layer items
-
 struct hash_entry
 {
 	enum item_type type;
@@ -102,65 +102,34 @@
 {
 	void (*graphics_destroy)(struct graphics_priv *gr);
 	void (*draw_mode)(struct graphics_priv *gr, enum draw_mode_num mode);
-	void (*draw_lines)(struct graphics_priv *gr, struct graphics_gc_priv *gc,
-			struct point *p, int count);
-	void (*draw_lines2)(struct graphics_priv *gr, struct graphics_gc_priv *gc,
-			struct point *p, int count, int order, int oneway);
-	void (*draw_lines3)(struct graphics_priv *gr, struct graphics_gc_priv *gc,
-			struct point *p, int count, int order, int width, int dashes, struct color *c);
-	void (*draw_lines4)(struct graphics_priv *gr, struct graphics_gc_priv *gc,
-			struct point *p, int count, int order, int width, int type, int dashes, struct color *c);
-	void (*draw_lines_dashed)(struct graphics_priv *gr,
-			struct graphics_gc_priv *gc, struct point *p, int count, int order,
-			int oneway);
-	void (*draw_polygon)(struct graphics_priv *gr, struct graphics_gc_priv *gc,
-			struct point *p, int count);
-	void (*draw_polygon2)(struct graphics_priv *gr,
-			struct graphics_gc_priv *gc, struct point *p, int count, int order,
-			int oneway);
-	void (*draw_rectangle)(struct graphics_priv *gr,
-			struct graphics_gc_priv *gc, struct point *p, int w, int h);
-	void (*draw_circle)(struct graphics_priv *gr, struct graphics_gc_priv *gc,
-			struct point *p, int r);
-	void (*draw_text)(struct graphics_priv *gr, struct graphics_gc_priv *fg,
-			struct graphics_gc_priv *bg, struct graphics_font_priv *font,
-			char *text, struct point *p, int dx, int dy);
-	void (*draw_image)(struct graphics_priv *gr, struct graphics_gc_priv *fg,
-			struct point *p, struct graphics_image_priv *img);
-	void (*draw_bigmap)(struct graphics_priv *gr, struct graphics_gc_priv *fg,
-			int yaw, int order, float clat, float clng, int x, int y, int scx,
-			int scy, int px, int py, int valid);
+	void (*draw_lines)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count);
+	void (*draw_lines2)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count, int order, int oneway);
+	void (*draw_lines3)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count, int order, int width, int dashes, struct color *c);
+	void (*draw_lines4)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count, int order, int width, int type, int dashes, struct color *c);
+	void (*draw_lines_dashed)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count, int order, int oneway);
+	void (*draw_polygon)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count);
+	void (*draw_polygon2)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int count, int order, int oneway);
+	void (*draw_rectangle)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int w, int h);
+	void (*draw_circle)(struct graphics_priv *gr, struct graphics_gc_priv *gc, struct point *p, int r);
+	void (*draw_text)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct graphics_gc_priv *bg, struct graphics_font_priv *font, char *text, struct point *p, int dx, int dy);
+	void (*draw_image)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, struct graphics_image_priv *img);
+	void (*draw_bigmap)(struct graphics_priv *gr, struct graphics_gc_priv *fg, int yaw, int order, float clat, float clng, int x, int y, int scx, int scy, int px, int py, int valid);
 	void
-			(*draw_image_warp)(struct graphics_priv *gr,
-					struct graphics_gc_priv *fg, struct point *p, int count,
-					char *data);
-	void (*draw_restore)(struct graphics_priv *gr, struct point *p, int w,
-			int h);
+	(*draw_image_warp)(struct graphics_priv *gr, struct graphics_gc_priv *fg, struct point *p, int count, char *data);
+	void (*draw_restore)(struct graphics_priv *gr, struct point *p, int w, int h);
 	void (*draw_drag)(struct graphics_priv *gr, struct point *p);
 	struct graphics_font_priv
-			*(*font_new)(struct graphics_priv *gr,
-					struct graphics_font_methods *meth, char *font, int size,
-					int flags);
-	struct graphics_gc_priv *(*gc_new)(struct graphics_priv *gr,
-			struct graphics_gc_methods *meth);
+	*(*font_new)(struct graphics_priv *gr, struct graphics_font_methods *meth, char *font, int size, int flags);
+	struct graphics_gc_priv *(*gc_new)(struct graphics_priv *gr, struct graphics_gc_methods *meth);
 	void
-			(*background_gc)(struct graphics_priv *gr,
-					struct graphics_gc_priv *gc);
-	struct graphics_priv *(*overlay_new)(const char* name, struct graphics_priv *gr,
-			struct graphics_methods *meth, struct point *p, int w, int h,
-			int alpha, int wraparound);
-	struct graphics_image_priv *(*image_new)(struct graphics_priv *gr,
-			struct graphics_image_methods *meth, char *path, int *w, int *h,
-			struct point *hot, int rotation);
+	(*background_gc)(struct graphics_priv *gr, struct graphics_gc_priv *gc);
+	struct graphics_priv *(*overlay_new)(const char* name, struct graphics_priv *gr, struct graphics_methods *meth, struct point *p, int w, int h, int alpha, int wraparound);
+	struct graphics_image_priv *(*image_new)(struct graphics_priv *gr, struct graphics_image_methods *meth, char *path, int *w, int *h, struct point *hot, int rotation);
 	void *(*get_data)(struct graphics_priv *gr, const char *type);
-	void (*image_free)(struct graphics_priv *gr,
-			struct graphics_image_priv *priv);
-	void (*get_text_bbox)(struct graphics_priv *gr,
-			struct graphics_font_priv *font, char *text, int dx, int dy,
-			struct point *ret, int estimate);
+	void (*image_free)(struct graphics_priv *gr, struct graphics_image_priv *priv);
+	void (*get_text_bbox)(struct graphics_priv *gr, struct graphics_font_priv *font, char *text, int dx, int dy, struct point *ret, int estimate);
 	void (*overlay_disable)(struct graphics_priv *gr, int disable);
-	void (*overlay_resize)(struct graphics_priv *gr, struct point *p, int w,
-			int h, int alpha, int wraparound);
+	void (*overlay_resize)(struct graphics_priv *gr, struct point *p, int w, int h, int alpha, int wraparound);
 	int (*set_attr)(struct graphics_priv *gr, struct attr *attr);
 };
 
@@ -179,12 +148,10 @@
 {
 	void (*gc_destroy)(struct graphics_gc_priv *gc);
 	void (*gc_set_linewidth)(struct graphics_gc_priv *gc, int width);
-	void (*gc_set_dashes)(struct graphics *gra, struct graphics_gc_priv *gc, int width, int offset,
-			int dash_list[], int order);
+	void (*gc_set_dashes)(struct graphics *gra, struct graphics_gc_priv *gc, int width, int offset, int dash_list[], int order);
 	void (*gc_set_foreground)(struct graphics_gc_priv *gc, struct color *c);
 	void (*gc_set_background)(struct graphics_gc_priv *gc, struct color *c);
-	void (*gc_set_stipple)(struct graphics_gc_priv *gc,
-			struct graphics_image_priv *img);
+	void (*gc_set_stipple)(struct graphics_gc_priv *gc, struct graphics_image_priv *img);
 };
 
 struct graphics_gc
@@ -239,20 +206,15 @@
 int graphics_set_attr(struct graphics *gra, struct attr *attr);
 void graphics_set_rect(struct graphics *gra, struct point_rect *pr);
 struct graphics *graphics_new(struct attr *parent, struct attr **attrs);
-int graphics_get_attr(struct graphics *this_, enum attr_type type,
-		struct attr *attr, struct attr_iter *iter);
-struct graphics *graphics_overlay_new(const char* name, struct graphics *parent, struct point *p,
-		int w, int h, int alpha, int wraparound);
-void graphics_overlay_resize(struct graphics *this_, struct point *p, int w,
-		int h, int alpha, int wraparound);
+int graphics_get_attr(struct graphics *this_, enum attr_type type, struct attr *attr, struct attr_iter *iter);
+struct graphics *graphics_overlay_new(const char* name, struct graphics *parent, struct point *p, int w, int h, int alpha, int wraparound);
+void graphics_overlay_resize(struct graphics *this_, struct point *p, int w, int h, int alpha, int wraparound);
 void graphics_init(struct graphics *this_);
 void *graphics_get_data(struct graphics *this_, const char *type);
 void graphics_add_callback(struct graphics *this_, struct callback *cb);
 void graphics_remove_callback(struct graphics *this_, struct callback *cb);
-struct graphics_font *graphics_font_new(struct graphics *gra, int size,
-		int flags);
-struct graphics_font *graphics_named_font_new(struct graphics *gra, char *font,
-		int size, int flags);
+struct graphics_font *graphics_font_new(struct graphics *gra, int size, int flags);
+struct graphics_font *graphics_named_font_new(struct graphics *gra, char *font, int size, int flags);
 void graphics_free(struct graphics *gra);
 void graphics_font_destroy_all(struct graphics *gra);
 struct graphics_gc *graphics_gc_new(struct graphics *gra);
@@ -260,53 +222,32 @@
 void graphics_gc_set_foreground(struct graphics_gc *gc, struct color *c);
 void graphics_gc_set_background(struct graphics_gc *gc, struct color *c);
 void
-		graphics_gc_set_stipple(struct graphics_gc *gc,
-				struct graphics_image *img);
+graphics_gc_set_stipple(struct graphics_gc *gc, struct graphics_image *img);
 void graphics_gc_set_linewidth(struct graphics_gc *gc, int width);
-void graphics_gc_set_dashes(struct graphics *gra, struct graphics_gc *gc, int width, int offset,
-		int dash_list[], int n, int order);
-struct graphics_image *graphics_image_new_scaled(struct graphics *gra,
-		char *path, int w, int h);
-struct graphics_image *graphics_image_new_scaled_rotated(struct graphics *gra,
-		char *path, int w, int h, int rotate);
+void graphics_gc_set_dashes(struct graphics *gra, struct graphics_gc *gc, int width, int offset, int dash_list[], int n, int order);
+struct graphics_image *graphics_image_new_scaled(struct graphics *gra, char *path, int w, int h);
+struct graphics_image *graphics_image_new_scaled_rotated(struct graphics *gra, char *path, int w, int h, int rotate);
 struct graphics_image *graphics_image_new(struct graphics *gra, char *path);
 void graphics_image_free(struct graphics *gra, struct graphics_image *img);
-void graphics_draw_restore(struct graphics *this_, struct point *p, int w,
-		int h);
+void graphics_draw_restore(struct graphics *this_, struct point *p, int w, int h);
 void graphics_draw_mode(struct graphics *this_, enum draw_mode_num mode);
-void graphics_draw_lines(struct graphics *this_, struct graphics_gc *gc,
-		struct point *p, int count);
-void graphics_draw_circle(struct graphics *this_, struct graphics_gc *gc,
-		struct point *p, int r);
-void graphics_draw_rectangle(struct graphics *this_, struct graphics_gc *gc,
-		struct point *p, int w, int h);
-void graphics_draw_rectangle_rounded(struct graphics *this_,
-		struct graphics_gc *gc, struct point *plu, int w, int h, int r,
-		int fill);
-void graphics_draw_text(struct graphics *this_, struct graphics_gc *gc1,
-		struct graphics_gc *gc2, struct graphics_font *font, char *text,
-		struct point *p, int dx, int dy);
-void graphics_get_text_bbox(struct graphics *this_, struct graphics_font *font,
-		char *text, int dx, int dy, struct point *ret, int estimate);
+void graphics_draw_lines(struct graphics *this_, struct graphics_gc *gc, struct point *p, int count);
+void graphics_draw_circle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int r);
+void graphics_draw_rectangle(struct graphics *this_, struct graphics_gc *gc, struct point *p, int w, int h);
+void graphics_draw_rectangle_rounded(struct graphics *this_, struct graphics_gc *gc, struct point *plu, int w, int h, int r, int fill);
+void graphics_draw_text(struct graphics *this_, struct graphics_gc *gc1, struct graphics_gc *gc2, struct graphics_font *font, char *text, struct point *p, int dx, int dy);
+void graphics_get_text_bbox(struct graphics *this_, struct graphics_font *font, char *text, int dx, int dy, struct point *ret, int estimate);
 void graphics_overlay_disable(struct graphics *this_, int disable);
-void graphics_draw_image(struct graphics *this_, struct graphics_gc *gc,
-		struct point *p, struct graphics_image *img);
+void graphics_draw_image(struct graphics *this_, struct graphics_gc *gc, struct point *p, struct graphics_image *img);
 int graphics_draw_drag(struct graphics *this_, struct point *p);
 void graphics_background_gc(struct graphics *this_, struct graphics_gc *gc);
-void graphics_draw_text_std(struct graphics *this_, int text_size, char *text,
-		struct point *p);
+void graphics_draw_text_std(struct graphics *this_, int text_size, char *text, struct point *p);
 char *graphics_icon_path(char *icon);
-void graphics_draw_itemgra(struct graphics *gra, struct itemgra *itm,
-		struct transformation *t, char *label);
-void graphics_displaylist_draw(struct graphics *gra,
-		struct displaylist *displaylist, struct transformation *trans,
-		struct layout *l, int flags);
-void graphics_draw(struct graphics *gra, struct displaylist *displaylist,
-		struct mapset *mapset, struct transformation *trans, struct layout *l,
-		int async, struct callback *cb, int flags);
+void graphics_draw_itemgra(struct graphics *gra, struct itemgra *itm, struct transformation *t, char *label);
+void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, struct layout *l, int flags);
+void graphics_draw(struct graphics *gra, struct displaylist *displaylist, struct mapset *mapset, struct transformation *trans, struct layout *l, int async, struct callback *cb, int flags);
 int graphics_draw_cancel(struct graphics *gra, struct displaylist *displaylist);
-struct displaylist_handle *graphics_displaylist_open(
-		struct displaylist *displaylist);
+struct displaylist_handle *graphics_displaylist_open(struct displaylist *displaylist);
 struct displayitem *graphics_displaylist_next(struct displaylist_handle *dlh);
 void graphics_displaylist_close(struct displaylist_handle *dlh);
 struct displaylist *graphics_displaylist_new(void);
@@ -314,12 +255,9 @@
 int graphics_displayitem_get_coord_count(struct displayitem *di);
 char *graphics_displayitem_get_label(struct displayitem *di);
 int graphics_displayitem_get_displayed(struct displayitem *di);
-int graphics_displayitem_within_dist(struct displaylist *displaylist,
-		struct displayitem *di, struct point *p, int dist);
-void graphics_add_selection(struct graphics *gra, struct item *item,
-		enum item_type type, struct displaylist *dl);
-void graphics_remove_selection(struct graphics *gra, struct item *item,
-		enum item_type type, struct displaylist *dl);
+int graphics_displayitem_within_dist(struct displaylist *displaylist, struct displayitem *di, struct point *p, int dist);
+void graphics_add_selection(struct graphics *gra, struct item *item, enum item_type type, struct displaylist *dl);
+void graphics_remove_selection(struct graphics *gra, struct item *item, enum item_type type, struct displaylist *dl);
 void graphics_clear_selection(struct graphics *gra, struct displaylist *dl);
 /* end of prototypes */
 #ifdef __cplusplus