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.254 by root, Sat Jan 28 14:23:16 2006 UTC vs.
Revision 1.273 by ayin, Mon Aug 13 07:18:58 2007 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
… …
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) 35inline void fill_text (text_t *start, text_t value, int len)
… …
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() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (xdisp, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (xdisp, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (xdisp, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
… …
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
… …
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 * sizeof (char));
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)
418 scr_swap_screen (); 416 scr_swap_screen ();
419 417
… …
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;
… …
645 { 643 {
646 line_t &l = ROW(nrow - 1 - i); 644 line_t &l = ROW(nrow - 1 - i);
647 645
648 // optimize if already cleared, can be significant on slow machines 646 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem 647 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) 648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 { 649 {
652 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0; 651 l.l = 0;
654 l.f = 0; 652 l.f = 0;
655 } 653 }
… …
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
… …
1114 * Process DEC Back Index 1112 * Process DEC Back Index
1115 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1118 */ 1116 */
1119#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1120void 1118void
1121rxvt_term::scr_backindex () NOTHROW 1119rxvt_term::scr_backindex () NOTHROW
1122{ 1120{
1123 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1131 * Process DEC Forward Index 1129 * Process DEC Forward Index
1132 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1135 */ 1133 */
1136#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1137void 1135void
1138rxvt_term::scr_forwardindex () NOTHROW 1136rxvt_term::scr_forwardindex () NOTHROW
1139{ 1137{
1140 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1342 } 1340 }
1343 else 1341 else
1344 { 1342 {
1345 ren = rstyle & (RS_fgMask | RS_bgMask); 1343 ren = rstyle & (RS_fgMask | RS_bgMask);
1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1347 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1348 ERASE_ROWS (row, num); 1346 ERASE_ROWS (row, num);
1349 gcvalue.foreground = pix_colors[Color_fg]; 1347 gcvalue.foreground = pix_colors[Color_fg];
1350 XChangeGC (xdisp, gc, GCForeground, &gcvalue); 1348 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1351 } 1349 }
1352 1350
1353 for (; num--; row++) 1351 for (; num--; row++)
1354 { 1352 {
1355 scr_blank_screen_mem (ROW(row), rstyle); 1353 scr_blank_screen_mem (ROW(row), rstyle);
1356 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1354 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1357 } 1355 }
1358} 1356}
1359 1357
1360#if ENABLE_FRILLS 1358#if !ENABLE_MINIMAL
1361void 1359void
1362rxvt_term::scr_erase_savelines () NOTHROW 1360rxvt_term::scr_erase_savelines () NOTHROW
1363{ 1361{
1364 want_refresh = 1; 1362 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
… …
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 1653#endif
1656#if TRANSPARENT 1654#if ENABLE_TRANSPARENCY
1657 if (!OPTION (Opt_transparent) || am_transparent == 0) 1655 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1656#endif
1659 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 1657 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1658
1661 XGCValues gcvalue; 1659 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1660 gcvalue.foreground = pix_colors[Color_fg];
1663 gcvalue.background = pix_colors[Color_bg]; 1661 gcvalue.background = pix_colors[Color_bg];
1664 XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); 1662 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1665 1663
1666 scr_clear (); 1664 scr_clear ();
1667 scr_touch (true); 1665 scr_touch (true);
1668 } 1666 }
1669} 1667}
… …
1754{ 1752{
1755 bool found = false; 1753 bool found = false;
1756 1754
1757 for (int i = 0; i < nrow; i++) 1755 for (int i = 0; i < nrow; i++)
1758 { 1756 {
1759 int col = 0;
1760 rend_t *drp = drawn_buf[i].r; 1757 rend_t *drp = drawn_buf[i].r;
1761 1758
1762 for (; col < ncol; col++, drp++) 1759 for (int col = 0; col < ncol; col++, drp++)
1763 if ((*drp & mask) == value) 1760 if ((*drp & mask) == value)
1764 { 1761 {
1765 found = true; 1762 found = true;
1766 *drp = ~value; 1763 *drp = ~value;
1767 } 1764 }
… …
1887{ 1884{
1888#ifndef NO_BELL 1885#ifndef NO_BELL
1889 1886
1890# ifndef NO_MAPALERT 1887# ifndef NO_MAPALERT
1891# ifdef MAPALERT_OPTION 1888# ifdef MAPALERT_OPTION
1892 if (OPTION (Opt_mapAlert)) 1889 if (option (Opt_mapAlert))
1893# endif 1890# endif
1894 XMapWindow (xdisp, parent[0]); 1891 XMapWindow (dpy, parent[0]);
1895# endif 1892# endif
1893# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell))
1895 {
1896 XWMHints *h;
1896 1897
1898 h = XGetWMHints(dpy, parent[0]);
1899 if (h != NULL)
1900 {
1901 h->flags |= XUrgencyHint;
1902 XSetWMHints(dpy, parent[0], h);
1903 }
1904 }
1905# endif
1906
1897 if (OPTION (Opt_visualBell)) 1907 if (option (Opt_visualBell))
1898 { 1908 {
1899 rvideo_bell = true; 1909 rvideo_bell = true;
1900 scr_rvideo_mode (rvideo_mode); 1910 scr_rvideo_mode (rvideo_mode);
1901 display->flush (); 1911 display->flush ();
1902 1912
1903 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1913 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1904 } 1914 }
1905 else 1915 else
1906 XBell (xdisp, 0); 1916 XBell (dpy, 0);
1907
1908#endif 1917#endif
1909} 1918}
1910 1919
1911/* ------------------------------------------------------------------------- */ 1920/* ------------------------------------------------------------------------- */
1912/* ARGSUSED */ 1921/* ARGSUSED */
… …
1970 * screen.text/screen.rend contain what the screen will change to. 1979 * screen.text/screen.rend contain what the screen will change to.
1971 */ 1980 */
1972void 1981void
1973rxvt_term::scr_refresh () NOTHROW 1982rxvt_term::scr_refresh () NOTHROW
1974{ 1983{
1975 unsigned char must_clear, /* use draw_string not draw_image_string */ 1984 unsigned char have_bg,
1976 showcursor; /* show the cursor */ 1985 showcursor; /* show the cursor */
1977 int16_t col, row, /* column/row we're processing */ 1986 int16_t col, row, /* column/row we're processing */
1978 ocrow; /* old cursor row */ 1987 ocrow; /* old cursor row */
1979 int i; /* tmp */ 1988 int i; /* tmp */
1980#ifndef NO_CURSORCOLOR 1989#ifndef NO_CURSORCOLOR
1981 rend_t cc1; /* store colours at cursor position (s) */ 1990 rend_t cc1; /* store colours at cursor position (s) */
1982#endif 1991#endif
1983 rend_t *crp; // cursor rendition pointer 1992 rend_t *crp; // cursor rendition pointer
1993 rend_t ccol1, /* Cursor colour */
1994 ccol2; /* Cursor colour2 */
1984 1995
1985 want_refresh = 0; /* screen is current */ 1996 want_refresh = 0; /* screen is current */
1986 1997
1987 if (refresh_type == NO_REFRESH || !mapped) 1998 if (refresh_type == NO_REFRESH || !mapped)
1988 return; 1999 return;
1989 2000
1990 /* 2001 /*
1991 * A: set up vars 2002 * A: set up vars
1992 */ 2003 */
1993 must_clear = 0; 2004 have_bg = 0;
1994 refresh_count = 0; 2005 refresh_count = 0;
1995 2006
1996#if XPM_BACKGROUND 2007#ifdef HAVE_BG_PIXMAP
1997 must_clear |= bgPixmap.pixmap != None; 2008 have_bg |= bgPixmap.pixmap != None;
1998#endif 2009#endif
1999#if TRANSPARENT 2010#if ENABLE_TRANSPARENCY
2000 must_clear |= OPTION (Opt_transparent) && am_transparent; 2011 have_bg |= option (Opt_transparent) && am_transparent;
2001#endif 2012#endif
2002 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2013 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2003 2014
2004 /* 2015 /*
2005 * B: reverse any characters which are selected 2016 * B: reverse any characters which are selected
… …
2009 /* 2020 /*
2010 * C: set the cursor character (s) 2021 * C: set the cursor character (s)
2011 */ 2022 */
2012 { 2023 {
2013 unsigned char setoldcursor; 2024 unsigned char setoldcursor;
2014 rend_t ccol1, /* Cursor colour */
2015 ccol2; /* Cursor colour2 */
2016 2025
2017 showcursor = (screen.flags & Screen_VisibleCursor); 2026 showcursor = (screen.flags & Screen_VisibleCursor);
2018#ifdef CURSOR_BLINK 2027#ifdef CURSOR_BLINK
2019 if (hidden_cursor) 2028 if (hidden_cursor)
2020 showcursor = 0; 2029 showcursor = 0;
… …
2027 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2036 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2028 col--; 2037 col--;
2029 2038
2030 crp = &ROW(screen.cur.row).r[col]; 2039 crp = &ROW(screen.cur.row).r[col];
2031 2040
2041#ifndef NO_CURSORCOLOR
2042 cc1 = *crp & (RS_fgMask | RS_bgMask);
2043 if (ISSET_PIXCOLOR (Color_cursor))
2044 ccol1 = Color_cursor;
2045 else
2046#endif
2047#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2048 ccol1 = fgcolor_of (rstyle);
2049#else
2050 ccol1 = Color_fg;
2051#endif
2052
2053#ifndef NO_CURSORCOLOR
2054 if (ISSET_PIXCOLOR (Color_cursor2))
2055 ccol2 = Color_cursor2;
2056 else
2057#endif
2058#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2059 ccol2 = bgcolor_of (rstyle);
2060#else
2061 ccol2 = Color_bg;
2062#endif
2063
2032 if (showcursor && focus) 2064 if (showcursor && focus)
2033 { 2065 {
2034 if (OPTION (Opt_cursorUnderline)) 2066 if (option (Opt_cursorUnderline))
2035 *crp ^= RS_Uline; 2067 *crp ^= RS_Uline;
2036 else 2068 else
2037 { 2069 {
2038 *crp ^= RS_RVid; 2070 *crp ^= RS_RVid;
2039
2040#ifndef NO_CURSORCOLOR
2041 cc1 = *crp & (RS_fgMask | RS_bgMask);
2042 if (ISSET_PIXCOLOR (Color_cursor))
2043 ccol1 = Color_cursor;
2044 else
2045#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2046 ccol1 = fgcolor_of (rstyle);
2047#else
2048 ccol1 = Color_fg;
2049#endif
2050 if (ISSET_PIXCOLOR (Color_cursor2))
2051 ccol2 = Color_cursor2;
2052 else
2053#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2054 ccol2 = bgcolor_of (rstyle);
2055#else
2056 ccol2 = Color_bg;
2057#endif
2058 *crp = SET_FGCOLOR (*crp, ccol1); 2071 *crp = SET_FGCOLOR (*crp, ccol1);
2059 *crp = SET_BGCOLOR (*crp, ccol2); 2072 *crp = SET_BGCOLOR (*crp, ccol2);
2060#endif
2061 } 2073 }
2062 } 2074 }
2063 } 2075 }
2064 2076
2065 /* make sure no outline cursor is left around */ 2077 /* make sure no outline cursor is left around */
… …
2104 * D: CopyArea pass - very useful for slower links 2116 * D: CopyArea pass - very useful for slower links
2105 * This has been deliberately kept simple. 2117 * This has been deliberately kept simple.
2106 */ 2118 */
2107 if (!display->is_local 2119 if (!display->is_local
2108 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2120 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2109 && abs (num_scr) < nrow && !must_clear) 2121 && abs (num_scr) < nrow && !have_bg)
2110 { 2122 {
2111 int16_t nits; 2123 int16_t nits;
2124 int i = num_scr;
2112 int j; 2125 int j;
2113 int len, wlen; 2126 int len, wlen;
2114 dLocal (int, num_scr); 2127 dLocal (int, num_scr);
2115 2128
2116 j = nrow; 2129 j = nrow;
2117 wlen = len = -1; 2130 wlen = len = -1;
2118 row = i > 0 ? 0 : j - 1; 2131 row = i > 0 ? 0 : j - 1;
2132
2119 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2133 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2120 { 2134 {
2121 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2135 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2122 { 2136 {
2123 line_t s = ROW(view_start + row); 2137 line_t s = ROW(view_start + row);
… …
2144 wlen = row; 2158 wlen = row;
2145 continue; 2159 continue;
2146 } 2160 }
2147 } 2161 }
2148 2162
2149 if (len != -1) 2163 if (len >= 0)
2150 { 2164 {
2151 /* also comes here at end if needed because of >= above */ 2165 /* also comes here at end if needed because of >= above */
2152 if (wlen < len) 2166 if (wlen < len)
2153 ::swap (wlen, len); 2167 ::swap (wlen, len);
2154 2168
2169 XGCValues gcv;
2170
2171 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2155 XCopyArea (xdisp, vt, vt, 2172 XCopyArea (dpy, vt, vt,
2156 gc, 0, Row2Pixel (len + i), 2173 gc, 0, Row2Pixel (len + i),
2157 (unsigned int)this->width, 2174 (unsigned int)this->width,
2158 (unsigned int)Height2Pixel (wlen - len + 1), 2175 (unsigned int)Height2Pixel (wlen - len + 1),
2159 0, Row2Pixel (len)); 2176 0, Row2Pixel (len));
2177 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2178
2160 len = -1; 2179 len = -1;
2161 } 2180 }
2162 } 2181 }
2163 } 2182 }
2164#endif 2183#endif
… …
2220 count++; 2239 count++;
2221 2240
2222 if (stp[col] != dtp[col] 2241 if (stp[col] != dtp[col]
2223 || !RS_SAME (srp[col], drp[col])) 2242 || !RS_SAME (srp[col], drp[col]))
2224 { 2243 {
2225 if (must_clear && (i++ > count / 2)) 2244 if (have_bg && (i++ > count / 2))
2226 break; 2245 break;
2227 2246
2228 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2229 drp[col] = rend; 2248 drp[col] = rend;
2230 i = 0; 2249 i = 0;
2231 } 2250 }
2232 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2251 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2233 break; 2252 break;
2234 } 2253 }
2235 2254
2236 col--; /* went one too far. move back */ 2255 col--; /* went one too far. move back */
2237 count -= i; /* dump any matching trailing chars */ 2256 count -= i; /* dump any matching trailing chars */
… …
2247 int back = bgcolor_of (rend); // desired background 2266 int back = bgcolor_of (rend); // desired background
2248 2267
2249 // only do special processing if any attributes are set, which is unlikely 2268 // only do special processing if any attributes are set, which is unlikely
2250 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2269 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2251 { 2270 {
2252#if ENABLE_STYLES
2253 // "careful" (too wide) character handling
2254
2255 // include previous careful character(s) if possible, looks nicer (best effort...)
2256 while (text > stp
2257 && srp[text - stp - 1] & RS_Careful
2258 && RS_SAME (rend, srp[text - stp - 1]))
2259 text--, count++, xpixel -= fwidth;
2260
2261 // force redraw after "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2263 drp[col + i + 1] = ~srp[col + i + 1];
2264
2265 // force redraw before "careful" characters to avoid pixel droppings
2266 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2267 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2268#endif
2269
2270 bool invert = rend & RS_RVid; 2271 bool invert = rend & RS_RVid;
2271 2272
2272#ifndef NO_BOLD_UNDERLINE_REVERSE 2273#ifndef NO_BOLD_UNDERLINE_REVERSE
2273 if (rend & RS_Bold 2274 if (rend & RS_Bold
2274 && fore == Color_fg) 2275 && fore == Color_fg)
… …
2290 else 2291 else
2291 invert = !invert; 2292 invert = !invert;
2292# endif 2293# endif
2293 } 2294 }
2294 2295
2295 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2296 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2296 fore = Color_UL; 2297 fore = Color_UL;
2297#endif 2298#endif
2298 2299
2299 if (invert) 2300 if (invert)
2300 { 2301 {
2302#ifdef OPTION_HC
2303 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2304 || !ISSET_PIXCOLOR (Color_HC))
2305#endif
2306 /* invert the column if no highlightColor is set or it is the
2307 * current cursor column */
2301 ::swap (fore, back); 2308 ::swap (fore, back);
2309#ifdef OPTION_HC
2310 else if (ISSET_PIXCOLOR (Color_HC))
2311 back = Color_HC;
2312#endif
2302 2313
2303#ifndef NO_BOLD_UNDERLINE_REVERSE 2314#ifndef NO_BOLD_UNDERLINE_REVERSE
2315# ifndef OPTION_HC
2304 if (ISSET_PIXCOLOR (Color_RV)) 2316 if (ISSET_PIXCOLOR (Color_RV))
2305 back = Color_RV; 2317 back = Color_RV;
2306 2318# endif
2307 if (fore == back) 2319 if (fore == back)
2308 { 2320 {
2309 fore = Color_bg; 2321 fore = Color_bg;
2310 back = Color_fg; 2322 back = Color_fg;
2311 } 2323 }
… …
2322 } 2334 }
2323 else if (hidden_text) 2335 else if (hidden_text)
2324 fore = back; 2336 fore = back;
2325 } 2337 }
2326#endif 2338#endif
2339
2340#if ENABLE_STYLES
2341 // "careful" (too wide) character handling
2342
2343 // include previous careful character(s) if possible, looks nicer (best effort...)
2344 while (text > stp
2345 && srp[text - stp - 1] & RS_Careful
2346 && RS_SAME (rend, srp[text - stp - 1]))
2347 text--, count++, xpixel -= fwidth;
2348
2349 // force redraw after "careful" characters to avoid pixel droppings
2350 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2351 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2352
2353 // force redraw before "careful" characters to avoid pixel droppings
2354 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2355 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2356#endif
2327 } 2357 }
2328 2358
2329 /* 2359 /*
2330 * Actually do the drawing of the string here 2360 * Actually do the drawing of the string here
2331 */ 2361 */
2332 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2362 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2333 2363
2334 if (back == fore)
2335 font->clear_rect (*drawable, xpixel, ypixel,
2336 fwidth * count, fheight,
2337 back);
2338 else if (back == Color_bg) 2364 if (have_bg && back == Color_bg)
2339 { 2365 {
2340 if (must_clear) 2366 // this is very ugly, maybe push it into ->draw?
2341 {
2342 CLEAR_CHARS (xpixel, ypixel, count);
2343 2367
2344 for (i = 0; i < count; i++) /* don't draw empty strings */ 2368 for (i = 0; i < count; i++) /* don't draw empty strings */
2345 if (text[i] != ' ') 2369 if (text[i] != ' ')
2346 { 2370 {
2347 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2348 break; 2372 goto did_clear;
2349 }
2350 } 2373 }
2351 else 2374
2352 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2375 CLEAR_CHARS (xpixel, ypixel, count);
2376 did_clear: ;
2353 } 2377 }
2354 else 2378 else
2355 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2379 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2356 2380
2357 if (rend & RS_Uline && font->descent > 1 && fore != back) 2381 if (rend & RS_Uline && font->descent > 1 && fore != back)
2358 { 2382 {
2359#if ENABLE_FRILLS 2383#if ENABLE_FRILLS
2360 if (ISSET_PIXCOLOR (Color_underline)) 2384 if (ISSET_PIXCOLOR (Color_underline))
2361 XSetForeground (xdisp, gc, pix_colors[Color_underline]); 2385 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2362 else 2386 else
2363#endif 2387#endif
2364 XSetForeground (xdisp, gc, pix_colors[fore]); 2388 XSetForeground (dpy, gc, pix_colors[fore]);
2365 2389
2366 XDrawLine (xdisp, drawBuffer, gc, 2390 XDrawLine (dpy, drawBuffer, gc,
2367 xpixel, ypixel + font->ascent + 1, 2391 xpixel, ypixel + font->ascent + 1,
2368 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2392 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2369 } 2393 }
2370 } /* for (col....) */ 2394 } /* for (col....) */
2371 } /* for (row....) */ 2395 } /* for (row....) */
… …
2380 */ 2404 */
2381 if (showcursor) 2405 if (showcursor)
2382 { 2406 {
2383 if (focus) 2407 if (focus)
2384 { 2408 {
2385 if (OPTION (Opt_cursorUnderline)) 2409 if (option (Opt_cursorUnderline))
2386 *crp ^= RS_Uline; 2410 *crp ^= RS_Uline;
2387 else 2411 else
2388 { 2412 {
2389 *crp ^= RS_RVid; 2413 *crp ^= RS_RVid;
2390#ifndef NO_CURSORCOLOR 2414#ifndef NO_CURSORCOLOR
… …
2404 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2428 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2405 cursorwidth++; 2429 cursorwidth++;
2406 2430
2407#ifndef NO_CURSORCOLOR 2431#ifndef NO_CURSORCOLOR
2408 if (ISSET_PIXCOLOR (Color_cursor)) 2432 if (ISSET_PIXCOLOR (Color_cursor))
2409 XSetForeground (xdisp, gc, pix_colors[Color_cursor]); 2433 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2434 else
2410#endif 2435#endif
2436 XSetForeground (dpy, gc, pix_colors[ccol1]);
2411 2437
2412 XDrawRectangle (xdisp, drawBuffer, gc, 2438 XDrawRectangle (dpy, drawBuffer, gc,
2413 Col2Pixel (col), 2439 Col2Pixel (col),
2414 Row2Pixel (oldcursor.row), 2440 Row2Pixel (oldcursor.row),
2415 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2441 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2416 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2442 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2417 } 2443 }
… …
2453 2479
2454void 2480void
2455rxvt_term::scr_recolour () NOTHROW 2481rxvt_term::scr_recolour () NOTHROW
2456{ 2482{
2457 if (1 2483 if (1
2458#if TRANSPARENT 2484#if ENABLE_TRANSPARENCY
2459 && !am_transparent 2485 && !am_transparent
2460#endif 2486#endif
2461#if XPM_BACKGROUND 2487#ifdef HAVE_BG_PIXMAP
2462 && !bgPixmap.pixmap 2488 && !bgPixmap.pixmap
2463#endif 2489#endif
2464 ) 2490 )
2465 { 2491 {
2466 XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2467 XClearWindow (xdisp, parent[0]); 2493 XClearWindow (dpy, parent[0]);
2468 XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); 2494 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2469#if HAVE_SCROLLBARS 2495#if HAVE_SCROLLBARS
2470 if (scrollBar.win) 2496 if (scrollBar.win)
2471 { 2497 {
2472 XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); 2498 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2473 scrollBar.setIdle (); 2499 scrollBar.setIdle ();
2474 scrollbar_show (0); 2500 scrollbar_show (0);
2475 } 2501 }
2476#endif 2502#endif
2477 } 2503 }
… …
2490 2516
2491 num_scr_allow = 0; 2517 num_scr_allow = 0;
2492 want_refresh = 1; 2518 want_refresh = 1;
2493 2519
2494 if (really) 2520 if (really)
2495 XClearWindow (xdisp, vt); 2521 XClearWindow (dpy, vt);
2496} 2522}
2497 2523
2498void 2524void
2499rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2525rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2500{ 2526{
… …
2549{ 2575{
2550 if (selection.op 2576 if (selection.op
2551 && current_screen == selection.screen 2577 && current_screen == selection.screen
2552 && selection.end.row >= view_start) 2578 && selection.end.row >= view_start)
2553 { 2579 {
2554#if ENABLE_FRILLS 2580#if !ENABLE_MINIMAL
2555 if (selection.rect) 2581 if (selection.rect)
2556 scr_xor_rect (selection.beg.row, selection.beg.col, 2582 scr_xor_rect (selection.beg.row, selection.beg.col,
2557 selection.end.row, selection.end.col, 2583 selection.end.row, selection.end.col,
2558 RS_RVid, RS_RVid | RS_Uline); 2584 RS_RVid, RS_RVid | RS_Uline);
2559 else 2585 else
… …
2675 } 2701 }
2676 2702
2677 unsigned long bytes_after; 2703 unsigned long bytes_after;
2678 XTextProperty ct; 2704 XTextProperty ct;
2679 2705
2680 if (XGetWindowProperty (xdisp, win, prop, 2706 if (XGetWindowProperty (dpy, win, prop,
2681 0, PROP_SIZE / 4, 2707 0, PROP_SIZE / 4,
2682 delete_prop, AnyPropertyType, 2708 delete_prop, AnyPropertyType,
2683 &ct.encoding, &ct.format, 2709 &ct.encoding, &ct.format,
2684 &ct.nitems, &bytes_after, 2710 &ct.nitems, &bytes_after,
2685 &ct.value) != Success) 2711 &ct.value) != Success)
… …
2694 if (bytes_after) 2720 if (bytes_after)
2695 { 2721 {
2696 // fetch and append remaining data 2722 // fetch and append remaining data
2697 XTextProperty ct2; 2723 XTextProperty ct2;
2698 2724
2699 if (XGetWindowProperty (xdisp, win, prop, 2725 if (XGetWindowProperty (dpy, win, prop,
2700 ct.nitems / 4, (bytes_after + 3) / 4, 2726 ct.nitems / 4, (bytes_after + 3) / 4,
2701 delete_prop, AnyPropertyType, 2727 delete_prop, AnyPropertyType,
2702 &ct2.encoding, &ct2.format, 2728 &ct2.encoding, &ct2.format,
2703 &ct2.nitems, &bytes_after, 2729 &ct2.nitems, &bytes_after,
2704 &ct2.value) != Success) 2730 &ct2.value) != Success)
… …
2717 2743
2718 if (ct.encoding == xa[XA_INCR]) 2744 if (ct.encoding == xa[XA_INCR])
2719 { 2745 {
2720 // INCR selection, start handshake 2746 // INCR selection, start handshake
2721 if (!delete_prop) 2747 if (!delete_prop)
2722 XDeleteProperty (xdisp, win, prop); 2748 XDeleteProperty (dpy, win, prop);
2723 2749
2724 selection_wait = Sel_incr; 2750 selection_wait = Sel_incr;
2725 incr_buf_fill = 0; 2751 incr_buf_fill = 0;
2726 incr_ev.start (NOW + 10); 2752 incr_ev.start (NOW + 10);
2727 2753
… …
2774 } 2800 }
2775 2801
2776 char **cl; 2802 char **cl;
2777 int cr; 2803 int cr;
2778 2804
2779#if ENABLE_FRILLS 2805#if !ENABLE_MINIMAL
2780 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2806 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2781 // so recode it manually 2807 // so recode it manually
2782 if (ct.encoding == xa[XA_UTF8_STRING]) 2808 if (ct.encoding == xa[XA_UTF8_STRING])
2783 { 2809 {
2784 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2810 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2788 paste (s, strlen (s)); 2814 paste (s, strlen (s));
2789 free (s); 2815 free (s);
2790 } 2816 }
2791 else 2817 else
2792#endif 2818#endif
2793 if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 2819 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2794 && cl) 2820 && cl)
2795 { 2821 {
2796 for (int i = 0; i < cr; i++) 2822 for (int i = 0; i < cr; i++)
2797 paste (cl[i], strlen (cl[i])); 2823 paste (cl[i], strlen (cl[i]));
2798 2824
… …
2880 else if (selnum == Sel_Secondary) 2906 else if (selnum == Sel_Secondary)
2881 sel = XA_SECONDARY; 2907 sel = XA_SECONDARY;
2882 else 2908 else
2883 sel = xa[XA_CLIPBOARD]; 2909 sel = xa[XA_CLIPBOARD];
2884 2910
2885 if (XGetSelectionOwner (xdisp, sel) != None) 2911 if (XGetSelectionOwner (dpy, sel) != None)
2886 { 2912 {
2887 XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], 2913 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2888 vt, selection_request_time); 2914 vt, selection_request_time);
2889 return 1; 2915 return 1;
2890 } 2916 }
2891 2917
2892 return 0; 2918 return 0;
… …
2955 2981
2956 int end_col; 2982 int end_col;
2957 2983
2958 for (; row <= selection.end.row; row++, col = 0) 2984 for (; row <= selection.end.row; row++, col = 0)
2959 { 2985 {
2960#if ENABLE_FRILLS 2986#if !ENABLE_MINIMAL
2961 if (selection.rect) 2987 if (selection.rect)
2962 { 2988 {
2963 col = selection.beg.col; 2989 col = selection.beg.col;
2964 end_col = ncol + 1; 2990 end_col = ncol + 1;
2965 } 2991 }
… …
2968 end_col = ROW(row).l; 2994 end_col = ROW(row).l;
2969 2995
2970 col = max (col, 0); 2996 col = max (col, 0);
2971 2997
2972 if (row == selection.end.row 2998 if (row == selection.end.row
2973#if ENABLE_FRILLS 2999#if !ENABLE_MINIMAL
2974 || selection.rect 3000 || selection.rect
2975#endif 3001#endif
2976 ) 3002 )
2977 min_it (end_col, selection.end.col); 3003 min_it (end_col, selection.end.col);
2978 3004
… …
3001#endif 3027#endif
3002 else 3028 else
3003 new_selection_text[ofs++] = *t++; 3029 new_selection_text[ofs++] = *t++;
3004 } 3030 }
3005 3031
3006#if ENABLE_FRILLS 3032#if !ENABLE_MINIMAL
3007 if (selection.rect) 3033 if (selection.rect)
3008 { 3034 {
3009 while (ofs 3035 while (ofs
3010 && new_selection_text[ofs - 1] != C0_LF 3036 && new_selection_text[ofs - 1] != C0_LF
3011 && unicode::is_space (new_selection_text[ofs - 1])) 3037 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3045bool 3071bool
3046rxvt_term::selection_grab (Time tm) NOTHROW 3072rxvt_term::selection_grab (Time tm) NOTHROW
3047{ 3073{
3048 selection_time = tm; 3074 selection_time = tm;
3049 3075
3050 XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); 3076 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3051 if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) 3077 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3052 { 3078 {
3053 display->set_selection_owner (this); 3079 display->set_selection_owner (this);
3054 return true; 3080 return true;
3055 } 3081 }
3056 else 3082 else
… …
3060 } 3086 }
3061 3087
3062#if 0 3088#if 0
3063 XTextProperty ct; 3089 XTextProperty ct;
3064 3090
3065 if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) 3091 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3066 { 3092 {
3067 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3093 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3068 XFree (ct.value); 3094 XFree (ct.value);
3069 } 3095 }
3070#endif 3096#endif
… …
3372 3398
3373 if (selection.clicks == 1) 3399 if (selection.clicks == 1)
3374 { 3400 {
3375 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3401 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3376 && !ROW(selection.beg.row).is_longer () 3402 && !ROW(selection.beg.row).is_longer ()
3377#if ENABLE_FRILLS 3403#if !ENABLE_MINIMAL
3378 && !selection.rect 3404 && !selection.rect
3379#endif 3405#endif
3380 ) 3406 )
3381 selection.beg.col = ncol; 3407 selection.beg.col = ncol;
3382 3408
3383 if ( 3409 if (
3384 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3410 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3385 && !ROW(selection.end.row).is_longer () 3411 && !ROW(selection.end.row).is_longer ()
3386#if ENABLE_FRILLS 3412#if !ENABLE_MINIMAL
3387 && !selection.rect 3413 && !selection.rect
3388#endif 3414#endif
3389 ) 3415 )
3390 selection.end.col = ncol; 3416 selection.end.col = ncol;
3391 } 3417 }
… …
3398 selection_delimit_word (DN, &selection.end, &selection.end); 3424 selection_delimit_word (DN, &selection.end, &selection.end);
3399 } 3425 }
3400 else if (selection.clicks == 3) 3426 else if (selection.clicks == 3)
3401 { 3427 {
3402#if ENABLE_FRILLS 3428#if ENABLE_FRILLS
3403 if (OPTION (Opt_tripleclickwords)) 3429 if (option (Opt_tripleclickwords))
3404 { 3430 {
3405 selection_delimit_word (UP, &selection.beg, &selection.beg); 3431 selection_delimit_word (UP, &selection.beg, &selection.beg);
3406 3432
3407 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3433 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3408 { 3434 {
3409 if (!ROW(end_row).is_longer ()) 3435 if (!ROW(end_row).is_longer ())
3410 { 3436 {
3411 selection.end.row = end_row; 3437 selection.end.row = end_row;
3412 selection.end.col = ROW(end_row).l; 3438 selection.end.col = ROW(end_row).l;
3439# if !ENABLE_MINIMAL
3413 selection_remove_trailing_spaces (); 3440 selection_remove_trailing_spaces ();
3441# endif
3414 break; 3442 break;
3415 } 3443 }
3416 } 3444 }
3417 } 3445 }
3418 else 3446 else
… …
3447 selection.mark.row = selection.beg.row; 3475 selection.mark.row = selection.beg.row;
3448 selection.mark.col = selection.beg.col; 3476 selection.mark.col = selection.beg.col;
3449 } 3477 }
3450 } 3478 }
3451 3479
3452#if ENABLE_FRILLS 3480#if !ENABLE_MINIMAL
3453 if (selection.rect && selection.beg.col > selection.end.col) 3481 if (selection.rect && selection.beg.col > selection.end.col)
3454 ::swap (selection.beg.col, selection.end.col); 3482 ::swap (selection.beg.col, selection.end.col);
3455#endif 3483#endif
3456} 3484}
3457 3485
3458#if ENABLE_FRILLS 3486#if !ENABLE_MINIMAL
3459void 3487void
3460rxvt_term::selection_remove_trailing_spaces () NOTHROW 3488rxvt_term::selection_remove_trailing_spaces () NOTHROW
3461{ 3489{
3462 int32_t end_col, end_row; 3490 int32_t end_col, end_row;
3463 text_t *stp; 3491 text_t *stp;
… …
3541 *target++ = xa[XA_COMPOUND_TEXT]; 3569 *target++ = xa[XA_COMPOUND_TEXT];
3542#if X_HAVE_UTF8_STRING 3570#if X_HAVE_UTF8_STRING
3543 *target++ = xa[XA_UTF8_STRING]; 3571 *target++ = xa[XA_UTF8_STRING];
3544#endif 3572#endif
3545 3573
3546 XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, 3574 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3547 32, PropModeReplace, 3575 32, PropModeReplace,
3548 (unsigned char *)target_list, target - target_list); 3576 (unsigned char *)target_list, target - target_list);
3549 ev.property = rq.property; 3577 ev.property = rq.property;
3550 } 3578 }
3551#if TODO // TODO 3579#if TODO // TODO
… …
3554 /* TODO: Handle MULTIPLE */ 3582 /* TODO: Handle MULTIPLE */
3555 } 3583 }
3556#endif 3584#endif
3557 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3585 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3558 { 3586 {
3559 XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, 3587 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3560 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3588 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3561 ev.property = rq.property; 3589 ev.property = rq.property;
3562 } 3590 }
3563 else if (rq.target == XA_STRING 3591 else if (rq.target == XA_STRING
3564 || rq.target == xa[XA_TEXT] 3592 || rq.target == xa[XA_TEXT]
… …
3588 style = enc_string; 3616 style = enc_string;
3589 else if (target == xa[XA_TEXT]) 3617 else if (target == xa[XA_TEXT])
3590 style = enc_text; 3618 style = enc_text;
3591 else if (target == xa[XA_COMPOUND_TEXT]) 3619 else if (target == xa[XA_COMPOUND_TEXT])
3592 style = enc_compound_text; 3620 style = enc_compound_text;
3593#if ENABLE_FRILLS 3621#if !ENABLE_MINIMAL
3594 else if (target == xa[XA_UTF8_STRING]) 3622 else if (target == xa[XA_UTF8_STRING])
3595 style = enc_utf8; 3623 style = enc_utf8;
3596#endif 3624#endif
3597 else 3625 else
3598 { 3626 {
… …
3609 { 3637 {
3610 cl = L""; 3638 cl = L"";
3611 selectlen = 0; 3639 selectlen = 0;
3612 } 3640 }
3613 3641
3614#if ENABLE_FRILLS 3642#if !ENABLE_MINIMAL
3615 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3643 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3616 // so recode it manually 3644 // so recode it manually
3617 if (style == enc_utf8) 3645 if (style == enc_utf8)
3618 { 3646 {
3619 freect = 1; 3647 freect = 1;
… …
3622 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3650 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3623 ct.nitems = strlen ((char *)ct.value); 3651 ct.nitems = strlen ((char *)ct.value);
3624 } 3652 }
3625 else 3653 else
3626#endif 3654#endif
3627 if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3655 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3628 freect = 1; 3656 freect = 1;
3629 else 3657 else
3630 { 3658 {
3631 /* if we failed to convert then send it raw */ 3659 /* if we failed to convert then send it raw */
3632 ct.value = (unsigned char *)cl; 3660 ct.value = (unsigned char *)cl;
3633 ct.nitems = selectlen; 3661 ct.nitems = selectlen;
3634 ct.encoding = target; 3662 ct.encoding = target;
3635 } 3663 }
3636 3664
3637 XChangeProperty (xdisp, rq.requestor, rq.property, 3665 XChangeProperty (dpy, rq.requestor, rq.property,
3638 ct.encoding, 8, PropModeReplace, 3666 ct.encoding, 8, PropModeReplace,
3639 ct.value, (int)ct.nitems); 3667 ct.value, (int)ct.nitems);
3640 ev.property = rq.property; 3668 ev.property = rq.property;
3641 3669
3642 if (freect) 3670 if (freect)
3643 XFree (ct.value); 3671 XFree (ct.value);
3644 } 3672 }
3645 3673
3646 XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); 3674 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3647} 3675}
3648 3676
3649/* ------------------------------------------------------------------------- * 3677/* ------------------------------------------------------------------------- *
3650 * MOUSE ROUTINES * 3678 * MOUSE ROUTINES *
3651 * ------------------------------------------------------------------------- */ 3679 * ------------------------------------------------------------------------- */
… …
3667void 3695void
3668rxvt_term::im_set_position (XPoint &pos) NOTHROW 3696rxvt_term::im_set_position (XPoint &pos) NOTHROW
3669{ 3697{
3670 XWindowAttributes xwa; 3698 XWindowAttributes xwa;
3671 3699
3672 XGetWindowAttributes (xdisp, vt, &xwa); 3700 XGetWindowAttributes (dpy, vt, &xwa);
3673 3701
3674 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3702 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3675 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3703 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3676} 3704}
3677#endif 3705#endif

Diff Legend

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