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.414 by sf-exg, Tue Jan 24 17:05:05 2012 UTC vs.
Revision 1.433 by sf-exg, Thu Jan 31 08:07:14 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;
… …
98 96
99/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
100void 98void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102{ 100{
103 if (!l.t) 101 if (!l.valid ())
104 { 102 {
105 lalloc (l); 103 l.alloc ();
106 col = 0; 104 col = 0;
107 width = ncol; 105 width = ncol;
108 } 106 }
109 107
110 l.touch (); 108 l.touch ();
… …
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 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
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
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
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
164#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
165 scr_overlay_off (); 217 scr_overlay_off ();
166#endif 218#endif
… …
192 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
193 245
194 screen.tscroll = 0; 246 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
196 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
197 if (!row_buf) 257 if (!prev_row_buf)
198 { 258 {
199 /* 259 /*
200 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 261 */
202 top_row = 0; 262 top_row = 0;
203 term_start = 0; 263 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 264
219 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
245 { 291 {
246 /* 292 /*
247 * add or delete rows as appropriate 293 * add or delete rows as appropriate
248 */ 294 */
249 295
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
268 { 297 {
269 lresize (drawn_buf[row]); 298 copy_line (drawn_buf [row], prev_drawn_buf [row]);
270 lresize (swap_buf [row]); 299 copy_line (swap_buf [row], prev_swap_buf [row]);
271 }
272
273 for (int row = prev_nrow; row < nrow; row++)
274 { 300 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
281 301
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
285 305
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 313 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 314
295 do 315 do
296 { 316 {
297 p = MOD (p - 1, prev_total_rows); 317 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 318 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 319 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 320 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 321
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 322 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 323 {
304 p = MOD (p - 1, prev_total_rows); 324 p = MOD (p - 1, prev_total_rows);
305 325
306 plines++; 326 plines++;
307 llen += prev_ncol; 327 llen += prev_ncol;
… …
320 340
321 // re-assemble the full line by destination lines 341 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 342 for (int qrow = q; qlines--; qrow++)
323 { 343 {
324 qline = row_buf + qrow; 344 qline = row_buf + qrow;
325 lalloc (*qline); 345 qline->alloc (); // redundant with next line
326 qline->l = ncol; 346 qline->l = ncol;
327 qline->is_longer (1); 347 qline->is_longer (1);
328 348
329 int qcol = 0; 349 int qcol = 0;
330 350
… …
345 // this seems to upset applications/shells/readline 365 // this seems to upset applications/shells/readline
346 // least. 366 // least.
347 if (prow == ocur.row) 367 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 368 screen.cur.row = q - (total_rows - nrow);
349 369
350 line_t &pline = old_buf [prow]; 370 line_t &pline = prev_row_buf [prow];
351 371
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 372 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 373
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 374 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 375 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 396 {
377 // if no scrollback exists (yet), wing, instead of wrap 397 // if no scrollback exists (yet), wing, instead of wrap
378 398
379 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
380 { 400 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 402 line_t &dst = row_buf [row];
383 403
384 qline = pline; 404 copy_line (dst, src);
385 lresize (qline);
386 } 405 }
387 406
388 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 409
393 term_start = 0; 410 term_start = 0;
394 } 411 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 412
400 clamp_it (screen.cur.row, 0, nrow - 1); 413 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 414 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 415 }
403 416
417 for (int row = nrow; row--; )
418 {
419 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
420 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
421 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
422 }
423
424 chunk_free (prev_chunk, prev_chunk_size);
425
404 free (tabs); 426 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 427 tabs = (char *)rxvt_malloc (ncol);
406 428
407 for (int col = ncol; col--; ) 429 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 430 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 437 tt_winch ();
416 438
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 439 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 440}
419 441
420/* ------------------------------------------------------------------------- */ 442void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 443rxvt_term::scr_release () NOTHROW
426{ 444{
427 if (row_buf) 445 chunk_free (chunk, chunk_size);
428 { 446 chunk = 0;
429 delete talloc; talloc = 0; 447 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 448
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 449 free (tabs);
438 tabs = 0; 450 tabs = 0;
439 }
440} 451}
441 452
442/* ------------------------------------------------------------------------- */ 453/* ------------------------------------------------------------------------- */
443/* 454/*
444 * Hard/Soft reset 455 * Hard/Soft reset
445 */ 456 */
446void 457void ecb_cold
447rxvt_term::scr_poweron () 458rxvt_term::scr_poweron ()
448{ 459{
449 scr_release (); 460 scr_release ();
461
450 prev_nrow = prev_ncol = 0; 462 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 463 rvideo_mode = false;
452 scr_soft_reset (); 464 scr_soft_reset ();
453 scr_reset (); 465 scr_reset ();
454 466
455 scr_clear (true); 467 scr_clear (true);
456 scr_refresh (); 468 scr_refresh ();
457} 469}
458 470
459void 471void ecb_cold
460rxvt_term::scr_soft_reset () NOTHROW 472rxvt_term::scr_soft_reset () NOTHROW
461{ 473{
462 /* only affects modes, nothing drastic such as clearing the screen */ 474 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 475#if ENABLE_OVERLAY
464 scr_overlay_off (); 476 scr_overlay_off ();
… …
630/* 642/*
631 * Scroll text between <row1> and <row2> inclusive, by <count> lines 643 * Scroll text between <row1> and <row2> inclusive, by <count> lines
632 * count positive ==> scroll up 644 * count positive ==> scroll up
633 * count negative ==> scroll down 645 * count negative ==> scroll down
634 */ 646 */
635int 647int ecb_hot
636rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
637{ 649{
638 if (count == 0 || (row1 > row2)) 650 if (count == 0 || (row1 > row2))
639 return 0; 651 return 0;
640 652
… …
774 786
775/* ------------------------------------------------------------------------- */ 787/* ------------------------------------------------------------------------- */
776/* 788/*
777 * Add text given in <str> of length <len> to screen struct 789 * Add text given in <str> of length <len> to screen struct
778 */ 790 */
779void 791void ecb_hot
780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
781{ 793{
782 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
783 return; 795 return;
784 796
… …
1134 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1135 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1136 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1137 */ 1149 */
1138#if !ENABLE_MINIMAL 1150#if !ENABLE_MINIMAL
1139void 1151void ecb_cold
1140rxvt_term::scr_backindex () NOTHROW 1152rxvt_term::scr_backindex () NOTHROW
1141{ 1153{
1142 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1143 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1144 else 1156 else
… …
1151 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1152 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1153 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1154 */ 1166 */
1155#if !ENABLE_MINIMAL 1167#if !ENABLE_MINIMAL
1156void 1168void ecb_cold
1157rxvt_term::scr_forwardindex () NOTHROW 1169rxvt_term::scr_forwardindex () NOTHROW
1158{ 1170{
1159 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1160 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1161 else 1173 else
… …
1412/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1413/* 1425/*
1414 * Fill the screen with `E's 1426 * Fill the screen with `E's
1415 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1416 */ 1428 */
1417void 1429void ecb_cold
1418rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () NOTHROW
1419{ 1431{
1420 rend_t fs; 1432 rend_t fs;
1421 1433
1422 want_refresh = 1; 1434 want_refresh = 1;
… …
1586/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1587/* 1599/*
1588 * Set the scrolling region 1600 * Set the scrolling region
1589 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1590 */ 1602 */
1591void 1603void ecb_cold
1592rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1593{ 1605{
1594 max_it (top, 0); 1606 max_it (top, 0);
1595 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1596 1608
… …
1606/* 1618/*
1607 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1608 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1609 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1610 */ 1622 */
1611void 1623void ecb_cold
1612rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1613{ 1625{
1614 want_refresh = 1; 1626 want_refresh = 1;
1615 1627
1616 if (mode) 1628 if (mode)
… …
1623/* 1635/*
1624 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1625 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1626 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1627 */ 1639 */
1628void 1640void ecb_cold
1629rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1630{ 1642{
1631 if (mode) 1643 if (mode)
1632 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1633 else 1645 else
… …
1642 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1643 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1644 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1645 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1646 */ 1658 */
1647void 1659void ecb_cold
1648rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1649{ 1661{
1650 if (mode) 1662 if (mode)
1651 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1652 else 1664 else
… …
1659/* 1671/*
1660 * Set insert/replace mode 1672 * Set insert/replace mode
1661 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1662 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1663 */ 1675 */
1664void 1676void ecb_cold
1665rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1666{ 1678{
1667 if (mode) 1679 if (mode)
1668 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1669 else 1681 else
… …
1675 * Set/Unset tabs 1687 * Set/Unset tabs
1676 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1677 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1678 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1679 */ 1691 */
1680void 1692void ecb_cold
1681rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1682{ 1694{
1683 if (mode < 0) 1695 if (mode < 0)
1684 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1685 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
… …
1704 if (rvideo_state != on) 1716 if (rvideo_state != on)
1705 { 1717 {
1706 rvideo_state = on; 1718 rvideo_state = on;
1707 1719
1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1709#ifdef HAVE_BG_PIXMAP 1721#ifdef HAVE_IMG
1710 if (bg_pixmap == None) 1722 if (bg_img == 0)
1711#endif 1723#endif
1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1713 1725
1714 XGCValues gcvalue; 1726 XGCValues gcvalue;
1715 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
… …
1724/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1725/* 1737/*
1726 * Report current cursor position 1738 * Report current cursor position
1727 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1728 */ 1740 */
1729void 1741void ecb_cold
1730rxvt_term::scr_report_position () NOTHROW 1742rxvt_term::scr_report_position () NOTHROW
1731{ 1743{
1732 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1733} 1745}
1734 1746
… …
1737 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1738 1750
1739/* 1751/*
1740 * Set font style 1752 * Set font style
1741 */ 1753 */
1742void 1754void ecb_cold
1743rxvt_term::set_font_style () NOTHROW 1755rxvt_term::set_font_style () NOTHROW
1744{ 1756{
1745#if 0 1757#if 0
1746 switch (charsets [screen.charset]) 1758 switch (charsets [screen.charset])
1747 { 1759 {
… …
1769 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1770 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1771 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1772 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1773 */ 1785 */
1774void 1786void ecb_cold
1775rxvt_term::scr_charset_choose (int set) NOTHROW 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1776{ 1788{
1777 screen.charset = set; 1789 screen.charset = set;
1778 set_font_style (); 1790 set_font_style ();
1779} 1791}
… …
1800 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1801 1813
1802/* 1814/*
1803 * refresh matching text. 1815 * refresh matching text.
1804 */ 1816 */
1805bool 1817bool ecb_cold
1806rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1807{ 1819{
1808 bool found = false; 1820 bool found = false;
1809 1821
1810 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
… …
1829 PART_BEG = 0, 1841 PART_BEG = 0,
1830 PART_END, 1842 PART_END,
1831 RC_COUNT 1843 RC_COUNT
1832}; 1844};
1833 1845
1834void 1846void ecb_hot
1835rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1836{ 1848{
1837 int i; 1849 int i;
1838 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1839 1851
… …
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1966#endif 1978#endif
1967} 1979}
1968 1980
1969/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1970void 1982void ecb_cold
1971rxvt_term::scr_printscreen (int fullhist) NOTHROW 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1972{ 1984{
1973#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1974 int nrows, row_start; 1986 int nrows, row_start;
1975 FILE *fd = popen_printer (); 1987 FILE *fd = popen_printer ();
… …
2024/* 2036/*
2025 * Refresh the screen 2037 * Refresh the screen
2026 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
2027 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
2028 */ 2040 */
2029void 2041void ecb_hot
2030rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
2031{ 2043{
2032 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
2033 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
2034 int i; /* tmp */ 2046 int i; /* tmp */
2035#ifndef NO_CURSORCOLOR
2036 rend_t cc1; /* store colours at cursor position (s) */
2037#endif
2038 rend_t *crp; // cursor rendition pointer
2039 rend_t ccol1, /* Cursor colour */ 2047 rend_t ccol1, /* Cursor colour */
2040 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
2041 2051
2042 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
2043 2053
2044 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
2045 return; 2055 return;
… …
2049 */ 2059 */
2050 refresh_count = 0; 2060 refresh_count = 0;
2051 2061
2052 unsigned int old_screen_flags = screen.flags; 2062 unsigned int old_screen_flags = screen.flags;
2053 bool have_bg = 0; 2063 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2064#ifdef HAVE_IMG
2055 have_bg = bg_pixmap != None; 2065 have_bg = bg_img != 0;
2056#endif 2066#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2068
2059 /* 2069 /*
2060 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
2084 int col = screen.cur.col; 2094 int col = screen.cur.col;
2085 2095
2086 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2087 col--; 2097 col--;
2088 2098
2089 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2090 2101
2091#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2092 cc1 = *crp & (RS_fgMask | RS_bgMask);
2093 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2094 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2095 else 2105 else
2096#endif 2106#endif
2097#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2111 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2112#endif 2122#endif
2113 2123
2114 if (focus) 2124 if (focus)
2115 { 2125 {
2126 rend_t rend = cur_rend;
2127
2116 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2117 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2118 else 2130 else
2119 { 2131 {
2120 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2121 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2122 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2123 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2124 } 2138 }
2125 } 2139 }
2126 2140
2127 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2128 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2447 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2448 */ 2462 */
2449 if (showcursor) 2463 if (showcursor)
2450 { 2464 {
2451 if (focus) 2465 if (focus)
2452 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2453 if (option (Opt_cursorUnderline))
2454 *crp ^= RS_Uline;
2455 else
2456 {
2457 *crp ^= RS_RVid;
2458#ifndef NO_CURSORCOLOR
2459 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2460#endif
2461 }
2462 }
2463 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2464 { 2468 {
2465 int cursorwidth = 1; 2469 int cursorwidth = 1;
2466 int col = oldcursor.col; 2470 int col = oldcursor.col;
2467 2471
… …
2500 screen.flags = old_screen_flags; 2504 screen.flags = old_screen_flags;
2501 num_scr = 0; 2505 num_scr = 0;
2502 num_scr_allow = 1; 2506 num_scr_allow = 1;
2503} 2507}
2504 2508
2505void 2509void ecb_cold
2506rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2507{ 2511{
2508 if (!l.t) 2512 if (!l.valid ())
2509 return; 2513 return;
2510 2514
2511 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2512 2516
2513 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2514 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2515} 2519}
2516 2520
2517void 2521void ecb_cold
2518rxvt_term::scr_remap_chars () NOTHROW 2522rxvt_term::scr_remap_chars () NOTHROW
2519{ 2523{
2520 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2521 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2522 2526
… …
2525 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2526 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2527 } 2531 }
2528} 2532}
2529 2533
2530void 2534void ecb_cold
2531rxvt_term::scr_recolour (bool refresh) NOTHROW 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2532{ 2536{
2533 bool transparent = false; 2537 bool transparent = false;
2534 2538
2535#ifdef HAVE_BG_PIXMAP 2539#ifdef HAVE_IMG
2536 if (bg_pixmap != None) 2540 if (bg_img != 0)
2537 { 2541 {
2538# ifdef ENABLE_TRANSPARENCY 2542# if ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT) 2543 if (bg_flags & BG_IS_TRANSPARENT)
2540 { 2544 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2545 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2543 2547
2544 transparent = true; 2548 transparent = true;
2545 } 2549 }
2546 else 2550 else
2547# endif 2551# endif
2548 { 2552 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2551 } 2555 }
2552 } 2556 }
2553 else 2557 else
2554#endif 2558#endif
2555 { 2559 {
… …
2562 if (scrollBar.win) 2566 if (scrollBar.win)
2563 { 2567 {
2564 if (transparent) 2568 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else 2570 else
2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2568 scrollBar.state = SB_STATE_IDLE; 2572 scrollBar.state = SB_STATE_IDLE;
2569 scrollBar.show (0); 2573 scrollBar.show (0);
2570 } 2574 }
2571 2575
2572 if (refresh) 2576 if (refresh)
… …
2638 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2642 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2639 srp[col] ^= rstyle; 2643 srp[col] ^= rstyle;
2640} 2644}
2641 2645
2642/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2643void 2647void ecb_hot
2644rxvt_term::scr_reverse_selection () NOTHROW 2648rxvt_term::scr_reverse_selection () NOTHROW
2645{ 2649{
2646 if (selection.op 2650 if (selection.op
2647 && current_screen == selection.screen 2651 && current_screen == selection.screen
2648 && selection.end.row >= view_start) 2652 && selection.end.row >= view_start)
… …
2939/* ------------------------------------------------------------------------- */ 2943/* ------------------------------------------------------------------------- */
2940/* 2944/*
2941 * Mark or select text based upon number of clicks: 1, 2, or 3 2945 * Mark or select text based upon number of clicks: 1, 2, or 3
2942 * EXT: button 1 press 2946 * EXT: button 1 press
2943 */ 2947 */
2944void 2948void ecb_cold
2945rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2949rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2946{ 2950{
2947 clicks = ((clicks - 1) % 3) + 1; 2951 clicks = ((clicks - 1) % 3) + 1;
2948 selection.clicks = clicks; /* save clicks so extend will work */ 2952 selection.clicks = clicks; /* save clicks so extend will work */
2949 2953
… …
2968 2972
2969/* ------------------------------------------------------------------------- */ 2973/* ------------------------------------------------------------------------- */
2970/* 2974/*
2971 * Mark a selection at the specified col/row 2975 * Mark a selection at the specified col/row
2972 */ 2976 */
2973void 2977void ecb_cold
2974rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2978rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2975{ 2979{
2976 want_refresh = 1; 2980 want_refresh = 1;
2977 2981
2978 selection.mark.row = row + view_start; 2982 selection.mark.row = row + view_start;
… …
3005/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3009/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3006#define DELIMIT_TEXT(x) \ 3010#define DELIMIT_TEXT(x) \
3007 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3011 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3008#define DELIMIT_REND(x) 1 3012#define DELIMIT_REND(x) 1
3009 3013
3010void 3014void ecb_cold
3011rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3015rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3012{ 3016{
3013 int col, row, dirnadd, tcol, trow, w1, w2; 3017 int col, row, dirnadd, tcol, trow, w1, w2;
3014 row_col_t bound; 3018 row_col_t bound;
3015 text_t *stp; 3019 text_t *stp;
… …
3089 * EXT: button 3 press; button 1 or 3 drag 3093 * EXT: button 3 press; button 1 or 3 drag
3090 * flag == 0 ==> button 1 3094 * flag == 0 ==> button 1
3091 * flag == 1 ==> button 3 press 3095 * flag == 1 ==> button 3 press
3092 * flag == 2 ==> button 3 motion 3096 * flag == 2 ==> button 3 motion
3093 */ 3097 */
3094void 3098void ecb_cold
3095rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3099rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3096{ 3100{
3097 int col = clamp (Pixel2Col (x), 0, ncol); 3101 int col = clamp (Pixel2Col (x), 0, ncol);
3098 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3102 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3099 3103
… …
3125 3129
3126/* ------------------------------------------------------------------------- */ 3130/* ------------------------------------------------------------------------- */
3127/* 3131/*
3128 * Extend the selection to the specified col/row 3132 * Extend the selection to the specified col/row
3129 */ 3133 */
3130void 3134void ecb_cold
3131rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3135rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3132{ 3136{
3133 row_col_t pos; 3137 row_col_t pos;
3134 enum { 3138 enum {
3135 LEFT, RIGHT 3139 LEFT, RIGHT
… …
3326 ::swap (selection.beg.col, selection.end.col); 3330 ::swap (selection.beg.col, selection.end.col);
3327#endif 3331#endif
3328} 3332}
3329 3333
3330#if !ENABLE_MINIMAL 3334#if !ENABLE_MINIMAL
3331void 3335void ecb_cold
3332rxvt_term::selection_remove_trailing_spaces () NOTHROW 3336rxvt_term::selection_remove_trailing_spaces () NOTHROW
3333{ 3337{
3334 int32_t end_col, end_row; 3338 int32_t end_col, end_row;
3335 text_t *stp; 3339 text_t *stp;
3336 3340
… …
3374/* ------------------------------------------------------------------------- */ 3378/* ------------------------------------------------------------------------- */
3375/* 3379/*
3376 * Double click on button 3 when already selected 3380 * Double click on button 3 when already selected
3377 * EXT: button 3 double click 3381 * EXT: button 3 double click
3378 */ 3382 */
3379void 3383void ecb_cold
3380rxvt_term::selection_rotate (int x, int y) NOTHROW 3384rxvt_term::selection_rotate (int x, int y) NOTHROW
3381{ 3385{
3382 selection.clicks = selection.clicks % 3 + 1; 3386 selection.clicks = selection.clicks % 3 + 1;
3383 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3387 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3384} 3388}
… …
3386/* ------------------------------------------------------------------------- */ 3390/* ------------------------------------------------------------------------- */
3387/* 3391/*
3388 * Respond to a request for our current selection 3392 * Respond to a request for our current selection
3389 * EXT: SelectionRequest 3393 * EXT: SelectionRequest
3390 */ 3394 */
3391void 3395void ecb_cold
3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3396rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3393{ 3397{
3394 Atom property = rq.property == None ? rq.target : rq.property; 3398 Atom property = rq.property == None ? rq.target : rq.property;
3395 XSelectionEvent ev; 3399 XSelectionEvent ev;
3396 3400
… …
3529 3533
3530 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3534 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3531} 3535}
3532 3536
3533/* ------------------------------------------------------------------------- */ 3537/* ------------------------------------------------------------------------- */
3534#ifdef USE_XIM 3538#if USE_XIM
3535void 3539void ecb_cold
3536rxvt_term::im_set_position (XPoint &pos) NOTHROW 3540rxvt_term::im_set_position (XPoint &pos) NOTHROW
3537{ 3541{
3538 XWindowAttributes xwa; 3542 XWindowAttributes xwa;
3539 3543
3540 XGetWindowAttributes (dpy, vt, &xwa); 3544 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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