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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.193 by root, Thu Dec 22 19:39:29 2005 UTC vs.
Revision 1.204 by root, Mon Jan 2 15:35:43 2006 UTC

  * This file handles _all_ screen updates and selections
  */
 #include "../config.h"          /* NECESSARY */
 #include "rxvt.h"               /* NECESSARY */
+#include "rxvtperl.h"           /* NECESSARY */
 #include <X11/Xmd.h>            /* get the typedef for CARD32 */
 #include <inttypes.h>
 /* ------------------------------------------------------------------------- *
  *             GENERAL SCREEN AND SELECTION UPDATE ROUTINES                  *
  * ------------------------------------------------------------------------- */
 #define ZERO_SCROLLBACK()                                              \
-    if (options & Opt_scrollTtyOutput)                                 \
+    if (OPTION (Opt_scrollTtyOutput))                                  \
         view_start = 0
 #define CLEAR_SELECTION()                                              \
     selection.beg.row = selection.beg.col                              \
         = selection.end.row = selection.end.col = 0
 #define CLEAR_ALL_SELECTION()                                          \
                       lofs += len;
                       qcol += len;
                     }
                 }
-              qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1;
+              qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
+#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
+              if (qline->l < 0)
+                {
+                  fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
+                  qline->l = 0;
+                }
+#endif
               scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
             }
           while (p != pend && q > 0);
           term_start = total_rows - nrow;
   for (int col = ncol; col--; )
     tabs [col] = col % TABSIZE == 0;
   tt_winch ();
+  PERL_INVOKE ((this, HOOK_RESET, DT_END));
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Free everything.  That way malloc debugging can find leakage.
   screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
   screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
 #if NSCREENS
-  if (options & Opt_secondaryScreen)
+  if (OPTION (Opt_secondaryScreen))
     {
       num_scr = 0;
       for (int i = prev_nrow; i--; )
         ::swap (ROW(i), swap_buf [i]);
       screen.flags |= Screen_VisibleCursor;
       swap.flags |= Screen_VisibleCursor;
     }
   else
 #endif
-    if (options & Opt_secondaryScroll)
+    if (OPTION (Opt_secondaryScroll))
       scr_scroll_text (0, prev_nrow - 1, prev_nrow);
   return scrn;
 }
   num_scr += count;
   if (count > 0
       && row1 == 0
       && row2 == nrow - 1
-      && (current_screen == PRIMARY || options & Opt_secondaryScroll))
+      && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
     {
       nsaved = min (nsaved + count, saveLines);
+      PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
       term_start = (term_start + count) % total_rows;
       if (selection.op && current_screen == selection.screen)
         {
           selection.beg.row  -= count;
           selection.end.row  -= count;
           selection.mark.row -= count;
-          selection_check (0);
+          if (selection.beg.row < -nsaved
+              || selection.end.row < -nsaved
+              || selection.mark.row < -nsaved)
+            {
+              CLEAR_ALL_SELECTION ();
+              selection.op = SELECTION_CLEAR;
+            }
         }
       for (int i = count; i--; )
+        {
+          ROW(row2 - i).l = 0;
-        scr_blank_screen_mem (ROW(row2 - i), rstyle);
+          scr_blank_screen_mem (ROW(row2 - i), rstyle);
+        }
-      if ((options & Opt_scrollWithBuffer)
+      if (OPTION (Opt_scrollWithBuffer)
           && view_start != 0
           && view_start != saveLines)
         scr_page (UP, count);
     }
   else
     {
       if (selection.op && current_screen == selection.screen)
         {
-          int i = selection.beg.row;
+          if ((selection.beg.row < row1 && selection.end.row > row1)
-          int j = selection.end.row;
+              || (selection.beg.row < row2 && selection.end.row > row2)
-          if ((i < row1 && j > row1)
-              || (i < row2 && j > row2)
-              || (i - count < row1 && i >= row1)
+              || (selection.beg.row - count < row1 && selection.beg.row >= row1)
-              || (i - count > row2 && i <= row2)
+              || (selection.beg.row - count > row2 && selection.beg.row <= row2)
-              || (j - count < row1 && j >= row1)
+              || (selection.end.row - count < row1 && selection.end.row >= row1)
-              || (j - count > row2 && j <= row2))
+              || (selection.end.row - count > row2 && selection.end.row <= row2))
             {
               CLEAR_ALL_SELECTION ();
-              selection.op = SELECTION_CLEAR;  /* XXX: too aggressive? */
+              selection.op = SELECTION_CLEAR;
             }
-          else if (j >= row1 && j <= row2)
+          else if (selection.end.row >= row1 && selection.end.row <= row2)
             {
               /* move selected region too */
               selection.beg.row  -= count;
               selection.end.row  -= count;
               selection.mark.row -= count;
     {
       c = *str++;
       if (c < 0x20)
         if (c == C0_LF)
           {
             if (!line->is_longer ())      /* XXX: think about this */
               max_it (line->l, screen.cur.col);
             screen.flags &= ~Screen_WrapNext;
       if (count)
         x = ncol - 1;
       // store horizontal tab commands as characters inside the text
       // buffer so they can be selected and pasted.
-      if (ht && options & Opt_pastableTabs)
+      if (ht && OPTION (Opt_pastableTabs))
         {
           base_rend = SET_FONT (base_rend, 0);
           if (!l.is_longer ())      /* XXX: think about this */
             max_it (l.l, x);
       CLEAR_ROWS (row, num);
     }
   else
     {
       ren = rstyle & (RS_fgMask | RS_bgMask);
-      gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)];
+      gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
       XChangeGC (display->display, gc, GCForeground, &gcvalue);
       ERASE_ROWS (row, num);
       gcvalue.foreground = pix_colors[Color_fg];
       XChangeGC (display->display, gc, GCForeground, &gcvalue);
     }
   for (; num--; row++)
     {
+      ROW (row).l = 0;
       scr_blank_screen_mem (ROW (row), rstyle);
-      ROW (row).l = 0;
       scr_blank_line (drawn_buf [row], 0, ncol, ren);
     }
 }
 #if ENABLE_FRILLS
       ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
 #if XPM_BACKGROUND
       if (bgPixmap.pixmap == None)
 #endif
 #if TRANSPARENT
-        if (! (options & Opt_transparent) || am_transparent == 0)
+        if (! OPTION (Opt_transparent) || am_transparent == 0)
 #endif
           XSetWindowBackground (display->display, vt,
                                pix_colors[Color_bg]);
       gcvalue.foreground = pix_colors[Color_fg];
 }
 int
 rxvt_term::scr_changeview (unsigned int oldviewstart)
 {
+  PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
   if (view_start != oldviewstart)
     {
       want_refresh = 1;
       num_scr -= (view_start - oldviewstart);
     }
 {
 #ifndef NO_BELL
 # ifndef NO_MAPALERT
 #  ifdef MAPALERT_OPTION
-  if (options & Opt_mapAlert)
+  if (OPTION (Opt_mapAlert))
 #  endif
     XMapWindow (display->display, parent[0]);
 # endif
-  if (options & Opt_visualBell)
+  if (OPTION (Opt_visualBell))
     {
       scr_rvideo_mode (!rvideo); /* refresh also done */
       rxvt_usleep (VISUAL_BELL_DURATION);
       scr_rvideo_mode (!rvideo); /* refresh also done */
     }
 #if XPM_BACKGROUND
   must_clear |= bgPixmap.pixmap != None;
 #endif
 #if TRANSPARENT
-  must_clear |= (options & Opt_transparent) && am_transparent;
+  must_clear |= OPTION (Opt_transparent) && am_transparent;
 #endif
   ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
   /*
    * B: reverse any characters which are selected
    */
+  PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
   scr_reverse_selection ();
   /*
    * C: set the cursor character (s)
    */
         crp = &ROW(screen.cur.row).r[col];
         if (showcursor && focus)
           {
-            if (options & Opt_cursorUnderline)
+            if (OPTION (Opt_cursorUnderline))
               *crp ^= RS_Uline;
             else
               {
                 *crp ^= RS_RVid;
                 cc1 = *crp & (RS_fgMask | RS_bgMask);
                 if (ISSET_PIXCOLOR (Color_cursor))
                   ccol1 = Color_cursor;
                 else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-                  ccol1 = GET_FGCOLOR (rstyle);
+                  ccol1 = fgcolor_of (rstyle);
 #else
                   ccol1 = Color_fg;
 #endif
                 if (ISSET_PIXCOLOR (Color_cursor2))
                   ccol2 = Color_cursor2;
                 else
 #ifdef CURSOR_COLOR_IS_RENDITION_COLOR
-                  ccol2 = GET_BGCOLOR (rstyle);
+                  ccol2 = bgcolor_of (rstyle);
 #else
                   ccol2 = Color_bg;
 #endif
                 *crp = SET_FGCOLOR (*crp, ccol1);
                 *crp = SET_BGCOLOR (*crp, ccol2);
             count++, i--;
           /*
            * Determine the attributes for the string
            */
-          int fore = GET_FGCOLOR (rend); // desired foreground
+          int fore = fgcolor_of (rend); // desired foreground
-          int back = GET_BGCOLOR (rend); // desired background
+          int back = bgcolor_of (rend); // desired background
-          // only do special processing if any attributes are set, which is rare
+          // 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
               if (srp[col] & RS_Careful && col < ncol - 1 && 0)
    */
   if (showcursor)
     {
       if (focus)
         {
-          if (options & Opt_cursorUnderline)
+          if (OPTION (Opt_cursorUnderline))
             *crp ^= RS_Uline;
           else
             {
               *crp ^= RS_RVid;
 #ifndef NO_CURSORCOLOR
   /*
    * H: cleanup selection
    */
   scr_reverse_selection ();
+  PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
   if (refresh_type & SMOOTH_REFRESH)
     XFlush (display->display);
   num_scr = 0;
 #if ENABLE_FRILLS
       if (selection.rect)
         {
           for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
+            {
+              text_t *stp = ROW(row).t;
+              rend_t *srp = ROW(row).r;
-            for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
+              for (col = selection.beg.col; col < selection.end.col; col++)
-              srp[col] ^= RS_RVid;
+                srp[col] ^= RS_RVid;
+              while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
+                srp[col] ^= RS_RVid | RS_Uline;
+              if (++col < selection.end.col)
+                srp[col] ^= RS_RVid | RS_Uline;
+            }
         }
       else
 #endif
         {
           if (selection.beg.row >= -view_start)
               row = selection.beg.row;
             }
           else
             {
               col = 0;
-              row = view_start;
+              row = -view_start;
             }
           for (; row < min (selection.end.row, view_end); row++, col = 0)
             for (rend_t *srp = ROW(row).r; col < ncol; col++)
               srp[col] ^= RS_RVid;
   selection.op = SELECTION_DONE;
   if (selection.clicks == 4)
     return;                 /* nothing selected, go away */
+  if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
+    return;
   i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
   new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
   int ofs = 0;
   int extra = 0;
 #endif
         end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
       col = max (col, 0);
-      if (row == selection.end.row || selection.rect)
+      if (row == selection.end.row
+#if ENABLE_FRILLS
+          || selection.rect
+#endif
+          )
-        end_col = min (end_col, selection.end.col);
+        min_it (end_col, selection.end.col);
       t = ROW(row).t + col;
       for (; col < end_col; col++)
         {
           if (*t == NOCHAR)
 #endif
           else
             new_selection_text[ofs++] = *t++;
         }
+#if ENABLE_FRILLS
+      if (selection.rect)
+        {
+          while (ofs
+                 && new_selection_text[ofs - 1] != C0_LF
+                 && unicode::is_space (new_selection_text[ofs - 1]))
+            --ofs;
+          new_selection_text[ofs++] = C0_LF;
+        }
+      else
+#endif
-      if (!ROW(row).is_longer () && row != selection.end.row)
+        if (!ROW(row).is_longer () && row != selection.end.row)
-        new_selection_text[ofs++] = C0_LF;
+          new_selection_text[ofs++] = C0_LF;
     }
   if (end_col != selection.end.col)
     new_selection_text[ofs++] = C0_LF;
   // we usually allocate much more than necessary, so realloc it smaller again
   selection.len = ofs;
   selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
+  if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
+    return;
+  selection_grab (tm);
+}
+bool
+rxvt_term::selection_grab (Time tm)
+{
+  selection_time = tm;
   XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
   if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
+    {
-    display->set_selection_owner (this);
+      display->set_selection_owner (this);
+      return true;
+    }
   else
-    rxvt_warn ("can't get primary selection, ignoring.\n");
+    return false;
 #if 0
   XTextProperty ct;
   if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
     {
       set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
       XFree (ct.value);
     }
 #endif
-  selection_time = tm;
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Mark or select text based upon number of clicks: 1, 2, or 3
       selection_delimit_word (DN, &selection.end, &selection.end);
     }
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
-      if (options & Opt_tripleclickwords)
+      if (OPTION (Opt_tripleclickwords))
         {
           selection_delimit_word (UP, &selection.beg, &selection.beg);
           for (int end_row = selection.mark.row; end_row < nrow; end_row++)
             {
     {
       stp = ROW(end_row).t;
       while (--end_col >= 0)
         {
-          if (stp[end_col] != ' '
+          if (stp[end_col] != NOCHAR
-              && stp[end_col] != '\t'
+              && !unicode::is_space (stp[end_col]))
-              && stp[end_col] != NOCHAR)
             break;
         }
       if (end_col >= 0
           || !ROW(end_row - 1).is_longer ())
 #if ENABLE_OVERLAY
 void
 rxvt_term::scr_overlay_new (int x, int y, int w, int h)
 {
-  if (nrow < 3 || ncol < 3)
+  if (nrow < 1 || ncol < 1)
     return;
   want_refresh = 1;
   scr_overlay_off ();
   for (int y = ov_h; y--; )
     {
       text_t *t1 = ov_text[y];
       rend_t *r1 = ov_rend[y];
-      text_t *t2 = ROW(y - view_start).t + ov_x;
+      text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
-      rend_t *r2 = ROW(y - view_start).r + ov_x;
+      rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
       for (int x = ov_w; x--; )
         {
           text_t t = *t1; *t1++ = *t2; *t2++ = t;
           rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.193 by root, Thu Dec 22 19:39:29 2005 UTC vs. Revision 1.204 by root, Mon Jan 2 15:35:43 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.193 by root, Thu Dec 22 19:39:29 2005 UTC vs.
Revision 1.204 by root, Mon Jan 2 15:35:43 2006 UTC