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.266 by root, Mon Oct 9 23:12:45 2006 UTC vs.
Revision 1.278 by root, Mon Sep 17 08:31:54 2007 UTC

… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
237 selection.text = NULL; 236 selection.text = NULL;
238 selection.len = 0; 237 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
241 selection.clicks = 0; 240 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 241 }
244 else 242 else
245 { 243 {
246 /* 244 /*
247 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
407 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
408 406
409 prev_nrow = nrow; 407 prev_nrow = nrow;
410 prev_ncol = ncol; 408 prev_ncol = ncol;
411 409
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
413 411
414 for (int col = ncol; --col; ) 412 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
416 414
417 if (current_screen != PRIMARY) 415 if (current_screen != PRIMARY)
… …
510} 508}
511 509
512void 510void
513rxvt_term::scr_swap_screen () 511rxvt_term::scr_swap_screen ()
514{ 512{
515 if (!OPTION (Opt_secondaryScreen)) 513 if (!option (Opt_secondaryScreen))
516 return; 514 return;
517 515
518 for (int i = prev_nrow; i--; ) 516 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]); 517 ::swap (ROW(i), swap_buf [i]);
520 518
… …
542 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
543 541
544 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
545 543
546#if NSCREENS 544#if NSCREENS
547 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
548 { 546 {
549 num_scr = 0; 547 num_scr = 0;
550 548
551 scr_swap_screen (); 549 scr_swap_screen ();
552 550
… …
555 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
556 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
557 } 555 }
558 else 556 else
559#endif 557#endif
560 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
561 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
562} 560}
563 561
564// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
565void 563void
… …
624 want_refresh = 1; 622 want_refresh = 1;
625 num_scr += count; 623 num_scr += count;
626 624
627 if (count > 0 625 if (count > 0
628 && row1 == 0 626 && row1 == 0
629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
630 { 628 {
631 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
632 630
633 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
684 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
685 } 683 }
686 } 684 }
687 685
688 // finally move the view window, if desired 686 // finally move the view window, if desired
689 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
690 && view_start != 0 688 && view_start != 0
691 && view_start != -saveLines) 689 && view_start != -saveLines)
692 scr_page (UP, count); 690 scr_page (UP, count);
693 691
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
1071 if (count) 1069 if (count)
1072 x = ncol - 1; 1070 x = ncol - 1;
1073 1071
1074 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1075 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1076 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1077 { 1075 {
1078 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1079 1077
1080 l.touch (x); 1078 l.touch (x);
1081 1079
… …
1623 */ 1621 */
1624void 1622void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1623rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1624{
1627 if (mode < 0) 1625 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1626 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1627 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1628 tabs [screen.cur.col] = !!mode;
1631} 1629}
1632 1630
1633/* ------------------------------------------------------------------------- */ 1631/* ------------------------------------------------------------------------- */
… …
1648 if (rvideo_state != on) 1646 if (rvideo_state != on)
1649 { 1647 {
1650 rvideo_state = on; 1648 rvideo_state = on;
1651 1649
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1655#endif
1656#if TRANSPARENT
1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1658#endif 1653#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1655
1661 XGCValues gcvalue; 1656 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1802 {
1808 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1810 } 1805 }
1811 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1809
1815 num_scr_allow = 0; 1810 num_scr_allow = 0;
1816 1811
… …
1886{ 1881{
1887#ifndef NO_BELL 1882#ifndef NO_BELL
1888 1883
1889# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1890# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1891 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1892# endif 1887# endif
1893 XMapWindow (dpy, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1894# endif 1889# endif
1895 1890
1891# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell))
1893 {
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1899 }
1900# endif
1901
1896 if (OPTION (Opt_visualBell)) 1902 if (option (Opt_visualBell))
1897 { 1903 {
1898 rvideo_bell = true; 1904 rvideo_bell = true;
1899 scr_rvideo_mode (rvideo_mode); 1905 scr_rvideo_mode (rvideo_mode);
1900 display->flush (); 1906 display->flush ();
1901 1907
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1908 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1903 } 1909 }
1904 else 1910 else
1905 XBell (dpy, 0); 1911 XBell (dpy, 0);
1906
1907#endif 1912#endif
1908} 1913}
1909 1914
1910/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1911/* ARGSUSED */ 1916/* ARGSUSED */
… …
1992 * A: set up vars 1997 * A: set up vars
1993 */ 1998 */
1994 have_bg = 0; 1999 have_bg = 0;
1995 refresh_count = 0; 2000 refresh_count = 0;
1996 2001
1997#if XPM_BACKGROUND 2002#ifdef HAVE_BG_PIXMAP
1998 have_bg |= bgPixmap.pixmap != None; 2003 have_bg |= bgPixmap.pixmap != None;
1999#endif
2000#if TRANSPARENT
2001 have_bg |= OPTION (Opt_transparent) && am_transparent;
2002#endif 2004#endif
2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2004 2006
2005 /* 2007 /*
2006 * B: reverse any characters which are selected 2008 * B: reverse any characters which are selected
… …
2051 ccol2 = Color_bg; 2053 ccol2 = Color_bg;
2052#endif 2054#endif
2053 2055
2054 if (showcursor && focus) 2056 if (showcursor && focus)
2055 { 2057 {
2056 if (OPTION (Opt_cursorUnderline)) 2058 if (option (Opt_cursorUnderline))
2057 *crp ^= RS_Uline; 2059 *crp ^= RS_Uline;
2058 else 2060 else
2059 { 2061 {
2060 *crp ^= RS_RVid; 2062 *crp ^= RS_RVid;
2061 *crp = SET_FGCOLOR (*crp, ccol1); 2063 *crp = SET_FGCOLOR (*crp, ccol1);
… …
2349 /* 2351 /*
2350 * Actually do the drawing of the string here 2352 * Actually do the drawing of the string here
2351 */ 2353 */
2352 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2353 2355
2354 if (back == Color_bg && have_bg) 2356 if (have_bg && back == Color_bg)
2355 { 2357 {
2356 // this is very ugly, maybe push it into ->draw? 2358 // this is very ugly, maybe push it into ->draw?
2357 2359
2358 for (i = 0; i < count; i++) /* don't draw empty strings */ 2360 for (i = 0; i < count; i++) /* don't draw empty strings */
2359 if (text[i] != ' ') 2361 if (text[i] != ' ')
2360 { 2362 {
2361 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2362 goto did_clear; 2364 goto did_clear;
2363 } 2365 }
2364 2366
2365 CLEAR_CHARS (xpixel, ypixel, count); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2366 did_clear: ; 2368 did_clear: ;
… …
2394 */ 2396 */
2395 if (showcursor) 2397 if (showcursor)
2396 { 2398 {
2397 if (focus) 2399 if (focus)
2398 { 2400 {
2399 if (OPTION (Opt_cursorUnderline)) 2401 if (option (Opt_cursorUnderline))
2400 *crp ^= RS_Uline; 2402 *crp ^= RS_Uline;
2401 else 2403 else
2402 { 2404 {
2403 *crp ^= RS_RVid; 2405 *crp ^= RS_RVid;
2404#ifndef NO_CURSORCOLOR 2406#ifndef NO_CURSORCOLOR
… …
2468} 2470}
2469 2471
2470void 2472void
2471rxvt_term::scr_recolour () NOTHROW 2473rxvt_term::scr_recolour () NOTHROW
2472{ 2474{
2473 if (1 2475#ifdef HAVE_BG_PIXMAP
2474#if TRANSPARENT 2476 bgPixmap.apply ();
2475 && !am_transparent 2477#else
2476#endif
2477#if XPM_BACKGROUND
2478 && !bgPixmap.pixmap
2479#endif
2480 )
2481 {
2482 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2483 XClearWindow (dpy, parent[0]); 2479 XClearWindow (dpy, parent[0]);
2484 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2485#if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2486 if (scrollBar.win) 2482 if (scrollBar.win)
2487 { 2483 {
2488 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2489 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2490 scrollbar_show (0); 2486 scrollbar_show (0);
2491 } 2487 }
2492#endif 2488# endif
2493 } 2489#endif
2494 2490
2495 scr_clear (); 2491 scr_clear ();
2496 scr_touch (true); 2492 scr_touch (true);
2497 want_refresh = 1; 2493 want_refresh = 1;
2498} 2494}
2499 2495
… …
3414 selection_delimit_word (DN, &selection.end, &selection.end); 3410 selection_delimit_word (DN, &selection.end, &selection.end);
3415 } 3411 }
3416 else if (selection.clicks == 3) 3412 else if (selection.clicks == 3)
3417 { 3413 {
3418#if ENABLE_FRILLS 3414#if ENABLE_FRILLS
3419 if (OPTION (Opt_tripleclickwords)) 3415 if (option (Opt_tripleclickwords))
3420 { 3416 {
3421 selection_delimit_word (UP, &selection.beg, &selection.beg); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3422 3418
3423 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3419 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3424 { 3420 {

Diff Legend

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