summaryrefslogtreecommitdiff
path: root/src/Fl_Image_Surface.cxx
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-03-05 07:04:20 +0000
committerManolo Gouy <Manolo>2016-03-05 07:04:20 +0000
commite7a0f7c5d02e26b05160b06e4e35d6f66aab5ac6 (patch)
tree88240634390cbac00e5bd95f2d0341f59a0bedde /src/Fl_Image_Surface.cxx
parent3f401f4477249c4ae4d02e232f6389ae51def1d3 (diff)
Complete the platform-neutral implementation of fl_XXX_offscreen() functions.
It is necessary to have a stack of the fl_begin_offscreen() calls, so that nested such calls apply fl_end_offscreen() to the matching fl_begin_offscreen(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11289 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_Image_Surface.cxx')
-rw-r--r--src/Fl_Image_Surface.cxx21
1 files changed, 15 insertions, 6 deletions
diff --git a/src/Fl_Image_Surface.cxx b/src/Fl_Image_Surface.cxx
index 3548d40a1..56b35bd33 100644
--- a/src/Fl_Image_Surface.cxx
+++ b/src/Fl_Image_Surface.cxx
@@ -132,7 +132,6 @@ Fl_Offscreen Fl_Image_Surface::get_offscreen_before_delete() {
static Fl_Image_Surface **offscreen_api_surface = NULL;
static int count_offscreens = 0;
-static int current_offscreen;
static int find_slot(void) { // return an available slot to memorize an Fl_Image_Surface::Helper object
static int max = 0;
@@ -175,14 +174,21 @@ void fl_delete_offscreen(Fl_Offscreen ctx) {
}
}
+static int stack_current_offscreen[16];
+static int stack_height = 0;
+
/** Send all subsequent drawing commands to this offscreen buffer.
\param ctx the offscreen buffer.
*/
void fl_begin_offscreen(Fl_Offscreen ctx) {
- for (current_offscreen = 0; current_offscreen < count_offscreens; current_offscreen++) {
- if (offscreen_api_surface[current_offscreen] &&
- offscreen_api_surface[current_offscreen]->offscreen() == ctx) {
- offscreen_api_surface[current_offscreen]->set_current();
+ for (int i = 0; i < count_offscreens; i++) {
+ if (offscreen_api_surface[i] && offscreen_api_surface[i]->offscreen() == ctx) {
+ offscreen_api_surface[i]->set_current();
+ if (stack_height < sizeof(stack_current_offscreen)/sizeof(int)) {
+ stack_current_offscreen[stack_height++] = i;
+ } else {
+ fprintf(stderr, "FLTK fl_begin_offscreen Stack overflow error\n");
+ }
return;
}
}
@@ -191,7 +197,10 @@ void fl_begin_offscreen(Fl_Offscreen ctx) {
/** Quit sending drawing commands to the current offscreen buffer.
*/
void fl_end_offscreen() {
- offscreen_api_surface[current_offscreen]->end_current();
+ if (stack_height > 0) {
+ int i = stack_current_offscreen[--stack_height];
+ offscreen_api_surface[i]->end_current();
+ }
}
/** @} */