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.331 by sf-exg, Wed Jan 6 17:52:43 2010 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
… …
395 } 398 }
396 399
397 free (tabs); 400 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 401 tabs = (char *)rxvt_malloc (ncol);
399 402
400 for (int col = ncol; --col; ) 403 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 404 tabs [col] = col % TABSIZE == 0;
402 405
403 CLEAR_ALL_SELECTION (); 406 CLEAR_ALL_SELECTION ();
404 407
405 prev_nrow = nrow; 408 prev_nrow = nrow;
… …
544 want_refresh = 1; 547 want_refresh = 1;
545 view_start = 0; 548 view_start = 0;
546 549
547 selection_check (2); /* check for boundary cross */ 550 selection_check (2); /* check for boundary cross */
548 551
549 int i = current_screen; current_screen = scrn; scrn = i; 552 current_screen = scrn;
550 553
551#if NSCREENS 554#if NSCREENS
552 if (option (Opt_secondaryScreen)) 555 if (option (Opt_secondaryScreen))
553 { 556 {
554 num_scr = 0; 557 num_scr = 0;
… …
895# else 898# else
896 c = 0xfffd; 899 c = 0xfffd;
897# endif 900# endif
898#endif 901#endif
899 902
900 // nuke the character at this position, if required
901 if (expect_false (
902 line->t[screen.cur.col] == NOCHAR
903 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909 904
910 // if the character doesn't fit into the remaining columns... 905 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 { 907 {
908 if (screen.flags & Screen_Autowrap)
909 {
913 // ... artificially enlargen the previous one 910 // ... artificially enlargen the previous one
914 c = NOCHAR; 911 c = NOCHAR;
915 // and try the same character next loop iteration 912 // and try the same character next loop iteration
916 --str; 913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
917 } 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);
918 925
919 line->touch (); 926 line->touch ();
920 927
921 do 928 do
922 { 929 {
… …
928 else 935 else
929 { 936 {
930 line->l = ncol; 937 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
933 break; 940
941 goto end_of_line;
934 } 942 }
935 943
936 c = NOCHAR; 944 c = NOCHAR;
937 } 945 }
938 while (expect_false (--width > 0)); 946 while (expect_false (--width > 0));
939 947
940 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 949 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
942 { 950 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 951 line->t[c] = ' ';
948 line->r[c] = rend; 952 line->r[c] = rend;
949 }
950 } 953 }
954
955end_of_line:
956 ;
951 } 957 }
952#if ENABLE_COMBINING 958#if ENABLE_COMBINING
953 else // width == 0 959 else // width == 0
954 { 960 {
955 if (c != 0xfeff) // ignore BOM 961 if (c != 0xfeff) // ignore BOM
… …
1018 1024
1019 want_refresh = 1; 1025 want_refresh = 1;
1020#endif 1026#endif
1021 } 1027 }
1022 } 1028 }
1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1023 else 1031 else
1024 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1025} 1033}
1026 1034
1027/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1334 return; 1342 return;
1335 1343
1336 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1337 1345
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1349 {
1345 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1346 1351
1347 if (mapped && !view_start) 1352 if (mapped)
1348 XClearArea (dpy, vt, 0, 1353 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1354 Row2Pixel (row - view_start), (unsigned int)width,
1350 (unsigned int)Height2Pixel (num), False); 1355 (unsigned int)Height2Pixel (num), False);
1351 } 1356 }
1352 else 1357 else
1353 { 1358 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1360
1356 if (mapped && !view_start) 1361 if (mapped)
1357 { 1362 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1365 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1366 0, Row2Pixel (row - view_start),
… …
1368 1373
1369 for (; num--; row++) 1374 for (; num--; row++)
1370 { 1375 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1376 scr_blank_screen_mem (ROW(row), rstyle);
1372 1377
1373 if (!view_start) 1378 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1380 }
1376} 1381}
1377 1382
1378#if !ENABLE_MINIMAL 1383#if !ENABLE_MINIMAL
1379void 1384void
… …
1678 { 1683 {
1679 rvideo_state = on; 1684 rvideo_state = on;
1680 1685
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1684#endif 1689#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1691
1687 XGCValues gcvalue; 1692 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1838 {
1834 min_it (rc[i].col, ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1836 } 1841 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1842
1838 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++)
1839 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);
1840 1845
1841 num_scr_allow = 0; 1846 num_scr_allow = 0;
1842 1847
… …
2024 refresh_count = 0; 2029 refresh_count = 0;
2025 2030
2026 unsigned int old_screen_flags = screen.flags; 2031 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0; 2032 char have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP 2033#ifdef HAVE_BG_PIXMAP
2029 have_bg = bgPixmap.pixmap != None; 2034 have_bg = bg_pixmap != None;
2030#endif 2035#endif
2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032 2037
2033 /* 2038 /*
2034 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
… …
2083 ccol2 = bgcolor_of (rstyle); 2088 ccol2 = bgcolor_of (rstyle);
2084#else 2089#else
2085 ccol2 = Color_bg; 2090 ccol2 = Color_bg;
2086#endif 2091#endif
2087 2092
2088 if (showcursor && focus) 2093 if (focus)
2089 { 2094 {
2090 if (option (Opt_cursorUnderline)) 2095 if (option (Opt_cursorUnderline))
2091 *crp ^= RS_Uline; 2096 *crp ^= RS_Uline;
2092 else 2097 else
2093 { 2098 {
… …
2229 2234
2230 // seek to the beginning of wide characters 2235 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2232 --col; 2237 --col;
2233 2238
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2240 text_t *text = stp + col;
2236 int count = 1; 2241 int count = 1;
2237 2242
2238 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2239 drp[col] = rend; 2244 drp[col] = rend;
… …
2284 */ 2289 */
2285 int fore = fgcolor_of (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2287 2292
2288 // 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
2289 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)))
2290 { 2295 {
2291 bool invert = rend & RS_RVid; 2296 bool invert = rend & RS_RVid;
2292 2297
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2318
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2320 fore = Color_UL;
2316#endif 2321#endif
2317 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
2318 if (invert) 2343 if (invert)
2319 { 2344 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2345 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2346
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2348 if (fore == back)
2338 { 2349 {
2339 fore = Color_bg; 2350 fore = Color_bg;
2340 back = Color_fg; 2351 back = Color_fg;
2341 } 2352 }
… …
2495 scr_remap_chars (swap_buf [i]); 2506 scr_remap_chars (swap_buf [i]);
2496 } 2507 }
2497} 2508}
2498 2509
2499void 2510void
2500rxvt_term::scr_recolour () NOTHROW 2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2501{ 2512{
2513 bool transparent = false;
2514
2502#ifdef HAVE_BG_PIXMAP 2515#ifdef HAVE_BG_PIXMAP
2503 bgPixmap.apply (); 2516 if (bg_pixmap != None)
2504#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);
2505 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 {
2506 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
2507 XClearWindow (dpy, parent[0]); 2540 XClearWindow (dpy, parent[0]);
2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2509 2541
2510 if (scrollBar.win) 2542 if (scrollBar.win)
2511 { 2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2513 scrollBar.state = STATE_IDLE; 2548 scrollBar.state = STATE_IDLE;
2514 scrollBar.show (0); 2549 scrollBar.show (0);
2515 } 2550 }
2516 2551
2517#endif 2552 if (refresh)
2518 2553 {
2519 /* bgPixmap.apply () does not do the following : */
2520 scr_clear (); 2554 scr_clear ();
2521 scr_touch (true); 2555 scr_touch (true);
2556 }
2522 want_refresh = 1; 2557 want_refresh = 1;
2523} 2558}
2524 2559
2525/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2526void 2561void
… …
2594 { 2629 {
2595#if !ENABLE_MINIMAL 2630#if !ENABLE_MINIMAL
2596 if (selection.rect) 2631 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2633 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2635 else
2601#endif 2636#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2638 selection.end.row, selection.end.col,
2604 RS_RVid); 2639 RS_Sel | RS_RVid);
2605 } 2640 }
2606} 2641}
2607 2642
2608/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2609/* 2644/*
… …
2614void 2649void
2615rxvt_term::scr_dump (int fd) NOTHROW 2650rxvt_term::scr_dump (int fd) NOTHROW
2616{ 2651{
2617 int row, wrote; 2652 int row, wrote;
2618 unsigned int width, towrite; 2653 unsigned int width, towrite;
2619 char r1[] = "\n"; 2654 const char r1[] = "\n";
2620 2655
2621 for (row = saveLines + top_row; 2656 for (row = saveLines + top_row;
2622 row < saveLines + nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2623 { 2658 {
2624 width = row_buf[row].l >= 0 ? row_buf[row].l 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2670/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2671/* 2706/*
2672 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2673 */ 2708 */
2674void 2709void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2676{ 2711{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2713 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2714 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2715 data[i] = C0_CR;
… …
2686 2721
2687 if (priv_modes & PrivMode_BracketPaste) 2722 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~"); 2723 tt_printf ("\e[201~");
2689} 2724}
2690 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
2691/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2692/* 2736/*
2693 * Respond to a notification that a primary selection has been sent 2737 * Respond to a notification that a primary selection has been sent
2694 * EXT: SelectionNotify 2738 * EXT: SelectionNotify
2695 */ 2739 */
2696void 2740void
2697rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2698{ 2742{
2699 if (prop == None) /* check for failed XConvertSelection */ 2743 if (prop == None) /* check for failed XConvertSelection */
2700 { 2744 {
2745 int selnum = selection_type & Sel_whereMask;
2746
2701 if ((selection_type & Sel_CompoundText)) 2747 if ((selection_type & Sel_CompoundText))
2702 { 2748 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = 0; 2749 selection_type = 0;
2706 if (selnum != Sel_direct)
2707 selection_request_other (XA_STRING, selnum); 2750 selection_request_other (XA_STRING, selnum);
2708 } 2751 }
2709 2752
2710 if ((selection_type & Sel_UTF8String)) 2753 if ((selection_type & Sel_UTF8String))
2711 { 2754 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = Sel_CompoundText; 2755 selection_type = Sel_CompoundText;
2715 if (selnum != Sel_direct)
2716 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2756 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2717 else
2718 selection_type = 0;
2719 } 2757 }
2720 2758
2721 return; 2759 return;
2722 } 2760 }
2723 2761
2724 unsigned long bytes_after; 2762 unsigned long bytes_after;
2725 XTextProperty ct; 2763 XTextProperty ct;
2726 2764
2765 // length == (2^31 - 1) / 4, as gdk
2727 if (XGetWindowProperty (dpy, win, prop, 2766 if (XGetWindowProperty (dpy, win, prop,
2728 0, PROP_SIZE / 4, 2767 0, 0x1fffffff,
2729 delete_prop, AnyPropertyType, 2768 delete_prop, AnyPropertyType,
2730 &ct.encoding, &ct.format, 2769 &ct.encoding, &ct.format,
2731 &ct.nitems, &bytes_after, 2770 &ct.nitems, &bytes_after,
2732 &ct.value) != Success) 2771 &ct.value) != Success)
2733 { 2772 {
… …
2735 goto bailout; 2774 goto bailout;
2736 } 2775 }
2737 2776
2738 if (ct.encoding == None) 2777 if (ct.encoding == None)
2739 goto bailout; 2778 goto bailout;
2740
2741 if (bytes_after)
2742 {
2743 // fetch and append remaining data
2744 XTextProperty ct2;
2745
2746 if (XGetWindowProperty (dpy, win, prop,
2747 ct.nitems / 4, (bytes_after + 3) / 4,
2748 delete_prop, AnyPropertyType,
2749 &ct2.encoding, &ct2.format,
2750 &ct2.nitems, &bytes_after,
2751 &ct2.value) != Success)
2752 goto bailout;
2753
2754 // realloc should be compatible to XFree, here, and elsewhere, too
2755 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2756 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2757 ct.nitems += ct2.nitems;
2758
2759 XFree (ct2.value);
2760 }
2761 2779
2762 if (ct.value == 0) 2780 if (ct.value == 0)
2763 goto bailout; 2781 goto bailout;
2764 2782
2765 if (ct.encoding == xa[XA_INCR]) 2783 if (ct.encoding == xa[XA_INCR])
… …
2796 { 2814 {
2797 /* 2815 /*
2798 * pass through again trying CUT_BUFFER0 if we've come from 2816 * pass through again trying CUT_BUFFER0 if we've come from
2799 * XConvertSelection () but nothing was presented 2817 * XConvertSelection () but nothing was presented
2800 */ 2818 */
2801 selection_paste (display->root, XA_CUT_BUFFER0, False); 2819 selection_paste (display->root, XA_CUT_BUFFER0, false);
2802 } 2820 }
2803 2821
2804 goto bailout; 2822 goto bailout;
2805 } 2823 }
2806 } 2824 }
… …
2809 incr_ev.start (10); 2827 incr_ev.start (10);
2810 2828
2811 while (incr_buf_fill + ct.nitems > incr_buf_size) 2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2812 { 2830 {
2813 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;
2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2832 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2815 } 2833 }
2816 2834
2817 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2818 incr_buf_fill += ct.nitems; 2836 incr_buf_fill += ct.nitems;
2819 2837
… …
2860{ 2878{
2861 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2862 2880
2863 incr_buf_size = 0; 2881 incr_buf_size = 0;
2864 free (incr_buf); 2882 free (incr_buf);
2883 incr_buf = 0;
2865 2884
2866 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2885 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2867} 2886}
2868 2887
2869void 2888void
… …
2902 selection_wait = Sel_normal; 2921 selection_wait = Sel_normal;
2903 2922
2904#if X_HAVE_UTF8_STRING 2923#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String; 2924 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum)) 2925 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return; 2926 return;
2908#else 2927#else
2909 selection_type = Sel_CompoundText; 2928 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) 2929 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return; 2930 return;
2912#endif 2931#endif
2913 } 2932 }
2914 2933
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2934 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false); 2935 selection_paste (display->root, XA_CUT_BUFFER0, false);
… …
2944/* 2963/*
2945 * Clear all selected text 2964 * Clear all selected text
2946 * EXT: SelectionClear 2965 * EXT: SelectionClear
2947 */ 2966 */
2948void 2967void
2949rxvt_term::selection_clear () NOTHROW 2968rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2969{
2970 if (!clipboard)
2971 {
2951 want_refresh = 1; 2972 want_refresh = 1;
2952 free (selection.text); 2973 free (selection.text);
2953 selection.text = NULL; 2974 selection.text = NULL;
2954 selection.len = 0; 2975 selection.len = 0;
2955 CLEAR_SELECTION (); 2976 CLEAR_SELECTION ();
2956 2977
2957 if (display->selection_owner == this) 2978 if (display->selection_owner == this)
2958 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 }
2959} 2990}
2960 2991
2961/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
2962/* 2993/*
2963 * Copy a selection into the cut buffer 2994 * Copy a selection into the cut buffer
2964 * EXT: button 1 or 3 release 2995 * EXT: button 1 or 3 release
2965 */ 2996 */
2966void 2997void
2967rxvt_term::selection_make (Time tm) 2998rxvt_term::selection_make (Time tm)
2968{ 2999{
2969 int i; 3000 int size;
2970 wchar_t *new_selection_text; 3001 wchar_t *new_selection_text;
2971 text_t *t; 3002 text_t *t;
2972 3003
2973 switch (selection.op) 3004 switch (selection.op)
2974 { 3005 {
… …
2990 return; /* nothing selected, go away */ 3021 return; /* nothing selected, go away */
2991 3022
2992 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)))
2993 return; 3024 return;
2994 3025
2995 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3026 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 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));
2997 3028
2998 int ofs = 0; 3029 int ofs = 0;
2999 int extra = 0; 3030 int extra = 0;
3000 3031
3001 int col = selection.beg.col; 3032 int col = selection.beg.col;
… …
3007 { 3038 {
3008#if !ENABLE_MINIMAL 3039#if !ENABLE_MINIMAL
3009 if (selection.rect) 3040 if (selection.rect)
3010 { 3041 {
3011 col = selection.beg.col; 3042 col = selection.beg.col;
3012 end_col = ncol + 1; 3043 end_col = selection.end.col;
3013 } 3044 }
3014 else 3045 else
3015#endif 3046#endif
3016 end_col = ROW(row).l; 3047 end_col = ROW(row).l;
3017 3048
3018 col = max (col, 0); 3049 col = max (col, 0);
3019 3050
3020 if (row == selection.end.row 3051 if (row == selection.end.row)
3021#if !ENABLE_MINIMAL
3022 || selection.rect
3023#endif
3024 )
3025 min_it (end_col, selection.end.col); 3052 min_it (end_col, selection.end.col);
3026 3053
3027 t = ROW(row).t + col; 3054 t = ROW(row).t + col;
3028 3055
3029 for (; col < end_col; col++) 3056 for (; col < end_col; col++)
… …
3037 3064
3038 extra -= (len - 1); 3065 extra -= (len - 1);
3039 3066
3040 if (extra < 0) 3067 if (extra < 0)
3041 { 3068 {
3042 extra += i; 3069 extra += size;
3043 i += i; 3070 size += size;
3044 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));
3045 } 3072 }
3046 3073
3047 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3074 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3048 } 3075 }
3049#endif 3076#endif
… …
3061 3088
3062 new_selection_text[ofs++] = C0_LF; 3089 new_selection_text[ofs++] = C0_LF;
3063 } 3090 }
3064 else 3091 else
3065#endif 3092#endif
3066 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))
3067 new_selection_text[ofs++] = C0_LF; 3096 new_selection_text[ofs++] = C0_LF;
3068 } 3097 }
3069
3070 if (end_col != selection.end.col)
3071 new_selection_text[ofs++] = C0_LF;
3072 3098
3073 new_selection_text[ofs] = 0; 3099 new_selection_text[ofs] = 0;
3074 3100
3075 if (ofs == 0) 3101 if (ofs == 0)
3076 { 3102 {
… …
3089 3115
3090 selection_grab (tm); 3116 selection_grab (tm);
3091} 3117}
3092 3118
3093bool 3119bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 3120rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 3121{
3122 Atom sel;
3123
3124 if (!clipboard)
3125 {
3096 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 }
3097 3134
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 3135 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 3136 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 3137 {
3101 display->set_selection_owner (this); 3138 display->set_selection_owner (this, clipboard);
3102 return true; 3139 return true;
3103 } 3140 }
3104 else 3141 else
3105 { 3142 {
3106 selection_clear (); 3143 selection_clear (clipboard);
3107 return false; 3144 return false;
3108 } 3145 }
3109 3146
3110#if 0 3147#if 0
3111 XTextProperty ct; 3148 XTextProperty ct;
… …
3606 else if (rq.target == xa[XA_MULTIPLE]) 3643 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3644 {
3608 /* TODO: Handle MULTIPLE */ 3645 /* TODO: Handle MULTIPLE */
3609 } 3646 }
3610#endif 3647#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3648 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3649 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3650 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3614 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);
3615 ev.property = rq.property; 3658 ev.property = rq.property;
3616 } 3659 }
3617 else if (rq.target == XA_STRING 3660 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3661 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3662 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3652 { 3695 {
3653 target = xa[XA_COMPOUND_TEXT]; 3696 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3697 style = enc_compound_text;
3655 } 3698 }
3656 3699
3657 if (selection.text) 3700 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3701 {
3659 cl = selection.text; 3702 cl = selection.text;
3660 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;
3661 } 3709 }
3662 else 3710 else
3663 { 3711 {
3664 cl = L""; 3712 cl = L"";
3665 selectlen = 0; 3713 selectlen = 0;

Diff Legend

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