Rename Fl_Window_Driver::in_resize_after_scale_change to 'is_a_rescale' which is more expressive.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12358 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

2 files changed, 12 insertions, 2 deletions

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;
 }