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.328 by root, Sun Mar 29 13:36:03 2009 UTC vs.
Revision 1.368 by sf-exg, Tue Feb 1 00:41:01 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
… …
143 col--; 144 col--;
144 145
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147 148
149 l.touch ();
150
148 // found start, nuke 151 // found start, nuke
149 do { 152 do {
150 l.t[col] = ' '; 153 l.t[col] = ' ';
151 l.r[col] = rend; 154 l.r[col] = rend;
152 col++; 155 col++;
… …
231 selection.text = NULL; 234 selection.text = NULL;
232 selection.len = 0; 235 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
235 selection.clicks = 0; 238 selection.clicks = 0;
239 selection.clip_text = NULL;
240 selection.clip_len = 0;
236 } 241 }
237 else 242 else
238 { 243 {
239 /* 244 /*
240 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 291 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 292
288 do 293 do
289 { 294 {
290 p = MOD (p - 1, prev_total_rows); 295 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 296 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 297 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
296 299
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 301 {
… …
397 } 400 }
398 401
399 free (tabs); 402 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
401 404
402 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
404 407
405 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
406 409
407 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
510 } 513 }
511 514
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 515 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 516 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 517 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 518 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 519 assert (s->cur.col >= 0);
518#endif
519} 520}
520 521
521void 522void
522rxvt_term::scr_swap_screen () 523rxvt_term::scr_swap_screen ()
523{ 524{
… …
548 want_refresh = 1; 549 want_refresh = 1;
549 view_start = 0; 550 view_start = 0;
550 551
551 selection_check (2); /* check for boundary cross */ 552 selection_check (2); /* check for boundary cross */
552 553
553 int i = current_screen; current_screen = scrn; scrn = i; 554 current_screen = scrn;
554 555
555#if NSCREENS 556#if NSCREENS
556 if (option (Opt_secondaryScreen)) 557 if (option (Opt_secondaryScreen))
557 { 558 {
558 num_scr = 0; 559 num_scr = 0;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 785 screen.cur.row -= minlines;
785 } 786 }
786 } 787 }
787 788
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 789 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 790 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 791 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 792 int row = screen.cur.row;
794 793
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 794 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 795
797 line_t *line = &ROW(row); 796 line_t *line = &ROW(row);
… …
901# else 900# else
902 c = 0xfffd; 901 c = 0xfffd;
903# endif 902# endif
904#endif 903#endif
905 904
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)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915 906
916 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
919 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
920 c = NOCHAR; 913 c = NOCHAR;
921 // and try the same character next loop iteration 914 // and try the same character next loop iteration
922 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
923 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
924 927
925 line->touch (); 928 line->touch ();
926 929
927 do 930 do
928 { 931 {
… …
934 else 937 else
935 { 938 {
936 line->l = ncol; 939 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
939 break; 942
943 goto end_of_line;
940 } 944 }
941 945
942 c = NOCHAR; 946 c = NOCHAR;
943 } 947 }
944 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
945 949
946 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
948 { 952 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 953 line->t[c] = ' ';
954 line->r[c] = rend; 954 line->r[c] = rend;
955 }
956 } 955 }
956
957end_of_line:
958 ;
957 } 959 }
958#if ENABLE_COMBINING 960#if ENABLE_COMBINING
959 else // width == 0 961 else // width == 0
960 { 962 {
961 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1003#endif
1002 } 1004 }
1003 1005
1004 max_it (line->l, screen.cur.col); 1006 max_it (line->l, screen.cur.col);
1005 1007
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1008 assert (screen.cur.row >= 0);
1008#endif
1009} 1009}
1010 1010
1011/* ------------------------------------------------------------------------- */ 1011/* ------------------------------------------------------------------------- */
1012/* 1012/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1026
1027 want_refresh = 1; 1027 want_refresh = 1;
1028#endif 1028#endif
1029 } 1029 }
1030 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1031 else 1033 else
1032 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1033} 1035}
1034 1036
1035/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1342 return; 1344 return;
1343 1345
1344 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1345 1347
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)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1351 {
1353 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1354 1353
1355 if (mapped && !view_start) 1354 if (mapped)
1356 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1359 } 1358 }
1360 else 1359 else
1361 { 1360 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1362
1364 if (mapped && !view_start) 1363 if (mapped)
1365 { 1364 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1376 1375
1377 for (; num--; row++) 1376 for (; num--; row++)
1378 { 1377 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1380 1379
1381 if (!view_start) 1380 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1382 }
1384} 1383}
1385 1384
1386#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1387void 1386void
… …
1686 { 1685 {
1687 rvideo_state = on; 1686 rvideo_state = on;
1688 1687
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1692#endif 1691#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1693
1695 XGCValues gcvalue; 1694 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1839 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1840 {
1842 min_it (rc[i].col, ncol - 1); 1841 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1842 min_it (rc[i].row, nrow - 1);
1844 } 1843 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1844
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1845 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); 1846 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1847
1849 num_scr_allow = 0; 1848 num_scr_allow = 0;
1850 1849
… …
1941 1940
1942 bell_ev.start (VISUAL_BELL_DURATION); 1941 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1942 }
1944 else 1943 else
1945 XBell (dpy, 0); 1944 XBell (dpy, 0);
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1946#endif
1947} 1947}
1948 1948
1949/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1950/* ARGSUSED */
… …
1969 row_start = view_start; 1969 row_start = view_start;
1970 } 1970 }
1971 1971
1972 wctomb (0, 0); 1972 wctomb (0, 0);
1973 1973
1974 for (int r1 = 0; r1 < nrows; r1++) 1974 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1975 {
1976 text_t *tp = ROW(r1).t; 1976 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1977 int len = ROW(r1).l;
1978 1978
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2031 refresh_count = 0; 2031 refresh_count = 0;
2032 2032
2033 unsigned int old_screen_flags = screen.flags; 2033 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2034 char have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2037#endif 2037#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2039
2040 /* 2040 /*
2041 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2090 ccol2 = bgcolor_of (rstyle); 2090 ccol2 = bgcolor_of (rstyle);
2091#else 2091#else
2092 ccol2 = Color_bg; 2092 ccol2 = Color_bg;
2093#endif 2093#endif
2094 2094
2095 if (showcursor && focus) 2095 if (focus)
2096 { 2096 {
2097 if (option (Opt_cursorUnderline)) 2097 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2098 *crp ^= RS_Uline;
2099 else 2099 else
2100 { 2100 {
… …
2236 2236
2237 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2239 --col; 2239 --col;
2240 2240
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2242 text_t *text = stp + col;
2243 int count = 1; 2243 int count = 1;
2244 2244
2245 dtp[col] = stp[col]; 2245 dtp[col] = stp[col];
2246 drp[col] = rend; 2246 drp[col] = rend;
… …
2291 */ 2291 */
2292 int fore = fgcolor_of (rend); // desired foreground 2292 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2293 int back = bgcolor_of (rend); // desired background
2294 2294
2295 // only do special processing if any attributes are set, which is unlikely 2295 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2297 {
2298 bool invert = rend & RS_RVid; 2298 bool invert = rend & RS_RVid;
2299 2299
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2300#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2301 if (rend & RS_Bold && fore == Color_fg)
… …
2320 2320
2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2321 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2322 fore = Color_UL; 2322 fore = Color_UL;
2323#endif 2323#endif
2324 2324
2325#ifdef OPTION_HC
2326 if (rend & RS_Sel)
2327 {
2328 /* invert the column if no highlightColor is set or it is the
2329 * current cursor column */
2330 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2331 && ISSET_PIXCOLOR (Color_HC))
2332 {
2333 if (ISSET_PIXCOLOR (Color_HTC))
2334 fore = Color_HTC;
2335 // if invert is 0 reverse video is set so we use bg color as fg color
2336 else if (!invert)
2337 fore = back;
2338
2339 back = Color_HC;
2340 invert = 0;
2341 }
2342 }
2343#endif
2344
2325 if (invert) 2345 if (invert)
2326 { 2346 {
2327#ifdef OPTION_HC
2328 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 || !ISSET_PIXCOLOR (Color_HC))
2330#endif
2331 /* invert the column if no highlightColor is set or it is the
2332 * current cursor column */
2333 ::swap (fore, back); 2347 ::swap (fore, back);
2334#ifdef OPTION_HC
2335 else if (ISSET_PIXCOLOR (Color_HC))
2336 back = Color_HC;
2337#endif
2338 2348
2339#ifndef NO_BOLD_UNDERLINE_REVERSE 2349#ifndef NO_BOLD_UNDERLINE_REVERSE
2340# ifndef OPTION_HC
2341 if (ISSET_PIXCOLOR (Color_RV))
2342 back = Color_RV;
2343# endif
2344 if (fore == back) 2350 if (fore == back)
2345 { 2351 {
2346 fore = Color_bg; 2352 fore = Color_bg;
2347 back = Color_fg; 2353 back = Color_fg;
2348 } 2354 }
… …
2502 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2503 } 2509 }
2504} 2510}
2505 2511
2506void 2512void
2507rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2514{
2515 bool transparent = false;
2516
2509#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2510 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2511#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2512 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2514 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2516 2543
2517 if (scrollBar.win) 2544 if (scrollBar.win)
2518 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2520 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2521 scrollBar.show (0); 2551 scrollBar.show (0);
2522 } 2552 }
2523 2553
2524#endif 2554 if (refresh)
2525 2555 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2556 scr_clear ();
2528 scr_touch (true); 2557 scr_touch (true);
2558 }
2529 want_refresh = 1; 2559 want_refresh = 1;
2530} 2560}
2531 2561
2532/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2533void 2563void
… …
2601 { 2631 {
2602#if !ENABLE_MINIMAL 2632#if !ENABLE_MINIMAL
2603 if (selection.rect) 2633 if (selection.rect)
2604 scr_xor_rect (selection.beg.row, selection.beg.col, 2634 scr_xor_rect (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2635 selection.end.row, selection.end.col,
2606 RS_RVid, RS_RVid | RS_Uline); 2636 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2607 else 2637 else
2608#endif 2638#endif
2609 scr_xor_span (selection.beg.row, selection.beg.col, 2639 scr_xor_span (selection.beg.row, selection.beg.col,
2610 selection.end.row, selection.end.col, 2640 selection.end.row, selection.end.col,
2611 RS_RVid); 2641 RS_Sel | RS_RVid);
2612 } 2642 }
2613} 2643}
2614 2644
2615/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2616/* 2646/*
… …
2621void 2651void
2622rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2653{
2624 int row, wrote; 2654 int row, wrote;
2625 unsigned int width, towrite; 2655 unsigned int width, towrite;
2626 char r1[] = "\n"; 2656 const char r1[] = "\n";
2627 2657
2628 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2630 { 2660 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2677/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2678/* 2708/*
2679 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2680 */ 2710 */
2681void 2711void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2713{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2693 2723
2694 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2696} 2726}
2697 2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2735}
2736
2698/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2699/* 2738/*
2700 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
2701 * EXT: SelectionNotify 2740 * EXT: SelectionNotify
2702 */ 2741 */
2703void 2742void
2704rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2705{ 2744{
2706 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2707 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2708 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2709 { 2753 {
2710 int selnum = selection_type & Sel_whereMask;
2711
2712 selection_type = 0; 2754 selection_type = 0;
2713 if (selnum != Sel_direct)
2714 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2715 } 2756 }
2716 2757
2717 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2718 { 2759 {
2719 int selnum = selection_type & Sel_whereMask;
2720
2721 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2722 if (selnum != Sel_direct)
2723 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2724 else
2725 selection_type = 0;
2726 } 2762 }
2727 2763
2728 return; 2764 return;
2729 } 2765 }
2730 2766
… …
2757 &ct2.nitems, &bytes_after, 2793 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success) 2794 &ct2.value) != Success)
2759 goto bailout; 2795 goto bailout;
2760 2796
2761 // realloc should be compatible to XFree, here, and elsewhere, too 2797 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems; 2800 ct.nitems += ct2.nitems;
2765 2801
2766 XFree (ct2.value); 2802 XFree (ct2.value);
2767 } 2803 }
… …
2803 { 2839 {
2804 /* 2840 /*
2805 * pass through again trying CUT_BUFFER0 if we've come from 2841 * pass through again trying CUT_BUFFER0 if we've come from
2806 * XConvertSelection () but nothing was presented 2842 * XConvertSelection () but nothing was presented
2807 */ 2843 */
2808 selection_paste (display->root, XA_CUT_BUFFER0, False); 2844 selection_paste (display->root, XA_CUT_BUFFER0, false);
2809 } 2845 }
2810 2846
2811 goto bailout; 2847 goto bailout;
2812 } 2848 }
2813 } 2849 }
… …
2816 incr_ev.start (10); 2852 incr_ev.start (10);
2817 2853
2818 while (incr_buf_fill + ct.nitems > incr_buf_size) 2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 { 2855 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2822 } 2858 }
2823 2859
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems; 2861 incr_buf_fill += ct.nitems;
2826 2862
… …
2909 selection_wait = Sel_normal; 2945 selection_wait = Sel_normal;
2910 2946
2911#if X_HAVE_UTF8_STRING 2947#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String; 2948 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2949 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return; 2950 return;
2915#else 2951#else
2916 selection_type = Sel_CompoundText; 2952 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2953 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return; 2954 return;
2919#endif 2955#endif
2920 } 2956 }
2921 2957
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2958 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false); 2959 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2951/* 2987/*
2952 * Clear all selected text 2988 * Clear all selected text
2953 * EXT: SelectionClear 2989 * EXT: SelectionClear
2954 */ 2990 */
2955void 2991void
2956rxvt_term::selection_clear () NOTHROW 2992rxvt_term::selection_clear (bool clipboard) NOTHROW
2957{ 2993{
2994 if (!clipboard)
2995 {
2958 want_refresh = 1; 2996 want_refresh = 1;
2959 free (selection.text); 2997 free (selection.text);
2960 selection.text = NULL; 2998 selection.text = NULL;
2961 selection.len = 0; 2999 selection.len = 0;
2962 CLEAR_SELECTION (); 3000 CLEAR_SELECTION ();
2963 3001
2964 if (display->selection_owner == this) 3002 if (display->selection_owner == this)
2965 display->selection_owner = 0; 3003 display->selection_owner = 0;
3004 }
3005 else
3006 {
3007 free (selection.clip_text);
3008 selection.clip_text = NULL;
3009 selection.clip_len = 0;
3010
3011 if (display->clipboard_owner == this)
3012 display->clipboard_owner = 0;
3013 }
2966} 3014}
2967 3015
2968/* ------------------------------------------------------------------------- */ 3016/* ------------------------------------------------------------------------- */
2969/* 3017/*
2970 * Copy a selection into the cut buffer 3018 * Copy a selection into the cut buffer
2971 * EXT: button 1 or 3 release 3019 * EXT: button 1 or 3 release
2972 */ 3020 */
2973void 3021void
2974rxvt_term::selection_make (Time tm) 3022rxvt_term::selection_make (Time tm)
2975{ 3023{
2976 int i; 3024 int size;
2977 wchar_t *new_selection_text; 3025 wchar_t *new_selection_text;
2978 text_t *t; 3026 text_t *t;
2979 3027
2980 switch (selection.op) 3028 switch (selection.op)
2981 { 3029 {
… …
2997 return; /* nothing selected, go away */ 3045 return; /* nothing selected, go away */
2998 3046
2999 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3047 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3000 return; 3048 return;
3001 3049
3002 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3050 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3003 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3051 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3004 3052
3005 int ofs = 0; 3053 int ofs = 0;
3006 int extra = 0; 3054 int extra = 0;
3007 3055
3008 int col = selection.beg.col; 3056 int col = selection.beg.col;
… …
3014 { 3062 {
3015#if !ENABLE_MINIMAL 3063#if !ENABLE_MINIMAL
3016 if (selection.rect) 3064 if (selection.rect)
3017 { 3065 {
3018 col = selection.beg.col; 3066 col = selection.beg.col;
3019 end_col = ncol + 1; 3067 end_col = selection.end.col;
3020 } 3068 }
3021 else 3069 else
3022#endif 3070#endif
3023 end_col = ROW(row).l; 3071 end_col = ROW(row).l;
3024 3072
3025 col = max (col, 0); 3073 col = max (col, 0);
3026 3074
3027 if (row == selection.end.row 3075 if (row == selection.end.row)
3028#if !ENABLE_MINIMAL
3029 || selection.rect
3030#endif
3031 )
3032 min_it (end_col, selection.end.col); 3076 min_it (end_col, selection.end.col);
3033 3077
3034 t = ROW(row).t + col; 3078 t = ROW(row).t + col;
3035 3079
3036 for (; col < end_col; col++) 3080 for (; col < end_col; col++)
… …
3044 3088
3045 extra -= (len - 1); 3089 extra -= (len - 1);
3046 3090
3047 if (extra < 0) 3091 if (extra < 0)
3048 { 3092 {
3049 extra += i; 3093 extra += size;
3050 i += i; 3094 size += size;
3051 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3095 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3052 } 3096 }
3053 3097
3054 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3098 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3055 } 3099 }
3056#endif 3100#endif
… …
3068 3112
3069 new_selection_text[ofs++] = C0_LF; 3113 new_selection_text[ofs++] = C0_LF;
3070 } 3114 }
3071 else 3115 else
3072#endif 3116#endif
3073 if (!ROW(row).is_longer () && row != selection.end.row) 3117 if (!ROW(row).is_longer ()
3118 && (row != selection.end.row || end_col != selection.end.col)
3119 && (row != selection.beg.row || selection.beg.col < ncol))
3074 new_selection_text[ofs++] = C0_LF; 3120 new_selection_text[ofs++] = C0_LF;
3075 } 3121 }
3076
3077 if (end_col != selection.end.col)
3078 new_selection_text[ofs++] = C0_LF;
3079 3122
3080 new_selection_text[ofs] = 0; 3123 new_selection_text[ofs] = 0;
3081 3124
3082 if (ofs == 0) 3125 if (ofs == 0)
3083 { 3126 {
… …
3096 3139
3097 selection_grab (tm); 3140 selection_grab (tm);
3098} 3141}
3099 3142
3100bool 3143bool
3101rxvt_term::selection_grab (Time tm) NOTHROW 3144rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3102{ 3145{
3146 Atom sel;
3147
3148 if (!clipboard)
3149 {
3103 selection_time = tm; 3150 selection_time = tm;
3151 sel = XA_PRIMARY;
3152 }
3153 else
3154 {
3155 clipboard_time = tm;
3156 sel = xa[XA_CLIPBOARD];
3157 }
3104 3158
3105 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3159 XSetSelectionOwner (dpy, sel, vt, tm);
3106 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3160 if (XGetSelectionOwner (dpy, sel) == vt)
3107 { 3161 {
3108 display->set_selection_owner (this); 3162 display->set_selection_owner (this, clipboard);
3109 return true; 3163 return true;
3110 } 3164 }
3111 else 3165 else
3112 { 3166 {
3113 selection_clear (); 3167 selection_clear (clipboard);
3114 return false; 3168 return false;
3115 } 3169 }
3116 3170
3117#if 0 3171#if 0
3118 XTextProperty ct; 3172 XTextProperty ct;
… …
3613 else if (rq.target == xa[XA_MULTIPLE]) 3667 else if (rq.target == xa[XA_MULTIPLE])
3614 { 3668 {
3615 /* TODO: Handle MULTIPLE */ 3669 /* TODO: Handle MULTIPLE */
3616 } 3670 }
3617#endif 3671#endif
3618 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3672 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3619 { 3673 {
3620 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3674 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3621 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3675 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3676 ev.property = rq.property;
3677 }
3678 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3679 {
3680 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3681 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3622 ev.property = rq.property; 3682 ev.property = rq.property;
3623 } 3683 }
3624 else if (rq.target == XA_STRING 3684 else if (rq.target == XA_STRING
3625 || rq.target == xa[XA_TEXT] 3685 || rq.target == xa[XA_TEXT]
3626 || rq.target == xa[XA_COMPOUND_TEXT] 3686 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3659 { 3719 {
3660 target = xa[XA_COMPOUND_TEXT]; 3720 target = xa[XA_COMPOUND_TEXT];
3661 style = enc_compound_text; 3721 style = enc_compound_text;
3662 } 3722 }
3663 3723
3664 if (selection.text) 3724 if (rq.selection == XA_PRIMARY && selection.text)
3665 { 3725 {
3666 cl = selection.text; 3726 cl = selection.text;
3667 selectlen = selection.len; 3727 selectlen = selection.len;
3728 }
3729 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3730 {
3731 cl = selection.clip_text;
3732 selectlen = selection.clip_len;
3668 } 3733 }
3669 else 3734 else
3670 { 3735 {
3671 cl = L""; 3736 cl = L"";
3672 selectlen = 0; 3737 selectlen = 0;

Diff Legend

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