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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC

   nrow = TermWin.nrow;
   if (ncol == prev_ncol && nrow == prev_nrow)
     return;
+  // we need at least two lines for wrapping to work correctly
+  if (nrow + TermWin.saveLines < 2)
+    {
+      TermWin.saveLines++;
+      prev_nrow--;
+      TermWin.nscrolled++;
+    }
   want_refresh = 1;
+  prev_total_rows = prev_nrow + TermWin.saveLines;
   total_rows = nrow + TermWin.saveLines;
-  prev_total_rows = prev_nrow + TermWin.saveLines;
   screen.tscroll = 0;
   screen.bscroll = nrow - 1;
   if (!talloc)
     {
       talloc = new rxvt_salloc (ncol * sizeof (text_t));
       ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
     }
-  if (prev_nrow == 0)
+  if (!screen.text)
     {
       /*
        * 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
        */
   if (j > 0)
     {
       /* A: scroll up */
       /* A1: 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 */
+      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 */
+      /* B1: Copy lines that will get clobbered by the rotation */
-      for (i = 0, j = row1; i < count; i++, j++)
+      for (i = 0, j = row2; i < count; i++, j--)
         {
           buf_text[i] = screen.text[j];
           buf_rend[i] = screen.rend[j];
         }
-      /* A2: Rotate lines */
+      /* B2: Rotate lines */
-      for (j = row1, i = j + count; i <= row2; i++, j++)
+      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 = row2 - count + 1, i = count;
-    }
-  else /* if (j < 0) */
-    {
-      /* B: scroll down */
-      /* B1: 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 */
-      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 */
+  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++)
+    for (; i--; j++)
-    {
-      screen.tlen[j] = 0;
-      screen.text[j] = buf_text[i];
-      screen.rend[j] = buf_rend[i];
-      if (!spec)              /* line length may not equal TermWin.ncol */
-        scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
+      scr_blank_screen_mem (screen.text, screen.rend, (unsigned int)j, rstyle);
-    }
   return count;
 }
 /* ------------------------------------------------------------------------- */
   D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
   ZERO_SCROLLBACK ();
   if (nlines > 0)
     {
-      nlines += (screen.cur.row - screen.bscroll);
+      nlines += screen.cur.row - screen.bscroll;
       if ((nlines > 0)
           && (screen.tscroll == 0)
           && (screen.bscroll == (TermWin.nrow - 1)))
         {
           /* _at least_ this many lines need to be scrolled */
           scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0);
           screen.cur.row -= nlines;
         }
     }
 #ifdef DEBUG_STRICT
   assert (screen.cur.col < last_col);
   assert ((screen.cur.row < TermWin.nrow)
           && (screen.cur.row >= - (int32_t)TermWin.nscrolled));
 #else                           /* drive with your eyes closed */
         scr_insdel_chars (1, INSERT);
       // rely on wcwidth to tell us the character width, at least for non-latin1
       // do wcwidth before further replacements, as wcwidth says that line-drawing
       // characters have width -1 (DOH!) on GNU/Linux sometimes.
-      int width = c < 256 ? 1 : wcwidth (c);
+      int width = c < 0x100 ? 1 : wcwidth (c);
       if (charsets[screen.charset] == '0') // DEC SPECIAL
         {
           // vt100 special graphics and line drawing
           static uint16_t vt100_0[32] = { // 5f .. 7e
         break;
       default:
         return;
     }
-  refresh_type |= REFRESH_BOUNDS;
   if (selection.op && current_screen == selection.screen
       && ((selection.beg.row >= row && selection.beg.row <= row + num)
           || (selection.end.row >= row
               && selection.end.row <= row + num)))
     CLEAR_SELECTION ();
   for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
     fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
   if (refresh)
-    scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS);
+    scr_refresh (SLOW_REFRESH);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Refresh the entire screen
  * direction should be UP or DN
  */
 int
 rxvt_term::scr_page (enum page_dirn direction, int nlines)
 {
-  int             n;
+  int n;
-  uint16_t       oldviewstart;
+  uint16_t oldviewstart;
   D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
 #ifdef DEBUG_STRICT
   assert ((nlines >= 0) && (nlines <= TermWin.nrow));
 #endif
     ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
 void
 rxvt_term::scr_refresh (unsigned char refresh_type)
 {
-  unsigned char clearfirst, /* first character writes before cell        */
-                clearlast,  /* last character writes beyond cell         */
-                must_clear, /* use draw_string not draw_image_string     */
+  unsigned char must_clear, /* use draw_string not draw_image_string     */
                 rvid,       /* reverse video this position               */
                 showcursor; /* show the cursor                           */
   int16_t col, row,   /* column/row we're processing               */
           ocrow;      /* old cursor row                            */
   int i,              /* tmp                                       */
     return;
   /*
    * A: set up vars
    */
-  clearfirst = clearlast = must_clear = 0;
+  must_clear = 0;
   refresh_count = 0;
   row_offset = TermWin.saveLines - TermWin.view_start;
-  if ((refresh_type & REFRESH_BOUNDS))
-    {
-      clearfirst = clearlast = 1;
-      refresh_type &= ~REFRESH_BOUNDS;
-    }
 #ifdef XPM_BACKGROUND
   must_clear |= (bgPixmap.pixmap != None);
 #endif
 #ifdef TRANSPARENT
   /*
    * H: cleanup selection
    */
   scr_reverse_selection ();
-  /*
-   * I: other general cleanup
-   */
-#if 0
-  if (clearfirst && TermWin.int_bwidth)
-    /*
-     * clear the whole screen height, note that width == 0 is treated
-     * specially by XClearArea
-     */
-    XClearArea (display->display, TermWin.vt, 0, 0,
-                (unsigned int)TermWin.int_bwidth,
-                (unsigned int)TermWin_TotalHeight (), False);
-  if (clearlast && TermWin.int_bwidth)
-    /*
-     * clear the whole screen height, note that width == 0 is treated
-     * specially by XClearArea
-     */
-    XClearArea (display->display, TermWin.vt,
-                TermWin.width + TermWin.int_bwidth, 0,
-                (unsigned int)TermWin.int_bwidth,
-                (unsigned int)TermWin_TotalHeight (), False);
-#endif
   if (refresh_type & SMOOTH_REFRESH)
     XFlush (display->display);
   num_scr = 0;
       if (ct.encoding == 0)
         {
           D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
           break;
         }
+      else if (ct.encoding == xa[XA_INCR])
+        {
+          // INCR selection, start handshake
+          XDeleteProperty (display->display, win, prop);
+          selection_wait = Sel_incr;
+          incr_ev.start (NOW + 10);
+          break;
+        }
       if (ct.value == NULL)
         {
           D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
           continue;
  * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
  */
 void
 rxvt_term::selection_property (Window win, Atom prop)
 {
-  int             reget_time = 0;
+  if (prop == None || selection_wait != Sel_incr)
-  if (prop == None)
     return;
-  D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
-  if (selection_wait == Sel_normal)
-    {
-      int a, afmt;
-      Atom atype;
-      unsigned long bytes_after, nitems;
-      unsigned char *s = NULL;
-      a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
-                             xa[XA_INCR], &atype, &afmt, &nitems,
-                             &bytes_after, &s);
-      if (s)
-        XFree (s);
-      if (a != Success)
-        return;
-#ifndef __CYGWIN32__
-      if (atype == xa[XA_INCR])
-        {  /* start an INCR transfer */
-          D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
-          XDeleteProperty (display->display, win, prop);
-          XFlush (display->display);
-          reget_time = 1;
-          selection_wait = Sel_incr;
-        }
-#endif
-    }
-  else if (selection_wait == Sel_incr)
-    {
-      reget_time = 1;
-      if (selection_paste (win, prop, True) == -1)
+  if (selection_paste (win, prop, 1) > 0)
-        {
-          D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
-          selection_wait = Sel_none;
-          incr_ev.stop ();
-        }
-    }
-  if (reget_time) /* received more data so reget time */
     incr_ev.start (NOW + 10);
+  else
+    {
+      selection_wait = Sel_none;
+      incr_ev.stop ();
+    }
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Request the current selection:
                        (8 * sizeof (target_list[0])), PropModeReplace,
                        (unsigned char *)target_list,
                        target - target_list);
       ev.property = rq.property;
     }
+#if TODO // TODO
   else if (rq.target == xa[XA_MULTIPLE])
     {
       /* TODO: Handle MULTIPLE */
     }
+#endif
   else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
     {
       XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER,
                        (8 * sizeof (Time)), PropModeReplace,
                        (unsigned char *)&selection_time, 1);

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC vs. Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC