ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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