From: root <root>
Date: Tue, 27 Dec 2005 01:46:06 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=e1c5a96245b631fb0917a6587a03ab63b6c8fbf0;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/Changes b/Changes
index 970a1957..64a9a422 100644
--- a/Changes
+++ b/Changes
@@ -11,7 +11,6 @@ WISH: OnTheSpot editing, or maybe switch to miiiiiiif
 WISH: just for fun, do shade and tint with XRender.
 
 6.1
-TODO: trailing spaces rmeoval for rect selections
 	- update iso8859-7 table (euro and drachma round-trip et al.).
 	- fix a crash when the selection scrolls out of the scrollback
           while the user still drags.
@@ -21,6 +20,9 @@ TODO: trailing spaces rmeoval for rect selections
           to extremely long lines and (hopefully) some segfaults.
         - iso14755 overlay position was wrong.
         - iso14755 overlay now displays rendition info, too.
+        - use unicode white space instead of hardcoded values for stripping
+          whitespace.
+        - do whitespace stripping on rectangular selections.
 
 6.0  Sat Dec 24 13:58:56 CET 2005
 	- make it compile without SMART_RESIZE again.
diff --git a/src/screen.C b/src/screen.C
index 6ba144b8..e49686bc 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -2450,8 +2450,16 @@ rxvt_term::scr_reverse_selection ()
       if (selection.rect)
         {
           for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
-            for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++)
-              srp[col] ^= RS_RVid;
+            {
+              text_t *stp = ROW(row).t;
+              rend_t *srp = ROW(row).r;
+
+              for (col = selection.beg.col; col < selection.end.col; col++)
+                srp[col] ^= RS_RVid;
+
+              while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
+                srp[col] ^= RS_RVid | RS_Uline;
+            }
         }
       else
 #endif
@@ -2889,7 +2897,7 @@ rxvt_term::selection_make (Time tm)
       col = max (col, 0);
 
       if (row == selection.end.row || selection.rect)
-        end_col = min (end_col, selection.end.col);
+        min_it (end_col, selection.end.col);
 
       t = ROW(row).t + col;
       for (; col < end_col; col++)
@@ -2917,8 +2925,20 @@ rxvt_term::selection_make (Time tm)
             new_selection_text[ofs++] = *t++;
         }
 
-      if (!ROW(row).is_longer () && row != selection.end.row)
-        new_selection_text[ofs++] = C0_LF;
+#if ENABLE_FRILLS
+      if (selection.rect)
+        {
+          while (ofs
+                 && new_selection_text[ofs - 1] != C0_LF
+                 && unicode::is_space (new_selection_text[ofs - 1]))
+            --ofs;
+
+          new_selection_text[ofs++] = C0_LF;
+        }
+      else
+#endif
+        if (!ROW(row).is_longer () && row != selection.end.row)
+          new_selection_text[ofs++] = C0_LF;
     }
 
   if (end_col != selection.end.col)
@@ -3350,9 +3370,8 @@ rxvt_term::selection_remove_trailing_spaces ()
 
       while (--end_col >= 0)
         {
-          if (stp[end_col] != ' '
-              && stp[end_col] != '\t'
-              && stp[end_col] != NOCHAR)
+          if (stp[end_col] != NOCHAR
+              && !unicode::is_space (stp[end_col]))
             break;
         }