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.415 by root, Mon May 28 14:25:16 2012 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
157/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
160 158
161void 159void
162rxvt_term::scr_alloc () 160rxvt_term::scr_alloc () NOTHROW
163{ 161{
164 int tsize = sizeof (text_t) * ncol; 162 int tsize = sizeof (text_t) * ncol;
165 int rsize = sizeof (rend_t) * ncol; 163 int rsize = sizeof (rend_t) * ncol;
166 164
167 // we assume that rend_t size is a sufficient alignment 165 // we assume that rend_t size is a sufficient alignment
168 // factor for tetx_t and line_t values, and we only 166 // factor for text_t and line_t values, and we only
169 // need to adjust tsize. 167 // need to adjust tsize.
170 tsize = (tsize + sizeof (rend_t) - 1); 168 tsize = (tsize + sizeof (rend_t) - 1);
171 tsize -= tsize % sizeof (rend_t); 169 tsize -= tsize % sizeof (rend_t);
172 170
173 int all_rows = total_rows + nrow + nrow; 171 int all_rows = total_rows + nrow + nrow;
174 172
175 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
176 chunk = rxvt_malloc (chunk_size); 174 chunk = chunk_alloc (chunk_size, 0);
177 175
178 char *base = (char *)chunk + sizeof (line_t) * all_rows; 176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
179 177
180 for (int row = 0; row < all_rows; ++row) 178 for (int row = 0; row < all_rows; ++row)
181 { 179 {
… …
190 drawn_buf = (line_t *)chunk; 188 drawn_buf = (line_t *)chunk;
191 swap_buf = drawn_buf + nrow; 189 swap_buf = drawn_buf + nrow;
192 row_buf = swap_buf + nrow; 190 row_buf = swap_buf + nrow;
193} 191}
194 192
195void 193void ecb_cold
196rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
197{ 195{
198#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
199 scr_overlay_off (); 197 scr_overlay_off ();
200#endif 198#endif
… …
227 225
228 screen.tscroll = 0; 226 screen.tscroll = 0;
229 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
230 228
231 void *prev_chunk = chunk; 229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
232 line_t *prev_drawn_buf = drawn_buf; 231 line_t *prev_drawn_buf = drawn_buf;
233 line_t *prev_swap_buf = swap_buf; 232 line_t *prev_swap_buf = swap_buf;
234 line_t *prev_row_buf = row_buf; 233 line_t *prev_row_buf = row_buf;
235 234
236 int common_col = min (prev_ncol, ncol); 235 int common_col = min (prev_ncol, ncol);
… …
238 scr_alloc (); 237 scr_alloc ();
239 238
240 if (!prev_row_buf) 239 if (!prev_row_buf)
241 { 240 {
242 /* 241 /*
243 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
244 */ 243 */
245 top_row = 0; 244 top_row = 0;
246 term_start = 0; 245 term_start = 0;
247 246
248 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
… …
281 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
282 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
283 282
284 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); 284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = prev_swap_buf [row].l;
288 } 289 }
289 290
290 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 291 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
291 int pend = MOD (term_start + top_row , prev_total_rows); 292 int pend = MOD (term_start + top_row , prev_total_rows);
292 int q = total_rows; // rewrapped row 293 int q = total_rows; // rewrapped row
… …
391 392
392 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 393 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
393 394
394 memcpy (dst.t, src.t, sizeof (text_t) * common_col); 395 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
395 memcpy (dst.r, src.r, sizeof (rend_t) * common_col); 396 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
397 dst.l = common_col;
396 } 398 }
397 399
398 for (int row = prev_nrow; row < nrow; row++) 400 for (int row = prev_nrow; row < nrow; row++)
399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 401 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
400 402
… …
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 412 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 413 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 414 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 } 415 }
414 416
415 free (prev_chunk); 417 chunk_free (prev_chunk, prev_chunk_size);
416 418
417 free (tabs); 419 free (tabs);
418 tabs = (char *)rxvt_malloc (ncol); 420 tabs = (char *)rxvt_malloc (ncol);
419 421
420 for (int col = ncol; col--; ) 422 for (int col = ncol; col--; )
… …
428 tt_winch (); 430 tt_winch ();
429 431
430 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 432 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
431} 433}
432 434
433/* ------------------------------------------------------------------------- */ 435void ecb_cold
434/*
435 * Free everything. That way malloc debugging can find leakage.
436 */
437void
438rxvt_term::scr_release () NOTHROW 436rxvt_term::scr_release () NOTHROW
439{ 437{
440 free (chunk); 438 chunk_free (chunk, chunk_size);
439 chunk = 0;
440 row_buf = 0;
441
441 free (tabs); 442 free (tabs);
443 tabs = 0;
442} 444}
443 445
444/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
445/* 447/*
446 * Hard/Soft reset 448 * Hard/Soft reset
447 */ 449 */
448void 450void ecb_cold
449rxvt_term::scr_poweron () 451rxvt_term::scr_poweron ()
450{ 452{
451 scr_release (); 453 scr_release ();
452 454
453 row_buf = 0;
454 tabs = 0;
455 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
456 rvideo_mode = false; 456 rvideo_mode = false;
457 scr_soft_reset (); 457 scr_soft_reset ();
458 scr_reset (); 458 scr_reset ();
459 459
460 scr_clear (true); 460 scr_clear (true);
461 scr_refresh (); 461 scr_refresh ();
462} 462}
463 463
464void 464void ecb_cold
465rxvt_term::scr_soft_reset () NOTHROW 465rxvt_term::scr_soft_reset () NOTHROW
466{ 466{
467 /* only affects modes, nothing drastic such as clearing the screen */ 467 /* only affects modes, nothing drastic such as clearing the screen */
468#if ENABLE_OVERLAY 468#if ENABLE_OVERLAY
469 scr_overlay_off (); 469 scr_overlay_off ();
… …
635/* 635/*
636 * Scroll text between <row1> and <row2> inclusive, by <count> lines 636 * Scroll text between <row1> and <row2> inclusive, by <count> lines
637 * count positive ==> scroll up 637 * count positive ==> scroll up
638 * count negative ==> scroll down 638 * count negative ==> scroll down
639 */ 639 */
640int 640int ecb_hot
641rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 641rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
642{ 642{
643 if (count == 0 || (row1 > row2)) 643 if (count == 0 || (row1 > row2))
644 return 0; 644 return 0;
645 645
… …
779 779
780/* ------------------------------------------------------------------------- */ 780/* ------------------------------------------------------------------------- */
781/* 781/*
782 * Add text given in <str> of length <len> to screen struct 782 * Add text given in <str> of length <len> to screen struct
783 */ 783 */
784void 784void ecb_hot
785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
786{ 786{
787 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
788 return; 788 return;
789 789
… …
1139 * XTERM_SEQ: ESC 6 1139 * XTERM_SEQ: ESC 6
1140 * Move cursor left in row. If we're at the left boundary, shift everything 1140 * Move cursor left in row. If we're at the left boundary, shift everything
1141 * in that row right. Clear left column. 1141 * in that row right. Clear left column.
1142 */ 1142 */
1143#if !ENABLE_MINIMAL 1143#if !ENABLE_MINIMAL
1144void 1144void ecb_cold
1145rxvt_term::scr_backindex () NOTHROW 1145rxvt_term::scr_backindex () NOTHROW
1146{ 1146{
1147 if (screen.cur.col > 0) 1147 if (screen.cur.col > 0)
1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1149 else 1149 else
… …
1156 * XTERM_SEQ: ESC 9 1156 * XTERM_SEQ: ESC 9
1157 * Move cursor right in row. If we're at the right boundary, shift everything 1157 * Move cursor right in row. If we're at the right boundary, shift everything
1158 * in that row left. Clear right column. 1158 * in that row left. Clear right column.
1159 */ 1159 */
1160#if !ENABLE_MINIMAL 1160#if !ENABLE_MINIMAL
1161void 1161void ecb_cold
1162rxvt_term::scr_forwardindex () NOTHROW 1162rxvt_term::scr_forwardindex () NOTHROW
1163{ 1163{
1164 if (screen.cur.col < ncol - 1) 1164 if (screen.cur.col < ncol - 1)
1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1166 else 1166 else
… …
1417/* ------------------------------------------------------------------------- */ 1417/* ------------------------------------------------------------------------- */
1418/* 1418/*
1419 * Fill the screen with `E's 1419 * Fill the screen with `E's
1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1421 */ 1421 */
1422void 1422void ecb_cold
1423rxvt_term::scr_E () NOTHROW 1423rxvt_term::scr_E () NOTHROW
1424{ 1424{
1425 rend_t fs; 1425 rend_t fs;
1426 1426
1427 want_refresh = 1; 1427 want_refresh = 1;
… …
1591/* ------------------------------------------------------------------------- */ 1591/* ------------------------------------------------------------------------- */
1592/* 1592/*
1593 * Set the scrolling region 1593 * Set the scrolling region
1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1595 */ 1595 */
1596void 1596void ecb_cold
1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1598{ 1598{
1599 max_it (top, 0); 1599 max_it (top, 0);
1600 min_it (bot, nrow - 1); 1600 min_it (bot, nrow - 1);
1601 1601
… …
1611/* 1611/*
1612 * Make the cursor visible/invisible 1612 * Make the cursor visible/invisible
1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1615 */ 1615 */
1616void 1616void ecb_cold
1617rxvt_term::scr_cursor_visible (int mode) NOTHROW 1617rxvt_term::scr_cursor_visible (int mode) NOTHROW
1618{ 1618{
1619 want_refresh = 1; 1619 want_refresh = 1;
1620 1620
1621 if (mode) 1621 if (mode)
… …
1628/* 1628/*
1629 * Set/unset automatic wrapping 1629 * Set/unset automatic wrapping
1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1632 */ 1632 */
1633void 1633void ecb_cold
1634rxvt_term::scr_autowrap (int mode) NOTHROW 1634rxvt_term::scr_autowrap (int mode) NOTHROW
1635{ 1635{
1636 if (mode) 1636 if (mode)
1637 screen.flags |= Screen_Autowrap; 1637 screen.flags |= Screen_Autowrap;
1638 else 1638 else
… …
1647 * Relative mode: line numbers are relative to top margin of scrolling region 1647 * Relative mode: line numbers are relative to top margin of scrolling region
1648 * and the cursor cannot be moved outside. 1648 * and the cursor cannot be moved outside.
1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1651 */ 1651 */
1652void 1652void ecb_cold
1653rxvt_term::scr_relative_origin (int mode) NOTHROW 1653rxvt_term::scr_relative_origin (int mode) NOTHROW
1654{ 1654{
1655 if (mode) 1655 if (mode)
1656 screen.flags |= Screen_Relative; 1656 screen.flags |= Screen_Relative;
1657 else 1657 else
… …
1664/* 1664/*
1665 * Set insert/replace mode 1665 * Set insert/replace mode
1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1668 */ 1668 */
1669void 1669void ecb_cold
1670rxvt_term::scr_insert_mode (int mode) NOTHROW 1670rxvt_term::scr_insert_mode (int mode) NOTHROW
1671{ 1671{
1672 if (mode) 1672 if (mode)
1673 screen.flags |= Screen_Insert; 1673 screen.flags |= Screen_Insert;
1674 else 1674 else
… …
1680 * Set/Unset tabs 1680 * Set/Unset tabs
1681 * XTERM_SEQ: Set tab at current column : ESC H 1681 * XTERM_SEQ: Set tab at current column : ESC H
1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1684 */ 1684 */
1685void 1685void ecb_cold
1686rxvt_term::scr_set_tab (int mode) NOTHROW 1686rxvt_term::scr_set_tab (int mode) NOTHROW
1687{ 1687{
1688 if (mode < 0) 1688 if (mode < 0)
1689 memset (tabs, 0, ncol); 1689 memset (tabs, 0, ncol);
1690 else if (screen.cur.col < ncol) 1690 else if (screen.cur.col < ncol)
… …
1709 if (rvideo_state != on) 1709 if (rvideo_state != on)
1710 { 1710 {
1711 rvideo_state = on; 1711 rvideo_state = on;
1712 1712
1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1714#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_IMG
1715 if (bg_pixmap == None) 1715 if (bg_img == 0)
1716#endif 1716#endif
1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1718 1718
1719 XGCValues gcvalue; 1719 XGCValues gcvalue;
1720 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1729/* ------------------------------------------------------------------------- */ 1729/* ------------------------------------------------------------------------- */
1730/* 1730/*
1731 * Report current cursor position 1731 * Report current cursor position
1732 * XTERM_SEQ: Report position: ESC [ 6 n 1732 * XTERM_SEQ: Report position: ESC [ 6 n
1733 */ 1733 */
1734void 1734void ecb_cold
1735rxvt_term::scr_report_position () NOTHROW 1735rxvt_term::scr_report_position () NOTHROW
1736{ 1736{
1737 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1737 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1738} 1738}
1739 1739
… …
1742 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1743 1743
1744/* 1744/*
1745 * Set font style 1745 * Set font style
1746 */ 1746 */
1747void 1747void ecb_cold
1748rxvt_term::set_font_style () NOTHROW 1748rxvt_term::set_font_style () NOTHROW
1749{ 1749{
1750#if 0 1750#if 0
1751 switch (charsets [screen.charset]) 1751 switch (charsets [screen.charset])
1752 { 1752 {
… …
1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1776 * XTERM_SEQ: Invoke G2 character set: ESC N 1776 * XTERM_SEQ: Invoke G2 character set: ESC N
1777 * XTERM_SEQ: Invoke G3 character set: ESC O 1777 * XTERM_SEQ: Invoke G3 character set: ESC O
1778 */ 1778 */
1779void 1779void ecb_cold
1780rxvt_term::scr_charset_choose (int set) NOTHROW 1780rxvt_term::scr_charset_choose (int set) NOTHROW
1781{ 1781{
1782 screen.charset = set; 1782 screen.charset = set;
1783 set_font_style (); 1783 set_font_style ();
1784} 1784}
… …
1805 * ------------------------------------------------------------------------- */ 1805 * ------------------------------------------------------------------------- */
1806 1806
1807/* 1807/*
1808 * refresh matching text. 1808 * refresh matching text.
1809 */ 1809 */
1810bool 1810bool ecb_cold
1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1812{ 1812{
1813 bool found = false; 1813 bool found = false;
1814 1814
1815 for (int i = 0; i < nrow; i++) 1815 for (int i = 0; i < nrow; i++)
… …
1834 PART_BEG = 0, 1834 PART_BEG = 0,
1835 PART_END, 1835 PART_END,
1836 RC_COUNT 1836 RC_COUNT
1837}; 1837};
1838 1838
1839void 1839void ecb_hot
1840rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1840rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1841{ 1841{
1842 int i; 1842 int i;
1843 row_col_t rc[RC_COUNT]; 1843 row_col_t rc[RC_COUNT];
1844 1844
… …
1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1971#endif 1971#endif
1972} 1972}
1973 1973
1974/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1975void 1975void ecb_cold
1976rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1977{ 1977{
1978#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1979 int nrows, row_start; 1979 int nrows, row_start;
1980 FILE *fd = popen_printer (); 1980 FILE *fd = popen_printer ();
… …
2029/* 2029/*
2030 * Refresh the screen 2030 * Refresh the screen
2031 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
2032 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
2033 */ 2033 */
2034void 2034void ecb_hot
2035rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
2036{ 2036{
2037 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
2038 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
2039 int i; /* tmp */ 2039 int i; /* tmp */
… …
2054 */ 2054 */
2055 refresh_count = 0; 2055 refresh_count = 0;
2056 2056
2057 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2058 bool have_bg = 0; 2058 bool have_bg = 0;
2059#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2060 have_bg = bg_pixmap != None; 2060 have_bg = bg_img != 0;
2061#endif 2061#endif
2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2063 2063
2064 /* 2064 /*
2065 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
… …
2505 screen.flags = old_screen_flags; 2505 screen.flags = old_screen_flags;
2506 num_scr = 0; 2506 num_scr = 0;
2507 num_scr_allow = 1; 2507 num_scr_allow = 1;
2508} 2508}
2509 2509
2510void 2510void ecb_cold
2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2512{ 2512{
2513 if (!l.valid ()) 2513 if (!l.valid ())
2514 return; 2514 return;
2515 2515
… …
2517 2517
2518 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
2519 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2519 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2520} 2520}
2521 2521
2522void 2522void ecb_cold
2523rxvt_term::scr_remap_chars () NOTHROW 2523rxvt_term::scr_remap_chars () NOTHROW
2524{ 2524{
2525 for (int i = total_rows; i--; ) 2525 for (int i = total_rows; i--; )
2526 scr_remap_chars (row_buf [i]); 2526 scr_remap_chars (row_buf [i]);
2527 2527
… …
2530 scr_remap_chars (drawn_buf [i]); 2530 scr_remap_chars (drawn_buf [i]);
2531 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2532 } 2532 }
2533} 2533}
2534 2534
2535void 2535void ecb_cold
2536rxvt_term::scr_recolour (bool refresh) NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2537{ 2537{
2538 bool transparent = false; 2538 bool transparent = false;
2539 2539
2540#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_IMG
2541 if (bg_pixmap != None) 2541 if (bg_img != 0)
2542 { 2542 {
2543# ifdef ENABLE_TRANSPARENCY 2543# if ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT) 2544 if (bg_flags & BG_IS_TRANSPARENT)
2545 { 2545 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2546 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2548 2548
2549 transparent = true; 2549 transparent = true;
2550 } 2550 }
2551 else 2551 else
2552# endif 2552# endif
2553 { 2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2555 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2556 } 2556 }
2557 } 2557 }
2558 else 2558 else
2559#endif 2559#endif
2560 { 2560 {
… …
2567 if (scrollBar.win) 2567 if (scrollBar.win)
2568 { 2568 {
2569 if (transparent) 2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else 2571 else
2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2573 scrollBar.state = SB_STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2574 scrollBar.show (0); 2574 scrollBar.show (0);
2575 } 2575 }
2576 2576
2577 if (refresh) 2577 if (refresh)
… …
2643 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2643 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2644 srp[col] ^= rstyle; 2644 srp[col] ^= rstyle;
2645} 2645}
2646 2646
2647/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2648void 2648void ecb_hot
2649rxvt_term::scr_reverse_selection () NOTHROW 2649rxvt_term::scr_reverse_selection () NOTHROW
2650{ 2650{
2651 if (selection.op 2651 if (selection.op
2652 && current_screen == selection.screen 2652 && current_screen == selection.screen
2653 && selection.end.row >= view_start) 2653 && selection.end.row >= view_start)
… …
2944/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
2945/* 2945/*
2946 * Mark or select text based upon number of clicks: 1, 2, or 3 2946 * Mark or select text based upon number of clicks: 1, 2, or 3
2947 * EXT: button 1 press 2947 * EXT: button 1 press
2948 */ 2948 */
2949void 2949void ecb_cold
2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2951{ 2951{
2952 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
2953 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
2954 2954
… …
2973 2973
2974/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
2975/* 2975/*
2976 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
2977 */ 2977 */
2978void 2978void ecb_cold
2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2980{ 2980{
2981 want_refresh = 1; 2981 want_refresh = 1;
2982 2982
2983 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3010/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3011#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3012 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3013#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3014 3014
3015void 3015void ecb_cold
3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3016rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3017{ 3017{
3018 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3019 row_col_t bound; 3019 row_col_t bound;
3020 text_t *stp; 3020 text_t *stp;
… …
3094 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3095 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3096 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3097 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3098 */ 3098 */
3099void 3099void ecb_cold
3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3101{ 3101{
3102 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3103 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3104 3104
… …
3130 3130
3131/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3132/* 3132/*
3133 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3134 */ 3134 */
3135void 3135void ecb_cold
3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3136rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3137{ 3137{
3138 row_col_t pos; 3138 row_col_t pos;
3139 enum { 3139 enum {
3140 LEFT, RIGHT 3140 LEFT, RIGHT
… …
3331 ::swap (selection.beg.col, selection.end.col); 3331 ::swap (selection.beg.col, selection.end.col);
3332#endif 3332#endif
3333} 3333}
3334 3334
3335#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3336void 3336void ecb_cold
3337rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3338{ 3338{
3339 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3340 text_t *stp; 3340 text_t *stp;
3341 3341
… …
3379/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3380/* 3380/*
3381 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3382 * EXT: button 3 double click 3382 * EXT: button 3 double click
3383 */ 3383 */
3384void 3384void ecb_cold
3385rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3386{ 3386{
3387 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3389} 3389}
… …
3391/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3392/* 3392/*
3393 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3394 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3395 */ 3395 */
3396void 3396void ecb_cold
3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3398{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property; 3399 Atom property = rq.property == None ? rq.target : rq.property;
3400 XSelectionEvent ev; 3400 XSelectionEvent ev;
3401 3401
… …
3534 3534
3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3536} 3536}
3537 3537
3538/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3539#ifdef USE_XIM 3539#if USE_XIM
3540void 3540void ecb_cold
3541rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3542{ 3542{
3543 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3544 3544
3545 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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