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

Diff Legend

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