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.247 by root, Sun Jan 22 20:39:47 2006 UTC vs.
Revision 1.275 by sasha, Wed Aug 15 22:41:52 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 (display->display, 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 (display->display, 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 (display->display, 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/* ------------------------------------------------------------------------- *
… …
126 width = ncol; 124 width = ncol;
127 } 125 }
128 126
129 l.touch (); 127 l.touch ();
130 128
131 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 131
134 text_t *et = l.t + col; 132 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 133 rend_t *er = l.r + col;
136 134
… …
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;
… …
641 } 639 }
642 640
643 // erase newly scrolled-in lines 641 // erase newly scrolled-in lines
644 for (int i = count; i--; ) 642 for (int i = count; i--; )
645 { 643 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i); 644 line_t &l = ROW(nrow - 1 - i);
649 645
646 // optimize if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 {
650 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0; 651 l.l = 0;
653 l.f = 0; 652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
654 } 656 }
655 657
656 // now copy lines below the scroll region bottom to the 658 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they 659 // bottom of the screen again, so they look as if they
658 // hadn't moved. 660 // hadn't moved.
… …
680 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
681 } 683 }
682 } 684 }
683 685
684 // finally move the view window, if desired 686 // finally move the view window, if desired
685 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
686 && view_start != 0 688 && view_start != 0
687 && view_start != -saveLines) 689 && view_start != -saveLines)
688 scr_page (UP, count); 690 scr_page (UP, count);
689 691
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
758 ZERO_SCROLLBACK (); 760 ZERO_SCROLLBACK ();
759 761
760 if (minlines > 0) 762 if (minlines > 0)
761 { 763 {
762 minlines += screen.cur.row - screen.bscroll; 764 minlines += screen.cur.row - screen.bscroll;
765 min_it (minlines, screen.cur.row - top_row);
763 766
764 if (minlines > 0 767 if (minlines > 0
765 && screen.tscroll == 0 768 && screen.tscroll == 0
766 && screen.bscroll == nrow - 1) 769 && screen.bscroll == nrow - 1)
767 { 770 {
… …
841 844
842 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
843 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
844 c = 0xfffd; 847 c = 0xfffd;
845 848
846 // rely on wcwidth to tell us the character width, at least for non-latin1 849 // rely on wcwidth to tell us the character width, do wcwidth before
847 // do wcwidth before further replacements, as wcwidth might return -1 850 // further replacements, as wcwidth might return -1 for the line
848 // for the line drawing characters below as they might be invalid in the current 851 // drawing characters below as they might be invalid in the current
849 // locale. 852 // locale.
850 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
851 854
852 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
853 { 856 {
854 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
855 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
1066 if (count) 1069 if (count)
1067 x = ncol - 1; 1070 x = ncol - 1;
1068 1071
1069 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1070 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1071 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1072 { 1075 {
1073 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1074 1077
1075 l.touch (x); 1078 l.touch (x);
1076 1079
… …
1109 * Process DEC Back Index 1112 * Process DEC Back Index
1110 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1111 * 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
1112 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1113 */ 1116 */
1114#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1115void 1118void
1116rxvt_term::scr_backindex () NOTHROW 1119rxvt_term::scr_backindex () NOTHROW
1117{ 1120{
1118 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1126 * Process DEC Forward Index 1129 * Process DEC Forward Index
1127 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1128 * 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
1129 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1130 */ 1133 */
1131#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1132void 1135void
1133rxvt_term::scr_forwardindex () NOTHROW 1136rxvt_term::scr_forwardindex () NOTHROW
1134{ 1137{
1135 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1337 } 1340 }
1338 else 1341 else
1339 { 1342 {
1340 ren = rstyle & (RS_fgMask | RS_bgMask); 1343 ren = rstyle & (RS_fgMask | RS_bgMask);
1341 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1342 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1343 ERASE_ROWS (row, num); 1346 ERASE_ROWS (row, num);
1344 gcvalue.foreground = pix_colors[Color_fg]; 1347 gcvalue.foreground = pix_colors[Color_fg];
1345 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1348 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1346 } 1349 }
1347 1350
1348 for (; num--; row++) 1351 for (; num--; row++)
1349 { 1352 {
1350 scr_blank_screen_mem (ROW(row), rstyle); 1353 scr_blank_screen_mem (ROW(row), rstyle);
1351 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1354 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1352 } 1355 }
1353} 1356}
1354 1357
1355#if ENABLE_FRILLS 1358#if !ENABLE_MINIMAL
1356void 1359void
1357rxvt_term::scr_erase_savelines () NOTHROW 1360rxvt_term::scr_erase_savelines () NOTHROW
1358{ 1361{
1359 want_refresh = 1; 1362 want_refresh = 1;
1360 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
… …
1643 if (rvideo_state != on) 1646 if (rvideo_state != on)
1644 { 1647 {
1645 rvideo_state = on; 1648 rvideo_state = on;
1646 1649
1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1648#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1649 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1650#endif 1653#endif
1651#if TRANSPARENT
1652 if (!OPTION (Opt_transparent) || am_transparent == 0)
1653#endif
1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1655 1655
1656 XGCValues gcvalue; 1656 XGCValues gcvalue;
1657 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1658 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1659 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1660 1660
1661 scr_clear (); 1661 scr_clear ();
1662 scr_touch (true); 1662 scr_touch (true);
1663 } 1663 }
1664} 1664}
… …
1749{ 1749{
1750 bool found = false; 1750 bool found = false;
1751 1751
1752 for (int i = 0; i < nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1753 { 1753 {
1754 int col = 0;
1755 rend_t *drp = drawn_buf[i].r; 1754 rend_t *drp = drawn_buf[i].r;
1756 1755
1757 for (; col < ncol; col++, drp++) 1756 for (int col = 0; col < ncol; col++, drp++)
1758 if ((*drp & mask) == value) 1757 if ((*drp & mask) == value)
1759 { 1758 {
1760 found = true; 1759 found = true;
1761 *drp = ~value; 1760 *drp = ~value;
1762 } 1761 }
… …
1802 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1803 { 1802 {
1804 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1805 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1806 } 1805 }
1807 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1808 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++)
1809 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);
1810 1809
1811 num_scr_allow = 0; 1810 num_scr_allow = 0;
1812 1811
… …
1882{ 1881{
1883#ifndef NO_BELL 1882#ifndef NO_BELL
1884 1883
1885# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1886# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1887 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1888# endif 1887# endif
1889 XMapWindow (display->display, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1890# endif 1889# endif
1890# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell))
1892 {
1893 XWMHints *h;
1891 1894
1895 h = XGetWMHints(dpy, parent[0]);
1896 if (h != NULL)
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h);
1900 }
1901 }
1902# endif
1903
1892 if (OPTION (Opt_visualBell)) 1904 if (option (Opt_visualBell))
1893 { 1905 {
1894 rvideo_bell = true; 1906 rvideo_bell = true;
1895 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1896 display->flush (); 1908 display->flush ();
1897 1909
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1910 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1899 } 1911 }
1900 else 1912 else
1901 XBell (display->display, 0); 1913 XBell (dpy, 0);
1902
1903#endif 1914#endif
1904} 1915}
1905 1916
1906/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1907/* ARGSUSED */ 1918/* ARGSUSED */
… …
1965 * screen.text/screen.rend contain what the screen will change to. 1976 * screen.text/screen.rend contain what the screen will change to.
1966 */ 1977 */
1967void 1978void
1968rxvt_term::scr_refresh () NOTHROW 1979rxvt_term::scr_refresh () NOTHROW
1969{ 1980{
1970 unsigned char must_clear, /* use draw_string not draw_image_string */ 1981 unsigned char have_bg,
1971 showcursor; /* show the cursor */ 1982 showcursor; /* show the cursor */
1972 int16_t col, row, /* column/row we're processing */ 1983 int16_t col, row, /* column/row we're processing */
1973 ocrow; /* old cursor row */ 1984 ocrow; /* old cursor row */
1974 int i; /* tmp */ 1985 int i; /* tmp */
1975#ifndef NO_CURSORCOLOR 1986#ifndef NO_CURSORCOLOR
1976 rend_t cc1; /* store colours at cursor position (s) */ 1987 rend_t cc1; /* store colours at cursor position (s) */
1977#endif 1988#endif
1978 rend_t *crp; // cursor rendition pointer 1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */
1979 1992
1980 want_refresh = 0; /* screen is current */ 1993 want_refresh = 0; /* screen is current */
1981 1994
1982 if (refresh_type == NO_REFRESH || !mapped) 1995 if (refresh_type == NO_REFRESH || !mapped)
1983 return; 1996 return;
1984 1997
1985 /* 1998 /*
1986 * A: set up vars 1999 * A: set up vars
1987 */ 2000 */
1988 must_clear = 0; 2001 have_bg = 0;
1989 refresh_count = 0; 2002 refresh_count = 0;
1990 2003
1991#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
1992 must_clear |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
1993#endif
1994#if TRANSPARENT
1995 must_clear |= OPTION (Opt_transparent) && am_transparent;
1996#endif 2006#endif
1997 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1998 2008
1999 /* 2009 /*
2000 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
2004 /* 2014 /*
2005 * C: set the cursor character (s) 2015 * C: set the cursor character (s)
2006 */ 2016 */
2007 { 2017 {
2008 unsigned char setoldcursor; 2018 unsigned char setoldcursor;
2009 rend_t ccol1, /* Cursor colour */
2010 ccol2; /* Cursor colour2 */
2011 2019
2012 showcursor = (screen.flags & Screen_VisibleCursor); 2020 showcursor = (screen.flags & Screen_VisibleCursor);
2013#ifdef CURSOR_BLINK 2021#ifdef CURSOR_BLINK
2014 if (hidden_cursor) 2022 if (hidden_cursor)
2015 showcursor = 0; 2023 showcursor = 0;
… …
2022 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2023 col--; 2031 col--;
2024 2032
2025 crp = &ROW(screen.cur.row).r[col]; 2033 crp = &ROW(screen.cur.row).r[col];
2026 2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046
2047#ifndef NO_CURSORCOLOR
2048 if (ISSET_PIXCOLOR (Color_cursor2))
2049 ccol2 = Color_cursor2;
2050 else
2051#endif
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057
2027 if (showcursor && focus) 2058 if (showcursor && focus)
2028 { 2059 {
2029 if (OPTION (Opt_cursorUnderline)) 2060 if (option (Opt_cursorUnderline))
2030 *crp ^= RS_Uline; 2061 *crp ^= RS_Uline;
2031 else 2062 else
2032 { 2063 {
2033 *crp ^= RS_RVid; 2064 *crp ^= RS_RVid;
2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2041 ccol1 = fgcolor_of (rstyle);
2042#else
2043 ccol1 = Color_fg;
2044#endif
2045 if (ISSET_PIXCOLOR (Color_cursor2))
2046 ccol2 = Color_cursor2;
2047 else
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053 *crp = SET_FGCOLOR (*crp, ccol1); 2065 *crp = SET_FGCOLOR (*crp, ccol1);
2054 *crp = SET_BGCOLOR (*crp, ccol2); 2066 *crp = SET_BGCOLOR (*crp, ccol2);
2055#endif
2056 } 2067 }
2057 } 2068 }
2058 } 2069 }
2059 2070
2060 /* make sure no outline cursor is left around */ 2071 /* make sure no outline cursor is left around */
… …
2099 * D: CopyArea pass - very useful for slower links 2110 * D: CopyArea pass - very useful for slower links
2100 * This has been deliberately kept simple. 2111 * This has been deliberately kept simple.
2101 */ 2112 */
2102 if (!display->is_local 2113 if (!display->is_local
2103 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2114 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2104 && abs (num_scr) < nrow && !must_clear) 2115 && abs (num_scr) < nrow && !have_bg)
2105 { 2116 {
2106 int16_t nits; 2117 int16_t nits;
2118 int i = num_scr;
2107 int j; 2119 int j;
2108 int len, wlen; 2120 int len, wlen;
2109 dLocal (int, num_scr); 2121 dLocal (int, num_scr);
2110 2122
2111 j = nrow; 2123 j = nrow;
2112 wlen = len = -1; 2124 wlen = len = -1;
2113 row = i > 0 ? 0 : j - 1; 2125 row = i > 0 ? 0 : j - 1;
2126
2114 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2127 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2115 { 2128 {
2116 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2129 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2117 { 2130 {
2118 line_t s = ROW(view_start + row); 2131 line_t s = ROW(view_start + row);
… …
2139 wlen = row; 2152 wlen = row;
2140 continue; 2153 continue;
2141 } 2154 }
2142 } 2155 }
2143 2156
2144 if (len != -1) 2157 if (len >= 0)
2145 { 2158 {
2146 /* also comes here at end if needed because of >= above */ 2159 /* also comes here at end if needed because of >= above */
2147 if (wlen < len) 2160 if (wlen < len)
2148 ::swap (wlen, len); 2161 ::swap (wlen, len);
2149 2162
2163 XGCValues gcv;
2164
2165 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2150 XCopyArea (display->display, vt, vt, 2166 XCopyArea (dpy, vt, vt,
2151 gc, 0, Row2Pixel (len + i), 2167 gc, 0, Row2Pixel (len + i),
2152 (unsigned int)this->width, 2168 (unsigned int)this->width,
2153 (unsigned int)Height2Pixel (wlen - len + 1), 2169 (unsigned int)Height2Pixel (wlen - len + 1),
2154 0, Row2Pixel (len)); 2170 0, Row2Pixel (len));
2171 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2172
2155 len = -1; 2173 len = -1;
2156 } 2174 }
2157 } 2175 }
2158 } 2176 }
2159#endif 2177#endif
… …
2215 count++; 2233 count++;
2216 2234
2217 if (stp[col] != dtp[col] 2235 if (stp[col] != dtp[col]
2218 || !RS_SAME (srp[col], drp[col])) 2236 || !RS_SAME (srp[col], drp[col]))
2219 { 2237 {
2220 if (must_clear && (i++ > count / 2)) 2238 if (have_bg && (i++ > count / 2))
2221 break; 2239 break;
2222 2240
2223 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2224 drp[col] = rend; 2242 drp[col] = rend;
2225 i = 0; 2243 i = 0;
2226 } 2244 }
2227 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2245 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2228 break; 2246 break;
2229 } 2247 }
2230 2248
2231 col--; /* went one too far. move back */ 2249 col--; /* went one too far. move back */
2232 count -= i; /* dump any matching trailing chars */ 2250 count -= i; /* dump any matching trailing chars */
… …
2242 int back = bgcolor_of (rend); // desired background 2260 int back = bgcolor_of (rend); // desired background
2243 2261
2244 // only do special processing if any attributes are set, which is unlikely 2262 // only do special processing if any attributes are set, which is unlikely
2245 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2246 { 2264 {
2247#if ENABLE_STYLES
2248 // force redraw after "careful" characters to avoid pixel droppings
2249 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2250 drp[col + 1] = ~srp[col + 1];
2251
2252 // include previous careful character(s) if possible, looks nicer (best effort...)
2253 while (text > stp
2254 && srp[text - stp - 1] & RS_Careful
2255 && RS_SAME (rend, srp[text - stp - 1]))
2256 text--, count++, xpixel -= fwidth;
2257#endif
2258
2259 bool invert = rend & RS_RVid; 2265 bool invert = rend & RS_RVid;
2260 2266
2261#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2262 if (rend & RS_Bold 2268 if (rend & RS_Bold
2263 && fore == Color_fg) 2269 && fore == Color_fg)
… …
2279 else 2285 else
2280 invert = !invert; 2286 invert = !invert;
2281# endif 2287# endif
2282 } 2288 }
2283 2289
2284 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2285 fore = Color_UL; 2291 fore = Color_UL;
2286#endif 2292#endif
2287 2293
2288 if (invert) 2294 if (invert)
2289 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2290 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2291 2307
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2293 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2294 back = Color_RV; 2311 back = Color_RV;
2295 2312# endif
2296 if (fore == back) 2313 if (fore == back)
2297 { 2314 {
2298 fore = Color_bg; 2315 fore = Color_bg;
2299 back = Color_fg; 2316 back = Color_fg;
2300 } 2317 }
… …
2311 } 2328 }
2312 else if (hidden_text) 2329 else if (hidden_text)
2313 fore = back; 2330 fore = back;
2314 } 2331 }
2315#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2316 } 2351 }
2317 2352
2318 /* 2353 /*
2319 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2320 */ 2355 */
2321 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2322 2357
2323 if (back == fore)
2324 font->clear_rect (*drawable, xpixel, ypixel,
2325 fwidth * count, fheight,
2326 back);
2327 else if (back == Color_bg) 2358 if (have_bg && back == Color_bg)
2328 { 2359 {
2329 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2330 {
2331 CLEAR_CHARS (xpixel, ypixel, count);
2332 2361
2333 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2334 if (text[i] != ' ') 2363 if (text[i] != ' ')
2335 { 2364 {
2336 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2337 break; 2366 goto did_clear;
2338 }
2339 } 2367 }
2340 else 2368
2341 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2342 } 2371 }
2343 else 2372 else
2344 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2345 2374
2346 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (rend & RS_Uline && font->descent > 1 && fore != back)
2347 { 2376 {
2348#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2349 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2350 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2351 else 2380 else
2352#endif 2381#endif
2353 XSetForeground (display->display, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2354 2383
2355 XDrawLine (display->display, drawBuffer, gc, 2384 XDrawLine (dpy, drawBuffer, gc,
2356 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2357 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2358 } 2387 }
2359 } /* for (col....) */ 2388 } /* for (col....) */
2360 } /* for (row....) */ 2389 } /* for (row....) */
… …
2369 */ 2398 */
2370 if (showcursor) 2399 if (showcursor)
2371 { 2400 {
2372 if (focus) 2401 if (focus)
2373 { 2402 {
2374 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2375 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2376 else 2405 else
2377 { 2406 {
2378 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2379#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2393 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2394 cursorwidth++; 2423 cursorwidth++;
2395 2424
2396#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2397 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2398 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2399#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2400 2431
2401 XDrawRectangle (display->display, drawBuffer, gc, 2432 XDrawRectangle (dpy, drawBuffer, gc,
2402 Col2Pixel (col), 2433 Col2Pixel (col),
2403 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2404 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2405 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2406 } 2437 }
… …
2441} 2472}
2442 2473
2443void 2474void
2444rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2445{ 2476{
2446 if (1 2477#ifdef HAVE_BG_PIXMAP
2447#if TRANSPARENT 2478 bgPixmap.apply ();
2448 && !am_transparent 2479#else
2449#endif
2450#if XPM_BACKGROUND
2451 && !bgPixmap.pixmap
2452#endif
2453 )
2454 {
2455 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2456 XClearWindow (display->display, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2457 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2458#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2459 if (scrollBar.win) 2484 if (scrollBar.win)
2460 { 2485 {
2461 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2462 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2463 scrollbar_show (0); 2488 scrollbar_show (0);
2464 } 2489 }
2465#endif 2490# endif
2466 } 2491#endif
2467 2492
2468 scr_clear (); 2493 scr_clear ();
2469 scr_touch (true); 2494 scr_touch (true);
2470 want_refresh = 1; 2495 want_refresh = 1;
2471} 2496}
2472 2497
… …
2479 2504
2480 num_scr_allow = 0; 2505 num_scr_allow = 0;
2481 want_refresh = 1; 2506 want_refresh = 1;
2482 2507
2483 if (really) 2508 if (really)
2484 XClearWindow (display->display, vt); 2509 XClearWindow (dpy, vt);
2485} 2510}
2486 2511
2487void 2512void
2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2513rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2489{ 2514{
… …
2538{ 2563{
2539 if (selection.op 2564 if (selection.op
2540 && current_screen == selection.screen 2565 && current_screen == selection.screen
2541 && selection.end.row >= view_start) 2566 && selection.end.row >= view_start)
2542 { 2567 {
2543#if ENABLE_FRILLS 2568#if !ENABLE_MINIMAL
2544 if (selection.rect) 2569 if (selection.rect)
2545 scr_xor_rect (selection.beg.row, selection.beg.col, 2570 scr_xor_rect (selection.beg.row, selection.beg.col,
2546 selection.end.row, selection.end.col, 2571 selection.end.row, selection.end.col,
2547 RS_RVid, RS_RVid | RS_Uline); 2572 RS_RVid, RS_RVid | RS_Uline);
2548 else 2573 else
… …
2664 } 2689 }
2665 2690
2666 unsigned long bytes_after; 2691 unsigned long bytes_after;
2667 XTextProperty ct; 2692 XTextProperty ct;
2668 2693
2669 if (XGetWindowProperty (display->display, win, prop, 2694 if (XGetWindowProperty (dpy, win, prop,
2670 0, PROP_SIZE / 4, 2695 0, PROP_SIZE / 4,
2671 delete_prop, AnyPropertyType, 2696 delete_prop, AnyPropertyType,
2672 &ct.encoding, &ct.format, 2697 &ct.encoding, &ct.format,
2673 &ct.nitems, &bytes_after, 2698 &ct.nitems, &bytes_after,
2674 &ct.value) != Success) 2699 &ct.value) != Success)
… …
2683 if (bytes_after) 2708 if (bytes_after)
2684 { 2709 {
2685 // fetch and append remaining data 2710 // fetch and append remaining data
2686 XTextProperty ct2; 2711 XTextProperty ct2;
2687 2712
2688 if (XGetWindowProperty (display->display, win, prop, 2713 if (XGetWindowProperty (dpy, win, prop,
2689 ct.nitems / 4, (bytes_after + 3) / 4, 2714 ct.nitems / 4, (bytes_after + 3) / 4,
2690 delete_prop, AnyPropertyType, 2715 delete_prop, AnyPropertyType,
2691 &ct2.encoding, &ct2.format, 2716 &ct2.encoding, &ct2.format,
2692 &ct2.nitems, &bytes_after, 2717 &ct2.nitems, &bytes_after,
2693 &ct2.value) != Success) 2718 &ct2.value) != Success)
… …
2706 2731
2707 if (ct.encoding == xa[XA_INCR]) 2732 if (ct.encoding == xa[XA_INCR])
2708 { 2733 {
2709 // INCR selection, start handshake 2734 // INCR selection, start handshake
2710 if (!delete_prop) 2735 if (!delete_prop)
2711 XDeleteProperty (display->display, win, prop); 2736 XDeleteProperty (dpy, win, prop);
2712 2737
2713 selection_wait = Sel_incr; 2738 selection_wait = Sel_incr;
2714 incr_buf_fill = 0; 2739 incr_buf_fill = 0;
2715 incr_ev.start (NOW + 10); 2740 incr_ev.start (NOW + 10);
2716 2741
… …
2763 } 2788 }
2764 2789
2765 char **cl; 2790 char **cl;
2766 int cr; 2791 int cr;
2767 2792
2768#if ENABLE_FRILLS 2793#if !ENABLE_MINIMAL
2769 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2794 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2770 // so recode it manually 2795 // so recode it manually
2771 if (ct.encoding == xa[XA_UTF8_STRING]) 2796 if (ct.encoding == xa[XA_UTF8_STRING])
2772 { 2797 {
2773 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2798 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2777 paste (s, strlen (s)); 2802 paste (s, strlen (s));
2778 free (s); 2803 free (s);
2779 } 2804 }
2780 else 2805 else
2781#endif 2806#endif
2782 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2807 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2783 && cl) 2808 && cl)
2784 { 2809 {
2785 for (int i = 0; i < cr; i++) 2810 for (int i = 0; i < cr; i++)
2786 paste (cl[i], strlen (cl[i])); 2811 paste (cl[i], strlen (cl[i]));
2787 2812
… …
2869 else if (selnum == Sel_Secondary) 2894 else if (selnum == Sel_Secondary)
2870 sel = XA_SECONDARY; 2895 sel = XA_SECONDARY;
2871 else 2896 else
2872 sel = xa[XA_CLIPBOARD]; 2897 sel = xa[XA_CLIPBOARD];
2873 2898
2874 if (XGetSelectionOwner (display->display, sel) != None) 2899 if (XGetSelectionOwner (dpy, sel) != None)
2875 { 2900 {
2876 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2901 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2877 vt, selection_request_time); 2902 vt, selection_request_time);
2878 return 1; 2903 return 1;
2879 } 2904 }
2880 2905
2881 return 0; 2906 return 0;
… …
2944 2969
2945 int end_col; 2970 int end_col;
2946 2971
2947 for (; row <= selection.end.row; row++, col = 0) 2972 for (; row <= selection.end.row; row++, col = 0)
2948 { 2973 {
2949#if ENABLE_FRILLS 2974#if !ENABLE_MINIMAL
2950 if (selection.rect) 2975 if (selection.rect)
2951 { 2976 {
2952 col = selection.beg.col; 2977 col = selection.beg.col;
2953 end_col = ncol + 1; 2978 end_col = ncol + 1;
2954 } 2979 }
… …
2957 end_col = ROW(row).l; 2982 end_col = ROW(row).l;
2958 2983
2959 col = max (col, 0); 2984 col = max (col, 0);
2960 2985
2961 if (row == selection.end.row 2986 if (row == selection.end.row
2962#if ENABLE_FRILLS 2987#if !ENABLE_MINIMAL
2963 || selection.rect 2988 || selection.rect
2964#endif 2989#endif
2965 ) 2990 )
2966 min_it (end_col, selection.end.col); 2991 min_it (end_col, selection.end.col);
2967 2992
… …
2990#endif 3015#endif
2991 else 3016 else
2992 new_selection_text[ofs++] = *t++; 3017 new_selection_text[ofs++] = *t++;
2993 } 3018 }
2994 3019
2995#if ENABLE_FRILLS 3020#if !ENABLE_MINIMAL
2996 if (selection.rect) 3021 if (selection.rect)
2997 { 3022 {
2998 while (ofs 3023 while (ofs
2999 && new_selection_text[ofs - 1] != C0_LF 3024 && new_selection_text[ofs - 1] != C0_LF
3000 && unicode::is_space (new_selection_text[ofs - 1])) 3025 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3034bool 3059bool
3035rxvt_term::selection_grab (Time tm) NOTHROW 3060rxvt_term::selection_grab (Time tm) NOTHROW
3036{ 3061{
3037 selection_time = tm; 3062 selection_time = tm;
3038 3063
3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3041 { 3066 {
3042 display->set_selection_owner (this); 3067 display->set_selection_owner (this);
3043 return true; 3068 return true;
3044 } 3069 }
3045 else 3070 else
… …
3049 } 3074 }
3050 3075
3051#if 0 3076#if 0
3052 XTextProperty ct; 3077 XTextProperty ct;
3053 3078
3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3079 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3055 { 3080 {
3056 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3081 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3057 XFree (ct.value); 3082 XFree (ct.value);
3058 } 3083 }
3059#endif 3084#endif
… …
3361 3386
3362 if (selection.clicks == 1) 3387 if (selection.clicks == 1)
3363 { 3388 {
3364 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3389 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.beg.row).is_longer () 3390 && !ROW(selection.beg.row).is_longer ()
3366#if ENABLE_FRILLS 3391#if !ENABLE_MINIMAL
3367 && !selection.rect 3392 && !selection.rect
3368#endif 3393#endif
3369 ) 3394 )
3370 selection.beg.col = ncol; 3395 selection.beg.col = ncol;
3371 3396
3372 if ( 3397 if (
3373 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3398 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3374 && !ROW(selection.end.row).is_longer () 3399 && !ROW(selection.end.row).is_longer ()
3375#if ENABLE_FRILLS 3400#if !ENABLE_MINIMAL
3376 && !selection.rect 3401 && !selection.rect
3377#endif 3402#endif
3378 ) 3403 )
3379 selection.end.col = ncol; 3404 selection.end.col = ncol;
3380 } 3405 }
… …
3387 selection_delimit_word (DN, &selection.end, &selection.end); 3412 selection_delimit_word (DN, &selection.end, &selection.end);
3388 } 3413 }
3389 else if (selection.clicks == 3) 3414 else if (selection.clicks == 3)
3390 { 3415 {
3391#if ENABLE_FRILLS 3416#if ENABLE_FRILLS
3392 if (OPTION (Opt_tripleclickwords)) 3417 if (option (Opt_tripleclickwords))
3393 { 3418 {
3394 selection_delimit_word (UP, &selection.beg, &selection.beg); 3419 selection_delimit_word (UP, &selection.beg, &selection.beg);
3395 3420
3396 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3421 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3397 { 3422 {
3398 if (!ROW(end_row).is_longer ()) 3423 if (!ROW(end_row).is_longer ())
3399 { 3424 {
3400 selection.end.row = end_row; 3425 selection.end.row = end_row;
3401 selection.end.col = ROW(end_row).l; 3426 selection.end.col = ROW(end_row).l;
3427# if !ENABLE_MINIMAL
3402 selection_remove_trailing_spaces (); 3428 selection_remove_trailing_spaces ();
3429# endif
3403 break; 3430 break;
3404 } 3431 }
3405 } 3432 }
3406 } 3433 }
3407 else 3434 else
… …
3436 selection.mark.row = selection.beg.row; 3463 selection.mark.row = selection.beg.row;
3437 selection.mark.col = selection.beg.col; 3464 selection.mark.col = selection.beg.col;
3438 } 3465 }
3439 } 3466 }
3440 3467
3441#if ENABLE_FRILLS 3468#if !ENABLE_MINIMAL
3442 if (selection.rect && selection.beg.col > selection.end.col) 3469 if (selection.rect && selection.beg.col > selection.end.col)
3443 ::swap (selection.beg.col, selection.end.col); 3470 ::swap (selection.beg.col, selection.end.col);
3444#endif 3471#endif
3445} 3472}
3446 3473
3447#if ENABLE_FRILLS 3474#if !ENABLE_MINIMAL
3448void 3475void
3449rxvt_term::selection_remove_trailing_spaces () NOTHROW 3476rxvt_term::selection_remove_trailing_spaces () NOTHROW
3450{ 3477{
3451 int32_t end_col, end_row; 3478 int32_t end_col, end_row;
3452 text_t *stp; 3479 text_t *stp;
… …
3507 */ 3534 */
3508void 3535void
3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3536rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3510{ 3537{
3511 XSelectionEvent ev; 3538 XSelectionEvent ev;
3512 dDisp;
3513 3539
3514 ev.type = SelectionNotify; 3540 ev.type = SelectionNotify;
3515 ev.property = None; 3541 ev.property = None;
3516 ev.display = rq.display; 3542 ev.display = rq.display;
3517 ev.requestor = rq.requestor; 3543 ev.requestor = rq.requestor;
… …
3531 *target++ = xa[XA_COMPOUND_TEXT]; 3557 *target++ = xa[XA_COMPOUND_TEXT];
3532#if X_HAVE_UTF8_STRING 3558#if X_HAVE_UTF8_STRING
3533 *target++ = xa[XA_UTF8_STRING]; 3559 *target++ = xa[XA_UTF8_STRING];
3534#endif 3560#endif
3535 3561
3536 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3562 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3537 32, PropModeReplace, 3563 32, PropModeReplace,
3538 (unsigned char *)target_list, target - target_list); 3564 (unsigned char *)target_list, target - target_list);
3539 ev.property = rq.property; 3565 ev.property = rq.property;
3540 } 3566 }
3541#if TODO // TODO 3567#if TODO // TODO
… …
3544 /* TODO: Handle MULTIPLE */ 3570 /* TODO: Handle MULTIPLE */
3545 } 3571 }
3546#endif 3572#endif
3547 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3548 { 3574 {
3549 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3575 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3550 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3576 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3551 ev.property = rq.property; 3577 ev.property = rq.property;
3552 } 3578 }
3553 else if (rq.target == XA_STRING 3579 else if (rq.target == XA_STRING
3554 || rq.target == xa[XA_TEXT] 3580 || rq.target == xa[XA_TEXT]
… …
3578 style = enc_string; 3604 style = enc_string;
3579 else if (target == xa[XA_TEXT]) 3605 else if (target == xa[XA_TEXT])
3580 style = enc_text; 3606 style = enc_text;
3581 else if (target == xa[XA_COMPOUND_TEXT]) 3607 else if (target == xa[XA_COMPOUND_TEXT])
3582 style = enc_compound_text; 3608 style = enc_compound_text;
3583#if ENABLE_FRILLS 3609#if !ENABLE_MINIMAL
3584 else if (target == xa[XA_UTF8_STRING]) 3610 else if (target == xa[XA_UTF8_STRING])
3585 style = enc_utf8; 3611 style = enc_utf8;
3586#endif 3612#endif
3587 else 3613 else
3588 { 3614 {
… …
3599 { 3625 {
3600 cl = L""; 3626 cl = L"";
3601 selectlen = 0; 3627 selectlen = 0;
3602 } 3628 }
3603 3629
3604#if ENABLE_FRILLS 3630#if !ENABLE_MINIMAL
3605 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3631 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3606 // so recode it manually 3632 // so recode it manually
3607 if (style == enc_utf8) 3633 if (style == enc_utf8)
3608 { 3634 {
3609 freect = 1; 3635 freect = 1;
… …
3612 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3638 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3613 ct.nitems = strlen ((char *)ct.value); 3639 ct.nitems = strlen ((char *)ct.value);
3614 } 3640 }
3615 else 3641 else
3616#endif 3642#endif
3617 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3643 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3618 freect = 1; 3644 freect = 1;
3619 else 3645 else
3620 { 3646 {
3621 /* if we failed to convert then send it raw */ 3647 /* if we failed to convert then send it raw */
3622 ct.value = (unsigned char *)cl; 3648 ct.value = (unsigned char *)cl;
3623 ct.nitems = selectlen; 3649 ct.nitems = selectlen;
3624 ct.encoding = target; 3650 ct.encoding = target;
3625 } 3651 }
3626 3652
3627 XChangeProperty (disp, rq.requestor, rq.property, 3653 XChangeProperty (dpy, rq.requestor, rq.property,
3628 ct.encoding, 8, PropModeReplace, 3654 ct.encoding, 8, PropModeReplace,
3629 ct.value, (int)ct.nitems); 3655 ct.value, (int)ct.nitems);
3630 ev.property = rq.property; 3656 ev.property = rq.property;
3631 3657
3632 if (freect) 3658 if (freect)
3633 XFree (ct.value); 3659 XFree (ct.value);
3634 } 3660 }
3635 3661
3636 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3637} 3663}
3638 3664
3639/* ------------------------------------------------------------------------- * 3665/* ------------------------------------------------------------------------- *
3640 * MOUSE ROUTINES * 3666 * MOUSE ROUTINES *
3641 * ------------------------------------------------------------------------- */ 3667 * ------------------------------------------------------------------------- */
… …
3657void 3683void
3658rxvt_term::im_set_position (XPoint &pos) NOTHROW 3684rxvt_term::im_set_position (XPoint &pos) NOTHROW
3659{ 3685{
3660 XWindowAttributes xwa; 3686 XWindowAttributes xwa;
3661 3687
3662 XGetWindowAttributes (display->display, vt, &xwa); 3688 XGetWindowAttributes (dpy, vt, &xwa);
3663 3689
3664 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3690 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3665 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3691 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3666} 3692}
3667#endif 3693#endif
… …
3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3789rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3764{ 3790{
3765 while (*s) 3791 while (*s)
3766 { 3792 {
3767 text_t t = *s++; 3793 text_t t = *s++;
3768 int width = wcwidth (t); 3794 int width = WCWIDTH (t);
3769 3795
3770 while (width--) 3796 while (width--)
3771 { 3797 {
3772 scr_overlay_set (x++, y, t); 3798 scr_overlay_set (x++, y, t);
3773 t = NOCHAR; 3799 t = NOCHAR;

Diff Legend

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