[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.411 by ayin, Sat Feb 16 16:07:29 2008 UTC vs.
Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC

   meta = ev.state & ModMetaMask;
   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;
 #ifdef USE_XIM
             }
           while (row < end_row);
         }
       scr_refresh ();
-      scrollbar_show (1);
+      scrollBar.show (1);
 #ifdef USE_XIM
       IMSendSpot ();
 #endif
     }
               ;
             if (scrollBar.state && ev.xany.window == scrollBar.win)
               {
                 scrollBar.state = STATE_IDLE;
-                scrollbar_show (0);
+                scrollBar.show (0);
               }
           }
         break;
       case MotionNotify:
                           &unused_root, &unused_child,
                           &unused_root_x, &unused_root_y,
                           &ev.xbutton.x, &ev.xbutton.y,
                           &unused_mask);
             scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
-                         scrollbar_size ());
+                         scrollBar.size ());
             want_refresh = 1;
-            scrollbar_show (1);
+            scrollBar.show (1);
           }
         break;
     }
 #if defined(CURSOR_BLINK)
                     }
                   if (scrollBar.style == R_SB_XTERM
                       || scrollbar_above_slider (ev.y)
                       || scrollbar_below_slider (ev.y))
-                    scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
+                    scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
                   scrollBar.state = STATE_MOTION;
                   break;
                 case Button1:
                   else
                     {
                       scr_page ((ev.button == Button1 ? DN : UP),
                                 (nrow
                                  * scrollbar_position (ev.y)
-                                 / scrollbar_size ()));
+                                 / scrollBar.size ()));
                     }
                   break;
               }
         }
     reportmode = !! (priv_modes & PrivMode_mouse_report);
   if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
     {
       scrollBar.state = STATE_IDLE;
-      scrollbar_show (0);
+      scrollBar.show (0);
     }
 #ifdef SELECTION_SCROLLING
   sel_scroll_ev.stop();
 #endif
                 }
               else
 # endif
                 {
                   scr_page (v, i);
-                  scrollbar_show (1);
+                  scrollBar.show (1);
                 }
             }
             break;
 #endif
         }
           cmdbuf_ptr = cmdbuf_endp;
           break;
         }
       if (len == (size_t)-1)
+        {
+          mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
-        return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
+          return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
+        }
       // assume wchar == unicode
       cmdbuf_ptr += len;
       return wc & UNICODE_MASK;
     }
         break;
       case 'Z':		/* identify the terminal type */
         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 */
         /* unimplemented */
         break;
         scr_forwardindex ();
         break;
 #endif
       case '=':
       case '>':
-        PrivMode ((ch == '='), PrivMode_aplKP);
+        set_privmode (PrivMode_aplKP, ch == '=');
         break;
       case C1_40:
         cmd_getc ();
         break;
         /* 8.3.106: RESET TO INITIAL STATE */
       case 'c':
         mbstate.reset ();
         scr_poweron ();
-        scrollbar_show (1);
+        scrollBar.show (1);
         break;
         /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
       case 'n':
         scr_charset_choose (2);
     {
       if (mode == 'r')
         state = (SavedModes & bit) ? 1 : 0;	/* no overlapping */
       else
         state = (mode == 't') ? ! (priv_modes & bit) : mode;
-      PrivMode (state, bit);
+      set_privmode (bit, state);
     }
   return state;
 }
             case 2:			/* VT52 mode */
               /* oddball mode.  should be set regardless of set/reset
                * 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)
                 {
                   scr_poweron ();
               if (state)		/* orthogonal */
                 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
               break;
 #ifdef scrollBar_esc
             case scrollBar_esc:
-              if (scrollbar_mapping (state))
+              if (scrollBar.map (state))
                 {
                   resize_all_windows (0, 0, 0);
                   scr_touch (true);
                 }
               break;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.411 by ayin, Sat Feb 16 16:07:29 2008 UTC vs. Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.411 by ayin, Sat Feb 16 16:07:29 2008 UTC vs.
Revision 1.415 by root, Sat Apr 26 03:37:18 2008 UTC