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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.85 by root, Sun Aug 8 16:43:21 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
        */
           /* _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 */
       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.85 by root, Sun Aug 8 16:43:21 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.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC