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.419 by root, Fri Jun 1 08:12: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 = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
162rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
163{ 195{
164#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
165 scr_overlay_off (); 197 scr_overlay_off ();
166#endif 198#endif
… …
192 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
193 225
194 screen.tscroll = 0; 226 screen.tscroll = 0;
195 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
196 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
197 if (!row_buf) 238 if (!prev_row_buf)
198 { 239 {
199 /* 240 /*
200 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
201 */ 242 */
202 top_row = 0; 243 top_row = 0;
203 term_start = 0; 244 term_start = 0;
204
205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
207
208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211
212 for (int row = nrow; row--; )
213 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
216 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
217 }
218 245
219 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
220 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
221 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
222 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
245 { 272 {
246 /* 273 /*
247 * add or delete rows as appropriate 274 * add or delete rows as appropriate
248 */ 275 */
249 276
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
251 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
252
253#if 0
254 if (nrow < prev_nrow)
255 {
256 for (int row = nrow; row < prev_nrow; row++)
257 {
258 lfree (swap_buf [row]);
259 lfree (drawn_buf[row]);
260 }
261 }
262#endif
263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
266
267 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
268 { 278 {
269 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
270 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 }
272 281
273 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
274 { 286 }
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 }
278
279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
281 287
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
285 291
… …
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 300
295 do 301 do
296 { 302 {
297 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
298 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
299 int plines = 1; 305 int plines = 1;
300 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
301 307
302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
303 { 309 {
304 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
305 311
306 plines++; 312 plines++;
307 llen += prev_ncol; 313 llen += prev_ncol;
… …
320 326
321 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
322 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
323 { 329 {
324 qline = row_buf + qrow; 330 qline = row_buf + qrow;
325 lalloc (*qline); 331 qline->alloc (); // redundant with next line
326 qline->l = ncol; 332 qline->l = ncol;
327 qline->is_longer (1); 333 qline->is_longer (1);
328 334
329 int qcol = 0; 335 int qcol = 0;
330 336
… …
345 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
346 // least. 352 // least.
347 if (prow == ocur.row) 353 if (prow == ocur.row)
348 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
349 355
350 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
351 357
352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
353 359
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
376 { 382 {
377 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
378 384
379 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
380 { 386 {
381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
382 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
383 389
384 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
385 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
386 } 394 }
387 395
388 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 398
393 term_start = 0; 399 term_start = 0;
394 } 400 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 401
400 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 404 }
403 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
404 free (tabs); 415 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
406 417
407 for (int col = ncol; col--; ) 418 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 426 tt_winch ();
416 427
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 429}
419 430
420/* ------------------------------------------------------------------------- */ 431void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 432rxvt_term::scr_release () NOTHROW
426{ 433{
427 if (row_buf) 434 free (chunk); chunk = 0; row_buf = 0;
428 { 435 free (tabs); tabs = 0;
429 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0;
431
432 free (row_buf);
433 free (swap_buf);
434 free (drawn_buf);
435 row_buf = 0; // signal that we freed all the arrays above
436
437 free (tabs);
438 tabs = 0;
439 }
440} 436}
441 437
442/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
443/* 439/*
444 * Hard/Soft reset 440 * Hard/Soft reset
445 */ 441 */
446void 442void ecb_cold
447rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
448{ 444{
449 scr_release (); 445 scr_release ();
446
450 prev_nrow = prev_ncol = 0; 447 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 448 rvideo_mode = false;
452 scr_soft_reset (); 449 scr_soft_reset ();
453 scr_reset (); 450 scr_reset ();
454 451
455 scr_clear (true); 452 scr_clear (true);
456 scr_refresh (); 453 scr_refresh ();
457} 454}
458 455
459void 456void ecb_cold
460rxvt_term::scr_soft_reset () 457rxvt_term::scr_soft_reset () NOTHROW
461{ 458{
462 /* only affects modes, nothing drastic such as clearing the screen */ 459 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 460#if ENABLE_OVERLAY
464 scr_overlay_off (); 461 scr_overlay_off ();
465#endif 462#endif
… …
520 assert (s->cur.row >= 0); 517 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 518 assert (s->cur.col >= 0);
522} 519}
523 520
524void 521void
525rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen () NOTHROW
526{ 523{
527 if (!option (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
528 return; 525 return;
529 526
530 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
… …
549 return; 546 return;
550 547
551 want_refresh = 1; 548 want_refresh = 1;
552 view_start = 0; 549 view_start = 0;
553 550
554 selection_check (2); /* check for boundary cross */ 551 /* check for boundary cross */
552 row_col_t pos;
553 pos.row = pos.col = 0;
554 if (ROWCOL_IS_BEFORE (selection.beg, pos)
555 && ROWCOL_IS_AFTER (selection.end, pos))
556 CLEAR_SELECTION ();
555 557
556 current_screen = scrn; 558 current_screen = scrn;
557 559
558#if NSCREENS 560#if NSCREENS
559 if (option (Opt_secondaryScreen)) 561 if (option (Opt_secondaryScreen))
… …
625/* 627/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 629 * count positive ==> scroll up
628 * count negative ==> scroll down 630 * count negative ==> scroll down
629 */ 631 */
630int 632int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 634{
633 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
634 return 0; 636 return 0;
635 637
… …
681 } 683 }
682 else 684 else
683 scr_blank_screen_mem (l, rstyle); 685 scr_blank_screen_mem (l, rstyle);
684 } 686 }
685 687
688 // move and/or clear selection, if any
689 if (selection.op && current_screen == selection.screen
690 && selection.beg.row <= row2)
691 {
692 selection.beg.row -= count;
693 selection.end.row -= count;
694 selection.mark.row -= count;
695
696 selection_check (0);
697 }
698
686 // finally move the view window, if desired 699 // finally move the view window, if desired
687 if (option (Opt_scrollWithBuffer) 700 if (option (Opt_scrollWithBuffer)
688 && view_start != 0 701 && view_start != 0
689 && view_start != -saveLines) 702 && view_start != -saveLines)
690 scr_page (UP, count); 703 scr_page (UP, count);
… …
692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 705 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); 706 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
694 } 707 }
695 else 708 else
696 { 709 {
710 if (selection.op && current_screen == selection.screen)
711 {
712 if ((selection.beg.row < row1 && selection.end.row > row1)
713 || (selection.beg.row < row2 && selection.end.row > row2)
714 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
715 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
716 || (selection.end.row - count < row1 && selection.end.row >= row1)
717 || (selection.end.row - count > row2 && selection.end.row <= row2))
718 {
719 CLEAR_ALL_SELECTION ();
720 selection.op = SELECTION_CLEAR;
721 }
722 else if (selection.end.row >= row1 && selection.end.row <= row2)
723 {
724 /* move selected region too */
725 selection.beg.row -= count;
726 selection.end.row -= count;
727 selection.mark.row -= count;
728
729 selection_check (0);
730 }
731 }
732
697 // use a simple and robust scrolling algorithm, this 733 // use a simple and robust scrolling algorithm, this
698 // part of scr_scroll_text is not time-critical. 734 // part of scr_scroll_text is not time-critical.
699 735
700 // sever line above scroll region 736 // sever line above scroll region
701 if (row1) 737 if (row1)
… …
728 l.is_longer (0); 764 l.is_longer (0);
729 l.touch (); 765 l.touch ();
730 } 766 }
731 } 767 }
732 768
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; 769 return count;
755} 770}
756 771
757/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
758/* 773/*
759 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
760 */ 775 */
761void 776void ecb_hot
762rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 777rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
763{ 778{
764 if (len <= 0) /* sanity */ 779 if (len <= 0) /* sanity */
765 return; 780 return;
766 781
767 unsigned char checksel; 782 bool checksel;
768 unicode_t c; 783 unicode_t c;
769 int ncol = this->ncol; 784 int ncol = this->ncol;
770 const wchar_t *strend = str + len; 785 const wchar_t *strend = str + len;
771 786
772 want_refresh = 1; 787 want_refresh = 1;
… …
1116 * XTERM_SEQ: ESC 6 1131 * XTERM_SEQ: ESC 6
1117 * Move cursor left in row. If we're at the left boundary, shift everything 1132 * Move cursor left in row. If we're at the left boundary, shift everything
1118 * in that row right. Clear left column. 1133 * in that row right. Clear left column.
1119 */ 1134 */
1120#if !ENABLE_MINIMAL 1135#if !ENABLE_MINIMAL
1121void 1136void ecb_cold
1122rxvt_term::scr_backindex () NOTHROW 1137rxvt_term::scr_backindex () NOTHROW
1123{ 1138{
1124 if (screen.cur.col > 0) 1139 if (screen.cur.col > 0)
1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1126 else 1141 else
… …
1133 * XTERM_SEQ: ESC 9 1148 * XTERM_SEQ: ESC 9
1134 * Move cursor right in row. If we're at the right boundary, shift everything 1149 * Move cursor right in row. If we're at the right boundary, shift everything
1135 * in that row left. Clear right column. 1150 * in that row left. Clear right column.
1136 */ 1151 */
1137#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1138void 1153void ecb_cold
1139rxvt_term::scr_forwardindex () NOTHROW 1154rxvt_term::scr_forwardindex () NOTHROW
1140{ 1155{
1141 if (screen.cur.col < ncol - 1) 1156 if (screen.cur.col < ncol - 1)
1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1143 else 1158 else
… …
1294 scr_blank_line (line, col, num, rstyle); 1309 scr_blank_line (line, col, num, rstyle);
1295} 1310}
1296 1311
1297/* ------------------------------------------------------------------------- */ 1312/* ------------------------------------------------------------------------- */
1298/* 1313/*
1299 * Erase part of whole of the screen 1314 * Erase part or whole of the screen
1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1315 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1316 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1317 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303 */ 1318 */
1304void 1319void
… …
1313 ZERO_SCROLLBACK (); 1328 ZERO_SCROLLBACK ();
1314 1329
1315 switch (mode) 1330 switch (mode)
1316 { 1331 {
1317 case 0: /* erase to end of screen */ 1332 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1333 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1334 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1335 num = nrow - row;
1322 break; 1336 break;
1323 case 1: /* erase to beginning of screen */ 1337 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1338 scr_erase_line (1);
1326 row = 0; 1339 row = 0;
1327 num = screen.cur.row; 1340 num = screen.cur.row;
1328 break; 1341 break;
1329 case 2: /* erase whole screen */ 1342 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1343 row = 0;
1332 num = nrow; 1344 num = nrow;
1333 break; 1345 break;
1334 default: 1346 default:
1335 return; 1347 return;
… …
1352 { 1364 {
1353 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1354 1366
1355 if (mapped) 1367 if (mapped)
1356 XClearArea (dpy, vt, 0, 1368 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1369 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1370 (unsigned int)Height2Pixel (num), False);
1359 } 1371 }
1360 else 1372 else
1361 { 1373 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1365 { 1377 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1380 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1381 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1382 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1383 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1386 }
1375 } 1387 }
… …
1397/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1398/* 1410/*
1399 * Fill the screen with `E's 1411 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1413 */
1402void 1414void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1415rxvt_term::scr_E () NOTHROW
1404{ 1416{
1405 rend_t fs; 1417 rend_t fs;
1406 1418
1407 want_refresh = 1; 1419 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1420 ZERO_SCROLLBACK ();
1409 1421
1410 num_scr_allow = 0; 1422 num_scr_allow = 0;
1411 selection_check (3); 1423
1424 row_col_t pos;
1425 pos.row = pos.col = 0;
1426 if (ROWCOL_IS_AFTER (selection.end, pos))
1427 CLEAR_SELECTION ();
1412 1428
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1429 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1430 for (int row = nrow; row--; )
1415 { 1431 {
1416 line_t &line = ROW(row); 1432 line_t &line = ROW(row);
… …
1567/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1568/* 1584/*
1569 * Set the scrolling region 1585 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1587 */
1572void 1588void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574{ 1590{
1575 max_it (top, 0); 1591 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1592 min_it (bot, nrow - 1);
1577 1593
… …
1587/* 1603/*
1588 * Make the cursor visible/invisible 1604 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1607 */
1592void 1608void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1609rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594{ 1610{
1595 want_refresh = 1; 1611 want_refresh = 1;
1596 1612
1597 if (mode) 1613 if (mode)
… …
1604/* 1620/*
1605 * Set/unset automatic wrapping 1621 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1624 */
1609void 1625void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1626rxvt_term::scr_autowrap (int mode) NOTHROW
1611{ 1627{
1612 if (mode) 1628 if (mode)
1613 screen.flags |= Screen_Autowrap; 1629 screen.flags |= Screen_Autowrap;
1614 else 1630 else
… …
1623 * Relative mode: line numbers are relative to top margin of scrolling region 1639 * Relative mode: line numbers are relative to top margin of scrolling region
1624 * and the cursor cannot be moved outside. 1640 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1643 */
1628void 1644void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1645rxvt_term::scr_relative_origin (int mode) NOTHROW
1630{ 1646{
1631 if (mode) 1647 if (mode)
1632 screen.flags |= Screen_Relative; 1648 screen.flags |= Screen_Relative;
1633 else 1649 else
… …
1640/* 1656/*
1641 * Set insert/replace mode 1657 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1660 */
1645void 1661void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1662rxvt_term::scr_insert_mode (int mode) NOTHROW
1647{ 1663{
1648 if (mode) 1664 if (mode)
1649 screen.flags |= Screen_Insert; 1665 screen.flags |= Screen_Insert;
1650 else 1666 else
… …
1656 * Set/Unset tabs 1672 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1673 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1676 */
1661void 1677void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1678rxvt_term::scr_set_tab (int mode) NOTHROW
1663{ 1679{
1664 if (mode < 0) 1680 if (mode < 0)
1665 memset (tabs, 0, ncol); 1681 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1682 else if (screen.cur.col < ncol)
… …
1705/* ------------------------------------------------------------------------- */ 1721/* ------------------------------------------------------------------------- */
1706/* 1722/*
1707 * Report current cursor position 1723 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1724 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1725 */
1710void 1726void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1727rxvt_term::scr_report_position () NOTHROW
1712{ 1728{
1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1729 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714} 1730}
1715 1731
… …
1718 * ------------------------------------------------------------------------- */ 1734 * ------------------------------------------------------------------------- */
1719 1735
1720/* 1736/*
1721 * Set font style 1737 * Set font style
1722 */ 1738 */
1723void 1739void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1740rxvt_term::set_font_style () NOTHROW
1725{ 1741{
1726#if 0 1742#if 0
1727 switch (charsets [screen.charset]) 1743 switch (charsets [screen.charset])
1728 { 1744 {
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1766 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1768 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1769 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1770 */
1755void 1771void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1772rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1773{
1758 screen.charset = set; 1774 screen.charset = set;
1759 set_font_style (); 1775 set_font_style ();
1760} 1776}
… …
1781 * ------------------------------------------------------------------------- */ 1797 * ------------------------------------------------------------------------- */
1782 1798
1783/* 1799/*
1784 * refresh matching text. 1800 * refresh matching text.
1785 */ 1801 */
1786bool 1802bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1804{
1789 bool found = false; 1805 bool found = false;
1790 1806
1791 for (int i = 0; i < nrow; i++) 1807 for (int i = 0; i < nrow; i++)
… …
1810 PART_BEG = 0, 1826 PART_BEG = 0,
1811 PART_END, 1827 PART_END,
1812 RC_COUNT 1828 RC_COUNT
1813}; 1829};
1814 1830
1815void 1831void ecb_hot
1816rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1832rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1817{ 1833{
1818 int i; 1834 int i;
1819 row_col_t rc[RC_COUNT]; 1835 row_col_t rc[RC_COUNT];
1820 1836
… …
1857 * Refresh the entire screen 1873 * Refresh the entire screen
1858 */ 1874 */
1859void 1875void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1876rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1877{
1862 scr_expose (0, 0, width, height, refresh); 1878 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1879}
1864 1880
1865/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1866/* 1882/*
1867 * Move the display so that the line represented by scrollbar value Y is at 1883 * Move the display so that the line represented by scrollbar value Y is at
… …
1946 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1962 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1947#endif 1963#endif
1948} 1964}
1949 1965
1950/* ------------------------------------------------------------------------- */ 1966/* ------------------------------------------------------------------------- */
1951void 1967void ecb_cold
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1968rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1969{
1954#ifdef PRINTPIPE 1970#ifdef PRINTPIPE
1955 int nrows, row_start; 1971 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1972 FILE *fd = popen_printer ();
… …
2005/* 2021/*
2006 * Refresh the screen 2022 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2023 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2024 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2025 */
2010void 2026void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2027rxvt_term::scr_refresh () NOTHROW
2012{ 2028{
2013 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2031 int i; /* tmp */
… …
2029 * A: set up vars 2045 * A: set up vars
2030 */ 2046 */
2031 refresh_count = 0; 2047 refresh_count = 0;
2032 2048
2033 unsigned int old_screen_flags = screen.flags; 2049 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2050 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2051#ifdef HAVE_BG_PIXMAP
2036 have_bg = bg_pixmap != None; 2052 have_bg = bg_pixmap != None;
2037#endif 2053#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2055
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2061 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2062#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2063 scr_swap_overlay ();
2048#endif 2064#endif
2049 2065
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2066 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2067
2052 /* 2068 /*
2053 * C: set the cursor character (s) 2069 * C: set the cursor character (s)
2054 */ 2070 */
2055 { 2071 {
2056 unsigned char setoldcursor; 2072 bool setoldcursor;
2057 2073
2058#ifdef CURSOR_BLINK 2074#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2075 if (hidden_cursor)
2060 showcursor = 0; 2076 showcursor = 0;
2061#endif 2077#endif
… …
2148 { 2164 {
2149 int16_t nits; 2165 int16_t nits;
2150 int i = num_scr; 2166 int i = num_scr;
2151 int j; 2167 int j;
2152 int len, wlen; 2168 int len, wlen;
2153 dLocal (int, num_scr);
2154 2169
2155 j = nrow; 2170 j = nrow;
2156 wlen = len = -1; 2171 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2158 2173
… …
2463 2478
2464 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2480 Col2Pixel (col),
2466 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2484 }
2470 } 2485 }
2471 2486
2472 /* 2487 /*
2473 * H: cleanup selection 2488 * H: cleanup selection
… …
2482 screen.flags = old_screen_flags; 2497 screen.flags = old_screen_flags;
2483 num_scr = 0; 2498 num_scr = 0;
2484 num_scr_allow = 1; 2499 num_scr_allow = 1;
2485} 2500}
2486 2501
2487void 2502void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2504{
2490 if (!l.t) 2505 if (!l.valid ())
2491 return; 2506 return;
2492 2507
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494 2509
2495 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2496 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497} 2512}
2498 2513
2499void 2514void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2501{ 2516{
2502 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2504 2519
… …
2507 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2509 } 2524 }
2510} 2525}
2511 2526
2512void 2527void ecb_cold
2513rxvt_term::scr_recolour (bool refresh) NOTHROW 2528rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2529{
2515 bool transparent = false; 2530 bool transparent = false;
2516 2531
2517#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_BG_PIXMAP
… …
2620 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2621 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2622} 2637}
2623 2638
2624/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2625void 2640void ecb_hot
2626rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2627{ 2642{
2628 if (selection.op 2643 if (selection.op
2629 && current_screen == selection.screen 2644 && current_screen == selection.screen
2630 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
… …
2649 */ 2664 */
2650#if 0 2665#if 0
2651void 2666void
2652rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) NOTHROW
2653{ 2668{
2654 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2655 unsigned int width, towrite; 2670 // 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} 2671}
2675#endif 2672#endif
2676 2673
2677/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2678 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
… …
2680void 2677void
2681rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) NOTHROW
2682{ 2679{
2683 if (!selection.op) 2680 if (!selection.op)
2684 return; 2681 return;
2685
2686 row_col_t pos;
2687 pos.row = pos.col = 0;
2688 2682
2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2692 || (check_more == 1 2686 || (check_more == 1
2693 && current_screen == selection.screen 2687 && current_screen == selection.screen
2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && 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 (); 2690 CLEAR_ALL_SELECTION ();
2705} 2691}
2706 2692
2707/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2708/* 2694/*
… …
2715 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2716 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2717 data[i] = C0_CR; 2703 data[i] = C0_CR;
2718 2704
2719 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2720 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2721 2707
2722 tt_write (data, len); 2708 tt_write (data, len);
2723 2709
2724 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2725 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2726} 2712}
2727 2713
2728void 2714void
2729rxvt_term::paste (char *data, unsigned int len) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2730{ 2716{
… …
2950/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
2951/* 2937/*
2952 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
2953 * EXT: button 1 press 2939 * EXT: button 1 press
2954 */ 2940 */
2955void 2941void ecb_cold
2956rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2957{ 2943{
2958 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
2959 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
2960 2946
… …
2979 2965
2980/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
2981/* 2967/*
2982 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
2983 */ 2969 */
2984void 2970void ecb_cold
2985rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2986{ 2972{
2987 want_refresh = 1; 2973 want_refresh = 1;
2988 2974
2989 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3016/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3017#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3019#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3020 3006
3021void 3007void ecb_cold
3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3023{ 3009{
3024 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3025 row_col_t bound; 3011 row_col_t bound;
3026 text_t *stp; 3012 text_t *stp;
… …
3100 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3101 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3102 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3103 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3104 */ 3090 */
3105void 3091void ecb_cold
3106rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3107{ 3093{
3108 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3109 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3110 3096
… …
3136 3122
3137/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3138/* 3124/*
3139 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3140 */ 3126 */
3141void 3127void ecb_cold
3142rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3143{ 3129{
3144 row_col_t pos; 3130 row_col_t pos;
3145 enum { 3131 enum {
3146 LEFT, RIGHT 3132 LEFT, RIGHT
… …
3337 ::swap (selection.beg.col, selection.end.col); 3323 ::swap (selection.beg.col, selection.end.col);
3338#endif 3324#endif
3339} 3325}
3340 3326
3341#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3342void 3328void ecb_cold
3343rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3344{ 3330{
3345 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3346 text_t *stp; 3332 text_t *stp;
3347 3333
… …
3385/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3386/* 3372/*
3387 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3388 * EXT: button 3 double click 3374 * EXT: button 3 double click
3389 */ 3375 */
3390void 3376void ecb_cold
3391rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3392{ 3378{
3393 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3394 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3395} 3381}
… …
3397/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3398/* 3384/*
3399 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3400 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3401 */ 3387 */
3402void 3388void ecb_cold
3403rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3404{ 3390{
3405 Atom property = rq.property == None ? rq.target : rq.property; 3391 Atom property = rq.property == None ? rq.target : rq.property;
3406 XSelectionEvent ev; 3392 XSelectionEvent ev;
3407 3393
… …
3541 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3542} 3528}
3543 3529
3544/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3545#ifdef USE_XIM 3531#ifdef USE_XIM
3546void 3532void ecb_cold
3547rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3548{ 3534{
3549 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3550 3536
3551 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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