--- rxvt-unicode/src/screen.C	2006/01/03 17:34:44	1.206
+++ rxvt-unicode/src/screen.C	2006/01/06 01:16:58	1.211
@@ -126,6 +126,8 @@
       width = ncol;
     }
 
+  l.touch ();
+
   efs &= ~RS_baseattrMask;
   efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
 
@@ -292,7 +294,6 @@
 #ifdef DEBUG_STRICT
               assert (old_buf [MOD (p, prev_total_rows)].t);
 #endif
-
               int plines = 1;
               int llen = old_buf [MOD (p, prev_total_rows)].l;
 
@@ -320,7 +321,8 @@
                 {
                   qline = row_buf + qrow;
                   lalloc (*qline);
-                  qline->set_is_longer ();
+                  qline->l = ncol;
+                  qline->is_longer (1);
 
                   int qcol = 0;
 
@@ -355,13 +357,7 @@
                 }
 
               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
+              qline->is_longer (0);
               scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
             }
           while (p != pend && q > 0);
@@ -372,7 +368,6 @@
           // make sure all terminal lines exist
           while (nsaved < 0)
             scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE);
-
         }
       else
         {
@@ -421,7 +416,7 @@
 
   tt_winch ();
 
-  PERL_INVOKE ((this, HOOK_RESET, DT_END));
+  HOOK_INVOKE ((this, HOOK_RESET, DT_END));
 }
 
 /* ------------------------------------------------------------------------- */
@@ -625,7 +620,7 @@
     {
       nsaved = min (nsaved + count, saveLines);
 
-      PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
+      HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
       
       term_start = (term_start + count) % total_rows;
 
@@ -714,19 +709,19 @@
 
   unsigned char checksel;
   unicode_t c;
-  int last_col;
+  int ncol = this->ncol;
   const unicode_t *strend = str + len;
 
   want_refresh = 1;
   ZERO_SCROLLBACK ();
-  last_col = ncol;
 
   if (nlines > 0)
     {
       nlines += screen.cur.row - screen.bscroll;
+
       if (nlines > 0
           && screen.tscroll == 0
-          && screen.bscroll == (nrow - 1))
+          && screen.bscroll == nrow - 1)
         {
           /* _at least_ this many lines need to be scrolled */
           scr_scroll_text (screen.tscroll, screen.bscroll, nlines);
@@ -735,7 +730,7 @@
     }
 
 #ifdef DEBUG_STRICT
-  assert (screen.cur.col < last_col);
+  assert (screen.cur.col < ncol);
   assert (screen.cur.row < nrow
           && screen.cur.row >= -nsaved);
 #endif
@@ -752,8 +747,7 @@
       if (c < 0x20)
         if (c == C0_LF)
           {
-            if (!line->is_longer ())      /* XXX: think about this */
-              max_it (line->l, screen.cur.col);
+            max_it (line->l, screen.cur.col);
 
             screen.flags &= ~Screen_WrapNext;
 
@@ -767,8 +761,7 @@
           }
         else if (c == C0_CR)
           {
-            if (!line->is_longer ())      /* XXX: think about this */
-              max_it (line->l, screen.cur.col);
+            max_it (line->l, screen.cur.col);
 
             screen.flags &= ~Screen_WrapNext;
             screen.cur.col = 0;
@@ -795,7 +788,8 @@
 
       if (screen.flags & Screen_WrapNext)
         {
-          line->set_is_longer ();
+          max_it (line->l, ncol);
+          line->is_longer (1);
 
           scr_do_wrap ();
           
@@ -813,7 +807,7 @@
       // locale.
       int width = c < 0x100 ? 1 : wcwidth (c);
 
-      if (charsets[screen.charset] == '0') // DEC SPECIAL
+      if (charsets [screen.charset] == '0') // DEC SPECIAL
         {
           // vt100 special graphics and line drawing
           // 5f-7e standard vt100
@@ -875,7 +869,7 @@
           rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
 
           // if the character doesn't fit into the remaining columns...
-          if (screen.cur.col > last_col - width && last_col >= width)
+          if (screen.cur.col > ncol - width && ncol >= width)
             {
               // ...output spaces
               c = ' ';
@@ -883,16 +877,18 @@
               --str;
             }
 
+          line->touch ();
+
           do
             {
               line->t[screen.cur.col] = c;
               line->r[screen.cur.col] = rend;
 
-              if (screen.cur.col < last_col - 1)
+              if (screen.cur.col < ncol - 1)
                 screen.cur.col++;
               else
                 {
-                  line->l = last_col;
+                  line->l = ncol;
                   if (screen.flags & Screen_Autowrap)
                     screen.flags |= Screen_WrapNext;
                   break;
@@ -904,11 +900,15 @@
 
           // pad with spaces when overwriting wide character with smaller one
           if (!width)
-            for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++)
-              {
-                line->t[c] = ' ';
-                line->r[c] = rend;
-              }
+            {
+              line->touch ();
+
+              for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
+                {
+                  line->t[c] = ' ';
+                  line->r[c] = rend;
+                }
+            }
         }
       else // width == 0
         {
@@ -917,31 +917,31 @@
           // we just tag the accent on the previous on-screen character.
           // this is arguably not correct, but also arguably not wrong.
           // we don't handle double-width characters nicely yet.
+          line_t *linep;
           text_t *tp;
           rend_t *rp;
 
           if (screen.cur.col > 0)
             {
+              linep = line;
               tp = line->t + screen.cur.col - 1;
               rp = line->r + screen.cur.col - 1;
-
-              while (*tp == NOCHAR && tp > line->t)
-                tp--, rp--;
             }
           else if (screen.cur.row > 0
                    && ROW(screen.cur.row - 1).is_longer ())
             {
-              line_t *line = &ROW(screen.cur.row - 1);
-
-              tp = line->t + last_col - 1;
-              rp = line->r + last_col - 1;
-
-              while (*tp == NOCHAR && tp > line->t)
-                tp--, rp--;
+              linep = &ROW(screen.cur.row - 1);
+              tp = line->t + ncol - 1;
+              rp = line->r + ncol - 1;
             }
           else
             continue;
 
+          linep->touch ();
+
+          while (*tp == NOCHAR && tp > linep->t)
+            tp--, rp--;
+
           // first try to find a precomposed character
           unicode_t n = rxvt_compose (*tp, c);
           if (n == NOCHAR)
@@ -953,8 +953,7 @@
         }
     }
 
-  if (!line->is_longer ())      /* XXX: think about this */
-    max_it (line->l, screen.cur.col);
+  max_it (line->l, screen.cur.col);
 
 #ifdef DEBUG_STRICT
   assert (screen.cur.row >= 0);
@@ -1014,6 +1013,7 @@
         if (tabs[i])
           {
             x = i;
+
             if (!--count)
               break;
           }
@@ -1030,8 +1030,7 @@
         {
           base_rend = SET_FONT (base_rend, 0);
 
-          if (!l.is_longer ())      /* XXX: think about this */
-            max_it (l.l, x);
+          l.touch (x);
 
           i = screen.cur.col;
 
@@ -1095,8 +1094,10 @@
     scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
   else
     {
-      if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN
-        ROW(screen.cur.row).l = ncol;
+      line_t &l = ROW(screen.cur.row);
+
+      l.touch ();
+      l.is_longer (0);
 
       scr_gotorc (0, 0, R_RELATIVE);
       scr_insdel_chars (1, DELETE);
@@ -1198,6 +1199,9 @@
 
   line_t &line = ROW(screen.cur.row);
 
+  line.touch ();
+  line.is_longer (0);
+
   switch (mode)
     {
       case 0:                     /* erase to end of line */
@@ -1301,8 +1305,10 @@
 
   for (; num--; row++)
     {
-      ROW (row).l = 0;
-      scr_blank_screen_mem (ROW (row), rstyle);
+      line_t &l = ROW(row);
+      l.l = 0;
+      l.is_longer (0);
+      scr_blank_screen_mem (l, rstyle);
       scr_blank_line (drawn_buf [row], 0, ncol, ren);
     }
 }
@@ -1345,7 +1351,8 @@
       for (int j = ncol; j--; )
         *r1++ = fs;
 
-      line.l = ncol;    /* make the `E's selectable */
+      line.is_longer (0);
+      line.touch (ncol);
     }
 }
 
@@ -1404,6 +1411,9 @@
 
   line_t *line = &ROW(row);
 
+  line->touch ();
+  line->is_longer (0);
+
   switch (insdel)
     {
       case INSERT:
@@ -1413,11 +1423,7 @@
             line->r[col] = line->r[col - count];
           }
 
-        if (!line->is_longer ())
-          {
-            line->l += count;
-            min_it (line->l, ncol);
-          }
+        line->l = min (line->l + count, ncol);
 
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
@@ -1440,6 +1446,8 @@
         screen.cur.col += count;     /* don't worry if > ncol */
         selection_check (1);
         screen.cur.col -= count;
+
+        line->l = max (line->l - count, 0);
         scr_blank_line (*line, screen.cur.col, count, rstyle);
         break;
 
@@ -1452,12 +1460,8 @@
             line->r[col] = line->r[col + count];
           }
 
-        scr_blank_line (*line, ncol - count, count, tr);
-
-        if (line->is_longer ()) /* break line continuation */
-          line->l = ncol;
-        
         line->l = max (line->l - count, 0);
+        scr_blank_line (*line, ncol - count, count, tr);
 
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
@@ -1579,7 +1583,7 @@
   if (mode < 0)
     memset (tabs, 0, ncol * sizeof (char));
   else if (screen.cur.col < ncol)
-    tabs[screen.cur.col] = (mode ? 1 : 0);
+    tabs [screen.cur.col] = !!mode;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1636,7 +1640,8 @@
 void
 rxvt_term::set_font_style ()
 {
-  switch (charsets[screen.charset])
+#if 0
+  switch (charsets [screen.charset])
     {
       case '0':                   /* DEC Special Character & Line Drawing Set */
         break;
@@ -1653,6 +1658,7 @@
       case 'K':                   /* German character set */
         break;
     }
+#endif
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1827,15 +1833,15 @@
 int
 rxvt_term::scr_changeview (unsigned int oldviewstart)
 {
-  PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
-
   if (view_start != oldviewstart)
     {
+      HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
+
       want_refresh = 1;
       num_scr -= (view_start - oldviewstart);
     }
 
-  return (int) (view_start - oldviewstart);
+  return (int)view_start - (int)oldviewstart;
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2049,7 +2055,7 @@
       }
   }
 
-  PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
+  HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
 #if ENABLE_OVERLAY
   scr_swap_overlay ();
 #endif
@@ -2109,7 +2115,7 @@
 
               XCopyArea (display->display, vt, vt,
                          gc, 0, Row2Pixel (len + i),
-                         (unsigned int)TermWin_TotalWidth (),
+                         (unsigned int)this->width,
                          (unsigned int)Height2Pixel (wlen - len + 1),
                          0, Row2Pixel (len));
               len = -1;
@@ -2322,7 +2328,7 @@
 #if ENABLE_OVERLAY
   scr_swap_overlay ();
 #endif
-  PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
+  HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
 
   /*
    * G: cleanup cursor and display outline cursor if necessary
@@ -2379,11 +2385,13 @@
 }
 
 void
-rxvt_term::scr_remap_chars (const line_t &l)
+rxvt_term::scr_remap_chars (line_t &l)
 {
   if (!l.t)
     return;
 
+  l.touch (); // maybe a bit of an overkill, but its not performance-relevant
+
   for (int i = ncol; i--; )
     l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
 }
@@ -2566,7 +2574,7 @@
  * Paste a selection direct to the command fd
  */
 void
-rxvt_term::paste (unsigned char *data, unsigned int len)
+rxvt_term::paste (char *data, unsigned int len)
 {
   /* convert normal newline chars into common keyboard Return key sequence */
   for (unsigned int i = 0; i < len; i++)
@@ -2720,7 +2728,7 @@
       char *s = rxvt_wcstombs (w);
       free (w);
       // TODO: strlen == only the first element will be converted. well...
-      paste ((unsigned char *)s, strlen (s));
+      paste (s, strlen (s));
       free (s);
     }
   else
@@ -2729,12 +2737,12 @@
       && cl)
     {
       for (int i = 0; i < cr; i++)
-        paste ((unsigned char *)cl[i], strlen (cl[i]));
+        paste (cl[i], strlen (cl[i]));
 
       XFreeStringList (cl);
     }
   else
-    paste (ct.value, ct.nitems); // paste raw
+    paste ((char *)ct.value, ct.nitems); // paste raw
 
 bailout:
   XFree (ct.value);
@@ -2782,7 +2790,7 @@
   if (selection.text)
     { /* internal selection */
       char *str = rxvt_wcstombs (selection.text, selection.len);
-      paste ((unsigned char *)str, strlen (str));
+      paste (str, strlen (str));
       free (str);
       return;
     }
@@ -2884,7 +2892,7 @@
   if (selection.clicks == 4)
     return;                 /* nothing selected, go away */
 
-  if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
+  if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
     return;
 
   i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
@@ -2908,7 +2916,7 @@
         }
       else
 #endif
-        end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
+        end_col = ROW(row).l;
 
       col = max (col, 0);
 
@@ -2920,6 +2928,7 @@
         min_it (end_col, selection.end.col);
 
       t = ROW(row).t + col;
+
       for (; col < end_col; col++)
         {
           if (*t == NOCHAR)
@@ -2978,7 +2987,7 @@
   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)))
+  if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
     return;
 
   selection_grab (tm);
@@ -3138,7 +3147,6 @@
       break;
     }
 
-Old_Word_Selection_You_Die:
   if (dirn == DN)
     col++;                  /* put us on one past the end */
 
@@ -3325,7 +3333,7 @@
       if (ROWCOL_IS_AFTER (selection.end, selection.beg))
         selection.end.col--;
 
-      if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
+      if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
         {
           selection_delimit_word (UP, &selection.beg, &selection.beg);
           selection_delimit_word (DN, &selection.end, &selection.end);