1 files changed, 14 insertions, 7 deletions

diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index 4fa3b8698..80bf4368e 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -88,7 +88,8 @@ void Fl_X11_Screen_Driver::display(const char *d) {
   static char e[1024];
   strcpy(e, "DISPLAY=");
   strlcat(e, d, sizeof(e));
-  for (char *c = e + 8; *c != ':'; c++) {
+  char *c;
+  for (c = e + 8; *c != ':'; c++) {
     if (!*c) {
       strlcat(e,":0.0",sizeof(e));
       break;
@@ -188,7 +189,8 @@ int Fl_X11_Screen_Driver::visual(int flags)
   XVisualInfo *visualList = XGetVisualInfo(fl_display, 0, &vTemplate, &num);
   // find all matches, use the one with greatest depth:
   XVisualInfo *found = 0;
-  for (int i=0; i<num; i++) if (test_visual(visualList[i], flags)) {
+  int i;
+  for (i =0; i<num; i++) if (test_visual(visualList[i], flags)) {
     if (!found || found->depth < visualList[i].depth)
       found = &visualList[i];
   }
@@ -314,6 +316,8 @@ void Fl_X11_Screen_Driver::init() {
 
 #endif // USE_XRANDR
 
+  int i;
+
 #if HAVE_XINERAMA
 
   if (XineramaIsActive(fl_display)) {
@@ -321,7 +325,7 @@ void Fl_X11_Screen_Driver::init() {
     if (num_screens > MAX_SCREENS) num_screens = MAX_SCREENS;
 
     /* There's no way to use different DPI for different Xinerama screens. */
-    for (int i=0; i<num_screens; i++) {
+    for (i =0; i<num_screens; i++) {
       screens[i].x_org = xsi[i].x_org;
       screens[i].y_org = xsi[i].y_org;
       screens[i].width = xsi[i].width;
@@ -345,7 +349,7 @@ void Fl_X11_Screen_Driver::init() {
     num_screens = ScreenCount(fl_display);
     if (num_screens > MAX_SCREENS) num_screens = MAX_SCREENS;
 
-    for (int i=0; i<num_screens; i++) {
+    for (i =0; i<num_screens; i++) {
       screens[i].x_org = 0;
       screens[i].y_org = 0;
       screens[i].width = DisplayWidth(fl_display, i);
@@ -450,7 +454,8 @@ void Fl_X11_Screen_Driver::grab(Fl_Window* win)
   static bool using_kde =
     ( p = getenv("XDG_CURRENT_DESKTOP") , (p && (strcmp(p, "KDE") == 0)) );
   Fl_Window *fullscreen_win = NULL;
-  for (Fl_Window *W = Fl::first_window(); W; W = Fl::next_window(W)) {
+  Fl_Window *W;
+  for (W = Fl::first_window(); W; W = Fl::next_window(W)) {
     if (W->fullscreen_active()) {
       fullscreen_win = W;
       break;
@@ -1177,7 +1182,8 @@ int Fl_X11_Screen_Driver::screen_num_unscaled(int x, int y)
   int screen = -1;
   if (num_screens < 0) init();
 
-  for (int i = 0; i < num_screens; i ++) {
+  int i;
+  for (i = 0; i < num_screens; i ++) {
     int sx = screens[i].x_org, sy = screens[i].y_org, sw = screens[i].width, sh = screens[i].height;
     if ((x >= sx) && (x < (sx+sw)) && (y >= sy) && (y < (sy+sh))) {
       screen = i;
@@ -1200,7 +1206,8 @@ void Fl_X11_Screen_Driver::desktop_scale_factor()
       if (factor < 1.1) factor = 1;
       else if (factor > 1.8 && factor < 2.2) factor = 2;
       else if (factor > 10.0) factor = 10.0;
-      for (int i = 0; i < screen_count(); i++)  scale(i, factor);
+      int i;
+      for (i = 0; i < screen_count(); i++)  scale(i, factor);
     }
   }
 }