8 files changed, 22 insertions, 12 deletions
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 06b6e2b1b..85e58c349 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -55,7 +55,7 @@ void Fl_Double_Window::resize(int X,int Y,int W,int H) {
   int oh = h();
   Fl_Window::resize(X,Y,W,H);
   Fl_X *myi = Fl_X::i(this);
-  if (myi && driver()->other_xid && (ow < w() || oh < h() || Fl_Window_Driver::in_resize_after_scale_change))
+  if (myi && driver()->other_xid && (ow < w() || oh < h() || Fl_Window_Driver::is_a_rescale))
     driver()->destroy_double_buffer();
 }
 
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx
index fc5a7748d..1d1bc1724 100644
--- a/src/Fl_Gl_Window.cxx
+++ b/src/Fl_Gl_Window.cxx
@@ -261,7 +261,7 @@ void Fl_Gl_Window::resize(int X,int Y,int W,int H) {
 //  printf("Fl_Gl_Window::resize(X=%d, Y=%d, W=%d, H=%d)\n", X, Y, W, H);
 //  printf("current: x()=%d, y()=%d, w()=%d, h()=%d\n", x(), y(), w(), h());
 
-  int is_a_resize = (W != Fl_Widget::w() || H != Fl_Widget::h() || Fl_Window_Driver::in_resize_after_scale_change);
+  int is_a_resize = (W != Fl_Widget::w() || H != Fl_Widget::h() || Fl_Window_Driver::is_a_rescale);
   if (is_a_resize) valid(0);
   pGlWindowDriver->resize(is_a_resize, W, H);
   Fl_Window::resize(X,Y,W,H);
diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx
index f359152f5..992f1c61f 100644
--- a/src/Fl_Group.cxx
+++ b/src/Fl_Group.cxx
@@ -700,7 +700,7 @@ void Fl_Group::resize(int X, int Y, int W, int H) {
 
   Fl_Widget::resize(X,Y,W,H); // make new xywh values visible for children
 
-  if ((!resizable() || (dw==0 && dh==0 )) && !Fl_Window_Driver::in_resize_after_scale_change) {
+  if ((!resizable() || (dw==0 && dh==0 )) && !Fl_Window_Driver::is_a_rescale) {
 
     if (!as_window()) {
       Fl_Widget*const* a = array();
diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx
index 3c92c09a7..1d1eac07e 100644
--- a/src/Fl_Window_Driver.cxx
+++ b/src/Fl_Window_Driver.cxx
@@ -257,7 +257,7 @@ int Fl_Window_Driver::screen_num() {
   return Fl::screen_num(x(), y(), w(), h());
 }
 
-bool Fl_Window_Driver::in_resize_after_scale_change = false;
+bool Fl_Window_Driver::is_a_rescale = false;
 
 void Fl_Window_Driver::resize_after_scale_change(int ns, float old_f, float new_f) {
   screen_num(ns);
@@ -268,10 +268,10 @@ void Fl_Window_Driver::resize_after_scale_change(int ns, float old_f, float new_
   } else {
     W = pWindow->w(); H = pWindow->h();
   }
-  in_resize_after_scale_change = true;
+  is_a_rescale = true;
   pWindow->resize(pWindow->x()*old_f/new_f,  pWindow->y()*old_f/new_f, W, H);
   size_range();
-  in_resize_after_scale_change = false;
+  is_a_rescale = false;
 }
 
 //
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index e8749a4cd..b3aa752df 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1683,10 +1683,10 @@ int Fl_WinAPI_Window_Driver::fake_X_wm(int &X,int &Y, int &bt,int &bx, int &by)
 void Fl_WinAPI_Window_Driver::resize(int X,int Y,int W,int H) {
   UINT flags = SWP_NOSENDCHANGING | SWP_NOZORDER
              | SWP_NOACTIVATE | SWP_NOOWNERZORDER;
-  int is_a_resize = (W != w() || H != h() || in_resize_after_scale_change);
+  int is_a_resize = (W != w() || H != h() || is_a_rescale);
   int resize_from_program = (pWindow != resize_bug_fix);
   if (!resize_from_program) resize_bug_fix = 0;
-  if (X != x() || Y != y() || in_resize_after_scale_change) {
+  if (X != x() || Y != y() || is_a_rescale) {
     force_position(1);
   } else {
     if (!is_a_resize) return;
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 0d75316ea..887a09f39 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -2106,8 +2106,8 @@ fprintf(stderr,"\n");*/
 ////////////////////////////////////////////////////////////////
 
 void Fl_X11_Window_Driver::resize(int X,int Y,int W,int H) {
-  int is_a_move = (X != x() || Y != y() || in_resize_after_scale_change);
-  int is_a_resize = (W != w() || H != h() || in_resize_after_scale_change);
+  int is_a_move = (X != x() || Y != y() || is_a_rescale);
+  int is_a_resize = (W != w() || H != h() || is_a_rescale);
   int resize_from_program = (pWindow != resize_bug_fix);
   if (!resize_from_program) resize_bug_fix = 0;
   if (is_a_move && resize_from_program) force_position(1);
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index d1390e862..13258944e 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -367,6 +367,16 @@ void Fl_X11_Screen_Driver::init() {
       }
     }
   }
+#if __APPLE_CC__ && USE_XFT // TMP simulate 2 screens under XQuartz
+  if (strstr(getenv("DISPLAY"), "xquartz")) {
+    num_screens = 2;
+    screens[1].x_org = screens[0].width/2;;
+    screens[1].y_org = screens[0].y_org;
+    screens[1].width = screens[0].width = screens[0].width/2;
+    screens[1].height = screens[0].height;
+    screens[1].scale = screens[0].scale = 1;
+  }
+#endif
   init_workarea();
 }
 
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index 7928dbba4..a374bd84c 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -704,10 +704,10 @@ void Fl_X11_Window_Driver::resize_after_screen_change(void *data) {
   float f = Fl::screen_driver()->scale(data_for_resize_window_between_screens_.screen);
   Fl_X11_Window_Driver::driver(win)->screen_num(data_for_resize_window_between_screens_.screen);
   Fl_Display_Device::display_device()->driver()->scale(f);
-  in_resize_after_scale_change = true;
+  is_a_rescale = true;
   win->driver()->size_range();
   win->resize(oldx/f, oldy/f, win->w(), win->h());
-  in_resize_after_scale_change = false;
+  is_a_rescale = false;
   data_for_resize_window_between_screens_.busy = false;
 }