Rename PrivMode to set_privmode and switch arguments order.

diff --git a/src/command.C b/src/command.C
index bd847d8304b9d1238f351abc6c3b2a3cbfbad7d3..58e5acf88a023d4b9d7f301fc934a36ac1d0357f 100644 (file)
--- a/src/command.C
+++ b/src/command.C
@@ -421,7 +421,7 @@ rxvt_term::key_press (XKeyEvent &ev)
   if (numlock_state || (ev.state & ModNumLockMask))
     {
       numlock_state = (ev.state & ModNumLockMask);
-      PrivMode ((!numlock_state), PrivMode_aplKP);
+      set_privmode (PrivMode_aplKP, !numlock_state);
     }
 
   kbuf[0] = 0;
@@ -2566,7 +2566,7 @@ rxvt_term::process_escape_vt52 (unicode_t ch)
         tt_printf ("\033/Z");  /* I am a VT100 emulating a VT52 */
         break;
       case '<':                /* turn off VT52 mode */
-        PrivMode (0, PrivMode_vt52);
+        set_privmode (PrivMode_vt52, 0);
         break;
       case 'F':        /* use special graphics character set */
       case 'G':           /* use regular character set */
@@ -2630,7 +2630,7 @@ rxvt_term::process_escape_seq ()
 #endif
       case '=':
       case '>':
-        PrivMode ((ch == '='), PrivMode_aplKP);
+        set_privmode (PrivMode_aplKP, ch == '=');
         break;
 
       case C1_40:
@@ -3543,7 +3543,7 @@ rxvt_term::privcases (int mode, unsigned long bit)
         state = (SavedModes & bit) ? 1 : 0;    /* no overlapping */
       else
         state = (mode == 't') ? ! (priv_modes & bit) : mode;
-      PrivMode (state, bit);
+      set_privmode (bit, state);
     }
 
   return state;
@@ -3651,7 +3651,7 @@ rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs,
                * parameter.  Return from VT52 mode with an ESC < from
                * within VT52 mode
                */
-              PrivMode (1, PrivMode_vt52);
+              set_privmode (PrivMode_vt52, 1);
               break;
             case 3:                    /* 80/132 */
               if (priv_modes & PrivMode_132OK)

diff --git a/src/rxvt.h b/src/rxvt.h
index 13a8b0cb6eca80620616604f703d5abcc0d3712e..65d434146eda91492b5927168c07550aea4d560f 100644 (file)
--- a/src/rxvt.h
+++ b/src/rxvt.h
@@ -1358,7 +1358,7 @@ struct rxvt_term : zero_initialized, rxvt_vars, rxvt_screen {
       options[opt >> 3] &= ~(1 << (opt & 7));
   }
 
-  void PrivMode (int set, unsigned bit) NOTHROW
+  void set_privmode (unsigned bit, int set) NOTHROW
   {
     if (set)
       priv_modes |= bit;