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.344 by sf-exg, Wed Jul 21 09:00:43 2010 UTC vs.
Revision 1.367 by sf-exg, Mon Jan 31 15:40:22 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
36fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
37{ 37{
38 while (len--) 38 while (len--)
… …
144 col--; 144 col--;
145 145
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148 148
149 l.touch ();
150
149 // found start, nuke 151 // found start, nuke
150 do { 152 do {
151 l.t[col] = ' '; 153 l.t[col] = ' ';
152 l.r[col] = rend; 154 l.r[col] = rend;
153 col++; 155 col++;
… …
398 } 400 }
399 401
400 free (tabs); 402 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 403 tabs = (char *)rxvt_malloc (ncol);
402 404
403 for (int col = ncol; --col; ) 405 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 406 tabs [col] = col % TABSIZE == 0;
405 407
406 CLEAR_ALL_SELECTION (); 408 CLEAR_ALL_SELECTION ();
407 409
408 prev_nrow = nrow; 410 prev_nrow = nrow;
… …
898# else 900# else
899 c = 0xfffd; 901 c = 0xfffd;
900# endif 902# endif
901#endif 903#endif
902 904
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 905 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912 906
913 // if the character doesn't fit into the remaining columns... 907 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 908 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 { 909 {
910 if (screen.flags & Screen_Autowrap)
911 {
916 // ... artificially enlargen the previous one 912 // ... artificially enlargen the previous one
917 c = NOCHAR; 913 c = NOCHAR;
918 // and try the same character next loop iteration 914 // and try the same character next loop iteration
919 --str; 915 --str;
916 }
917 else
918 screen.cur.col = ncol - width;
920 } 919 }
920
921 // nuke the character at this position, if required
922 // due to wonderful coincidences everywhere else in this loop
923 // we never have to check for overwriting a wide char itself,
924 // only its tail.
925 if (expect_false (line->t[screen.cur.col] == NOCHAR))
926 scr_kill_char (*line, screen.cur.col);
921 927
922 line->touch (); 928 line->touch ();
923 929
924 do 930 do
925 { 931 {
… …
931 else 937 else
932 { 938 {
933 line->l = ncol; 939 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 940 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 941 screen.flags |= Screen_WrapNext;
936 break; 942
943 goto end_of_line;
937 } 944 }
938 945
939 c = NOCHAR; 946 c = NOCHAR;
940 } 947 }
941 while (expect_false (--width > 0)); 948 while (expect_false (--width > 0));
942 949
943 // pad with spaces when overwriting wide character with smaller one 950 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 951 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
945 { 952 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 953 line->t[c] = ' ';
951 line->r[c] = rend; 954 line->r[c] = rend;
952 }
953 } 955 }
956
957end_of_line:
958 ;
954 } 959 }
955#if ENABLE_COMBINING 960#if ENABLE_COMBINING
956 else // width == 0 961 else // width == 0
957 { 962 {
958 if (c != 0xfeff) // ignore BOM 963 if (c != 0xfeff) // ignore BOM
… …
1021 1026
1022 want_refresh = 1; 1027 want_refresh = 1;
1023#endif 1028#endif
1024 } 1029 }
1025 } 1030 }
1031 else if (screen.flags & Screen_WrapNext)
1032 screen.flags &= ~Screen_WrapNext;
1026 else 1033 else
1027 scr_gotorc (0, -1, RELATIVE); 1034 scr_gotorc (0, -1, RELATIVE);
1028} 1035}
1029 1036
1030/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1343 if (row >= nrow) /* Out Of Bounds */
1337 return; 1344 return;
1338 1345
1339 min_it (num, nrow - row); 1346 min_it (num, nrow - row);
1340 1347
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1348 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1349 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1350 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1351 {
1348 ren = DEFAULT_RSTYLE; 1352 ren = DEFAULT_RSTYLE;
1349 1353
1350 if (mapped && !view_start) 1354 if (mapped)
1351 XClearArea (dpy, vt, 0, 1355 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1356 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False); 1357 (unsigned int)Height2Pixel (num), False);
1354 } 1358 }
1355 else 1359 else
1356 { 1360 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1361 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1362
1359 if (mapped && !view_start) 1363 if (mapped)
1360 { 1364 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1366 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1367 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1368 0, Row2Pixel (row - view_start),
… …
1371 1375
1372 for (; num--; row++) 1376 for (; num--; row++)
1373 { 1377 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1378 scr_blank_screen_mem (ROW(row), rstyle);
1375 1379
1376 if (!view_start) 1380 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1381 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1382 }
1379} 1383}
1380 1384
1381#if !ENABLE_MINIMAL 1385#if !ENABLE_MINIMAL
1382void 1386void
… …
1681 { 1685 {
1682 rvideo_state = on; 1686 rvideo_state = on;
1683 1687
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1686 if (bgPixmap.pixmap == None) 1690 if (bg_pixmap == None)
1687#endif 1691#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1693
1690 XGCValues gcvalue; 1694 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1695 gcvalue.foreground = pix_colors[Color_fg];
… …
2027 refresh_count = 0; 2031 refresh_count = 0;
2028 2032
2029 unsigned int old_screen_flags = screen.flags; 2033 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0; 2034 char have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2035#ifdef HAVE_BG_PIXMAP
2032 have_bg = bgPixmap.pixmap != None; 2036 have_bg = bg_pixmap != None;
2033#endif 2037#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2039
2036 /* 2040 /*
2037 * B: reverse any characters which are selected 2041 * B: reverse any characters which are selected
… …
2504 scr_remap_chars (swap_buf [i]); 2508 scr_remap_chars (swap_buf [i]);
2505 } 2509 }
2506} 2510}
2507 2511
2508void 2512void
2509rxvt_term::scr_recolour () NOTHROW 2513rxvt_term::scr_recolour (bool refresh) NOTHROW
2510{ 2514{
2515 bool transparent = false;
2516
2511#ifdef HAVE_BG_PIXMAP 2517#ifdef HAVE_BG_PIXMAP
2512 bgPixmap.apply (); 2518 if (bg_pixmap != None)
2513#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2514 2525
2526 transparent = true;
2527 }
2528 else
2529# endif
2530 {
2531 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2533 }
2534 }
2535 else
2536#endif
2537 {
2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2538 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2539 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2540 }
2541
2516 XClearWindow (dpy, parent[0]); 2542 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2518 2543
2519 if (scrollBar.win) 2544 if (scrollBar.win)
2520 { 2545 {
2546 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else
2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2522 scrollBar.state = STATE_IDLE; 2550 scrollBar.state = STATE_IDLE;
2523 scrollBar.show (0); 2551 scrollBar.show (0);
2524 } 2552 }
2525 2553
2526#endif 2554 if (refresh)
2527 2555 {
2528 /* bgPixmap.apply () does not do the following : */
2529 scr_clear (); 2556 scr_clear ();
2530 scr_touch (true); 2557 scr_touch (true);
2558 }
2531 want_refresh = 1; 2559 want_refresh = 1;
2532} 2560}
2533 2561
2534/* ------------------------------------------------------------------------- */ 2562/* ------------------------------------------------------------------------- */
2535void 2563void
… …
2623void 2651void
2624rxvt_term::scr_dump (int fd) NOTHROW 2652rxvt_term::scr_dump (int fd) NOTHROW
2625{ 2653{
2626 int row, wrote; 2654 int row, wrote;
2627 unsigned int width, towrite; 2655 unsigned int width, towrite;
2628 char r1[] = "\n"; 2656 const char r1[] = "\n";
2629 2657
2630 for (row = saveLines + top_row; 2658 for (row = saveLines + top_row;
2631 row < saveLines + nrow - 1; row++) 2659 row < saveLines + nrow - 1; row++)
2632 { 2660 {
2633 width = row_buf[row].l >= 0 ? row_buf[row].l 2661 width = row_buf[row].l >= 0 ? row_buf[row].l
… …
2679/* ------------------------------------------------------------------------- */ 2707/* ------------------------------------------------------------------------- */
2680/* 2708/*
2681 * Paste a selection direct to the command fd 2709 * Paste a selection direct to the command fd
2682 */ 2710 */
2683void 2711void
2684rxvt_term::paste (char *data, unsigned int len) NOTHROW 2712rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2685{ 2713{
2686 /* convert normal newline chars into common keyboard Return key sequence */ 2714 /* convert normal newline chars into common keyboard Return key sequence */
2687 for (unsigned int i = 0; i < len; i++) 2715 for (unsigned int i = 0; i < len; i++)
2688 if (data[i] == C0_LF) 2716 if (data[i] == C0_LF)
2689 data[i] = C0_CR; 2717 data[i] = C0_CR;
… …
2695 2723
2696 if (priv_modes & PrivMode_BracketPaste) 2724 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~"); 2725 tt_printf ("\e[201~");
2698} 2726}
2699 2727
2728void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{
2731 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2732 return;
2733
2734 tt_paste (data, len);
2735}
2736
2700/* ------------------------------------------------------------------------- */ 2737/* ------------------------------------------------------------------------- */
2701/* 2738/*
2702 * Respond to a notification that a primary selection has been sent 2739 * Respond to a notification that a primary selection has been sent
2703 * EXT: SelectionNotify 2740 * EXT: SelectionNotify
2704 */ 2741 */
2705void 2742void
2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2743rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2707{ 2744{
2708 if (prop == None) /* check for failed XConvertSelection */ 2745 if (prop == None) /* check for failed XConvertSelection */
2709 { 2746 {
2747 int selnum = selection_type & Sel_whereMask;
2748
2749 if (selnum == Sel_direct)
2750 selection_type = 0;
2751
2710 if ((selection_type & Sel_CompoundText)) 2752 if ((selection_type & Sel_CompoundText))
2711 { 2753 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = 0; 2754 selection_type = 0;
2715 if (selnum != Sel_direct)
2716 selection_request_other (XA_STRING, selnum); 2755 selection_request_other (XA_STRING, selnum);
2717 } 2756 }
2718 2757
2719 if ((selection_type & Sel_UTF8String)) 2758 if ((selection_type & Sel_UTF8String))
2720 { 2759 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = Sel_CompoundText; 2760 selection_type = Sel_CompoundText;
2724 if (selnum != Sel_direct)
2725 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2761 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2726 else
2727 selection_type = 0;
2728 } 2762 }
2729 2763
2730 return; 2764 return;
2731 } 2765 }
2732 2766
… …
2759 &ct2.nitems, &bytes_after, 2793 &ct2.nitems, &bytes_after,
2760 &ct2.value) != Success) 2794 &ct2.value) != Success)
2761 goto bailout; 2795 goto bailout;
2762 2796
2763 // realloc should be compatible to XFree, here, and elsewhere, too 2797 // realloc should be compatible to XFree, here, and elsewhere, too
2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2798 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2799 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2766 ct.nitems += ct2.nitems; 2800 ct.nitems += ct2.nitems;
2767 2801
2768 XFree (ct2.value); 2802 XFree (ct2.value);
2769 } 2803 }
… …
2818 incr_ev.start (10); 2852 incr_ev.start (10);
2819 2853
2820 while (incr_buf_fill + ct.nitems > incr_buf_size) 2854 while (incr_buf_fill + ct.nitems > incr_buf_size)
2821 { 2855 {
2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2856 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2857 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2824 } 2858 }
2825 2859
2826 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2860 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2827 incr_buf_fill += ct.nitems; 2861 incr_buf_fill += ct.nitems;
2828 2862
… …
2985 * EXT: button 1 or 3 release 3019 * EXT: button 1 or 3 release
2986 */ 3020 */
2987void 3021void
2988rxvt_term::selection_make (Time tm) 3022rxvt_term::selection_make (Time tm)
2989{ 3023{
2990 int i; 3024 int size;
2991 wchar_t *new_selection_text; 3025 wchar_t *new_selection_text;
2992 text_t *t; 3026 text_t *t;
2993 3027
2994 switch (selection.op) 3028 switch (selection.op)
2995 { 3029 {
… …
3011 return; /* nothing selected, go away */ 3045 return; /* nothing selected, go away */
3012 3046
3013 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3047 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3014 return; 3048 return;
3015 3049
3016 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3050 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3017 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3051 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3018 3052
3019 int ofs = 0; 3053 int ofs = 0;
3020 int extra = 0; 3054 int extra = 0;
3021 3055
3022 int col = selection.beg.col; 3056 int col = selection.beg.col;
… …
3028 { 3062 {
3029#if !ENABLE_MINIMAL 3063#if !ENABLE_MINIMAL
3030 if (selection.rect) 3064 if (selection.rect)
3031 { 3065 {
3032 col = selection.beg.col; 3066 col = selection.beg.col;
3033 end_col = ncol + 1; 3067 end_col = selection.end.col;
3034 } 3068 }
3035 else 3069 else
3036#endif 3070#endif
3037 end_col = ROW(row).l; 3071 end_col = ROW(row).l;
3038 3072
3039 col = max (col, 0); 3073 col = max (col, 0);
3040 3074
3041 if (row == selection.end.row 3075 if (row == selection.end.row)
3042#if !ENABLE_MINIMAL
3043 || selection.rect
3044#endif
3045 )
3046 min_it (end_col, selection.end.col); 3076 min_it (end_col, selection.end.col);
3047 3077
3048 t = ROW(row).t + col; 3078 t = ROW(row).t + col;
3049 3079
3050 for (; col < end_col; col++) 3080 for (; col < end_col; col++)
… …
3058 3088
3059 extra -= (len - 1); 3089 extra -= (len - 1);
3060 3090
3061 if (extra < 0) 3091 if (extra < 0)
3062 { 3092 {
3063 extra += i; 3093 extra += size;
3064 i += i; 3094 size += size;
3065 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3095 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3066 } 3096 }
3067 3097
3068 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3098 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3069 } 3099 }
3070#endif 3100#endif
… …
3082 3112
3083 new_selection_text[ofs++] = C0_LF; 3113 new_selection_text[ofs++] = C0_LF;
3084 } 3114 }
3085 else 3115 else
3086#endif 3116#endif
3087 if (!ROW(row).is_longer () && row != selection.end.row) 3117 if (!ROW(row).is_longer ()
3118 && (row != selection.end.row || end_col != selection.end.col)
3119 && (row != selection.beg.row || selection.beg.col < ncol))
3088 new_selection_text[ofs++] = C0_LF; 3120 new_selection_text[ofs++] = C0_LF;
3089 } 3121 }
3090
3091 if (end_col != selection.end.col)
3092 new_selection_text[ofs++] = C0_LF;
3093 3122
3094 new_selection_text[ofs] = 0; 3123 new_selection_text[ofs] = 0;
3095 3124
3096 if (ofs == 0) 3125 if (ofs == 0)
3097 { 3126 {

Diff Legend

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