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.327 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.371 by sf-exg, Wed Feb 9 23:07:18 2011 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 146
147 l.touch ();
148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
152 col++; 153 col++;
… …
231 selection.text = NULL; 232 selection.text = NULL;
232 selection.len = 0; 233 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
235 selection.clicks = 0; 236 selection.clicks = 0;
237 selection.clip_text = NULL;
238 selection.clip_len = 0;
236 } 239 }
237 else 240 else
238 { 241 {
239 /* 242 /*
240 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 290
288 do 291 do
289 { 292 {
290 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 294 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 295 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 296 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 297
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 299 {
… …
397 } 398 }
398 399
399 free (tabs); 400 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 401 tabs = (char *)rxvt_malloc (ncol);
401 402
402 for (int col = ncol; --col; ) 403 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 404 tabs [col] = col % TABSIZE == 0;
404 405
405 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
406 407
407 prev_nrow = nrow; 408 prev_nrow = nrow;
… …
510 } 511 }
511 512
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 514 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 515 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
518#endif
519} 518}
520 519
521void 520void
522rxvt_term::scr_swap_screen () 521rxvt_term::scr_swap_screen ()
523{ 522{
… …
548 want_refresh = 1; 547 want_refresh = 1;
549 view_start = 0; 548 view_start = 0;
550 549
551 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
552 551
553 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
554 553
555#if NSCREENS 554#if NSCREENS
556 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
557 { 556 {
558 num_scr = 0; 557 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 783 screen.cur.row -= minlines;
785 } 784 }
786 } 785 }
787 786
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 787 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 788 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 789 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 790 int row = screen.cur.row;
794 791
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 793
797 line_t *line = &ROW(row); 794 line_t *line = &ROW(row);
… …
901# else 898# else
902 c = 0xfffd; 899 c = 0xfffd;
903# endif 900# endif
904#endif 901#endif
905 902
906 // nuke the character at this position, if required
907 if (expect_false (
908 line->t[screen.cur.col] == NOCHAR
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 904
916 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 907 {
908 if (screen.flags & Screen_Autowrap)
909 {
919 // ... artificially enlargen the previous one 910 // ... artificially enlargen the previous one
920 c = NOCHAR; 911 c = NOCHAR;
921 // and try the same character next loop iteration 912 // and try the same character next loop iteration
922 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
923 } 917 }
918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
924 925
925 line->touch (); 926 line->touch ();
926 927
927 do 928 do
928 { 929 {
… …
934 else 935 else
935 { 936 {
936 line->l = ncol; 937 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
939 break; 940
941 goto end_of_line;
940 } 942 }
941 943
942 c = NOCHAR; 944 c = NOCHAR;
943 } 945 }
944 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
945 947
946 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 950 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 951 line->t[c] = ' ';
954 line->r[c] = rend; 952 line->r[c] = rend;
955 }
956 } 953 }
954
955end_of_line:
956 ;
957 } 957 }
958#if ENABLE_COMBINING 958#if ENABLE_COMBINING
959 else // width == 0 959 else // width == 0
960 { 960 {
961 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1001#endif
1002 } 1002 }
1003 1003
1004 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
1005 1005
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
1008#endif
1009} 1007}
1010 1008
1011/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
1012/* 1010/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1024
1027 want_refresh = 1; 1025 want_refresh = 1;
1028#endif 1026#endif
1029 } 1027 }
1030 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1031 else 1031 else
1032 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1033} 1033}
1034 1034
1035/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1342 return; 1342 return;
1343 1343
1344 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1345 1345
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1349 {
1353 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1354 1351
1355 if (mapped && !view_start) 1352 if (mapped)
1356 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1359 } 1356 }
1360 else 1357 else
1361 { 1358 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1360
1364 if (mapped && !view_start) 1361 if (mapped)
1365 { 1362 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1376 1373
1377 for (; num--; row++) 1374 for (; num--; row++)
1378 { 1375 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1380 1377
1381 if (!view_start) 1378 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1380 }
1384} 1381}
1385 1382
1386#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1387void 1384void
… …
1686 { 1683 {
1687 rvideo_state = on; 1684 rvideo_state = on;
1688 1685
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1692#endif 1689#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1691
1695 XGCValues gcvalue; 1692 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1838 {
1842 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1844 } 1841 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1845
1849 num_scr_allow = 0; 1846 num_scr_allow = 0;
1850 1847
… …
1941 1938
1942 bell_ev.start (VISUAL_BELL_DURATION); 1939 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1940 }
1944 else 1941 else
1945 XBell (dpy, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1944#endif
1947} 1945}
1948 1946
1949/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1948/* ARGSUSED */
… …
1969 row_start = view_start; 1967 row_start = view_start;
1970 } 1968 }
1971 1969
1972 wctomb (0, 0); 1970 wctomb (0, 0);
1973 1971
1974 for (int r1 = 0; r1 < nrows; r1++) 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1973 {
1976 text_t *tp = ROW(r1).t; 1974 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1975 int len = ROW(r1).l;
1978 1976
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2031 refresh_count = 0; 2029 refresh_count = 0;
2032 2030
2033 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2032 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2037#endif 2035#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2037
2040 /* 2038 /*
2041 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2090 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2091#else 2089#else
2092 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2093#endif 2091#endif
2094 2092
2095 if (showcursor && focus) 2093 if (focus)
2096 { 2094 {
2097 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2099 else 2097 else
2100 { 2098 {
… …
2236 2234
2237 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2237 --col;
2240 2238
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2240 text_t *text = stp + col;
2243 int count = 1; 2241 int count = 1;
2244 2242
2245 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2246 drp[col] = rend; 2244 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2248 for (i = 0; ++col < ncol; )
2251 { 2249 {
2252 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2253 { 2251 {
2254 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2255 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2256 count++; 2255 count++;
2257 i++; 2256 i++;
2258 2257
2259 continue; 2258 continue;
2260 } 2259 }
… …
2290 */ 2289 */
2291 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2293 2292
2294 // only do special processing if any attributes are set, which is unlikely 2293 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2295 {
2297 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2298 2297
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2318
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2320 fore = Color_UL;
2322#endif 2321#endif
2323 2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2324 if (invert) 2343 if (invert)
2325 { 2344 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2345 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2346
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2348 if (fore == back)
2344 { 2349 {
2345 fore = Color_bg; 2350 fore = Color_bg;
2346 back = Color_fg; 2351 back = Color_fg;
2347 } 2352 }
… …
2501 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2502 } 2507 }
2503} 2508}
2504 2509
2505void 2510void
2506rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2507{ 2512{
2513 bool transparent = false;
2514
2508#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2509 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2510#else 2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2511 2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2512 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2513 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2515 2541
2516 if (scrollBar.win) 2542 if (scrollBar.win)
2517 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2519 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2520 scrollBar.show (0); 2549 scrollBar.show (0);
2521 } 2550 }
2522 2551
2523#endif 2552 if (refresh)
2524 2553 {
2525 /* bgPixmap.apply () does not do the following : */
2526 scr_clear (); 2554 scr_clear ();
2527 scr_touch (true); 2555 scr_touch (true);
2556 }
2528 want_refresh = 1; 2557 want_refresh = 1;
2529} 2558}
2530 2559
2531/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2532void 2561void
… …
2600 { 2629 {
2601#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2602 if (selection.rect) 2631 if (selection.rect)
2603 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2604 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2605 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2606 else 2635 else
2607#endif 2636#endif
2608 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2609 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2610 RS_RVid); 2639 RS_Sel | RS_RVid);
2611 } 2640 }
2612} 2641}
2613 2642
2614/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2615/* 2644/*
… …
2620void 2649void
2621rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2622{ 2651{
2623 int row, wrote; 2652 int row, wrote;
2624 unsigned int width, towrite; 2653 unsigned int width, towrite;
2625 char r1[] = "\n"; 2654 const char r1[] = "\n";
2626 2655
2627 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2628 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2629 { 2658 {
2630 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2676/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2677/* 2706/*
2678 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2679 */ 2708 */
2680void 2709void
2681rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2682{ 2711{
2683 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2684 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2685 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2686 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2692 2721
2693 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2695} 2724}
2696 2725
2726void
2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2728{
2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2730 return;
2731
2732 tt_paste (data, len);
2733}
2734
2697/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2698/* 2736/*
2699 * Respond to a notification that a primary selection has been sent 2737 * Respond to a notification that a primary selection has been sent
2700 * EXT: SelectionNotify 2738 * EXT: SelectionNotify
2701 */ 2739 */
2702void 2740void
2703rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2704{ 2742{
2705 if (prop == None) /* check for failed XConvertSelection */ 2743 if (prop == None) /* check for failed XConvertSelection */
2706 { 2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2707 if ((selection_type & Sel_CompoundText)) 2747 if ((selection_type & Sel_CompoundText))
2708 { 2748 {
2709 int selnum = selection_type & Sel_whereMask;
2710
2711 selection_type = 0; 2749 selection_type = 0;
2712 if (selnum != Sel_direct)
2713 selection_request_other (XA_STRING, selnum); 2750 selection_request_other (XA_STRING, selnum);
2714 } 2751 }
2715 2752
2716 if ((selection_type & Sel_UTF8String)) 2753 if ((selection_type & Sel_UTF8String))
2717 { 2754 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = Sel_CompoundText; 2755 selection_type = Sel_CompoundText;
2721 if (selnum != Sel_direct)
2722 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2756 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2723 else
2724 selection_type = 0;
2725 } 2757 }
2726 2758
2727 return; 2759 return;
2728 } 2760 }
2729 2761
2730 unsigned long bytes_after; 2762 unsigned long bytes_after;
2731 XTextProperty ct; 2763 XTextProperty ct;
2732 2764
2765 // length == (2^31 - 1) / 4, as gdk
2733 if (XGetWindowProperty (dpy, win, prop, 2766 if (XGetWindowProperty (dpy, win, prop,
2734 0, PROP_SIZE / 4, 2767 0, 0x1fffffff,
2735 delete_prop, AnyPropertyType, 2768 delete_prop, AnyPropertyType,
2736 &ct.encoding, &ct.format, 2769 &ct.encoding, &ct.format,
2737 &ct.nitems, &bytes_after, 2770 &ct.nitems, &bytes_after,
2738 &ct.value) != Success) 2771 &ct.value) != Success)
2739 { 2772 {
… …
2741 goto bailout; 2774 goto bailout;
2742 } 2775 }
2743 2776
2744 if (ct.encoding == None) 2777 if (ct.encoding == None)
2745 goto bailout; 2778 goto bailout;
2746
2747 if (bytes_after)
2748 {
2749 // fetch and append remaining data
2750 XTextProperty ct2;
2751
2752 if (XGetWindowProperty (dpy, win, prop,
2753 ct.nitems / 4, (bytes_after + 3) / 4,
2754 delete_prop, AnyPropertyType,
2755 &ct2.encoding, &ct2.format,
2756 &ct2.nitems, &bytes_after,
2757 &ct2.value) != Success)
2758 goto bailout;
2759
2760 // realloc should be compatible to XFree, here, and elsewhere, too
2761 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2762 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2763 ct.nitems += ct2.nitems;
2764
2765 XFree (ct2.value);
2766 }
2767 2779
2768 if (ct.value == 0) 2780 if (ct.value == 0)
2769 goto bailout; 2781 goto bailout;
2770 2782
2771 if (ct.encoding == xa[XA_INCR]) 2783 if (ct.encoding == xa[XA_INCR])
… …
2802 { 2814 {
2803 /* 2815 /*
2804 * pass through again trying CUT_BUFFER0 if we've come from 2816 * pass through again trying CUT_BUFFER0 if we've come from
2805 * XConvertSelection () but nothing was presented 2817 * XConvertSelection () but nothing was presented
2806 */ 2818 */
2807 selection_paste (display->root, XA_CUT_BUFFER0, False); 2819 selection_paste (display->root, XA_CUT_BUFFER0, false);
2808 } 2820 }
2809 2821
2810 goto bailout; 2822 goto bailout;
2811 } 2823 }
2812 } 2824 }
… …
2815 incr_ev.start (10); 2827 incr_ev.start (10);
2816 2828
2817 while (incr_buf_fill + ct.nitems > incr_buf_size) 2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2818 { 2830 {
2819 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2820 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2832 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2821 } 2833 }
2822 2834
2823 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2824 incr_buf_fill += ct.nitems; 2836 incr_buf_fill += ct.nitems;
2825 2837
… …
2866{ 2878{
2867 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2868 2880
2869 incr_buf_size = 0; 2881 incr_buf_size = 0;
2870 free (incr_buf); 2882 free (incr_buf);
2883 incr_buf = 0;
2871 2884
2872 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2885 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2873} 2886}
2874 2887
2875void 2888void
… …
2908 selection_wait = Sel_normal; 2921 selection_wait = Sel_normal;
2909 2922
2910#if X_HAVE_UTF8_STRING 2923#if X_HAVE_UTF8_STRING
2911 selection_type = Sel_UTF8String; 2924 selection_type = Sel_UTF8String;
2912 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2925 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2913 return; 2926 return;
2914#else 2927#else
2915 selection_type = Sel_CompoundText; 2928 selection_type = Sel_CompoundText;
2916 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2929 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2917 return; 2930 return;
2918#endif 2931#endif
2919 } 2932 }
2920 2933
2921 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2934 selection_wait = Sel_none; /* don't loop in selection_paste () */
2922 selection_paste (display->root, XA_CUT_BUFFER0, false); 2935 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2950/* 2963/*
2951 * Clear all selected text 2964 * Clear all selected text
2952 * EXT: SelectionClear 2965 * EXT: SelectionClear
2953 */ 2966 */
2954void 2967void
2955rxvt_term::selection_clear () NOTHROW 2968rxvt_term::selection_clear (bool clipboard) NOTHROW
2956{ 2969{
2970 if (!clipboard)
2971 {
2957 want_refresh = 1; 2972 want_refresh = 1;
2958 free (selection.text); 2973 free (selection.text);
2959 selection.text = NULL; 2974 selection.text = NULL;
2960 selection.len = 0; 2975 selection.len = 0;
2961 CLEAR_SELECTION (); 2976 CLEAR_SELECTION ();
2962 2977
2963 if (display->selection_owner == this) 2978 if (display->selection_owner == this)
2964 display->selection_owner = 0; 2979 display->selection_owner = 0;
2980 }
2981 else
2982 {
2983 free (selection.clip_text);
2984 selection.clip_text = NULL;
2985 selection.clip_len = 0;
2986
2987 if (display->clipboard_owner == this)
2988 display->clipboard_owner = 0;
2989 }
2965} 2990}
2966 2991
2967/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
2968/* 2993/*
2969 * Copy a selection into the cut buffer 2994 * Copy a selection into the cut buffer
2970 * EXT: button 1 or 3 release 2995 * EXT: button 1 or 3 release
2971 */ 2996 */
2972void 2997void
2973rxvt_term::selection_make (Time tm) 2998rxvt_term::selection_make (Time tm)
2974{ 2999{
2975 int i; 3000 int size;
2976 wchar_t *new_selection_text; 3001 wchar_t *new_selection_text;
2977 text_t *t; 3002 text_t *t;
2978 3003
2979 switch (selection.op) 3004 switch (selection.op)
2980 { 3005 {
… …
2996 return; /* nothing selected, go away */ 3021 return; /* nothing selected, go away */
2997 3022
2998 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3023 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2999 return; 3024 return;
3000 3025
3001 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3026 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3002 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3027 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3003 3028
3004 int ofs = 0; 3029 int ofs = 0;
3005 int extra = 0; 3030 int extra = 0;
3006 3031
3007 int col = selection.beg.col; 3032 int col = selection.beg.col;
… …
3013 { 3038 {
3014#if !ENABLE_MINIMAL 3039#if !ENABLE_MINIMAL
3015 if (selection.rect) 3040 if (selection.rect)
3016 { 3041 {
3017 col = selection.beg.col; 3042 col = selection.beg.col;
3018 end_col = ncol + 1; 3043 end_col = selection.end.col;
3019 } 3044 }
3020 else 3045 else
3021#endif 3046#endif
3022 end_col = ROW(row).l; 3047 end_col = ROW(row).l;
3023 3048
3024 col = max (col, 0); 3049 col = max (col, 0);
3025 3050
3026 if (row == selection.end.row 3051 if (row == selection.end.row)
3027#if !ENABLE_MINIMAL
3028 || selection.rect
3029#endif
3030 )
3031 min_it (end_col, selection.end.col); 3052 min_it (end_col, selection.end.col);
3032 3053
3033 t = ROW(row).t + col; 3054 t = ROW(row).t + col;
3034 3055
3035 for (; col < end_col; col++) 3056 for (; col < end_col; col++)
… …
3043 3064
3044 extra -= (len - 1); 3065 extra -= (len - 1);
3045 3066
3046 if (extra < 0) 3067 if (extra < 0)
3047 { 3068 {
3048 extra += i; 3069 extra += size;
3049 i += i; 3070 size += size;
3050 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3071 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3051 } 3072 }
3052 3073
3053 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3054 } 3075 }
3055#endif 3076#endif
… …
3067 3088
3068 new_selection_text[ofs++] = C0_LF; 3089 new_selection_text[ofs++] = C0_LF;
3069 } 3090 }
3070 else 3091 else
3071#endif 3092#endif
3072 if (!ROW(row).is_longer () && row != selection.end.row) 3093 if (!ROW(row).is_longer ()
3094 && (row != selection.end.row || end_col != selection.end.col)
3095 && (row != selection.beg.row || selection.beg.col < ncol))
3073 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3074 } 3097 }
3075
3076 if (end_col != selection.end.col)
3077 new_selection_text[ofs++] = C0_LF;
3078 3098
3079 new_selection_text[ofs] = 0; 3099 new_selection_text[ofs] = 0;
3080 3100
3081 if (ofs == 0) 3101 if (ofs == 0)
3082 { 3102 {
… …
3095 3115
3096 selection_grab (tm); 3116 selection_grab (tm);
3097} 3117}
3098 3118
3099bool 3119bool
3100rxvt_term::selection_grab (Time tm) NOTHROW 3120rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3101{ 3121{
3122 Atom sel;
3123
3124 if (!clipboard)
3125 {
3102 selection_time = tm; 3126 selection_time = tm;
3127 sel = XA_PRIMARY;
3128 }
3129 else
3130 {
3131 clipboard_time = tm;
3132 sel = xa[XA_CLIPBOARD];
3133 }
3103 3134
3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3135 XSetSelectionOwner (dpy, sel, vt, tm);
3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3136 if (XGetSelectionOwner (dpy, sel) == vt)
3106 { 3137 {
3107 display->set_selection_owner (this); 3138 display->set_selection_owner (this, clipboard);
3108 return true; 3139 return true;
3109 } 3140 }
3110 else 3141 else
3111 { 3142 {
3112 selection_clear (); 3143 selection_clear (clipboard);
3113 return false; 3144 return false;
3114 } 3145 }
3115 3146
3116#if 0 3147#if 0
3117 XTextProperty ct; 3148 XTextProperty ct;
… …
3612 else if (rq.target == xa[XA_MULTIPLE]) 3643 else if (rq.target == xa[XA_MULTIPLE])
3613 { 3644 {
3614 /* TODO: Handle MULTIPLE */ 3645 /* TODO: Handle MULTIPLE */
3615 } 3646 }
3616#endif 3647#endif
3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3648 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3618 { 3649 {
3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3650 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3620 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3651 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3652 ev.property = rq.property;
3653 }
3654 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3655 {
3656 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3657 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3621 ev.property = rq.property; 3658 ev.property = rq.property;
3622 } 3659 }
3623 else if (rq.target == XA_STRING 3660 else if (rq.target == XA_STRING
3624 || rq.target == xa[XA_TEXT] 3661 || rq.target == xa[XA_TEXT]
3625 || rq.target == xa[XA_COMPOUND_TEXT] 3662 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3658 { 3695 {
3659 target = xa[XA_COMPOUND_TEXT]; 3696 target = xa[XA_COMPOUND_TEXT];
3660 style = enc_compound_text; 3697 style = enc_compound_text;
3661 } 3698 }
3662 3699
3663 if (selection.text) 3700 if (rq.selection == XA_PRIMARY && selection.text)
3664 { 3701 {
3665 cl = selection.text; 3702 cl = selection.text;
3666 selectlen = selection.len; 3703 selectlen = selection.len;
3704 }
3705 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3706 {
3707 cl = selection.clip_text;
3708 selectlen = selection.clip_len;
3667 } 3709 }
3668 else 3710 else
3669 { 3711 {
3670 cl = L""; 3712 cl = L"";
3671 selectlen = 0; 3713 selectlen = 0;

Diff Legend

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