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.267 by root, Thu Nov 2 17:23:50 2006 UTC vs.
Revision 1.268 by root, Tue May 1 21:30:01 2007 UTC

… …
47 47
48/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 52 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 53 view_start = 0
54#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
510} 510}
511 511
512void 512void
513rxvt_term::scr_swap_screen () 513rxvt_term::scr_swap_screen ()
514{ 514{
515 if (!OPTION (Opt_secondaryScreen)) 515 if (!option (Opt_secondaryScreen))
516 return; 516 return;
517 517
518 for (int i = prev_nrow; i--; ) 518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 519 ::swap (ROW(i), swap_buf [i]);
520 520
… …
542 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
543 543
544 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
545 545
546#if NSCREENS 546#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 547 if (option (Opt_secondaryScreen))
548 { 548 {
549 num_scr = 0; 549 num_scr = 0;
550 550
551 scr_swap_screen (); 551 scr_swap_screen ();
552 552
… …
555 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
557 } 557 }
558 else 558 else
559#endif 559#endif
560 if (OPTION (Opt_secondaryScroll)) 560 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 562}
563 563
564// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
565void 565void
… …
624 want_refresh = 1; 624 want_refresh = 1;
625 num_scr += count; 625 num_scr += count;
626 626
627 if (count > 0 627 if (count > 0
628 && row1 == 0 628 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 630 {
631 top_row = max (top_row - count, -saveLines); 631 top_row = max (top_row - count, -saveLines);
632 632
633 // scroll everything up 'count' lines 633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
… …
684 selection.op = SELECTION_CLEAR; 684 selection.op = SELECTION_CLEAR;
685 } 685 }
686 } 686 }
687 687
688 // finally move the view window, if desired 688 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 689 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 690 && view_start != 0
691 && view_start != -saveLines) 691 && view_start != -saveLines)
692 scr_page (UP, count); 692 scr_page (UP, count);
693 693
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
1071 if (count) 1071 if (count)
1072 x = ncol - 1; 1072 x = ncol - 1;
1073 1073
1074 // store horizontal tab commands as characters inside the text 1074 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && option (Opt_pastableTabs))
1077 { 1077 {
1078 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1079 1079
1080 l.touch (x); 1080 l.touch (x);
1081 1081
… …
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1654 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1655#endif 1655#endif
1656#if TRANSPARENT 1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1658#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1660
1661 XGCValues gcvalue; 1661 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
… …
1886{ 1886{
1887#ifndef NO_BELL 1887#ifndef NO_BELL
1888 1888
1889# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1891 if (option (Opt_mapAlert))
1892# endif 1892# endif
1893 XMapWindow (dpy, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1894# endif 1894# endif
1895 1895
1896 if (OPTION (Opt_visualBell)) 1896 if (option (Opt_visualBell))
1897 { 1897 {
1898 rvideo_bell = true; 1898 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1899 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1900 display->flush ();
1901 1901
… …
1996 1996
1997#if XPM_BACKGROUND 1997#if XPM_BACKGROUND
1998 have_bg |= bgPixmap.pixmap != None; 1998 have_bg |= bgPixmap.pixmap != None;
1999#endif 1999#endif
2000#if TRANSPARENT 2000#if TRANSPARENT
2001 have_bg |= OPTION (Opt_transparent) && am_transparent; 2001 have_bg |= option (Opt_transparent) && am_transparent;
2002#endif 2002#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2004
2005 /* 2005 /*
2006 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
2051 ccol2 = Color_bg; 2051 ccol2 = Color_bg;
2052#endif 2052#endif
2053 2053
2054 if (showcursor && focus) 2054 if (showcursor && focus)
2055 { 2055 {
2056 if (OPTION (Opt_cursorUnderline)) 2056 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2058 else 2058 else
2059 { 2059 {
2060 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
2061 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
… …
2394 */ 2394 */
2395 if (showcursor) 2395 if (showcursor)
2396 { 2396 {
2397 if (focus) 2397 if (focus)
2398 { 2398 {
2399 if (OPTION (Opt_cursorUnderline)) 2399 if (option (Opt_cursorUnderline))
2400 *crp ^= RS_Uline; 2400 *crp ^= RS_Uline;
2401 else 2401 else
2402 { 2402 {
2403 *crp ^= RS_RVid; 2403 *crp ^= RS_RVid;
2404#ifndef NO_CURSORCOLOR 2404#ifndef NO_CURSORCOLOR
… …
3414 selection_delimit_word (DN, &selection.end, &selection.end); 3414 selection_delimit_word (DN, &selection.end, &selection.end);
3415 } 3415 }
3416 else if (selection.clicks == 3) 3416 else if (selection.clicks == 3)
3417 { 3417 {
3418#if ENABLE_FRILLS 3418#if ENABLE_FRILLS
3419 if (OPTION (Opt_tripleclickwords)) 3419 if (option (Opt_tripleclickwords))
3420 { 3420 {
3421 selection_delimit_word (UP, &selection.beg, &selection.beg); 3421 selection_delimit_word (UP, &selection.beg, &selection.beg);
3422 3422
3423 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3423 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3424 { 3424 {

Diff Legend

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