ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.194 by root, Mon Dec 26 21:30:04 2005 UTC vs.
Revision 1.205 by root, Tue Jan 3 04:18:47 2006 UTC

… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
351 lofs += len; 352 lofs += len;
352 qcol += len; 353 qcol += len;
353 } 354 }
354 } 355 }
355 356
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
364#endif
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 } 366 }
359 while (p != pend && q > 0); 367 while (p != pend && q > 0);
360 368
361 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
… …
410 418
411 for (int col = ncol; col--; ) 419 for (int col = ncol; col--; )
412 tabs [col] = col % TABSIZE == 0; 420 tabs [col] = col % TABSIZE == 0;
413 421
414 tt_winch (); 422 tt_winch ();
423
424 PERL_INVOKE ((this, HOOK_RESET, DT_END));
415} 425}
416 426
417/* ------------------------------------------------------------------------- */ 427/* ------------------------------------------------------------------------- */
418/* 428/*
419 * Free everything. That way malloc debugging can find leakage. 429 * Free everything. That way malloc debugging can find leakage.
… …
523 533
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 534 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 535 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526 536
527#if NSCREENS 537#if NSCREENS
528 if (options & Opt_secondaryScreen) 538 if (OPTION (Opt_secondaryScreen))
529 { 539 {
530 num_scr = 0; 540 num_scr = 0;
531 541
532 for (int i = prev_nrow; i--; ) 542 for (int i = prev_nrow; i--; )
533 ::swap (ROW(i), swap_buf [i]); 543 ::swap (ROW(i), swap_buf [i]);
… …
537 screen.flags |= Screen_VisibleCursor; 547 screen.flags |= Screen_VisibleCursor;
538 swap.flags |= Screen_VisibleCursor; 548 swap.flags |= Screen_VisibleCursor;
539 } 549 }
540 else 550 else
541#endif 551#endif
542 if (options & Opt_secondaryScroll) 552 if (OPTION (Opt_secondaryScroll))
543 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 553 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
544 554
545 return scrn; 555 return scrn;
546} 556}
547 557
… …
609 num_scr += count; 619 num_scr += count;
610 620
611 if (count > 0 621 if (count > 0
612 && row1 == 0 622 && row1 == 0
613 && row2 == nrow - 1 623 && row2 == nrow - 1
614 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
615 { 625 {
616 nsaved = min (nsaved + count, saveLines); 626 nsaved = min (nsaved + count, saveLines);
627
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
629
617 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
618 631
619 if (selection.op && current_screen == selection.screen) 632 if (selection.op && current_screen == selection.screen)
620 { 633 {
621 selection.beg.row -= count; 634 selection.beg.row -= count;
… …
630 selection.op = SELECTION_CLEAR; 643 selection.op = SELECTION_CLEAR;
631 } 644 }
632 } 645 }
633 646
634 for (int i = count; i--; ) 647 for (int i = count; i--; )
648 {
649 ROW(row2 - i).l = 0;
635 scr_blank_screen_mem (ROW(row2 - i), rstyle); 650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
636 652
637 if ((options & Opt_scrollWithBuffer) 653 if (OPTION (Opt_scrollWithBuffer)
638 && view_start != 0 654 && view_start != 0
639 && view_start != saveLines) 655 && view_start != saveLines)
640 scr_page (UP, count); 656 scr_page (UP, count);
641 } 657 }
642 else 658 else
… …
733 { 749 {
734 c = *str++; 750 c = *str++;
735 751
736 if (c < 0x20) 752 if (c < 0x20)
737 if (c == C0_LF) 753 if (c == C0_LF)
738 { 754 {
739 if (!line->is_longer ()) /* XXX: think about this */ 755 if (!line->is_longer ()) /* XXX: think about this */
740 max_it (line->l, screen.cur.col); 756 max_it (line->l, screen.cur.col);
741 757
742 screen.flags &= ~Screen_WrapNext; 758 screen.flags &= ~Screen_WrapNext;
743 759
… …
1008 if (count) 1024 if (count)
1009 x = ncol - 1; 1025 x = ncol - 1;
1010 1026
1011 // store horizontal tab commands as characters inside the text 1027 // store horizontal tab commands as characters inside the text
1012 // buffer so they can be selected and pasted. 1028 // buffer so they can be selected and pasted.
1013 if (ht && options & Opt_pastableTabs) 1029 if (ht && OPTION (Opt_pastableTabs))
1014 { 1030 {
1015 base_rend = SET_FONT (base_rend, 0); 1031 base_rend = SET_FONT (base_rend, 0);
1016 1032
1017 if (!l.is_longer ()) /* XXX: think about this */ 1033 if (!l.is_longer ()) /* XXX: think about this */
1018 max_it (l.l, x); 1034 max_it (l.l, x);
… …
1274 CLEAR_ROWS (row, num); 1290 CLEAR_ROWS (row, num);
1275 } 1291 }
1276 else 1292 else
1277 { 1293 {
1278 ren = rstyle & (RS_fgMask | RS_bgMask); 1294 ren = rstyle & (RS_fgMask | RS_bgMask);
1279 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1295 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1280 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1296 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1281 ERASE_ROWS (row, num); 1297 ERASE_ROWS (row, num);
1282 gcvalue.foreground = pix_colors[Color_fg]; 1298 gcvalue.foreground = pix_colors[Color_fg];
1283 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1299 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1284 } 1300 }
1285 1301
1286 for (; num--; row++) 1302 for (; num--; row++)
1287 { 1303 {
1304 ROW (row).l = 0;
1288 scr_blank_screen_mem (ROW (row), rstyle); 1305 scr_blank_screen_mem (ROW (row), rstyle);
1289 ROW (row).l = 0;
1290 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1306 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1291 } 1307 }
1292} 1308}
1293 1309
1294#if ENABLE_FRILLS 1310#if ENABLE_FRILLS
… …
1583 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1584#if XPM_BACKGROUND 1600#if XPM_BACKGROUND
1585 if (bgPixmap.pixmap == None) 1601 if (bgPixmap.pixmap == None)
1586#endif 1602#endif
1587#if TRANSPARENT 1603#if TRANSPARENT
1588 if (! (options & Opt_transparent) || am_transparent == 0) 1604 if (! OPTION (Opt_transparent) || am_transparent == 0)
1589#endif 1605#endif
1590 XSetWindowBackground (display->display, vt, 1606 XSetWindowBackground (display->display, vt,
1591 pix_colors[Color_bg]); 1607 pix_colors[Color_bg]);
1592 1608
1593 gcvalue.foreground = pix_colors[Color_fg]; 1609 gcvalue.foreground = pix_colors[Color_fg];
… …
1809} 1825}
1810 1826
1811int 1827int
1812rxvt_term::scr_changeview (unsigned int oldviewstart) 1828rxvt_term::scr_changeview (unsigned int oldviewstart)
1813{ 1829{
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831
1814 if (view_start != oldviewstart) 1832 if (view_start != oldviewstart)
1815 { 1833 {
1816 want_refresh = 1; 1834 want_refresh = 1;
1817 num_scr -= (view_start - oldviewstart); 1835 num_scr -= (view_start - oldviewstart);
1818 } 1836 }
… …
1826{ 1844{
1827#ifndef NO_BELL 1845#ifndef NO_BELL
1828 1846
1829# ifndef NO_MAPALERT 1847# ifndef NO_MAPALERT
1830# ifdef MAPALERT_OPTION 1848# ifdef MAPALERT_OPTION
1831 if (options & Opt_mapAlert) 1849 if (OPTION (Opt_mapAlert))
1832# endif 1850# endif
1833 XMapWindow (display->display, parent[0]); 1851 XMapWindow (display->display, parent[0]);
1834# endif 1852# endif
1835 1853
1836 if (options & Opt_visualBell) 1854 if (OPTION (Opt_visualBell))
1837 { 1855 {
1838 scr_rvideo_mode (!rvideo); /* refresh also done */ 1856 scr_rvideo_mode (!rvideo); /* refresh also done */
1839 rxvt_usleep (VISUAL_BELL_DURATION); 1857 rxvt_usleep (VISUAL_BELL_DURATION);
1840 scr_rvideo_mode (!rvideo); /* refresh also done */ 1858 scr_rvideo_mode (!rvideo); /* refresh also done */
1841 } 1859 }
… …
1932 1950
1933#if XPM_BACKGROUND 1951#if XPM_BACKGROUND
1934 must_clear |= bgPixmap.pixmap != None; 1952 must_clear |= bgPixmap.pixmap != None;
1935#endif 1953#endif
1936#if TRANSPARENT 1954#if TRANSPARENT
1937 must_clear |= (options & Opt_transparent) && am_transparent; 1955 must_clear |= OPTION (Opt_transparent) && am_transparent;
1938#endif 1956#endif
1939 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1957 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1940 1958
1941 /* 1959 /*
1942 * B: reverse any characters which are selected 1960 * B: reverse any characters which are selected
… …
1966 1984
1967 crp = &ROW(screen.cur.row).r[col]; 1985 crp = &ROW(screen.cur.row).r[col];
1968 1986
1969 if (showcursor && focus) 1987 if (showcursor && focus)
1970 { 1988 {
1971 if (options & Opt_cursorUnderline) 1989 if (OPTION (Opt_cursorUnderline))
1972 *crp ^= RS_Uline; 1990 *crp ^= RS_Uline;
1973 else 1991 else
1974 { 1992 {
1975 *crp ^= RS_RVid; 1993 *crp ^= RS_RVid;
1976 1994
… …
1978 cc1 = *crp & (RS_fgMask | RS_bgMask); 1996 cc1 = *crp & (RS_fgMask | RS_bgMask);
1979 if (ISSET_PIXCOLOR (Color_cursor)) 1997 if (ISSET_PIXCOLOR (Color_cursor))
1980 ccol1 = Color_cursor; 1998 ccol1 = Color_cursor;
1981 else 1999 else
1982#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1983 ccol1 = GET_FGCOLOR (rstyle); 2001 ccol1 = fgcolor_of (rstyle);
1984#else 2002#else
1985 ccol1 = Color_fg; 2003 ccol1 = Color_fg;
1986#endif 2004#endif
1987 if (ISSET_PIXCOLOR (Color_cursor2)) 2005 if (ISSET_PIXCOLOR (Color_cursor2))
1988 ccol2 = Color_cursor2; 2006 ccol2 = Color_cursor2;
1989 else 2007 else
1990#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2008#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1991 ccol2 = GET_BGCOLOR (rstyle); 2009 ccol2 = bgcolor_of (rstyle);
1992#else 2010#else
1993 ccol2 = Color_bg; 2011 ccol2 = Color_bg;
1994#endif 2012#endif
1995 *crp = SET_FGCOLOR (*crp, ccol1); 2013 *crp = SET_FGCOLOR (*crp, ccol1);
1996 *crp = SET_BGCOLOR (*crp, ccol2); 2014 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2029 oldcursor.col = screen.cur.col; 2047 oldcursor.col = screen.cur.col;
2030 } 2048 }
2031 } 2049 }
2032 } 2050 }
2033 2051
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2034#if ENABLE_OVERLAY 2053#if ENABLE_OVERLAY
2035 scr_swap_overlay (); 2054 scr_swap_overlay ();
2036#endif 2055#endif
2037 2056
2038#ifndef NO_SLOW_LINK_SUPPORT 2057#ifndef NO_SLOW_LINK_SUPPORT
… …
2177 count++, i--; 2196 count++, i--;
2178 2197
2179 /* 2198 /*
2180 * Determine the attributes for the string 2199 * Determine the attributes for the string
2181 */ 2200 */
2182 int fore = GET_FGCOLOR (rend); // desired foreground 2201 int fore = fgcolor_of (rend); // desired foreground
2183 int back = GET_BGCOLOR (rend); // desired background 2202 int back = bgcolor_of (rend); // desired background
2184 2203
2185 // only do special processing if any attributes are set, which is rare 2204 // only do special processing if any attributes are set, which is unlikely
2186 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2205 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2187 { 2206 {
2188#if ENABLE_STYLES 2207#if ENABLE_STYLES
2189 // force redraw after "careful" characters to avoid pixel droppings 2208 // force redraw after "careful" characters to avoid pixel droppings
2190 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2209 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2301 } /* for (row....) */ 2320 } /* for (row....) */
2302 2321
2303#if ENABLE_OVERLAY 2322#if ENABLE_OVERLAY
2304 scr_swap_overlay (); 2323 scr_swap_overlay ();
2305#endif 2324#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2306 2326
2307 /* 2327 /*
2308 * G: cleanup cursor and display outline cursor if necessary 2328 * G: cleanup cursor and display outline cursor if necessary
2309 */ 2329 */
2310 if (showcursor) 2330 if (showcursor)
2311 { 2331 {
2312 if (focus) 2332 if (focus)
2313 { 2333 {
2314 if (options & Opt_cursorUnderline) 2334 if (OPTION (Opt_cursorUnderline))
2315 *crp ^= RS_Uline; 2335 *crp ^= RS_Uline;
2316 else 2336 else
2317 { 2337 {
2318 *crp ^= RS_RVid; 2338 *crp ^= RS_RVid;
2319#ifndef NO_CURSORCOLOR 2339#ifndef NO_CURSORCOLOR
… …
2438 2458
2439#if ENABLE_FRILLS 2459#if ENABLE_FRILLS
2440 if (selection.rect) 2460 if (selection.rect)
2441 { 2461 {
2442 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2463 {
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2443 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2467 for (col = selection.beg.col; col < selection.end.col; col++)
2444 srp[col] ^= RS_RVid; 2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2445 } 2476 }
2446 else 2477 else
2447#endif 2478#endif
2448 { 2479 {
2449 if (selection.beg.row >= -view_start) 2480 if (selection.beg.row >= -view_start)
… …
2452 row = selection.beg.row; 2483 row = selection.beg.row;
2453 } 2484 }
2454 else 2485 else
2455 { 2486 {
2456 col = 0; 2487 col = 0;
2457 row = view_start; 2488 row = -view_start;
2458 } 2489 }
2459 2490
2460 for (; row < min (selection.end.row, view_end); row++, col = 0) 2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2461 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2462 srp[col] ^= RS_RVid; 2493 srp[col] ^= RS_RVid;
… …
2851 selection.op = SELECTION_DONE; 2882 selection.op = SELECTION_DONE;
2852 2883
2853 if (selection.clicks == 4) 2884 if (selection.clicks == 4)
2854 return; /* nothing selected, go away */ 2885 return; /* nothing selected, go away */
2855 2886
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return;
2889
2856 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2857 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2858 2892
2859 int ofs = 0; 2893 int ofs = 0;
2860 int extra = 0; 2894 int extra = 0;
… …
2876#endif 2910#endif
2877 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2878 2912
2879 col = max (col, 0); 2913 col = max (col, 0);
2880 2914
2881 if (row == selection.end.row || selection.rect) 2915 if (row == selection.end.row
2916#if ENABLE_FRILLS
2917 || selection.rect
2918#endif
2919 )
2882 end_col = min (end_col, selection.end.col); 2920 min_it (end_col, selection.end.col);
2883 2921
2884 t = ROW(row).t + col; 2922 t = ROW(row).t + col;
2885 for (; col < end_col; col++) 2923 for (; col < end_col; col++)
2886 { 2924 {
2887 if (*t == NOCHAR) 2925 if (*t == NOCHAR)
… …
2905#endif 2943#endif
2906 else 2944 else
2907 new_selection_text[ofs++] = *t++; 2945 new_selection_text[ofs++] = *t++;
2908 } 2946 }
2909 2947
2948#if ENABLE_FRILLS
2949 if (selection.rect)
2950 {
2951 while (ofs
2952 && new_selection_text[ofs - 1] != C0_LF
2953 && unicode::is_space (new_selection_text[ofs - 1]))
2954 --ofs;
2955
2956 new_selection_text[ofs++] = C0_LF;
2957 }
2958 else
2959#endif
2910 if (!ROW(row).is_longer () && row != selection.end.row) 2960 if (!ROW(row).is_longer () && row != selection.end.row)
2911 new_selection_text[ofs++] = C0_LF; 2961 new_selection_text[ofs++] = C0_LF;
2912 } 2962 }
2913 2963
2914 if (end_col != selection.end.col) 2964 if (end_col != selection.end.col)
2915 new_selection_text[ofs++] = C0_LF; 2965 new_selection_text[ofs++] = C0_LF;
2916 2966
… …
2926 2976
2927 // we usually allocate much more than necessary, so realloc it smaller again 2977 // we usually allocate much more than necessary, so realloc it smaller again
2928 selection.len = ofs; 2978 selection.len = ofs;
2929 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2930 2980
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return;
2983
2984 selection_grab (tm);
2985}
2986
2987bool
2988rxvt_term::selection_grab (Time tm)
2989{
2990 selection_time = tm;
2991
2931 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2932 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 {
2933 display->set_selection_owner (this); 2995 display->set_selection_owner (this);
2996 return true;
2997 }
2934 else 2998 else
2935 rxvt_warn ("can't get primary selection, ignoring.\n"); 2999 return false;
2936 3000
2937#if 0 3001#if 0
2938 XTextProperty ct; 3002 XTextProperty ct;
2939 3003
2940 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2941 { 3005 {
2942 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3006 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2943 XFree (ct.value); 3007 XFree (ct.value);
2944 } 3008 }
2945#endif 3009#endif
2946
2947 selection_time = tm;
2948} 3010}
2949 3011
2950/* ------------------------------------------------------------------------- */ 3012/* ------------------------------------------------------------------------- */
2951/* 3013/*
2952 * Mark or select text based upon number of clicks: 1, 2, or 3 3014 * Mark or select text based upon number of clicks: 1, 2, or 3
… …
3267 selection_delimit_word (DN, &selection.end, &selection.end); 3329 selection_delimit_word (DN, &selection.end, &selection.end);
3268 } 3330 }
3269 else if (selection.clicks == 3) 3331 else if (selection.clicks == 3)
3270 { 3332 {
3271#if ENABLE_FRILLS 3333#if ENABLE_FRILLS
3272 if (options & Opt_tripleclickwords) 3334 if (OPTION (Opt_tripleclickwords))
3273 { 3335 {
3274 selection_delimit_word (UP, &selection.beg, &selection.beg); 3336 selection_delimit_word (UP, &selection.beg, &selection.beg);
3275 3337
3276 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3338 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3277 { 3339 {
… …
3338 { 3400 {
3339 stp = ROW(end_row).t; 3401 stp = ROW(end_row).t;
3340 3402
3341 while (--end_col >= 0) 3403 while (--end_col >= 0)
3342 { 3404 {
3343 if (stp[end_col] != ' ' 3405 if (stp[end_col] != NOCHAR
3344 && stp[end_col] != '\t' 3406 && !unicode::is_space (stp[end_col]))
3345 && stp[end_col] != NOCHAR)
3346 break; 3407 break;
3347 } 3408 }
3348 3409
3349 if (end_col >= 0 3410 if (end_col >= 0
3350 || !ROW(end_row - 1).is_longer ()) 3411 || !ROW(end_row - 1).is_longer ())
… …
3549 3610
3550#if ENABLE_OVERLAY 3611#if ENABLE_OVERLAY
3551void 3612void
3552rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3613rxvt_term::scr_overlay_new (int x, int y, int w, int h)
3553{ 3614{
3554 if (nrow < 3 || ncol < 3) 3615 if (nrow < 1 || ncol < 1)
3555 return; 3616 return;
3556 3617
3557 want_refresh = 1; 3618 want_refresh = 1;
3558 3619
3559 scr_overlay_off (); 3620 scr_overlay_off ();
… …
3666 for (int y = ov_h; y--; ) 3727 for (int y = ov_h; y--; )
3667 { 3728 {
3668 text_t *t1 = ov_text[y]; 3729 text_t *t1 = ov_text[y];
3669 rend_t *r1 = ov_rend[y]; 3730 rend_t *r1 = ov_rend[y];
3670 3731
3671 text_t *t2 = ROW(y - view_start).t + ov_x; 3732 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3672 rend_t *r2 = ROW(y - view_start).r + ov_x; 3733 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3673 3734
3674 for (int x = ov_w; x--; ) 3735 for (int x = ov_w; x--; )
3675 { 3736 {
3676 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3737 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3677 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3738 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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