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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.248 by root, Sun Jan 22 20:58:33 2006 UTC vs.
Revision 1.251 by root, Wed Jan 25 21:03:04 2006 UTC

       // some utf-8 decoders "decode" surrogate characters: let's fix this.
       if (IN_RANGE_INC (c, 0xd800, 0xdfff))
         c = 0xfffd;
-      // rely on wcwidth to tell us the character width, at least for non-latin1
+      // rely on wcwidth to tell us the character width, do wcwidth before
-      // do wcwidth before further replacements, as wcwidth might return -1
+      // further replacements, as wcwidth might return -1 for the line
-      // for the line drawing characters below as they might be invalid in the current
+      // drawing characters below as they might be invalid in the current
       // locale.
-      int width = c < 0x100 ? 1 : wcwidth (c);
+      int width = WCWIDTH (c);
       if (charsets [screen.charset] == '0') // DEC SPECIAL
         {
           // vt100 special graphics and line drawing
           // 5f-7e standard vt100
           // only do special processing if any attributes are set, which is unlikely
           if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
             {
 #if ENABLE_STYLES
-              // force redraw after "careful" characters to avoid pixel droppings
+              // "careful" (too wide) character handling
-              if (srp[col] & RS_Careful && col < ncol - 1 && 0)
-                drp[col + 1] = ~srp[col + 1];
               // include previous careful character(s) if possible, looks nicer (best effort...)
               while (text > stp
                   && srp[text - stp - 1] & RS_Careful
                   && RS_SAME (rend, srp[text - stp - 1]))
                 text--, count++, xpixel -= fwidth;
+              // force redraw after "careful" characters to avoid pixel droppings
+              for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
+                drp[col + i + 1] = ~srp[col + i + 1];
+              // force redraw before "careful" characters to avoid pixel droppings
+              for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
+                drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
 #endif
               bool invert = rend & RS_RVid;
 #ifndef NO_BOLD_UNDERLINE_REVERSE
  */
 void
 rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
 {
   XSelectionEvent ev;
-  dDisp;
   ev.type = SelectionNotify;
   ev.property = None;
   ev.display = rq.display;
   ev.requestor = rq.requestor;
       *target++ = xa[XA_COMPOUND_TEXT];
 #if X_HAVE_UTF8_STRING
       *target++ = xa[XA_UTF8_STRING];
 #endif
-      XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM,
+      XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
                        32, PropModeReplace,
                        (unsigned char *)target_list, target - target_list);
       ev.property = rq.property;
     }
 #if TODO // TODO
       /* TODO: Handle MULTIPLE */
     }
 #endif
   else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
     {
-      XChangeProperty (disp, rq.requestor, rq.property, rq.target,
+      XChangeProperty (xdisp, rq.requestor, rq.property, rq.target,
                        32, PropModeReplace, (unsigned char *)&selection_time, 1);
       ev.property = rq.property;
     }
   else if (rq.target == XA_STRING
            || rq.target == xa[XA_TEXT]
           ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
           ct.nitems = strlen ((char *)ct.value);
         }
       else
 #endif
-      if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
+      if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
         freect = 1;
       else
         {
           /* if we failed to convert then send it raw */
           ct.value = (unsigned char *)cl;
           ct.nitems = selectlen;
           ct.encoding = target;
         }
-      XChangeProperty (disp, rq.requestor, rq.property,
+      XChangeProperty (xdisp, rq.requestor, rq.property,
                        ct.encoding, 8, PropModeReplace,
                        ct.value, (int)ct.nitems);
       ev.property = rq.property;
       if (freect)
         XFree (ct.value);
     }
-  XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
+  XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
 }
 /* ------------------------------------------------------------------------- *
  *                              MOUSE ROUTINES                               *
  * ------------------------------------------------------------------------- */
 rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
 {
   while (*s)
     {
       text_t t = *s++;
-      int width = wcwidth (t);
+      int width = WCWIDTH (t);
       while (width--)
         {
           scr_overlay_set (x++, y, t);
           t = NOCHAR;

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.248 by root, Sun Jan 22 20:58:33 2006 UTC vs. Revision 1.251 by root, Wed Jan 25 21:03:04 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.248 by root, Sun Jan 22 20:58:33 2006 UTC vs.
Revision 1.251 by root, Wed Jan 25 21:03:04 2006 UTC