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.377 by root, Mon Mar 21 13:46:17 2011 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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
2697/* ------------------------------------------------------------------------- */
2698/*
2699 * Respond to a notification that a primary selection has been sent
2700 * EXT: SelectionNotify
2701 */
2702void 2726void
2703rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{ 2728{
2705 if (prop == None) /* check for failed XConvertSelection */ 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2706 {
2707 if ((selection_type & Sel_CompoundText))
2708 {
2709 int selnum = selection_type & Sel_whereMask;
2710
2711 selection_type = 0;
2712 if (selnum != Sel_direct)
2713 selection_request_other (XA_STRING, selnum);
2714 }
2715
2716 if ((selection_type & Sel_UTF8String))
2717 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = Sel_CompoundText;
2721 if (selnum != Sel_direct)
2722 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2723 else
2724 selection_type = 0;
2725 }
2726
2727 return;
2728 }
2729
2730 unsigned long bytes_after;
2731 XTextProperty ct;
2732
2733 if (XGetWindowProperty (dpy, win, prop,
2734 0, PROP_SIZE / 4,
2735 delete_prop, AnyPropertyType,
2736 &ct.encoding, &ct.format,
2737 &ct.nitems, &bytes_after,
2738 &ct.value) != Success)
2739 {
2740 ct.value = 0;
2741 goto bailout;
2742 }
2743
2744 if (ct.encoding == None)
2745 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
2768 if (ct.value == 0)
2769 goto bailout;
2770
2771 if (ct.encoding == xa[XA_INCR])
2772 {
2773 // INCR selection, start handshake
2774 if (!delete_prop)
2775 XDeleteProperty (dpy, win, prop);
2776
2777 selection_wait = Sel_incr;
2778 incr_buf_fill = 0;
2779 incr_ev.start (10);
2780
2781 goto bailout;
2782 }
2783
2784 if (ct.nitems == 0)
2785 {
2786 if (selection_wait == Sel_incr)
2787 {
2788 XFree (ct.value);
2789
2790 // finally complete, now paste the whole thing
2791 selection_wait = Sel_normal;
2792 ct.value = (unsigned char *)incr_buf;
2793 ct.nitems = incr_buf_fill;
2794 incr_buf = 0;
2795 incr_buf_size = 0;
2796 incr_ev.stop ();
2797 }
2798 else
2799 {
2800 if (selection_wait == Sel_normal
2801 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2802 {
2803 /*
2804 * pass through again trying CUT_BUFFER0 if we've come from
2805 * XConvertSelection () but nothing was presented
2806 */
2807 selection_paste (display->root, XA_CUT_BUFFER0, False);
2808 }
2809
2810 goto bailout;
2811 }
2812 }
2813 else if (selection_wait == Sel_incr)
2814 {
2815 incr_ev.start (10);
2816
2817 while (incr_buf_fill + ct.nitems > incr_buf_size)
2818 {
2819 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2820 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2821 }
2822
2823 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2824 incr_buf_fill += ct.nitems;
2825
2826 goto bailout;
2827 }
2828
2829 char **cl;
2830 int cr;
2831
2832#if !ENABLE_MINIMAL
2833 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2834 // so recode it manually
2835 if (ct.encoding == xa[XA_UTF8_STRING])
2836 {
2837 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2838 char *s = rxvt_wcstombs (w);
2839 free (w);
2840 // TODO: strlen == only the first element will be converted. well...
2841 paste (s, strlen (s));
2842 free (s);
2843 }
2844 else
2845#endif
2846 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2847 && cl)
2848 {
2849 for (int i = 0; i < cr; i++)
2850 paste (cl[i], strlen (cl[i]));
2851
2852 XFreeStringList (cl);
2853 }
2854 else
2855 paste ((char *)ct.value, ct.nitems); // paste raw
2856
2857bailout:
2858 XFree (ct.value);
2859
2860 if (selection_wait == Sel_normal)
2861 selection_wait = Sel_none;
2862}
2863
2864void
2865rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2866{
2867 selection_wait = Sel_none;
2868
2869 incr_buf_size = 0;
2870 free (incr_buf);
2871
2872 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2873}
2874
2875void
2876rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2877{
2878 if (prop == None || selection_wait != Sel_incr)
2879 return; 2730 return;
2880 2731
2881 selection_paste (win, prop, true); 2732 tt_paste (data, len);
2882} 2733}
2883 2734
2884/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2885/* 2736/*
2886 * Request the current selection: 2737 * Request the current selection:
… …
2898 { 2749 {
2899 /* internal selection */ 2750 /* internal selection */
2900 char *str = rxvt_wcstombs (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2901 paste (str, strlen (str)); 2752 paste (str, strlen (str));
2902 free (str); 2753 free (str);
2903 return;
2904 }
2905 else
2906 { 2754 }
2907 selection_request_time = tm; 2755 else if (!selection_req)
2908 selection_wait = Sel_normal;
2909
2910#if X_HAVE_UTF8_STRING
2911 selection_type = Sel_UTF8String;
2912 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2913 return;
2914#else
2915 selection_type = Sel_CompoundText;
2916 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2917 return;
2918#endif
2919 } 2756 {
2920 2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2921 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2758 selection_req->run ();
2922 selection_paste (display->root, XA_CUT_BUFFER0, false);
2923}
2924
2925int
2926rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2927{
2928 Atom sel;
2929
2930 selection_type |= selnum;
2931
2932 if (selnum == Sel_Primary)
2933 sel = XA_PRIMARY;
2934 else if (selnum == Sel_Secondary)
2935 sel = XA_SECONDARY;
2936 else
2937 sel = xa[XA_CLIPBOARD];
2938
2939 if (XGetSelectionOwner (dpy, sel) != None)
2940 { 2759 }
2941 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2942 vt, selection_request_time);
2943 return 1;
2944 }
2945
2946 return 0;
2947} 2760}
2948 2761
2949/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2950/* 2763/*
2951 * Clear all selected text 2764 * Clear all selected text
2952 * EXT: SelectionClear 2765 * EXT: SelectionClear
2953 */ 2766 */
2954void 2767void
2955rxvt_term::selection_clear () NOTHROW 2768rxvt_term::selection_clear (bool clipboard) NOTHROW
2956{ 2769{
2770 if (!clipboard)
2771 {
2957 want_refresh = 1; 2772 want_refresh = 1;
2958 free (selection.text); 2773 free (selection.text);
2959 selection.text = NULL; 2774 selection.text = NULL;
2960 selection.len = 0; 2775 selection.len = 0;
2961 CLEAR_SELECTION (); 2776 CLEAR_SELECTION ();
2962 2777
2963 if (display->selection_owner == this) 2778 if (display->selection_owner == this)
2964 display->selection_owner = 0; 2779 display->selection_owner = 0;
2780 }
2781 else
2782 {
2783 free (selection.clip_text);
2784 selection.clip_text = NULL;
2785 selection.clip_len = 0;
2786
2787 if (display->clipboard_owner == this)
2788 display->clipboard_owner = 0;
2789 }
2965} 2790}
2966 2791
2967/* ------------------------------------------------------------------------- */ 2792/* ------------------------------------------------------------------------- */
2968/* 2793/*
2969 * Copy a selection into the cut buffer 2794 * Copy a selection into the cut buffer
2970 * EXT: button 1 or 3 release 2795 * EXT: button 1 or 3 release
2971 */ 2796 */
2972void 2797void
2973rxvt_term::selection_make (Time tm) 2798rxvt_term::selection_make (Time tm)
2974{ 2799{
2975 int i; 2800 int size;
2976 wchar_t *new_selection_text; 2801 wchar_t *new_selection_text;
2977 text_t *t; 2802 text_t *t;
2978 2803
2979 switch (selection.op) 2804 switch (selection.op)
2980 { 2805 {
… …
2996 return; /* nothing selected, go away */ 2821 return; /* nothing selected, go away */
2997 2822
2998 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2823 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2999 return; 2824 return;
3000 2825
3001 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2826 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3002 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2827 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3003 2828
3004 int ofs = 0; 2829 int ofs = 0;
3005 int extra = 0; 2830 int extra = 0;
3006 2831
3007 int col = selection.beg.col; 2832 int col = selection.beg.col;
… …
3013 { 2838 {
3014#if !ENABLE_MINIMAL 2839#if !ENABLE_MINIMAL
3015 if (selection.rect) 2840 if (selection.rect)
3016 { 2841 {
3017 col = selection.beg.col; 2842 col = selection.beg.col;
3018 end_col = ncol + 1; 2843 end_col = selection.end.col;
3019 } 2844 }
3020 else 2845 else
3021#endif 2846#endif
3022 end_col = ROW(row).l; 2847 end_col = ROW(row).l;
3023 2848
3024 col = max (col, 0); 2849 col = max (col, 0);
3025 2850
3026 if (row == selection.end.row 2851 if (row == selection.end.row)
3027#if !ENABLE_MINIMAL
3028 || selection.rect
3029#endif
3030 )
3031 min_it (end_col, selection.end.col); 2852 min_it (end_col, selection.end.col);
3032 2853
3033 t = ROW(row).t + col; 2854 t = ROW(row).t + col;
3034 2855
3035 for (; col < end_col; col++) 2856 for (; col < end_col; col++)
… …
3043 2864
3044 extra -= (len - 1); 2865 extra -= (len - 1);
3045 2866
3046 if (extra < 0) 2867 if (extra < 0)
3047 { 2868 {
3048 extra += i; 2869 extra += size;
3049 i += i; 2870 size += size;
3050 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2871 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3051 } 2872 }
3052 2873
3053 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2874 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3054 } 2875 }
3055#endif 2876#endif
… …
3067 2888
3068 new_selection_text[ofs++] = C0_LF; 2889 new_selection_text[ofs++] = C0_LF;
3069 } 2890 }
3070 else 2891 else
3071#endif 2892#endif
3072 if (!ROW(row).is_longer () && row != selection.end.row) 2893 if (!ROW(row).is_longer ()
2894 && (row != selection.end.row || end_col != selection.end.col)
2895 && (row != selection.beg.row || selection.beg.col < ncol))
3073 new_selection_text[ofs++] = C0_LF; 2896 new_selection_text[ofs++] = C0_LF;
3074 } 2897 }
3075
3076 if (end_col != selection.end.col)
3077 new_selection_text[ofs++] = C0_LF;
3078 2898
3079 new_selection_text[ofs] = 0; 2899 new_selection_text[ofs] = 0;
3080 2900
3081 if (ofs == 0) 2901 if (ofs == 0)
3082 { 2902 {
… …
3095 2915
3096 selection_grab (tm); 2916 selection_grab (tm);
3097} 2917}
3098 2918
3099bool 2919bool
3100rxvt_term::selection_grab (Time tm) NOTHROW 2920rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3101{ 2921{
2922 Atom sel;
2923
2924 if (!clipboard)
2925 {
3102 selection_time = tm; 2926 selection_time = tm;
2927 sel = XA_PRIMARY;
2928 }
2929 else
2930 {
2931 clipboard_time = tm;
2932 sel = xa[XA_CLIPBOARD];
2933 }
3103 2934
3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2935 XSetSelectionOwner (dpy, sel, vt, tm);
3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2936 if (XGetSelectionOwner (dpy, sel) == vt)
3106 { 2937 {
3107 display->set_selection_owner (this); 2938 display->set_selection_owner (this, clipboard);
3108 return true; 2939 return true;
3109 } 2940 }
3110 else 2941 else
3111 { 2942 {
3112 selection_clear (); 2943 selection_clear (clipboard);
3113 return false; 2944 return false;
3114 } 2945 }
3115 2946
3116#if 0 2947#if 0
3117 XTextProperty ct; 2948 XTextProperty ct;
… …
3612 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3613 { 3444 {
3614 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3615 } 3446 }
3616#endif 3447#endif
3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3618 { 3449 {
3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3620 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3452 ev.property = rq.property;
3453 }
3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3455 {
3456 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3621 ev.property = rq.property; 3458 ev.property = rq.property;
3622 } 3459 }
3623 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3624 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3625 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3658 { 3495 {
3659 target = xa[XA_COMPOUND_TEXT]; 3496 target = xa[XA_COMPOUND_TEXT];
3660 style = enc_compound_text; 3497 style = enc_compound_text;
3661 } 3498 }
3662 3499
3663 if (selection.text) 3500 if (rq.selection == XA_PRIMARY && selection.text)
3664 { 3501 {
3665 cl = selection.text; 3502 cl = selection.text;
3666 selectlen = selection.len; 3503 selectlen = selection.len;
3504 }
3505 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3506 {
3507 cl = selection.clip_text;
3508 selectlen = selection.clip_len;
3667 } 3509 }
3668 else 3510 else
3669 { 3511 {
3670 cl = L""; 3512 cl = L"";
3671 selectlen = 0; 3513 selectlen = 0;

Diff Legend

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