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.430 by root, Sun Jan 13 20:16:40 2013 UTC

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

Diff Legend

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