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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.222 by root, Wed Jan 11 05:14:26 2006 UTC vs.
Revision 1.224 by root, Thu Jan 12 03:32:56 2006 UTC

  * Change the colour for following text
  */
 void
 rxvt_term::scr_color (unsigned int color, int fgbg)
 {
-  if (!IN_RANGE_INC (color, minTermCOLOR, maxTermCOLOR))
+  if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
     color = fgbg;
   if (fgbg == Color_fg)
     rstyle = SET_FGCOLOR (rstyle, color);
   else
 rxvt_term::selection_click (int clicks, int x, int y)
 {
   clicks = ((clicks - 1) % 3) + 1;
   selection.clicks = clicks;       /* save clicks so extend will work */
+  if (clicks == 2 && !selection.rect
+      && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
+    {
+      MEvent.clicks = 1; // what a mess
+      return;
+    }
   selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
   if (clicks == 2 || clicks == 3)
     selection_extend_colrow (selection.mark.col,
                              selection.mark.row + view_start,
   else if (selection.clicks == 2)
     {
       if (ROWCOL_IS_AFTER (selection.end, selection.beg))
         selection.end.col--;
-      if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
-        {
-          selection_delimit_word (UP, &selection.beg, &selection.beg);
+      selection_delimit_word (UP, &selection.beg, &selection.beg);
-          selection_delimit_word (DN, &selection.end, &selection.end);
+      selection_delimit_word (DN, &selection.end, &selection.end);
-        }
     }
   else if (selection.clicks == 3)
     {
 #if ENABLE_FRILLS
       if (OPTION (Opt_tripleclickwords))

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