summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx10
-rw-r--r--src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx2
-rw-r--r--src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx2
-rw-r--r--src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx16
-rw-r--r--src/drivers/X11/Fl_X11_Window_Driver.cxx19
5 files changed, 24 insertions, 25 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
index 47fb70242..68389bae9 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.cxx
@@ -73,14 +73,14 @@ void Fl_Cocoa_Window_Driver::flush_overlay()
pWindow->make_current(); // make sure fl_gc is non-zero
Fl_X *myi = Fl_X::i(pWindow);
if (!myi) return; // window not yet created
- if (!myi->other_xid) {
- myi->other_xid = fl_create_offscreen(oWindow->w(), oWindow->h());
+ if (!other_xid) {
+ other_xid = fl_create_offscreen(oWindow->w(), oWindow->h());
oWindow->clear_damage(FL_DAMAGE_ALL);
}
if (oWindow->damage() & ~FL_DAMAGE_EXPOSE) {
fl_clip_region(myi->region); myi->region = 0;
- if ( myi->other_xid ) {
- fl_begin_offscreen( myi->other_xid );
+ if ( other_xid ) {
+ fl_begin_offscreen( other_xid );
fl_clip_region( 0 );
draw();
fl_end_offscreen();
@@ -92,7 +92,7 @@ void Fl_Cocoa_Window_Driver::flush_overlay()
// on Irix (at least) it is faster to reduce the area copied to
// the current clip region:
int X,Y,W,H; fl_clip_box(0,0,oWindow->w(),oWindow->h(),X,Y,W,H);
- if (myi->other_xid) fl_copy_offscreen(X, Y, W, H, myi->other_xid, X, Y);
+ if (other_xid) fl_copy_offscreen(X, Y, W, H, other_xid, X, Y);
if (overlay() == oWindow) oWindow->draw_overlay();
}
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
index ef0501ad5..7da770170 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
@@ -69,7 +69,7 @@ Fl_X *Fl_PicoAndroid_Window_Driver::makeWindow()
parent = 0;
}
Fl_X *x = new Fl_X;
- x->other_xid = 0;
+ other_xid = 0;
x->w = pWindow;
x->region = 0;
if (!pWindow->force_position()) {
diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx
index bba11e520..96c52a459 100644
--- a/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx
@@ -67,7 +67,7 @@ Fl_X *Fl_PicoSDL_Window_Driver::makeWindow()
parent = 0;
}
Fl_X *x = new Fl_X;
- x->other_xid = 0;
+ other_xid = 0;
x->w = pWindow;
x->region = 0;
if (!pWindow->force_position()) {
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index 366a4c6ef..b72a6d7a4 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -268,20 +268,20 @@ void Fl_WinAPI_Window_Driver::flush_double()
Fl_X *i = Fl_X::i(pWindow);
if (!i) return; // window not yet created
- if (!i->other_xid) {
- i->other_xid = fl_create_offscreen(w(), h());
+ if (!other_xid) {
+ other_xid = fl_create_offscreen(w(), h());
pWindow->clear_damage(FL_DAMAGE_ALL);
}
if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) {
fl_clip_region(i->region); i->region = 0;
- fl_begin_offscreen(i->other_xid);
+ fl_begin_offscreen(other_xid);
fl_graphics_driver->clip_region( 0 );
draw();
fl_end_offscreen();
}
int X,Y,W,H; fl_clip_box(0,0,w(),h(),X,Y,W,H);
- if (i->other_xid) fl_copy_offscreen(X, Y, W, H, i->other_xid, X, Y);
+ if (other_xid) fl_copy_offscreen(X, Y, W, H, other_xid, X, Y);
}
@@ -297,13 +297,13 @@ void Fl_WinAPI_Window_Driver::flush_overlay()
int eraseoverlay = (pWindow->damage()&FL_DAMAGE_OVERLAY);
pWindow->clear_damage((uchar)(pWindow->damage()&~FL_DAMAGE_OVERLAY));
- if (!i->other_xid) {
- i->other_xid = fl_create_offscreen(w(), h());
+ if (!other_xid) {
+ other_xid = fl_create_offscreen(w(), h());
pWindow->clear_damage(FL_DAMAGE_ALL);
}
if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) {
fl_clip_region(i->region); i->region = 0;
- fl_begin_offscreen(i->other_xid);
+ fl_begin_offscreen(other_xid);
fl_graphics_driver->clip_region(0);
draw();
fl_end_offscreen();
@@ -311,7 +311,7 @@ void Fl_WinAPI_Window_Driver::flush_overlay()
if (eraseoverlay) fl_clip_region(0);
int X, Y, W, H; fl_clip_box(0, 0, w(), h(), X, Y, W, H);
- if (i->other_xid) fl_copy_offscreen(X, Y, W, H, i->other_xid, X, Y);
+ if (other_xid) fl_copy_offscreen(X, Y, W, H, other_xid, X, Y);
if (overlay() == oWindow) oWindow->draw_overlay();
}
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index b468cd60d..bb952b7bd 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -80,8 +80,8 @@ void Fl_X11_Window_Driver::flush_double_dbe(int erase_overlay)
{
pWindow->make_current(); // make sure fl_gc is non-zero
Fl_X *i = Fl_X::i(pWindow);
- if (!i->other_xid) {
- i->other_xid = XdbeAllocateBackBufferName(fl_display, fl_xid(pWindow), XdbeCopied);
+ if (!other_xid) {
+ other_xid = XdbeAllocateBackBufferName(fl_display, fl_xid(pWindow), XdbeCopied);
backbuffer_bad = 1;
pWindow->clear_damage(FL_DAMAGE_ALL);
}
@@ -94,7 +94,7 @@ void Fl_X11_Window_Driver::flush_double_dbe(int erase_overlay)
// Redraw as needed...
if (pWindow->damage()) {
fl_clip_region(i->region); i->region = 0;
- fl_window = i->other_xid;
+ fl_window = other_xid;
draw();
fl_window = i->xid;
}
@@ -111,9 +111,8 @@ void Fl_X11_Window_Driver::flush_double_dbe(int erase_overlay)
void Fl_X11_Window_Driver::destroy_double_buffer() {
#if USE_XDBE
if (can_xdbe()) {
- Fl_X *i = Fl_X::i(pWindow);
- XdbeDeallocateBackBufferName(fl_display, i->other_xid);
- i->other_xid = 0;
+ XdbeDeallocateBackBufferName(fl_display, other_xid);
+ other_xid = 0;
}
else
#endif // USE_XDBE
@@ -218,19 +217,19 @@ void Fl_X11_Window_Driver::flush_double(int erase_overlay)
{
pWindow->make_current(); // make sure fl_gc is non-zero
Fl_X *i = Fl_X::i(pWindow);
- if (!i->other_xid) {
- i->other_xid = fl_create_offscreen(w(), h());
+ if (!other_xid) {
+ other_xid = fl_create_offscreen(w(), h());
pWindow->clear_damage(FL_DAMAGE_ALL);
}
if (pWindow->damage() & ~FL_DAMAGE_EXPOSE) {
fl_clip_region(i->region); i->region = 0;
- fl_window = i->other_xid;
+ fl_window = other_xid;
draw();
fl_window = i->xid;
}
if (erase_overlay) fl_clip_region(0);
int X,Y,W,H; fl_clip_box(0,0,w(),h(),X,Y,W,H);
- if (i->other_xid) fl_copy_offscreen(X, Y, W, H, i->other_xid, X, Y);
+ if (other_xid) fl_copy_offscreen(X, Y, W, H, other_xid, X, Y);
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-09 03:11:04 +0000