remove OPTION macro

diff --git a/Changes b/Changes
index 04e57b5..1602b24 100644 (file)
--- a/Changes
+++ b/Changes
@@ -24,7 +24,7 @@ TODO: add bell event (or generic event to act on such controls).
        - nuke reconf script, serves no purpose anymore.
         - do not process focus events caused by grabs
           (patch by Mikachu).
-        - better option handling (exg).
+        - better option handling, support more than 30 options (exg).
 
 8.2  Sat Feb 17 21:35:28 CET 2007
        - fix make depend in src/, reported by exg.

diff --git a/src/command.C b/src/command.C
index 893afad..a874a02 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -879,7 +879,7 @@ rxvt_term::key_press (XKeyEvent &ev)
   if (len <= 0)
     return;                    /* not mapped */
 
-  if (OPTION (Opt_scrollTtyKeypress))
+  if (option (Opt_scrollTtyKeypress))
     if (view_start)
       {
         view_start = 0;
@@ -1234,7 +1234,7 @@ rxvt_term::pty_fill ()
     {
       pty_ev.stop ();
 
-      if (!OPTION (Opt_hold))
+      if (!option (Opt_hold))
         destroy ();
     }
   
@@ -1265,7 +1265,7 @@ rxvt_term::pointer_unblank ()
 #ifdef POINTER_BLANK
   hidden_pointer = 0;
 
-  if (OPTION (Opt_pointerBlank))
+  if (option (Opt_pointerBlank))
     pointer_ev.start (NOW + pointerBlankDelay);
 #endif
 }
@@ -1274,7 +1274,7 @@ rxvt_term::pointer_unblank ()
 void
 rxvt_term::pointer_blank ()
 {
-  if (!OPTION (Opt_pointerBlank))
+  if (!option (Opt_pointerBlank))
     return;
 
   XDefineCursor (dpy, vt, display->blank_cursor);
@@ -1488,7 +1488,7 @@ rxvt_term::x_cb (XEvent &ev)
             HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
 
 #ifdef TRANSPARENT
-            if (OPTION (Opt_transparent))
+            if (option (Opt_transparent))
               check_our_parents ();
 #endif
           }
@@ -1687,7 +1687,7 @@ rxvt_term::x_cb (XEvent &ev)
     }
 
 #if defined(CURSOR_BLINK)
-  if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
+  if (option (Opt_cursorBlink) && ev.type == KeyPress)
     {
       if (hidden_cursor)
         {
@@ -1700,7 +1700,7 @@ rxvt_term::x_cb (XEvent &ev)
 #endif
 
 #if defined(POINTER_BLANK)
-  if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
+  if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
     {
       if (ev.type == MotionNotify
           || ev.type == ButtonPress
@@ -1732,7 +1732,7 @@ rxvt_term::focus_in ()
         }
 #endif
 #if CURSOR_BLINK
-      if (OPTION (Opt_cursorBlink))
+      if (option (Opt_cursorBlink))
         cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
 #endif
 #if OFF_FOCUS_FADING
@@ -1769,7 +1769,7 @@ rxvt_term::focus_out ()
         XUnsetICFocus (Input_Context);
 #endif
 #if CURSOR_BLINK
-      if (OPTION (Opt_cursorBlink))
+      if (option (Opt_cursorBlink))
         cursor_blink_ev.stop ();
       hidden_cursor = 0;
 #endif
@@ -1820,7 +1820,7 @@ rxvt_term::rootwin_cb (XEvent &ev)
 
         /* FALLTHROUGH */
       case ReparentNotify:
-        if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
+        if (option (Opt_transparent) && check_our_parents () && am_transparent)
           want_refresh = want_full_refresh = 1;
         break;
     }
@@ -2176,7 +2176,7 @@ rxvt_term::button_release (XButtonEvent &ev)
 
               if (ev.state & ShiftMask)
                 i = 1;
-              else if (OPTION (Opt_mouseWheelScrollPage))
+              else if (option (Opt_mouseWheelScrollPage))
                 i = nrow - 1;
               else
                 i = 5;
@@ -2457,7 +2457,7 @@ rxvt_term::check_our_parents ()
 
   pchanged = 0;
 
-  if (!OPTION (Opt_transparent))
+  if (!option (Opt_transparent))
     return pchanged;   /* Don't try any more */
 
   XGetWindowAttributes (dpy, display->root, &wrootattr);
@@ -2737,7 +2737,7 @@ rxvt_term::cmd_parse ()
 
                   refresh_count++;
 
-                  if (!OPTION (Opt_jumpScroll)
+                  if (!option (Opt_jumpScroll)
                       || (refresh_count >= refresh_limit * (nrow - 1)))
                     {
                       refreshnow = true;
@@ -2787,7 +2787,7 @@ rxvt_term::cmd_parse ()
            */
           if (refreshnow)
             {
-              if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
+              if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
                 refresh_limit++;
               else
                 {
@@ -3463,7 +3463,7 @@ rxvt_term::process_csi_seq ()
               scr_report_position ();
               break;
             case 7:                    /* unofficial extension */
-              if (OPTION (Opt_insecure))
+              if (option (Opt_insecure))
                 tt_printf ("%-.250s\012", rs[Rs_display_name]);
               break;
             case 8:                    /* unofficial extension */
@@ -3637,7 +3637,7 @@ rxvt_term::process_window_ops (const int *args, unsigned int nargs)
         {
           char *s;
           XGetIconName (dpy, parent[0], &s);
-          tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : "");        /* 8bit ST */
+          tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : "");        /* 8bit ST */
           XFree (s);
         }
         break;
@@ -3645,7 +3645,7 @@ rxvt_term::process_window_ops (const int *args, unsigned int nargs)
         {
           char *s;
           XFetchName (dpy, parent[0], &s);
-          tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : "");        /* 8bit ST */
+          tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : "");        /* 8bit ST */
           XFree (s);
         }
         break;
@@ -3963,7 +3963,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
 #endif
         if (query)
           tt_printf ("\33]%d;%-.250s%c", saveop,
-                     OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
+                     option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
                        ? fontset[op - URxvt_font]->fontdesc : "",
                      resp);
         else
@@ -3987,7 +3987,7 @@ rxvt_term::process_xterm_seq (int op, const char *str, char resp)
 #if !ENABLE_MINIMAL
       case URxvt_locale:
         if (query)
-          tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
+          tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
         else
           {
             set_locale (str);
@@ -4138,7 +4138,7 @@ rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs,
 #endif
           case 1048:           /* alternative cursor save */
           case 1049:
-            if (OPTION (Opt_secondaryScreen))
+            if (option (Opt_secondaryScreen))
               if (mode == 0)
                 scr_cursor (RESTORE);
               else if (mode == 1)
@@ -4213,14 +4213,14 @@ rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs,
               set_option (Opt_scrollTtyKeypress, state);
               break;
             case 1047:         /* secondary screen w/ clearing last */
-              if (OPTION (Opt_secondaryScreen))
+              if (option (Opt_secondaryScreen))
                 if (current_screen != PRIMARY)
                   scr_erase_screen (2);
               scr_change_screen (state);
               break;
             case 1049:         /* secondary screen w/ clearing first */
               scr_change_screen (state);
-              if (OPTION (Opt_secondaryScreen))
+              if (option (Opt_secondaryScreen))
                 if (current_screen != PRIMARY)
                   scr_erase_screen (2);
               break;

diff --git a/src/init.C b/src/init.C
index 2ec15d1..d619d79 100644 (file)
--- a/src/init.C
+++ b/src/init.C
@@ -213,13 +213,13 @@ rxvt_term::init_vars ()
 
   last_bot = last_state = -1;
 
-  set_option (Opt_scrollBar, 1);
-  set_option (Opt_scrollTtyOutput, 1);
-  set_option (Opt_jumpScroll, 1);
-  set_option (Opt_secondaryScreen, 1);
-  set_option (Opt_secondaryScroll, 1);
-  set_option (Opt_pastableTabs, 1);
-  set_option (Opt_intensityStyles, 1);
+  set_option (Opt_scrollBar);
+  set_option (Opt_scrollTtyOutput);
+  set_option (Opt_jumpScroll);
+  set_option (Opt_secondaryScreen);
+  set_option (Opt_secondaryScroll);
+  set_option (Opt_pastableTabs);
+  set_option (Opt_intensityStyles);
 
   return true;
 }
@@ -430,7 +430,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
 
 #ifdef XTERM_REVERSE_VIDEO
   /* this is how xterm implements reverseVideo */
-  if (OPTION (Opt_reverseVideo))
+  if (option (Opt_reverseVideo))
     {
       if (!rs[Rs_color + Color_fg])
         rs[Rs_color + Color_fg] = def_colorName[Color_bg];
@@ -446,7 +446,7 @@ rxvt_term::init_resources (int argc, const char *const *argv)
 
 #ifndef XTERM_REVERSE_VIDEO
   /* this is how we implement reverseVideo */
-  if (OPTION (Opt_reverseVideo))
+  if (option (Opt_reverseVideo))
     ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
 #endif
 
@@ -630,16 +630,16 @@ rxvt_term::init_command (const char *const *argv)
    */
 
 #ifdef META8_OPTION
-  meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
+  meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
 #endif
 
   get_ourmods ();
 
-  if (!OPTION (Opt_scrollTtyOutput))
+  if (!option (Opt_scrollTtyOutput))
     priv_modes |= PrivMode_TtyOutputInh;
-  if (OPTION (Opt_scrollTtyKeypress))
+  if (option (Opt_scrollTtyKeypress))
     priv_modes |= PrivMode_Keypress;
-  if (!OPTION (Opt_jumpScroll))
+  if (!option (Opt_jumpScroll))
     priv_modes |= PrivMode_smoothScroll;
 
 #ifndef NO_BACKSPACE_KEY
@@ -679,7 +679,7 @@ rxvt_term::Get_Colours ()
       if (!set_color (xcol, name))
         {
 #ifndef XTERM_REVERSE_VIDEO
-          if (i < 2 && OPTION (Opt_reverseVideo))
+          if (i < 2 && option (Opt_reverseVideo))
             name = def_colorName [1 - i];
           else
 #endif
@@ -896,10 +896,10 @@ rxvt_term::create_windows (int argc, const char *const *argv)
 
   parent = display->root;
 
-  attributes.override_redirect = !!OPTION (Opt_override_redirect);
+  attributes.override_redirect = !!option (Opt_override_redirect);
 
 #if ENABLE_FRILLS
-  if (OPTION (Opt_borderLess))
+  if (option (Opt_borderLess))
     {
       if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
         {
@@ -959,7 +959,7 @@ rxvt_term::create_windows (int argc, const char *const *argv)
 
   wmHint.flags         = InputHint | StateHint | WindowGroupHint;
   wmHint.input         = True;
-  wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
+  wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
   wmHint.window_group  = top;
 
   XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
@@ -1026,7 +1026,7 @@ rxvt_term::create_windows (int argc, const char *const *argv)
 
   vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
 
-  if (OPTION (Opt_pointerBlank))
+  if (option (Opt_pointerBlank))
     vt_emask |= PointerMotionMask;
   else
     vt_emask |= Button1MotionMask | Button3MotionMask;
@@ -1037,7 +1037,7 @@ rxvt_term::create_windows (int argc, const char *const *argv)
 
 #ifdef XPM_BACKGROUND
   if (rs[Rs_backgroundPixmap] != NULL
-      && !OPTION (Opt_transparent))
+      && !option (Opt_transparent))
     {
       const char *p = rs[Rs_backgroundPixmap];
 
@@ -1331,8 +1331,8 @@ rxvt_term::run_command (const char *const *argv)
         _exit (EXIT_FAILURE);
 
       default:
-        if (!OPTION (Opt_utmpInhibit))
-          pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
+        if (!option (Opt_utmpInhibit))
+          pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
 
         pty->close_tty ();
 
@@ -1355,7 +1355,7 @@ rxvt_term::run_child (const char *const *argv)
 {
   char *login;
 
-  if (OPTION (Opt_console))
+  if (option (Opt_console))
     {     /* be virtual console, fail silently */
 #ifdef TIOCCONS
       unsigned int on = 1;
@@ -1414,7 +1414,7 @@ rxvt_term::run_child (const char *const *argv)
 
       argv0 = (const char *)rxvt_r_basename (shell);
 
-      if (OPTION (Opt_loginShell))
+      if (option (Opt_loginShell))
         {
           login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
 

diff --git a/src/main.C b/src/main.C
index 699c618..b9157ce 100644 (file)
--- a/src/main.C
+++ b/src/main.C
@@ -309,7 +309,7 @@ rxvt_term::child_cb (child_watcher &w, int status)
 
   cmd_pid = 0;
 
-  if (!OPTION (Opt_hold))
+  if (!option (Opt_hold))
     destroy ();
 }
 
@@ -483,7 +483,7 @@ rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 #endif
 
 #ifdef HAVE_SCROLLBARS
-  if (OPTION (Opt_scrollBar))
+  if (option (Opt_scrollBar))
     scrollBar.setIdle ();    /* set existence for size calculations */
 #endif
 
@@ -500,11 +500,11 @@ rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
 #endif
 
 #ifdef HAVE_SCROLLBARS
-  if (OPTION (Opt_scrollBar))
+  if (option (Opt_scrollBar))
     resize_scrollbar ();      /* create and map scrollbar */
 #endif
 #ifdef TRANSPARENT
-  if (OPTION (Opt_transparent))
+  if (option (Opt_transparent))
     {
       XSelectInput (dpy, display->root, PropertyChangeMask);
       check_our_parents ();
@@ -711,7 +711,7 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
       sb_w = scrollbar_TotalWidth ();
       szHint.base_width += sb_w;
 
-      if (!OPTION (Opt_scrollBar_right))
+      if (!option (Opt_scrollBar_right))
         window_vt_x += sb_w;
     }
 
@@ -742,7 +742,7 @@ rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
       szHint.height = szHint.base_height + height;
     }
 
-  if (scrollBar.state && OPTION (Opt_scrollBar_right))
+  if (scrollBar.state && option (Opt_scrollBar_right))
     window_sb_x = szHint.width - sb_w;
 
   if (recalc_x)

diff --git a/src/rxvt.h b/src/rxvt.h
index 0d2a695..f61fe40 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -689,8 +689,6 @@ enum {
 #define Width2Pixel(n)          ((int32_t)(n) * (int32_t)fwidth)
 #define Height2Pixel(n)         ((int32_t)(n) * (int32_t)fheight)
 
-#define OPTION(opt)            option(opt)
-
 // for m >= -n, ensure remainder lies between 0..n-1
 #define MOD(m,n) (((m) + (n)) % (n))
 
@@ -1289,7 +1287,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
 #ifndef NO_BRIGHTCOLOR
     if (r & RS_Bold
 # if ENABLE_STYLES
-        && OPTION (Opt_intensityStyles)
+        && option (Opt_intensityStyles)
 # endif
         && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
@@ -1303,7 +1301,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
 #ifndef NO_BRIGHTCOLOR
     if (r & RS_Blink
 # if ENABLE_STYLES
-        && OPTION (Opt_intensityStyles)
+        && option (Opt_intensityStyles)
 # endif
         && IN_RANGE_INC (base, minCOLOR, minBrightCOLOR))
       base += minBrightCOLOR - minCOLOR;
@@ -1316,7 +1314,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
     return options[opt >> 3] & (1 << (opt & 7));
   }
 
-  void set_option (uint8_t opt, bool set) NOTHROW
+  void set_option (uint8_t opt, bool set = true) NOTHROW
   {
     if (set)
       options[opt >> 3] |= (1 << (opt & 7));

diff --git a/src/screen.C b/src/screen.C
index 77b9935..f392c45 100644 (file)
--- a/src/screen.C
+++ b/src/screen.C
@@ -49,7 +49,7 @@ inline void fill_text (text_t *start, text_t value, int len)
  *             GENERAL SCREEN AND SELECTION UPDATE ROUTINES                  *
  * ------------------------------------------------------------------------- */
 #define ZERO_SCROLLBACK()                                              \
-    if (OPTION (Opt_scrollTtyOutput))                                  \
+    if (option (Opt_scrollTtyOutput))                                  \
         view_start = 0
 #define CLEAR_SELECTION()                                              \
     selection.beg.row = selection.beg.col                              \
@@ -512,7 +512,7 @@ rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
 void
 rxvt_term::scr_swap_screen ()
 {
-  if (!OPTION (Opt_secondaryScreen))
+  if (!option (Opt_secondaryScreen))
     return;
 
   for (int i = prev_nrow; i--; )
@@ -544,7 +544,7 @@ rxvt_term::scr_change_screen (int scrn)
   int i = current_screen; current_screen = scrn; scrn = i;
 
 #if NSCREENS
-  if (OPTION (Opt_secondaryScreen))
+  if (option (Opt_secondaryScreen))
     {
       num_scr = 0;
 
@@ -557,7 +557,7 @@ rxvt_term::scr_change_screen (int scrn)
     }
   else
 #endif
-    if (OPTION (Opt_secondaryScroll))
+    if (option (Opt_secondaryScroll))
       scr_scroll_text (0, prev_nrow - 1, prev_nrow);
 }
 
@@ -626,7 +626,7 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
 
   if (count > 0
       && row1 == 0
-      && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
+      && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
     {
       top_row = max (top_row - count, -saveLines);
 
@@ -686,7 +686,7 @@ rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
         }
 
       // finally move the view window, if desired
-      if (OPTION (Opt_scrollWithBuffer)
+      if (option (Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != -saveLines)
         scr_page (UP, count);
@@ -1073,7 +1073,7 @@ rxvt_term::scr_tab (int count, bool ht) NOTHROW
 
       // store horizontal tab commands as characters inside the text
       // buffer so they can be selected and pasted.
-      if (ht && OPTION (Opt_pastableTabs))
+      if (ht && option (Opt_pastableTabs))
         {
           base_rend = SET_FONT (base_rend, 0);
 
@@ -1654,7 +1654,7 @@ rxvt_term::scr_rvideo_mode (bool on) NOTHROW
       if (bgPixmap.pixmap == None)
 #endif
 #if TRANSPARENT
-        if (!OPTION (Opt_transparent) || am_transparent == 0)
+        if (!option (Opt_transparent) || am_transparent == 0)
 #endif
           XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 
@@ -1888,12 +1888,12 @@ rxvt_term::scr_bell () NOTHROW
 
 # ifndef NO_MAPALERT
 #  ifdef MAPALERT_OPTION
-  if (OPTION (Opt_mapAlert))
+  if (option (Opt_mapAlert))
 #  endif
     XMapWindow (dpy, parent[0]);
 # endif
 
-  if (OPTION (Opt_visualBell))
+  if (option (Opt_visualBell))
     {
       rvideo_bell = true;
       scr_rvideo_mode (rvideo_mode);
@@ -1998,7 +1998,7 @@ rxvt_term::scr_refresh () NOTHROW
   have_bg |= bgPixmap.pixmap != None;
 #endif
 #if TRANSPARENT
-  have_bg |= OPTION (Opt_transparent) && am_transparent;
+  have_bg |= option (Opt_transparent) && am_transparent;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
 
@@ -2053,7 +2053,7 @@ rxvt_term::scr_refresh () NOTHROW
 
         if (showcursor && focus)
           {
-            if (OPTION (Opt_cursorUnderline))
+            if (option (Opt_cursorUnderline))
               *crp ^= RS_Uline;
             else
               {
@@ -2396,7 +2396,7 @@ rxvt_term::scr_refresh () NOTHROW
     {
       if (focus)
         {
-          if (OPTION (Opt_cursorUnderline))
+          if (option (Opt_cursorUnderline))
             *crp ^= RS_Uline;
           else
             {
@@ -3416,7 +3416,7 @@ rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int b
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
-      if (OPTION (Opt_tripleclickwords))
+      if (option (Opt_tripleclickwords))
         {
           selection_delimit_word (UP, &selection.beg, &selection.beg);
 

diff --git a/src/scrollbar-plain.C b/src/scrollbar-plain.C
index 94b0648..dc94249 100644 (file)
--- a/src/scrollbar-plain.C
+++ b/src/scrollbar-plain.C
@@ -43,7 +43,7 @@ rxvt_term::scrollbar_show_plain (int update, int last_top, int last_bot, int scr
       pscrollbarGC = XCreateGC (dpy, scrollBar.win, GCForeground, &gcvalue);
     }
 
-  xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
+  xsb = option (Opt_scrollBar_right) ? 1 : 0;
 
   if (update)
     {

diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C
index 267c4b7..0288540 100644 (file)
--- a/src/scrollbar-rxvt.C
+++ b/src/scrollbar-rxvt.C
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:       scrollbar-rxvt.C
  *----------------------------------------------------------------------*
  *
@@ -187,7 +187,7 @@ rxvt_term::scrollbar_show_rxvt (int update, int last_top, int last_bot, int scro
   {
     int xofs;
 
-    if (OPTION (Opt_scrollBar_right))
+    if (option (Opt_scrollBar_right))
       xofs = 0;
     else
       xofs = sbshadow ? sbwidth : sbwidth - 1;

diff --git a/src/scrollbar-xterm.C b/src/scrollbar-xterm.C
index 917e7d2..3fd2a38 100644 (file)
--- a/src/scrollbar-xterm.C
+++ b/src/scrollbar-xterm.C
@@ -61,7 +61,7 @@ rxvt_term::scrollbar_show_xterm (int update, int last_top, int last_bot, int scr
 
   if (update)
     {
-      xsb = OPTION (Opt_scrollBar_right) ? 1 : 0;
+      xsb = option (Opt_scrollBar_right) ? 1 : 0;
       if (last_top < scrollBar.top)
         XClearArea (dpy, scrollBar.win,
                    sb_shadow + xsb, last_top,

diff --git a/src/scrollbar.C b/src/scrollbar.C
index e8550d1..2daaa48 100644 (file)
--- a/src/scrollbar.C
+++ b/src/scrollbar.C
@@ -1,4 +1,4 @@
-/*--------------------------------*-C-*---------------------------------*
+/*----------------------------------------------------------------------*
  * File:       scrollbar.C
  *----------------------------------------------------------------------*
  *
@@ -230,7 +230,7 @@ rxvt_term::setup_scrollbar (const char *scrollalign, const char *scrollstyle, co
       width = min (i, SB_WIDTH_MAXIMUM);
 
 # ifdef RXVT_SCROLLBAR
-  if (! OPTION (Opt_scrollBar_floating) && style == R_SB_RXVT)
+  if (! option (Opt_scrollBar_floating) && style == R_SB_RXVT)
     sb_shadow = SHADOW_WIDTH;
 # endif
 

diff --git a/src/xpm.C b/src/xpm.C
index 3d17244..36a6b49 100644 (file)
--- a/src/xpm.C
+++ b/src/xpm.C
@@ -178,7 +178,7 @@ rxvt_term::resize_pixmap ()
       pixmap = None;
 
 #ifdef TRANSPARENT
-      if (!OPTION (Opt_transparent) || !am_transparent)
+      if (!option (Opt_transparent) || !am_transparent)
 #endif
         XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);