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.346 by sf-exg, Mon Jul 26 09:57:53 2010 UTC vs.
Revision 1.364 by sf-exg, Thu Jan 20 17:39:29 2011 UTC

… …
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
… …
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 (bgPixmap.pixmap != None)
2513#else 2519 {
2520# ifdef ENABLE_TRANSPARENCY
2521 if (bgPixmap.flags & bgPixmap_t::isTransparent)
2522 {
2523 XSetWindowBackgroundPixmap (dpy, parent[0], bgPixmap.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, bgPixmap.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
… …
2768 &ct2.nitems, &bytes_after, 2796 &ct2.nitems, &bytes_after,
2769 &ct2.value) != Success) 2797 &ct2.value) != Success)
2770 goto bailout; 2798 goto bailout;
2771 2799
2772 // realloc should be compatible to XFree, here, and elsewhere, too 2800 // realloc should be compatible to XFree, here, and elsewhere, too
2773 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); 2801 ct.value = (unsigned char *)rxvt_realloc (ct.value, ct.nitems + ct2.nitems + 1);
2774 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); 2802 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2775 ct.nitems += ct2.nitems; 2803 ct.nitems += ct2.nitems;
2776 2804
2777 XFree (ct2.value); 2805 XFree (ct2.value);
2778 } 2806 }
… …
2827 incr_ev.start (10); 2855 incr_ev.start (10);
2828 2856
2829 while (incr_buf_fill + ct.nitems > incr_buf_size) 2857 while (incr_buf_fill + ct.nitems > incr_buf_size)
2830 { 2858 {
2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2859 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2832 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2860 incr_buf = (char *)rxvt_realloc (incr_buf, incr_buf_size);
2833 } 2861 }
2834 2862
2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); 2863 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2836 incr_buf_fill += ct.nitems; 2864 incr_buf_fill += ct.nitems;
2837 2865
… …
2994 * EXT: button 1 or 3 release 3022 * EXT: button 1 or 3 release
2995 */ 3023 */
2996void 3024void
2997rxvt_term::selection_make (Time tm) 3025rxvt_term::selection_make (Time tm)
2998{ 3026{
2999 int i; 3027 int size;
3000 wchar_t *new_selection_text; 3028 wchar_t *new_selection_text;
3001 text_t *t; 3029 text_t *t;
3002 3030
3003 switch (selection.op) 3031 switch (selection.op)
3004 { 3032 {
… …
3020 return; /* nothing selected, go away */ 3048 return; /* nothing selected, go away */
3021 3049
3022 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 3050 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3023 return; 3051 return;
3024 3052
3025 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 3053 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3026 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3054 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3027 3055
3028 int ofs = 0; 3056 int ofs = 0;
3029 int extra = 0; 3057 int extra = 0;
3030 3058
3031 int col = selection.beg.col; 3059 int col = selection.beg.col;
… …
3037 { 3065 {
3038#if !ENABLE_MINIMAL 3066#if !ENABLE_MINIMAL
3039 if (selection.rect) 3067 if (selection.rect)
3040 { 3068 {
3041 col = selection.beg.col; 3069 col = selection.beg.col;
3042 end_col = ncol + 1; 3070 end_col = selection.end.col;
3043 } 3071 }
3044 else 3072 else
3045#endif 3073#endif
3046 end_col = ROW(row).l; 3074 end_col = ROW(row).l;
3047 3075
3048 col = max (col, 0); 3076 col = max (col, 0);
3049 3077
3050 if (row == selection.end.row 3078 if (row == selection.end.row)
3051#if !ENABLE_MINIMAL
3052 || selection.rect
3053#endif
3054 )
3055 min_it (end_col, selection.end.col); 3079 min_it (end_col, selection.end.col);
3056 3080
3057 t = ROW(row).t + col; 3081 t = ROW(row).t + col;
3058 3082
3059 for (; col < end_col; col++) 3083 for (; col < end_col; col++)
… …
3067 3091
3068 extra -= (len - 1); 3092 extra -= (len - 1);
3069 3093
3070 if (extra < 0) 3094 if (extra < 0)
3071 { 3095 {
3072 extra += i; 3096 extra += size;
3073 i += i; 3097 size += size;
3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3098 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3075 } 3099 }
3076 3100
3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3101 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3078 } 3102 }
3079#endif 3103#endif
… …
3091 3115
3092 new_selection_text[ofs++] = C0_LF; 3116 new_selection_text[ofs++] = C0_LF;
3093 } 3117 }
3094 else 3118 else
3095#endif 3119#endif
3096 if (!ROW(row).is_longer () && row != selection.end.row) 3120 if (!ROW(row).is_longer ()
3121 && (row != selection.end.row || end_col != selection.end.col)
3122 && (row != selection.beg.row || selection.beg.col < ncol))
3097 new_selection_text[ofs++] = C0_LF; 3123 new_selection_text[ofs++] = C0_LF;
3098 } 3124 }
3099
3100 if (end_col != selection.end.col)
3101 new_selection_text[ofs++] = C0_LF;
3102 3125
3103 new_selection_text[ofs] = 0; 3126 new_selection_text[ofs] = 0;
3104 3127
3105 if (ofs == 0) 3128 if (ofs == 0)
3106 { 3129 {

Diff Legend

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