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.194 by root, Mon Dec 26 21:30:04 2005 UTC vs.
Revision 1.202 by root, Sat Dec 31 17:16:17 2005 UTC

… …
46 46
47/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 51 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 52 view_start = 0
53#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
… …
351 lofs += len; 351 lofs += len;
352 qcol += len; 352 qcol += len;
353 } 353 }
354 } 354 }
355 355
356 qline->l = llen < ncol ? llen : MOD (llen - 1, ncol) + 1; 356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY
358 if (qline->l < 0)
359 {
360 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
361 qline->l = 0;
362 }
363#endif
357 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
358 } 365 }
359 while (p != pend && q > 0); 366 while (p != pend && q > 0);
360 367
361 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
… …
523 530
524 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); 531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
525 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); 532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
526 533
527#if NSCREENS 534#if NSCREENS
528 if (options & Opt_secondaryScreen) 535 if (OPTION (Opt_secondaryScreen))
529 { 536 {
530 num_scr = 0; 537 num_scr = 0;
531 538
532 for (int i = prev_nrow; i--; ) 539 for (int i = prev_nrow; i--; )
533 ::swap (ROW(i), swap_buf [i]); 540 ::swap (ROW(i), swap_buf [i]);
… …
537 screen.flags |= Screen_VisibleCursor; 544 screen.flags |= Screen_VisibleCursor;
538 swap.flags |= Screen_VisibleCursor; 545 swap.flags |= Screen_VisibleCursor;
539 } 546 }
540 else 547 else
541#endif 548#endif
542 if (options & Opt_secondaryScroll) 549 if (OPTION (Opt_secondaryScroll))
543 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 550 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
544 551
545 return scrn; 552 return scrn;
546} 553}
547 554
… …
609 num_scr += count; 616 num_scr += count;
610 617
611 if (count > 0 618 if (count > 0
612 && row1 == 0 619 && row1 == 0
613 && row2 == nrow - 1 620 && row2 == nrow - 1
614 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 621 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
615 { 622 {
616 nsaved = min (nsaved + count, saveLines); 623 nsaved = min (nsaved + count, saveLines);
617 term_start = (term_start + count) % total_rows; 624 term_start = (term_start + count) % total_rows;
618 625
619 if (selection.op && current_screen == selection.screen) 626 if (selection.op && current_screen == selection.screen)
… …
630 selection.op = SELECTION_CLEAR; 637 selection.op = SELECTION_CLEAR;
631 } 638 }
632 } 639 }
633 640
634 for (int i = count; i--; ) 641 for (int i = count; i--; )
642 {
643 ROW(row2 - i).l = 0;
635 scr_blank_screen_mem (ROW(row2 - i), rstyle); 644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
636 646
637 if ((options & Opt_scrollWithBuffer) 647 if (OPTION (Opt_scrollWithBuffer)
638 && view_start != 0 648 && view_start != 0
639 && view_start != saveLines) 649 && view_start != saveLines)
640 scr_page (UP, count); 650 scr_page (UP, count);
641 } 651 }
642 else 652 else
… …
733 { 743 {
734 c = *str++; 744 c = *str++;
735 745
736 if (c < 0x20) 746 if (c < 0x20)
737 if (c == C0_LF) 747 if (c == C0_LF)
738 { 748 {
739 if (!line->is_longer ()) /* XXX: think about this */ 749 if (!line->is_longer ()) /* XXX: think about this */
740 max_it (line->l, screen.cur.col); 750 max_it (line->l, screen.cur.col);
741 751
742 screen.flags &= ~Screen_WrapNext; 752 screen.flags &= ~Screen_WrapNext;
743 753
… …
1008 if (count) 1018 if (count)
1009 x = ncol - 1; 1019 x = ncol - 1;
1010 1020
1011 // store horizontal tab commands as characters inside the text 1021 // store horizontal tab commands as characters inside the text
1012 // buffer so they can be selected and pasted. 1022 // buffer so they can be selected and pasted.
1013 if (ht && options & Opt_pastableTabs) 1023 if (ht && OPTION (Opt_pastableTabs))
1014 { 1024 {
1015 base_rend = SET_FONT (base_rend, 0); 1025 base_rend = SET_FONT (base_rend, 0);
1016 1026
1017 if (!l.is_longer ()) /* XXX: think about this */ 1027 if (!l.is_longer ()) /* XXX: think about this */
1018 max_it (l.l, x); 1028 max_it (l.l, x);
… …
1274 CLEAR_ROWS (row, num); 1284 CLEAR_ROWS (row, num);
1275 } 1285 }
1276 else 1286 else
1277 { 1287 {
1278 ren = rstyle & (RS_fgMask | RS_bgMask); 1288 ren = rstyle & (RS_fgMask | RS_bgMask);
1279 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1289 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1280 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1290 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1281 ERASE_ROWS (row, num); 1291 ERASE_ROWS (row, num);
1282 gcvalue.foreground = pix_colors[Color_fg]; 1292 gcvalue.foreground = pix_colors[Color_fg];
1283 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1293 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1284 } 1294 }
1285 1295
1286 for (; num--; row++) 1296 for (; num--; row++)
1287 { 1297 {
1298 ROW (row).l = 0;
1288 scr_blank_screen_mem (ROW (row), rstyle); 1299 scr_blank_screen_mem (ROW (row), rstyle);
1289 ROW (row).l = 0;
1290 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1300 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1291 } 1301 }
1292} 1302}
1293 1303
1294#if ENABLE_FRILLS 1304#if ENABLE_FRILLS
… …
1583 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1593 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1584#if XPM_BACKGROUND 1594#if XPM_BACKGROUND
1585 if (bgPixmap.pixmap == None) 1595 if (bgPixmap.pixmap == None)
1586#endif 1596#endif
1587#if TRANSPARENT 1597#if TRANSPARENT
1588 if (! (options & Opt_transparent) || am_transparent == 0) 1598 if (! OPTION (Opt_transparent) || am_transparent == 0)
1589#endif 1599#endif
1590 XSetWindowBackground (display->display, vt, 1600 XSetWindowBackground (display->display, vt,
1591 pix_colors[Color_bg]); 1601 pix_colors[Color_bg]);
1592 1602
1593 gcvalue.foreground = pix_colors[Color_fg]; 1603 gcvalue.foreground = pix_colors[Color_fg];
… …
1826{ 1836{
1827#ifndef NO_BELL 1837#ifndef NO_BELL
1828 1838
1829# ifndef NO_MAPALERT 1839# ifndef NO_MAPALERT
1830# ifdef MAPALERT_OPTION 1840# ifdef MAPALERT_OPTION
1831 if (options & Opt_mapAlert) 1841 if (OPTION (Opt_mapAlert))
1832# endif 1842# endif
1833 XMapWindow (display->display, parent[0]); 1843 XMapWindow (display->display, parent[0]);
1834# endif 1844# endif
1835 1845
1836 if (options & Opt_visualBell) 1846 if (OPTION (Opt_visualBell))
1837 { 1847 {
1838 scr_rvideo_mode (!rvideo); /* refresh also done */ 1848 scr_rvideo_mode (!rvideo); /* refresh also done */
1839 rxvt_usleep (VISUAL_BELL_DURATION); 1849 rxvt_usleep (VISUAL_BELL_DURATION);
1840 scr_rvideo_mode (!rvideo); /* refresh also done */ 1850 scr_rvideo_mode (!rvideo); /* refresh also done */
1841 } 1851 }
… …
1932 1942
1933#if XPM_BACKGROUND 1943#if XPM_BACKGROUND
1934 must_clear |= bgPixmap.pixmap != None; 1944 must_clear |= bgPixmap.pixmap != None;
1935#endif 1945#endif
1936#if TRANSPARENT 1946#if TRANSPARENT
1937 must_clear |= (options & Opt_transparent) && am_transparent; 1947 must_clear |= OPTION (Opt_transparent) && am_transparent;
1938#endif 1948#endif
1939 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1949 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1940 1950
1941 /* 1951 /*
1942 * B: reverse any characters which are selected 1952 * B: reverse any characters which are selected
… …
1966 1976
1967 crp = &ROW(screen.cur.row).r[col]; 1977 crp = &ROW(screen.cur.row).r[col];
1968 1978
1969 if (showcursor && focus) 1979 if (showcursor && focus)
1970 { 1980 {
1971 if (options & Opt_cursorUnderline) 1981 if (OPTION (Opt_cursorUnderline))
1972 *crp ^= RS_Uline; 1982 *crp ^= RS_Uline;
1973 else 1983 else
1974 { 1984 {
1975 *crp ^= RS_RVid; 1985 *crp ^= RS_RVid;
1976 1986
… …
1978 cc1 = *crp & (RS_fgMask | RS_bgMask); 1988 cc1 = *crp & (RS_fgMask | RS_bgMask);
1979 if (ISSET_PIXCOLOR (Color_cursor)) 1989 if (ISSET_PIXCOLOR (Color_cursor))
1980 ccol1 = Color_cursor; 1990 ccol1 = Color_cursor;
1981 else 1991 else
1982#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 1992#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1983 ccol1 = GET_FGCOLOR (rstyle); 1993 ccol1 = fgcolor_of (rstyle);
1984#else 1994#else
1985 ccol1 = Color_fg; 1995 ccol1 = Color_fg;
1986#endif 1996#endif
1987 if (ISSET_PIXCOLOR (Color_cursor2)) 1997 if (ISSET_PIXCOLOR (Color_cursor2))
1988 ccol2 = Color_cursor2; 1998 ccol2 = Color_cursor2;
1989 else 1999 else
1990#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1991 ccol2 = GET_BGCOLOR (rstyle); 2001 ccol2 = bgcolor_of (rstyle);
1992#else 2002#else
1993 ccol2 = Color_bg; 2003 ccol2 = Color_bg;
1994#endif 2004#endif
1995 *crp = SET_FGCOLOR (*crp, ccol1); 2005 *crp = SET_FGCOLOR (*crp, ccol1);
1996 *crp = SET_BGCOLOR (*crp, ccol2); 2006 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2177 count++, i--; 2187 count++, i--;
2178 2188
2179 /* 2189 /*
2180 * Determine the attributes for the string 2190 * Determine the attributes for the string
2181 */ 2191 */
2182 int fore = GET_FGCOLOR (rend); // desired foreground 2192 int fore = fgcolor_of (rend); // desired foreground
2183 int back = GET_BGCOLOR (rend); // desired background 2193 int back = bgcolor_of (rend); // desired background
2184 2194
2185 // only do special processing if any attributes are set, which is rare 2195 // only do special processing if any attributes are set, which is unlikely
2186 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2187 { 2197 {
2188#if ENABLE_STYLES 2198#if ENABLE_STYLES
2189 // force redraw after "careful" characters to avoid pixel droppings 2199 // force redraw after "careful" characters to avoid pixel droppings
2190 if (srp[col] & RS_Careful && col < ncol - 1 && 0) 2200 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
… …
2309 */ 2319 */
2310 if (showcursor) 2320 if (showcursor)
2311 { 2321 {
2312 if (focus) 2322 if (focus)
2313 { 2323 {
2314 if (options & Opt_cursorUnderline) 2324 if (OPTION (Opt_cursorUnderline))
2315 *crp ^= RS_Uline; 2325 *crp ^= RS_Uline;
2316 else 2326 else
2317 { 2327 {
2318 *crp ^= RS_RVid; 2328 *crp ^= RS_RVid;
2319#ifndef NO_CURSORCOLOR 2329#ifndef NO_CURSORCOLOR
… …
2438 2448
2439#if ENABLE_FRILLS 2449#if ENABLE_FRILLS
2440 if (selection.rect) 2450 if (selection.rect)
2441 { 2451 {
2442 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2452 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++)
2453 {
2454 text_t *stp = ROW(row).t;
2455 rend_t *srp = ROW(row).r;
2456
2443 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2457 for (col = selection.beg.col; col < selection.end.col; col++)
2444 srp[col] ^= RS_RVid; 2458 srp[col] ^= RS_RVid;
2459
2460 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2461 srp[col] ^= RS_RVid | RS_Uline;
2462 }
2445 } 2463 }
2446 else 2464 else
2447#endif 2465#endif
2448 { 2466 {
2449 if (selection.beg.row >= -view_start) 2467 if (selection.beg.row >= -view_start)
… …
2452 row = selection.beg.row; 2470 row = selection.beg.row;
2453 } 2471 }
2454 else 2472 else
2455 { 2473 {
2456 col = 0; 2474 col = 0;
2457 row = view_start; 2475 row = -view_start;
2458 } 2476 }
2459 2477
2460 for (; row < min (selection.end.row, view_end); row++, col = 0) 2478 for (; row < min (selection.end.row, view_end); row++, col = 0)
2461 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2479 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2462 srp[col] ^= RS_RVid; 2480 srp[col] ^= RS_RVid;
… …
2876#endif 2894#endif
2877 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2895 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN
2878 2896
2879 col = max (col, 0); 2897 col = max (col, 0);
2880 2898
2881 if (row == selection.end.row || selection.rect) 2899 if (row == selection.end.row
2900#if ENABLE_FRILLS
2901 || selection.rect
2902#endif
2903 )
2882 end_col = min (end_col, selection.end.col); 2904 min_it (end_col, selection.end.col);
2883 2905
2884 t = ROW(row).t + col; 2906 t = ROW(row).t + col;
2885 for (; col < end_col; col++) 2907 for (; col < end_col; col++)
2886 { 2908 {
2887 if (*t == NOCHAR) 2909 if (*t == NOCHAR)
… …
2905#endif 2927#endif
2906 else 2928 else
2907 new_selection_text[ofs++] = *t++; 2929 new_selection_text[ofs++] = *t++;
2908 } 2930 }
2909 2931
2932#if ENABLE_FRILLS
2933 if (selection.rect)
2934 {
2935 while (ofs
2936 && new_selection_text[ofs - 1] != C0_LF
2937 && unicode::is_space (new_selection_text[ofs - 1]))
2938 --ofs;
2939
2940 new_selection_text[ofs++] = C0_LF;
2941 }
2942 else
2943#endif
2910 if (!ROW(row).is_longer () && row != selection.end.row) 2944 if (!ROW(row).is_longer () && row != selection.end.row)
2911 new_selection_text[ofs++] = C0_LF; 2945 new_selection_text[ofs++] = C0_LF;
2912 } 2946 }
2913 2947
2914 if (end_col != selection.end.col) 2948 if (end_col != selection.end.col)
2915 new_selection_text[ofs++] = C0_LF; 2949 new_selection_text[ofs++] = C0_LF;
2916 2950
… …
3267 selection_delimit_word (DN, &selection.end, &selection.end); 3301 selection_delimit_word (DN, &selection.end, &selection.end);
3268 } 3302 }
3269 else if (selection.clicks == 3) 3303 else if (selection.clicks == 3)
3270 { 3304 {
3271#if ENABLE_FRILLS 3305#if ENABLE_FRILLS
3272 if (options & Opt_tripleclickwords) 3306 if (OPTION (Opt_tripleclickwords))
3273 { 3307 {
3274 selection_delimit_word (UP, &selection.beg, &selection.beg); 3308 selection_delimit_word (UP, &selection.beg, &selection.beg);
3275 3309
3276 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3310 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3277 { 3311 {
… …
3338 { 3372 {
3339 stp = ROW(end_row).t; 3373 stp = ROW(end_row).t;
3340 3374
3341 while (--end_col >= 0) 3375 while (--end_col >= 0)
3342 { 3376 {
3343 if (stp[end_col] != ' ' 3377 if (stp[end_col] != NOCHAR
3344 && stp[end_col] != '\t' 3378 && !unicode::is_space (stp[end_col]))
3345 && stp[end_col] != NOCHAR)
3346 break; 3379 break;
3347 } 3380 }
3348 3381
3349 if (end_col >= 0 3382 if (end_col >= 0
3350 || !ROW(end_row - 1).is_longer ()) 3383 || !ROW(end_row - 1).is_longer ())
… …
3666 for (int y = ov_h; y--; ) 3699 for (int y = ov_h; y--; )
3667 { 3700 {
3668 text_t *t1 = ov_text[y]; 3701 text_t *t1 = ov_text[y];
3669 rend_t *r1 = ov_rend[y]; 3702 rend_t *r1 = ov_rend[y];
3670 3703
3671 text_t *t2 = ROW(y - view_start).t + ov_x; 3704 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x;
3672 rend_t *r2 = ROW(y - view_start).r + ov_x; 3705 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x;
3673 3706
3674 for (int x = ov_w; x--; ) 3707 for (int x = ov_w; x--; )
3675 { 3708 {
3676 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3709 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3677 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3710 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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