diff options
| author | Ole Loots <ole@monochrom.net> | 2011-11-28 23:23:28 +0000 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2011-11-28 23:23:28 +0000 |
| commit | 999410adc818e9bc9e566580b38954720d7dad55 (patch) | |
| tree | 6abf17a5a94a9835673e2b5b5a6542087f010737 /atari/redrawslots.c | |
| parent | a7ba1b7ccd1178717e8e4a0546282270ed2fb1d6 (diff) | |
| download | netsurf-999410adc818e9bc9e566580b38954720d7dad55.tar.gz netsurf-999410adc818e9bc9e566580b38954720d7dad55.tar.bz2 | |
I'm actually trying to simplify the frontend code, changes:
- Optimized browser window caret, uses back-buffer now. ( So no content redraw is scheduled by the frontend just for a caret move )
- Fixed a double redraw issue when the browser reformat is pending and the AES also sends an redraw request because of the resize.
- Started to use netsurfs textarea instead of a custom implementation ( to reduce code size ).
svn path=/trunk/netsurf/; revision=13191
Diffstat (limited to 'atari/redrawslots.c')
| -rw-r--r-- | atari/redrawslots.c | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/atari/redrawslots.c b/atari/redrawslots.c new file mode 100644 index 000000000..f3969c283 --- /dev/null +++ b/atari/redrawslots.c @@ -0,0 +1,79 @@ + +#include <stdbool.h> +#include "windom.h" +#include "utils/types.h" +#include "atari/redrawslots.h" + +void redraw_slots_init(struct s_redrw_slots * slots, short size) +{ + slots->size = MIN( MAX_REDRW_SLOTS , size); + slots->areas_used = 0; +} + + +static inline bool rect_intersect( struct rect * box1, struct rect * box2 )
+{
+ if (box2->x1 < box1->x0)
+ return false;
+
+ if (box2->y1 < box1->y0)
+ return false;
+
+ if (box2->x0 > box1->x1)
+ return false;
+
+ if (box2->y0 > box1->y1)
+ return false;
+
+ return true;
+} +/*
+ schedule a slots, coords are relative.
+*/
+void redraw_slot_schedule(struct s_redrw_slots * slots, short x0, short y0, short x1, short y1)
+{
+ int i;
+ struct rect area;
+
+ area.x0 = x0;
+ area.y0 = y0;
+ area.x1 = x1;
+ area.y1 = y1;
+
+ for( i=0; i<slots->areas_used; i++) {
+ if( slots->areas[i].x0 <= x0
+ && slots->areas[i].x1 >= x1
+ && slots->areas[i].y0 <= y0
+ && slots->areas[i].y1 >= y1 ){
+ /* the area is already queued for redraw */
+ return;
+ } else {
+ if( rect_intersect(&slots->areas[i], &area ) ){
+ slots->areas[i].x0 = MIN(slots->areas[i].x0, x0);
+ slots->areas[i].y0 = MIN(slots->areas[i].y0, y0);
+ slots->areas[i].x1 = MAX(slots->areas[i].x1, x1);
+ slots->areas[i].y1 = MAX(slots->areas[i].y1, y1);
+ return;
+ }
+ }
+ }
+
+ if( slots->areas_used < slots->size ) {
+ slots->areas[slots->areas_used].x0 = x0;
+ slots->areas[slots->areas_used].x1 = x1;
+ slots->areas[slots->areas_used].y0 = y0;
+ slots->areas[slots->areas_used].y1 = y1;
+ slots->areas_used++;
+ } else {
+ /*
+ we are out of available slots, merge box with last slot
+ this is dumb... but also a very rare case.
+ */
+ slots->areas[slots->size-1].x0 = MIN(slots->areas[i].x0, x0);
+ slots->areas[slots->size-1].y0 = MIN(slots->areas[i].y0, y0);
+ slots->areas[slots->size-1].x1 = MAX(slots->areas[i].x1, x1);
+ slots->areas[slots->size-1].y1 = MAX(slots->areas[i].y1, y1);
+ }
+done:
+ return;
+} |