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.412 by root, Wed Jan 18 12:26:59 2012 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 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 ();
… …
157/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
160 158
161void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
162rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
163{ 195{
164#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
165 scr_overlay_off (); 197 scr_overlay_off ();
166#endif 198#endif
… …
192 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
193 225
194 screen.tscroll = 0; 226 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
196 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
197 if (!row_buf) 239 if (!prev_row_buf)
198 { 240 {
199 /* 241 /*
200 * 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
201 */ 243 */
202 top_row = 0; 244 top_row = 0;
203 term_start = 0; 245 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 246
219 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
245 { 273 {
246 /* 274 /*
247 * add or delete rows as appropriate 275 * add or delete rows as appropriate
248 */ 276 */
249 277
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--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
268 { 279 {
269 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 282
273 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
274 { 287 }
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 288
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
285 292
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 301
295 do 302 do
296 { 303 {
297 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 306 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 308
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 310 {
304 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
305 312
306 plines++; 313 plines++;
307 llen += prev_ncol; 314 llen += prev_ncol;
… …
320 327
321 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
323 { 330 {
324 qline = row_buf + qrow; 331 qline = row_buf + qrow;
325 lalloc (*qline); 332 qline->alloc (); // redundant with next line
326 qline->l = ncol; 333 qline->l = ncol;
327 qline->is_longer (1); 334 qline->is_longer (1);
328 335
329 int qcol = 0; 336 int qcol = 0;
330 337
… …
345 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
346 // least. 353 // least.
347 if (prow == ocur.row) 354 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
349 356
350 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
351 358
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 360
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 383 {
377 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
378 385
379 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
380 { 387 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
383 390
384 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
386 } 395 }
387 396
388 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 399
393 term_start = 0; 400 term_start = 0;
394 } 401 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 402
400 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 405 }
403 406
407 for (int row = nrow; row--; )
408 {
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 }
413
414 printf ("pc %p\n", prev_chunk);//D
415 chunk_free (prev_chunk, prev_chunk_size);
416
404 free (tabs); 417 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 418 tabs = (char *)rxvt_malloc (ncol);
406 419
407 for (int col = ncol; col--; ) 420 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 421 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 428 tt_winch ();
416 429
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 431}
419 432
420/* ------------------------------------------------------------------------- */ 433void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 434rxvt_term::scr_release () NOTHROW
426{ 435{
427 if (row_buf) 436 chunk_free (chunk, chunk_size);
428 { 437 chunk = 0;
429 delete talloc; talloc = 0; 438 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 439
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); 440 free (tabs);
438 tabs = 0; 441 tabs = 0;
439 }
440} 442}
441 443
442/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
443/* 445/*
444 * Hard/Soft reset 446 * Hard/Soft reset
445 */ 447 */
446void 448void ecb_cold
447rxvt_term::scr_poweron () 449rxvt_term::scr_poweron ()
448{ 450{
449 scr_release (); 451 scr_release ();
452
450 prev_nrow = prev_ncol = 0; 453 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 454 rvideo_mode = false;
452 scr_soft_reset (); 455 scr_soft_reset ();
453 scr_reset (); 456 scr_reset ();
454 457
455 scr_clear (true); 458 scr_clear (true);
456 scr_refresh (); 459 scr_refresh ();
457} 460}
458 461
459void 462void ecb_cold
460rxvt_term::scr_soft_reset () 463rxvt_term::scr_soft_reset () NOTHROW
461{ 464{
462 /* only affects modes, nothing drastic such as clearing the screen */ 465 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 466#if ENABLE_OVERLAY
464 scr_overlay_off (); 467 scr_overlay_off ();
465#endif 468#endif
… …
520 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
522} 525}
523 526
524void 527void
525rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
526{ 529{
527 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
528 return; 531 return;
529 532
530 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
630/* 633/*
631 * Scroll text between <row1> and <row2> inclusive, by <count> lines 634 * Scroll text between <row1> and <row2> inclusive, by <count> lines
632 * count positive ==> scroll up 635 * count positive ==> scroll up
633 * count negative ==> scroll down 636 * count negative ==> scroll down
634 */ 637 */
635int 638int ecb_hot
636rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
637{ 640{
638 if (count == 0 || (row1 > row2)) 641 if (count == 0 || (row1 > row2))
639 return 0; 642 return 0;
640 643
… …
774 777
775/* ------------------------------------------------------------------------- */ 778/* ------------------------------------------------------------------------- */
776/* 779/*
777 * Add text given in <str> of length <len> to screen struct 780 * Add text given in <str> of length <len> to screen struct
778 */ 781 */
779void 782void ecb_hot
780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
781{ 784{
782 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
783 return; 786 return;
784 787
… …
1134 * XTERM_SEQ: ESC 6 1137 * XTERM_SEQ: ESC 6
1135 * Move cursor left in row. If we're at the left boundary, shift everything 1138 * Move cursor left in row. If we're at the left boundary, shift everything
1136 * in that row right. Clear left column. 1139 * in that row right. Clear left column.
1137 */ 1140 */
1138#if !ENABLE_MINIMAL 1141#if !ENABLE_MINIMAL
1139void 1142void ecb_cold
1140rxvt_term::scr_backindex () NOTHROW 1143rxvt_term::scr_backindex () NOTHROW
1141{ 1144{
1142 if (screen.cur.col > 0) 1145 if (screen.cur.col > 0)
1143 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1144 else 1147 else
… …
1151 * XTERM_SEQ: ESC 9 1154 * XTERM_SEQ: ESC 9
1152 * Move cursor right in row. If we're at the right boundary, shift everything 1155 * Move cursor right in row. If we're at the right boundary, shift everything
1153 * in that row left. Clear right column. 1156 * in that row left. Clear right column.
1154 */ 1157 */
1155#if !ENABLE_MINIMAL 1158#if !ENABLE_MINIMAL
1156void 1159void ecb_cold
1157rxvt_term::scr_forwardindex () NOTHROW 1160rxvt_term::scr_forwardindex () NOTHROW
1158{ 1161{
1159 if (screen.cur.col < ncol - 1) 1162 if (screen.cur.col < ncol - 1)
1160 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1161 else 1164 else
… …
1412/* ------------------------------------------------------------------------- */ 1415/* ------------------------------------------------------------------------- */
1413/* 1416/*
1414 * Fill the screen with `E's 1417 * Fill the screen with `E's
1415 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1416 */ 1419 */
1417void 1420void ecb_cold
1418rxvt_term::scr_E () NOTHROW 1421rxvt_term::scr_E () NOTHROW
1419{ 1422{
1420 rend_t fs; 1423 rend_t fs;
1421 1424
1422 want_refresh = 1; 1425 want_refresh = 1;
… …
1586/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1587/* 1590/*
1588 * Set the scrolling region 1591 * Set the scrolling region
1589 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1590 */ 1593 */
1591void 1594void ecb_cold
1592rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1593{ 1596{
1594 max_it (top, 0); 1597 max_it (top, 0);
1595 min_it (bot, nrow - 1); 1598 min_it (bot, nrow - 1);
1596 1599
… …
1606/* 1609/*
1607 * Make the cursor visible/invisible 1610 * Make the cursor visible/invisible
1608 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1609 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1610 */ 1613 */
1611void 1614void ecb_cold
1612rxvt_term::scr_cursor_visible (int mode) NOTHROW 1615rxvt_term::scr_cursor_visible (int mode) NOTHROW
1613{ 1616{
1614 want_refresh = 1; 1617 want_refresh = 1;
1615 1618
1616 if (mode) 1619 if (mode)
… …
1623/* 1626/*
1624 * Set/unset automatic wrapping 1627 * Set/unset automatic wrapping
1625 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1626 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1627 */ 1630 */
1628void 1631void ecb_cold
1629rxvt_term::scr_autowrap (int mode) NOTHROW 1632rxvt_term::scr_autowrap (int mode) NOTHROW
1630{ 1633{
1631 if (mode) 1634 if (mode)
1632 screen.flags |= Screen_Autowrap; 1635 screen.flags |= Screen_Autowrap;
1633 else 1636 else
… …
1642 * Relative mode: line numbers are relative to top margin of scrolling region 1645 * Relative mode: line numbers are relative to top margin of scrolling region
1643 * and the cursor cannot be moved outside. 1646 * and the cursor cannot be moved outside.
1644 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1645 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1646 */ 1649 */
1647void 1650void ecb_cold
1648rxvt_term::scr_relative_origin (int mode) NOTHROW 1651rxvt_term::scr_relative_origin (int mode) NOTHROW
1649{ 1652{
1650 if (mode) 1653 if (mode)
1651 screen.flags |= Screen_Relative; 1654 screen.flags |= Screen_Relative;
1652 else 1655 else
… …
1659/* 1662/*
1660 * Set insert/replace mode 1663 * Set insert/replace mode
1661 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1662 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1663 */ 1666 */
1664void 1667void ecb_cold
1665rxvt_term::scr_insert_mode (int mode) NOTHROW 1668rxvt_term::scr_insert_mode (int mode) NOTHROW
1666{ 1669{
1667 if (mode) 1670 if (mode)
1668 screen.flags |= Screen_Insert; 1671 screen.flags |= Screen_Insert;
1669 else 1672 else
… …
1675 * Set/Unset tabs 1678 * Set/Unset tabs
1676 * XTERM_SEQ: Set tab at current column : ESC H 1679 * XTERM_SEQ: Set tab at current column : ESC H
1677 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1678 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1679 */ 1682 */
1680void 1683void ecb_cold
1681rxvt_term::scr_set_tab (int mode) NOTHROW 1684rxvt_term::scr_set_tab (int mode) NOTHROW
1682{ 1685{
1683 if (mode < 0) 1686 if (mode < 0)
1684 memset (tabs, 0, ncol); 1687 memset (tabs, 0, ncol);
1685 else if (screen.cur.col < ncol) 1688 else if (screen.cur.col < ncol)
… …
1705 { 1708 {
1706 rvideo_state = on; 1709 rvideo_state = on;
1707 1710
1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1709#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_BG_PIXMAP
1710 if (bg_pixmap == None) 1713 if (bg_img == 0)
1711#endif 1714#endif
1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1713 1716
1714 XGCValues gcvalue; 1717 XGCValues gcvalue;
1715 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
1724/* ------------------------------------------------------------------------- */ 1727/* ------------------------------------------------------------------------- */
1725/* 1728/*
1726 * Report current cursor position 1729 * Report current cursor position
1727 * XTERM_SEQ: Report position: ESC [ 6 n 1730 * XTERM_SEQ: Report position: ESC [ 6 n
1728 */ 1731 */
1729void 1732void ecb_cold
1730rxvt_term::scr_report_position () NOTHROW 1733rxvt_term::scr_report_position () NOTHROW
1731{ 1734{
1732 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1733} 1736}
1734 1737
… …
1737 * ------------------------------------------------------------------------- */ 1740 * ------------------------------------------------------------------------- */
1738 1741
1739/* 1742/*
1740 * Set font style 1743 * Set font style
1741 */ 1744 */
1742void 1745void ecb_cold
1743rxvt_term::set_font_style () NOTHROW 1746rxvt_term::set_font_style () NOTHROW
1744{ 1747{
1745#if 0 1748#if 0
1746 switch (charsets [screen.charset]) 1749 switch (charsets [screen.charset])
1747 { 1750 {
… …
1769 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1770 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1771 * XTERM_SEQ: Invoke G2 character set: ESC N 1774 * XTERM_SEQ: Invoke G2 character set: ESC N
1772 * XTERM_SEQ: Invoke G3 character set: ESC O 1775 * XTERM_SEQ: Invoke G3 character set: ESC O
1773 */ 1776 */
1774void 1777void ecb_cold
1775rxvt_term::scr_charset_choose (int set) NOTHROW 1778rxvt_term::scr_charset_choose (int set) NOTHROW
1776{ 1779{
1777 screen.charset = set; 1780 screen.charset = set;
1778 set_font_style (); 1781 set_font_style ();
1779} 1782}
… …
1800 * ------------------------------------------------------------------------- */ 1803 * ------------------------------------------------------------------------- */
1801 1804
1802/* 1805/*
1803 * refresh matching text. 1806 * refresh matching text.
1804 */ 1807 */
1805bool 1808bool ecb_cold
1806rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1807{ 1810{
1808 bool found = false; 1811 bool found = false;
1809 1812
1810 for (int i = 0; i < nrow; i++) 1813 for (int i = 0; i < nrow; i++)
… …
1829 PART_BEG = 0, 1832 PART_BEG = 0,
1830 PART_END, 1833 PART_END,
1831 RC_COUNT 1834 RC_COUNT
1832}; 1835};
1833 1836
1834void 1837void ecb_hot
1835rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1836{ 1839{
1837 int i; 1840 int i;
1838 row_col_t rc[RC_COUNT]; 1841 row_col_t rc[RC_COUNT];
1839 1842
… …
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1966#endif 1969#endif
1967} 1970}
1968 1971
1969/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1970void 1973void ecb_cold
1971rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1972{ 1975{
1973#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1974 int nrows, row_start; 1977 int nrows, row_start;
1975 FILE *fd = popen_printer (); 1978 FILE *fd = popen_printer ();
… …
2024/* 2027/*
2025 * Refresh the screen 2028 * Refresh the screen
2026 * drawn_text/drawn_rend contain the screen information before the update. 2029 * drawn_text/drawn_rend contain the screen information before the update.
2027 * screen.text/screen.rend contain what the screen will change to. 2030 * screen.text/screen.rend contain what the screen will change to.
2028 */ 2031 */
2029void 2032void ecb_hot
2030rxvt_term::scr_refresh () NOTHROW 2033rxvt_term::scr_refresh () NOTHROW
2031{ 2034{
2032 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
2033 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
2034 int i; /* tmp */ 2037 int i; /* tmp */
… …
2050 refresh_count = 0; 2053 refresh_count = 0;
2051 2054
2052 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2053 bool have_bg = 0; 2056 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_BG_PIXMAP
2055 have_bg = bg_pixmap != None; 2058 have_bg = bg_img != 0;
2056#endif 2059#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2061
2059 /* 2062 /*
2060 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
2481 2484
2482 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2483 Col2Pixel (col), 2486 Col2Pixel (col),
2484 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2485 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2486 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2487 } 2490 }
2488 } 2491 }
2489 2492
2490 /* 2493 /*
2491 * H: cleanup selection 2494 * H: cleanup selection
… …
2500 screen.flags = old_screen_flags; 2503 screen.flags = old_screen_flags;
2501 num_scr = 0; 2504 num_scr = 0;
2502 num_scr_allow = 1; 2505 num_scr_allow = 1;
2503} 2506}
2504 2507
2505void 2508void ecb_cold
2506rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2507{ 2510{
2508 if (!l.t) 2511 if (!l.valid ())
2509 return; 2512 return;
2510 2513
2511 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2512 2515
2513 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
2514 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2515} 2518}
2516 2519
2517void 2520void ecb_cold
2518rxvt_term::scr_remap_chars () NOTHROW 2521rxvt_term::scr_remap_chars () NOTHROW
2519{ 2522{
2520 for (int i = total_rows; i--; ) 2523 for (int i = total_rows; i--; )
2521 scr_remap_chars (row_buf [i]); 2524 scr_remap_chars (row_buf [i]);
2522 2525
… …
2525 scr_remap_chars (drawn_buf [i]); 2528 scr_remap_chars (drawn_buf [i]);
2526 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2527 } 2530 }
2528} 2531}
2529 2532
2530void 2533void ecb_cold
2531rxvt_term::scr_recolour (bool refresh) NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2532{ 2535{
2533 bool transparent = false; 2536 bool transparent = false;
2534 2537
2535#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_BG_PIXMAP
2536 if (bg_pixmap != None) 2539 if (bg_img != 0)
2537 { 2540 {
2538# ifdef ENABLE_TRANSPARENCY 2541# if ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT) 2542 if (bg_flags & BG_IS_TRANSPARENT)
2540 { 2543 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2544 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2543 2546
2544 transparent = true; 2547 transparent = true;
2545 } 2548 }
2546 else 2549 else
2547# endif 2550# endif
2548 { 2551 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2553 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2551 } 2554 }
2552 } 2555 }
2553 else 2556 else
2554#endif 2557#endif
2555 { 2558 {
… …
2638 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2641 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2639 srp[col] ^= rstyle; 2642 srp[col] ^= rstyle;
2640} 2643}
2641 2644
2642/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2643void 2646void ecb_hot
2644rxvt_term::scr_reverse_selection () NOTHROW 2647rxvt_term::scr_reverse_selection () NOTHROW
2645{ 2648{
2646 if (selection.op 2649 if (selection.op
2647 && current_screen == selection.screen 2650 && current_screen == selection.screen
2648 && selection.end.row >= view_start) 2651 && selection.end.row >= view_start)
… …
2939/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2940/* 2943/*
2941 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
2942 * EXT: button 1 press 2945 * EXT: button 1 press
2943 */ 2946 */
2944void 2947void ecb_cold
2945rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2946{ 2949{
2947 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2948 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2949 2952
… …
2968 2971
2969/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
2970/* 2973/*
2971 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
2972 */ 2975 */
2973void 2976void ecb_cold
2974rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2975{ 2978{
2976 want_refresh = 1; 2979 want_refresh = 1;
2977 2980
2978 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3005/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3006#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3007 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3008#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3009 3012
3010void 3013void ecb_cold
3011rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3012{ 3015{
3013 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3014 row_col_t bound; 3017 row_col_t bound;
3015 text_t *stp; 3018 text_t *stp;
… …
3089 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3090 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3091 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3092 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3093 */ 3096 */
3094void 3097void ecb_cold
3095rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3096{ 3099{
3097 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3098 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3099 3102
… …
3125 3128
3126/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3127/* 3130/*
3128 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3129 */ 3132 */
3130void 3133void ecb_cold
3131rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3132{ 3135{
3133 row_col_t pos; 3136 row_col_t pos;
3134 enum { 3137 enum {
3135 LEFT, RIGHT 3138 LEFT, RIGHT
… …
3326 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3327#endif 3330#endif
3328} 3331}
3329 3332
3330#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3331void 3334void ecb_cold
3332rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3333{ 3336{
3334 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3335 text_t *stp; 3338 text_t *stp;
3336 3339
… …
3374/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3375/* 3378/*
3376 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3377 * EXT: button 3 double click 3380 * EXT: button 3 double click
3378 */ 3381 */
3379void 3382void ecb_cold
3380rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3381{ 3384{
3382 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3383 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3384} 3387}
… …
3386/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3387/* 3390/*
3388 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3389 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3390 */ 3393 */
3391void 3394void ecb_cold
3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3393{ 3396{
3394 Atom property = rq.property == None ? rq.target : rq.property; 3397 Atom property = rq.property == None ? rq.target : rq.property;
3395 XSelectionEvent ev; 3398 XSelectionEvent ev;
3396 3399
… …
3529 3532
3530 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3531} 3534}
3532 3535
3533/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3534#ifdef USE_XIM 3537#if USE_XIM
3535void 3538void ecb_cold
3536rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3537{ 3540{
3538 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3539 3542
3540 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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