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.398 by sf-exg, Wed Nov 2 15:11:51 2011 UTC vs.
Revision 1.438 by sf-exg, Mon Mar 25 15:41:07 2013 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
98 96
99/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
100void 98void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102{ 100{
103 if (!l.t) 101 if (!l.valid ())
104 { 102 {
105 lalloc (l); 103 l.alloc ();
106 col = 0; 104 col = 0;
107 width = ncol; 105 width = ncol;
108 } 106 }
109 107
110 l.touch (); 108 l.touch ();
… …
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
164#if ENABLE_OVERLAY 216#if ENABLE_OVERLAY
165 scr_overlay_off (); 217 scr_overlay_off ();
166#endif 218#endif
… …
192 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
193 245
194 screen.tscroll = 0; 246 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
196 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
197 if (!row_buf) 257 if (!prev_row_buf)
198 { 258 {
199 /*
200 * first time called so just malloc everything: don't rely on realloc
201 */
202 top_row = 0; 259 top_row = 0;
203 term_start = 0; 260 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 261
219 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
245 { 288 {
246 /* 289 /*
247 * add or delete rows as appropriate 290 * add or delete rows as appropriate
248 */ 291 */
249 292
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
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 294
267 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
268 { 296 {
269 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
271 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
272 300
273 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
274 { 302 }
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 303
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
285 307
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 316
295 do 317 do
296 { 318 {
297 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 321 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 323
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 325 {
304 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
305 327
306 plines++; 328 plines++;
307 llen += prev_ncol; 329 llen += prev_ncol;
… …
320 342
321 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
323 { 345 {
324 qline = row_buf + qrow; 346 qline = row_buf + qrow;
325 lalloc (*qline); 347 qline->alloc (); // redundant with next line
326 qline->l = ncol; 348 qline->l = ncol;
327 qline->is_longer (1); 349 qline->is_longer (1);
328 350
329 int qcol = 0; 351 int qcol = 0;
330 352
… …
345 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
346 // least. 368 // least.
347 if (prow == ocur.row) 369 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
349 371
350 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
351 373
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 375
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 398 {
377 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
378 400
379 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
380 { 402 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
383 405
384 qline = pline; 406 copy_line (dst, src);
385 lresize (qline);
386 } 407 }
387 408
388 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 411
393 term_start = 0; 412 term_start = 0;
394 } 413 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 414
400 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 417 }
403 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
404 free (tabs); 428 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
406 430
407 for (int col = ncol; col--; ) 431 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 439 tt_winch ();
416 440
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 442}
419 443
420/* ------------------------------------------------------------------------- */ 444void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
426{ 446{
427 if (row_buf) 447 chunk_free (chunk, chunk_size);
428 { 448 chunk = 0;
429 delete talloc; talloc = 0; 449 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 450
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); 451 free (tabs);
438 tabs = 0; 452 tabs = 0;
439 }
440} 453}
441 454
442/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
443/* 456/*
444 * Hard/Soft reset 457 * Hard/Soft reset
445 */ 458 */
446void 459void ecb_cold
447rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
448{ 461{
449 scr_release (); 462 scr_release ();
463
450 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 465 rvideo_mode = false;
452 scr_soft_reset (); 466 scr_soft_reset ();
453 scr_reset (); 467 scr_reset ();
454 468
455 scr_clear (true); 469 scr_clear (true);
456 scr_refresh (); 470 scr_refresh ();
457} 471}
458 472
459void 473void ecb_cold
460rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
461{ 475{
462 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
464 scr_overlay_off (); 478 scr_overlay_off ();
465#endif 479#endif
… …
520 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
522} 536}
523 537
524void 538void
525rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
526{ 540{
527 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
528 return; 542 return;
529 543
530 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
549 return; 563 return;
550 564
551 want_refresh = 1; 565 want_refresh = 1;
552 view_start = 0; 566 view_start = 0;
553 567
554 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
555 574
556 current_screen = scrn; 575 current_screen = scrn;
557 576
558#if NSCREENS 577#if NSCREENS
559 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
625/* 644/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 646 * count positive ==> scroll up
628 * count negative ==> scroll down 647 * count negative ==> scroll down
629 */ 648 */
630int 649int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 651{
633 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
634 return 0; 653 return 0;
635 654
… …
681 } 700 }
682 else 701 else
683 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
684 } 703 }
685 704
705 // move and/or clear selection, if any
706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
708 {
709 selection.beg.row -= count;
710 selection.end.row -= count;
711 selection.mark.row -= count;
712
713 selection_check (0);
714 }
715
686 // finally move the view window, if desired 716 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 718 && view_start != 0
689 && view_start != -saveLines) 719 && view_start != -saveLines)
690 scr_page (UP, count); 720 scr_page (UP, count);
… …
692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 722 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 723 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
694 } 724 }
695 else 725 else
696 { 726 {
727 if (selection.op && current_screen == selection.screen)
728 {
729 if ((selection.beg.row < row1 && selection.end.row > row1)
730 || (selection.beg.row < row2 && selection.end.row > row2)
731 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
732 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
733 || (selection.end.row - count < row1 && selection.end.row >= row1)
734 || (selection.end.row - count > row2 && selection.end.row <= row2))
735 {
736 CLEAR_ALL_SELECTION ();
737 selection.op = SELECTION_CLEAR;
738 }
739 else if (selection.end.row >= row1 && selection.end.row <= row2)
740 {
741 /* move selected region too */
742 selection.beg.row -= count;
743 selection.end.row -= count;
744 selection.mark.row -= count;
745
746 selection_check (0);
747 }
748 }
749
697 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
699 752
700 // sever line above scroll region 753 // sever line above scroll region
701 if (row1) 754 if (row1)
… …
728 l.is_longer (0); 781 l.is_longer (0);
729 l.touch (); 782 l.touch ();
730 } 783 }
731 } 784 }
732 785
733 // move and/or clear selection, if any
734 if (selection.op && current_screen == selection.screen)
735 {
736 if ((selection.beg.row < row1 && selection.end.row > row1)
737 || (selection.beg.row < row2 && selection.end.row > row2)
738 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
739 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
740 || (selection.end.row - count < row1 && selection.end.row >= row1)
741 || (selection.end.row - count > row2 && selection.end.row <= row2))
742 CLEAR_ALL_SELECTION ();
743 else if (selection.end.row >= row1 && selection.end.row <= row2)
744 {
745 /* move selected region too */
746 selection.beg.row -= count;
747 selection.end.row -= count;
748 selection.mark.row -= count;
749
750 selection_check (0);
751 }
752 }
753
754 return count; 786 return count;
755} 787}
756 788
757/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
758/* 790/*
759 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
760 */ 792 */
761void 793void ecb_hot
762rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
763{ 795{
764 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
765 return; 797 return;
766 798
767 unsigned char checksel; 799 bool checksel;
768 unicode_t c; 800 unicode_t c;
769 int ncol = this->ncol; 801 int ncol = this->ncol;
770 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
771 803
772 want_refresh = 1; 804 want_refresh = 1;
… …
1116 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1117 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1118 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1119 */ 1151 */
1120#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1121void 1153void ecb_cold
1122rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1123{ 1155{
1124 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1126 else 1158 else
… …
1133 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1134 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1135 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1136 */ 1168 */
1137#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1138void 1170void ecb_cold
1139rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1140{ 1172{
1141 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1143 else 1175 else
… …
1294 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1295} 1327}
1296 1328
1297/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1298/* 1330/*
1299 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303 */ 1335 */
1304void 1336void
… …
1313 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1314 1346
1315 switch (mode) 1347 switch (mode)
1316 { 1348 {
1317 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1350 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1352 num = nrow - row;
1322 break; 1353 break;
1323 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1355 scr_erase_line (1);
1326 row = 0; 1356 row = 0;
1327 num = screen.cur.row; 1357 num = screen.cur.row;
1328 break; 1358 break;
1329 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1360 row = 0;
1332 num = nrow; 1361 num = nrow;
1333 break; 1362 break;
1334 default: 1363 default:
1335 return; 1364 return;
… …
1352 { 1381 {
1353 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1354 1383
1355 if (mapped) 1384 if (mapped)
1356 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1359 } 1388 }
1360 else 1389 else
1361 { 1390 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1365 { 1394 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1399 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1403 }
1375 } 1404 }
… …
1397/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1398/* 1427/*
1399 * Fill the screen with `E's 1428 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1430 */
1402void 1431void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1404{ 1433{
1405 rend_t fs; 1434 rend_t fs;
1406 1435
1407 want_refresh = 1; 1436 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1409 1438
1410 num_scr_allow = 0; 1439 num_scr_allow = 0;
1411 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1412 1445
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1415 { 1448 {
1416 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1567/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1568/* 1601/*
1569 * Set the scrolling region 1602 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1604 */
1572void 1605void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574{ 1607{
1575 max_it (top, 0); 1608 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1577 1610
… …
1587/* 1620/*
1588 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1624 */
1592void 1625void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594{ 1627{
1595 want_refresh = 1; 1628 want_refresh = 1;
1596 1629
1597 if (mode) 1630 if (mode)
… …
1604/* 1637/*
1605 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1641 */
1609void 1642void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1611{ 1644{
1612 if (mode) 1645 if (mode)
1613 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1614 else 1647 else
… …
1623 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1624 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1660 */
1628void 1661void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1630{ 1663{
1631 if (mode) 1664 if (mode)
1632 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1633 else 1666 else
… …
1640/* 1673/*
1641 * Set insert/replace mode 1674 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1677 */
1645void 1678void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1647{ 1680{
1648 if (mode) 1681 if (mode)
1649 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1650 else 1683 else
… …
1656 * Set/Unset tabs 1689 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1693 */
1661void 1694void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1663{ 1696{
1664 if (mode < 0) 1697 if (mode < 0)
1665 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1685 if (rvideo_state != on) 1718 if (rvideo_state != on)
1686 { 1719 {
1687 rvideo_state = on; 1720 rvideo_state = on;
1688 1721
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1691 if (bg_pixmap == None) 1724 if (bg_img == 0)
1692#endif 1725#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1727
1695 XGCValues gcvalue; 1728 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1705/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1706/* 1739/*
1707 * Report current cursor position 1740 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1742 */
1710void 1743void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1712{ 1745{
1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714} 1747}
1715 1748
… …
1718 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1719 1752
1720/* 1753/*
1721 * Set font style 1754 * Set font style
1722 */ 1755 */
1723void 1756void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1725{ 1758{
1726#if 0 1759#if 0
1727 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1728 { 1761 {
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1787 */
1755void 1788void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1790{
1758 screen.charset = set; 1791 screen.charset = set;
1759 set_font_style (); 1792 set_font_style ();
1760} 1793}
… …
1781 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1782 1815
1783/* 1816/*
1784 * refresh matching text. 1817 * refresh matching text.
1785 */ 1818 */
1786bool 1819bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1821{
1789 bool found = false; 1822 bool found = false;
1790 1823
1791 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1810 PART_BEG = 0, 1843 PART_BEG = 0,
1811 PART_END, 1844 PART_END,
1812 RC_COUNT 1845 RC_COUNT
1813}; 1846};
1814 1847
1815void 1848void ecb_hot
1816rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1817{ 1850{
1818 int i; 1851 int i;
1819 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1820 1853
… …
1857 * Refresh the entire screen 1890 * Refresh the entire screen
1858 */ 1891 */
1859void 1892void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1894{
1862 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1896}
1864 1897
1865/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1866/* 1899/*
1867 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
… …
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947#endif 1980#endif
1948} 1981}
1949 1982
1950/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1951void 1984void ecb_cold
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1986{
1954#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1955 int nrows, row_start; 1988 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
2005/* 2038/*
2006 * Refresh the screen 2039 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2042 */
2010void 2043void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2012{ 2045{
2013 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2048 int i; /* tmp */
2016#ifndef NO_CURSORCOLOR
2017 rend_t cc1; /* store colours at cursor position (s) */
2018#endif
2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2053 int cursorwidth;
2022 2054
2023 want_refresh = 0; /* screen is current */ 2055 want_refresh = 0; /* screen is current */
2024 2056
2025 if (refresh_type == NO_REFRESH || !mapped) 2057 if (refresh_type == NO_REFRESH || !mapped)
2026 return; 2058 return;
… …
2029 * A: set up vars 2061 * A: set up vars
2030 */ 2062 */
2031 refresh_count = 0; 2063 refresh_count = 0;
2032 2064
2033 unsigned int old_screen_flags = screen.flags; 2065 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2066 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2067#ifdef HAVE_IMG
2036 have_bg = bg_pixmap != None; 2068 have_bg = bg_img != 0;
2037#endif 2069#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2070 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2071
2040 /* 2072 /*
2041 * B: reverse any characters which are selected 2073 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2077 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2078#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2079 scr_swap_overlay ();
2048#endif 2080#endif
2049 2081
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2082 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2083
2052 /* 2084 /*
2053 * C: set the cursor character (s) 2085 * C: set the cursor character (s)
2054 */ 2086 */
2055 { 2087 {
2056 unsigned char setoldcursor; 2088 bool setoldcursor;
2057 2089
2058#ifdef CURSOR_BLINK 2090#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2091 if (hidden_cursor)
2060 showcursor = 0; 2092 showcursor = 0;
2061#endif 2093#endif
… …
2065 int col = screen.cur.col; 2097 int col = screen.cur.col;
2066 2098
2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2099 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2068 col--; 2100 col--;
2069 2101
2102 cursorwidth = 1;
2103 while (col + cursorwidth < ncol
2104 && ROW(screen.cur.row).t[col + cursorwidth] == NOCHAR)
2105 cursorwidth++;
2106
2070 crp = &ROW(screen.cur.row).r[col]; 2107 cur_rend = ROW(screen.cur.row).r[col];
2108 cur_col = col;
2071 2109
2072#ifndef NO_CURSORCOLOR 2110#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2111 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2112 ccol1 = Color_cursor;
2076 else 2113 else
2077#endif 2114#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2115#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2092 ccol2 = Color_bg; 2129 ccol2 = Color_bg;
2093#endif 2130#endif
2094 2131
2095 if (focus) 2132 if (focus)
2096 { 2133 {
2134 rend_t rend = cur_rend;
2135
2097 if (option (Opt_cursorUnderline)) 2136 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2137 rend ^= RS_Uline;
2099 else 2138 else
2100 { 2139 {
2101 *crp ^= RS_RVid; 2140 rend ^= RS_RVid;
2102 *crp = SET_FGCOLOR (*crp, ccol1); 2141 rend = SET_FGCOLOR (rend, ccol1);
2103 *crp = SET_BGCOLOR (*crp, ccol2); 2142 rend = SET_BGCOLOR (rend, ccol2);
2104 } 2143 }
2144
2145 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2105 } 2146 }
2106 } 2147 }
2107 2148
2108 /* make sure no outline cursor is left around */ 2149 /* make sure no outline cursor is left around */
2109 setoldcursor = 0; 2150 setoldcursor = 0;
… …
2148 { 2189 {
2149 int16_t nits; 2190 int16_t nits;
2150 int i = num_scr; 2191 int i = num_scr;
2151 int j; 2192 int j;
2152 int len, wlen; 2193 int len, wlen;
2153 dLocal (int, num_scr);
2154 2194
2155 j = nrow; 2195 j = nrow;
2156 wlen = len = -1; 2196 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2197 row = i > 0 ? 0 : j - 1;
2158 2198
… …
2409 else 2449 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2450 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2451
2412 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) 2452 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2453 {
2454 if (showcursor && focus && row == screen.cur.row
2455 && IN_RANGE_EXC (col, cur_col, cur_col + cursorwidth))
2456 XSetForeground (dpy, gc, pix_colors[ccol1]);
2457 else
2414#if ENABLE_FRILLS 2458#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2459 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2460 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2461 else
2418#endif 2462#endif
… …
2429 * G: cleanup cursor and display outline cursor if necessary 2473 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2474 */
2431 if (showcursor) 2475 if (showcursor)
2432 { 2476 {
2433 if (focus) 2477 if (focus)
2434 { 2478 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435 if (option (Opt_cursorUnderline))
2436 *crp ^= RS_Uline;
2437 else
2438 {
2439 *crp ^= RS_RVid;
2440#ifndef NO_CURSORCOLOR
2441 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2442#endif
2443 }
2444 }
2445 else if (oldcursor.row >= 0) 2479 else if (oldcursor.row >= 0)
2446 { 2480 {
2447 int cursorwidth = 1;
2448 int col = oldcursor.col;
2449
2450 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2451 col--;
2452
2453 while (col + cursorwidth < ncol
2454 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2455 cursorwidth++;
2456
2457#ifndef NO_CURSORCOLOR
2458 if (ISSET_PIXCOLOR (Color_cursor))
2459 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2460 else
2461#endif
2462 XSetForeground (dpy, gc, pix_colors[ccol1]); 2481 XSetForeground (dpy, gc, pix_colors[ccol1]);
2463 2482
2464 XDrawRectangle (dpy, vt, gc, 2483 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2484 Col2Pixel (cur_col),
2466 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2488 }
2470 } 2489 }
2471 2490
2472 /* 2491 /*
2473 * H: cleanup selection 2492 * H: cleanup selection
… …
2482 screen.flags = old_screen_flags; 2501 screen.flags = old_screen_flags;
2483 num_scr = 0; 2502 num_scr = 0;
2484 num_scr_allow = 1; 2503 num_scr_allow = 1;
2485} 2504}
2486 2505
2487void 2506void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2508{
2490 if (!l.t) 2509 if (!l.valid ())
2491 return; 2510 return;
2492 2511
2493 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
2494 2513
2495 for (int i = ncol; i--; ) 2514 for (int i = ncol; i--; )
2496 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]));
2497} 2516}
2498 2517
2499void 2518void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2519rxvt_term::scr_remap_chars () NOTHROW
2501{ 2520{
2502 for (int i = total_rows; i--; ) 2521 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2522 scr_remap_chars (row_buf [i]);
2504 2523
… …
2507 scr_remap_chars (drawn_buf [i]); 2526 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2509 } 2528 }
2510} 2529}
2511 2530
2512void 2531void ecb_cold
2513rxvt_term::scr_recolour (bool refresh) NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2533{
2515 bool transparent = false; 2534 bool transparent = false;
2516 2535
2517#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_IMG
2518 if (bg_pixmap != None) 2537 if (bg_img != 0)
2519 { 2538 {
2520# ifdef ENABLE_TRANSPARENCY 2539# if ENABLE_TRANSPARENCY
2521 if (bg_flags & BG_IS_TRANSPARENT) 2540 if (bg_flags & BG_IS_TRANSPARENT)
2522 { 2541 {
2523 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2542 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2524 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2525 2544
2526 transparent = true; 2545 transparent = true;
2527 } 2546 }
2528 else 2547 else
2529# endif 2548# endif
2530 { 2549 {
2531 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2532 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2551 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2533 } 2552 }
2534 } 2553 }
2535 else 2554 else
2536#endif 2555#endif
2537 { 2556 {
… …
2544 if (scrollBar.win) 2563 if (scrollBar.win)
2545 { 2564 {
2546 if (transparent) 2565 if (transparent)
2547 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2548 else 2567 else
2549 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2550 scrollBar.state = SB_STATE_IDLE; 2569 scrollBar.state = SB_STATE_IDLE;
2551 scrollBar.show (0); 2570 scrollBar.show (0);
2552 } 2571 }
2553 2572
2554 if (refresh) 2573 if (refresh)
… …
2620 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2639 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2621 srp[col] ^= rstyle; 2640 srp[col] ^= rstyle;
2622} 2641}
2623 2642
2624/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2625void 2644void ecb_hot
2626rxvt_term::scr_reverse_selection () NOTHROW 2645rxvt_term::scr_reverse_selection () NOTHROW
2627{ 2646{
2628 if (selection.op 2647 if (selection.op
2629 && current_screen == selection.screen 2648 && current_screen == selection.screen
2630 && selection.end.row >= view_start) 2649 && selection.end.row >= view_start)
… …
2649 */ 2668 */
2650#if 0 2669#if 0
2651void 2670void
2652rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2653{ 2672{
2654 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2655 unsigned int width, towrite; 2674 // relevant code in scr_printscreen
2656 const char r1[] = "\n";
2657
2658 for (row = saveLines + top_row;
2659 row < saveLines + nrow - 1; row++)
2660 {
2661 width = row_buf[row].l >= 0 ? row_buf[row].l
2662 : ncol;
2663 for (towrite = width; towrite; towrite -= wrote)
2664 {
2665 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2666 towrite);
2667 if (wrote < 0)
2668 return; /* XXX: death, no report */
2669 }
2670 if (row_buf[row].l >= 0)
2671 if (write (fd, r1, 1) <= 0)
2672 return; /* XXX: death, no report */
2673 }
2674} 2675}
2675#endif 2676#endif
2676 2677
2677/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2678 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
… …
2680void 2681void
2681rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2682{ 2683{
2683 if (!selection.op) 2684 if (!selection.op)
2684 return; 2685 return;
2685
2686 row_col_t pos;
2687 pos.row = pos.col = 0;
2688 2686
2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2692 || (check_more == 1 2690 || (check_more == 1
2693 && current_screen == selection.screen 2691 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2696 || (check_more == 2
2697 && ROWCOL_IS_BEFORE (selection.beg, pos)
2698 && ROWCOL_IS_AFTER (selection.end, pos))
2699 || (check_more == 3
2700 && ROWCOL_IS_AFTER (selection.end, pos))
2701 || (check_more == 4 /* screen width change */
2702 && (selection.beg.row != selection.end.row
2703 || selection.end.col > ncol)))
2704 CLEAR_ALL_SELECTION (); 2694 CLEAR_ALL_SELECTION ();
2695}
2696
2697void
2698rxvt_term::selection_changed () NOTHROW
2699{
2700 line_t &r1 = ROW (selection.beg.row);
2701 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2702 --selection.beg.col;
2703
2704 line_t &r2 = ROW (selection.end.row);
2705 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2706 ++selection.end.col;
2707
2708 want_refresh = 1;
2705} 2709}
2706 2710
2707/* ------------------------------------------------------------------------- */ 2711/* ------------------------------------------------------------------------- */
2708/* 2712/*
2709 * Paste a selection direct to the command fd 2713 * Paste a selection direct to the command fd
… …
2715 for (unsigned int i = 0; i < len; i++) 2719 for (unsigned int i = 0; i < len; i++)
2716 if (data[i] == C0_LF) 2720 if (data[i] == C0_LF)
2717 data[i] = C0_CR; 2721 data[i] = C0_CR;
2718 2722
2719 if (priv_modes & PrivMode_BracketPaste) 2723 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~"); 2724 tt_printf ("\x1b[200~");
2721 2725
2722 tt_write (data, len); 2726 tt_write (data, len);
2723 2727
2724 if (priv_modes & PrivMode_BracketPaste) 2728 if (priv_modes & PrivMode_BracketPaste)
2725 tt_printf ("\e[201~"); 2729 tt_printf ("\x1b[201~");
2726} 2730}
2727 2731
2728void 2732void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW 2733rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{ 2734{
… …
2950/* ------------------------------------------------------------------------- */ 2954/* ------------------------------------------------------------------------- */
2951/* 2955/*
2952 * Mark or select text based upon number of clicks: 1, 2, or 3 2956 * Mark or select text based upon number of clicks: 1, 2, or 3
2953 * EXT: button 1 press 2957 * EXT: button 1 press
2954 */ 2958 */
2955void 2959void ecb_cold
2956rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2960rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2957{ 2961{
2958 clicks = ((clicks - 1) % 3) + 1; 2962 clicks = ((clicks - 1) % 3) + 1;
2959 selection.clicks = clicks; /* save clicks so extend will work */ 2963 selection.clicks = clicks; /* save clicks so extend will work */
2960 2964
… …
2979 2983
2980/* ------------------------------------------------------------------------- */ 2984/* ------------------------------------------------------------------------- */
2981/* 2985/*
2982 * Mark a selection at the specified col/row 2986 * Mark a selection at the specified col/row
2983 */ 2987 */
2984void 2988void ecb_cold
2985rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2989rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2986{ 2990{
2987 want_refresh = 1; 2991 want_refresh = 1;
2988 2992
2989 selection.mark.row = row + view_start; 2993 selection.mark.row = row + view_start;
… …
3012 * Word select: select text for 2 clicks 3016 * Word select: select text for 2 clicks
3013 * We now only find out the boundary in one direction 3017 * We now only find out the boundary in one direction
3014 */ 3018 */
3015 3019
3016/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3020/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3017#define DELIMIT_TEXT(x) \ 3021#define DELIMIT_TEXT(x) \
3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3022 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3019#define DELIMIT_REND(x) 1 3023#define DELIMIT_REND(x) 1
3020 3024
3021void 3025void ecb_cold
3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3026rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3023{ 3027{
3024 int col, row, dirnadd, tcol, trow, w1, w2; 3028 int col, row, dirnadd, tcol, trow, w1, w2;
3025 row_col_t bound; 3029 row_col_t bound;
3026 text_t *stp; 3030 text_t *stp;
… …
3100 * EXT: button 3 press; button 1 or 3 drag 3104 * EXT: button 3 press; button 1 or 3 drag
3101 * flag == 0 ==> button 1 3105 * flag == 0 ==> button 1
3102 * flag == 1 ==> button 3 press 3106 * flag == 1 ==> button 3 press
3103 * flag == 2 ==> button 3 motion 3107 * flag == 2 ==> button 3 motion
3104 */ 3108 */
3105void 3109void ecb_cold
3106rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3110rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3107{ 3111{
3108 int col = clamp (Pixel2Col (x), 0, ncol); 3112 int col = clamp (Pixel2Col (x), 0, ncol);
3109 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3113 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3110 3114
… …
3136 3140
3137/* ------------------------------------------------------------------------- */ 3141/* ------------------------------------------------------------------------- */
3138/* 3142/*
3139 * Extend the selection to the specified col/row 3143 * Extend the selection to the specified col/row
3140 */ 3144 */
3141void 3145void ecb_cold
3142rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3146rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3143{ 3147{
3144 row_col_t pos; 3148 row_col_t pos;
3145 enum { 3149 enum {
3146 LEFT, RIGHT 3150 LEFT, RIGHT
3147 } closeto = RIGHT; 3151 } closeto = RIGHT;
3148
3149 want_refresh = 1;
3150 3152
3151 switch (selection.op) 3153 switch (selection.op)
3152 { 3154 {
3153 case SELECTION_INIT: 3155 case SELECTION_INIT:
3154 CLEAR_SELECTION (); 3156 CLEAR_SELECTION ();
… …
3334 3336
3335#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3336 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3337 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3338#endif 3340#endif
3341
3342 selection_changed ();
3339} 3343}
3340 3344
3341#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3342void 3346void ecb_cold
3343rxvt_term::selection_remove_trailing_spaces () NOTHROW 3347rxvt_term::selection_remove_trailing_spaces () NOTHROW
3344{ 3348{
3345 int32_t end_col, end_row; 3349 int32_t end_col, end_row;
3346 text_t *stp; 3350 text_t *stp;
3347 3351
… …
3385/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3386/* 3390/*
3387 * Double click on button 3 when already selected 3391 * Double click on button 3 when already selected
3388 * EXT: button 3 double click 3392 * EXT: button 3 double click
3389 */ 3393 */
3390void 3394void ecb_cold
3391rxvt_term::selection_rotate (int x, int y) NOTHROW 3395rxvt_term::selection_rotate (int x, int y) NOTHROW
3392{ 3396{
3393 selection.clicks = selection.clicks % 3 + 1; 3397 selection.clicks = selection.clicks % 3 + 1;
3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3398 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3395} 3399}
… …
3397/* ------------------------------------------------------------------------- */ 3401/* ------------------------------------------------------------------------- */
3398/* 3402/*
3399 * Respond to a request for our current selection 3403 * Respond to a request for our current selection
3400 * EXT: SelectionRequest 3404 * EXT: SelectionRequest
3401 */ 3405 */
3402void 3406void ecb_cold
3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3407rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3404{ 3408{
3405 Atom property = rq.property == None ? rq.target : rq.property; 3409 Atom property = rq.property == None ? rq.target : rq.property;
3406 XSelectionEvent ev; 3410 XSelectionEvent ev;
3407 3411
… …
3540 3544
3541 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3545 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3542} 3546}
3543 3547
3544/* ------------------------------------------------------------------------- */ 3548/* ------------------------------------------------------------------------- */
3545#ifdef USE_XIM 3549#if USE_XIM
3546void 3550void ecb_cold
3547rxvt_term::im_set_position (XPoint &pos) NOTHROW 3551rxvt_term::im_set_position (XPoint &pos) NOTHROW
3548{ 3552{
3549 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3550 3554
3551 XGetWindowAttributes (dpy, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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