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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC vs.
Revision 1.259 by root, Fri Feb 17 14:30:51 2006 UTC

  */
 #define drawBuffer      vt
 #define CLEAR_ROWS(row, num)                                           \
     if (mapped)                                                \
-        XClearArea (xdisp, drawBuffer, 0,                   \
+        XClearArea (dpy, drawBuffer, 0,                   \
                     Row2Pixel (row), (unsigned int)width,      \
                     (unsigned int)Height2Pixel (num), False)
 #define CLEAR_CHARS(x, y, num)                                         \
     if (mapped)                                                \
-        XClearArea (xdisp, drawBuffer, x, y,                \
+        XClearArea (dpy, drawBuffer, x, y,                \
                     (unsigned int)Width2Pixel (num),                   \
                     (unsigned int)Height2Pixel (1), False)
 #define ERASE_ROWS(row, num)                                           \
-    XFillRectangle (xdisp, drawBuffer, gc,          \
+    XFillRectangle (dpy, drawBuffer, gc,          \
                     0, Row2Pixel (row),                                \
                     (unsigned int)width,                       \
                     (unsigned int)Height2Pixel (num))
 /* ------------------------------------------------------------------------- *
       width = ncol;
     }
   l.touch ();
-  efs &= ~RS_baseattrMask;
+  efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
   efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
   text_t *et = l.t + col;
   rend_t *er = l.r + col;
         l.touch ();
       }
       // erase newly scrolled-in lines
       for (int i = count; i--; )
+        {
+          line_t &l = ROW(nrow - 1 - i);
+          // optimize if already cleared, can be significant on slow machines
+          // could be rolled into scr_blank_screen_mem
+          if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
+            {
+              scr_blank_line (l, 0, l.l, rstyle);
+              l.l = 0;
+              l.f = 0;
+            }
+          else
-        scr_blank_screen_mem (ROW(nrow - 1 - i), rstyle);
+            scr_blank_screen_mem (l, rstyle);
+        }
       // 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; )
  * Process DEC Back Index
  * XTERM_SEQ: ESC 6
  * Move cursor left in row.  If we're at the left boundary, shift everything
  * in that row right.  Clear left column.
  */
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
 rxvt_term::scr_backindex () NOTHROW
 {
   if (screen.cur.col > 0)
     scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
  * Process DEC Forward Index
  * XTERM_SEQ: ESC 9
  * Move cursor right in row.  If we're at the right boundary, shift everything
  * in that row left.  Clear right column.
  */
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
 rxvt_term::scr_forwardindex () NOTHROW
 {
   if (screen.cur.col < ncol - 1)
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
     }
   else
     {
       ren = rstyle & (RS_fgMask | RS_bgMask);
       gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
-      XChangeGC (xdisp, gc, GCForeground, &gcvalue);
+      XChangeGC (dpy, gc, GCForeground, &gcvalue);
       ERASE_ROWS (row, num);
       gcvalue.foreground = pix_colors[Color_fg];
-      XChangeGC (xdisp, gc, GCForeground, &gcvalue);
+      XChangeGC (dpy, gc, GCForeground, &gcvalue);
     }
   for (; num--; row++)
     {
       scr_blank_screen_mem (ROW(row), rstyle);
       scr_blank_line (drawn_buf [row], 0, ncol, ren);
     }
 }
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
 rxvt_term::scr_erase_savelines () NOTHROW
 {
   want_refresh = 1;
   ZERO_SCROLLBACK ();
       if (bgPixmap.pixmap == None)
 #endif
 #if TRANSPARENT
         if (!OPTION (Opt_transparent) || am_transparent == 0)
 #endif
-          XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
+          XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
       XGCValues gcvalue;
       gcvalue.foreground = pix_colors[Color_fg];
       gcvalue.background = pix_colors[Color_bg];
-      XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue);
+      XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
       scr_clear ();
       scr_touch (true);
     }
 }
 {
   bool found = false;
   for (int i = 0; i < nrow; i++)
     {
-      int col = 0;
       rend_t *drp = drawn_buf[i].r;
-      for (; col < ncol; col++, drp++)
+      for (int col = 0; col < ncol; col++, drp++)
         if ((*drp & mask) == value)
           {
             found = true;
             *drp = ~value;
           }
 # ifndef NO_MAPALERT
 #  ifdef MAPALERT_OPTION
   if (OPTION (Opt_mapAlert))
 #  endif
-    XMapWindow (xdisp, parent[0]);
+    XMapWindow (dpy, parent[0]);
 # endif
   if (OPTION (Opt_visualBell))
     {
       rvideo_bell = true;
       display->flush ();
       bell_ev.start (NOW + VISUAL_BELL_DURATION);
     }
   else
-    XBell (xdisp, 0);
+    XBell (dpy, 0);
 #endif
 }
 /* ------------------------------------------------------------------------- */
             {
               /* also comes here at end if needed because of >= above */
               if (wlen < len)
                 ::swap (wlen, len);
-              XCopyArea (xdisp, vt, vt,
+              XCopyArea (dpy, vt, vt,
                          gc, 0, Row2Pixel (len + i),
                          (unsigned int)this->width,
                          (unsigned int)Height2Pixel (wlen - len + 1),
                          0, Row2Pixel (len));
               len = -1;
                   && 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];
+                drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
               // 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];
+                drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
 #endif
               bool invert = rend & RS_RVid;
 #ifndef NO_BOLD_UNDERLINE_REVERSE
            * Actually do the drawing of the string here
            */
           rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
           if (back == fore)
-            font->clear_rect (*drawable, xpixel, ypixel,
+            font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
-                              fwidth * count, fheight,
-                              back);
           else if (back == Color_bg)
             {
               if (must_clear)
                 {
                   CLEAR_CHARS (xpixel, ypixel, count);
           if (rend & RS_Uline && font->descent > 1 && fore != back)
             {
 #if ENABLE_FRILLS
               if (ISSET_PIXCOLOR (Color_underline))
-                XSetForeground (xdisp, gc, pix_colors[Color_underline]);
+                XSetForeground (dpy, gc, pix_colors[Color_underline]);
               else
 #endif
-                XSetForeground (xdisp, gc, pix_colors[fore]);
+                XSetForeground (dpy, gc, pix_colors[fore]);
-              XDrawLine (xdisp, drawBuffer, gc,
+              XDrawLine (dpy, 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 (xdisp, gc, pix_colors[Color_cursor]);
+            XSetForeground (dpy, gc, pix_colors[Color_cursor]);
 #endif
-          XDrawRectangle (xdisp, drawBuffer, gc,
+          XDrawRectangle (dpy, 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 (xdisp, parent[0], pix_colors[Color_border]);
+      XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
-      XClearWindow (xdisp, parent[0]);
+      XClearWindow (dpy, parent[0]);
-      XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]);
+      XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
 #if HAVE_SCROLLBARS
       if (scrollBar.win)
         {
-          XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]);
+          XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
           scrollBar.setIdle ();
           scrollbar_show (0);
         }
 #endif
     }
   num_scr_allow = 0;
   want_refresh = 1;
   if (really)
-    XClearWindow (xdisp, vt);
+    XClearWindow (dpy, 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
 {
 {
   if (selection.op
       && current_screen == selection.screen
       && selection.end.row >= view_start)
     {
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         scr_xor_rect (selection.beg.row, selection.beg.col,
                       selection.end.row, selection.end.col,
                       RS_RVid, RS_RVid | RS_Uline);
       else
     }
   unsigned long bytes_after;
   XTextProperty ct;
-  if (XGetWindowProperty (xdisp, win, prop,
+  if (XGetWindowProperty (dpy, 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 (xdisp, win, prop,
+      if (XGetWindowProperty (dpy, 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 (xdisp, win, prop);
+        XDeleteProperty (dpy, win, prop);
       selection_wait = Sel_incr;
       incr_buf_fill = 0;
       incr_ev.start (NOW + 10);
     }
   char **cl;
   int cr;
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
   // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
   // so recode it manually
   if (ct.encoding == xa[XA_UTF8_STRING])
     {
       wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
       paste (s, strlen (s));
       free (s);
     }
   else
 #endif
-  if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0
+  if (XmbTextPropertyToTextList (dpy, &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 (xdisp, sel) != None)
+  if (XGetSelectionOwner (dpy, sel) != None)
     {
-      XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION],
+      XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
                          vt, selection_request_time);
       return 1;
     }
   return 0;
   int end_col;
   for (; row <= selection.end.row; row++, col = 0)
     {
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         {
           col = selection.beg.col;
           end_col = ncol + 1;
         }
         end_col = ROW(row).l;
       col = max (col, 0);
       if (row == selection.end.row
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           || selection.rect
 #endif
           )
         min_it (end_col, selection.end.col);
 #endif
           else
             new_selection_text[ofs++] = *t++;
         }
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       if (selection.rect)
         {
           while (ofs
                  && new_selection_text[ofs - 1] != C0_LF
                  && unicode::is_space (new_selection_text[ofs - 1]))
 bool
 rxvt_term::selection_grab (Time tm) NOTHROW
 {
   selection_time = tm;
-  XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm);
+  XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
-  if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt)
+  if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
     {
       display->set_selection_owner (this);
       return true;
     }
   else
     }
 #if 0
   XTextProperty ct;
-  if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0)
+  if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
     {
       set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
       XFree (ct.value);
     }
 #endif
   if (selection.clicks == 1)
     {
       if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
           && !ROW(selection.beg.row).is_longer ()
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           && !selection.rect
 #endif
          )
         selection.beg.col = ncol;
       if (
           selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
           && !ROW(selection.end.row).is_longer ()
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
           && !selection.rect
 #endif
          )
         selection.end.col = ncol;
     }
             {
               if (!ROW(end_row).is_longer ())
                 {
                   selection.end.row = end_row;
                   selection.end.col = ROW(end_row).l;
+# if !ENABLE_MINIMAL
                   selection_remove_trailing_spaces ();
+# endif
                   break;
                 }
             }
         }
       else
           selection.mark.row = selection.beg.row;
           selection.mark.col = selection.beg.col;
         }
     }
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
   if (selection.rect && selection.beg.col > selection.end.col)
     ::swap (selection.beg.col, selection.end.col);
 #endif
 }
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
 void
 rxvt_term::selection_remove_trailing_spaces () NOTHROW
 {
   int32_t end_col, end_row;
   text_t *stp;
       *target++ = xa[XA_COMPOUND_TEXT];
 #if X_HAVE_UTF8_STRING
       *target++ = xa[XA_UTF8_STRING];
 #endif
-      XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM,
+      XChangeProperty (dpy, 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 (xdisp, rq.requestor, rq.property, rq.target,
+      XChangeProperty (dpy, 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]
         style = enc_string;
       else if (target == xa[XA_TEXT])
         style = enc_text;
       else if (target == xa[XA_COMPOUND_TEXT])
         style = enc_compound_text;
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       else if (target == xa[XA_UTF8_STRING])
         style = enc_utf8;
 #endif
       else
         {
         {
           cl = L"";
           selectlen = 0;
         }
-#if ENABLE_FRILLS
+#if !ENABLE_MINIMAL
       // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
       // so recode it manually
       if (style == enc_utf8)
         {
           freect = 1;
           ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
           ct.nitems = strlen ((char *)ct.value);
         }
       else
 #endif
-      if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
+      if (XwcTextListToTextProperty (dpy, &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 (xdisp, rq.requestor, rq.property,
+      XChangeProperty (dpy, rq.requestor, rq.property,
                        ct.encoding, 8, PropModeReplace,
                        ct.value, (int)ct.nitems);
       ev.property = rq.property;
       if (freect)
         XFree (ct.value);
     }
-  XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev);
+  XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
 }
 /* ------------------------------------------------------------------------- *
  *                              MOUSE ROUTINES                               *
  * ------------------------------------------------------------------------- */
 void
 rxvt_term::im_set_position (XPoint &pos) NOTHROW
 {
   XWindowAttributes xwa;
-  XGetWindowAttributes (xdisp, vt, &xwa);
+  XGetWindowAttributes (dpy, vt, &xwa);
   pos.x = xwa.x + Col2Pixel    (screen.cur.col);
   pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
 }
 #endif

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC vs. Revision 1.259 by root, Fri Feb 17 14:30:51 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.253 by root, Fri Jan 27 18:36:43 2006 UTC vs.
Revision 1.259 by root, Fri Feb 17 14:30:51 2006 UTC