Convert ux_screen.c to K&R style.

diff --git a/src/curses/ux_screen.c b/src/curses/ux_screen.c
index fb482a017438371b6e415bb7cfd74c50b958444f..b3dadc072adf614e87ef0809156fb3550a200c1a 100644 (file)
--- a/src/curses/ux_screen.c
+++ b/src/curses/ux_screen.c
@@ -50,38 +50,39 @@ static WINDOW *saved_screen = NULL;
  * being erased.  This is not relevant for the curses interface.
  *
  */
-void os_erase_area (int top, int left, int bottom, int right, int UNUSED(win))
+void os_erase_area(int top, int left, int bottom, int right, int UNUSED(win))
 {
-    int y, x, i, j;
+       int y, x, i, j;
 
-    /* Catch the most common situation and do things the easy way */
-    if ((top == 1) && (bottom == h_screen_rows) &&
-       (left == 1) && (right == h_screen_cols)) {
+       /* Catch the most common situation and do things the easy way */
+       if ((top == 1) && (bottom == h_screen_rows) &&
+               (left == 1) && (right == h_screen_cols)) {
 #ifdef COLOR_SUPPORT
-      /* Only set the curses background when doing an erase, so it won't
-       * interfere with the copying we do in os_scroll_area.
-       */
-      bkgdset(u_setup.current_color | ' ');
-      erase();
-      bkgdset(0);
+               /* Only set the curses background when doing an erase,
+                * so it won't interfere with the copying we do in
+                * os_scroll_area.
+                */
+               bkgdset(u_setup.current_color | ' ');
+               erase();
+               bkgdset(0);
 #else
-      erase();
+               erase();
 #endif
-    } else {
-        /* Sigh... */
-       int saved_style = u_setup.current_text_style;
-       os_set_text_style(u_setup.current_color);
-       getyx(stdscr, y, x);
-       top--; left--; bottom--; right--;
-       for (i = top; i <= bottom; i++) {
-         move(i, left);
-         for (j = left; j <= right; j++)
-           addch(' ');
+       } else {
+               /* Sigh... */
+               int saved_style = u_setup.current_text_style;
+               os_set_text_style(u_setup.current_color);
+               getyx(stdscr, y, x);
+               top--; left--; bottom--; right--;
+               for (i = top; i <= bottom; i++) {
+                       move(i, left);
+                       for (j = left; j <= right; j++)
+                               addch(' ');
+               }
+               move(y, x);
+               os_set_text_style(saved_style);
        }
-       move(y, x);
-       os_set_text_style(saved_style);
-    }
-}/* os_erase_area */
+} /* os_erase_area */
 
 
 /*
@@ -92,79 +93,80 @@ void os_erase_area (int top, int left, int bottom, int right, int UNUSED(win))
  * colour. Top left coordinates are (1,1). The cursor stays put.
  *
  */
-void os_scroll_area (int top, int left, int bottom, int right, int units)
+void os_scroll_area(int top, int left, int bottom, int right, int units)
 {
-  top--; left--; bottom--; right--;
-
-  if ((left == 0) && (right == h_screen_cols - 1)) {
-    static int old_scroll_top = 0;
-    static int old_scroll_bottom = 0;
-
-    if (!((old_scroll_top == top) && (old_scroll_bottom == bottom))) {
-        old_scroll_top = top; old_scroll_bottom = bottom;
-        setscrreg(top, bottom);
-    }
-    scrollok(stdscr, TRUE);
-    scrl(units);
-    scrollok(stdscr, FALSE);
-  } else {
-    int row, col, x, y;
-    chtype ch;
-
-    getyx(stdscr, y, x);
-    /* Must turn off attributes during copying.  */
-    attrset(0);
-    if (units > 0) {
-      for (row = top; row <= bottom - units; row++)
-       for (col = left; col <= right; col++) {
-         ch = mvinch(row + units, col);
-         mvaddch(row, col, ch);
-       }
-    } else if (units < 0) {
-      for (row = bottom; row >= top - units; row--)
-       for (col = left; col <= right; col++) {
-         ch = mvinch(row + units, col);
-         mvaddch(row, col, ch);
+       top--; left--; bottom--; right--;
+
+       if ((left == 0) && (right == h_screen_cols - 1)) {
+               static int old_scroll_top = 0;
+               static int old_scroll_bottom = 0;
+
+               if (!((old_scroll_top == top) && (old_scroll_bottom == bottom))) {
+                       old_scroll_top = top; old_scroll_bottom = bottom;
+                       setscrreg(top, bottom);
+               }
+               scrollok(stdscr, TRUE);
+               scrl(units);
+               scrollok(stdscr, FALSE);
+       } else {
+               int row, col, x, y;
+               chtype ch;
+
+               getyx(stdscr, y, x);
+               /* Must turn off attributes during copying.  */
+               attrset(0);
+               if (units > 0) {
+                       for (row = top; row <= bottom - units; row++) {
+                               for (col = left; col <= right; col++) {
+                                       ch = mvinch(row + units, col);
+                                       mvaddch(row, col, ch);
+                               }
+                       }
+               } else if (units < 0) {
+                       for (row = bottom; row >= top - units; row--) {
+                               for (col = left; col <= right; col++) {
+                                       ch = mvinch(row + units, col);
+                                       mvaddch(row, col, ch);
+                               }
+                       }
+               }
+               /* Restore attributes.  */
+               os_set_text_style(u_setup.current_text_style);
+               move(y, x);
        }
-    }
-    /* Restore attributes.  */
-    os_set_text_style(u_setup.current_text_style);
-    move(y, x);
-  }
-  if (units > 0)
-    os_erase_area(bottom - units + 2, left + 1, bottom + 1, right + 1, 0);
-  else if (units < 0)
-    os_erase_area(top + 1, left + 1, top - units, right + 1, 0);
-}/* os_scroll_area */
+       if (units > 0)
+               os_erase_area(bottom - units + 2, left + 1, bottom + 1, right + 1, 0);
+       else if (units < 0)
+               os_erase_area(top + 1, left + 1, top - units, right + 1, 0);
+} /* os_scroll_area */
 
 
 static void save_screen(void)
 {
-    if ((saved_screen = newpad(h_screen_rows, h_screen_cols))
-        && overwrite(stdscr, saved_screen) == ERR) {
-        delwin(saved_screen);
-        saved_screen = NULL;
-    }
-    if (saved_screen) {
-        int y, x;
-        getyx(stdscr, y, x);
-        wmove(saved_screen, y, x);
-    }
-}
+       if ((saved_screen = newpad(h_screen_rows, h_screen_cols))
+               && overwrite(stdscr, saved_screen) == ERR) {
+               delwin(saved_screen);
+               saved_screen = NULL;
+       }
+       if (saved_screen) {
+               int y, x;
+               getyx(stdscr, y, x);
+               wmove(saved_screen, y, x);
+       }
+} /* save_screen */
 
 
 static void resize_restore_screen(void)
 {
-    unix_get_terminal_size();
-    resize_screen();
-    if (zmp != NULL)
-        restart_header();
-    if (saved_screen) {
-        delwin(saved_screen);
-        saved_screen = NULL;
-    }
-}
-
+       unix_get_terminal_size();
+       resize_screen();
+       if (zmp != NULL)
+               restart_header();
+       if (saved_screen) {
+               delwin(saved_screen);
+               saved_screen = NULL;
+       }
+} /* resize_restore_screen */
 
 
 /**
@@ -173,11 +175,12 @@ static void resize_restore_screen(void)
  */
 void unix_resize_display(void)
 {
-    save_screen();
-    endwin();
-    refresh();
-    resize_restore_screen();
-}/* unix_redraw_display */
+       save_screen();
+       endwin();
+       refresh();
+       resize_restore_screen();
+} /* unix_redraw_display */
+
 
 /**
  * Suspend ourselves.  Save the screen and raise SIGTSTP.
@@ -186,11 +189,12 @@ void unix_resize_display(void)
  */
 void unix_suspend_program(void)
 {
-    save_screen();
-    raise(SIGTSTP);
-    resize_restore_screen();
+       save_screen();
+       raise(SIGTSTP);
+       resize_restore_screen();
 }
 
+
 /**
  * Repaint a window.
  *
@@ -207,30 +211,31 @@ void unix_suspend_program(void)
 bool os_repaint_window(int win, int ypos_old, int ypos_new, int xpos,
                        int ysize, int xsize)
 {
-    int lines, cols;
-    if (!saved_screen)
-        return FALSE;
-    if (xsize == 0 || ysize == 0)
-        return TRUE;
-    getmaxyx(saved_screen, lines, cols);
-    ypos_old--, ypos_new--, xpos--;
-    if (xpos + xsize > cols)
-        xsize = cols - xpos;
-    if (ypos_old + ysize > lines)
-        ysize = lines - ypos_old;
-    /* Most of the time we are in os_read_line, where the cursor position
-       is different from that in the window properties.  So use the real cursor
-       position. */
-    if (win == cwin) {
-        int y, x;
-        getyx(saved_screen, y, x);
-        y += ypos_new - ypos_old;
-        if (y >= ypos_new && y< ypos_new + ysize
-            && x >= xpos && x < xpos + xsize)
-            move(y, x);
-    }
-    if (xsize <= 0 || ysize <= 0)
-        return FALSE;
-    return copywin(saved_screen, stdscr, ypos_old, xpos, ypos_new, xpos,
-                   ypos_new + ysize - 1, xpos + xsize - 1, FALSE) != ERR;
-}
+       int lines, cols;
+       if (!saved_screen)
+               return FALSE;
+       if (xsize == 0 || ysize == 0)
+               return TRUE;
+       getmaxyx(saved_screen, lines, cols);
+       ypos_old--, ypos_new--, xpos--;
+       if (xpos + xsize > cols)
+               xsize = cols - xpos;
+       if (ypos_old + ysize > lines)
+               ysize = lines - ypos_old;
+       /* Most of the time we are in os_read_line, where the cursor
+        * position is different from that in the window properties.
+        * So use the real cursor position.
+        */
+       if (win == cwin) {
+               int y, x;
+               getyx(saved_screen, y, x);
+               y += ypos_new - ypos_old;
+               if (y >= ypos_new && y< ypos_new + ysize
+                       && x >= xpos && x < xpos + xsize)
+                       move(y, x);
+       }
+       if (xsize <= 0 || ysize <= 0)
+               return FALSE;
+       return copywin(saved_screen, stdscr, ypos_old, xpos, ypos_new, xpos,
+               ypos_new + ysize - 1, xpos + xsize - 1, FALSE) != ERR;
+} /* os_repaint_window */