more horizontal refactoring
[swftools.git] / lib / gfxpoly / poly.c
index 7036a61..8711a00 100644 (file)
@@ -3,27 +3,31 @@
 #include <math.h>
 #include "../mem.h"
 #include "../types.h"
-#include "../q.h"
 #include "../MD5.h"
 #include "poly.h"
 #include "active.h"
 #include "xrow.h"
 #include "wind.h"
+#include "convert.h"
+#include "heap.h"
 
 static gfxpoly_t*current_polygon = 0;
 void gfxpoly_fail(char*expr, char*file, int line, const char*function)
 {
-    if(!current_polygon) {fprintf(stderr, "error outside polygon\n");exit(1);}
+    if(!current_polygon) {
+       fprintf(stderr, "assert(%s) failed in %s in line %d: %s\n", expr, file, line, function);
+       exit(1);
+    }
 
-    void*md5 = init_md5();
-    
-    edge_t* s = current_polygon->edges;
-    while(s) {
-       update_md5(md5, (unsigned char*)&s->a.x, sizeof(s->a.x));
-       update_md5(md5, (unsigned char*)&s->a.y, sizeof(s->a.y));
-       update_md5(md5, (unsigned char*)&s->b.x, sizeof(s->b.x));
-       update_md5(md5, (unsigned char*)&s->b.y, sizeof(s->b.y));
-       s = s->next;
+    void*md5 = initialize_md5();
+   
+    int s,t;
+    gfxpolystroke_t*stroke = current_polygon->strokes;
+    for(;stroke;stroke=stroke->next) {
+       for(t=0;t<stroke->num_points;t++) {
+           update_md5(md5, (unsigned char*)&stroke->points[t].x, sizeof(stroke->points[t].x));
+           update_md5(md5, (unsigned char*)&stroke->points[t].y, sizeof(stroke->points[t].y));
+       }
     }
     unsigned char h[16];
     char filename[32+4+1];
@@ -64,33 +68,24 @@ static void point_free(void*o)
     p->y = 0;
     free(p);
 }
-static type_t point_type = {
+type_t point_type = {
     equals: point_equals,
     hash: point_hash,
     dup: point_dup,
     free: point_free,
 };
 
-typedef struct _status {
-    int32_t y;
-    actlist_t*actlist;
-    heap_t*queue;
-    edge_t*output;
-    xrow_t*xrow;
-    windrule_t*windrule;
-    windcontext_t*context;
-    segment_t*ending_segments;
-#ifdef CHECKS
-    dict_t*seen_crossings; //list of crossing we saw so far
-    dict_t*intersecting_segs; //list of segments intersecting in this scanline
-    dict_t*segs_with_point; //lists of segments that received a point in this scanline
-#endif
-} status_t;
+typedef struct _event {
+    eventtype_t type;
+    point_t p;
+    segment_t*s1;
+    segment_t*s2;
+} event_t;
 
 /* compare_events_simple differs from compare_events in that it schedules
    events from left to right regardless of type. It's only used in horizontal
    processing, in order to get an x-wise sorting of the current scanline */
-static int compare_events_simple(const void*_a,const void*_b)
+static inline int compare_events_simple(const void*_a,const void*_b)
 {
     event_t* a = (event_t*)_a;
     event_t* b = (event_t*)_b;
@@ -101,7 +96,7 @@ static int compare_events_simple(const void*_a,const void*_b)
     return 0;
 }
 
-static int compare_events(const void*_a,const void*_b)
+static inline int compare_events(const void*_a,const void*_b)
 {
     event_t* a = (event_t*)_a;
     event_t* b = (event_t*)_b;
@@ -110,154 +105,295 @@ static int compare_events(const void*_a,const void*_b)
     /* we need to schedule end after intersect (so that a segment about
        to end has a chance to tear up a few other segs first) and start
        events after end (in order not to confuse the intersection check, which
-       assumes there's an actual y overlap between active segments)). 
+       assumes there's an actual y overlap between active segments, and 
+       because ending segments in the active list make it difficult to insert
+       starting segments at the right position)). 
        Horizontal lines come last, because the only purpose
        they have is to create snapping coordinates for the segments (still)
        existing in this scanline.
     */
     d = b->type - a->type;
     if(d) return d;
-    d = b->p.x - a->p.x;
-    return d;
-}
+    return 0;
 
-gfxpoly_t* gfxpoly_new(double gridsize)
-{
-    gfxpoly_t*p = (gfxpoly_t*)rfx_calloc(sizeof(gfxpoly_t));
-    p->gridsize = gridsize;
-    return p;
+    /* I don't see any reason why we would need to order by x- at least as long
+       as we do horizontal lines in a seperate pass */
+    //d = b->p.x - a->p.x;
+    //return d;
 }
-void gfxpoly_destroy(gfxpoly_t*poly)
+
+#define COMPARE_EVENTS(x,y) (compare_events(x,y)>0)
+#define COMPARE_EVENTS_SIMPLE(x,y) (compare_events_simple(x,y)>0)
+HEAP_DEFINE(queue,event_t,COMPARE_EVENTS);
+HEAP_DEFINE(hqueue,event_t,COMPARE_EVENTS_SIMPLE);
+
+typedef struct _horizontal {
+    int32_t y;
+    int32_t x1, x2;
+    edgestyle_t*fs;
+    segment_dir_t dir;
+    int polygon_nr;
+} horizontal_t;
+
+typedef struct _horizdata {
+    horizontal_t*data;
+    int num;
+    int size;
+} horizdata_t;
+
+typedef struct _status {
+    int32_t y;
+    double gridsize;
+    actlist_t*actlist;
+    queue_t queue;
+    xrow_t*xrow;
+    windrule_t*windrule;
+    windcontext_t*context;
+    segment_t*ending_segments;
+
+    horizdata_t horiz;
+
+    gfxpolystroke_t*strokes;
+#ifdef CHECKS
+    dict_t*seen_crossings; //list of crossing we saw so far
+    dict_t*intersecting_segs; //list of segments intersecting in this scanline
+    dict_t*segs_with_point; //lists of segments that received a point in this scanline
+#endif
+} status_t;
+
+
+int gfxpoly_num_segments(gfxpoly_t*poly)
 {
-    edge_t* s = poly->edges;
-    while(s) {
-        edge_t*next  = s->next;
-        free(s);
-        s = next;
+    gfxpolystroke_t*stroke = poly->strokes;
+    int count = 0;
+    for(;stroke;stroke=stroke->next) {
+       count++;
     }
-    free(poly);
+    return count;
 }
 int gfxpoly_size(gfxpoly_t*poly)
 {
-    edge_t* s = poly->edges;
-    int t=0;
-    while(s) {
-        s = s->next;t++;
+    int s,t;
+    int edges = 0;
+    gfxpolystroke_t*stroke = poly->strokes;
+    for(;stroke;stroke=stroke->next) {
+       edges += stroke->num_points-1;
     }
-    return t;
+    return edges;
 }
 
-char gfxpoly_check(gfxpoly_t*poly)
+char gfxpoly_check(gfxpoly_t*poly, char updown)
 {
-    edge_t* s = poly->edges;
-    dict_t*d = dict_new2(&point_type);
-    while(s) {
-        if(!dict_contains(d, &s->a)) {
-            dict_put(d, &s->a, (void*)(ptroff_t)1);
-        } else {
-            int count = (ptroff_t)dict_lookup(d, &s->a);
-            dict_del(d, &s->a);
-            count++;
-            dict_put(d, &s->a, (void*)(ptroff_t)count);
-        }
-        if(!dict_contains(d, &s->b)) {
-            dict_put(d, &s->b, (void*)(ptroff_t)1);
-        } else {
-            int count = (ptroff_t)dict_lookup(d, &s->b);
-            dict_del(d, &s->b);
-            count++;
-            dict_put(d, &s->b, (void*)(ptroff_t)count);
-        }
-        s = s->next;
+    current_polygon = poly;
+    dict_t*d1 = dict_new2(&point_type);
+    dict_t*d2 = dict_new2(&point_type);
+    int s,t;
+    gfxpolystroke_t*stroke = poly->strokes;
+    for(;stroke;stroke=stroke->next) {
+       /* In order to not confuse the fill/wind logic, existing segments must have
+          a non-zero edge style */
+       assert(stroke->fs);
+
+       /* put all the segments into dictionaries so that we can check
+          that the endpoint multiplicity is two */
+       for(s=0;s<stroke->num_points;s++) {
+           point_t p = stroke->points[s];
+           int num_xor = (s>=1 && s<stroke->num_points-1)?2:1; // mid points are two points (start+end)
+           int num_circ = (s>=1 && s<stroke->num_points-1)?0:(s==0?1:-1);
+           if(stroke->dir==DIR_UP)
+               num_circ=-num_circ;
+
+           if(!dict_contains(d1, &p)) {
+               dict_put(d1, &p, (void*)(ptroff_t)num_xor);
+               if(updown) {
+                   assert(!dict_contains(d2, &p));
+                   dict_put(d2, &p, (void*)(ptroff_t)num_circ);
+               }
+           } else {
+               int count = (ptroff_t)dict_lookup(d1, &p);
+               dict_del(d1, &p);
+               count+=num_xor;
+               dict_put(d1, &p, (void*)(ptroff_t)count);
+
+               if(updown) {
+                   assert(dict_contains(d2, &p));
+                   count = (ptroff_t)dict_lookup(d2, &p);
+                   dict_del(d2, &p);
+                   count+=num_circ;
+                   dict_put(d2, &p, (void*)(ptroff_t)count);
+               }
+           }
+       }
     }
-    DICT_ITERATE_ITEMS(d, point_t*, p, void*, c) {
-        int count = (ptroff_t)c;
+    DICT_ITERATE_ITEMS(d1, point_t*, p1, void*, c1) {
+        int count = (ptroff_t)c1;
         if(count&1) {
-            fprintf(stderr, "Point (%f,%f) occurs %d times\n", p->x*poly->gridsize, p->y*poly->gridsize, count);
-            dict_destroy(d);
-            return 0;
+            fprintf(stderr, "Error: Point (%.2f,%.2f) occurs %d times\n", p1->x * poly->gridsize, p1->y * poly->gridsize, count);
+            dict_destroy(d1);
+            dict_destroy(d2);
+           return 0;
         }
     }
-    dict_destroy(d);
+    dict_destroy(d1);
+    if(updown) {
+       DICT_ITERATE_ITEMS(d2, point_t*, p2, void*, c2) {
+           int count = (ptroff_t)c2;
+           if(count!=0) {
+               if(count>0) fprintf(stderr, "Error: Point (%d,%d) has %d more incoming than outgoing segments\n", p2->x, p2->y, count);
+               if(count<0) fprintf(stderr, "Error: Point (%d,%d) has %d more outgoing than incoming segments\n", p2->x, p2->y, -count);
+               dict_destroy(d2);
+               return 0;
+           }
+       }
+    }
+    dict_destroy(d2);
     return 1;
 }
 
 void gfxpoly_dump(gfxpoly_t*poly)
 {
-    edge_t* s = poly->edges;
+    int s,t;
     double g = poly->gridsize;
-    while(s) {
-        fprintf(stderr, "(%f,%f) -> (%f,%f)\n", s->a.x*g, s->a.y*g, s->b.x*g, s->b.y*g);
-        s = s->next;
+    fprintf(stderr, "polyon %p (gridsize: %.2f)\n", poly, poly->gridsize);
+    gfxpolystroke_t*stroke = poly->strokes;
+    for(;stroke;stroke=stroke->next) {
+       fprintf(stderr, "%11p", stroke);
+       if(stroke->dir==DIR_UP) {
+           for(s=stroke->num_points-1;s>=1;s--) {
+               point_t a = stroke->points[s];
+               point_t b = stroke->points[s-1];
+               fprintf(stderr, "%s (%.2f,%.2f) -> (%.2f,%.2f)%s%s\n", s!=stroke->num_points-1?"           ":"", a.x*g, a.y*g, b.x*g, b.y*g,
+                                                           s==1?"]":"", a.y==b.y?"H":"");
+           }
+       } else {
+           for(s=0;s<stroke->num_points-1;s++) {
+               point_t a = stroke->points[s];
+               point_t b = stroke->points[s+1];
+               fprintf(stderr, "%s (%.2f,%.2f) -> (%.2f,%.2f)%s%s\n", s?"           ":"", a.x*g, a.y*g, b.x*g, b.y*g,
+                                                           s==stroke->num_points-2?"]":"", a.y==b.y?"H":"");
+           }
+       }
     }
 }
 
-gfxpoly_t* gfxpoly_save(gfxpoly_t*poly, const char*filename)
+void gfxpoly_save(gfxpoly_t*poly, const char*filename)
 {
     FILE*fi = fopen(filename, "wb");
     fprintf(fi, "%% gridsize %f\n", poly->gridsize);
     fprintf(fi, "%% begin\n");
-    edge_t* s = poly->edges;
-    while(s) {
-        fprintf(fi, "%g setgray\n", s->b.y < s->a.y ? 0.7 : 0);
-        fprintf(fi, "%d %d moveto\n", s->a.x, s->a.y);
-        fprintf(fi, "%d %d lineto\n", s->b.x, s->b.y);
-        fprintf(fi, "stroke\n");
-        s = s->next;
+    int s,t;
+    gfxpolystroke_t*stroke = poly->strokes;
+    for(;stroke;stroke=stroke->next) {
+           fprintf(fi, "%g setgray\n", stroke->dir==DIR_UP ? 0.7 : 0);
+       point_t p = stroke->points[0];
+       fprintf(fi, "%d %d moveto\n", p.x, p.y);
+       for(s=1;s<stroke->num_points;s++) {
+           p = stroke->points[s];
+           fprintf(fi, "%d %d lineto\n", p.x, p.y);
+       }
+       fprintf(fi, "stroke\n");
+    }
+    fprintf(fi, "showpage\n");
+    fclose(fi);
+}
+
+void gfxpoly_save_arrows(gfxpoly_t*poly, const char*filename)
+{
+    FILE*fi = fopen(filename, "wb");
+    fprintf(fi, "%% gridsize %f\n", poly->gridsize);
+    fprintf(fi, "%% begin\n");
+    int t;
+    double l = 5.0 / poly->gridsize;
+    double g = poly->gridsize;
+    gfxpolystroke_t*stroke = poly->strokes;
+    for(;stroke;stroke=stroke->next) {
+       fprintf(fi, "%g setgray\n", 0);
+
+       int s = stroke->dir==DIR_UP?stroke->num_points-1:0;
+       int end = stroke->dir==DIR_UP?-1:stroke->num_points;
+       int dir = stroke->dir==DIR_UP?-1:1;
+
+       point_t p = stroke->points[s];
+       s+=dir;
+       point_t o = p;
+       fprintf(fi, "%f %f moveto\n", p.x * g, p.y * g);
+       for(;s!=end;s+=dir) {
+           p = stroke->points[s];
+           int lx = p.x - o.x;
+           int ly = p.y - o.y;
+           double d = sqrt(lx*lx+ly*ly);
+           if(!d) d=1;
+           else   d = l / d;
+           double d2 = d*1.5;
+           fprintf(fi, "%f %f lineto\n", (p.x - lx*d2) * g, (p.y - ly*d2) * g);
+           fprintf(fi, "%f %f lineto\n", (p.x - lx*d2 + (ly*d))*g,
+                                         (p.y - ly*d2 - (lx*d))*g);
+           fprintf(fi, "%f %f lineto\n", p.x * g, p.y * g);
+           fprintf(fi, "%f %f lineto\n", (p.x - lx*d2 - (ly*d))*g, 
+                                         (p.y - ly*d2 + (lx*d))*g);
+           fprintf(fi, "%f %f lineto\n", (p.x - lx*d2) * g, (p.y - ly*d2) * g);
+           fprintf(fi, "%f %f moveto\n", p.x * g, p.y * g);
+           o = p;
+       }
+       fprintf(fi, "stroke\n");
     }
     fprintf(fi, "showpage\n");
     fclose(fi);
 }
 
-inline static event_t event_new()
+inline static event_t* event_new()
 {
-    event_t e;
-    memset(&e, 0, sizeof(e));
+    event_t*e = rfx_calloc(sizeof(event_t));
     return e;
 }
+inline static void event_free(event_t*e)
+{
+    free(e);
+}
 
-static void event_dump(event_t*e)
+static void event_dump(status_t*status, event_t*e)
 {
     if(e->type == EVENT_HORIZONTAL) {
-        fprintf(stderr, "Horizontal [%d] (%d,%d) -> (%d,%d)\n", e->s1->nr, e->s1->a.x, e->s1->a.y, e->s1->b.x, e->s1->b.y);
+        fprintf(stderr, "Horizontal [%d] (%.2f,%.2f) -> (%.2f,%.2f)\n", (int)e->s1->nr, 
+               e->s1->a.x * status->gridsize, e->s1->a.y * status->gridsize, e->s1->b.x * status->gridsize, e->s1->b.y * status->gridsize);
     } else if(e->type == EVENT_START) {
-        fprintf(stderr, "event: segment [%d] starts at (%d,%d)\n", e->s1->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] starts at (%.2f,%.2f)\n", (int)e->s1->nr, 
+               e->p.x * status->gridsize, e->p.y * status->gridsize);
     } else if(e->type == EVENT_END) {
-        fprintf(stderr, "event: segment [%d] ends at (%d,%d)\n", e->s1->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] ends at (%.2f,%.2f)\n", (int)e->s1->nr, 
+               e->p.x * status->gridsize, e->p.y * status->gridsize);
     } else if(e->type == EVENT_CROSS) {
-        fprintf(stderr, "event: segment [%d] and [%d] intersect at (%d,%d)\n", e->s1->nr, e->s2->nr, e->p.x, e->p.y);
-    } else if(e->type == EVENT_CORNER) {
-        fprintf(stderr, "event: segment [%d] ends, segment [%d] starts, at (%d,%d)\n", e->s1->nr, e->s2->nr, e->p.x, e->p.y);
+        fprintf(stderr, "event: segment [%d] and [%d] intersect at (%.2f,%.2f)\n", (int)e->s1->nr, (int)e->s2->nr, 
+               e->p.x * status->gridsize, e->p.y * status->gridsize);
     } else {
         assert(0);
     }
 }
 
-static inline max32(int32_t v1, int32_t v2) {return v1>v2?v1:v2;}
-static inline min32(int32_t v1, int32_t v2) {return v1<v2?v1:v2;}
+static inline int32_t max32(int32_t v1, int32_t v2) {return v1>v2?v1:v2;}
+static inline int32_t min32(int32_t v1, int32_t v2) {return v1<v2?v1:v2;}
 
 static void segment_dump(segment_t*s)
 {
-    fprintf(stderr, "[%d] (%d,%d)->(%d,%d) ", s->nr, s->a.x, s->a.y, s->b.x, s->b.y);
-    fprintf(stderr, " dx:%d dy:%d k:%f dx/dy=%f\n", s->delta.x, s->delta.y, s->k,
-            (double)s->delta.x / s->delta.y);
+    fprintf(stderr, "[%d] (%d,%d)->(%d,%d) ", (int)s->nr, s->a.x, s->a.y, s->b.x, s->b.y);
+    fprintf(stderr, " dx:%d dy:%d k:%f dx/dy=%f fs=%p\n", s->delta.x, s->delta.y, s->k,
+            (double)s->delta.x / s->delta.y, s->fs);
 }
 
-static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int polygon_nr)
+static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int polygon_nr, segment_dir_t dir)
 {
-    if(y1<y2) {
-        s->dir = DIR_DOWN;
-    } else if(y1>y2) {
-        int32_t x = x1;x1=x2;x2=x;
-        int32_t y = y1;y1=y2;y2=y;
-        s->dir = DIR_UP;
+    s->dir = dir;
+    if(y1!=y2) {
+       assert(y1<y2);
     } else {
-        /* up/down for horizontal segments is handled by "rotating"
-           them 90° anticlockwise in screen coordinates (tilt your head to
-           the right) */
-        s->dir = DIR_UP;
+        /* We need to make sure horizontal segments always go from left to right.
+          "up/down" for horizontal segments is handled by "rotating"
+           them 90° counterclockwise in screen coordinates (tilt your head to
+           the right). In other words, the "normal" direction (what's positive dy for
+          vertical segments) is positive dx for horizontal segments.
+        */
         if(x1>x2) {
-            s->dir = DIR_DOWN;
+            s->dir = DIR_INVERT(s->dir);
             int32_t x = x1;x1=x2;x2=x;
             int32_t y = y1;y1=y2;y2=y;
         }
@@ -275,13 +411,15 @@ static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_
 
     s->pos = s->a;
     s->polygon_nr = polygon_nr;
-#define XDEBUG
-#ifdef XDEBUG
     static int segment_count=0;
     s->nr = segment_count++;
-#endif
 
 #ifdef CHECKS
+    /* notice: on some systems (with some compilers), for the line 
+       (1073741823,-1073741824)->(1073741823,1073741823)
+       we get LINE_EQ(s->a, s) == 1. 
+       That's why we now clamp to 26 bit.
+    */
     assert(LINE_EQ(s->a, s) == 0);
     assert(LINE_EQ(s->b, s) == 0);
 
@@ -299,45 +437,85 @@ static void segment_init(segment_t*s, int32_t x1, int32_t y1, int32_t x2, int32_
     assert(LINE_EQ(p, s) >= 0);
 #endif
 
+#ifndef DONT_REMEMBER_CROSSINGS
     dict_init2(&s->scheduled_crossings, &ptr_type, 0);
+#endif
 }
 
-static segment_t* segment_new(int32_t x1, int32_t y1, int32_t x2, int32_t y2, int polygon_nr)
+static segment_t* segment_new(point_t a, point_t b, int polygon_nr, segment_dir_t dir)
 {
     segment_t*s = (segment_t*)rfx_calloc(sizeof(segment_t));
-    segment_init(s, x1, y1, x2, y2, polygon_nr);
+    segment_init(s, a.x, a.y, b.x, b.y, polygon_nr, dir);
     return s;
 }
 
-static void segment_destroy(segment_t*s)
+static void segment_clear(segment_t*s)
 {
+#ifndef DONT_REMEMBER_CROSSINGS
     dict_clear(&s->scheduled_crossings);
+#endif
+}
+static void segment_destroy(segment_t*s)
+{
+    segment_clear(s);
     free(s);
 }
 
-static void gfxpoly_enqueue(edge_t*list, heap_t*queue, int polygon_nr)
+static void advance_stroke(queue_t*queue, hqueue_t*hqueue, gfxpolystroke_t*stroke, int polygon_nr, int pos, double gridsize)
 {
-    edge_t*l;
-    for(l=list;l;l=l->next) {
-        if(l->a.x == l->b.x &&
-           l->a.y == l->b.y) {
-            fprintf(stderr, "Warning: intersector input contains zero-length segments\n");
-            continue;
-        }
-        segment_t*s = segment_new(l->a.x, l->a.y, l->b.x, l->b.y, polygon_nr);
+    if(!stroke) 
+       return;
+    segment_t*s = 0;
+    /* we need to queue multiple segments at once because we need to process start events
+       before horizontal events */
+    while(pos < stroke->num_points-1) {
+       assert(stroke->points[pos].y <= stroke->points[pos+1].y);
+       s = segment_new(stroke->points[pos], stroke->points[pos+1], polygon_nr, stroke->dir);
+       s->fs = stroke->fs;
+       pos++;
+       s->stroke = 0;
+       s->stroke_pos = 0;
 #ifdef DEBUG
-        if(l->tmp)
-            s->nr = l->tmp;
-        fprintf(stderr, "[%d] (%d,%d) -> (%d,%d) %s\n",
-                s->nr, s->a.x, s->a.y, s->b.x, s->b.y,
-                s->dir==DIR_UP?"up":"down");
+       /*if(l->tmp)
+           s->nr = l->tmp;*/
+       fprintf(stderr, "[%d] (%.2f,%.2f) -> (%.2f,%.2f) %s (stroke %p, %d more to come)\n",
+               s->nr, s->a.x * gridsize, s->a.y * gridsize, 
+               s->b.x * gridsize, s->b.y * gridsize,
+               s->dir==DIR_UP?"up":"down", stroke, stroke->num_points - 1 - pos);
+#endif
+       event_t* e = event_new();
+       e->type = s->delta.y ? EVENT_START : EVENT_HORIZONTAL;
+       e->p = s->a;
+       e->s1 = s;
+       e->s2 = 0;
+       
+       if(queue) queue_put(queue, e);
+       else hqueue_put(hqueue, e);
+
+       if(e->type != EVENT_HORIZONTAL) {
+           break;
+       }
+    }
+    if(s) {
+       s->stroke = stroke;
+       s->stroke_pos = pos;
+    }
+}
+
+static void gfxpoly_enqueue(gfxpoly_t*p, queue_t*queue, hqueue_t*hqueue, int polygon_nr)
+{
+    int t;
+    gfxpolystroke_t*stroke = p->strokes;
+    for(;stroke;stroke=stroke->next) {
+       assert(stroke->num_points > 1);
+
+#ifdef CHECKS
+       int s;
+       for(s=0;s<stroke->num_points-1;s++) {
+           assert(stroke->points[s].y <= stroke->points[s+1].y);
+       }
 #endif
-        event_t e = event_new();
-        e.type = s->delta.y ? EVENT_START : EVENT_HORIZONTAL;
-        e.p = s->a;
-        e.s1 = s;
-        e.s2 = 0;
-        heap_put(queue, &e);
+       advance_stroke(queue, hqueue, stroke, polygon_nr, 0, p->gridsize);
     }
 }
 
@@ -345,12 +523,12 @@ static void schedule_endpoint(status_t*status, segment_t*s)
 {
     // schedule end point of segment
     assert(s->b.y > status->y);
-    event_t e;
-    e.type = EVENT_END;
-    e.p = s->b;
-    e.s1 = s;
-    e.s2 = 0;
-    heap_put(status->queue, &e);
+    event_t*e = event_new();
+    e->type = EVENT_END;
+    e->p = s->b;
+    e->s1 = s;
+    e->s2 = 0;
+    queue_put(&status->queue, e);
 }
 
 static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
@@ -358,7 +536,6 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
     /* the code that's required (and the checks you can perform) before
        it can be said with 100% certainty that we indeed have a valid crossing
        amazes me every time. -mk */
-
 #ifdef CHECKS
     assert(s1!=s2);
     assert(s1->right == s2);
@@ -383,15 +560,25 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
 #endif
 
     if(s1->maxx <= s2->minx) {
+#ifdef DEBUG
+            fprintf(stderr, "[%d] doesn't intersect with [%d] because: bounding boxes don't intersect\n", s1->nr, s2->nr);
+#endif
         /* bounding boxes don't intersect */
         return;
     }
 
-    if(dict_contains(&s1->scheduled_crossings, s2)) {
+#ifndef DONT_REMEMBER_CROSSINGS
+    if(dict_contains(&s1->scheduled_crossings, (void*)(ptroff_t)s2->nr)) {
         /* FIXME: this whole segment hashing thing is really slow */
-        //fprintf(stderr, "Encountered crossing between [%d] and [%d] twice\n", s1->nr, s2->nr);
+#ifdef DEBUG
+        fprintf(stderr, "[%d] doesn't intersect with [%d] because: we already scheduled this intersection\n", s1->nr, s2->nr);
+//     DICT_ITERATE_KEY(&s1->scheduled_crossings, void*, x) {
+//         fprintf(stderr, "[%d]<->[%d]\n", s1->nr, (int)(ptroff_t)x);
+//     }
+#endif
         return; // we already know about this one
     }
+#endif
 
     double det = (double)s1->delta.x*s2->delta.y - (double)s1->delta.y*s2->delta.x;
     if(!det) {
@@ -402,20 +589,15 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
 #endif
             return;
         } else {
+#ifdef DEBUG
+            fprintf(stderr, "[%d] doesn't intersect with [%d] because: they are parallel to each other\n", s1->nr, s2->nr);
+#endif
             /* lines are parallel */
             return;
         }
     }
+
     double asign2 = LINE_EQ(s1->a, s2);
-    double bsign2 = LINE_EQ(s1->b, s2);
-    if(asign2<0 && bsign2<0) {
-        // segment1 is completely to the left of segment2
-        return;
-    }
-    if(asign2>0 && bsign2>0)  {
-        // segment2 is completely to the left of segment1
-        return;
-    }
     if(asign2==0) {
         // segment1 touches segment2 in a single point (ignored)
 #ifdef DEBUG
@@ -423,6 +605,7 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
 #endif
         return;
     }
+    double bsign2 = LINE_EQ(s1->b, s2);
     if(bsign2==0) {
         // segment1 touches segment2 in a single point (ignored)
 #ifdef DEBUG
@@ -430,16 +613,26 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
 #endif
         return;
     }
-    double asign1 = LINE_EQ(s2->a, s1);
-    double bsign1 = LINE_EQ(s2->b, s1);
-    if(asign1<0 && bsign1<0) {
+
+    if(asign2<0 && bsign2<0) {
         // segment1 is completely to the left of segment2
+#ifdef DEBUG
+            fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s1->nr, s2->nr);
+#endif
         return;
     }
-    if(asign1>0 && bsign1>0)  {
-        // segment2 is completely to the left of segment1
+    if(asign2>0 && bsign2>0)  {
+        // segment1 is completely to the right of segment2
+#ifndef DONT_REMEMBER_CROSSINGS
+       assert(0);
+#endif
+#ifdef DEBUG
+            fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s2->nr, s1->nr);
+#endif
         return;
     }
+    
+    double asign1 = LINE_EQ(s2->a, s1);
     if(asign1==0) {
         // segment2 touches segment1 in a single point (ignored)
 #ifdef DEBUG
@@ -447,6 +640,7 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
 #endif
         return;
     }
+    double bsign1 = LINE_EQ(s2->b, s1);
     if(asign2==0) {
         // segment2 touches segment1 in a single point (ignored)
 #ifdef DEBUG
@@ -455,6 +649,34 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
         return;
     }
 
+    if(asign1<0 && bsign1<0) {
+        // segment2 is completely to the left of segment1
+#ifndef DONT_REMEMBER_CROSSINGS
+       assert(0);
+#endif
+#ifdef DEBUG
+            fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s1->nr, s2->nr);
+#endif
+        return;
+    }
+    if(asign1>0 && bsign1>0)  {
+        // segment2 is completely to the right of segment1
+#ifdef DEBUG
+            fprintf(stderr, "[%d] doesn't intersect with [%d] because: [%d] is completely to the left of [%d]\n", s1->nr, s2->nr, s2->nr, s1->nr);
+#endif
+        return;
+    }
+
+#ifdef DONT_REMEMBER_CROSSINGS
+    /* s2 crosses s1 from *left* to *right*. This is a crossing we already processed- 
+       there's not way s2 would be to the left of s1 otherwise */
+    if(asign1<0 && bsign1>0) return;
+    if(asign2>0 && bsign2<0) return;
+#endif
+
+    assert(!(asign1<0 && bsign1>0));
+    assert(!(asign2>0 && bsign2<0));
+
     /* TODO: should we precompute these? */
     double la = (double)s1->a.x*(double)s1->b.y - (double)s1->a.y*(double)s1->b.x;
     double lb = (double)s2->a.x*(double)s2->b.y - (double)s2->a.y*(double)s2->b.x;
@@ -471,24 +693,28 @@ static void schedule_crossing(status_t*status, segment_t*s1, segment_t*s2)
     point_t pair;
     pair.x = s1->nr;
     pair.y = s2->nr;
+#ifndef DONT_REMEMBER_CROSSINGS
     assert(!dict_contains(status->seen_crossings, &pair));
     dict_put(status->seen_crossings, &pair, 0);
 #endif
+#endif
 #ifdef DEBUG
     fprintf(stderr, "schedule crossing between [%d] and [%d] at (%d,%d)\n", s1->nr, s2->nr, p.x, p.y);
 #endif
 
+#ifndef DONT_REMEMBER_CROSSINGS
     /* we insert into each other's intersection history because these segments might switch
        places and we still want to look them up quickly after they did */
-    dict_put(&s1->scheduled_crossings, s2, 0);
-    dict_put(&s2->scheduled_crossings, s1, 0);
-
-    event_t e = event_new();
-    e.type = EVENT_CROSS;
-    e.p = p;
-    e.s1 = s1;
-    e.s2 = s2;
-    heap_put(status->queue, &e);
+    dict_put(&s1->scheduled_crossings, (void*)(ptroff_t)(s2->nr), 0);
+    dict_put(&s2->scheduled_crossings, (void*)(ptroff_t)(s1->nr), 0);
+#endif
+
+    event_t* e = event_new();
+    e->type = EVENT_CROSS;
+    e->p = p;
+    e->s1 = s1;
+    e->s2 = s2;
+    queue_put(&status->queue, e);
     return;
 }
 
@@ -529,6 +755,36 @@ static inline box_t box_new(int32_t x, int32_t y)
     return box;
 }
 
+static void store_horizontal(status_t*status, point_t p1, point_t p2, edgestyle_t*fs, segment_dir_t dir, int polygon_nr);
+
+static void append_stroke(status_t*status, point_t a, point_t b, segment_dir_t dir, edgestyle_t*fs)
+{
+    gfxpolystroke_t*stroke = status->strokes;
+    /* find a stoke to attach this segment to. It has to have an endpoint
+       matching our start point, and a matching edgestyle */
+    while(stroke) {
+       point_t p = stroke->points[stroke->num_points-1];
+       if(p.x == a.x && p.y == a.y && stroke->fs == fs && stroke->dir == dir)
+           break;
+       stroke = stroke->next;
+    }
+    if(!stroke) {
+       stroke = rfx_calloc(sizeof(gfxpolystroke_t));
+       stroke->dir = dir;
+       stroke->fs = fs;
+       stroke->next = status->strokes;
+       status->strokes = stroke;
+       stroke->points_size = 2;
+       stroke->points = rfx_calloc(sizeof(point_t)*stroke->points_size);
+       stroke->points[0] = a;
+       stroke->num_points = 1;
+    } else if(stroke->num_points == stroke->points_size) {
+       assert(stroke->fs);
+       stroke->points_size *= 2;
+       stroke->points = rfx_realloc(stroke->points, sizeof(point_t)*stroke->points_size);
+    }
+    stroke->points[stroke->num_points++] = b;
+}
 
 static void insert_point_into_segment(status_t*status, segment_t*s, point_t p)
 {
@@ -540,28 +796,30 @@ static void insert_point_into_segment(status_t*status, segment_t*s, point_t p)
     assert(s->fs_out_ok);
 #endif
 
-    if(s->fs_out) {
+    if(s->pos.y != p.y) {
+       /* non horizontal line- copy to output */
+       if(s->fs_out) {
 #ifdef DEBUG
-        fprintf(stderr, "[%d] receives next point (%d,%d)->(%d,%d) (drawing)\n", s->nr,
-                s->pos.x, s->pos.y, p.x, p.y);
+           fprintf(stderr, "[%d] receives next point (%.2f,%.2f)->(%.2f,%.2f) (drawing)\n", s->nr,
+                   s->pos.x * status->gridsize, s->pos.y * status->gridsize, 
+                   p.x * status->gridsize, p.y * status->gridsize);
 #endif
-        // omit horizontal lines
-        if(s->pos.y != p.y) {
-            edge_t*e = rfx_calloc(sizeof(edge_t));
+           segment_dir_t dir = s->wind.is_filled?DIR_DOWN:DIR_UP;
+           assert(s->pos.y != p.y);
+           append_stroke(status, s->pos, p, dir, s->fs_out);
+       } else {
 #ifdef DEBUG
-            e->tmp = s->nr;
+           fprintf(stderr, "[%d] receives next point (%.2f,%.2f) (omitting)\n", s->nr, 
+                   p.x * status->gridsize, 
+                   p.y * status->gridsize);
 #endif
-            e->a = s->pos;
-            e->b = p;
-            assert(e->a.y != e->b.y);
-            e->next = status->output;
-            status->output = e;
-        }
+       }
     } else {
-#ifdef DEBUG
-        fprintf(stderr, "[%d] receives next point (%d,%d) (omitting)\n", s->nr, p.x, p.y);
-#endif
+       /* horizontal line. we need to look at this more closely at the end of this
+          scanline */
+       store_horizontal(status, s->pos, p, s->fs, s->dir, s->polygon_nr);
     }
+
     s->pos = p;
 }
 
@@ -596,7 +854,6 @@ static void segrange_test_segment_min(segrange_t*range, segment_t*seg, int32_t y
     /* we need to calculate the xpos anew (and can't use start coordinate or
        intersection coordinate), because we need the xpos exactly at the end of
        this scanline.
-       TODO: might be faster to use XPOS_COMPARE here (see also _max)
      */
     double x = XPOS(seg, y);
     if(!range->segmin || x<range->xmin) {
@@ -652,7 +909,7 @@ static void add_points_to_positively_sloped_segments(status_t*status, int32_t y,
                     //break;
                 }
             }
-            seg = actlist_right(status->actlist, seg);
+            seg = seg->right;
         }
     }
     segrange_test_segment_min(range, first, y);
@@ -691,7 +948,7 @@ static void add_points_to_negatively_sloped_segments(status_t*status, int32_t y,
                     //break;
                 }
             }
-            seg = actlist_left(status->actlist, seg);
+            seg = seg->left;
         }
     }
     segrange_test_segment_min(range, last, y);
@@ -721,6 +978,7 @@ static void add_points_to_ending_segments(status_t*status, int32_t y)
 
         if(status->xrow->num == 1) {
             // shortcut
+           assert(seg->b.x == status->xrow->x[0]);
             point_t p = {status->xrow->x[0], y};
             insert_point_into_segment(status, seg, p);
         } else {
@@ -779,7 +1037,7 @@ static void recalculate_windings(status_t*status, segrange_t*range)
     s = range->segmin;
 #endif
 #ifdef CHECKS
-    /* test sanity: check that we don't have changed segments
+    /* test sanity: verify that we don't have changed segments
        outside of the given range */
     s = actlist_leftmost(status->actlist);
     while(s && s!=range->segmin) {
@@ -792,13 +1050,13 @@ static void recalculate_windings(status_t*status, segrange_t*range)
         s = s->left;
     }
     /* in check mode, go through the whole interval so we can test
-       that all polygons where the fillstyle changed also have seg->changed=1 */
+       that all polygons where the edgestyle changed also have seg->changed=1 */
     s = actlist_leftmost(status->actlist);
     end = 0;
 #endif
 
     if(end)
-        end = actlist_right(status->actlist, end);
+        end = end->right;
     while(s!=end) {
 #ifndef CHECKS
         if(s->changed)
@@ -807,19 +1065,20 @@ static void recalculate_windings(status_t*status, segrange_t*range)
             segment_t* left = actlist_left(status->actlist, s);
             windstate_t wind = left?left->wind:status->windrule->start(status->context);
             s->wind = status->windrule->add(status->context, wind, s->fs, s->dir, s->polygon_nr);
-            fillstyle_t*fs_old = s->fs_out;
+            edgestyle_t*fs_old = s->fs_out;
             s->fs_out = status->windrule->diff(&wind, &s->wind);
 
+#ifdef DEBUG
+            fprintf(stderr, "[%d] dir=%s wind=%d wind.filled=%s fs_old/new=%s/%s %s\n", s->nr, s->dir==DIR_UP?"up":"down", s->wind.wind_nr, s->wind.is_filled?"fill":"nofill", 
+                   fs_old?"draw":"omit", s->fs_out?"draw":"omit",
+                   fs_old!=s->fs_out?"CHANGED":"");
+#endif
             assert(!(!s->changed && fs_old!=s->fs_out));
             s->changed = 0;
 
 #ifdef CHECKS
             s->fs_out_ok = 1;
 #endif
-#ifdef DEBUG
-            fprintf(stderr, "[%d] %s/%d/%s/%s %s\n", s->nr, s->dir==DIR_UP?"up":"down", s->wind.wind_nr, s->wind.is_filled?"fill":"nofill", s->fs_out?"draw":"omit",
-                   fs_old!=s->fs_out?"CHANGED":"");
-#endif
         }
         s = s->right;
     }
@@ -834,7 +1093,6 @@ static void intersect_with_horizontal(status_t*status, segment_t*h)
 
     /* not strictly necessary, also done by the event */
     xrow_add(status->xrow, h->a.x);
-    point_t o = h->a;
 
     if(!right) {
         assert(!left);
@@ -845,14 +1103,17 @@ static void intersect_with_horizontal(status_t*status, segment_t*h)
     right = right->right; //first seg to the right of h->b
     segment_t* s = left;
 
+    point_t o = h->a;
     while(s!=right) {
         assert(s);
         int32_t x = XPOS_INT(s, status->y);
+       point_t p = {x, status->y};
 #ifdef DEBUG
-        fprintf(stderr, "...into [%d] (%d,%d) -> (%d,%d) at (%d,%d)\n", s->nr,
-                s->a.x, s->a.y,
-                s->b.x, s->b.y,
-                x, status->y
+        fprintf(stderr, "...intersecting with [%d] (%.2f,%.2f) -> (%.2f,%.2f) at (%.2f,%.2f)\n", 
+               s->nr,
+                s->a.x * status->gridsize, s->a.y * status->gridsize,
+                s->b.x * status->gridsize, s->b.y * status->gridsize,
+                x * status->gridsize, status->y * status->gridsize
                 );
 #endif
         assert(x >= h->a.x);
@@ -861,84 +1122,217 @@ static void intersect_with_horizontal(status_t*status, segment_t*h)
         assert(s->delta.x > 0 && x <= s->b.x || s->delta.x <= 0 && x >= s->b.x);
         xrow_add(status->xrow, x);
 
+       o = p;
         s = s->right;
     }
 }
 
+/* while, for a scanline, we need both starting as well as ending segments in order
+   to *reconstruct* horizontal lines, we only need one or the other to *process*
+   horizontal lines from the input data.
+
+   So horizontal lines are processed twice: first they create hotpixels by intersecting
+   all segments on the scanline (EVENT_HORIZTONAL). Secondly, they are processed for
+   their actual content. The second also happens for all segments that received more than
+   one point in this scanline.
+*/
+void horiz_reset(horizdata_t*horiz)
+{
+    horiz->num = 0;
+}
+
+void horiz_destroy(horizdata_t*horiz)
+{
+    if(horiz->data) rfx_free(horiz->data);
+    horiz->data = 0;
+}
+
+static int compare_horizontals(const void *_h1, const void *_h2)
+{
+    horizontal_t*h1 = (horizontal_t*)_h1;
+    horizontal_t*h2 = (horizontal_t*)_h2;
+    return h1->x1 - h2->x1;
+}
+
+static void process_horizontals(status_t*status)
+{
+    horizdata_t*horiz = &status->horiz;
+    qsort(horiz->data, horiz->num, sizeof(horizontal_t), compare_horizontals);
+    int t;
+    int xstart = 0;
+    for(t=0;t<horiz->num;t++) {
+       horizontal_t*h = &horiz->data[t];
+#ifdef DEBUG
+       fprintf(stderr, "horizontal (y=%.2f): %.2f -> %.2f dir=%s fs=%p\n", 
+               h->y * status->gridsize,
+               h->x1 * status->gridsize,
+               h->x2 * status->gridsize,
+               h->dir==DIR_UP?"up":"down", h->fs);
+#endif
+       assert(h->y == status->y);
+       assert(xrow_contains(status->xrow, h->x1));
+       assert(xrow_contains(status->xrow, h->x2));
+
+       int pos = xrow_find(status->xrow, h->x1);
+       int x = h->x1;
+       assert(pos <= status->xrow->num);
+       assert(pos == status->xrow->num || status->xrow->x[pos] > x);
+
+       while(x < h->x2) {
+           int next_x = pos < status->xrow->num ? status->xrow->x[pos] : h->x2;
+           pos++;
+           
+           assert(next_x > x);
+
+           point_t p1 = {x,h->y};
+           point_t p2 = {next_x,h->y};
+           segment_t* left = actlist_find(status->actlist, p1, p2);
+           assert(!left || left->fs_out_ok);
+#ifdef DEBUG
+           fprintf(stderr, "  fragment %.2f..%.2f\n", 
+                   x * status->gridsize,
+                   next_x * status->gridsize);
+           if(left) {
+               fprintf(stderr, "    segment [%d] (%.2f,%.2f -> %.2f,%2f, at %.2f,%.2f) is to the left\n", 
+                       SEGNR(left), 
+                       left->a.x * status->gridsize,
+                       left->a.y * status->gridsize,
+                       left->b.x * status->gridsize,
+                       left->b.y * status->gridsize,
+                       left->pos.x * status->gridsize,
+                       left->pos.y * status->gridsize
+                       );
+               /* this segment might be a distance away from the left point
+                  of the horizontal line if the horizontal line belongs to a stroke
+                  with segments that just ended (so this horizontal line appears to
+                  be "floating in space" from our current point of view)
+               assert(left->pos.y == h->y && left->pos.x == h->x1);
+               */
+           }
+#endif
+           windstate_t below = left?left->wind:status->windrule->start(status->context);
+           windstate_t above = status->windrule->add(status->context, below, h->fs, h->dir, h->polygon_nr);
+           edgestyle_t*fs = status->windrule->diff(&above, &below);
+           if(fs) {
+#ifdef DEBUG
+               fprintf(stderr, "    ...storing\n");
+#endif
+               append_stroke(status, p1, p2, h->dir, fs);
+           } else {
+#ifdef DEBUG
+               fprintf(stderr, "    ...ignoring\n");
+#endif
+           }
+           x = next_x;
+       }
+    }
+}
+
+static void store_horizontal(status_t*status, point_t p1, point_t p2, edgestyle_t*fs, segment_dir_t dir, int polygon_nr)
+{
+    assert(p1.y == p2.y);
+    assert(p1.x != p2.x); // TODO: can this happen?
+
+    if(p1.x > p2.x) {
+       dir = DIR_INVERT(dir);
+       point_t p_1 = p1;
+       point_t p_2 = p2;
+       p1 = p_2;
+       p2 = p_1;
+    }
+
+    if(status->horiz.size == status->horiz.num) {
+       if(!status->horiz.size)
+           status->horiz.size = 16;
+       status->horiz.size *= 2;
+       status->horiz.data = rfx_realloc(status->horiz.data, sizeof(status->horiz.data[0])*status->horiz.size);
+    }
+    horizontal_t*h = &status->horiz.data[status->horiz.num++];
+    h->y = p1.y;
+    h->x1 = p1.x;
+    h->x2 = p2.x;
+    h->fs = fs;
+    h->dir = dir;
+    h->polygon_nr = polygon_nr;
+}
+
+
 static void event_apply(status_t*status, event_t*e)
 {
-    switch(e->type) {
-        case EVENT_HORIZONTAL: {
 #ifdef DEBUG
-            event_dump(e);
+    event_dump(status, e);
 #endif
-            intersect_with_horizontal(status, e->s1);
-            segment_destroy(e->s1);e->s1=0;
+
+    switch(e->type) {
+        case EVENT_HORIZONTAL: {
+            segment_t*s = e->s1;
+            intersect_with_horizontal(status, s);
+           store_horizontal(status, s->a, s->b, s->fs, s->dir, s->polygon_nr);
+           advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos, status->gridsize);
+            segment_destroy(s);e->s1=0;
             break;
         }
         case EVENT_END: {
             //delete segment from list
             segment_t*s = e->s1;
-#ifdef DEBUG
-            event_dump(e);
-#endif
 #ifdef CHECKS
             dict_del(status->intersecting_segs, s);
             dict_del(status->segs_with_point, s);
             assert(!dict_contains(status->intersecting_segs, s));
             assert(!dict_contains(status->segs_with_point, s));
 #endif
-            segment_t*left = actlist_left(status->actlist, s);
-            segment_t*right = actlist_right(status->actlist, s);
+            segment_t*left = s->left;
+            segment_t*right = s->right;
             actlist_delete(status->actlist, s);
             if(left && right)
                 schedule_crossing(status, left, right);
 
+           /* schedule segment for xrow handling */
             s->left = 0; s->right = status->ending_segments;
             status->ending_segments = s;
+           advance_stroke(&status->queue, 0, s->stroke, s->polygon_nr, s->stroke_pos, status->gridsize);
             break;
         }
         case EVENT_START: {
             //insert segment into list
-#ifdef DEBUG
-            event_dump(e);
-#endif
             segment_t*s = e->s1;
            assert(e->p.x == s->a.x && e->p.y == s->a.y);
             actlist_insert(status->actlist, s->a, s->b, s);
-            segment_t*left = actlist_left(status->actlist, s);
-            segment_t*right = actlist_right(status->actlist, s);
+            segment_t*left = s->left;
+            segment_t*right = s->right;
             if(left)
                 schedule_crossing(status, left, s);
             if(right)
                 schedule_crossing(status, s, right);
-            schedule_endpoint(status, e->s1);
+            schedule_endpoint(status, s);
             break;
         }
         case EVENT_CROSS: {
             // exchange two segments
-#ifdef DEBUG
-            event_dump(e);
-#endif
-            if(actlist_right(status->actlist, e->s1) == e->s2 &&
-               actlist_left(status->actlist, e->s2) == e->s1) {
+            if(e->s1->right == e->s2) {
+               assert(e->s2->left == e->s1);
                 exchange_two(status, e);
             } else {
+               assert(e->s2->left != e->s1);
 #ifdef DEBUG
                fprintf(stderr, "Ignore this crossing ([%d] not next to [%d])\n", e->s1->nr, e->s2->nr);
 #endif
+#ifndef DONT_REMEMBER_CROSSINGS
                 /* ignore this crossing for now (there are some line segments in between).
                    it'll get rescheduled as soon as the "obstacles" are gone */
-                char del1 = dict_del(&e->s1->scheduled_crossings, e->s2);
-                char del2 = dict_del(&e->s2->scheduled_crossings, e->s1);
+                char del1 = dict_del(&e->s1->scheduled_crossings, (void*)(ptroff_t)e->s2->nr);
+                char del2 = dict_del(&e->s2->scheduled_crossings, (void*)(ptroff_t)e->s1->nr);
                 assert(del1 && del2);
+#endif
 #ifdef CHECKS
                 point_t pair;
                 pair.x = e->s1->nr;
                 pair.y = e->s2->nr;
+#ifndef DONT_REMEMBER_CROSSINGS
                 assert(dict_contains(status->seen_crossings, &pair));
                 dict_del(status->seen_crossings, &pair);
 #endif
+#endif
             }
         }
     }
@@ -952,7 +1346,7 @@ static void check_status(status_t*status)
             s->pos.y != s->b.y) &&
            !dict_contains(status->segs_with_point, s)) {
             fprintf(stderr, "Error: segment [%d] (%sslope) intersects in scanline %d, but it didn't receive a point\n",
-                    s->nr,
+                    SEGNR(s),
                     s->delta.x<0?"-":"+",
                     status->y);
             assert(0);
@@ -961,170 +1355,73 @@ static void check_status(status_t*status)
 }
 #endif
 
-static void add_horizontals(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*context)
+gfxpoly_t* gfxpoly_process(gfxpoly_t*poly1, gfxpoly_t*poly2, windrule_t*windrule, windcontext_t*context)
 {
-    /*
-          |..|        |...........|                 |           |
-          |..|        |...........|                 |           |
-          |..+        +        +..|                 +--+     +--+
-          |...........|        |..|                    |     |
-          |...........|        |..|                    |     |
-     */
-
-#ifdef DEBUG
-    fprintf(stderr, "========================================================================\n");
-#endif
-    heap_t* queue = heap_new(sizeof(event_t), compare_events_simple);
-    gfxpoly_enqueue(poly->edges, queue, 0);
+    current_polygon = poly1;
 
-    actlist_t* actlist = actlist_new();
-
-    event_t*e = heap_chopmax(queue);
-    while(e) {
-        int32_t y = e->p.y;
-        int32_t x = 0;
-        char fill = 0;
-#ifdef DEBUG
-        fprintf(stderr, "----------------------------------- %d\n", y);
-        actlist_dump(actlist, y-1);
-#endif
-#ifdef CHECKS
-        actlist_verify(actlist, y-1);
-#endif
-        do {
-            if(fill && x != e->p.x) {
-#ifdef DEBUG
-                fprintf(stderr, "%d) draw horizontal line from %d to %d\n", y, x, e->p.x);
-#endif
-               assert(x<e->p.x);
-                edge_t*l= malloc(sizeof(edge_t));
-                l->a.y = l->b.y = y;
-               /* TODO: strictly speaking we need to draw from low x to high x so that left/right fillstyles add up
-                        (because the horizontal line's fill style controls the area *below* the line)
-                */
-                l->a.x = x;
-                l->b.x = e->p.x;
-                l->next = poly->edges;
-                poly->edges = l;
-#ifdef CHECKS
-               /* the output should always be intersection free polygons, so check this horizontal
-                  line isn't hacking through any segments in the active list */
-               segment_t* start = actlist_find(actlist, l->a, l->a);
-               segment_t* s = actlist_find(actlist, l->b, l->b);
-               while(s!=start) {
-                   assert(s->a.y == y || s->b.y == y);
-                   s = s->left;
-               }
-#endif
-            }
-            segment_t*left = 0;
-            segment_t*s = e->s1;
-
-            windstate_t before,after;
-            switch(e->type) {
-                case EVENT_START: {
-                   assert(e->p.x == s->a.x && e->p.y == s->a.y);
-                    actlist_insert(actlist, s->a, s->b, s);
-                    event_t e;
-                    e.type = EVENT_END;
-                    e.p = s->b;
-                    e.s1 = s;
-                    e.s2 = 0;
-                    heap_put(queue, &e);
-                    left = actlist_left(actlist, s);
-
-                    before = left?left->wind:windrule->start(context);
-                    after = s->wind = windrule->add(context, before, s->fs, s->dir, s->polygon_nr);
-                    break;
-                }
-                case EVENT_END: {
-                    left = actlist_left(actlist, s);
-                    actlist_delete(actlist, s);
-
-                    before = s->wind;
-                    after = left?left->wind:windrule->start(context);
-                    break;
-                }
-                default: assert(0);
-            }
-
-            x = e->p.x;
-            fill ^= 1;//(before.is_filled != after.is_filled);
-#ifdef DEBUG
-            fprintf(stderr, "%d) event=%s[%d] left:[%d] x:%d before:%d after:%d\n",
-                    y, e->type==EVENT_START?"start":"end",
-                    s->nr,
-                    left?left->nr:-1,
-                    x,
-                    before.is_filled, after.is_filled);
-#endif
-
-            if(e->type == EVENT_END)
-                segment_destroy(s);
-
-            free(e);
-            e = heap_chopmax(queue);
-        } while(e && y == e->p.y);
+    status_t status;
+    memset(&status, 0, sizeof(status_t));
+    status.gridsize = poly1->gridsize;
 
-        assert(!fill); // check that polygon is not bleeding
+    queue_init(&status.queue);
+    gfxpoly_enqueue(poly1, &status.queue, 0, /*polygon nr*/0);
+    if(poly2) {
+       assert(poly1->gridsize == poly2->gridsize);
+       gfxpoly_enqueue(poly2, &status.queue, 0, /*polygon nr*/1);
     }
-    actlist_destroy(actlist);
-    heap_destroy(queue);
-}
 
-gfxpoly_t* gfxpoly_process(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*context)
-{
-    current_polygon = poly;
-    heap_t* queue = heap_new(sizeof(event_t), compare_events);
-
-    gfxpoly_enqueue(poly->edges, queue, /*polygon nr*/0);
-
-    status_t status;
-    memset(&status, 0, sizeof(status_t));
-    status.queue = queue;
     status.windrule = windrule;
     status.context = context;
     status.actlist = actlist_new();
+
 #ifdef CHECKS
     status.seen_crossings = dict_new2(&point_type);
+    int32_t lasty=-0x80000000;
 #endif
 
     status.xrow = xrow_new();
 
-    event_t*e = heap_chopmax(queue);
+    event_t*e = queue_get(&status.queue);
     while(e) {
+       assert(e->s1->fs);
         status.y = e->p.y;
 #ifdef CHECKS
+       assert(status.y>=lasty);
+       lasty = status.y;
         status.intersecting_segs = dict_new2(&ptr_type);
         status.segs_with_point = dict_new2(&ptr_type);
 #endif
 
 #ifdef DEBUG
-        fprintf(stderr, "----------------------------------- %d\n", status.y);
-        actlist_dump(status.actlist, status.y-1);
+        fprintf(stderr, "----------------------------------- %.2f\n", status.y * status.gridsize);
+        actlist_dump(status.actlist, status.y-1, status.gridsize);
 #endif
 #ifdef CHECKS
         actlist_verify(status.actlist, status.y-1);
 #endif
         xrow_reset(status.xrow);
+       horiz_reset(&status.horiz);
+
         do {
             xrow_add(status.xrow, e->p.x);
             event_apply(&status, e);
-            free(e);
-            e = heap_chopmax(queue);
+           event_free(e);
+            e = queue_get(&status.queue);
         } while(e && status.y == e->p.y);
 
         xrow_sort(status.xrow);
         segrange_t range;
         memset(&range, 0, sizeof(range));
 #ifdef DEBUG
-        actlist_dump(status.actlist, status.y);
+        actlist_dump(status.actlist, status.y, status.gridsize);
 #endif
+       xrow_dump(status.xrow, status.gridsize);
         add_points_to_positively_sloped_segments(&status, status.y, &range);
         add_points_to_negatively_sloped_segments(&status, status.y, &range);
         add_points_to_ending_segments(&status, status.y);
 
         recalculate_windings(&status, &range);
+       process_horizontals(&status);
 #ifdef CHECKS
         check_status(&status);
         dict_destroy(status.intersecting_segs);
@@ -1135,12 +1432,32 @@ gfxpoly_t* gfxpoly_process(gfxpoly_t*poly, windrule_t*windrule, windcontext_t*co
     dict_destroy(status.seen_crossings);
 #endif
     actlist_destroy(status.actlist);
-    heap_destroy(queue);
+    queue_destroy(&status.queue);
+    horiz_destroy(&status.horiz);
     xrow_destroy(status.xrow);
 
-    gfxpoly_t*p = gfxpoly_new(poly->gridsize);
-    p->edges = status.output;
+    gfxpoly_t*p = (gfxpoly_t*)malloc(sizeof(gfxpoly_t));
+    p->gridsize = poly1->gridsize;
+    p->strokes = status.strokes;
 
-    add_horizontals(p, &windrule_evenodd, context); // output is always even/odd
+#ifdef CHECKS
+    /* we only add segments with non-empty edgestyles to strokes in
+       recalculate_windings, but better safe than sorry */
+    gfxpolystroke_t*stroke = p->strokes;
+    while(stroke) {
+       assert(stroke->fs);
+       stroke = stroke->next;
+    }
+#endif
     return p;
 }
+
+static windcontext_t twopolygons = {2};
+gfxpoly_t* gfxpoly_intersect(gfxpoly_t*p1, gfxpoly_t*p2)
+{
+    return gfxpoly_process(p1, p2, &windrule_intersect, &twopolygons);
+}
+gfxpoly_t* gfxpoly_union(gfxpoly_t*p1, gfxpoly_t*p2)
+{
+    return gfxpoly_process(p1, p2, &windrule_union, &twopolygons);
+}