From b6f65b1c8706098fbbbe8b717f5c94309728aa16 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Fri, 7 Sep 2018 09:24:35 +0000
Subject: X11: simplify the use of member function
 Fl_X11_Screen_Driver::init_workarea().

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@13044 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/drivers/X11/Fl_X11_Screen_Driver.cxx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index ff385c340..d0274a10e 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -212,8 +212,6 @@ static int fl_workarea_xywh[4] = { -1, -1, -1, -1 };
 
 void Fl_X11_Screen_Driver::init_workarea() 
 {
-  if (!fl_display) open_display();
-
   Atom actual;
   unsigned long count, remaining;
   int format;
@@ -247,7 +245,7 @@ void Fl_X11_Screen_Driver::init_workarea()
 
 
 int Fl_X11_Screen_Driver::x() {
-  if (fl_workarea_xywh[0] < 0) init_workarea();
+  if (!fl_display) open_display();
   return fl_workarea_xywh[0]
 #if USE_XFT
   / screens[0].scale
@@ -256,7 +254,7 @@ int Fl_X11_Screen_Driver::x() {
 }
 
 int Fl_X11_Screen_Driver::y() {
-  if (fl_workarea_xywh[0] < 0) init_workarea();
+  if (!fl_display) open_display();
   return fl_workarea_xywh[1]
 #if USE_XFT
   / screens[0].scale
@@ -265,7 +263,7 @@ int Fl_X11_Screen_Driver::y() {
 }
 
 int Fl_X11_Screen_Driver::w() {
-  if (fl_workarea_xywh[0] < 0) init_workarea();
+  if (!fl_display) open_display();
   return fl_workarea_xywh[2]
 #if USE_XFT
       / screens[0].scale
@@ -274,7 +272,7 @@ int Fl_X11_Screen_Driver::w() {
 }
 
 int Fl_X11_Screen_Driver::h() {
-  if (fl_workarea_xywh[0] < 0) init_workarea();
+  if (!fl_display) open_display();
   return fl_workarea_xywh[3]
 #if USE_XFT
   / screens[0].scale
-- 
cgit v1.2.3