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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.429 by root, Wed Nov 5 16:21:18 2008 UTC vs.
Revision 1.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC

 void
 rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
 {
   rxvt_fontset *fs = FONTSET (r);
-  rxvt_font *f = (*fs)[fs->find_font (ch)];
-  wchar_t *chr, *alloc, ch2, *fname;
+  wchar_t *chr, *alloc, ch2, **fname;
   int len;
-  fname = rxvt_utf8towcs (f->name);
 # if ENABLE_COMBINING
   if (IS_COMPOSE (ch))
     {
       len = rxvt_composite.expand (ch, 0);
            r & RS_Blink   ? " blink"   : "",
            r & RS_RVid    ? " rvid"    : "",
            r & RS_Uline   ? " uline"   : "",
            r & RS_Careful ? " careful" : "");
+  int width = 0;
+  fname = rxvt_temp_buf<wchar_t *> (len);
+  for (int i = 0; i < len; i++)
+    {
+      rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
+      fname[i] = rxvt_utf8towcs (f->name);
-  int width = wcswidth (fname, wcslen (fname));
+      max_it (width, wcswidth (fname[i], wcslen (fname[i])));
+    }
   max_it (width, 8+5); // for char + hex
   max_it (width, strlen (attr));
   if (y >= 0)
     {
       y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
       x = 0;
     }
-  scr_overlay_new (x, y, width, len + 2);
+  scr_overlay_new (x, y, width, len * 2 + 1);
   r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
   for (int y = 0; y < len; y++)
     {
 //    char buf[4+4+3+1];
 //    snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
 //    scr_overlay_set (0, 0, buf);
 //  }
   scr_overlay_set (0, len    , attr);
+  for (int i = 0; i < len; i++)
+    {
-  scr_overlay_set (0, len + 1, fname);
+      scr_overlay_set (0, len + 1 + i, fname[i]);
-  free (fname);
+      free (fname[i]);
+    }
 # if ENABLE_COMBINING
   if (alloc)
     delete [] alloc;
 # endif
 }
 static int
 hex_keyval (XKeyEvent &ev)
 {
-  // check wether this event corresponds to a hex digit
+  // check whether this event corresponds to a hex digit
   // if the modifiers had not been pressed.
   for (int index = 0; index < 8; index++)
     {
       KeySym k = XLookupKeysym (&ev, index);
    */
   shft = ev.state & ShiftMask;
   ctrl = ev.state & ControlMask;
   meta = ev.state & ModMetaMask;
-  if (numlock_state || (ev.state & ModNumLockMask))
-    {
-      numlock_state = (ev.state & ModNumLockMask);
-      set_privmode (PrivMode_aplKP, !numlock_state);
-    }
   kbuf[0] = 0;
 #ifdef USE_XIM
   if (Input_Context)
     {
 #ifdef PAGING_CONTEXT_LINES
               lnsppg = nrow - PAGING_CONTEXT_LINES;
 #else
               lnsppg = nrow * 4 / 5;
 #endif
+              max_it (lnsppg, 1);
               if (keysym == XK_Prior)
                 {
                   scr_page (UP, lnsppg);
                   return;
                 }
             }
         }
 #if ENABLE_FRILLS || ISO_14755
       // ISO 14755 support
-      if (shft && ctrl)
+      if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
         {
           int hv;
           if (iso14755buf & ISO_14755_51
               && (keysym == XK_space || keysym == XK_KP_Space
               scr_overlay_off ();
 # endif
               iso14755buf = 0;
             }
         }
+      else if (option (Opt_iso14755) &&
-      else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
+               ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
-               || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
+                || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))))
         if (!(iso14755buf & ISO_14755_STARTED))
           {
             iso14755buf |= ISO_14755_STARTED;
 # if ISO_14755
             scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
       if (keysym >= 0xFF00 && keysym <= 0xFFFF)
         {
           bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
           unsigned int newlen = 1;
+          if (ev.state & ModNumLockMask)
+            kp = false;
-          switch (translate_keypad (keysym, kp))
+          keysym = translate_keypad (keysym, kp);
+          switch (keysym)
             {
 #ifndef NO_BACKSPACE_KEY
               case XK_BackSpace:
                 if (priv_modes & PrivMode_HaveBackSpace)
                   {
               default:
                 {
                   int param = map_function_key (keysym);
                   if (param > 0)
+                    {
-                    sprintf (kbuf,"\033[%d~", param);
+                      int n = sprintf (kbuf,"\033[%d~", param);
+                      /*
+                       * pass Shift/Control indicators for function keys ending with `~'
+                       *
+                       * eg,
+                       *   Prior = "ESC[5~"
+                       *   Shift+Prior = "ESC[5$"
+                       *   Ctrl+Prior = "ESC[5^"
+                       *   Ctrl+Shift+Prior = "ESC[5@"
+                       */
+                      kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
+                    }
                   else
                     newlen = 0;
                 }
                 break;
             }
         view_start = 0;
         want_refresh = 1;
       }
   /*
-   * these modifications only affect the static keybuffer
-   * pass Shift/Control indicators for function keys ending with `~'
-   *
-   * eg,
-   *   Prior = "ESC[5~"
-   *   Shift+Prior = "ESC[5$"
-   *   Ctrl+Prior = "ESC[5^"
-   *   Ctrl+Shift+Prior = "ESC[5@"
    * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
    */
-  if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
-    kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
   /* escape prefix */
   if (meta
 #ifdef META8_OPTION
       && meta_char == C0_ESC
     }
   display->flush ();
 }
-/* checks wether a refresh is requested and starts the refresh timer */
+/* checks whether a refresh is requested and starts the refresh timer */
 void
 rxvt_term::refresh_check ()
 {
   if (want_refresh && !flush_ev.is_active ())
     flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
     // this should really be sched_yield(), but the linux guys thought
     // that giving a process calling sched_yield () less cpu time than
     // ones with high nice levels is a useful thing to do. It surely is is
     // allowed by the sus... as is returning ENOSYS.
     // since the linux guys additionally thought that breaking the only
-    // known workaroudn against their unusable sched_yield hack is cool,
+    // known workaround against their unusable sched_yield hack is cool,
     // we just nanosleep a bit and hope for the best.
     struct timespec ts = { 0, 1000 };
     nanosleep (&ts, 0);
             selection_property (ev.xproperty.window, ev.xproperty.atom);
         break;
       case SelectionClear:
-        selection_clear ();
+        selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
         break;
       case SelectionNotify:
         if (selection_wait == Sel_normal)
           selection_paste (ev.xselection.requestor, ev.xselection.property, true);
         selection_send (ev.xselectionrequest);
         break;
       case MapNotify:
 #ifdef HAVE_BG_PIXMAP
-        /* This is needed spcifically to fix the case of no window manager or a
+        /* This is needed specifically to fix the case of no window manager or a
          * non-reparenting window manager. In those cases we never get first
          * ConfigureNotify. Also that speeds startup under normal WM, by taking
-         * care of multiplicity of ConfigureNotify events arriwing while WM does
+         * care of multiplicity of ConfigureNotify events arriving while WM does
          * reparenting.
-         * We should not render background immidiately, as there could be several
+         * We should not render background immediately, as there could be several
          * ConfigureNotify's to follow. Lets take care of all of them in one scoop
          * by scheduling background redraw as soon as we can, but giving a short
          * bit of time for ConfigureNotifies to arrive.
          * We should render background PRIOR to drawing any text, but AFTER all
          * of ConfigureNotifys for the best results.
 #endif
   refresh_check ();
 }
+#if ENABLE_FRILLS
 void
 rxvt_term::set_urgency (bool enable)
 {
   if (enable == urgency_hint)
     return;
       h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
       XSetWMHints (dpy, parent[0], h);
       urgency_hint = enable;
     }
 }
+#endif
 void
 rxvt_term::focus_in ()
 {
   if (!focus)
           /* save the xbutton state (for ButtonRelease) */
           MEvent.state = ev.state;
 #ifdef MOUSE_REPORT_DOUBLECLICK
           if (ev.button == MEvent.button && clickintime)
             {
-              /* same button, within alloted time */
+              /* same button, within allowed time */
               MEvent.clicks++;
               if (MEvent.clicks > 1)
                 {
                   /* only report double clicks */
             selection_make (ev.time);
             break;
           case Button2:
             if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
-	      selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
+              selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
             break;
 #ifdef MOUSE_WHEEL
           case Button4:
           case Button5:
           break;
         }
       if (len == (size_t)-1)
         {
-          mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
+          mbstate.reset (); // reset now undefined conversion state
           return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
         }
       // assume wchar == unicode
       cmdbuf_ptr += len;
  * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
  */
 void
 rxvt_term::process_dcs_seq ()
 {
-  char *s;
-  unicode_t eh;
   /*
    * Not handled yet
    */
+  unicode_t eh;
-  s = get_to_st (eh);
+  char *s = get_to_st (eh);
   if (s)
     free (s);
   return;
 }
  * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
  */
 void
 rxvt_term::process_osc_seq ()
 {
-  unicode_t ch, eh;
   int arg;
-  ch = cmd_getc ();
+  unicode_t ch = cmd_getc ();
   for (arg = 0; isdigit (ch); ch = cmd_getc ())
     arg = arg * 10 + (ch - '0');
   if (ch == ';')
     {
+      unicode_t eh;
       char *s = get_to_st (eh);
       if (s)
         {
           process_xterm_seq (arg, s, eh);
 /*
  * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
  */
 void
-rxvt_term::process_xterm_seq (int op, const char *str, char resp)
+rxvt_term::process_xterm_seq (int op, char *str, char resp)
 {
   int color;
   char *buf, *name;
   bool query = str[0] == '?' && !str[1];
   int saveop = op;
             XFree (value);
           }
         else
           {
-            char *eq = strchr (str, '='); // constness lost, but verified to be ok
+            char *eq = strchr (str, '=');
             if (eq)
               {
                 *eq = 0;
                 set_utf8_property (display->atom (str), eq + 1);
         process_color_seq (op, Color_pointer_fg, str, resp);
         break;
       case XTerm_Color_pointer_bg:
         process_color_seq (op, Color_pointer_bg, str, resp);
         break;
+#ifdef OPTION_HC
+      case XTerm_Color_HC:
+        process_color_seq (op, Color_HC, str, resp);
+        break;
+      case XTerm_Color_HTC:
+        process_color_seq (op, Color_HTC, str, resp);
+        break;
+#endif
 #ifndef NO_BOLD_UNDERLINE_REVERSE
-      case XTerm_Color_RV:
-        process_color_seq (op, Color_RV, str, resp);
-        break;
-      case Rxvt_Color_BD:
       case URxvt_Color_BD:
         process_color_seq (op, Color_BD, str, resp);
         break;
-      case Rxvt_Color_UL:
       case URxvt_Color_UL:
         process_color_seq (op, Color_UL, str, resp);
         break;
       case URxvt_Color_IT:
         process_color_seq (op, Color_IT, str, resp);
       case Rxvt_Pixmap:
         if (!strcmp (str, "?"))
           {
             char str[256];
-            sprintf (str, "[%dx%d+%d+%d]",	/* can't presume snprintf () ! */
+            sprintf (str, "[%dx%d+%d+%d]",
                      min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
                      min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
             process_xterm_seq (XTerm_title, str, CHAR_ST);
           }
         else
     {
       if (mode == 'r')
         state = (SavedModes & bit) ? 1 : 0;	/* no overlapping */
       else
         state = (mode == 't') ? ! (priv_modes & bit) : mode;
       set_privmode (bit, state);
     }
   return state;
 }
                   { 6, PrivMode_relOrigin },    // DECOM
                   { 7, PrivMode_Autowrap },     // DECAWM
                  // 8, auto-repeat keys         // DECARM
                   { 9, PrivMode_MouseX10 },
                  // 18 end FF to printer after print screen
-                 // 19 Print screen prints full screen/scorll region
+                 // 19 Print screen prints full screen/scroll region
                   { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis
 #ifdef scrollBar_esc
                   { scrollBar_esc, PrivMode_scrollBar },
 #endif
                   { 35, PrivMode_ShiftKeys },   // rxvt extension

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.429 by root, Wed Nov 5 16:21:18 2008 UTC vs. Revision 1.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.429 by root, Wed Nov 5 16:21:18 2008 UTC vs.
Revision 1.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC