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.390 by sf-exg, Fri Jul 8 20:54:31 2011 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 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 , 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, 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 = min (src.l, ncol);
399 dst.f = src.f;
386 } 400 }
387 401
388 for (int row = prev_nrow; row < nrow; row++) 402 for (int row = prev_nrow; row < nrow; row++)
389 {
390 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
391 }
392 404
393 term_start = 0; 405 term_start = 0;
394 } 406 }
395
396 free (old_buf);
397 delete old_ta;
398 delete old_ra;
399 407
400 clamp_it (screen.cur.row, 0, nrow - 1); 408 clamp_it (screen.cur.row, 0, nrow - 1);
401 clamp_it (screen.cur.col, 0, ncol - 1); 409 clamp_it (screen.cur.col, 0, ncol - 1);
402 } 410 }
403 411
412 for (int row = nrow; row--; )
413 {
414 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
415 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
416 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
417 }
418
419 chunk_free (prev_chunk, prev_chunk_size);
420
404 free (tabs); 421 free (tabs);
405 tabs = (char *)rxvt_malloc (ncol); 422 tabs = (char *)rxvt_malloc (ncol);
406 423
407 for (int col = ncol; col--; ) 424 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0; 425 tabs [col] = col % TABSIZE == 0;
… …
415 tt_winch (); 432 tt_winch ();
416 433
417 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 434 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
418} 435}
419 436
420/* ------------------------------------------------------------------------- */ 437void ecb_cold
421/*
422 * Free everything. That way malloc debugging can find leakage.
423 */
424void
425rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
426{ 439{
427 if (row_buf) 440 chunk_free (chunk, chunk_size);
428 { 441 chunk = 0;
429 delete talloc; talloc = 0; 442 row_buf = 0;
430 delete ralloc; ralloc = 0;
431 443
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); 444 free (tabs);
438 tabs = 0; 445 tabs = 0;
439 }
440} 446}
441 447
442/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
443/* 449/*
444 * Hard/Soft reset 450 * Hard/Soft reset
445 */ 451 */
446void 452void ecb_cold
447rxvt_term::scr_poweron () 453rxvt_term::scr_poweron ()
448{ 454{
449 scr_release (); 455 scr_release ();
456
450 prev_nrow = prev_ncol = 0; 457 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false; 458 rvideo_mode = false;
452 scr_soft_reset (); 459 scr_soft_reset ();
453 scr_reset (); 460 scr_reset ();
454 461
455 scr_clear (true); 462 scr_clear (true);
456 scr_refresh (); 463 scr_refresh ();
457} 464}
458 465
459void 466void ecb_cold
460rxvt_term::scr_soft_reset () 467rxvt_term::scr_soft_reset () NOTHROW
461{ 468{
462 /* only affects modes, nothing drastic such as clearing the screen */ 469 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY 470#if ENABLE_OVERLAY
464 scr_overlay_off (); 471 scr_overlay_off ();
465#endif 472#endif
… …
520 assert (s->cur.row >= 0); 527 assert (s->cur.row >= 0);
521 assert (s->cur.col >= 0); 528 assert (s->cur.col >= 0);
522} 529}
523 530
524void 531void
525rxvt_term::scr_swap_screen () 532rxvt_term::scr_swap_screen () NOTHROW
526{ 533{
527 if (!option (Opt_secondaryScreen)) 534 if (!option (Opt_secondaryScreen))
528 return; 535 return;
529 536
530 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
… …
549 return; 556 return;
550 557
551 want_refresh = 1; 558 want_refresh = 1;
552 view_start = 0; 559 view_start = 0;
553 560
554 selection_check (2); /* check for boundary cross */ 561 /* check for boundary cross */
562 row_col_t pos;
563 pos.row = pos.col = 0;
564 if (ROWCOL_IS_BEFORE (selection.beg, pos)
565 && ROWCOL_IS_AFTER (selection.end, pos))
566 CLEAR_SELECTION ();
555 567
556 current_screen = scrn; 568 current_screen = scrn;
557 569
558#if NSCREENS 570#if NSCREENS
559 if (option (Opt_secondaryScreen)) 571 if (option (Opt_secondaryScreen))
… …
625/* 637/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 638 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 639 * count positive ==> scroll up
628 * count negative ==> scroll down 640 * count negative ==> scroll down
629 */ 641 */
630int 642int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 643rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 644{
633 if (count == 0 || (row1 > row2)) 645 if (count == 0 || (row1 > row2))
634 return 0; 646 return 0;
635 647
… …
644 656
645 top_row = max (top_row - count, -saveLines); 657 top_row = max (top_row - count, -saveLines);
646 658
647 // sever bottommost line 659 // sever bottommost line
648 { 660 {
649 line_t &l = ROW(row2 - 1); 661 line_t &l = ROW(row2);
650 l.is_longer (0); 662 l.is_longer (0);
651 l.touch (); 663 l.touch ();
652 } 664 }
653 665
654 // scroll everything up 'count' lines 666 // scroll everything up 'count' lines
… …
682 else 694 else
683 scr_blank_screen_mem (l, rstyle); 695 scr_blank_screen_mem (l, rstyle);
684 } 696 }
685 697
686 // move and/or clear selection, if any 698 // move and/or clear selection, if any
687 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen
700 && selection.beg.row <= row2)
688 { 701 {
689 selection.beg.row -= count; 702 selection.beg.row -= count;
690 selection.end.row -= count; 703 selection.end.row -= count;
691 selection.mark.row -= count; 704 selection.mark.row -= count;
692 705
693 if (selection.beg.row < top_row 706 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 } 707 }
701 708
702 // finally move the view window, if desired 709 // finally move the view window, if desired
703 if (option (Opt_scrollWithBuffer) 710 if (option (Opt_scrollWithBuffer)
704 && view_start != 0 711 && view_start != 0
… …
761 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
762 ROW(row1 + row) = temp_buf [row]; 769 ROW(row1 + row) = temp_buf [row];
763 770
764 // sever bottommost line 771 // sever bottommost line
765 { 772 {
766 line_t &l = ROW(row2 - 1); 773 line_t &l = ROW(row2);
767 l.is_longer (0); 774 l.is_longer (0);
768 l.touch (); 775 l.touch ();
769 } 776 }
770
771 } 777 }
772 778
773 return count; 779 return count;
774} 780}
775 781
776/* ------------------------------------------------------------------------- */ 782/* ------------------------------------------------------------------------- */
777/* 783/*
778 * Add text given in <str> of length <len> to screen struct 784 * Add text given in <str> of length <len> to screen struct
779 */ 785 */
780void 786void ecb_hot
781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 787rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
782{ 788{
783 if (len <= 0) /* sanity */ 789 if (len <= 0) /* sanity */
784 return; 790 return;
785 791
786 unsigned char checksel; 792 bool checksel;
787 unicode_t c; 793 unicode_t c;
788 int ncol = this->ncol; 794 int ncol = this->ncol;
789 const wchar_t *strend = str + len; 795 const wchar_t *strend = str + len;
790 796
791 want_refresh = 1; 797 want_refresh = 1;
… …
1135 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1136 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1137 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1138 */ 1144 */
1139#if !ENABLE_MINIMAL 1145#if !ENABLE_MINIMAL
1140void 1146void ecb_cold
1141rxvt_term::scr_backindex () NOTHROW 1147rxvt_term::scr_backindex () NOTHROW
1142{ 1148{
1143 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1145 else 1151 else
… …
1152 * XTERM_SEQ: ESC 9 1158 * XTERM_SEQ: ESC 9
1153 * Move cursor right in row. If we're at the right boundary, shift everything 1159 * Move cursor right in row. If we're at the right boundary, shift everything
1154 * in that row left. Clear right column. 1160 * in that row left. Clear right column.
1155 */ 1161 */
1156#if !ENABLE_MINIMAL 1162#if !ENABLE_MINIMAL
1157void 1163void ecb_cold
1158rxvt_term::scr_forwardindex () NOTHROW 1164rxvt_term::scr_forwardindex () NOTHROW
1159{ 1165{
1160 if (screen.cur.col < ncol - 1) 1166 if (screen.cur.col < ncol - 1)
1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1167 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1162 else 1168 else
… …
1313 scr_blank_line (line, col, num, rstyle); 1319 scr_blank_line (line, col, num, rstyle);
1314} 1320}
1315 1321
1316/* ------------------------------------------------------------------------- */ 1322/* ------------------------------------------------------------------------- */
1317/* 1323/*
1318 * Erase part of whole of the screen 1324 * Erase part or whole of the screen
1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1325 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1326 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1327 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1322 */ 1328 */
1323void 1329void
… …
1332 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1333 1339
1334 switch (mode) 1340 switch (mode)
1335 { 1341 {
1336 case 0: /* erase to end of screen */ 1342 case 0: /* erase to end of screen */
1337 selection_check (1);
1338 scr_erase_line (0); 1343 scr_erase_line (0);
1339 row = screen.cur.row + 1; /* possible OOB */ 1344 row = screen.cur.row + 1; /* possible OOB */
1340 num = nrow - row; 1345 num = nrow - row;
1341 break; 1346 break;
1342 case 1: /* erase to beginning of screen */ 1347 case 1: /* erase to beginning of screen */
1343 selection_check (3);
1344 scr_erase_line (1); 1348 scr_erase_line (1);
1345 row = 0; 1349 row = 0;
1346 num = screen.cur.row; 1350 num = screen.cur.row;
1347 break; 1351 break;
1348 case 2: /* erase whole screen */ 1352 case 2: /* erase whole screen */
1349 selection_check (3);
1350 row = 0; 1353 row = 0;
1351 num = nrow; 1354 num = nrow;
1352 break; 1355 break;
1353 default: 1356 default:
1354 return; 1357 return;
… …
1371 { 1374 {
1372 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1373 1376
1374 if (mapped) 1377 if (mapped)
1375 XClearArea (dpy, vt, 0, 1378 XClearArea (dpy, vt, 0,
1376 Row2Pixel (row - view_start), (unsigned int)width, 1379 Row2Pixel (row - view_start), (unsigned int)vt_width,
1377 (unsigned int)Height2Pixel (num), False); 1380 (unsigned int)Height2Pixel (num), False);
1378 } 1381 }
1379 else 1382 else
1380 { 1383 {
1381 ren = rstyle & (RS_fgMask | RS_bgMask); 1384 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1384 { 1387 {
1385 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1388 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1386 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1387 XFillRectangle (dpy, vt, gc, 1390 XFillRectangle (dpy, vt, gc,
1388 0, Row2Pixel (row - view_start), 1391 0, Row2Pixel (row - view_start),
1389 (unsigned int)width, 1392 (unsigned int)vt_width,
1390 (unsigned int)Height2Pixel (num)); 1393 (unsigned int)Height2Pixel (num));
1391 gcvalue.foreground = pix_colors[Color_fg]; 1394 gcvalue.foreground = pix_colors[Color_fg];
1392 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1395 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1393 } 1396 }
1394 } 1397 }
… …
1416/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1417/* 1420/*
1418 * Fill the screen with `E's 1421 * Fill the screen with `E's
1419 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1422 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1420 */ 1423 */
1421void 1424void ecb_cold
1422rxvt_term::scr_E () NOTHROW 1425rxvt_term::scr_E () NOTHROW
1423{ 1426{
1424 rend_t fs; 1427 rend_t fs;
1425 1428
1426 want_refresh = 1; 1429 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1428 1431
1429 num_scr_allow = 0; 1432 num_scr_allow = 0;
1430 selection_check (3); 1433
1434 row_col_t pos;
1435 pos.row = pos.col = 0;
1436 if (ROWCOL_IS_AFTER (selection.end, pos))
1437 CLEAR_SELECTION ();
1431 1438
1432 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1439 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1433 for (int row = nrow; row--; ) 1440 for (int row = nrow; row--; )
1434 { 1441 {
1435 line_t &line = ROW(row); 1442 line_t &line = ROW(row);
… …
1586/* ------------------------------------------------------------------------- */ 1593/* ------------------------------------------------------------------------- */
1587/* 1594/*
1588 * Set the scrolling region 1595 * Set the scrolling region
1589 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1596 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1590 */ 1597 */
1591void 1598void ecb_cold
1592rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1599rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1593{ 1600{
1594 max_it (top, 0); 1601 max_it (top, 0);
1595 min_it (bot, nrow - 1); 1602 min_it (bot, nrow - 1);
1596 1603
… …
1606/* 1613/*
1607 * Make the cursor visible/invisible 1614 * Make the cursor visible/invisible
1608 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1615 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1609 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1616 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1610 */ 1617 */
1611void 1618void ecb_cold
1612rxvt_term::scr_cursor_visible (int mode) NOTHROW 1619rxvt_term::scr_cursor_visible (int mode) NOTHROW
1613{ 1620{
1614 want_refresh = 1; 1621 want_refresh = 1;
1615 1622
1616 if (mode) 1623 if (mode)
… …
1623/* 1630/*
1624 * Set/unset automatic wrapping 1631 * Set/unset automatic wrapping
1625 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1632 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1626 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1633 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1627 */ 1634 */
1628void 1635void ecb_cold
1629rxvt_term::scr_autowrap (int mode) NOTHROW 1636rxvt_term::scr_autowrap (int mode) NOTHROW
1630{ 1637{
1631 if (mode) 1638 if (mode)
1632 screen.flags |= Screen_Autowrap; 1639 screen.flags |= Screen_Autowrap;
1633 else 1640 else
… …
1642 * Relative mode: line numbers are relative to top margin of scrolling region 1649 * Relative mode: line numbers are relative to top margin of scrolling region
1643 * and the cursor cannot be moved outside. 1650 * and the cursor cannot be moved outside.
1644 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1651 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1645 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1652 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1646 */ 1653 */
1647void 1654void ecb_cold
1648rxvt_term::scr_relative_origin (int mode) NOTHROW 1655rxvt_term::scr_relative_origin (int mode) NOTHROW
1649{ 1656{
1650 if (mode) 1657 if (mode)
1651 screen.flags |= Screen_Relative; 1658 screen.flags |= Screen_Relative;
1652 else 1659 else
… …
1659/* 1666/*
1660 * Set insert/replace mode 1667 * Set insert/replace mode
1661 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1668 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1662 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1669 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1663 */ 1670 */
1664void 1671void ecb_cold
1665rxvt_term::scr_insert_mode (int mode) NOTHROW 1672rxvt_term::scr_insert_mode (int mode) NOTHROW
1666{ 1673{
1667 if (mode) 1674 if (mode)
1668 screen.flags |= Screen_Insert; 1675 screen.flags |= Screen_Insert;
1669 else 1676 else
… …
1675 * Set/Unset tabs 1682 * Set/Unset tabs
1676 * XTERM_SEQ: Set tab at current column : ESC H 1683 * XTERM_SEQ: Set tab at current column : ESC H
1677 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1684 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1678 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1685 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1679 */ 1686 */
1680void 1687void ecb_cold
1681rxvt_term::scr_set_tab (int mode) NOTHROW 1688rxvt_term::scr_set_tab (int mode) NOTHROW
1682{ 1689{
1683 if (mode < 0) 1690 if (mode < 0)
1684 memset (tabs, 0, ncol); 1691 memset (tabs, 0, ncol);
1685 else if (screen.cur.col < ncol) 1692 else if (screen.cur.col < ncol)
… …
1704 if (rvideo_state != on) 1711 if (rvideo_state != on)
1705 { 1712 {
1706 rvideo_state = on; 1713 rvideo_state = on;
1707 1714
1708 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1715 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1709#ifdef HAVE_BG_PIXMAP 1716#ifdef HAVE_IMG
1710 if (bg_pixmap == None) 1717 if (bg_img == 0)
1711#endif 1718#endif
1712 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1719 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1713 1720
1714 XGCValues gcvalue; 1721 XGCValues gcvalue;
1715 gcvalue.foreground = pix_colors[Color_fg]; 1722 gcvalue.foreground = pix_colors[Color_fg];
… …
1724/* ------------------------------------------------------------------------- */ 1731/* ------------------------------------------------------------------------- */
1725/* 1732/*
1726 * Report current cursor position 1733 * Report current cursor position
1727 * XTERM_SEQ: Report position: ESC [ 6 n 1734 * XTERM_SEQ: Report position: ESC [ 6 n
1728 */ 1735 */
1729void 1736void ecb_cold
1730rxvt_term::scr_report_position () NOTHROW 1737rxvt_term::scr_report_position () NOTHROW
1731{ 1738{
1732 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1739 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1733} 1740}
1734 1741
… …
1737 * ------------------------------------------------------------------------- */ 1744 * ------------------------------------------------------------------------- */
1738 1745
1739/* 1746/*
1740 * Set font style 1747 * Set font style
1741 */ 1748 */
1742void 1749void ecb_cold
1743rxvt_term::set_font_style () NOTHROW 1750rxvt_term::set_font_style () NOTHROW
1744{ 1751{
1745#if 0 1752#if 0
1746 switch (charsets [screen.charset]) 1753 switch (charsets [screen.charset])
1747 { 1754 {
… …
1769 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1776 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1770 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1777 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1771 * XTERM_SEQ: Invoke G2 character set: ESC N 1778 * XTERM_SEQ: Invoke G2 character set: ESC N
1772 * XTERM_SEQ: Invoke G3 character set: ESC O 1779 * XTERM_SEQ: Invoke G3 character set: ESC O
1773 */ 1780 */
1774void 1781void ecb_cold
1775rxvt_term::scr_charset_choose (int set) NOTHROW 1782rxvt_term::scr_charset_choose (int set) NOTHROW
1776{ 1783{
1777 screen.charset = set; 1784 screen.charset = set;
1778 set_font_style (); 1785 set_font_style ();
1779} 1786}
… …
1800 * ------------------------------------------------------------------------- */ 1807 * ------------------------------------------------------------------------- */
1801 1808
1802/* 1809/*
1803 * refresh matching text. 1810 * refresh matching text.
1804 */ 1811 */
1805bool 1812bool ecb_cold
1806rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1813rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1807{ 1814{
1808 bool found = false; 1815 bool found = false;
1809 1816
1810 for (int i = 0; i < nrow; i++) 1817 for (int i = 0; i < nrow; i++)
… …
1829 PART_BEG = 0, 1836 PART_BEG = 0,
1830 PART_END, 1837 PART_END,
1831 RC_COUNT 1838 RC_COUNT
1832}; 1839};
1833 1840
1834void 1841void ecb_hot
1835rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1842rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1836{ 1843{
1837 int i; 1844 int i;
1838 row_col_t rc[RC_COUNT]; 1845 row_col_t rc[RC_COUNT];
1839 1846
… …
1876 * Refresh the entire screen 1883 * Refresh the entire screen
1877 */ 1884 */
1878void 1885void
1879rxvt_term::scr_touch (bool refresh) NOTHROW 1886rxvt_term::scr_touch (bool refresh) NOTHROW
1880{ 1887{
1881 scr_expose (0, 0, width, height, refresh); 1888 scr_expose (0, 0, vt_width, vt_height, refresh);
1882} 1889}
1883 1890
1884/* ------------------------------------------------------------------------- */ 1891/* ------------------------------------------------------------------------- */
1885/* 1892/*
1886 * Move the display so that the line represented by scrollbar value Y is at 1893 * Move the display so that the line represented by scrollbar value Y is at
… …
1965 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1966#endif 1973#endif
1967} 1974}
1968 1975
1969/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1970void 1977void ecb_cold
1971rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1972{ 1979{
1973#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1974 int nrows, row_start; 1981 int nrows, row_start;
1975 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
2024/* 2031/*
2025 * Refresh the screen 2032 * Refresh the screen
2026 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2027 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2028 */ 2035 */
2029void 2036void ecb_hot
2030rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2031{ 2038{
2032 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2033 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2034 int i; /* tmp */ 2041 int i; /* tmp */
… …
2048 * A: set up vars 2055 * A: set up vars
2049 */ 2056 */
2050 refresh_count = 0; 2057 refresh_count = 0;
2051 2058
2052 unsigned int old_screen_flags = screen.flags; 2059 unsigned int old_screen_flags = screen.flags;
2053 char have_bg = 0; 2060 bool have_bg = 0;
2054#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2055 have_bg = bg_pixmap != None; 2062 have_bg = bg_img != 0;
2056#endif 2063#endif
2057 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2058 2065
2059 /* 2066 /*
2060 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
… …
2064 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2065#if ENABLE_OVERLAY 2072#if ENABLE_OVERLAY
2066 scr_swap_overlay (); 2073 scr_swap_overlay ();
2067#endif 2074#endif
2068 2075
2069 char showcursor = screen.flags & Screen_VisibleCursor; 2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2070 2077
2071 /* 2078 /*
2072 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2073 */ 2080 */
2074 { 2081 {
2075 unsigned char setoldcursor; 2082 bool setoldcursor;
2076 2083
2077#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2078 if (hidden_cursor) 2085 if (hidden_cursor)
2079 showcursor = 0; 2086 showcursor = 0;
2080#endif 2087#endif
… …
2167 { 2174 {
2168 int16_t nits; 2175 int16_t nits;
2169 int i = num_scr; 2176 int i = num_scr;
2170 int j; 2177 int j;
2171 int len, wlen; 2178 int len, wlen;
2172 dLocal (int, num_scr);
2173 2179
2174 j = nrow; 2180 j = nrow;
2175 wlen = len = -1; 2181 wlen = len = -1;
2176 row = i > 0 ? 0 : j - 1; 2182 row = i > 0 ? 0 : j - 1;
2177 2183
… …
2482 2488
2483 XDrawRectangle (dpy, vt, gc, 2489 XDrawRectangle (dpy, vt, gc,
2484 Col2Pixel (col), 2490 Col2Pixel (col),
2485 Row2Pixel (oldcursor.row), 2491 Row2Pixel (oldcursor.row),
2486 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2492 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2487 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2493 (unsigned int) (Height2Pixel (1) - 1));
2488 } 2494 }
2489 } 2495 }
2490 2496
2491 /* 2497 /*
2492 * H: cleanup selection 2498 * H: cleanup selection
… …
2501 screen.flags = old_screen_flags; 2507 screen.flags = old_screen_flags;
2502 num_scr = 0; 2508 num_scr = 0;
2503 num_scr_allow = 1; 2509 num_scr_allow = 1;
2504} 2510}
2505 2511
2506void 2512void ecb_cold
2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2513rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2508{ 2514{
2509 if (!l.t) 2515 if (!l.valid ())
2510 return; 2516 return;
2511 2517
2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2518 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2513 2519
2514 for (int i = ncol; i--; ) 2520 for (int i = ncol; i--; )
2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2521 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2516} 2522}
2517 2523
2518void 2524void ecb_cold
2519rxvt_term::scr_remap_chars () NOTHROW 2525rxvt_term::scr_remap_chars () NOTHROW
2520{ 2526{
2521 for (int i = total_rows; i--; ) 2527 for (int i = total_rows; i--; )
2522 scr_remap_chars (row_buf [i]); 2528 scr_remap_chars (row_buf [i]);
2523 2529
… …
2526 scr_remap_chars (drawn_buf [i]); 2532 scr_remap_chars (drawn_buf [i]);
2527 scr_remap_chars (swap_buf [i]); 2533 scr_remap_chars (swap_buf [i]);
2528 } 2534 }
2529} 2535}
2530 2536
2531void 2537void ecb_cold
2532rxvt_term::scr_recolour (bool refresh) NOTHROW 2538rxvt_term::scr_recolour (bool refresh) NOTHROW
2533{ 2539{
2534 bool transparent = false; 2540 bool transparent = false;
2535 2541
2536#ifdef HAVE_BG_PIXMAP 2542#ifdef HAVE_IMG
2537 if (bg_pixmap != None) 2543 if (bg_img != 0)
2538 { 2544 {
2539# ifdef ENABLE_TRANSPARENCY 2545# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT) 2546 if (bg_flags & BG_IS_TRANSPARENT)
2541 { 2547 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap); 2548 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); 2549 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2544 2550
2545 transparent = true; 2551 transparent = true;
2546 } 2552 }
2547 else 2553 else
2548# endif 2554# endif
2549 { 2555 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]); 2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap); 2557 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 } 2558 }
2553 } 2559 }
2554 else 2560 else
2555#endif 2561#endif
2556 { 2562 {
… …
2563 if (scrollBar.win) 2569 if (scrollBar.win)
2564 { 2570 {
2565 if (transparent) 2571 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); 2572 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else 2573 else
2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2574 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2569 scrollBar.state = STATE_IDLE; 2575 scrollBar.state = SB_STATE_IDLE;
2570 scrollBar.show (0); 2576 scrollBar.show (0);
2571 } 2577 }
2572 2578
2573 if (refresh) 2579 if (refresh)
2574 { 2580 {
… …
2639 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2645 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2640 srp[col] ^= rstyle; 2646 srp[col] ^= rstyle;
2641} 2647}
2642 2648
2643/* ------------------------------------------------------------------------- */ 2649/* ------------------------------------------------------------------------- */
2644void 2650void ecb_hot
2645rxvt_term::scr_reverse_selection () NOTHROW 2651rxvt_term::scr_reverse_selection () NOTHROW
2646{ 2652{
2647 if (selection.op 2653 if (selection.op
2648 && current_screen == selection.screen 2654 && current_screen == selection.screen
2649 && selection.end.row >= view_start) 2655 && selection.end.row >= view_start)
… …
2668 */ 2674 */
2669#if 0 2675#if 0
2670void 2676void
2671rxvt_term::scr_dump (int fd) NOTHROW 2677rxvt_term::scr_dump (int fd) NOTHROW
2672{ 2678{
2673 int row, wrote; 2679 // if this method is needed, it can be implemented by factoring the
2674 unsigned int width, towrite; 2680 // relevant code in scr_printscreen
2675 const char r1[] = "\n";
2676
2677 for (row = saveLines + top_row;
2678 row < saveLines + nrow - 1; row++)
2679 {
2680 width = row_buf[row].l >= 0 ? row_buf[row].l
2681 : ncol;
2682 for (towrite = width; towrite; towrite -= wrote)
2683 {
2684 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2685 towrite);
2686 if (wrote < 0)
2687 return; /* XXX: death, no report */
2688 }
2689 if (row_buf[row].l >= 0)
2690 if (write (fd, r1, 1) <= 0)
2691 return; /* XXX: death, no report */
2692 }
2693} 2681}
2694#endif 2682#endif
2695 2683
2696/* ------------------------------------------------------------------------- * 2684/* ------------------------------------------------------------------------- *
2697 * CHARACTER SELECTION * 2685 * CHARACTER SELECTION *
2698 * ------------------------------------------------------------------------- */ 2686 * ------------------------------------------------------------------------- */
2699void 2687void
2700rxvt_term::selection_check (int check_more) NOTHROW 2688rxvt_term::selection_check (int check_more) NOTHROW
2701{ 2689{
2702 row_col_t pos;
2703
2704 if (!selection.op) 2690 if (!selection.op)
2705 return; 2691 return;
2706 2692
2707 pos.row = pos.col = 0;
2708 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2693 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2709 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2710 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2695 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2711 || (check_more == 1 2696 || (check_more == 1
2712 && current_screen == selection.screen 2697 && current_screen == selection.screen
2713 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2698 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2714 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2699 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2715 || (check_more == 2
2716 && ROWCOL_IS_BEFORE (selection.beg, pos)
2717 && ROWCOL_IS_AFTER (selection.end, pos))
2718 || (check_more == 3
2719 && ROWCOL_IS_AFTER (selection.end, pos))
2720 || (check_more == 4 /* screen width change */
2721 && (selection.beg.row != selection.end.row
2722 || selection.end.col > ncol)))
2723 CLEAR_SELECTION (); 2700 CLEAR_ALL_SELECTION ();
2724} 2701}
2725 2702
2726/* ------------------------------------------------------------------------- */ 2703/* ------------------------------------------------------------------------- */
2727/* 2704/*
2728 * Paste a selection direct to the command fd 2705 * Paste a selection direct to the command fd
… …
2734 for (unsigned int i = 0; i < len; i++) 2711 for (unsigned int i = 0; i < len; i++)
2735 if (data[i] == C0_LF) 2712 if (data[i] == C0_LF)
2736 data[i] = C0_CR; 2713 data[i] = C0_CR;
2737 2714
2738 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2739 tt_printf ("\e[200~"); 2716 tt_printf ("\x1b[200~");
2740 2717
2741 tt_write (data, len); 2718 tt_write (data, len);
2742 2719
2743 if (priv_modes & PrivMode_BracketPaste) 2720 if (priv_modes & PrivMode_BracketPaste)
2744 tt_printf ("\e[201~"); 2721 tt_printf ("\x1b[201~");
2745} 2722}
2746 2723
2747void 2724void
2748rxvt_term::paste (char *data, unsigned int len) NOTHROW 2725rxvt_term::paste (char *data, unsigned int len) NOTHROW
2749{ 2726{
… …
2969/* ------------------------------------------------------------------------- */ 2946/* ------------------------------------------------------------------------- */
2970/* 2947/*
2971 * Mark or select text based upon number of clicks: 1, 2, or 3 2948 * Mark or select text based upon number of clicks: 1, 2, or 3
2972 * EXT: button 1 press 2949 * EXT: button 1 press
2973 */ 2950 */
2974void 2951void ecb_cold
2975rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2952rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2976{ 2953{
2977 clicks = ((clicks - 1) % 3) + 1; 2954 clicks = ((clicks - 1) % 3) + 1;
2978 selection.clicks = clicks; /* save clicks so extend will work */ 2955 selection.clicks = clicks; /* save clicks so extend will work */
2979 2956
… …
2998 2975
2999/* ------------------------------------------------------------------------- */ 2976/* ------------------------------------------------------------------------- */
3000/* 2977/*
3001 * Mark a selection at the specified col/row 2978 * Mark a selection at the specified col/row
3002 */ 2979 */
3003void 2980void ecb_cold
3004rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2981rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3005{ 2982{
3006 want_refresh = 1; 2983 want_refresh = 1;
3007 2984
3008 selection.mark.row = row + view_start; 2985 selection.mark.row = row + view_start;
… …
3035/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3012/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3036#define DELIMIT_TEXT(x) \ 3013#define DELIMIT_TEXT(x) \
3037 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3014 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3038#define DELIMIT_REND(x) 1 3015#define DELIMIT_REND(x) 1
3039 3016
3040void 3017void ecb_cold
3041rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3018rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3042{ 3019{
3043 int col, row, dirnadd, tcol, trow, w1, w2; 3020 int col, row, dirnadd, tcol, trow, w1, w2;
3044 row_col_t bound; 3021 row_col_t bound;
3045 text_t *stp; 3022 text_t *stp;
… …
3119 * EXT: button 3 press; button 1 or 3 drag 3096 * EXT: button 3 press; button 1 or 3 drag
3120 * flag == 0 ==> button 1 3097 * flag == 0 ==> button 1
3121 * flag == 1 ==> button 3 press 3098 * flag == 1 ==> button 3 press
3122 * flag == 2 ==> button 3 motion 3099 * flag == 2 ==> button 3 motion
3123 */ 3100 */
3124void 3101void ecb_cold
3125rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3102rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3126{ 3103{
3127 int col = clamp (Pixel2Col (x), 0, ncol); 3104 int col = clamp (Pixel2Col (x), 0, ncol);
3128 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3105 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3129 3106
… …
3155 3132
3156/* ------------------------------------------------------------------------- */ 3133/* ------------------------------------------------------------------------- */
3157/* 3134/*
3158 * Extend the selection to the specified col/row 3135 * Extend the selection to the specified col/row
3159 */ 3136 */
3160void 3137void ecb_cold
3161rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3138rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3162{ 3139{
3163 row_col_t pos; 3140 row_col_t pos;
3164 enum { 3141 enum {
3165 LEFT, RIGHT 3142 LEFT, RIGHT
… …
3356 ::swap (selection.beg.col, selection.end.col); 3333 ::swap (selection.beg.col, selection.end.col);
3357#endif 3334#endif
3358} 3335}
3359 3336
3360#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3361void 3338void ecb_cold
3362rxvt_term::selection_remove_trailing_spaces () NOTHROW 3339rxvt_term::selection_remove_trailing_spaces () NOTHROW
3363{ 3340{
3364 int32_t end_col, end_row; 3341 int32_t end_col, end_row;
3365 text_t *stp; 3342 text_t *stp;
3366 3343
… …
3404/* ------------------------------------------------------------------------- */ 3381/* ------------------------------------------------------------------------- */
3405/* 3382/*
3406 * Double click on button 3 when already selected 3383 * Double click on button 3 when already selected
3407 * EXT: button 3 double click 3384 * EXT: button 3 double click
3408 */ 3385 */
3409void 3386void ecb_cold
3410rxvt_term::selection_rotate (int x, int y) NOTHROW 3387rxvt_term::selection_rotate (int x, int y) NOTHROW
3411{ 3388{
3412 selection.clicks = selection.clicks % 3 + 1; 3389 selection.clicks = selection.clicks % 3 + 1;
3413 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3390 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3414} 3391}
… …
3416/* ------------------------------------------------------------------------- */ 3393/* ------------------------------------------------------------------------- */
3417/* 3394/*
3418 * Respond to a request for our current selection 3395 * Respond to a request for our current selection
3419 * EXT: SelectionRequest 3396 * EXT: SelectionRequest
3420 */ 3397 */
3421void 3398void ecb_cold
3422rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3399rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3423{ 3400{
3424 Atom property = rq.property == None ? rq.target : rq.property; 3401 Atom property = rq.property == None ? rq.target : rq.property;
3425 XSelectionEvent ev; 3402 XSelectionEvent ev;
3426 3403
… …
3559 3536
3560 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3537 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3561} 3538}
3562 3539
3563/* ------------------------------------------------------------------------- */ 3540/* ------------------------------------------------------------------------- */
3564#ifdef USE_XIM 3541#if USE_XIM
3565void 3542void ecb_cold
3566rxvt_term::im_set_position (XPoint &pos) NOTHROW 3543rxvt_term::im_set_position (XPoint &pos) NOTHROW
3567{ 3544{
3568 XWindowAttributes xwa; 3545 XWindowAttributes xwa;
3569 3546
3570 XGetWindowAttributes (dpy, vt, &xwa); 3547 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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