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.413 by root, Wed Jan 18 12:39:14 2012 UTC vs.
Revision 1.429 by root, Sun Jan 13 20:11:21 2013 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
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
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = prev_swap_buf [row].l;
274 { 289 }
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 290
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 291 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 292 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 293 int q = total_rows; // rewrapped row
285 294
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 302 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 303
295 do 304 do
296 { 305 {
297 p = MOD (p - 1, prev_total_rows); 306 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 307 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 308 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 309 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 310
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 311 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 312 {
304 p = MOD (p - 1, prev_total_rows); 313 p = MOD (p - 1, prev_total_rows);
305 314
306 plines++; 315 plines++;
307 llen += prev_ncol; 316 llen += prev_ncol;
… …
320 329
321 // re-assemble the full line by destination lines 330 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 331 for (int qrow = q; qlines--; qrow++)
323 { 332 {
324 qline = row_buf + qrow; 333 qline = row_buf + qrow;
325 lalloc (*qline); 334 qline->alloc (); // redundant with next line
326 qline->l = ncol; 335 qline->l = ncol;
327 qline->is_longer (1); 336 qline->is_longer (1);
328 337
329 int qcol = 0; 338 int qcol = 0;
330 339
… …
345 // this seems to upset applications/shells/readline 354 // this seems to upset applications/shells/readline
346 // least. 355 // least.
347 if (prow == ocur.row) 356 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 357 screen.cur.row = q - (total_rows - nrow);
349 358
350 line_t &pline = old_buf [prow]; 359 line_t &pline = prev_row_buf [prow];
351 360
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 361 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 362
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 363 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 364 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 385 {
377 // if no scrollback exists (yet), wing, instead of wrap 386 // if no scrollback exists (yet), wing, instead of wrap
378 387
379 for (int row = min (nrow, prev_nrow); row--; ) 388 for (int row = min (nrow, prev_nrow); row--; )
380 { 389 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 390 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 391 line_t &dst = row_buf [row];
383 392
384 qline = pline; 393 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 394
395 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
396 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
397 dst.l = common_col;
386 } 398 }
387 399
388 for (int row = prev_nrow; row < nrow; row++) 400 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 401 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 402
393 term_start = 0; 403 term_start = 0;
394 } 404 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 405
400 clamp_it (screen.cur.row, 0, nrow - 1); 406 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 407 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 408 }
403 409
410 for (int row = nrow; row--; )
411 {
412 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
413 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
414 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
415 }
416
417 chunk_free (prev_chunk, prev_chunk_size);
418
404 free (tabs); 419 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 420 tabs = (char *)rxvt_malloc (ncol);
406 421
407 for (int col = ncol; col--; ) 422 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 423 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 430 tt_winch ();
416 431
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 432 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 433}
419 434
420/* ------------------------------------------------------------------------- */ 435void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 436rxvt_term::scr_release () NOTHROW
426{ 437{
427 if (row_buf) 438 chunk_free (chunk, chunk_size);
428 { 439 chunk = 0;
429 delete talloc; talloc = 0; 440 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 441
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); 442 free (tabs);
438 tabs = 0; 443 tabs = 0;
439 }
440} 444}
441 445
442/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
443/* 447/*
444 * Hard/Soft reset 448 * Hard/Soft reset
445 */ 449 */
446void 450void ecb_cold
447rxvt_term::scr_poweron () 451rxvt_term::scr_poweron ()
448{ 452{
449 scr_release (); 453 scr_release ();
454
450 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 456 rvideo_mode = false;
452 scr_soft_reset (); 457 scr_soft_reset ();
453 scr_reset (); 458 scr_reset ();
454 459
455 scr_clear (true); 460 scr_clear (true);
456 scr_refresh (); 461 scr_refresh ();
457} 462}
458 463
459void 464void ecb_cold
460rxvt_term::scr_soft_reset () NOTHROW 465rxvt_term::scr_soft_reset () NOTHROW
461{ 466{
462 /* only affects modes, nothing drastic such as clearing the screen */ 467 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 468#if ENABLE_OVERLAY
464 scr_overlay_off (); 469 scr_overlay_off ();
… …
630/* 635/*
631 * Scroll text between <row1> and <row2> inclusive, by <count> lines 636 * Scroll text between <row1> and <row2> inclusive, by <count> lines
632 * count positive ==> scroll up 637 * count positive ==> scroll up
633 * count negative ==> scroll down 638 * count negative ==> scroll down
634 */ 639 */
635int 640int ecb_hot
636rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 641rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
637{ 642{
638 if (count == 0 || (row1 > row2)) 643 if (count == 0 || (row1 > row2))
639 return 0; 644 return 0;
640 645
… …
774 779
775/* ------------------------------------------------------------------------- */ 780/* ------------------------------------------------------------------------- */
776/* 781/*
777 * Add text given in <str> of length <len> to screen struct 782 * Add text given in <str> of length <len> to screen struct
778 */ 783 */
779void 784void ecb_hot
780rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
781{ 786{
782 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
783 return; 788 return;
784 789
… …
1134 * XTERM_SEQ: ESC 6 1139 * XTERM_SEQ: ESC 6
1135 * Move cursor left in row. If we're at the left boundary, shift everything 1140 * Move cursor left in row. If we're at the left boundary, shift everything
1136 * in that row right. Clear left column. 1141 * in that row right. Clear left column.
1137 */ 1142 */
1138#if !ENABLE_MINIMAL 1143#if !ENABLE_MINIMAL
1139void 1144void ecb_cold
1140rxvt_term::scr_backindex () NOTHROW 1145rxvt_term::scr_backindex () NOTHROW
1141{ 1146{
1142 if (screen.cur.col > 0) 1147 if (screen.cur.col > 0)
1143 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1148 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1144 else 1149 else
… …
1151 * XTERM_SEQ: ESC 9 1156 * XTERM_SEQ: ESC 9
1152 * Move cursor right in row. If we're at the right boundary, shift everything 1157 * Move cursor right in row. If we're at the right boundary, shift everything
1153 * in that row left. Clear right column. 1158 * in that row left. Clear right column.
1154 */ 1159 */
1155#if !ENABLE_MINIMAL 1160#if !ENABLE_MINIMAL
1156void 1161void ecb_cold
1157rxvt_term::scr_forwardindex () NOTHROW 1162rxvt_term::scr_forwardindex () NOTHROW
1158{ 1163{
1159 if (screen.cur.col < ncol - 1) 1164 if (screen.cur.col < ncol - 1)
1160 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1165 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1161 else 1166 else
… …
1412/* ------------------------------------------------------------------------- */ 1417/* ------------------------------------------------------------------------- */
1413/* 1418/*
1414 * Fill the screen with `E's 1419 * Fill the screen with `E's
1415 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1420 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1416 */ 1421 */
1417void 1422void ecb_cold
1418rxvt_term::scr_E () NOTHROW 1423rxvt_term::scr_E () NOTHROW
1419{ 1424{
1420 rend_t fs; 1425 rend_t fs;
1421 1426
1422 want_refresh = 1; 1427 want_refresh = 1;
… …
1586/* ------------------------------------------------------------------------- */ 1591/* ------------------------------------------------------------------------- */
1587/* 1592/*
1588 * Set the scrolling region 1593 * Set the scrolling region
1589 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1594 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1590 */ 1595 */
1591void 1596void ecb_cold
1592rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1597rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1593{ 1598{
1594 max_it (top, 0); 1599 max_it (top, 0);
1595 min_it (bot, nrow - 1); 1600 min_it (bot, nrow - 1);
1596 1601
… …
1606/* 1611/*
1607 * Make the cursor visible/invisible 1612 * Make the cursor visible/invisible
1608 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1613 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1609 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1614 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1610 */ 1615 */
1611void 1616void ecb_cold
1612rxvt_term::scr_cursor_visible (int mode) NOTHROW 1617rxvt_term::scr_cursor_visible (int mode) NOTHROW
1613{ 1618{
1614 want_refresh = 1; 1619 want_refresh = 1;
1615 1620
1616 if (mode) 1621 if (mode)
… …
1623/* 1628/*
1624 * Set/unset automatic wrapping 1629 * Set/unset automatic wrapping
1625 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1630 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1626 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1631 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1627 */ 1632 */
1628void 1633void ecb_cold
1629rxvt_term::scr_autowrap (int mode) NOTHROW 1634rxvt_term::scr_autowrap (int mode) NOTHROW
1630{ 1635{
1631 if (mode) 1636 if (mode)
1632 screen.flags |= Screen_Autowrap; 1637 screen.flags |= Screen_Autowrap;
1633 else 1638 else
… …
1642 * Relative mode: line numbers are relative to top margin of scrolling region 1647 * Relative mode: line numbers are relative to top margin of scrolling region
1643 * and the cursor cannot be moved outside. 1648 * and the cursor cannot be moved outside.
1644 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1649 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1645 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1650 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1646 */ 1651 */
1647void 1652void ecb_cold
1648rxvt_term::scr_relative_origin (int mode) NOTHROW 1653rxvt_term::scr_relative_origin (int mode) NOTHROW
1649{ 1654{
1650 if (mode) 1655 if (mode)
1651 screen.flags |= Screen_Relative; 1656 screen.flags |= Screen_Relative;
1652 else 1657 else
… …
1659/* 1664/*
1660 * Set insert/replace mode 1665 * Set insert/replace mode
1661 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1666 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1662 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1667 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1663 */ 1668 */
1664void 1669void ecb_cold
1665rxvt_term::scr_insert_mode (int mode) NOTHROW 1670rxvt_term::scr_insert_mode (int mode) NOTHROW
1666{ 1671{
1667 if (mode) 1672 if (mode)
1668 screen.flags |= Screen_Insert; 1673 screen.flags |= Screen_Insert;
1669 else 1674 else
… …
1675 * Set/Unset tabs 1680 * Set/Unset tabs
1676 * XTERM_SEQ: Set tab at current column : ESC H 1681 * XTERM_SEQ: Set tab at current column : ESC H
1677 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1682 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1678 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1683 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1679 */ 1684 */
1680void 1685void ecb_cold
1681rxvt_term::scr_set_tab (int mode) NOTHROW 1686rxvt_term::scr_set_tab (int mode) NOTHROW
1682{ 1687{
1683 if (mode < 0) 1688 if (mode < 0)
1684 memset (tabs, 0, ncol); 1689 memset (tabs, 0, ncol);
1685 else if (screen.cur.col < ncol) 1690 else if (screen.cur.col < ncol)
… …
1704 if (rvideo_state != on) 1709 if (rvideo_state != on)
1705 { 1710 {
1706 rvideo_state = on; 1711 rvideo_state = on;
1707 1712
1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1709#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_IMG
1710 if (bg_pixmap == None) 1715 if (bg_img == 0)
1711#endif 1716#endif
1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1713 1718
1714 XGCValues gcvalue; 1719 XGCValues gcvalue;
1715 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1724/* ------------------------------------------------------------------------- */ 1729/* ------------------------------------------------------------------------- */
1725/* 1730/*
1726 * Report current cursor position 1731 * Report current cursor position
1727 * XTERM_SEQ: Report position: ESC [ 6 n 1732 * XTERM_SEQ: Report position: ESC [ 6 n
1728 */ 1733 */
1729void 1734void ecb_cold
1730rxvt_term::scr_report_position () NOTHROW 1735rxvt_term::scr_report_position () NOTHROW
1731{ 1736{
1732 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1737 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1733} 1738}
1734 1739
… …
1737 * ------------------------------------------------------------------------- */ 1742 * ------------------------------------------------------------------------- */
1738 1743
1739/* 1744/*
1740 * Set font style 1745 * Set font style
1741 */ 1746 */
1742void 1747void ecb_cold
1743rxvt_term::set_font_style () NOTHROW 1748rxvt_term::set_font_style () NOTHROW
1744{ 1749{
1745#if 0 1750#if 0
1746 switch (charsets [screen.charset]) 1751 switch (charsets [screen.charset])
1747 { 1752 {
… …
1769 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1774 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1770 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1775 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1771 * XTERM_SEQ: Invoke G2 character set: ESC N 1776 * XTERM_SEQ: Invoke G2 character set: ESC N
1772 * XTERM_SEQ: Invoke G3 character set: ESC O 1777 * XTERM_SEQ: Invoke G3 character set: ESC O
1773 */ 1778 */
1774void 1779void ecb_cold
1775rxvt_term::scr_charset_choose (int set) NOTHROW 1780rxvt_term::scr_charset_choose (int set) NOTHROW
1776{ 1781{
1777 screen.charset = set; 1782 screen.charset = set;
1778 set_font_style (); 1783 set_font_style ();
1779} 1784}
… …
1800 * ------------------------------------------------------------------------- */ 1805 * ------------------------------------------------------------------------- */
1801 1806
1802/* 1807/*
1803 * refresh matching text. 1808 * refresh matching text.
1804 */ 1809 */
1805bool 1810bool ecb_cold
1806rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1811rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1807{ 1812{
1808 bool found = false; 1813 bool found = false;
1809 1814
1810 for (int i = 0; i < nrow; i++) 1815 for (int i = 0; i < nrow; i++)
… …
1829 PART_BEG = 0, 1834 PART_BEG = 0,
1830 PART_END, 1835 PART_END,
1831 RC_COUNT 1836 RC_COUNT
1832}; 1837};
1833 1838
1834void 1839void ecb_hot
1835rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1840rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1836{ 1841{
1837 int i; 1842 int i;
1838 row_col_t rc[RC_COUNT]; 1843 row_col_t rc[RC_COUNT];
1839 1844
… …
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1966#endif 1971#endif
1967} 1972}
1968 1973
1969/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1970void 1975void ecb_cold
1971rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1972{ 1977{
1973#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1974 int nrows, row_start; 1979 int nrows, row_start;
1975 FILE *fd = popen_printer (); 1980 FILE *fd = popen_printer ();
… …
2024/* 2029/*
2025 * Refresh the screen 2030 * Refresh the screen
2026 * drawn_text/drawn_rend contain the screen information before the update. 2031 * drawn_text/drawn_rend contain the screen information before the update.
2027 * screen.text/screen.rend contain what the screen will change to. 2032 * screen.text/screen.rend contain what the screen will change to.
2028 */ 2033 */
2029void 2034void ecb_hot
2030rxvt_term::scr_refresh () NOTHROW 2035rxvt_term::scr_refresh () NOTHROW
2031{ 2036{
2032 int16_t col, row, /* column/row we're processing */ 2037 int16_t col, row, /* column/row we're processing */
2033 ocrow; /* old cursor row */ 2038 ocrow; /* old cursor row */
2034 int i; /* tmp */ 2039 int i; /* tmp */
… …
2049 */ 2054 */
2050 refresh_count = 0; 2055 refresh_count = 0;
2051 2056
2052 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2053 bool have_bg = 0; 2058 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_IMG
2055 have_bg = bg_pixmap != None; 2060 have_bg = bg_img != 0;
2056#endif 2061#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2063
2059 /* 2064 /*
2060 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
… …
2481 2486
2482 XDrawRectangle (dpy, vt, gc, 2487 XDrawRectangle (dpy, vt, gc,
2483 Col2Pixel (col), 2488 Col2Pixel (col),
2484 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2485 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2486 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2487 } 2492 }
2488 } 2493 }
2489 2494
2490 /* 2495 /*
2491 * H: cleanup selection 2496 * H: cleanup selection
… …
2500 screen.flags = old_screen_flags; 2505 screen.flags = old_screen_flags;
2501 num_scr = 0; 2506 num_scr = 0;
2502 num_scr_allow = 1; 2507 num_scr_allow = 1;
2503} 2508}
2504 2509
2505void 2510void ecb_cold
2506rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2507{ 2512{
2508 if (!l.t) 2513 if (!l.valid ())
2509 return; 2514 return;
2510 2515
2511 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2512 2517
2513 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
2514 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2519 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2515} 2520}
2516 2521
2517void 2522void ecb_cold
2518rxvt_term::scr_remap_chars () NOTHROW 2523rxvt_term::scr_remap_chars () NOTHROW
2519{ 2524{
2520 for (int i = total_rows; i--; ) 2525 for (int i = total_rows; i--; )
2521 scr_remap_chars (row_buf [i]); 2526 scr_remap_chars (row_buf [i]);
2522 2527
… …
2525 scr_remap_chars (drawn_buf [i]); 2530 scr_remap_chars (drawn_buf [i]);
2526 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2527 } 2532 }
2528} 2533}
2529 2534
2530void 2535void ecb_cold
2531rxvt_term::scr_recolour (bool refresh) NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2532{ 2537{
2533 bool transparent = false; 2538 bool transparent = false;
2534 2539
2535#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_IMG
2536 if (bg_pixmap != None) 2541 if (bg_img != 0)
2537 { 2542 {
2538# ifdef ENABLE_TRANSPARENCY 2543# if ENABLE_TRANSPARENCY
2539 if (bg_flags & BG_IS_TRANSPARENT) 2544 if (bg_flags & BG_IS_TRANSPARENT)
2540 { 2545 {
2541 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2546 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2542 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2543 2548
2544 transparent = true; 2549 transparent = true;
2545 } 2550 }
2546 else 2551 else
2547# endif 2552# endif
2548 { 2553 {
2549 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2550 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2555 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2551 } 2556 }
2552 } 2557 }
2553 else 2558 else
2554#endif 2559#endif
2555 { 2560 {
… …
2562 if (scrollBar.win) 2567 if (scrollBar.win)
2563 { 2568 {
2564 if (transparent) 2569 if (transparent)
2565 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2566 else 2571 else
2567 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2568 scrollBar.state = SB_STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2569 scrollBar.show (0); 2574 scrollBar.show (0);
2570 } 2575 }
2571 2576
2572 if (refresh) 2577 if (refresh)
… …
2638 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2643 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2639 srp[col] ^= rstyle; 2644 srp[col] ^= rstyle;
2640} 2645}
2641 2646
2642/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2643void 2648void ecb_hot
2644rxvt_term::scr_reverse_selection () NOTHROW 2649rxvt_term::scr_reverse_selection () NOTHROW
2645{ 2650{
2646 if (selection.op 2651 if (selection.op
2647 && current_screen == selection.screen 2652 && current_screen == selection.screen
2648 && selection.end.row >= view_start) 2653 && selection.end.row >= view_start)
… …
2939/* ------------------------------------------------------------------------- */ 2944/* ------------------------------------------------------------------------- */
2940/* 2945/*
2941 * 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
2942 * EXT: button 1 press 2947 * EXT: button 1 press
2943 */ 2948 */
2944void 2949void ecb_cold
2945rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2950rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2946{ 2951{
2947 clicks = ((clicks - 1) % 3) + 1; 2952 clicks = ((clicks - 1) % 3) + 1;
2948 selection.clicks = clicks; /* save clicks so extend will work */ 2953 selection.clicks = clicks; /* save clicks so extend will work */
2949 2954
… …
2968 2973
2969/* ------------------------------------------------------------------------- */ 2974/* ------------------------------------------------------------------------- */
2970/* 2975/*
2971 * Mark a selection at the specified col/row 2976 * Mark a selection at the specified col/row
2972 */ 2977 */
2973void 2978void ecb_cold
2974rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2979rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2975{ 2980{
2976 want_refresh = 1; 2981 want_refresh = 1;
2977 2982
2978 selection.mark.row = row + view_start; 2983 selection.mark.row = row + view_start;
… …
3005/* 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 */
3006#define DELIMIT_TEXT(x) \ 3011#define DELIMIT_TEXT(x) \
3007 (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)))
3008#define DELIMIT_REND(x) 1 3013#define DELIMIT_REND(x) 1
3009 3014
3010void 3015void ecb_cold
3011rxvt_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
3012{ 3017{
3013 int col, row, dirnadd, tcol, trow, w1, w2; 3018 int col, row, dirnadd, tcol, trow, w1, w2;
3014 row_col_t bound; 3019 row_col_t bound;
3015 text_t *stp; 3020 text_t *stp;
… …
3089 * EXT: button 3 press; button 1 or 3 drag 3094 * EXT: button 3 press; button 1 or 3 drag
3090 * flag == 0 ==> button 1 3095 * flag == 0 ==> button 1
3091 * flag == 1 ==> button 3 press 3096 * flag == 1 ==> button 3 press
3092 * flag == 2 ==> button 3 motion 3097 * flag == 2 ==> button 3 motion
3093 */ 3098 */
3094void 3099void ecb_cold
3095rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3100rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3096{ 3101{
3097 int col = clamp (Pixel2Col (x), 0, ncol); 3102 int col = clamp (Pixel2Col (x), 0, ncol);
3098 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3103 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3099 3104
… …
3125 3130
3126/* ------------------------------------------------------------------------- */ 3131/* ------------------------------------------------------------------------- */
3127/* 3132/*
3128 * Extend the selection to the specified col/row 3133 * Extend the selection to the specified col/row
3129 */ 3134 */
3130void 3135void ecb_cold
3131rxvt_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
3132{ 3137{
3133 row_col_t pos; 3138 row_col_t pos;
3134 enum { 3139 enum {
3135 LEFT, RIGHT 3140 LEFT, RIGHT
… …
3326 ::swap (selection.beg.col, selection.end.col); 3331 ::swap (selection.beg.col, selection.end.col);
3327#endif 3332#endif
3328} 3333}
3329 3334
3330#if !ENABLE_MINIMAL 3335#if !ENABLE_MINIMAL
3331void 3336void ecb_cold
3332rxvt_term::selection_remove_trailing_spaces () NOTHROW 3337rxvt_term::selection_remove_trailing_spaces () NOTHROW
3333{ 3338{
3334 int32_t end_col, end_row; 3339 int32_t end_col, end_row;
3335 text_t *stp; 3340 text_t *stp;
3336 3341
… …
3374/* ------------------------------------------------------------------------- */ 3379/* ------------------------------------------------------------------------- */
3375/* 3380/*
3376 * Double click on button 3 when already selected 3381 * Double click on button 3 when already selected
3377 * EXT: button 3 double click 3382 * EXT: button 3 double click
3378 */ 3383 */
3379void 3384void ecb_cold
3380rxvt_term::selection_rotate (int x, int y) NOTHROW 3385rxvt_term::selection_rotate (int x, int y) NOTHROW
3381{ 3386{
3382 selection.clicks = selection.clicks % 3 + 1; 3387 selection.clicks = selection.clicks % 3 + 1;
3383 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3388 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3384} 3389}
… …
3386/* ------------------------------------------------------------------------- */ 3391/* ------------------------------------------------------------------------- */
3387/* 3392/*
3388 * Respond to a request for our current selection 3393 * Respond to a request for our current selection
3389 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3390 */ 3395 */
3391void 3396void ecb_cold
3392rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3393{ 3398{
3394 Atom property = rq.property == None ? rq.target : rq.property; 3399 Atom property = rq.property == None ? rq.target : rq.property;
3395 XSelectionEvent ev; 3400 XSelectionEvent ev;
3396 3401
… …
3529 3534
3530 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3535 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3531} 3536}
3532 3537
3533/* ------------------------------------------------------------------------- */ 3538/* ------------------------------------------------------------------------- */
3534#ifdef USE_XIM 3539#if USE_XIM
3535void 3540void ecb_cold
3536rxvt_term::im_set_position (XPoint &pos) NOTHROW 3541rxvt_term::im_set_position (XPoint &pos) NOTHROW
3537{ 3542{
3538 XWindowAttributes xwa; 3543 XWindowAttributes xwa;
3539 3544
3540 XGetWindowAttributes (dpy, vt, &xwa); 3545 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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