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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.148 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.156 by root, Fri Feb 4 11:41:23 2005 UTC

               ralloc->free (drawn_rend[p]);
             }
           /* we have fewer rows so fix up cursor position */
           MIN_IT (screen.cur.row, (int32_t)nrow - 1);
-          MIN_IT (swap.cur.row, (int32_t)nrow - 1);
           scr_reset_realloc (); /* realloc _last_ */
         }
       else if (nrow > prev_nrow)
         {
               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);
-          assert (swap.cur.row < TermWin.nrow);
 #else                           /* drive with your eyes closed */
           MIN_IT (screen.cur.row, nrow - 1);
-          MIN_IT (swap.cur.row, nrow - 1);
 #endif
           TermWin.ncol =  ncol; // save b/c scr_blank_screen_mem uses this
         }
       /* resize columns */
                 }
             }
           MIN_IT (screen.cur.col, (int16_t)ncol - 1);
-          MIN_IT (swap.cur.col, (int16_t)ncol - 1);
           delete talloc; talloc = ta;
           delete ralloc; ralloc = ra;
         }
   if (current_screen == scrn)
     return scrn;
   selection_check (2);        /* check for boundary cross */
-  SWAP_IT (current_screen, scrn, int);
+  i = current_screen; current_screen = scrn; scrn = i;
   SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
   SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
-# ifdef DEBUG_STRICT
-  assert (screen.cur.row >= 0 && screen.cur.row < prev_nrow);
-  assert (screen.cur.col >= 0 && screen.cur.col < prev_ncol);
-# else                          /* drive with your eyes closed */
   MAX_IT (screen.cur.row, 0);
   MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
   MAX_IT (screen.cur.col, 0);
   MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
-# endif
 #if NSCREENS
   if (options & Opt_secondaryScreen)
     {
       num_scr = 0;
           else
             font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back);
           if (rend & RS_Uline && font->descent > 1 && fore != back)
             {
+#if ENABLE_FRILLS
+              if (ISSET_PIXCOLOR (Color_underline))
+                XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]);
+              else
+#endif
-              XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
+                XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
               XDrawLine (display->display, drawBuffer, TermWin.gc,
                          xpixel, ypixel + font->ascent + 1,
                          xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
             }
         }                     /* for (col....) */
 /* ------------------------------------------------------------------------- */
 /*
  * Paste a selection direct to the command fd
  */
 void
-rxvt_term::paste (const unsigned char *data, unsigned int len)
+rxvt_term::paste (unsigned char *data, unsigned int len)
 {
-  unsigned int i, j, n;
-  unsigned char *ds = (unsigned char *)rxvt_malloc (PASTE_SIZE);
   /* convert normal newline chars into common keyboard Return key sequence */
-  for (i = 0; i < len; i += PASTE_SIZE)
+  for (unsigned int i = 0; i < len; i++)
-    {
-      n = min (len - i, PASTE_SIZE);
-      memcpy (ds, data + i, n);
-      for (j = 0; j < n; j++)
-        if (ds[j] == C0_LF)
+    if (data[i] == C0_LF)
-          ds[j] = C0_CR;
+      data[i] = C0_CR;
-      tt_write (ds, (int)n);
+  tt_write (data, len);
-    }
-  free (ds);
 }
 /* ------------------------------------------------------------------------- */
 /*
  * Respond to a notification that a primary selection has been sent
   unsigned long bytes_after;
   XTextProperty ct;
   if (XGetWindowProperty (display->display, win, prop,
-                          0, (long)(PROP_SIZE / 4),
+                          0, PROP_SIZE / 4,
                           delete_prop, AnyPropertyType,
                           &ct.encoding, &ct.format,
                           &ct.nitems, &bytes_after,
                           &ct.value) != Success)
     {
   if (bytes_after)
     {
       // fetch and append remaining data
       XTextProperty ct2;
-      unsigned long bytes_after2;
       if (XGetWindowProperty (display->display, win, prop,
-                              ct.nitems / 4, (long) (bytes_after + 3) / 4,
+                              ct.nitems / 4, (bytes_after + 3) / 4,
                               delete_prop, AnyPropertyType,
                               &ct2.encoding, &ct2.format,
-                              &ct2.nitems, &bytes_after2,
+                              &ct2.nitems, &bytes_after,
                               &ct2.value) != Success)
         goto bailout;
       // realloc should be compatible to XFree, here, and elsewhere, too
-      ct.value = (unsigned char *)realloc (ct.value, ct.nitems + bytes_after);
+      ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
-      memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems);
+      memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
       ct.nitems += ct2.nitems;
       XFree (ct2.value);
     }
-  else if (delete_prop)
-    XDeleteProperty (display->display, win, prop);
   if (ct.value == 0)
     goto bailout;
   if (ct.encoding == xa[XA_INCR])
       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                               *
  * ------------------------------------------------------------------------- */

Diff Legend

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

Comparing rxvt-unicode/src/screen.C (file contents): Revision 1.148 by root, Mon Dec 13 01:29:03 2004 UTC vs. Revision 1.156 by root, Fri Feb 4 11:41:23 2005 UTC

Diff Legend

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.148 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.156 by root, Fri Feb 4 11:41:23 2005 UTC