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.271 by sasha, Fri Aug 3 22:40:10 2007 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 2008 UTC

1/*---------------------------------------------------------------------------* 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-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row> 88 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 91 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \ 92#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 93 if (mapped) \
98 XClearArea (dpy, drawBuffer, 0, \ 94 XClearArea (dpy, vt, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 95 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 96 (unsigned int)Height2Pixel (num), False)
101 97
102#define CLEAR_CHARS(x, y, num) \ 98#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 99 if (mapped) \
104 XClearArea (dpy, drawBuffer, x, y, \ 100 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 101 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 102 (unsigned int)Height2Pixel (1), False)
107 103
108#define ERASE_ROWS(row, num) \ 104#define ERASE_ROWS(row, num) \
109 XFillRectangle (dpy, drawBuffer, gc, \ 105 XFillRectangle (dpy, vt, gc, \
110 0, Row2Pixel (row), \ 106 0, Row2Pixel (row), \
111 (unsigned int)width, \ 107 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 108 (unsigned int)Height2Pixel (num))
113 109
114/* ------------------------------------------------------------------------- * 110/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 111 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 112 * ------------------------------------------------------------------------- */
… …
161{ 157{
162#if ENABLE_OVERLAY 158#if ENABLE_OVERLAY
163 scr_overlay_off (); 159 scr_overlay_off ();
164#endif 160#endif
165 161
162 rvideo_mode = false;
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
237 selection.text = NULL; 234 selection.text = NULL;
238 selection.len = 0; 235 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
241 selection.clicks = 0; 238 selection.clicks = 0;
242 rvideo_state = rvideo_mode = false;
243 } 239 }
244 else 240 else
245 { 241 {
246 /* 242 /*
247 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 273 }
278 274
279 line_t *old_buf = row_buf; 275 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 277
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 279 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 280 int q = total_rows; // rewrapped row
285 281
286 if (top_row) 282 if (top_row)
… …
330 int qcol = 0; 326 int qcol = 0;
331 327
332 // see below for cursor adjustment rationale 328 // see below for cursor adjustment rationale
333 if (p == ocur.row) 329 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 330 screen.cur.row = q - (total_rows - nrow);
335 331
336 // fill a single destination line 332 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
338 { 334 {
339 int prow = lofs / prev_ncol; 335 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
… …
366 } 362 }
367 while (p != pend && q > 0); 363 while (p != pend && q > 0);
368 364
369 term_start = total_rows - nrow; 365 term_start = total_rows - nrow;
370 top_row = q - term_start; 366 top_row = q - term_start;
371 367
372 // make sure all terminal lines exist 368 // make sure all terminal lines exist
373 while (top_row > 0) 369 while (top_row > 0)
374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 370 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375 } 371 }
376 else 372 else
377 { 373 {
378 // if no scrollback exists (yet), wing, instead of wrap 374 // if no scrollback exists (yet), wing, instead of wrap
379 375
380 for (int row = min (nrow, prev_nrow); row--; ) 376 for (int row = min (nrow, prev_nrow); row--; )
381 { 377 {
382 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
383 line_t &qline = row_buf [row]; 379 line_t &qline = row_buf [row];
384 380
… …
407 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
408 404
409 prev_nrow = nrow; 405 prev_nrow = nrow;
410 prev_ncol = ncol; 406 prev_ncol = ncol;
411 407
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 408 tabs = (char *)rxvt_malloc (ncol);
413 409
414 for (int col = ncol; --col; ) 410 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 411 tabs [col] = col % TABSIZE == 0;
416 412
417 if (current_screen != PRIMARY) 413 if (current_screen != PRIMARY)
… …
598/* 594/*
599 * Change the rendition style for following text 595 * Change the rendition style for following text
600 */ 596 */
601void 597void
602rxvt_term::scr_rendition (int set, int style) NOTHROW 598rxvt_term::scr_rendition (int set, int style) NOTHROW
603 { 599{
604 if (set) 600 if (set)
605 rstyle |= style; 601 rstyle |= style;
606 else if (style == ~RS_None) 602 else if (style == ~RS_None)
607 rstyle = DEFAULT_RSTYLE; 603 rstyle = DEFAULT_RSTYLE;
608 else 604 else
609 rstyle &= ~style; 605 rstyle &= ~style;
610 } 606}
611 607
612/* ------------------------------------------------------------------------- */ 608/* ------------------------------------------------------------------------- */
613/* 609/*
614 * Scroll text between <row1> and <row2> inclusive, by <count> lines 610 * Scroll text between <row1> and <row2> inclusive, by <count> lines
615 * count positive ==> scroll up 611 * count positive ==> scroll up
… …
666 line_t &l2 = ROW(i); 662 line_t &l2 = ROW(i);
667 663
668 ::swap (l1, l2); 664 ::swap (l1, l2);
669 l2.touch (); 665 l2.touch ();
670 } 666 }
671 667
672 // move and/or clear selection, if any 668 // move and/or clear selection, if any
673 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
674 { 670 {
675 selection.beg.row -= count; 671 selection.beg.row -= count;
676 selection.end.row -= count; 672 selection.end.row -= count;
… …
712 { 708 {
713 /* move selected region too */ 709 /* move selected region too */
714 selection.beg.row -= count; 710 selection.beg.row -= count;
715 selection.end.row -= count; 711 selection.end.row -= count;
716 selection.mark.row -= count; 712 selection.mark.row -= count;
717 713
718 selection_check (0); 714 selection_check (0);
719 } 715 }
720 } 716 }
721 717
722 // use a simple and robust scrolling algorithm, this 718 // use a simple and robust scrolling algorithm, this
… …
834 } 830 }
835 831
836 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
837 { 833 {
838 scr_do_wrap (); 834 scr_do_wrap ();
839 835
840 line->l = ncol; 836 line->l = ncol;
841 line->is_longer (1); 837 line->is_longer (1);
842 838
843 row = screen.cur.row; 839 row = screen.cur.row;
844 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
… …
1013 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1014 */ 1010 */
1015void 1011void
1016rxvt_term::scr_backspace () NOTHROW 1012rxvt_term::scr_backspace () NOTHROW
1017{ 1013{
1018 want_refresh = 1;
1019
1020 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1021 { 1015 {
1022 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1023 { 1017 {
1024#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1025 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1026 screen.cur.row--; 1020 --screen.cur.row;
1027 return; 1021
1022 want_refresh = 1;
1028#endif 1023#endif
1029 } 1024 }
1030 } 1025 }
1031 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1032 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1033
1034 screen.flags &= ~Screen_WrapNext;
1035} 1028}
1036 1029
1037/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1038/* 1031/*
1039 * Process Horizontal Tab 1032 * Process Horizontal Tab
… …
1062 x = i; 1055 x = i;
1063 1056
1064 if (!--count) 1057 if (!--count)
1065 break; 1058 break;
1066 } 1059 }
1067 else 1060 else
1068 ht &= l.t[i] == ' ' 1061 ht &= l.t[i] == ' '
1069 && RS_SAME (l.r[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1070 1063
1071 if (count) 1064 if (count)
1072 x = ncol - 1; 1065 x = ncol - 1;
… …
1188 } 1181 }
1189 } 1182 }
1190 else 1183 else
1191 { 1184 {
1192 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1193 { /* relative origin mode */ 1187 /* relative origin mode */
1194 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1195 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1196 } 1190 }
1197 else 1191 else
1198 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1231/* 1225/*
1232 * Erase part or whole of a line 1226 * Erase part or whole of a line
1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1236 */ 1231 */
1237void 1232void
1238rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1239{ 1234{
1240 unsigned int col, num; 1235 unsigned int col, num;
… …
1249 line.touch (); 1244 line.touch ();
1250 line.is_longer (0); 1245 line.is_longer (0);
1251 1246
1252 switch (mode) 1247 switch (mode)
1253 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1254 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1255 col = screen.cur.col; 1256 col = screen.cur.col;
1256 num = ncol - col; 1257 num = ncol - col;
1257 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1258 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1259 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1260 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1261 break; 1263 break;
1264
1262 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1263 col = 0; 1266 col = 0;
1264 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1265 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1266 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1267 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1268 break; 1272 break;
1273
1269 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1270 col = 0; 1275 col = 0;
1271 num = ncol; 1276 num = ncol;
1272 line.l = 0; 1277 line.l = 0;
1273 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1474 { 1479 {
1475 if (selection.end.row != screen.cur.row 1480 if (selection.end.row != screen.cur.row
1476 || (selection.end.col + count >= ncol)) 1481 || (selection.end.col + count >= ncol))
1477 CLEAR_SELECTION (); 1482 CLEAR_SELECTION ();
1478 else 1483 else
1484 {
1479 { /* shift selection */ 1485 /* shift selection */
1480 selection.beg.col += count; 1486 selection.beg.col += count;
1481 selection.mark.col += count; /* XXX: yes? */ 1487 selection.mark.col += count; /* XXX: yes? */
1482 selection.end.col += count; 1488 selection.end.col += count;
1483 } 1489 }
1484 } 1490 }
… …
1623 */ 1629 */
1624void 1630void
1625rxvt_term::scr_set_tab (int mode) NOTHROW 1631rxvt_term::scr_set_tab (int mode) NOTHROW
1626{ 1632{
1627 if (mode < 0) 1633 if (mode < 0)
1628 memset (tabs, 0, ncol * sizeof (char)); 1634 memset (tabs, 0, ncol);
1629 else if (screen.cur.col < ncol) 1635 else if (screen.cur.col < ncol)
1630 tabs [screen.cur.col] = !!mode; 1636 tabs [screen.cur.col] = !!mode;
1631} 1637}
1632 1638
1633/* ------------------------------------------------------------------------- */ 1639/* ------------------------------------------------------------------------- */
… …
1650 rvideo_state = on; 1656 rvideo_state = on;
1651 1657
1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1658 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1653#ifdef HAVE_BG_PIXMAP 1659#ifdef HAVE_BG_PIXMAP
1654 if (bgPixmap.pixmap == None) 1660 if (bgPixmap.pixmap == None)
1655#endif
1656#if ENABLE_TRANSPARENCY
1657 if (!option (Opt_transparent) || am_transparent == 0)
1658#endif 1661#endif
1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1662 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1660 1663
1661 XGCValues gcvalue; 1664 XGCValues gcvalue;
1662 gcvalue.foreground = pix_colors[Color_fg]; 1665 gcvalue.foreground = pix_colors[Color_fg];
… …
1806 for (i = PART_BEG; i < RC_COUNT; i++) 1809 for (i = PART_BEG; i < RC_COUNT; i++)
1807 { 1810 {
1808 min_it (rc[i].col, ncol - 1); 1811 min_it (rc[i].col, ncol - 1);
1809 min_it (rc[i].row, nrow - 1); 1812 min_it (rc[i].row, nrow - 1);
1810 } 1813 }
1811 1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1815 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1816 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1814 1817
1815 num_scr_allow = 0; 1818 num_scr_allow = 0;
1816 1819
… …
1871 return true; 1874 return true;
1872} 1875}
1873 1876
1874#ifndef NO_BELL 1877#ifndef NO_BELL
1875void 1878void
1876rxvt_term::bell_cb (time_watcher &w) 1879rxvt_term::bell_cb (ev::timer &w, int revents)
1877{ 1880{
1878 rvideo_bell = false; 1881 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode); 1882 scr_rvideo_mode (rvideo_mode);
1883 refresh_check ();
1880} 1884}
1881#endif 1885#endif
1882 1886
1883/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1884void 1888void
… …
1890# ifdef MAPALERT_OPTION 1894# ifdef MAPALERT_OPTION
1891 if (option (Opt_mapAlert)) 1895 if (option (Opt_mapAlert))
1892# endif 1896# endif
1893 XMapWindow (dpy, parent[0]); 1897 XMapWindow (dpy, parent[0]);
1894# endif 1898# endif
1899
1895# if ENABLE_FRILLS 1900# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell)) 1901 if (option (Opt_urgentOnBell))
1897 { 1902 {
1898 XWMHints *h;
1899
1900 h = XGetWMHints(dpy, parent[0]); 1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1901 if (h != NULL)
1902 { 1904 {
1903 h->flags |= XUrgencyHint; 1905 h->flags |= XUrgencyHint;
1904 XSetWMHints(dpy, parent[0], h); 1906 XSetWMHints (dpy, parent[0], h);
1905 } 1907 }
1906 } 1908 }
1907# endif 1909# endif
1908 1910
1909 if (option (Opt_visualBell)) 1911 if (option (Opt_visualBell))
1910 { 1912 {
1911 rvideo_bell = true; 1913 rvideo_bell = true;
1912 scr_rvideo_mode (rvideo_mode); 1914 scr_rvideo_mode (rvideo_mode);
1913 display->flush (); 1915 flush ();
1914 1916
1915 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1917 bell_ev.start (VISUAL_BELL_DURATION);
1916 } 1918 }
1917 else 1919 else
1918 XBell (dpy, 0); 1920 XBell (dpy, 0);
1919
1920#endif 1921#endif
1921} 1922}
1922 1923
1923/* ------------------------------------------------------------------------- */ 1924/* ------------------------------------------------------------------------- */
1924/* ARGSUSED */ 1925/* ARGSUSED */
… …
2002 return; 2003 return;
2003 2004
2004 /* 2005 /*
2005 * A: set up vars 2006 * A: set up vars
2006 */ 2007 */
2008 refresh_count = 0;
2009
2007 have_bg = 0; 2010 have_bg = 0;
2008 refresh_count = 0;
2009
2010#ifdef HAVE_BG_PIXMAP 2011#ifdef HAVE_BG_PIXMAP
2011 have_bg |= bgPixmap.pixmap != None; 2012 have_bg = bgPixmap.pixmap != None;
2012#endif
2013#if ENABLE_TRANSPARENCY
2014 have_bg |= option (Opt_transparent) && am_transparent;
2015#endif 2013#endif
2016 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2017 2015
2018 /* 2016 /*
2019 * B: reverse any characters which are selected 2017 * B: reverse any characters which are selected
… …
2272 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2273 { 2271 {
2274 bool invert = rend & RS_RVid; 2272 bool invert = rend & RS_RVid;
2275 2273
2276#ifndef NO_BOLD_UNDERLINE_REVERSE 2274#ifndef NO_BOLD_UNDERLINE_REVERSE
2277 if (rend & RS_Bold
2278 && fore == Color_fg) 2275 if (rend & RS_Bold && fore == Color_fg)
2279 { 2276 {
2280 if (ISSET_PIXCOLOR (Color_BD)) 2277 if (ISSET_PIXCOLOR (Color_BD))
2281 fore = Color_BD; 2278 fore = Color_BD;
2282# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2283 else 2280 else
2284 invert = !invert; 2281 invert = !invert;
2285# endif 2282# endif
2286 } 2283 }
2287 2284
2288 if (rend & RS_Italic 2285 if (rend & RS_Italic && fore == Color_fg)
2289 && fore == Color_fg)
2290 { 2286 {
2291 if (ISSET_PIXCOLOR (Color_IT)) 2287 if (ISSET_PIXCOLOR (Color_IT))
2292 fore = Color_IT; 2288 fore = Color_IT;
2293# if !ENABLE_STYLES 2289# if !ENABLE_STYLES
2294 else 2290 else
… …
2328 } 2324 }
2329 2325
2330#ifdef TEXT_BLINK 2326#ifdef TEXT_BLINK
2331 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2327 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2332 { 2328 {
2333 if (!text_blink_ev.active) 2329 if (!text_blink_ev.is_active ())
2334 { 2330 {
2335 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2331 text_blink_ev.again ();
2336 hidden_text = 0; 2332 hidden_text = 0;
2337 } 2333 }
2338 else if (hidden_text) 2334 else if (hidden_text)
2339 fore = back; 2335 fore = back;
2340 } 2336 }
… …
2388 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2384 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2389 else 2385 else
2390#endif 2386#endif
2391 XSetForeground (dpy, gc, pix_colors[fore]); 2387 XSetForeground (dpy, gc, pix_colors[fore]);
2392 2388
2393 XDrawLine (dpy, drawBuffer, gc, 2389 XDrawLine (dpy, vt, gc,
2394 xpixel, ypixel + font->ascent + 1, 2390 xpixel, ypixel + font->ascent + 1,
2395 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2396 } 2392 }
2397 } /* for (col....) */ 2393 } /* for (col....) */
2398 } /* for (row....) */ 2394 } /* for (row....) */
… …
2436 XSetForeground (dpy, gc, pix_colors[Color_cursor]); 2432 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2437 else 2433 else
2438#endif 2434#endif
2439 XSetForeground (dpy, gc, pix_colors[ccol1]); 2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2440 2436
2441 XDrawRectangle (dpy, drawBuffer, gc, 2437 XDrawRectangle (dpy, vt, gc,
2442 Col2Pixel (col), 2438 Col2Pixel (col),
2443 Row2Pixel (oldcursor.row), 2439 Row2Pixel (oldcursor.row),
2444 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2440 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2445 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2446 } 2442 }
… …
2481} 2477}
2482 2478
2483void 2479void
2484rxvt_term::scr_recolour () NOTHROW 2480rxvt_term::scr_recolour () NOTHROW
2485{ 2481{
2486 if (1
2487#if ENABLE_TRANSPARENCY
2488 && !am_transparent
2489#endif
2490#ifdef HAVE_BG_PIXMAP 2482#ifdef HAVE_BG_PIXMAP
2491 && !bgPixmap.pixmap 2483 bgPixmap.apply ();
2492#endif 2484#else
2493 ) 2485
2494 {
2495 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2496 XClearWindow (dpy, parent[0]); 2487 XClearWindow (dpy, parent[0]);
2497 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2498#if HAVE_SCROLLBARS 2489
2499 if (scrollBar.win) 2490 if (scrollBar.win)
2500 { 2491 {
2501 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2502 scrollBar.setIdle (); 2493 scrollBar.state = STATE_IDLE;
2503 scrollbar_show (0); 2494 scrollBar.show (0);
2504 }
2505#endif
2506 } 2495 }
2507 2496
2497#endif
2498
2499 /* bgPixmap.apply () does not do the following : */
2508 scr_clear (); 2500 scr_clear ();
2509 scr_touch (true); 2501 scr_touch (true);
2510 want_refresh = 1; 2502 want_refresh = 1;
2511} 2503}
2512 2504
… …
2604{ 2596{
2605 int row, wrote; 2597 int row, wrote;
2606 unsigned int width, towrite; 2598 unsigned int width, towrite;
2607 char r1[] = "\n"; 2599 char r1[] = "\n";
2608 2600
2609 for (row = saveLines - nsaved; 2601 for (row = saveLines + top_row;
2610 row < saveLines + nrow - 1; row++) 2602 row < saveLines + nrow - 1; row++)
2611 { 2603 {
2612 width = row_buf[row].l >= 0 ? row_buf[row].l 2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2613 : ncol; 2605 : ncol;
2614 for (towrite = width; towrite; towrite -= wrote) 2606 for (towrite = width; towrite; towrite -= wrote)
… …
2665 /* convert normal newline chars into common keyboard Return key sequence */ 2657 /* convert normal newline chars into common keyboard Return key sequence */
2666 for (unsigned int i = 0; i < len; i++) 2658 for (unsigned int i = 0; i < len; i++)
2667 if (data[i] == C0_LF) 2659 if (data[i] == C0_LF)
2668 data[i] = C0_CR; 2660 data[i] = C0_CR;
2669 2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~");
2664
2670 tt_write (data, len); 2665 tt_write (data, len);
2666
2667 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~");
2671} 2669}
2672 2670
2673/* ------------------------------------------------------------------------- */ 2671/* ------------------------------------------------------------------------- */
2674/* 2672/*
2675 * Respond to a notification that a primary selection has been sent 2673 * Respond to a notification that a primary selection has been sent
… …
2750 if (!delete_prop) 2748 if (!delete_prop)
2751 XDeleteProperty (dpy, win, prop); 2749 XDeleteProperty (dpy, win, prop);
2752 2750
2753 selection_wait = Sel_incr; 2751 selection_wait = Sel_incr;
2754 incr_buf_fill = 0; 2752 incr_buf_fill = 0;
2755 incr_ev.start (NOW + 10); 2753 incr_ev.start (10);
2756 2754
2757 goto bailout; 2755 goto bailout;
2758 } 2756 }
2759 2757
2760 if (ct.nitems == 0) 2758 if (ct.nitems == 0)
… …
2769 ct.nitems = incr_buf_fill; 2767 ct.nitems = incr_buf_fill;
2770 incr_buf = 0; 2768 incr_buf = 0;
2771 incr_buf_size = 0; 2769 incr_buf_size = 0;
2772 incr_ev.stop (); 2770 incr_ev.stop ();
2773 } 2771 }
2774 else 2772 else
2775 { 2773 {
2776 if (selection_wait == Sel_normal 2774 if (selection_wait == Sel_normal
2777 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2778 { 2776 {
2779 /* 2777 /*
… …
2786 goto bailout; 2784 goto bailout;
2787 } 2785 }
2788 } 2786 }
2789 else if (selection_wait == Sel_incr) 2787 else if (selection_wait == Sel_incr)
2790 { 2788 {
2791 incr_ev.start (NOW + 10); 2789 incr_ev.start (10);
2792 2790
2793 while (incr_buf_fill + ct.nitems > incr_buf_size) 2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2794 { 2792 {
2795 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2796 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2836 if (selection_wait == Sel_normal) 2834 if (selection_wait == Sel_normal)
2837 selection_wait = Sel_none; 2835 selection_wait = Sel_none;
2838} 2836}
2839 2837
2840void 2838void
2841rxvt_term::incr_cb (time_watcher &w) NOTHROW 2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2842{ 2840{
2843 selection_wait = Sel_none; 2841 selection_wait = Sel_none;
2844 2842
2845 incr_buf_size = 0; 2843 incr_buf_size = 0;
2846 free (incr_buf); 2844 free (incr_buf);
… …
2857 selection_paste (win, prop, true); 2855 selection_paste (win, prop, true);
2858} 2856}
2859 2857
2860/* ------------------------------------------------------------------------- */ 2858/* ------------------------------------------------------------------------- */
2861/* 2859/*
2862 * Request the current selection: 2860 * Request the current selection:
2863 * Order: > internal selection if available 2861 * Order: > internal selection if available
2864 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2862 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2865 * > CUT_BUFFER0 2863 * > CUT_BUFFER0
2866 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2864 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2867 * will auto fallback to CUT_BUFFER0 2865 * will auto fallback to CUT_BUFFER0
… …
2869 */ 2867 */
2870void 2868void
2871rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2872{ 2870{
2873 if (selection.text && selnum == Sel_Primary) 2871 if (selection.text && selnum == Sel_Primary)
2872 {
2874 { /* internal selection */ 2873 /* internal selection */
2875 char *str = rxvt_wcstombs (selection.text, selection.len); 2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2876 paste (str, strlen (str)); 2875 paste (str, strlen (str));
2877 free (str); 2876 free (str);
2878 return; 2877 return;
2879 } 2878 }
… …
3145 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3144 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3146 3145
3147 while (selection.mark.col > 0 3146 while (selection.mark.col > 0
3148 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3149 --selection.mark.col; 3148 --selection.mark.col;
3150 3149
3151 if (selection.op) 3150 if (selection.op)
3151 {
3152 { /* clear the old selection */ 3152 /* clear the old selection */
3153 selection.beg.row = selection.end.row = selection.mark.row; 3153 selection.beg.row = selection.end.row = selection.mark.row;
3154 selection.beg.col = selection.end.col = selection.mark.col; 3154 selection.beg.col = selection.end.col = selection.mark.col;
3155 } 3155 }
3156 3156
3157 selection.op = SELECTION_INIT; 3157 selection.op = SELECTION_INIT;
… …
3346 * a point/word/line which is either the start or end of the selection 3346 * a point/word/line which is either the start or end of the selection
3347 * and it was decided by whichever point/word/line was `fixed' at the 3347 * and it was decided by whichever point/word/line was `fixed' at the
3348 * time of the most recent button3 press 3348 * time of the most recent button3 press
3349 */ 3349 */
3350 if (button3 && buttonpress) 3350 if (button3 && buttonpress)
3351 {
3351 { /* button3 press */ 3352 /* button3 press */
3352 /* 3353 /*
3353 * first determine which edge of the selection we are closest to 3354 * first determine which edge of the selection we are closest to
3354 */ 3355 */
3355 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3356 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3356 || (!ROWCOL_IS_AFTER (pos, selection.end) 3357 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3374 selection.mark.row = selection.beg.row; 3375 selection.mark.row = selection.beg.row;
3375 selection.mark.col = selection.beg.col; 3376 selection.mark.col = selection.beg.col;
3376 } 3377 }
3377 } 3378 }
3378 else 3379 else
3380 {
3379 { /* button1 drag or button3 drag */ 3381 /* button1 drag or button3 drag */
3380 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3382 if (ROWCOL_IS_AFTER (selection.mark, pos))
3381 { 3383 {
3382 if (selection.mark.row == selection.end.row 3384 if (selection.mark.row == selection.end.row
3383 && selection.mark.col == selection.end.col 3385 && selection.mark.col == selection.end.col
3384 && clickchange 3386 && clickchange
… …
3465 selection.end.row++; 3467 selection.end.row++;
3466 } 3468 }
3467 } 3469 }
3468 3470
3469 if (button3 && buttonpress) 3471 if (button3 && buttonpress)
3472 {
3470 { /* mark may need to be changed */ 3473 /* mark may need to be changed */
3471 if (closeto == LEFT) 3474 if (closeto == LEFT)
3472 { 3475 {
3473 selection.mark.row = selection.end.row; 3476 selection.mark.row = selection.end.row;
3474 selection.mark.col = selection.end.col - (selection.clicks == 2); 3477 selection.mark.col = selection.end.col - (selection.clicks == 2);
3475 } 3478 }
… …
3674 XFree (ct.value); 3677 XFree (ct.value);
3675 } 3678 }
3676 3679
3677 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3680 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3678} 3681}
3679
3680/* ------------------------------------------------------------------------- *
3681 * MOUSE ROUTINES *
3682 * ------------------------------------------------------------------------- */
3683
3684/*
3685 * return col/row values corresponding to x/y pixel values
3686 */
3687void
3688rxvt_term::pixel_position (int *x, int *y) NOTHROW
3689{
3690 *x = Pixel2Col (*x);
3691 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3692 *y = Pixel2Row (*y);
3693 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3694}
3695 3682
3696/* ------------------------------------------------------------------------- */ 3683/* ------------------------------------------------------------------------- */
3697#ifdef USE_XIM 3684#ifdef USE_XIM
3698void 3685void
3699rxvt_term::im_set_position (XPoint &pos) NOTHROW 3686rxvt_term::im_set_position (XPoint &pos) NOTHROW

Diff Legend

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