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.416 by root, Mon May 28 14:26:11 2012 UTC vs.
Revision 1.439 by sf-exg, Mon Mar 25 16:24:18 2013 UTC

… …
150 l.r[col] = rend; 150 l.r[col] = rend;
151 col++; 151 col++;
152 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
153} 153}
154 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
155/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
158 168
159void 169void
160rxvt_term::scr_alloc () 170rxvt_term::scr_alloc () NOTHROW
161{ 171{
162 int tsize = sizeof (text_t) * ncol; 172 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol; 173 int rsize = sizeof (rend_t) * ncol;
164 174
165 // we assume that rend_t size is a sufficient alignment 175 // we assume that rend_t size is a sufficient alignment
166 // factor for tetx_t and line_t values, and we only 176 // factor for text_t and line_t values, and we only
167 // need to adjust tsize. 177 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1); 178 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t); 179 tsize -= tsize % sizeof (rend_t);
170 180
171 int all_rows = total_rows + nrow + nrow; 181 int all_rows = total_rows + nrow + nrow;
172 182
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; 183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size); 184 chunk = chunk_alloc (chunk_size, 0);
175 185
176 char *base = (char *)chunk + sizeof (line_t) * all_rows; 186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177 187
178 for (int row = 0; row < all_rows; ++row) 188 for (int row = 0; row < all_rows; ++row)
179 { 189 {
… …
189 swap_buf = drawn_buf + nrow; 199 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow; 200 row_buf = swap_buf + nrow;
191} 201}
192 202
193void 203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
194rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
195{ 215{
196#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
197 scr_overlay_off (); 217 scr_overlay_off ();
198#endif 218#endif
… …
225 245
226 screen.tscroll = 0; 246 screen.tscroll = 0;
227 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
228 248
229 void *prev_chunk = chunk; 249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
230 line_t *prev_drawn_buf = drawn_buf; 251 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf; 252 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf; 253 line_t *prev_row_buf = row_buf;
233 254
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc (); 255 scr_alloc ();
237 256
238 if (!prev_row_buf) 257 if (!prev_row_buf)
239 { 258 {
240 /*
241 * first time called so just malloc everything: don't rely on realloc
242 */
243 top_row = 0; 259 top_row = 0;
244 term_start = 0; 260 term_start = 0;
245 261
246 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
247 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
… …
272 { 288 {
273 /* 289 /*
274 * add or delete rows as appropriate 290 * add or delete rows as appropriate
275 */ 291 */
276 292
293 int common_col = min (prev_ncol, ncol);
294
277 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
278 { 296 {
279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
281
282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); 300
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); 301 copy_line (swap_buf [row], prev_swap_buf [row]);
286 } 302 }
287 303
288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
289 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
290 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
… …
385 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
386 { 402 {
387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
388 line_t &dst = row_buf [row]; 404 line_t &dst = row_buf [row];
389 405
390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE); 406 copy_line (dst, src);
391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
394 } 407 }
395 408
396 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
398 411
… …
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); 423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 } 424 }
412 425
413 free (prev_chunk); 426 chunk_free (prev_chunk, prev_chunk_size);
414 427
415 free (tabs); 428 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
417 430
418 for (int col = ncol; col--; ) 431 for (int col = ncol; col--; )
… …
426 tt_winch (); 439 tt_winch ();
427 440
428 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
429} 442}
430 443
431/* ------------------------------------------------------------------------- */ 444void ecb_cold
432/*
433 * Free everything. That way malloc debugging can find leakage.
434 */
435void
436rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
437{ 446{
438 free (chunk); 447 chunk_free (chunk, chunk_size);
448 chunk = 0;
449 row_buf = 0;
450
439 free (tabs); 451 free (tabs);
452 tabs = 0;
440} 453}
441 454
442/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
443/* 456/*
444 * Hard/Soft reset 457 * Hard/Soft reset
445 */ 458 */
446void 459void ecb_cold
447rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
448{ 461{
449 scr_release (); 462 scr_release ();
450 463
451 row_buf = 0;
452 tabs = 0;
453 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false; 465 rvideo_mode = false;
455 scr_soft_reset (); 466 scr_soft_reset ();
456 scr_reset (); 467 scr_reset ();
457 468
458 scr_clear (true); 469 scr_clear (true);
459 scr_refresh (); 470 scr_refresh ();
460} 471}
461 472
462void 473void ecb_cold
463rxvt_term::scr_soft_reset () NOTHROW 474rxvt_term::scr_soft_reset () NOTHROW
464{ 475{
465 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
466#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
467 scr_overlay_off (); 478 scr_overlay_off ();
… …
633/* 644/*
634 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
635 * count positive ==> scroll up 646 * count positive ==> scroll up
636 * count negative ==> scroll down 647 * count negative ==> scroll down
637 */ 648 */
638int 649int ecb_hot
639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
640{ 651{
641 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
642 return 0; 653 return 0;
643 654
… …
777 788
778/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
779/* 790/*
780 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
781 */ 792 */
782void 793void ecb_hot
783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
784{ 795{
785 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
786 return; 797 return;
787 798
… …
1137 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1138 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1139 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1140 */ 1151 */
1141#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1142void 1153void ecb_cold
1143rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1144{ 1155{
1145 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1147 else 1158 else
… …
1154 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1155 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1156 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1157 */ 1168 */
1158#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1159void 1170void ecb_cold
1160rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1161{ 1172{
1162 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1164 else 1175 else
… …
1415/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1416/* 1427/*
1417 * Fill the screen with `E's 1428 * Fill the screen with `E's
1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1419 */ 1430 */
1420void 1431void ecb_cold
1421rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1422{ 1433{
1423 rend_t fs; 1434 rend_t fs;
1424 1435
1425 want_refresh = 1; 1436 want_refresh = 1;
… …
1589/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1590/* 1601/*
1591 * Set the scrolling region 1602 * Set the scrolling region
1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1593 */ 1604 */
1594void 1605void ecb_cold
1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1596{ 1607{
1597 max_it (top, 0); 1608 max_it (top, 0);
1598 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1599 1610
… …
1609/* 1620/*
1610 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1613 */ 1624 */
1614void 1625void ecb_cold
1615rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1616{ 1627{
1617 want_refresh = 1; 1628 want_refresh = 1;
1618 1629
1619 if (mode) 1630 if (mode)
… …
1626/* 1637/*
1627 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1630 */ 1641 */
1631void 1642void ecb_cold
1632rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1633{ 1644{
1634 if (mode) 1645 if (mode)
1635 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1636 else 1647 else
… …
1645 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1646 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1649 */ 1660 */
1650void 1661void ecb_cold
1651rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1652{ 1663{
1653 if (mode) 1664 if (mode)
1654 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1655 else 1666 else
… …
1662/* 1673/*
1663 * Set insert/replace mode 1674 * Set insert/replace mode
1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1666 */ 1677 */
1667void 1678void ecb_cold
1668rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1669{ 1680{
1670 if (mode) 1681 if (mode)
1671 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1672 else 1683 else
… …
1678 * Set/Unset tabs 1689 * Set/Unset tabs
1679 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1682 */ 1693 */
1683void 1694void ecb_cold
1684rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1685{ 1696{
1686 if (mode < 0) 1697 if (mode < 0)
1687 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1688 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1707 if (rvideo_state != on) 1718 if (rvideo_state != on)
1708 { 1719 {
1709 rvideo_state = on; 1720 rvideo_state = on;
1710 1721
1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1712#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1713 if (bg_pixmap == None) 1724 if (bg_img == 0)
1714#endif 1725#endif
1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1716 1727
1717 XGCValues gcvalue; 1728 XGCValues gcvalue;
1718 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1727/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1728/* 1739/*
1729 * Report current cursor position 1740 * Report current cursor position
1730 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1731 */ 1742 */
1732void 1743void ecb_cold
1733rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1734{ 1745{
1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1736} 1747}
1737 1748
… …
1740 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1741 1752
1742/* 1753/*
1743 * Set font style 1754 * Set font style
1744 */ 1755 */
1745void 1756void ecb_cold
1746rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1747{ 1758{
1748#if 0 1759#if 0
1749 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1750 { 1761 {
… …
1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1774 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1775 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1776 */ 1787 */
1777void 1788void ecb_cold
1778rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1779{ 1790{
1780 screen.charset = set; 1791 screen.charset = set;
1781 set_font_style (); 1792 set_font_style ();
1782} 1793}
… …
1803 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1804 1815
1805/* 1816/*
1806 * refresh matching text. 1817 * refresh matching text.
1807 */ 1818 */
1808bool 1819bool ecb_cold
1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1810{ 1821{
1811 bool found = false; 1822 bool found = false;
1812 1823
1813 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1832 PART_BEG = 0, 1843 PART_BEG = 0,
1833 PART_END, 1844 PART_END,
1834 RC_COUNT 1845 RC_COUNT
1835}; 1846};
1836 1847
1837void 1848void ecb_hot
1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1839{ 1850{
1840 int i; 1851 int i;
1841 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1842 1853
… …
1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1969#endif 1980#endif
1970} 1981}
1971 1982
1972/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1973void 1984void ecb_cold
1974rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1975{ 1986{
1976#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1977 int nrows, row_start; 1988 int nrows, row_start;
1978 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
2027/* 2038/*
2028 * Refresh the screen 2039 * Refresh the screen
2029 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2030 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2031 */ 2042 */
2032void 2043void ecb_hot
2033rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2034{ 2045{
2035 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2036 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2037 int i; /* tmp */ 2048 int i; /* tmp */
2038#ifndef NO_CURSORCOLOR
2039 rend_t cc1; /* store colours at cursor position (s) */
2040#endif
2041 rend_t *crp; // cursor rendition pointer
2042 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2043 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2053 int cursorwidth;
2044 2054
2045 want_refresh = 0; /* screen is current */ 2055 want_refresh = 0; /* screen is current */
2046 2056
2047 if (refresh_type == NO_REFRESH || !mapped) 2057 if (refresh_type == NO_REFRESH || !mapped)
2048 return; 2058 return;
… …
2052 */ 2062 */
2053 refresh_count = 0; 2063 refresh_count = 0;
2054 2064
2055 unsigned int old_screen_flags = screen.flags; 2065 unsigned int old_screen_flags = screen.flags;
2056 bool have_bg = 0; 2066 bool have_bg = 0;
2057#ifdef HAVE_BG_PIXMAP 2067#ifdef HAVE_IMG
2058 have_bg = bg_pixmap != None; 2068 have_bg = bg_img != 0;
2059#endif 2069#endif
2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2070 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2061 2071
2062 /* 2072 /*
2063 * B: reverse any characters which are selected 2073 * B: reverse any characters which are selected
… …
2073 2083
2074 /* 2084 /*
2075 * C: set the cursor character (s) 2085 * C: set the cursor character (s)
2076 */ 2086 */
2077 { 2087 {
2078 bool setoldcursor;
2079
2080#ifdef CURSOR_BLINK 2088#ifdef CURSOR_BLINK
2081 if (hidden_cursor) 2089 if (hidden_cursor)
2082 showcursor = 0; 2090 showcursor = 0;
2083#endif 2091#endif
2084 2092
… …
2087 int col = screen.cur.col; 2095 int col = screen.cur.col;
2088 2096
2089 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2097 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2090 col--; 2098 col--;
2091 2099
2100 cursorwidth = 1;
2101 while (col + cursorwidth < ncol
2102 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2103 cursorwidth++;
2104
2092 crp = &ROW(screen.cur.row).r[col]; 2105 cur_rend = ROW(screen.cur.row).r[col];
2106 cur_col = col;
2093 2107
2094#ifndef NO_CURSORCOLOR 2108#ifndef NO_CURSORCOLOR
2095 cc1 = *crp & (RS_fgMask | RS_bgMask);
2096 if (ISSET_PIXCOLOR (Color_cursor)) 2109 if (ISSET_PIXCOLOR (Color_cursor))
2097 ccol1 = Color_cursor; 2110 ccol1 = Color_cursor;
2098 else 2111 else
2099#endif 2112#endif
2100#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2113#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2114 ccol2 = Color_bg; 2127 ccol2 = Color_bg;
2115#endif 2128#endif
2116 2129
2117 if (focus) 2130 if (focus)
2118 { 2131 {
2132 rend_t rend = cur_rend;
2133
2119 if (option (Opt_cursorUnderline)) 2134 if (option (Opt_cursorUnderline))
2120 *crp ^= RS_Uline; 2135 rend ^= RS_Uline;
2121 else 2136 else
2122 { 2137 {
2123 *crp ^= RS_RVid; 2138 rend ^= RS_RVid;
2124 *crp = SET_FGCOLOR (*crp, ccol1); 2139 rend = SET_FGCOLOR (rend, ccol1);
2125 *crp = SET_BGCOLOR (*crp, ccol2); 2140 rend = SET_BGCOLOR (rend, ccol2);
2126 } 2141 }
2142
2143 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2127 } 2144 }
2128 } 2145 }
2129 2146
2130 /* make sure no outline cursor is left around */ 2147 /* make sure no outline cursor is left around */
2131 setoldcursor = 0;
2132 if (ocrow != -1) 2148 if (ocrow != -1)
2133 { 2149 {
2134 if (screen.cur.row - view_start != ocrow 2150 if (screen.cur.row - view_start != ocrow
2135 || screen.cur.col != oldcursor.col) 2151 || screen.cur.col != oldcursor.col)
2136 { 2152 {
2137 if (ocrow < nrow 2153 if (ocrow < nrow
2138 && oldcursor.col < ncol) 2154 && oldcursor.col < ncol)
2139 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2155 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2140
2141 if (focus || !showcursor)
2142 oldcursor.row = -1;
2143 else
2144 setoldcursor = 1;
2145 } 2156 }
2146 } 2157 }
2147 else if (!focus)
2148 setoldcursor = 1;
2149 2158
2150 if (setoldcursor) 2159 // save the current cursor coordinates if the cursor is visible
2160 // and the window is unfocused, so as to clear the outline cursor
2161 // in the next refresh if the cursor moves
2162 if (showcursor && !focus && screen.cur.row - view_start < nrow)
2151 { 2163 {
2152 if (screen.cur.row - view_start >= nrow)
2153 oldcursor.row = -1;
2154 else
2155 {
2156 oldcursor.row = screen.cur.row - view_start; 2164 oldcursor.row = screen.cur.row - view_start;
2157 oldcursor.col = screen.cur.col; 2165 oldcursor.col = screen.cur.col;
2158 }
2159 } 2166 }
2167 else
2168 oldcursor.row = -1;
2160 } 2169 }
2161 2170
2162#ifndef NO_SLOW_LINK_SUPPORT 2171#ifndef NO_SLOW_LINK_SUPPORT
2163 /* 2172 /*
2164 * D: CopyArea pass - very useful for slower links 2173 * D: CopyArea pass - very useful for slower links
… …
2430 else 2439 else
2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2440 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2432 2441
2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2442 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2434 { 2443 {
2444 if (showcursor && focus && row == screen.cur.row
2445 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2446 XSetForeground (dpy, gc, pix_colors[ccol1]);
2447 else
2435#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2436 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2437 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2438 else 2451 else
2439#endif 2452#endif
… …
2450 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2451 */ 2464 */
2452 if (showcursor) 2465 if (showcursor)
2453 { 2466 {
2454 if (focus) 2467 if (focus)
2455 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2456 if (option (Opt_cursorUnderline))
2457 *crp ^= RS_Uline;
2458 else
2459 {
2460 *crp ^= RS_RVid;
2461#ifndef NO_CURSORCOLOR
2462 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2463#endif
2464 }
2465 }
2466 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2467 { 2470 {
2468 int cursorwidth = 1;
2469 int col = oldcursor.col;
2470
2471 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2472 col--;
2473
2474 while (col + cursorwidth < ncol
2475 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2476 cursorwidth++;
2477
2478#ifndef NO_CURSORCOLOR
2479 if (ISSET_PIXCOLOR (Color_cursor))
2480 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2481 else
2482#endif
2483 XSetForeground (dpy, gc, pix_colors[ccol1]); 2471 XSetForeground (dpy, gc, pix_colors[ccol1]);
2484 2472
2485 XDrawRectangle (dpy, vt, gc, 2473 XDrawRectangle (dpy, vt, gc,
2486 Col2Pixel (col), 2474 Col2Pixel (cur_col),
2487 Row2Pixel (oldcursor.row), 2475 Row2Pixel (oldcursor.row),
2488 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2476 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2489 (unsigned int) (Height2Pixel (1) - 1)); 2477 (unsigned int) (Height2Pixel (1) - 1));
2490 } 2478 }
2491 } 2479 }
… …
2503 screen.flags = old_screen_flags; 2491 screen.flags = old_screen_flags;
2504 num_scr = 0; 2492 num_scr = 0;
2505 num_scr_allow = 1; 2493 num_scr_allow = 1;
2506} 2494}
2507 2495
2508void 2496void ecb_cold
2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2497rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2510{ 2498{
2511 if (!l.valid ()) 2499 if (!l.valid ())
2512 return; 2500 return;
2513 2501
… …
2515 2503
2516 for (int i = ncol; i--; ) 2504 for (int i = ncol; i--; )
2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2505 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2518} 2506}
2519 2507
2520void 2508void ecb_cold
2521rxvt_term::scr_remap_chars () NOTHROW 2509rxvt_term::scr_remap_chars () NOTHROW
2522{ 2510{
2523 for (int i = total_rows; i--; ) 2511 for (int i = total_rows; i--; )
2524 scr_remap_chars (row_buf [i]); 2512 scr_remap_chars (row_buf [i]);
2525 2513
… …
2528 scr_remap_chars (drawn_buf [i]); 2516 scr_remap_chars (drawn_buf [i]);
2529 scr_remap_chars (swap_buf [i]); 2517 scr_remap_chars (swap_buf [i]);
2530 } 2518 }
2531} 2519}
2532 2520
2533void 2521void ecb_cold
2534rxvt_term::scr_recolour (bool refresh) NOTHROW 2522rxvt_term::scr_recolour (bool refresh) NOTHROW
2535{ 2523{
2536 bool transparent = false; 2524 bool transparent = false;
2537 2525
2538#ifdef HAVE_BG_PIXMAP 2526#ifdef HAVE_IMG
2539 if (bg_pixmap != None) 2527 if (bg_img != 0)
2540 { 2528 {
2541# ifdef ENABLE_TRANSPARENCY 2529# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT) 2530 if (bg_flags & BG_IS_TRANSPARENT)
2543 { 2531 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2532 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2533 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2546 2534
2547 transparent = true; 2535 transparent = true;
2548 } 2536 }
2549 else 2537 else
2550# endif 2538# endif
2551 { 2539 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2541 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 } 2542 }
2555 } 2543 }
2556 else 2544 else
2557#endif 2545#endif
2558 { 2546 {
… …
2565 if (scrollBar.win) 2553 if (scrollBar.win)
2566 { 2554 {
2567 if (transparent) 2555 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2556 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else 2557 else
2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2571 scrollBar.state = SB_STATE_IDLE; 2559 scrollBar.state = SB_STATE_IDLE;
2572 scrollBar.show (0); 2560 scrollBar.show (0);
2573 } 2561 }
2574 2562
2575 if (refresh) 2563 if (refresh)
… …
2641 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2629 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2642 srp[col] ^= rstyle; 2630 srp[col] ^= rstyle;
2643} 2631}
2644 2632
2645/* ------------------------------------------------------------------------- */ 2633/* ------------------------------------------------------------------------- */
2646void 2634void ecb_hot
2647rxvt_term::scr_reverse_selection () NOTHROW 2635rxvt_term::scr_reverse_selection () NOTHROW
2648{ 2636{
2649 if (selection.op 2637 if (selection.op
2650 && current_screen == selection.screen 2638 && current_screen == selection.screen
2651 && selection.end.row >= view_start) 2639 && selection.end.row >= view_start)
… …
2692 || (check_more == 1 2680 || (check_more == 1
2693 && current_screen == selection.screen 2681 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2682 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end))) 2683 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 CLEAR_ALL_SELECTION (); 2684 CLEAR_ALL_SELECTION ();
2685}
2686
2687void
2688rxvt_term::selection_changed () NOTHROW
2689{
2690 line_t &r1 = ROW (selection.beg.row);
2691 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2692 --selection.beg.col;
2693
2694 line_t &r2 = ROW (selection.end.row);
2695 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2696 ++selection.end.col;
2697
2698 want_refresh = 1;
2697} 2699}
2698 2700
2699/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2700/* 2702/*
2701 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
… …
2942/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
2943/* 2945/*
2944 * 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
2945 * EXT: button 1 press 2947 * EXT: button 1 press
2946 */ 2948 */
2947void 2949void ecb_cold
2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2949{ 2951{
2950 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
2951 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
2952 2954
… …
2971 2973
2972/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
2973/* 2975/*
2974 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
2975 */ 2977 */
2976void 2978void ecb_cold
2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2978{ 2980{
2979 want_refresh = 1; 2981 want_refresh = 1;
2980 2982
2981 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3004 * Word select: select text for 2 clicks 3006 * Word select: select text for 2 clicks
3005 * We now only find out the boundary in one direction 3007 * We now only find out the boundary in one direction
3006 */ 3008 */
3007 3009
3008/* 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 */
3009#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3010 (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)))
3011#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3012 3014
3013void 3015void ecb_cold
3014rxvt_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
3015{ 3017{
3016 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3017 row_col_t bound; 3019 row_col_t bound;
3018 text_t *stp; 3020 text_t *stp;
… …
3092 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3093 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3094 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3095 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3096 */ 3098 */
3097void 3099void ecb_cold
3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3099{ 3101{
3100 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3101 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3102 3104
… …
3128 3130
3129/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3130/* 3132/*
3131 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3132 */ 3134 */
3133void 3135void ecb_cold
3134rxvt_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
3135{ 3137{
3136 row_col_t pos; 3138 row_col_t pos;
3137 enum { 3139 enum {
3138 LEFT, RIGHT 3140 LEFT, RIGHT
3139 } closeto = RIGHT; 3141 } closeto = RIGHT;
3140
3141 want_refresh = 1;
3142 3142
3143 switch (selection.op) 3143 switch (selection.op)
3144 { 3144 {
3145 case SELECTION_INIT: 3145 case SELECTION_INIT:
3146 CLEAR_SELECTION (); 3146 CLEAR_SELECTION ();
… …
3326 3326
3327#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3328 if (selection.rect && selection.beg.col > selection.end.col) 3328 if (selection.rect && selection.beg.col > selection.end.col)
3329 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3330#endif 3330#endif
3331
3332 selection_changed ();
3331} 3333}
3332 3334
3333#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3334void 3336void ecb_cold
3335rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3336{ 3338{
3337 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3338 text_t *stp; 3340 text_t *stp;
3339 3341
… …
3377/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3378/* 3380/*
3379 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3380 * EXT: button 3 double click 3382 * EXT: button 3 double click
3381 */ 3383 */
3382void 3384void ecb_cold
3383rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3384{ 3386{
3385 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3387} 3389}
… …
3389/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3390/* 3392/*
3391 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3392 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3393 */ 3395 */
3394void 3396void ecb_cold
3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3396{ 3398{
3397 Atom property = rq.property == None ? rq.target : rq.property; 3399 Atom property = rq.property == None ? rq.target : rq.property;
3398 XSelectionEvent ev; 3400 XSelectionEvent ev;
3399 3401
… …
3532 3534
3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3534} 3536}
3535 3537
3536/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3537#ifdef USE_XIM 3539#if USE_XIM
3538void 3540void ecb_cold
3539rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3540{ 3542{
3541 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3542 3544
3543 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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