--- rxvt-unicode/src/screen.C	2004/12/13 19:16:36	1.150
+++ rxvt-unicode/src/screen.C	2005/02/19 19:37:34	1.158
@@ -30,7 +30,6 @@
 #include <X11/Xmd.h>            /* get the typedef for CARD32 */
 
 #include <inttypes.h>
-#include <wchar.h>
 
 #include "salloc.C" // HACK, should be a seperate compile!
 
@@ -296,7 +295,6 @@
 
           /* 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_ */
         }
@@ -337,13 +335,11 @@
               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
         }
@@ -396,7 +392,6 @@
             }
 
           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;
@@ -568,19 +563,14 @@
 
   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)
@@ -1904,10 +1894,8 @@
   int n;
   unsigned int oldviewstart;
 
-#ifdef DEBUG_STRICT
-  assert ((nlines >= 0) && (nlines <= TermWin.nrow));
-#endif
   oldviewstart = TermWin.view_start;
+
   if (direction == UP)
     {
       n = TermWin.view_start + nlines;
@@ -1918,6 +1906,7 @@
       n = TermWin.view_start - nlines;
       TermWin.view_start = max (n, 0);
     }
+
   return scr_changeview (oldviewstart);
 }
 
@@ -2402,7 +2391,13 @@
 
           if (rend & RS_Uline && font->descent > 1 && fore != back)
             {
-              XSetForeground (display->display, TermWin.gc, pix_colors[fore]);
+#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]);
+
               XDrawLine (display->display, drawBuffer, TermWin.gc,
                          xpixel, ypixel + font->ascent + 1,
                          xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
@@ -3414,7 +3409,7 @@
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
-      if ((options & Opt_tripleclickwords))
+      if (options & Opt_tripleclickwords)
         {
           int end_row;
 
@@ -3442,6 +3437,15 @@
 
           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++;
         }
     }
 
@@ -3531,6 +3535,7 @@
 rxvt_term::selection_send (const XSelectionRequestEvent &rq)
 {
   XSelectionEvent ev;
+  dDisp;
 
   ev.type = SelectionNotify;
   ev.property = None;
@@ -3554,7 +3559,7 @@
       *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;
@@ -3567,7 +3572,7 @@
 #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;
     }
@@ -3635,7 +3640,7 @@
         }
       else
 #endif
-      if (XwcTextListToTextProperty (display->display, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
+      if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
         freect = 1;
       else
         {
@@ -3645,7 +3650,7 @@
           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;
@@ -3654,7 +3659,7 @@
         XFree (ct.value);
     }
 
-  XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev);
+  XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev);
 }
 
 /* ------------------------------------------------------------------------- *