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.388 by root, Fri Jul 8 00:08:40 2011 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC

… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate compile!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
… …
98 96
99/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
100void 98void
101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
102{ 100{
103 if (!l.t) 101 if (!l.valid ())
104 { 102 {
105 lalloc (l); 103 l.alloc ();
106 col = 0; 104 col = 0;
107 width = ncol; 105 width = ncol;
108 } 106 }
109 107
110 l.touch (); 108 l.touch ();
… …
157/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
160 158
161void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
162rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
163{ 195{
164#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
165 scr_overlay_off (); 197 scr_overlay_off ();
166#endif 198#endif
… …
192 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
193 225
194 screen.tscroll = 0; 226 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
196 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
197 if (!row_buf) 239 if (!prev_row_buf)
198 { 240 {
199 /* 241 /*
200 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 243 */
202 top_row = 0; 244 top_row = 0;
203 term_start = 0; 245 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 246
219 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
245 { 273 {
246 /* 274 /*
247 * add or delete rows as appropriate 275 * add or delete rows as appropriate
248 */ 276 */
249 277
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
268 { 279 {
269 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 282
273 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
274 { 287 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 288
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
285 292
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 301
295 do 302 do
296 { 303 {
297 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 306 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 308
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 310 {
304 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
305 312
306 plines++; 313 plines++;
307 llen += prev_ncol; 314 llen += prev_ncol;
… …
320 327
321 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
323 { 330 {
324 qline = row_buf + qrow; 331 qline = row_buf + qrow;
325 lalloc (*qline); 332 qline->alloc (); // redundant with next line
326 qline->l = ncol; 333 qline->l = ncol;
327 qline->is_longer (1); 334 qline->is_longer (1);
328 335
329 int qcol = 0; 336 int qcol = 0;
330 337
… …
345 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
346 // least. 353 // least.
347 if (prow == ocur.row) 354 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
349 356
350 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
351 358
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 360
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 383 {
377 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
378 385
379 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
380 { 387 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
383 390
384 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
386 } 395 }
387 396
388 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 399
393 term_start = 0; 400 term_start = 0;
394 } 401 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 402
400 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 405 }
403 406
407 for (int row = nrow; row--; )
408 {
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 }
413
414 printf ("pc %p\n", prev_chunk);//D
415 chunk_free (prev_chunk, prev_chunk_size);
416
404 free (tabs); 417 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 418 tabs = (char *)rxvt_malloc (ncol);
406 419
407 for (int col = ncol; col--; ) 420 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 421 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 428 tt_winch ();
416 429
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 431}
419 432
420/* ------------------------------------------------------------------------- */ 433void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 434rxvt_term::scr_release () NOTHROW
426{ 435{
427 if (row_buf) 436 chunk_free (chunk, chunk_size);
428 { 437 chunk = 0;
429 delete talloc; talloc = 0; 438 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 439
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs); 440 free (tabs);
438 tabs = 0; 441 tabs = 0;
439 }
440} 442}
441 443
442/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
443/* 445/*
444 * Hard/Soft reset 446 * Hard/Soft reset
445 */ 447 */
446void 448void ecb_cold
447rxvt_term::scr_poweron () 449rxvt_term::scr_poweron ()
448{ 450{
449 scr_release (); 451 scr_release ();
452
450 prev_nrow = prev_ncol = 0; 453 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 454 rvideo_mode = false;
452 scr_soft_reset (); 455 scr_soft_reset ();
453 scr_reset (); 456 scr_reset ();
454 457
455 scr_clear (true); 458 scr_clear (true);
456 scr_refresh (); 459 scr_refresh ();
457} 460}
458 461
459void 462void ecb_cold
460rxvt_term::scr_soft_reset () 463rxvt_term::scr_soft_reset () NOTHROW
461{ 464{
462 /* only affects modes, nothing drastic such as clearing the screen */ 465 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 466#if ENABLE_OVERLAY
464 scr_overlay_off (); 467 scr_overlay_off ();
465#endif 468#endif
… …
520 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
522} 525}
523 526
524void 527void
525rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
526{ 529{
527 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
528 return; 531 return;
529 532
530 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
549 return; 552 return;
550 553
551 want_refresh = 1; 554 want_refresh = 1;
552 view_start = 0; 555 view_start = 0;
553 556
554 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
555 563
556 current_screen = scrn; 564 current_screen = scrn;
557 565
558#if NSCREENS 566#if NSCREENS
559 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
… …
625/* 633/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 634 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 635 * count positive ==> scroll up
628 * count negative ==> scroll down 636 * count negative ==> scroll down
629 */ 637 */
630int 638int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 640{
633 if (count == 0 || (row1 > row2)) 641 if (count == 0 || (row1 > row2))
634 return 0; 642 return 0;
635 643
… …
644 652
645 top_row = max (top_row - count, -saveLines); 653 top_row = max (top_row - count, -saveLines);
646 654
647 // sever bottommost line 655 // sever bottommost line
648 { 656 {
649 line_t &l = ROW(row2 - 1); 657 line_t &l = ROW(row2);
650 l.is_longer (0); 658 l.is_longer (0);
651 l.touch (); 659 l.touch ();
652 } 660 }
653 661
654 // scroll everything up 'count' lines 662 // scroll everything up 'count' lines
… …
682 else 690 else
683 scr_blank_screen_mem (l, rstyle); 691 scr_blank_screen_mem (l, rstyle);
684 } 692 }
685 693
686 // move and/or clear selection, if any 694 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen
696 && selection.beg.row <= row2)
688 { 697 {
689 selection.beg.row -= count; 698 selection.beg.row -= count;
690 selection.end.row -= count; 699 selection.end.row -= count;
691 selection.mark.row -= count; 700 selection.mark.row -= count;
692 701
693 if (selection.beg.row < top_row 702 selection_check (0);
694 || selection.end.row < top_row
695 || selection.mark.row < top_row)
696 {
697 CLEAR_ALL_SELECTION ();
698 selection.op = SELECTION_CLEAR;
699 }
700 } 703 }
701 704
702 // finally move the view window, if desired 705 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 706 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 707 && view_start != 0
… …
734 } 737 }
735 738
736 // use a simple and robust scrolling algorithm, this 739 // use a simple and robust scrolling algorithm, this
737 // part of scr_scroll_text is not time-critical. 740 // part of scr_scroll_text is not time-critical.
738 741
742 // sever line above scroll region
743 if (row1)
744 {
745 line_t &l = ROW(row1 - 1);
746 l.is_longer (0);
747 l.touch ();
748 }
749
739 int rows = row2 - row1 + 1; 750 int rows = row2 - row1 + 1;
740 751
741 min_it (count, rows); 752 min_it (count, rows);
742 753
743 line_t *temp_buf = row_buf + total_rows; 754 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
744 755
745 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
746 { 757 {
747 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 758 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
748 759
… …
750 scr_blank_screen_mem (temp_buf [row], rstyle); 761 scr_blank_screen_mem (temp_buf [row], rstyle);
751 } 762 }
752 763
753 for (int row = 0; row < rows; row++) 764 for (int row = 0; row < rows; row++)
754 ROW(row1 + row) = temp_buf [row]; 765 ROW(row1 + row) = temp_buf [row];
766
767 // sever bottommost line
768 {
769 line_t &l = ROW(row2);
770 l.is_longer (0);
771 l.touch ();
772 }
755 } 773 }
756 774
757 return count; 775 return count;
758} 776}
759 777
760/* ------------------------------------------------------------------------- */ 778/* ------------------------------------------------------------------------- */
761/* 779/*
762 * Add text given in <str> of length <len> to screen struct 780 * Add text given in <str> of length <len> to screen struct
763 */ 781 */
764void 782void ecb_hot
765rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
766{ 784{
767 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
768 return; 786 return;
769 787
770 unsigned char checksel; 788 bool checksel;
771 unicode_t c; 789 unicode_t c;
772 int ncol = this->ncol; 790 int ncol = this->ncol;
773 const wchar_t *strend = str + len; 791 const wchar_t *strend = str + len;
774 792
775 want_refresh = 1; 793 want_refresh = 1;
… …
1119 * XTERM_SEQ: ESC 6 1137 * XTERM_SEQ: ESC 6
1120 * Move cursor left in row. If we're at the left boundary, shift everything 1138 * Move cursor left in row. If we're at the left boundary, shift everything
1121 * in that row right. Clear left column. 1139 * in that row right. Clear left column.
1122 */ 1140 */
1123#if !ENABLE_MINIMAL 1141#if !ENABLE_MINIMAL
1124void 1142void ecb_cold
1125rxvt_term::scr_backindex () NOTHROW 1143rxvt_term::scr_backindex () NOTHROW
1126{ 1144{
1127 if (screen.cur.col > 0) 1145 if (screen.cur.col > 0)
1128 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1129 else 1147 else
… …
1136 * XTERM_SEQ: ESC 9 1154 * XTERM_SEQ: ESC 9
1137 * Move cursor right in row. If we're at the right boundary, shift everything 1155 * Move cursor right in row. If we're at the right boundary, shift everything
1138 * in that row left. Clear right column. 1156 * in that row left. Clear right column.
1139 */ 1157 */
1140#if !ENABLE_MINIMAL 1158#if !ENABLE_MINIMAL
1141void 1159void ecb_cold
1142rxvt_term::scr_forwardindex () NOTHROW 1160rxvt_term::scr_forwardindex () NOTHROW
1143{ 1161{
1144 if (screen.cur.col < ncol - 1) 1162 if (screen.cur.col < ncol - 1)
1145 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1146 else 1164 else
… …
1297 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1298} 1316}
1299 1317
1300/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1301/* 1319/*
1302 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1303 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1304 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1305 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1306 */ 1324 */
1307void 1325void
… …
1316 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1317 1335
1318 switch (mode) 1336 switch (mode)
1319 { 1337 {
1320 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1321 selection_check (1);
1322 scr_erase_line (0); 1339 scr_erase_line (0);
1323 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1324 num = nrow - row; 1341 num = nrow - row;
1325 break; 1342 break;
1326 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1327 selection_check (3);
1328 scr_erase_line (1); 1344 scr_erase_line (1);
1329 row = 0; 1345 row = 0;
1330 num = screen.cur.row; 1346 num = screen.cur.row;
1331 break; 1347 break;
1332 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1333 selection_check (3);
1334 row = 0; 1349 row = 0;
1335 num = nrow; 1350 num = nrow;
1336 break; 1351 break;
1337 default: 1352 default:
1338 return; 1353 return;
… …
1355 { 1370 {
1356 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1357 1372
1358 if (mapped) 1373 if (mapped)
1359 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1360 Row2Pixel (row - view_start), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1361 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1362 } 1377 }
1363 else 1378 else
1364 { 1379 {
1365 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1368 { 1383 {
1369 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1372 0, Row2Pixel (row - view_start), 1387 0, Row2Pixel (row - view_start),
1373 (unsigned int)width, 1388 (unsigned int)vt_width,
1374 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1375 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1376 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1377 } 1392 }
1378 } 1393 }
… …
1400/* ------------------------------------------------------------------------- */ 1415/* ------------------------------------------------------------------------- */
1401/* 1416/*
1402 * Fill the screen with `E's 1417 * Fill the screen with `E's
1403 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1404 */ 1419 */
1405void 1420void ecb_cold
1406rxvt_term::scr_E () NOTHROW 1421rxvt_term::scr_E () NOTHROW
1407{ 1422{
1408 rend_t fs; 1423 rend_t fs;
1409 1424
1410 want_refresh = 1; 1425 want_refresh = 1;
1411 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1412 1427
1413 num_scr_allow = 0; 1428 num_scr_allow = 0;
1414 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1415 1434
1416 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1417 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1418 { 1437 {
1419 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1570/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1571/* 1590/*
1572 * Set the scrolling region 1591 * Set the scrolling region
1573 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1574 */ 1593 */
1575void 1594void ecb_cold
1576rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1577{ 1596{
1578 max_it (top, 0); 1597 max_it (top, 0);
1579 min_it (bot, nrow - 1); 1598 min_it (bot, nrow - 1);
1580 1599
… …
1590/* 1609/*
1591 * Make the cursor visible/invisible 1610 * Make the cursor visible/invisible
1592 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1593 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1594 */ 1613 */
1595void 1614void ecb_cold
1596rxvt_term::scr_cursor_visible (int mode) NOTHROW 1615rxvt_term::scr_cursor_visible (int mode) NOTHROW
1597{ 1616{
1598 want_refresh = 1; 1617 want_refresh = 1;
1599 1618
1600 if (mode) 1619 if (mode)
… …
1607/* 1626/*
1608 * Set/unset automatic wrapping 1627 * Set/unset automatic wrapping
1609 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1610 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1611 */ 1630 */
1612void 1631void ecb_cold
1613rxvt_term::scr_autowrap (int mode) NOTHROW 1632rxvt_term::scr_autowrap (int mode) NOTHROW
1614{ 1633{
1615 if (mode) 1634 if (mode)
1616 screen.flags |= Screen_Autowrap; 1635 screen.flags |= Screen_Autowrap;
1617 else 1636 else
… …
1626 * Relative mode: line numbers are relative to top margin of scrolling region 1645 * Relative mode: line numbers are relative to top margin of scrolling region
1627 * and the cursor cannot be moved outside. 1646 * and the cursor cannot be moved outside.
1628 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1629 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1630 */ 1649 */
1631void 1650void ecb_cold
1632rxvt_term::scr_relative_origin (int mode) NOTHROW 1651rxvt_term::scr_relative_origin (int mode) NOTHROW
1633{ 1652{
1634 if (mode) 1653 if (mode)
1635 screen.flags |= Screen_Relative; 1654 screen.flags |= Screen_Relative;
1636 else 1655 else
… …
1643/* 1662/*
1644 * Set insert/replace mode 1663 * Set insert/replace mode
1645 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1646 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1647 */ 1666 */
1648void 1667void ecb_cold
1649rxvt_term::scr_insert_mode (int mode) NOTHROW 1668rxvt_term::scr_insert_mode (int mode) NOTHROW
1650{ 1669{
1651 if (mode) 1670 if (mode)
1652 screen.flags |= Screen_Insert; 1671 screen.flags |= Screen_Insert;
1653 else 1672 else
… …
1659 * Set/Unset tabs 1678 * Set/Unset tabs
1660 * XTERM_SEQ: Set tab at current column : ESC H 1679 * XTERM_SEQ: Set tab at current column : ESC H
1661 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1662 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1663 */ 1682 */
1664void 1683void ecb_cold
1665rxvt_term::scr_set_tab (int mode) NOTHROW 1684rxvt_term::scr_set_tab (int mode) NOTHROW
1666{ 1685{
1667 if (mode < 0) 1686 if (mode < 0)
1668 memset (tabs, 0, ncol); 1687 memset (tabs, 0, ncol);
1669 else if (screen.cur.col < ncol) 1688 else if (screen.cur.col < ncol)
… …
1689 { 1708 {
1690 rvideo_state = on; 1709 rvideo_state = on;
1691 1710
1692 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1693#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_BG_PIXMAP
1694 if (bg_pixmap == None) 1713 if (bg_img == 0)
1695#endif 1714#endif
1696 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1697 1716
1698 XGCValues gcvalue; 1717 XGCValues gcvalue;
1699 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
1708/* ------------------------------------------------------------------------- */ 1727/* ------------------------------------------------------------------------- */
1709/* 1728/*
1710 * Report current cursor position 1729 * Report current cursor position
1711 * XTERM_SEQ: Report position: ESC [ 6 n 1730 * XTERM_SEQ: Report position: ESC [ 6 n
1712 */ 1731 */
1713void 1732void ecb_cold
1714rxvt_term::scr_report_position () NOTHROW 1733rxvt_term::scr_report_position () NOTHROW
1715{ 1734{
1716 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1717} 1736}
1718 1737
… …
1721 * ------------------------------------------------------------------------- */ 1740 * ------------------------------------------------------------------------- */
1722 1741
1723/* 1742/*
1724 * Set font style 1743 * Set font style
1725 */ 1744 */
1726void 1745void ecb_cold
1727rxvt_term::set_font_style () NOTHROW 1746rxvt_term::set_font_style () NOTHROW
1728{ 1747{
1729#if 0 1748#if 0
1730 switch (charsets [screen.charset]) 1749 switch (charsets [screen.charset])
1731 { 1750 {
… …
1753 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1754 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1755 * XTERM_SEQ: Invoke G2 character set: ESC N 1774 * XTERM_SEQ: Invoke G2 character set: ESC N
1756 * XTERM_SEQ: Invoke G3 character set: ESC O 1775 * XTERM_SEQ: Invoke G3 character set: ESC O
1757 */ 1776 */
1758void 1777void ecb_cold
1759rxvt_term::scr_charset_choose (int set) NOTHROW 1778rxvt_term::scr_charset_choose (int set) NOTHROW
1760{ 1779{
1761 screen.charset = set; 1780 screen.charset = set;
1762 set_font_style (); 1781 set_font_style ();
1763} 1782}
… …
1784 * ------------------------------------------------------------------------- */ 1803 * ------------------------------------------------------------------------- */
1785 1804
1786/* 1805/*
1787 * refresh matching text. 1806 * refresh matching text.
1788 */ 1807 */
1789bool 1808bool ecb_cold
1790rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1791{ 1810{
1792 bool found = false; 1811 bool found = false;
1793 1812
1794 for (int i = 0; i < nrow; i++) 1813 for (int i = 0; i < nrow; i++)
… …
1813 PART_BEG = 0, 1832 PART_BEG = 0,
1814 PART_END, 1833 PART_END,
1815 RC_COUNT 1834 RC_COUNT
1816}; 1835};
1817 1836
1818void 1837void ecb_hot
1819rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1820{ 1839{
1821 int i; 1840 int i;
1822 row_col_t rc[RC_COUNT]; 1841 row_col_t rc[RC_COUNT];
1823 1842
… …
1860 * Refresh the entire screen 1879 * Refresh the entire screen
1861 */ 1880 */
1862void 1881void
1863rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1864{ 1883{
1865 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1866} 1885}
1867 1886
1868/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1869/* 1888/*
1870 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
1949 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1950#endif 1969#endif
1951} 1970}
1952 1971
1953/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1954void 1973void ecb_cold
1955rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1956{ 1975{
1957#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1958 int nrows, row_start; 1977 int nrows, row_start;
1959 FILE *fd = popen_printer (); 1978 FILE *fd = popen_printer ();
… …
2008/* 2027/*
2009 * Refresh the screen 2028 * Refresh the screen
2010 * drawn_text/drawn_rend contain the screen information before the update. 2029 * drawn_text/drawn_rend contain the screen information before the update.
2011 * screen.text/screen.rend contain what the screen will change to. 2030 * screen.text/screen.rend contain what the screen will change to.
2012 */ 2031 */
2013void 2032void ecb_hot
2014rxvt_term::scr_refresh () NOTHROW 2033rxvt_term::scr_refresh () NOTHROW
2015{ 2034{
2016 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
2017 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
2018 int i; /* tmp */ 2037 int i; /* tmp */
… …
2032 * A: set up vars 2051 * A: set up vars
2033 */ 2052 */
2034 refresh_count = 0; 2053 refresh_count = 0;
2035 2054
2036 unsigned int old_screen_flags = screen.flags; 2055 unsigned int old_screen_flags = screen.flags;
2037 char have_bg = 0; 2056 bool have_bg = 0;
2038#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_BG_PIXMAP
2039 have_bg = bg_pixmap != None; 2058 have_bg = bg_img != 0;
2040#endif 2059#endif
2041 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2042 2061
2043 /* 2062 /*
2044 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
… …
2048 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2049#if ENABLE_OVERLAY 2068#if ENABLE_OVERLAY
2050 scr_swap_overlay (); 2069 scr_swap_overlay ();
2051#endif 2070#endif
2052 2071
2053 char showcursor = screen.flags & Screen_VisibleCursor; 2072 bool showcursor = screen.flags & Screen_VisibleCursor;
2054 2073
2055 /* 2074 /*
2056 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2057 */ 2076 */
2058 { 2077 {
2059 unsigned char setoldcursor; 2078 bool setoldcursor;
2060 2079
2061#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2062 if (hidden_cursor) 2081 if (hidden_cursor)
2063 showcursor = 0; 2082 showcursor = 0;
2064#endif 2083#endif
… …
2151 { 2170 {
2152 int16_t nits; 2171 int16_t nits;
2153 int i = num_scr; 2172 int i = num_scr;
2154 int j; 2173 int j;
2155 int len, wlen; 2174 int len, wlen;
2156 dLocal (int, num_scr);
2157 2175
2158 j = nrow; 2176 j = nrow;
2159 wlen = len = -1; 2177 wlen = len = -1;
2160 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2161 2179
… …
2466 2484
2467 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2468 Col2Pixel (col), 2486 Col2Pixel (col),
2469 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2470 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2471 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2472 } 2490 }
2473 } 2491 }
2474 2492
2475 /* 2493 /*
2476 * H: cleanup selection 2494 * H: cleanup selection
… …
2485 screen.flags = old_screen_flags; 2503 screen.flags = old_screen_flags;
2486 num_scr = 0; 2504 num_scr = 0;
2487 num_scr_allow = 1; 2505 num_scr_allow = 1;
2488} 2506}
2489 2507
2490void 2508void ecb_cold
2491rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2492{ 2510{
2493 if (!l.t) 2511 if (!l.valid ())
2494 return; 2512 return;
2495 2513
2496 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2497 2515
2498 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
2499 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2500} 2518}
2501 2519
2502void 2520void ecb_cold
2503rxvt_term::scr_remap_chars () NOTHROW 2521rxvt_term::scr_remap_chars () NOTHROW
2504{ 2522{
2505 for (int i = total_rows; i--; ) 2523 for (int i = total_rows; i--; )
2506 scr_remap_chars (row_buf [i]); 2524 scr_remap_chars (row_buf [i]);
2507 2525
… …
2510 scr_remap_chars (drawn_buf [i]); 2528 scr_remap_chars (drawn_buf [i]);
2511 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2512 } 2530 }
2513} 2531}
2514 2532
2515void 2533void ecb_cold
2516rxvt_term::scr_recolour (bool refresh) NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2517{ 2535{
2518 bool transparent = false; 2536 bool transparent = false;
2519 2537
2520#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_BG_PIXMAP
2521 if (bg_pixmap != None) 2539 if (bg_img != 0)
2522 { 2540 {
2523# ifdef ENABLE_TRANSPARENCY 2541# if ENABLE_TRANSPARENCY
2524 if (bg_flags & BG_IS_TRANSPARENT) 2542 if (bg_flags & BG_IS_TRANSPARENT)
2525 { 2543 {
2526 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2544 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2527 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2528 2546
2529 transparent = true; 2547 transparent = true;
2530 } 2548 }
2531 else 2549 else
2532# endif 2550# endif
2533 { 2551 {
2534 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2535 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2553 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2536 } 2554 }
2537 } 2555 }
2538 else 2556 else
2539#endif 2557#endif
2540 { 2558 {
… …
2548 { 2566 {
2549 if (transparent) 2567 if (transparent)
2550 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2551 else 2569 else
2552 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2553 scrollBar.state = STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2554 scrollBar.show (0); 2572 scrollBar.show (0);
2555 } 2573 }
2556 2574
2557 if (refresh) 2575 if (refresh)
2558 { 2576 {
… …
2623 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2641 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2624 srp[col] ^= rstyle; 2642 srp[col] ^= rstyle;
2625} 2643}
2626 2644
2627/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2628void 2646void ecb_hot
2629rxvt_term::scr_reverse_selection () NOTHROW 2647rxvt_term::scr_reverse_selection () NOTHROW
2630{ 2648{
2631 if (selection.op 2649 if (selection.op
2632 && current_screen == selection.screen 2650 && current_screen == selection.screen
2633 && selection.end.row >= view_start) 2651 && selection.end.row >= view_start)
… …
2652 */ 2670 */
2653#if 0 2671#if 0
2654void 2672void
2655rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2656{ 2674{
2657 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2658 unsigned int width, towrite; 2676 // relevant code in scr_printscreen
2659 const char r1[] = "\n";
2660
2661 for (row = saveLines + top_row;
2662 row < saveLines + nrow - 1; row++)
2663 {
2664 width = row_buf[row].l >= 0 ? row_buf[row].l
2665 : ncol;
2666 for (towrite = width; towrite; towrite -= wrote)
2667 {
2668 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2669 towrite);
2670 if (wrote < 0)
2671 return; /* XXX: death, no report */
2672 }
2673 if (row_buf[row].l >= 0)
2674 if (write (fd, r1, 1) <= 0)
2675 return; /* XXX: death, no report */
2676 }
2677} 2677}
2678#endif 2678#endif
2679 2679
2680/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2681 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
2682 * ------------------------------------------------------------------------- */ 2682 * ------------------------------------------------------------------------- */
2683void 2683void
2684rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2685{ 2685{
2686 row_col_t pos;
2687
2688 if (!selection.op) 2686 if (!selection.op)
2689 return; 2687 return;
2690 2688
2691 pos.row = pos.col = 0;
2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2695 || (check_more == 1 2692 || (check_more == 1
2696 && current_screen == selection.screen 2693 && current_screen == selection.screen
2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2699 || (check_more == 2
2700 && ROWCOL_IS_BEFORE (selection.beg, pos)
2701 && ROWCOL_IS_AFTER (selection.end, pos))
2702 || (check_more == 3
2703 && ROWCOL_IS_AFTER (selection.end, pos))
2704 || (check_more == 4 /* screen width change */
2705 && (selection.beg.row != selection.end.row
2706 || selection.end.col > ncol)))
2707 CLEAR_SELECTION (); 2696 CLEAR_ALL_SELECTION ();
2708} 2697}
2709 2698
2710/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2711/* 2700/*
2712 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
… …
2718 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2719 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2720 data[i] = C0_CR; 2709 data[i] = C0_CR;
2721 2710
2722 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2724 2713
2725 tt_write (data, len); 2714 tt_write (data, len);
2726 2715
2727 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2728 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2729} 2718}
2730 2719
2731void 2720void
2732rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2733{ 2722{
… …
2953/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
2954/* 2943/*
2955 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
2956 * EXT: button 1 press 2945 * EXT: button 1 press
2957 */ 2946 */
2958void 2947void ecb_cold
2959rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2960{ 2949{
2961 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
2962 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
2963 2952
… …
2982 2971
2983/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
2984/* 2973/*
2985 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
2986 */ 2975 */
2987void 2976void ecb_cold
2988rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2989{ 2978{
2990 want_refresh = 1; 2979 want_refresh = 1;
2991 2980
2992 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3019/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3020#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3021 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3022#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3023 3012
3024void 3013void ecb_cold
3025rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3026{ 3015{
3027 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3028 row_col_t bound; 3017 row_col_t bound;
3029 text_t *stp; 3018 text_t *stp;
… …
3103 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3104 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3105 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3106 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3107 */ 3096 */
3108void 3097void ecb_cold
3109rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3110{ 3099{
3111 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3112 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3113 3102
… …
3139 3128
3140/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3141/* 3130/*
3142 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3143 */ 3132 */
3144void 3133void ecb_cold
3145rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3146{ 3135{
3147 row_col_t pos; 3136 row_col_t pos;
3148 enum { 3137 enum {
3149 LEFT, RIGHT 3138 LEFT, RIGHT
… …
3340 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3341#endif 3330#endif
3342} 3331}
3343 3332
3344#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3345void 3334void ecb_cold
3346rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3347{ 3336{
3348 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3349 text_t *stp; 3338 text_t *stp;
3350 3339
… …
3388/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3389/* 3378/*
3390 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3391 * EXT: button 3 double click 3380 * EXT: button 3 double click
3392 */ 3381 */
3393void 3382void ecb_cold
3394rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3395{ 3384{
3396 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3397 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3398} 3387}
… …
3400/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3401/* 3390/*
3402 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3403 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3404 */ 3393 */
3405void 3394void ecb_cold
3406rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3407{ 3396{
3408 Atom property = rq.property == None ? rq.target : rq.property; 3397 Atom property = rq.property == None ? rq.target : rq.property;
3409 XSelectionEvent ev; 3398 XSelectionEvent ev;
3410 3399
… …
3543 3532
3544 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3545} 3534}
3546 3535
3547/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3548#ifdef USE_XIM 3537#if USE_XIM
3549void 3538void ecb_cold
3550rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3551{ 3540{
3552 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3553 3542
3554 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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