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.335 by root, Tue Mar 30 23:00:35 2010 UTC vs.
Revision 1.379 by sf-exg, Fri Apr 1 11:06:42 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++;
… …
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
161rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
162{ 163{
164#if ENABLE_OVERLAY
165 scr_overlay_off ();
166#endif
167
163 view_start = 0; 168 view_start = 0;
164 num_scr = 0; 169 num_scr = 0;
165 170
166 if (ncol == 0) 171 if (ncol == 0)
167 ncol = 80; 172 ncol = 80;
… …
397 } 402 }
398 403
399 free (tabs); 404 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 405 tabs = (char *)rxvt_malloc (ncol);
401 406
402 for (int col = ncol; --col; ) 407 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 408 tabs [col] = col % TABSIZE == 0;
404 409
405 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
406 411
407 prev_nrow = nrow; 412 prev_nrow = nrow;
… …
897# else 902# else
898 c = 0xfffd; 903 c = 0xfffd;
899# endif 904# endif
900#endif 905#endif
901 906
902 // nuke the character at this position, if required
903 if (expect_false (
904 line->t[screen.cur.col] == NOCHAR
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911 908
912 // if the character doesn't fit into the remaining columns... 909 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 910 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 { 911 {
912 if (screen.flags & Screen_Autowrap)
913 {
915 // ... artificially enlargen the previous one 914 // ... artificially enlargen the previous one
916 c = NOCHAR; 915 c = NOCHAR;
917 // and try the same character next loop iteration 916 // and try the same character next loop iteration
918 --str; 917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
919 } 921 }
922
923 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
927 if (expect_false (line->t[screen.cur.col] == NOCHAR))
928 scr_kill_char (*line, screen.cur.col);
920 929
921 line->touch (); 930 line->touch ();
922 931
923 do 932 do
924 { 933 {
… …
930 else 939 else
931 { 940 {
932 line->l = ncol; 941 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
935 break; 944
945 goto end_of_line;
936 } 946 }
937 947
938 c = NOCHAR; 948 c = NOCHAR;
939 } 949 }
940 while (expect_false (--width > 0)); 950 while (expect_false (--width > 0));
941 951
942 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
944 { 954 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 955 line->t[c] = ' ';
950 line->r[c] = rend; 956 line->r[c] = rend;
951 }
952 } 957 }
958
959end_of_line:
960 ;
953 } 961 }
954#if ENABLE_COMBINING 962#if ENABLE_COMBINING
955 else // width == 0 963 else // width == 0
956 { 964 {
957 if (c != 0xfeff) // ignore BOM 965 if (c != 0xfeff) // ignore BOM
… …
1020 1028
1021 want_refresh = 1; 1029 want_refresh = 1;
1022#endif 1030#endif
1023 } 1031 }
1024 } 1032 }
1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1025 else 1035 else
1026 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1027} 1037}
1028 1038
1029/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1336 return; 1346 return;
1337 1347
1338 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1339 1349
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1343 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1353 {
1347 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1348 1355
1349 if (mapped && !view_start) 1356 if (mapped)
1350 XClearArea (dpy, vt, 0, 1357 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1358 Row2Pixel (row - view_start), (unsigned int)width,
1352 (unsigned int)Height2Pixel (num), False); 1359 (unsigned int)Height2Pixel (num), False);
1353 } 1360 }
1354 else 1361 else
1355 { 1362 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1364
1358 if (mapped && !view_start) 1365 if (mapped)
1359 { 1366 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1369 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1370 0, Row2Pixel (row - view_start),
… …
1370 1377
1371 for (; num--; row++) 1378 for (; num--; row++)
1372 { 1379 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1374 1381
1375 if (!view_start) 1382 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1384 }
1378} 1385}
1379 1386
1380#if !ENABLE_MINIMAL 1387#if !ENABLE_MINIMAL
1381void 1388void
… …
1680 { 1687 {
1681 rvideo_state = on; 1688 rvideo_state = on;
1682 1689
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1691#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1686#endif 1693#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1695
1689 XGCValues gcvalue; 1696 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
… …
2026 refresh_count = 0; 2033 refresh_count = 0;
2027 2034
2028 unsigned int old_screen_flags = screen.flags; 2035 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2036 char have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2037#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2038 have_bg = bg_pixmap != None;
2032#endif 2039#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2041
2035 /* 2042 /*
2036 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
… …
2085 ccol2 = bgcolor_of (rstyle); 2092 ccol2 = bgcolor_of (rstyle);
2086#else 2093#else
2087 ccol2 = Color_bg; 2094 ccol2 = Color_bg;
2088#endif 2095#endif
2089 2096
2090 if (showcursor && focus) 2097 if (focus)
2091 { 2098 {
2092 if (option (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2094 else 2101 else
2095 { 2102 {
… …
2231 2238
2232 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2234 --col; 2241 --col;
2235 2242
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2244 text_t *text = stp + col;
2238 int count = 1; 2245 int count = 1;
2239 2246
2240 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2241 drp[col] = rend; 2248 drp[col] = rend;
… …
2286 */ 2293 */
2287 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2289 2296
2290 // only do special processing if any attributes are set, which is unlikely 2297 // only do special processing if any attributes are set, which is unlikely
2291 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2299 {
2293 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2294 2301
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2322
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2324 fore = Color_UL;
2318#endif 2325#endif
2319 2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2345#endif
2346
2320 if (invert) 2347 if (invert)
2321 { 2348 {
2322#ifdef OPTION_HC
2323 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 || !ISSET_PIXCOLOR (Color_HC))
2325#endif
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 ::swap (fore, back); 2349 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2350
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2335# ifndef OPTION_HC
2336 if (ISSET_PIXCOLOR (Color_RV))
2337 back = Color_RV;
2338# endif
2339 if (fore == back) 2352 if (fore == back)
2340 { 2353 {
2341 fore = Color_bg; 2354 fore = Color_bg;
2342 back = Color_fg; 2355 back = Color_fg;
2343 } 2356 }
… …
2377 } 2390 }
2378 2391
2379 /* 2392 /*
2380 * Actually do the drawing of the string here 2393 * Actually do the drawing of the string here
2381 */ 2394 */
2382 rxvt_font *font = fontset [GET_STYLE (rend)]->get (*text, GET_FONT (rend)); 2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2383 2396
2384 if (expect_true (have_bg && back == Color_bg)) 2397 if (expect_true (have_bg && back == Color_bg))
2385 { 2398 {
2386 // this is very ugly, maybe push it into ->draw? 2399 // this is very ugly, maybe push it into ->draw?
2387 2400
… …
2497 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2498 } 2511 }
2499} 2512}
2500 2513
2501void 2514void
2502rxvt_term::scr_recolour () NOTHROW 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2516{
2517 bool transparent = false;
2518
2504#ifdef HAVE_BG_PIXMAP 2519#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2520 if (bg_pixmap != None)
2506#else 2521 {
2522# ifdef ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT)
2524 {
2525 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2507 2527
2528 transparent = true;
2529 }
2530 else
2531# endif
2532 {
2533 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2535 }
2536 }
2537 else
2538#endif
2539 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2542 }
2543
2509 XClearWindow (dpy, parent[0]); 2544 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2511 2545
2512 if (scrollBar.win) 2546 if (scrollBar.win)
2513 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2552 scrollBar.state = STATE_IDLE;
2516 scrollBar.show (0); 2553 scrollBar.show (0);
2517 } 2554 }
2518 2555
2519#endif 2556 if (refresh)
2520 2557 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2558 scr_clear ();
2523 scr_touch (true); 2559 scr_touch (true);
2560 }
2524 want_refresh = 1; 2561 want_refresh = 1;
2525} 2562}
2526 2563
2527/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2528void 2565void
… …
2596 { 2633 {
2597#if !ENABLE_MINIMAL 2634#if !ENABLE_MINIMAL
2598 if (selection.rect) 2635 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2636 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2637 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2638 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2639 else
2603#endif 2640#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2606 RS_RVid); 2643 RS_Sel | RS_RVid);
2607 } 2644 }
2608} 2645}
2609 2646
2610/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2611/* 2648/*
… …
2616void 2653void
2617rxvt_term::scr_dump (int fd) NOTHROW 2654rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2655{
2619 int row, wrote; 2656 int row, wrote;
2620 unsigned int width, towrite; 2657 unsigned int width, towrite;
2621 char r1[] = "\n"; 2658 const char r1[] = "\n";
2622 2659
2623 for (row = saveLines + top_row; 2660 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2625 { 2662 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2672/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2673/* 2710/*
2674 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2675 */ 2712 */
2676void 2713void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2715{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2719 data[i] = C0_CR;
… …
2688 2725
2689 if (priv_modes & PrivMode_BracketPaste) 2726 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2727 tt_printf ("\e[201~");
2691} 2728}
2692 2729
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2730void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2732{
2701 if (prop == None) /* check for failed XConvertSelection */ 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702 {
2703 if ((selection_type & Sel_CompoundText))
2704 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum);
2710 }
2711
2712 if ((selection_type & Sel_UTF8String))
2713 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 }
2722
2723 return;
2724 }
2725
2726 unsigned long bytes_after;
2727 XTextProperty ct;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after,
2734 &ct.value) != Success)
2735 {
2736 ct.value = 0;
2737 goto bailout;
2738 }
2739
2740 if (ct.encoding == None)
2741 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763
2764 if (ct.value == 0)
2765 goto bailout;
2766
2767 if (ct.encoding == xa[XA_INCR])
2768 {
2769 // INCR selection, start handshake
2770 if (!delete_prop)
2771 XDeleteProperty (dpy, win, prop);
2772
2773 selection_wait = Sel_incr;
2774 incr_buf_fill = 0;
2775 incr_ev.start (10);
2776
2777 goto bailout;
2778 }
2779
2780 if (ct.nitems == 0)
2781 {
2782 if (selection_wait == Sel_incr)
2783 {
2784 XFree (ct.value);
2785
2786 // finally complete, now paste the whole thing
2787 selection_wait = Sel_normal;
2788 ct.value = (unsigned char *)incr_buf;
2789 ct.nitems = incr_buf_fill;
2790 incr_buf = 0;
2791 incr_buf_size = 0;
2792 incr_ev.stop ();
2793 }
2794 else
2795 {
2796 if (selection_wait == Sel_normal
2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798 {
2799 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented
2802 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False);
2804 }
2805
2806 goto bailout;
2807 }
2808 }
2809 else if (selection_wait == Sel_incr)
2810 {
2811 incr_ev.start (10);
2812
2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817 }
2818
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems;
2821
2822 goto bailout;
2823 }
2824
2825 char **cl;
2826 int cr;
2827
2828#if !ENABLE_MINIMAL
2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830 // so recode it manually
2831 if (ct.encoding == xa[XA_UTF8_STRING])
2832 {
2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834 char *s = rxvt_wcstombs (w);
2835 free (w);
2836 // TODO: strlen == only the first element will be converted. well...
2837 paste (s, strlen (s));
2838 free (s);
2839 }
2840 else
2841#endif
2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843 && cl)
2844 {
2845 for (int i = 0; i < cr; i++)
2846 paste (cl[i], strlen (cl[i]));
2847
2848 XFreeStringList (cl);
2849 }
2850 else
2851 paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853bailout:
2854 XFree (ct.value);
2855
2856 if (selection_wait == Sel_normal)
2857 selection_wait = Sel_none;
2858}
2859
2860void
2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862{
2863 selection_wait = Sel_none;
2864
2865 incr_buf_size = 0;
2866 free (incr_buf);
2867
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869}
2870
2871void
2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873{
2874 if (prop == None || selection_wait != Sel_incr)
2875 return; 2734 return;
2876 2735
2877 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2878} 2737}
2879 2738
2880/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2881/* 2740/*
2882 * Request the current selection: 2741 * Request the current selection:
… …
2888 * EXT: button 2 release 2747 * EXT: button 2 release
2889 */ 2748 */
2890void 2749void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2751{
2893 if (selection.text && selnum == Sel_Primary) 2752 if (!selection_req)
2894 {
2895 /* internal selection */
2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2897 paste (str, strlen (str));
2898 free (str);
2899 return;
2900 } 2753 {
2901 else 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2902 { 2756 }
2903 selection_request_time = tm;
2904 selection_wait = Sel_normal;
2905
2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return;
2910#else
2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return;
2914#endif
2915 }
2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2919}
2920
2921int
2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923{
2924 Atom sel;
2925
2926 selection_type |= selnum;
2927
2928 if (selnum == Sel_Primary)
2929 sel = XA_PRIMARY;
2930 else if (selnum == Sel_Secondary)
2931 sel = XA_SECONDARY;
2932 else
2933 sel = xa[XA_CLIPBOARD];
2934
2935 if (XGetSelectionOwner (dpy, sel) != None)
2936 {
2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938 vt, selection_request_time);
2939 return 1;
2940 }
2941
2942 return 0;
2943} 2757}
2944 2758
2945/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2946/* 2760/*
2947 * Clear all selected text 2761 * Clear all selected text
… …
2970 if (display->clipboard_owner == this) 2784 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2785 display->clipboard_owner = 0;
2972 } 2786 }
2973} 2787}
2974 2788
2975void
2976rxvt_term::clipboard_copy (Time tm)
2977{
2978 if (selection.len > 0)
2979 {
2980 free (selection.clip_text);
2981 selection.clip_len = selection.len;
2982 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2983 memcpy (selection.clip_text, selection.text,
2984 sizeof (wchar_t) * selection.clip_len);
2985 selection_grab (tm, true);
2986 }
2987}
2988
2989/* ------------------------------------------------------------------------- */ 2789/* ------------------------------------------------------------------------- */
2990/* 2790/*
2991 * Copy a selection into the cut buffer 2791 * Copy a selection into the cut buffer
2992 * EXT: button 1 or 3 release 2792 * EXT: button 1 or 3 release
2993 */ 2793 */
2994void 2794void
2995rxvt_term::selection_make (Time tm) 2795rxvt_term::selection_make (Time tm)
2996{ 2796{
2997 int i; 2797 int size;
2998 wchar_t *new_selection_text; 2798 wchar_t *new_selection_text;
2999 text_t *t; 2799 text_t *t;
3000 2800
3001 switch (selection.op) 2801 switch (selection.op)
3002 { 2802 {
… …
3018 return; /* nothing selected, go away */ 2818 return; /* nothing selected, go away */
3019 2819
3020 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2820 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3021 return; 2821 return;
3022 2822
3023 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2823 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3024 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2824 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3025 2825
3026 int ofs = 0; 2826 int ofs = 0;
3027 int extra = 0; 2827 int extra = 0;
3028 2828
3029 int col = selection.beg.col; 2829 int col = selection.beg.col;
… …
3035 { 2835 {
3036#if !ENABLE_MINIMAL 2836#if !ENABLE_MINIMAL
3037 if (selection.rect) 2837 if (selection.rect)
3038 { 2838 {
3039 col = selection.beg.col; 2839 col = selection.beg.col;
3040 end_col = ncol + 1; 2840 end_col = selection.end.col;
3041 } 2841 }
3042 else 2842 else
3043#endif 2843#endif
3044 end_col = ROW(row).l; 2844 end_col = ROW(row).l;
3045 2845
3046 col = max (col, 0); 2846 col = max (col, 0);
3047 2847
3048 if (row == selection.end.row 2848 if (row == selection.end.row)
3049#if !ENABLE_MINIMAL
3050 || selection.rect
3051#endif
3052 )
3053 min_it (end_col, selection.end.col); 2849 min_it (end_col, selection.end.col);
3054 2850
3055 t = ROW(row).t + col; 2851 t = ROW(row).t + col;
3056 2852
3057 for (; col < end_col; col++) 2853 for (; col < end_col; col++)
… …
3065 2861
3066 extra -= (len - 1); 2862 extra -= (len - 1);
3067 2863
3068 if (extra < 0) 2864 if (extra < 0)
3069 { 2865 {
3070 extra += i; 2866 extra += size;
3071 i += i; 2867 size += size;
3072 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2868 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3073 } 2869 }
3074 2870
3075 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2871 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3076 } 2872 }
3077#endif 2873#endif
… …
3089 2885
3090 new_selection_text[ofs++] = C0_LF; 2886 new_selection_text[ofs++] = C0_LF;
3091 } 2887 }
3092 else 2888 else
3093#endif 2889#endif
3094 if (!ROW(row).is_longer () && row != selection.end.row) 2890 if (!ROW(row).is_longer ()
2891 && (row != selection.end.row || end_col != selection.end.col)
2892 && (row != selection.beg.row || selection.beg.col < ncol))
3095 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3096 } 2894 }
3097
3098 if (end_col != selection.end.col)
3099 new_selection_text[ofs++] = C0_LF;
3100 2895
3101 new_selection_text[ofs] = 0; 2896 new_selection_text[ofs] = 0;
3102 2897
3103 if (ofs == 0) 2898 if (ofs == 0)
3104 { 2899 {

Diff Legend

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