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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.164 by root, Wed Jun 22 14:33:23 2005 UTC

 #include "rxvt.h"               /* NECESSARY */
 #include <X11/Xmd.h>            /* get the typedef for CARD32 */
 #include <inttypes.h>
-#include <wchar.h>
 #include "salloc.C" // HACK, should be a seperate compile!
 inline void fill_text (text_t *start, text_t value, int len)
 {
       /*
        * first time called so just malloc everything: don't rely on realloc
        * Note: this is still needed so that all the scrollback lines are NULL
        */
       screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
-      buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
+      buf_text    = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
-      drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
+      drawn_text  = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
-      swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
+      swap.text   = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
       screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t));
-      swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
+      swap.tlen   = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
       screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
-      buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
+      buf_rend    = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
-      drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
+      drawn_rend  = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
-      swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
+      swap.rend   = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
       for (p = 0; p < nrow; p++)
         {
           q = p + TermWin.saveLines;
           scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
               scr_scroll_text (0, (int)nrow - 1, -k, 1);
               screen.cur.row += k;
               screen.s_cur.row += k;
               TermWin.nscrolled -= k;
             }
 #ifdef DEBUG_STRICT
           assert (screen.cur.row < TermWin.nrow);
 #else                           /* drive with your eyes closed */
           MIN_IT (screen.cur.row, nrow - 1);
 #endif
           TermWin.ncol =  ncol; // save b/c scr_blank_screen_mem uses this
         }
           selection.op = SELECTION_CLEAR;  /* XXX: too aggressive? */
         }
       else if (j >= row1 && j <= row2)
         {
           /* move selected region too */
-          selection.beg.row -= count;
+          selection.beg.row  -= count;
-          selection.end.row -= count;
+          selection.end.row  -= count;
           selection.mark.row -= count;
         }
     }
   selection_check (0);        /* _after_ TermWin.nscrolled update */
   i = row2 - row1 + 1;
   MIN_IT (count, i);
   if (j > 0)
     {
-      /* A: scroll up */
+      /* scroll up */
-      /* A1: Copy lines that will get clobbered by the rotation */
+      /* Copy lines that will get clobbered by the rotation */
       memcpy (buf_text, screen.text + row1, count * sizeof (text_t *));
       memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *));
-      /* A2: Rotate lines */
+      /* Rotate lines */
       i = row2 - row1 - count + 1;
       memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t));
       memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *));
       memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *));
       j = row2 - count + 1, i = count;
     }
   else /* if (j < 0) */
     {
-      /* B: scroll down */
+      /* scroll down */
-      /* B1: Copy lines that will get clobbered by the rotation */
+      /* Copy lines that will get clobbered by the rotation */
       for (i = 0, j = row2; i < count; i++, j--)
         {
           buf_text[i] = screen.text[j];
           buf_rend[i] = screen.rend[j];
         }
-      /* B2: Rotate lines */
+      /* Rotate lines */
       for (j = row2, i = j - count; i >= row1; i--, j--)
         {
           screen.tlen[j] = screen.tlen[i];
           screen.text[j] = screen.text[i];
           screen.rend[j] = screen.rend[i];
       j = row1, i = count;
       count = -count;
     }
-  /* C: Resurrect lines */
+  /* Resurrect lines */
   memset (screen.tlen + j, 0, i * sizeof (int16_t));
   memcpy (screen.text + j, buf_text, i * sizeof (text_t *));
   memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *));
   if (!spec) /* line length may not equal TermWin.ncol */
     for (; i--; j++)
  */
 #if ENABLE_FRILLS
 void
 rxvt_term::scr_forwardindex ()
 {
-  int             row;
+  int row;
   if (screen.cur.col < TermWin.ncol - 1)
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
   else
     {
       screen.tlen[row + row_offset] = 0;
       scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren);
     }
 }
+#if ENABLE_FRILLS
+void
+rxvt_term::scr_erase_savelines ()
+{
+  want_refresh = 1;
+  ZERO_SCROLLBACK ();
+  TermWin.nscrolled = 0;
+}
+#endif
 /* ------------------------------------------------------------------------- */
 /*
  * Fill the screen with `E's
  * XTERM_SEQ: Screen Alignment Test: ESC # 8
  */
 void
 rxvt_term::scr_E ()
 {
-  int             i, j, k;
+  int i, j, k;
-  rend_t         *r1, fs;
+  rend_t *r1, fs;
   want_refresh = 1;
   ZERO_SCROLLBACK ();
   num_scr_allow = 0;
 rxvt_term::scr_page (enum page_dirn direction, int nlines)
 {
   int n;
   unsigned int oldviewstart;
-#ifdef DEBUG_STRICT
-  assert ((nlines >= 0) && (nlines <= TermWin.nrow));
-#endif
   oldviewstart = TermWin.view_start;
   if (direction == UP)
     {
       n = TermWin.view_start + nlines;
       TermWin.view_start = min (n, TermWin.nscrolled);
     }
   else
     {
       n = TermWin.view_start - nlines;
       TermWin.view_start = max (n, 0);
     }
   return scr_changeview (oldviewstart);
 }
 int
 rxvt_term::scr_changeview (unsigned int oldviewstart)
 /*
  * Refresh the screen
  * drawn_text/drawn_rend contain the screen information before the update.
  * screen.text/screen.rend contain what the screen will change to.
  */
-#define FONT_WIDTH(X, Y)                                                \
-    (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
-#define FONT_RBEAR(X, Y)                                                \
-    (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
-#define FONT_LBEAR(X, Y)                                                \
-    (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
-#define IS_FONT_CHAR(X, Y)                                              \
-    ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
 void
 rxvt_term::scr_refresh (unsigned char refresh_type)
 {
   unsigned char must_clear, /* use draw_string not draw_image_string     */
                 showcursor; /* show the cursor                           */
   refresh_count = 0;
   row_offset = TermWin.saveLines - TermWin.view_start;
 #if XPM_BACKGROUND
-  must_clear |= (bgPixmap.pixmap != None);
+  must_clear |= bgPixmap.pixmap != None;
 #endif
 #if TRANSPARENT
-  must_clear |= ((options & Opt_transparent) && am_transparent);
+  must_clear |= (options & Opt_transparent) && am_transparent;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
   /*
    * B: reverse any characters which are selected
         crp = &screen.rend[screen.cur.row + TermWin.saveLines][col];
         if (showcursor && TermWin.focus)
           {
+            if (options & Opt_cursorUnderline)
+              *crp ^= RS_Uline;
+            else
+              {
-            *crp ^= RS_RVid;
+                *crp ^= RS_RVid;
 #ifndef NO_CURSORCOLOR
-            cc1 = *crp & (RS_fgMask | RS_bgMask);
+                cc1 = *crp & (RS_fgMask | RS_bgMask);
-            if (ISSET_PIXCOLOR (Color_cursor))
+                if (ISSET_PIXCOLOR (Color_cursor))
-              ccol1 = Color_cursor;
+                  ccol1 = Color_cursor;
-            else
+                else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-              ccol1 = GET_FGCOLOR (rstyle);
+                  ccol1 = GET_FGCOLOR (rstyle);
 #else
-              ccol1 = Color_fg;
+                  ccol1 = Color_fg;
 #endif
-            if (ISSET_PIXCOLOR (Color_cursor2))
+                if (ISSET_PIXCOLOR (Color_cursor2))
-              ccol2 = Color_cursor2;
+                  ccol2 = Color_cursor2;
-            else
+                else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-              ccol2 = GET_BGCOLOR (rstyle);
+                  ccol2 = GET_BGCOLOR (rstyle);
 #else
-              ccol2 = Color_bg;
+                  ccol2 = Color_bg;
 #endif
-            *crp = SET_FGCOLOR (*crp, ccol1);
+                *crp = SET_FGCOLOR (*crp, ccol1);
-            *crp = SET_BGCOLOR (*crp, ccol2);
+                *crp = SET_BGCOLOR (*crp, ccol2);
 #endif
+              }
           }
       }
     /* make sure no outline cursor is left around */
     setoldcursor = 0;
    */
   if (showcursor)
     {
       if (TermWin.focus)
         {
+          if (options & Opt_cursorUnderline)
+            *crp ^= RS_Uline;
+          else
+            {
-          *crp ^= RS_RVid;
+              *crp ^= RS_RVid;
 #ifndef NO_CURSORCOLOR
-          *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
+              *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
 #endif
+            }
         }
       else if (oldcursor.row >= 0)
         {
+          int cursorwidth = 1;
+          int col = oldcursor.col;
+          while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR)
+            col--;
+          while (col + cursorwidth < TermWin.ncol
+                 && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR)
+            cursorwidth++;
 #ifndef NO_CURSORCOLOR
           if (ISSET_PIXCOLOR (Color_cursor))
             XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]);
 #endif
-          int cursorwidth = 1;
-          while (oldcursor.col + cursorwidth < TermWin.ncol
-                 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
-            cursorwidth++;
           XDrawRectangle (display->display, drawBuffer, TermWin.gc,
-                          Col2Pixel (oldcursor.col),
+                          Col2Pixel (col),
                           Row2Pixel (oldcursor.row),
                           (unsigned int) (Width2Pixel (cursorwidth) - 1),
                           (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1));
         }
     }
 int
 rxvt_term::selection_request_other (Atom target, int selnum)
 {
   Atom sel;
-#ifdef DEBUG_SELECT
-  char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
-#endif
   selection_type |= selnum;
   if (selnum == Sel_Primary)
     sel = XA_PRIMARY;
       selection_delimit_word (DN, &selection.end, &selection.end);
     }
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
-      if ((options & Opt_tripleclickwords))
+      if (options & Opt_tripleclickwords)
         {
           int end_row;
           selection_delimit_word (UP, &selection.beg, &selection.beg);
           end_row = screen.tlen[selection.mark.row + TermWin.saveLines];
           if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
             selection.mark.col++;
           selection.beg.col = 0;
           selection.end.col = ncol;
+          // select a complete logical line
+          while (selection.beg.row > -TermWin.saveLines
+                 && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1)
+            selection.beg.row--;
+          while (selection.end.row < TermWin.nrow
+                 && screen.tlen[selection.end.row + TermWin.saveLines] == -1)
+            selection.end.row++;
         }
     }
   if (button3 && buttonpress)
     { /* mark may need to be changed */
  */
 void
 rxvt_term::selection_send (const XSelectionRequestEvent &rq)
 {
   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 (display->display, rq.requestor, rq.property, XA_ATOM,
+      XChangeProperty (disp, 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 (display->display, rq.requestor, rq.property, rq.target,
+      XChangeProperty (disp, 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 (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
+      if (XwcTextListToTextProperty (disp, &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 (display->display, rq.requestor, rq.property,
+      XChangeProperty (disp, rq.requestor, rq.property,
                        ct.encoding, 8, PropModeReplace,
                        ct.value, (int)ct.nitems);
       ev.property = rq.property;
       if (freect)
         XFree (ct.value);
     }
-  XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
+  XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
 }
 /* ------------------------------------------------------------------------- *
  *                              MOUSE ROUTINES                               *
  * ------------------------------------------------------------------------- */
   while (*s)
     scr_overlay_set (x++, y, *s++);
 }
 void
+rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s)
+{
+  while (*s)
+    {
+      text_t t = *s++;
+      int width = wcwidth (t);
+      while (width--)
+        {
+          scr_overlay_set (x++, y, t);
+          t = NOCHAR;
+        }
+    }
+}
+void
 rxvt_term::scr_swap_overlay ()
 {
   if (!ov_text)
     return;

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC vs. Revision 1.164 by root, Wed Jun 22 14:33:23 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.153 by root, Fri Jan 14 17:15:26 2005 UTC vs.
Revision 1.164 by root, Wed Jun 22 14:33:23 2005 UTC