Fix:Build:Made android compileable again

[navit-package] / navit / graphics.c

diff --git a/navit/graphics.c b/navit/graphics.c
index 4073daa..5335955 100644 (file)
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -104,6 +104,16 @@ struct displaylist {
 static void draw_circle(struct point *pnt, int diameter, int scale, int start, int len, struct point *res, int *pos, int dir);
 static void graphics_process_selection(struct graphics *gra, struct displaylist *dl);
 
+int
+graphics_set_attr(struct graphics *gra, struct attr *attr)
+{
+       int ret=1;
+       dbg(0,"enter\n");
+       if (gra->meth.set_attr)
+               ret=gra->meth.set_attr(gra->priv, attr);
+        return ret != 0;
+}
+
 void
 graphics_set_rect(struct graphics *gra, struct point_rect *pr)
 {
@@ -197,6 +207,8 @@ graphics_overlay_resize(struct graphics *this_, struct point *p, int w, int h, i
 */
 void graphics_init(struct graphics *this_)
 {
+       if (this_->gc[0])
+               return;
        this_->gc[0]=graphics_gc_new(this_);
        graphics_gc_set_background(this_->gc[0], &(struct color) { 0xffff, 0xefef, 0xb7b7, 0xffff});
        graphics_gc_set_foreground(this_->gc[0], &(struct color) { 0xffff, 0xefef, 0xb7b7, 0xffff });
@@ -1002,8 +1014,8 @@ int_sqrt(unsigned int n)
        unsigned int h, p= 0, q= 1, r= n;
 
        /* avoid q rollover */
-       if(n > (1<<(sizeof(n)*8-1))) {
-               q = 1<<(sizeof(n)*8-1);
+       if(n >= (1<<(sizeof(n)*8-2))) {
+               q = 1<<(sizeof(n)*8-2);
        } else {
                while ( q <= n ) {
                        q <<= 2;
@@ -1067,13 +1079,27 @@ graphics_draw_polyline_as_polygon(struct graphics *gra, struct graphics_gc *gc,
                wi=*width;
                width+=step;
                if (i < count - 1) {
+                       int dxs,dys,lscales;
+
                        dx = (pnt[i + 1].x - pnt[i].x);
                        dy = (pnt[i + 1].y - pnt[i].y);
+#if 0
                        l = int_sqrt(dx * dx * lscale * lscale + dy * dy * lscale * lscale);
+#else
+                       dxs=dx*dx;
+                       dys=dy*dy;
+                       lscales=lscale*lscale;
+                       if (dxs + dys > lscales)
+                               l = int_sqrt(dxs+dys)*lscale;
+                       else
+                               l = int_sqrt((dxs+dys)*lscales);
+#endif
                        fow=fowler(-dy, dx);
                }
                if (! l) 
                        l=1;
+               if (wi*lscale > 10000)
+                       lscale=10000/wi;
                dbg_assert(wi*lscale < 10000);
                calc_offsets(wi*lscale, l, dx, dy, &o);
                pos.x = pnt[i].x + o.ny;
@@ -1720,7 +1746,7 @@ static void xdisplay_draw(struct displaylist *display_list, struct graphics *gra
 extern void *route_selection;
 
 static void
-do_draw(struct displaylist *displaylist, int cancel)
+do_draw(struct displaylist *displaylist, int cancel, int flags)
 {
        struct item *item;
        int count,max=16384,workload=0;
@@ -1772,11 +1798,13 @@ do_draw(struct displaylist *displaylist, int cancel)
        profile(1,"process_selection\n");
        event_remove_idle(displaylist->idle_ev);
        displaylist->idle_ev=NULL;
+       callback_destroy(displaylist->idle_cb);
+       displaylist->idle_cb=NULL;
        displaylist->busy=0;
        graphics_process_selection(displaylist->dc.gra, displaylist);
        profile(1,"draw\n");
        if (! cancel) 
-               graphics_displaylist_draw(displaylist->dc.gra, displaylist, displaylist->dc.trans, displaylist->layout, 1);
+               graphics_displaylist_draw(displaylist->dc.gra, displaylist, displaylist->dc.trans, displaylist->layout, flags);
        map_rect_destroy(displaylist->mr);
        map_selection_destroy(displaylist->sel);
        mapset_close(displaylist->msh);
@@ -1795,7 +1823,7 @@ do_draw(struct displaylist *displaylist, int cancel)
  * @returns <>
  * @author Martin Schaller (04/2008)
 */
-void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, struct layout *l, int callback)
+void graphics_displaylist_draw(struct graphics *gra, struct displaylist *displaylist, struct transformation *trans, struct layout *l, int flags)
 {
        int order=transform_get_order(trans);
        displaylist->dc.trans=trans;
@@ -1808,16 +1836,18 @@ void graphics_displaylist_draw(struct graphics *gra, struct displaylist *display
                gra->default_font = g_strdup(l->font);
        }
        graphics_background_gc(gra, gra->gc[0]);
-       gra->meth.draw_mode(gra->priv, draw_mode_begin);
-       gra->meth.draw_rectangle(gra->priv, gra->gc[0]->priv, &gra->r.lu, gra->r.rl.x-gra->r.lu.x, gra->r.rl.y-gra->r.lu.y);
+       gra->meth.draw_mode(gra->priv, (flags & 8)?draw_mode_begin_clear:draw_mode_begin);
+       if (!(flags & 2))
+               gra->meth.draw_rectangle(gra->priv, gra->gc[0]->priv, &gra->r.lu, gra->r.rl.x-gra->r.lu.x, gra->r.rl.y-gra->r.lu.y);
        if (l) 
                xdisplay_draw(displaylist, gra, l, order+l->order_delta);
-       if (callback)
+       if (flags & 1)
                callback_list_call_attr_0(gra->cbl, attr_postdraw);
-       gra->meth.draw_mode(gra->priv, draw_mode_end);
+       if (!(flags & 4))
+               gra->meth.draw_mode(gra->priv, draw_mode_end);
 }
 
-static void graphics_load_mapset(struct graphics *gra, struct displaylist *displaylist, struct mapset *mapset, struct transformation *trans, struct layout *l, int async, struct callback *cb)
+static void graphics_load_mapset(struct graphics *gra, struct displaylist *displaylist, struct mapset *mapset, struct transformation *trans, struct layout *l, int async, struct callback *cb, int flags)
 {
        int order=transform_get_order(trans);
 
@@ -1825,7 +1855,7 @@ static void graphics_load_mapset(struct graphics *gra, struct displaylist *displ
        if (displaylist->busy) {
                if (async == 1)
                        return;
-               do_draw(displaylist, 1);
+               do_draw(displaylist, 1, flags);
        }
        xdisplay_free(displaylist->dl);
        dbg(1,"order=%d\n", order);
@@ -1842,9 +1872,10 @@ static void graphics_load_mapset(struct graphics *gra, struct displaylist *displ
        displaylist->layout=l;
        if (async) {
                if (! displaylist->idle_cb)
-                       displaylist->idle_cb=callback_new_2(callback_cast(do_draw), displaylist, 0);
+                       displaylist->idle_cb=callback_new_3(callback_cast(do_draw), displaylist, 0, flags);
                displaylist->idle_ev=event_add_idle(50, displaylist->idle_cb);
-       }
+       } else
+               do_draw(displaylist, 0, flags);
 }
 /**
  * FIXME
@@ -1852,11 +1883,9 @@ static void graphics_load_mapset(struct graphics *gra, struct displaylist *displ
  * @returns <>
  * @author Martin Schaller (04/2008)
 */
-void graphics_draw(struct graphics *gra, struct displaylist *displaylist, struct mapset *mapset, struct transformation *trans, struct layout *l, int async, struct callback *cb)
+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)
 {
-       graphics_load_mapset(gra, displaylist, mapset, trans, l, async, cb);
-       if (! async)
-               do_draw(displaylist, 0);
+       graphics_load_mapset(gra, displaylist, mapset, trans, l, async, cb, flags);
 }
 
 int
@@ -1864,7 +1893,7 @@ graphics_draw_cancel(struct graphics *gra, struct displaylist *displaylist)
 {
        if (!displaylist->busy)
                return 0;
-       do_draw(displaylist, 1);
+       do_draw(displaylist, 1, 0);
        return 1;
 }