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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

  */
 #define drawBuffer      vt
 #define CLEAR_ROWS(row, num)                                           \
     if (mapped)                                                \
-        XClearArea (display->display, drawBuffer, 0,                   \
+        XClearArea (xdisp, drawBuffer, 0,                   \
                     Row2Pixel (row), (unsigned int)width,      \
                     (unsigned int)Height2Pixel (num), False)
 #define CLEAR_CHARS(x, y, num)                                         \
     if (mapped)                                                \
-        XClearArea (display->display, drawBuffer, x, y,                \
+        XClearArea (xdisp, drawBuffer, x, y,                \
                     (unsigned int)Width2Pixel (num),                   \
                     (unsigned int)Height2Pixel (1), False)
 #define ERASE_ROWS(row, num)                                           \
-    XFillRectangle (display->display, drawBuffer, gc,          \
+    XFillRectangle (xdisp, drawBuffer, gc,          \
                     0, Row2Pixel (row),                                \
                     (unsigned int)width,                       \
                     (unsigned int)Height2Pixel (num))
 /* ------------------------------------------------------------------------- *
         l.touch ();
       }
       // erase newly scrolled-in lines
       for (int i = count; i--; )
-        {
+        scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);
-          // basically this is a slightly optimized scr_blank_screen_mem
-          // it is worth the effort on slower machines
-          line_t &l = ROW(nrow - 1 - i);
-          scr_blank_line (l, 0, l.l, rstyle);
-          l.l = 0;
-          l.f = 0;
-        }
       // now copy lines below the scroll region bottom to the
       // bottom of the screen again, so they look as if they
       // hadn't moved.
       for (int i = nrow; --i > row2; )
   ZERO_SCROLLBACK ();
   if (minlines > 0)
     {
       minlines += screen.cur.row - screen.bscroll;
+      min_it (minlines, screen.cur.row - top_row);
       if (minlines > 0
           && screen.tscroll == 0
           && screen.bscroll == nrow - 1)
         {
       // 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
     }
   else
     {
       ren = rstyle & (RS_fgMask | RS_bgMask);
       gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
-      XChangeGC (display->display, gc, GCForeground, &gcvalue);
+      XChangeGC (xdisp, gc, GCForeground, &gcvalue);
       ERASE_ROWS (row, num);
       gcvalue.foreground = pix_colors[Color_fg];
-      XChangeGC (display->display, gc, GCForeground, &gcvalue);
+      XChangeGC (xdisp, gc, GCForeground, &gcvalue);
     }
   for (; num--; row++)
     {
       scr_blank_screen_mem (ROW(row), rstyle);
       if (bgPixmap.pixmap == None)
 #endif
 #if TRANSPARENT
         if (!OPTION (Opt_transparent) || am_transparent == 0)
 #endif
-          XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
+          XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
       XGCValues gcvalue;
       gcvalue.foreground = pix_colors[Color_fg];
       gcvalue.background = pix_colors[Color_bg];
-      XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
+      XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
       scr_clear ();
       scr_touch (true);
     }
 }
 # ifndef NO_MAPALERT
 #  ifdef MAPALERT_OPTION
   if (OPTION (Opt_mapAlert))
 #  endif
-    XMapWindow (display->display, parent[0]);
+    XMapWindow (xdisp, parent[0]);
 # endif
   if (OPTION (Opt_visualBell))
     {
       rvideo_bell = true;
       display->flush ();
       bell_ev.start (NOW + VISUAL_BELL_DURATION);
     }
   else
-    XBell (display->display, 0);
+    XBell (xdisp, 0);
 #endif
 }
 /* ------------------------------------------------------------------------- */
             {
               /* also comes here at end if needed because of >= above */
               if (wlen < len)
                 ::swap (wlen, len);
-              XCopyArea (display->display, vt, vt,
+              XCopyArea (xdisp, vt, vt,
                          gc, 0, Row2Pixel (len + i),
                          (unsigned int)this->width,
                          (unsigned int)Height2Pixel (wlen - len + 1),
                          0, Row2Pixel (len));
               len = -1;
           // 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
           if (rend & RS_Uline && font->descent > 1 && fore != back)
             {
 #if ENABLE_FRILLS
               if (ISSET_PIXCOLOR (Color_underline))
-                XSetForeground (display->display, gc, pix_colors[Color_underline]);
+                XSetForeground (xdisp, gc, pix_colors[Color_underline]);
               else
 #endif
-                XSetForeground (display->display, gc, pix_colors[fore]);
+                XSetForeground (xdisp, gc, pix_colors[fore]);
-              XDrawLine (display->display, drawBuffer, gc,
+              XDrawLine (xdisp, drawBuffer, gc,
                          xpixel, ypixel + font->ascent + 1,
                          xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
             }
         }                     /* for (col....) */
     }                         /* for (row....) */
                  && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
             cursorwidth++;
 #ifndef NO_CURSORCOLOR
           if (ISSET_PIXCOLOR (Color_cursor))
-            XSetForeground (display->display, gc, pix_colors[Color_cursor]);
+            XSetForeground (xdisp, gc, pix_colors[Color_cursor]);
 #endif
-          XDrawRectangle (display->display, drawBuffer, gc,
+          XDrawRectangle (xdisp, drawBuffer, gc,
                           Col2Pixel (col),
                           Row2Pixel (oldcursor.row),
                           (unsigned int) (Width2Pixel (cursorwidth) - 1),
                           (unsigned int) (Height2Pixel (1) - lineSpace - 1));
         }
 #if XPM_BACKGROUND
       && !bgPixmap.pixmap
 #endif
       )
     {
-      XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]);
+      XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]);
-      XClearWindow (display->display, parent[0]);
+      XClearWindow (xdisp, parent[0]);
-      XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
+      XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
 #if HAVE_SCROLLBARS
       if (scrollBar.win)
         {
-          XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]);
+          XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
           scrollBar.setIdle ();
           scrollbar_show (0);
         }
 #endif
     }
   num_scr_allow = 0;
   want_refresh = 1;
   if (really)
-    XClearWindow (display->display, vt);
+    XClearWindow (xdisp, vt);
 }
 void
 rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
 {
     }
   unsigned long bytes_after;
   XTextProperty ct;
-  if (XGetWindowProperty (display->display, win, prop,
+  if (XGetWindowProperty (xdisp, win, prop,
                           0, PROP_SIZE / 4,
                           delete_prop, AnyPropertyType,
                           &ct.encoding, &ct.format,
                           &ct.nitems, &bytes_after,
                           &ct.value) != Success)
   if (bytes_after)
     {
       // fetch and append remaining data
       XTextProperty ct2;
-      if (XGetWindowProperty (display->display, win, prop,
+      if (XGetWindowProperty (xdisp, win, prop,
                               ct.nitems / 4, (bytes_after + 3) / 4,
                               delete_prop, AnyPropertyType,
                               &ct2.encoding, &ct2.format,
                               &ct2.nitems, &bytes_after,
                               &ct2.value) != Success)
   if (ct.encoding == xa[XA_INCR])
     {
       // INCR selection, start handshake
       if (!delete_prop)
-        XDeleteProperty (display->display, win, prop);
+        XDeleteProperty (xdisp, win, prop);
       selection_wait = Sel_incr;
       incr_buf_fill = 0;
       incr_ev.start (NOW + 10);
       paste (s, strlen (s));
       free (s);
     }
   else
 #endif
-  if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
+  if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
       && cl)
     {
       for (int i = 0; i < cr; i++)
         paste (cl[i], strlen (cl[i]));
   else if (selnum == Sel_Secondary)
     sel = XA_SECONDARY;
   else
     sel = xa[XA_CLIPBOARD];
-  if (XGetSelectionOwner (display->display, sel) != None)
+  if (XGetSelectionOwner (xdisp, sel) != None)
     {
-      XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
+      XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
                          vt, selection_request_time);
       return 1;
     }
   return 0;
 bool
 rxvt_term::selection_grab (Time tm) NOTHROW
 {
   selection_time = tm;
-  XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
+  XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
-  if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
+  if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
     {
       display->set_selection_owner (this);
       return true;
     }
   else
     }
 #if 0
   XTextProperty ct;
-  if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
+  if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
     {
       set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
       XFree (ct.value);
     }
 #endif
  */
 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                               *
  * ------------------------------------------------------------------------- */
 void
 rxvt_term::im_set_position (XPoint &pos) NOTHROW
 {
   XWindowAttributes xwa;
-  XGetWindowAttributes (display->display, vt, &xwa);
+  XGetWindowAttributes (xdisp, vt, &xwa);
   pos.x = xwa.x + Col2Pixel    (screen.cur.col);
   pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
 }
 #endif
 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.247 by root, Sun Jan 22 20:39:47 2006 UTC vs. Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC