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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.434 by sf-exg, Wed Jan 6 10:29:14 2010 UTC vs.
Revision 1.444 by sf-exg, Thu Apr 1 08:40:33 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);
 #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;
                 }
               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);
     }
   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);
       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

Diff Legend

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

Comparing rxvt-unicode/src/command.C (file contents): Revision 1.434 by sf-exg, Wed Jan 6 10:29:14 2010 UTC vs. Revision 1.444 by sf-exg, Thu Apr 1 08:40:33 2010 UTC

Diff Legend

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.434 by sf-exg, Wed Jan 6 10:29:14 2010 UTC vs.
Revision 1.444 by sf-exg, Thu Apr 1 08:40:33 2010 UTC