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.318 by root, Tue Nov 4 22:44:09 2008 UTC vs.
Revision 1.421 by sf-exg, Sun Jun 10 13:07:56 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
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 seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_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
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = rxvt_malloc (chunk_size);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
163 view_start = 0; 200 view_start = 0;
164 num_scr = 0; 201 num_scr = 0;
165 202
166 if (ncol == 0) 203 if (ncol == 0)
167 ncol = 80; 204 ncol = 80;
… …
187 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
188 225
189 screen.tscroll = 0; 226 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
191 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
192 if (!row_buf) 238 if (!prev_row_buf)
193 { 239 {
194 /* 240 /*
195 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
196 */ 242 */
197 top_row = 0; 243 top_row = 0;
198 term_start = 0; 244 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 245
214 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 263 selection.text = NULL;
232 selection.len = 0; 264 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
235 selection.clicks = 0; 267 selection.clicks = 0;
268 selection.clip_text = NULL;
269 selection.clip_len = 0;
236 } 270 }
237 else 271 else
238 { 272 {
239 /* 273 /*
240 * add or delete rows as appropriate 274 * add or delete rows as appropriate
241 */ 275 */
242 276
243 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
244 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246#if 0
247 if (nrow < prev_nrow)
248 {
249 for (int row = nrow; row < prev_nrow; row++)
250 {
251 lfree (swap_buf [row]);
252 lfree (drawn_buf[row]);
253 }
254 }
255#endif
256
257 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259
260 for (int row = min (nrow, prev_nrow); row--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
261 { 278 {
262 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
264 }
265 281
266 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
267 { 286 }
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 }
271
272 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274 287
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
278 291
279 if (top_row) 292 if (top_row)
280 { 293 {
281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 294 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
282 // to come up with a lean and mean algorithm. 295 // to come up with a lean and mean algorithm.
296 // TODO: maybe optimise when width didn't change
283 297
284 row_col_t ocur = screen.cur; 298 row_col_t ocur = screen.cur;
285 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
286 300
287 do 301 do
288 { 302 {
289 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
290#ifdef DEBUG_STRICT
291 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292#endif
293 int plines = 1; 305 int plines = 1;
294 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
295 307
296 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
297 { 309 {
298 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
299 311
300 plines++; 312 plines++;
301 llen += prev_ncol; 313 llen += prev_ncol;
… …
314 326
315 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
316 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
317 { 329 {
318 qline = row_buf + qrow; 330 qline = row_buf + qrow;
319 lalloc (*qline); 331 qline->alloc (); // redundant with next line
320 qline->l = ncol; 332 qline->l = ncol;
321 qline->is_longer (1); 333 qline->is_longer (1);
322 334
323 int qcol = 0; 335 int qcol = 0;
324 336
… …
339 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
340 // least. 352 // least.
341 if (prow == ocur.row) 353 if (prow == ocur.row)
342 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
343 355
344 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
345 357
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347 359
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
370 { 382 {
371 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
372 384
373 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
374 { 386 {
375 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
376 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
377 389
378 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
379 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
380 } 394 }
381 395
382 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
383 {
384 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
385 }
386 398
387 term_start = 0; 399 term_start = 0;
388 } 400 }
389
390 free (old_buf);
391 delete old_ta;
392 delete old_ra;
393 401
394 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
395 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
396 } 404 }
397 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
415 free (tabs);
416 tabs = (char *)rxvt_malloc (ncol);
417
418 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0;
420
398 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
399 422
400 prev_nrow = nrow; 423 prev_nrow = nrow;
401 prev_ncol = ncol; 424 prev_ncol = ncol;
402 425
403 tt_winch (); 426 tt_winch ();
404 427
405 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
406} 429}
407 430
408/* ------------------------------------------------------------------------- */ 431void ecb_cold
409/*
410 * Free everything. That way malloc debugging can find leakage.
411 */
412void
413rxvt_term::scr_release () NOTHROW 432rxvt_term::scr_release () NOTHROW
414{ 433{
415 if (row_buf) 434 free (chunk); chunk = 0; row_buf = 0;
416 { 435 free (tabs); tabs = 0;
417 delete talloc; talloc = 0;
418 delete ralloc; ralloc = 0;
419
420 free (row_buf);
421 free (swap_buf);
422 free (drawn_buf);
423 row_buf = 0; // signal that we freed all the arrays above
424
425 free (tabs);
426 tabs = 0;
427 }
428} 436}
429 437
430/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
431/* 439/*
432 * Hard/Soft reset 440 * Hard/Soft reset
433 */ 441 */
434void 442void ecb_cold
435rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
436{ 444{
437 scr_release (); 445 scr_release ();
446
438 prev_nrow = prev_ncol = 0; 447 prev_nrow = prev_ncol = 0;
448 rvideo_mode = false;
439 scr_soft_reset (); 449 scr_soft_reset ();
440 scr_reset (); 450 scr_reset ();
441 451
442 scr_clear (true); 452 scr_clear (true);
443 scr_refresh (); 453 scr_refresh ();
444} 454}
445 455
446void 456void ecb_cold
447rxvt_term::scr_soft_reset () 457rxvt_term::scr_soft_reset () NOTHROW
448{ 458{
449 /* only affects modes, nothing drastic such as clearing the screen */ 459 /* only affects modes, nothing drastic such as clearing the screen */
450#if ENABLE_OVERLAY 460#if ENABLE_OVERLAY
451 scr_overlay_off (); 461 scr_overlay_off ();
452#endif 462#endif
453
454 rvideo_mode = false;
455
456 if (current_screen != PRIMARY)
457 scr_swap_screen ();
458
459 free (tabs);
460 tabs = (char *)rxvt_malloc (ncol);
461
462 for (int col = ncol; --col; )
463 tabs [col] = col % TABSIZE == 0;
464 463
465 if (current_screen != PRIMARY) 464 if (current_screen != PRIMARY)
466 scr_swap_screen (); 465 scr_swap_screen ();
467 466
468 scr_scroll_region (0, MAX_ROWS - 1); 467 scr_scroll_region (0, MAX_ROWS - 1);
… …
513 } 512 }
514 513
515 /* boundary check in case screen size changed between SAVE and RESTORE */ 514 /* boundary check in case screen size changed between SAVE and RESTORE */
516 min_it (s->cur.row, nrow - 1); 515 min_it (s->cur.row, nrow - 1);
517 min_it (s->cur.col, ncol - 1); 516 min_it (s->cur.col, ncol - 1);
518#ifdef DEBUG_STRICT
519 assert (s->cur.row >= 0); 517 assert (s->cur.row >= 0);
520 assert (s->cur.col >= 0); 518 assert (s->cur.col >= 0);
521#endif
522} 519}
523 520
524void 521void
525rxvt_term::scr_swap_screen () 522rxvt_term::scr_swap_screen () NOTHROW
526{ 523{
527 if (!option (Opt_secondaryScreen)) 524 if (!option (Opt_secondaryScreen))
528 return; 525 return;
529 526
530 for (int i = prev_nrow; i--; ) 527 for (int i = prev_nrow; i--; )
… …
549 return; 546 return;
550 547
551 want_refresh = 1; 548 want_refresh = 1;
552 view_start = 0; 549 view_start = 0;
553 550
554 selection_check (2); /* check for boundary cross */ 551 /* check for boundary cross */
552 row_col_t pos;
553 pos.row = pos.col = 0;
554 if (ROWCOL_IS_BEFORE (selection.beg, pos)
555 && ROWCOL_IS_AFTER (selection.end, pos))
556 CLEAR_SELECTION ();
555 557
556 int i = current_screen; current_screen = scrn; scrn = i; 558 current_screen = scrn;
557 559
558#if NSCREENS 560#if NSCREENS
559 if (option (Opt_secondaryScreen)) 561 if (option (Opt_secondaryScreen))
560 { 562 {
561 num_scr = 0; 563 num_scr = 0;
… …
625/* 627/*
626 * Scroll text between <row1> and <row2> inclusive, by <count> lines 628 * Scroll text between <row1> and <row2> inclusive, by <count> lines
627 * count positive ==> scroll up 629 * count positive ==> scroll up
628 * count negative ==> scroll down 630 * count negative ==> scroll down
629 */ 631 */
630int 632int ecb_hot
631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 633rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
632{ 634{
633 if (count == 0 || (row1 > row2)) 635 if (count == 0 || (row1 > row2))
634 return 0; 636 return 0;
635 637
… …
638 640
639 if (count > 0 641 if (count > 0
640 && row1 == 0 642 && row1 == 0
641 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 643 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
642 { 644 {
645 min_it (count, total_rows - (nrow - (row2 + 1)));
646
643 top_row = max (top_row - count, -saveLines); 647 top_row = max (top_row - count, -saveLines);
644
645 // scroll everything up 'count' lines
646 term_start = (term_start + count) % total_rows;
647 648
648 // sever bottommost line 649 // sever bottommost line
649 { 650 {
650 line_t &l = ROW(row2 - count); 651 line_t &l = ROW(row2);
651 l.is_longer (0); 652 l.is_longer (0);
652 l.touch (); 653 l.touch ();
653 } 654 }
654 655
656 // scroll everything up 'count' lines
657 term_start = (term_start + count) % total_rows;
658
659 // now copy lines below the scroll region bottom to the
660 // bottom of the screen again, so they look as if they
661 // hadn't moved.
662 for (int i = nrow; --i > row2; )
663 {
664 line_t &l1 = ROW(i - count);
665 line_t &l2 = ROW(i);
666
667 ::swap (l1, l2);
668 l2.touch ();
669 }
670
655 // erase newly scrolled-in lines 671 // erase newly scrolled-in lines
656 for (int i = count; i--; ) 672 for (int i = count; i--; )
657 { 673 {
658 line_t &l = ROW(nrow - 1 - i); 674 line_t &l = ROW(row2 - i);
659 675
660 // optimize if already cleared, can be significant on slow machines 676 // optimise if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem 677 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 678 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 { 679 {
664 scr_blank_line (l, 0, l.l, rstyle); 680 scr_blank_line (l, 0, l.l, rstyle);
665 l.l = 0; 681 l.l = 0;
… …
667 } 683 }
668 else 684 else
669 scr_blank_screen_mem (l, rstyle); 685 scr_blank_screen_mem (l, rstyle);
670 } 686 }
671 687
672 // now copy lines below the scroll region bottom to the
673 // bottom of the screen again, so they look as if they
674 // hadn't moved.
675 for (int i = nrow; --i > row2; )
676 {
677 line_t &l1 = ROW(i - count);
678 line_t &l2 = ROW(i);
679
680 ::swap (l1, l2);
681 l2.touch ();
682 }
683
684 // move and/or clear selection, if any 688 // move and/or clear selection, if any
685 if (selection.op && current_screen == selection.screen) 689 if (selection.op && current_screen == selection.screen
690 && selection.beg.row <= row2)
686 { 691 {
687 selection.beg.row -= count; 692 selection.beg.row -= count;
688 selection.end.row -= count; 693 selection.end.row -= count;
689 selection.mark.row -= count; 694 selection.mark.row -= count;
690 695
691 if (selection.beg.row < top_row 696 selection_check (0);
692 || selection.end.row < top_row
693 || selection.mark.row < top_row)
694 {
695 CLEAR_ALL_SELECTION ();
696 selection.op = SELECTION_CLEAR;
697 }
698 } 697 }
699 698
700 // finally move the view window, if desired 699 // finally move the view window, if desired
701 if (option (Opt_scrollWithBuffer) 700 if (option (Opt_scrollWithBuffer)
702 && view_start != 0 701 && view_start != 0
… …
732 } 731 }
733 732
734 // use a simple and robust scrolling algorithm, this 733 // use a simple and robust scrolling algorithm, this
735 // part of scr_scroll_text is not time-critical. 734 // part of scr_scroll_text is not time-critical.
736 735
736 // sever line above scroll region
737 if (row1)
738 {
739 line_t &l = ROW(row1 - 1);
740 l.is_longer (0);
741 l.touch ();
742 }
743
737 int rows = row2 - row1 + 1; 744 int rows = row2 - row1 + 1;
738 745
739 min_it (count, rows); 746 min_it (count, rows);
740 747
741 line_t *temp_buf = row_buf + total_rows; 748 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
742 749
743 for (int row = 0; row < rows; row++) 750 for (int row = 0; row < rows; row++)
744 { 751 {
745 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 752 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
746 753
… …
748 scr_blank_screen_mem (temp_buf [row], rstyle); 755 scr_blank_screen_mem (temp_buf [row], rstyle);
749 } 756 }
750 757
751 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
752 ROW(row1 + row) = temp_buf [row]; 759 ROW(row1 + row) = temp_buf [row];
760
761 // sever bottommost line
762 {
763 line_t &l = ROW(row2);
764 l.is_longer (0);
765 l.touch ();
766 }
753 } 767 }
754 768
755 return count; 769 return count;
756} 770}
757 771
758/* ------------------------------------------------------------------------- */ 772/* ------------------------------------------------------------------------- */
759/* 773/*
760 * Add text given in <str> of length <len> to screen struct 774 * Add text given in <str> of length <len> to screen struct
761 */ 775 */
762void 776void ecb_hot
763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 777rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
764{ 778{
765 if (len <= 0) /* sanity */ 779 if (len <= 0) /* sanity */
766 return; 780 return;
767 781
768 unsigned char checksel; 782 bool checksel;
769 unicode_t c; 783 unicode_t c;
770 int ncol = this->ncol; 784 int ncol = this->ncol;
771 const wchar_t *strend = str + len; 785 const wchar_t *strend = str + len;
772 786
773 want_refresh = 1; 787 want_refresh = 1;
… …
786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 800 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
787 screen.cur.row -= minlines; 801 screen.cur.row -= minlines;
788 } 802 }
789 } 803 }
790 804
791#ifdef DEBUG_STRICT
792 assert (screen.cur.col < ncol); 805 assert (screen.cur.col < ncol);
793 assert (screen.cur.row < nrow 806 assert (screen.cur.row < nrow
794 && screen.cur.row >= top_row); 807 && screen.cur.row >= top_row);
795#endif
796 int row = screen.cur.row; 808 int row = screen.cur.row;
797 809
798 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 810 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
799 811
800 line_t *line = &ROW(row); 812 line_t *line = &ROW(row);
801 813
802 while (str < strend) 814 while (str < strend)
803 { 815 {
804 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 816 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
805 817
806 if (expect_false (c < 0x20)) 818 if (ecb_unlikely (c < 0x20))
807 if (c == C0_LF) 819 if (c == C0_LF)
808 { 820 {
809 max_it (line->l, screen.cur.col); 821 max_it (line->l, screen.cur.col);
810 822
811 screen.flags &= ~Screen_WrapNext; 823 screen.flags &= ~Screen_WrapNext;
… …
830 { 842 {
831 scr_tab (1, true); 843 scr_tab (1, true);
832 continue; 844 continue;
833 } 845 }
834 846
835 if (expect_false ( 847 if (ecb_unlikely (
836 checksel /* see if we're writing within selection */ 848 checksel /* see if we're writing within selection */
837 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 849 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
838 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 850 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
839 )) 851 ))
840 { 852 {
… …
845 * should be a similar check. 857 * should be a similar check.
846 */ 858 */
847 CLEAR_SELECTION (); 859 CLEAR_SELECTION ();
848 } 860 }
849 861
850 if (expect_false (screen.flags & Screen_WrapNext)) 862 if (ecb_unlikely (screen.flags & Screen_WrapNext))
851 { 863 {
852 scr_do_wrap (); 864 scr_do_wrap ();
853 865
854 line->l = ncol; 866 line->l = ncol;
855 line->is_longer (1); 867 line->is_longer (1);
… …
857 row = screen.cur.row; 869 row = screen.cur.row;
858 line = &ROW(row); /* _must_ refresh */ 870 line = &ROW(row); /* _must_ refresh */
859 } 871 }
860 872
861 // some utf-8 decoders "decode" surrogate characters: let's fix this. 873 // some utf-8 decoders "decode" surrogate characters: let's fix this.
862 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 874 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
863 c = 0xfffd; 875 c = 0xfffd;
864 876
865 // rely on wcwidth to tell us the character width, do wcwidth before 877 // rely on wcwidth to tell us the character width, do wcwidth before
866 // further replacements, as wcwidth might return -1 for the line 878 // further replacements, as wcwidth might return -1 for the line
867 // drawing characters below as they might be invalid in the current 879 // drawing characters below as they might be invalid in the current
868 // locale. 880 // locale.
869 int width = WCWIDTH (c); 881 int width = WCWIDTH (c);
870 882
871 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 883 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
872 { 884 {
873 // vt100 special graphics and line drawing 885 // vt100 special graphics and line drawing
874 // 5f-7e standard vt100 886 // 5f-7e standard vt100
875 // 40-5e rxvt extension for extra curses acs chars 887 // 40-5e rxvt extension for extra curses acs chars
876 static uint16_t vt100_0[62] = { // 41 .. 7e 888 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
889 c = vt100_0[c - 0x41]; 901 c = vt100_0[c - 0x41];
890 width = 1; // vt100 line drawing characters are always single-width 902 width = 1; // vt100 line drawing characters are always single-width
891 } 903 }
892 } 904 }
893 905
894 if (expect_false (screen.flags & Screen_Insert)) 906 if (ecb_unlikely (screen.flags & Screen_Insert))
895 scr_insdel_chars (width, INSERT); 907 scr_insdel_chars (width, INSERT);
896 908
897 if (width != 0) 909 if (width != 0)
898 { 910 {
899#if !UNICODE_3 911#if !UNICODE_3
… …
904# else 916# else
905 c = 0xfffd; 917 c = 0xfffd;
906# endif 918# endif
907#endif 919#endif
908 920
921 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
922
923 // if the character doesn't fit into the remaining columns...
924 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
925 {
926 if (screen.flags & Screen_Autowrap)
927 {
928 // ... artificially enlargen the previous one
929 c = NOCHAR;
930 // and try the same character next loop iteration
931 --str;
932 }
933 else
934 screen.cur.col = ncol - width;
935 }
936
909 // nuke the character at this position, if required 937 // nuke the character at this position, if required
910 if (expect_false ( 938 // due to wonderful coincidences everywhere else in this loop
939 // we never have to check for overwriting a wide char itself,
940 // only its tail.
911 line->t[screen.cur.col] == NOCHAR 941 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
912 || (screen.cur.col < ncol - 1
913 && line->t[screen.cur.col + 1] == NOCHAR)
914 ))
915 scr_kill_char (*line, screen.cur.col); 942 scr_kill_char (*line, screen.cur.col);
916
917 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
918
919 // if the character doesn't fit into the remaining columns...
920 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
921 {
922 // ... artificially enlargen the previous one
923 c = NOCHAR;
924 // and try the same character next loop iteration
925 --str;
926 }
927 943
928 line->touch (); 944 line->touch ();
929 945
930 do 946 do
931 { 947 {
932 line->t[screen.cur.col] = c; 948 line->t[screen.cur.col] = c;
933 line->r[screen.cur.col] = rend; 949 line->r[screen.cur.col] = rend;
934 950
935 if (expect_true (screen.cur.col < ncol - 1)) 951 if (ecb_likely (screen.cur.col < ncol - 1))
936 screen.cur.col++; 952 screen.cur.col++;
937 else 953 else
938 { 954 {
939 line->l = ncol; 955 line->l = ncol;
940 if (screen.flags & Screen_Autowrap) 956 if (screen.flags & Screen_Autowrap)
941 screen.flags |= Screen_WrapNext; 957 screen.flags |= Screen_WrapNext;
942 break; 958
959 goto end_of_line;
943 } 960 }
944 961
945 c = NOCHAR; 962 c = NOCHAR;
946 } 963 }
947 while (expect_false (--width > 0)); 964 while (ecb_unlikely (--width > 0));
948 965
949 // pad with spaces when overwriting wide character with smaller one 966 // pad with spaces when overwriting wide character with smaller one
950 if (expect_false (!width)) 967 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
951 { 968 {
952 line->touch ();
953
954 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
955 {
956 line->t[c] = ' '; 969 line->t[c] = ' ';
957 line->r[c] = rend; 970 line->r[c] = rend;
958 }
959 } 971 }
972
973end_of_line:
974 ;
960 } 975 }
961#if ENABLE_COMBINING 976#if ENABLE_COMBINING
962 else // width == 0 977 else // width == 0
963 { 978 {
964 if (c != 0xfeff) // ignore BOM 979 if (c != 0xfeff) // ignore BOM
… …
1004#endif 1019#endif
1005 } 1020 }
1006 1021
1007 max_it (line->l, screen.cur.col); 1022 max_it (line->l, screen.cur.col);
1008 1023
1009#ifdef DEBUG_STRICT
1010 assert (screen.cur.row >= 0); 1024 assert (screen.cur.row >= 0);
1011#endif
1012} 1025}
1013 1026
1014/* ------------------------------------------------------------------------- */ 1027/* ------------------------------------------------------------------------- */
1015/* 1028/*
1016 * Process Backspace. Move back the cursor back a position, wrap if have to 1029 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1029 1042
1030 want_refresh = 1; 1043 want_refresh = 1;
1031#endif 1044#endif
1032 } 1045 }
1033 } 1046 }
1047 else if (screen.flags & Screen_WrapNext)
1048 screen.flags &= ~Screen_WrapNext;
1034 else 1049 else
1035 scr_gotorc (0, -1, RELATIVE); 1050 scr_gotorc (0, -1, RELATIVE);
1036} 1051}
1037 1052
1038/* ------------------------------------------------------------------------- */ 1053/* ------------------------------------------------------------------------- */
… …
1116 * XTERM_SEQ: ESC 6 1131 * XTERM_SEQ: ESC 6
1117 * Move cursor left in row. If we're at the left boundary, shift everything 1132 * Move cursor left in row. If we're at the left boundary, shift everything
1118 * in that row right. Clear left column. 1133 * in that row right. Clear left column.
1119 */ 1134 */
1120#if !ENABLE_MINIMAL 1135#if !ENABLE_MINIMAL
1121void 1136void ecb_cold
1122rxvt_term::scr_backindex () NOTHROW 1137rxvt_term::scr_backindex () NOTHROW
1123{ 1138{
1124 if (screen.cur.col > 0) 1139 if (screen.cur.col > 0)
1125 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1140 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1126 else 1141 else
… …
1133 * XTERM_SEQ: ESC 9 1148 * XTERM_SEQ: ESC 9
1134 * Move cursor right in row. If we're at the right boundary, shift everything 1149 * Move cursor right in row. If we're at the right boundary, shift everything
1135 * in that row left. Clear right column. 1150 * in that row left. Clear right column.
1136 */ 1151 */
1137#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1138void 1153void ecb_cold
1139rxvt_term::scr_forwardindex () NOTHROW 1154rxvt_term::scr_forwardindex () NOTHROW
1140{ 1155{
1141 if (screen.cur.col < ncol - 1) 1156 if (screen.cur.col < ncol - 1)
1142 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1143 else 1158 else
… …
1294 scr_blank_line (line, col, num, rstyle); 1309 scr_blank_line (line, col, num, rstyle);
1295} 1310}
1296 1311
1297/* ------------------------------------------------------------------------- */ 1312/* ------------------------------------------------------------------------- */
1298/* 1313/*
1299 * Erase part of whole of the screen 1314 * Erase part or whole of the screen
1300 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1315 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1301 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1316 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1302 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1317 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1303 */ 1318 */
1304void 1319void
… …
1313 ZERO_SCROLLBACK (); 1328 ZERO_SCROLLBACK ();
1314 1329
1315 switch (mode) 1330 switch (mode)
1316 { 1331 {
1317 case 0: /* erase to end of screen */ 1332 case 0: /* erase to end of screen */
1318 selection_check (1);
1319 scr_erase_line (0); 1333 scr_erase_line (0);
1320 row = screen.cur.row + 1; /* possible OOB */ 1334 row = screen.cur.row + 1; /* possible OOB */
1321 num = nrow - row; 1335 num = nrow - row;
1322 break; 1336 break;
1323 case 1: /* erase to beginning of screen */ 1337 case 1: /* erase to beginning of screen */
1324 selection_check (3);
1325 scr_erase_line (1); 1338 scr_erase_line (1);
1326 row = 0; 1339 row = 0;
1327 num = screen.cur.row; 1340 num = screen.cur.row;
1328 break; 1341 break;
1329 case 2: /* erase whole screen */ 1342 case 2: /* erase whole screen */
1330 selection_check (3);
1331 row = 0; 1343 row = 0;
1332 num = nrow; 1344 num = nrow;
1333 break; 1345 break;
1334 default: 1346 default:
1335 return; 1347 return;
… …
1344 if (row >= nrow) /* Out Of Bounds */ 1356 if (row >= nrow) /* Out Of Bounds */
1345 return; 1357 return;
1346 1358
1347 min_it (num, nrow - row); 1359 min_it (num, nrow - row);
1348 1360
1349 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1350 if (rstyle & (RS_RVid | RS_Uline)) 1361 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1351 ren = (rend_t) ~RS_None; 1362 ren = (rend_t) ~RS_None;
1352 else if (GET_BASEBG (rstyle) == Color_bg) 1363 else if (GET_BASEBG (rstyle) == Color_bg)
1353 { 1364 {
1354 ren = DEFAULT_RSTYLE; 1365 ren = DEFAULT_RSTYLE;
1355 1366
1356 if (mapped) 1367 if (mapped)
1357 XClearArea (dpy, vt, 0, 1368 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row), (unsigned int)width, 1369 Row2Pixel (row - view_start), (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num), False); 1370 (unsigned int)Height2Pixel (num), False);
1360 } 1371 }
1361 else 1372 else
1362 { 1373 {
1363 ren = rstyle & (RS_fgMask | RS_bgMask); 1374 ren = rstyle & (RS_fgMask | RS_bgMask);
1364 1375
1376 if (mapped)
1377 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1378 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1379 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1380 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row), 1381 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1382 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1383 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1384 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1386 }
1373 } 1387 }
1374 1388
1375 for (; num--; row++) 1389 for (; num--; row++)
1376 { 1390 {
1377 scr_blank_screen_mem (ROW(row), rstyle); 1391 scr_blank_screen_mem (ROW(row), rstyle);
1392
1393 if (row - view_start < nrow)
1378 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1394 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1379 } 1395 }
1380} 1396}
1381 1397
1382#if !ENABLE_MINIMAL 1398#if !ENABLE_MINIMAL
1383void 1399void
… …
1393/* ------------------------------------------------------------------------- */ 1409/* ------------------------------------------------------------------------- */
1394/* 1410/*
1395 * Fill the screen with `E's 1411 * Fill the screen with `E's
1396 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1412 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1397 */ 1413 */
1398void 1414void ecb_cold
1399rxvt_term::scr_E () NOTHROW 1415rxvt_term::scr_E () NOTHROW
1400{ 1416{
1401 rend_t fs; 1417 rend_t fs;
1402 1418
1403 want_refresh = 1; 1419 want_refresh = 1;
1404 ZERO_SCROLLBACK (); 1420 ZERO_SCROLLBACK ();
1405 1421
1406 num_scr_allow = 0; 1422 num_scr_allow = 0;
1407 selection_check (3); 1423
1424 row_col_t pos;
1425 pos.row = pos.col = 0;
1426 if (ROWCOL_IS_AFTER (selection.end, pos))
1427 CLEAR_SELECTION ();
1408 1428
1409 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1429 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1410 for (int row = nrow; row--; ) 1430 for (int row = nrow; row--; )
1411 { 1431 {
1412 line_t &line = ROW(row); 1432 line_t &line = ROW(row);
… …
1536 { 1556 {
1537 line->t[col] = line->t[col + count]; 1557 line->t[col] = line->t[col + count];
1538 line->r[col] = line->r[col + count]; 1558 line->r[col] = line->r[col + count];
1539 } 1559 }
1540 1560
1541 scr_blank_line (*line, ncol - count, count, 1561 scr_blank_line (*line, ncol - count, count, rstyle);
1542 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1543 1562
1544 if (selection.op && current_screen == selection.screen 1563 if (selection.op && current_screen == selection.screen
1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1564 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1546 { 1565 {
1547 if (selection.end.row != screen.cur.row 1566 if (selection.end.row != screen.cur.row
… …
1564/* ------------------------------------------------------------------------- */ 1583/* ------------------------------------------------------------------------- */
1565/* 1584/*
1566 * Set the scrolling region 1585 * Set the scrolling region
1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1586 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1568 */ 1587 */
1569void 1588void ecb_cold
1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1589rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1571{ 1590{
1572 max_it (top, 0); 1591 max_it (top, 0);
1573 min_it (bot, nrow - 1); 1592 min_it (bot, nrow - 1);
1574 1593
… …
1584/* 1603/*
1585 * Make the cursor visible/invisible 1604 * Make the cursor visible/invisible
1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1605 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1606 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1588 */ 1607 */
1589void 1608void ecb_cold
1590rxvt_term::scr_cursor_visible (int mode) NOTHROW 1609rxvt_term::scr_cursor_visible (int mode) NOTHROW
1591{ 1610{
1592 want_refresh = 1; 1611 want_refresh = 1;
1593 1612
1594 if (mode) 1613 if (mode)
… …
1601/* 1620/*
1602 * Set/unset automatic wrapping 1621 * Set/unset automatic wrapping
1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1622 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1623 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1605 */ 1624 */
1606void 1625void ecb_cold
1607rxvt_term::scr_autowrap (int mode) NOTHROW 1626rxvt_term::scr_autowrap (int mode) NOTHROW
1608{ 1627{
1609 if (mode) 1628 if (mode)
1610 screen.flags |= Screen_Autowrap; 1629 screen.flags |= Screen_Autowrap;
1611 else 1630 else
… …
1620 * Relative mode: line numbers are relative to top margin of scrolling region 1639 * Relative mode: line numbers are relative to top margin of scrolling region
1621 * and the cursor cannot be moved outside. 1640 * and the cursor cannot be moved outside.
1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1641 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1642 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1624 */ 1643 */
1625void 1644void ecb_cold
1626rxvt_term::scr_relative_origin (int mode) NOTHROW 1645rxvt_term::scr_relative_origin (int mode) NOTHROW
1627{ 1646{
1628 if (mode) 1647 if (mode)
1629 screen.flags |= Screen_Relative; 1648 screen.flags |= Screen_Relative;
1630 else 1649 else
… …
1637/* 1656/*
1638 * Set insert/replace mode 1657 * Set insert/replace mode
1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1658 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1659 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1641 */ 1660 */
1642void 1661void ecb_cold
1643rxvt_term::scr_insert_mode (int mode) NOTHROW 1662rxvt_term::scr_insert_mode (int mode) NOTHROW
1644{ 1663{
1645 if (mode) 1664 if (mode)
1646 screen.flags |= Screen_Insert; 1665 screen.flags |= Screen_Insert;
1647 else 1666 else
… …
1653 * Set/Unset tabs 1672 * Set/Unset tabs
1654 * XTERM_SEQ: Set tab at current column : ESC H 1673 * XTERM_SEQ: Set tab at current column : ESC H
1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1674 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1675 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1657 */ 1676 */
1658void 1677void ecb_cold
1659rxvt_term::scr_set_tab (int mode) NOTHROW 1678rxvt_term::scr_set_tab (int mode) NOTHROW
1660{ 1679{
1661 if (mode < 0) 1680 if (mode < 0)
1662 memset (tabs, 0, ncol); 1681 memset (tabs, 0, ncol);
1663 else if (screen.cur.col < ncol) 1682 else if (screen.cur.col < ncol)
… …
1683 { 1702 {
1684 rvideo_state = on; 1703 rvideo_state = on;
1685 1704
1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1705 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP 1706#ifdef HAVE_BG_PIXMAP
1688 if (bgPixmap.pixmap == None) 1707 if (bg_img == 0)
1689#endif 1708#endif
1690 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1709 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1691 1710
1692 XGCValues gcvalue; 1711 XGCValues gcvalue;
1693 gcvalue.foreground = pix_colors[Color_fg]; 1712 gcvalue.foreground = pix_colors[Color_fg];
… …
1702/* ------------------------------------------------------------------------- */ 1721/* ------------------------------------------------------------------------- */
1703/* 1722/*
1704 * Report current cursor position 1723 * Report current cursor position
1705 * XTERM_SEQ: Report position: ESC [ 6 n 1724 * XTERM_SEQ: Report position: ESC [ 6 n
1706 */ 1725 */
1707void 1726void ecb_cold
1708rxvt_term::scr_report_position () NOTHROW 1727rxvt_term::scr_report_position () NOTHROW
1709{ 1728{
1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1729 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1711} 1730}
1712 1731
… …
1715 * ------------------------------------------------------------------------- */ 1734 * ------------------------------------------------------------------------- */
1716 1735
1717/* 1736/*
1718 * Set font style 1737 * Set font style
1719 */ 1738 */
1720void 1739void ecb_cold
1721rxvt_term::set_font_style () NOTHROW 1740rxvt_term::set_font_style () NOTHROW
1722{ 1741{
1723#if 0 1742#if 0
1724 switch (charsets [screen.charset]) 1743 switch (charsets [screen.charset])
1725 { 1744 {
… …
1747 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1766 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1767 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1749 * XTERM_SEQ: Invoke G2 character set: ESC N 1768 * XTERM_SEQ: Invoke G2 character set: ESC N
1750 * XTERM_SEQ: Invoke G3 character set: ESC O 1769 * XTERM_SEQ: Invoke G3 character set: ESC O
1751 */ 1770 */
1752void 1771void ecb_cold
1753rxvt_term::scr_charset_choose (int set) NOTHROW 1772rxvt_term::scr_charset_choose (int set) NOTHROW
1754{ 1773{
1755 screen.charset = set; 1774 screen.charset = set;
1756 set_font_style (); 1775 set_font_style ();
1757} 1776}
… …
1778 * ------------------------------------------------------------------------- */ 1797 * ------------------------------------------------------------------------- */
1779 1798
1780/* 1799/*
1781 * refresh matching text. 1800 * refresh matching text.
1782 */ 1801 */
1783bool 1802bool ecb_cold
1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1803rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1785{ 1804{
1786 bool found = false; 1805 bool found = false;
1787 1806
1788 for (int i = 0; i < nrow; i++) 1807 for (int i = 0; i < nrow; i++)
… …
1807 PART_BEG = 0, 1826 PART_BEG = 0,
1808 PART_END, 1827 PART_END,
1809 RC_COUNT 1828 RC_COUNT
1810}; 1829};
1811 1830
1812void 1831void ecb_hot
1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1832rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1814{ 1833{
1815 int i; 1834 int i;
1816 row_col_t rc[RC_COUNT]; 1835 row_col_t rc[RC_COUNT];
1817 1836
… …
1837 for (i = PART_BEG; i < RC_COUNT; i++) 1856 for (i = PART_BEG; i < RC_COUNT; i++)
1838 { 1857 {
1839 min_it (rc[i].col, ncol - 1); 1858 min_it (rc[i].col, ncol - 1);
1840 min_it (rc[i].row, nrow - 1); 1859 min_it (rc[i].row, nrow - 1);
1841 } 1860 }
1842// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1861
1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1862 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1844 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1863 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1845 1864
1846 num_scr_allow = 0; 1865 num_scr_allow = 0;
1847 1866
… …
1854 * Refresh the entire screen 1873 * Refresh the entire screen
1855 */ 1874 */
1856void 1875void
1857rxvt_term::scr_touch (bool refresh) NOTHROW 1876rxvt_term::scr_touch (bool refresh) NOTHROW
1858{ 1877{
1859 scr_expose (0, 0, width, height, refresh); 1878 scr_expose (0, 0, vt_width, vt_height, refresh);
1860} 1879}
1861 1880
1862/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1863/* 1882/*
1864 * Move the display so that the line represented by scrollbar value Y is at 1883 * Move the display so that the line represented by scrollbar value Y is at
… …
1920 1939
1921# ifndef NO_MAPALERT 1940# ifndef NO_MAPALERT
1922# ifdef MAPALERT_OPTION 1941# ifdef MAPALERT_OPTION
1923 if (option (Opt_mapAlert)) 1942 if (option (Opt_mapAlert))
1924# endif 1943# endif
1925 XMapWindow (dpy, parent[0]); 1944 XMapWindow (dpy, parent);
1926# endif 1945# endif
1927 1946
1928# if ENABLE_FRILLS 1947# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell)) 1948 if (option (Opt_urgentOnBell))
1930 set_urgency (1); 1949 set_urgency (1);
… …
1938 1957
1939 bell_ev.start (VISUAL_BELL_DURATION); 1958 bell_ev.start (VISUAL_BELL_DURATION);
1940 } 1959 }
1941 else 1960 else
1942 XBell (dpy, 0); 1961 XBell (dpy, 0);
1962 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1943#endif 1963#endif
1944} 1964}
1945 1965
1946/* ------------------------------------------------------------------------- */ 1966/* ------------------------------------------------------------------------- */
1947/* ARGSUSED */ 1967void ecb_cold
1948void
1949rxvt_term::scr_printscreen (int fullhist) NOTHROW 1968rxvt_term::scr_printscreen (int fullhist) NOTHROW
1950{ 1969{
1951#ifdef PRINTPIPE 1970#ifdef PRINTPIPE
1952 int nrows, row_start; 1971 int nrows, row_start;
1953 FILE *fd = popen_printer (); 1972 FILE *fd = popen_printer ();
… …
1966 row_start = view_start; 1985 row_start = view_start;
1967 } 1986 }
1968 1987
1969 wctomb (0, 0); 1988 wctomb (0, 0);
1970 1989
1971 for (int r1 = 0; r1 < nrows; r1++) 1990 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1972 { 1991 {
1973 text_t *tp = ROW(r1).t; 1992 text_t *tp = ROW(r1).t;
1974 int len = ROW(r1).l; 1993 int len = ROW(r1).l;
1975 1994
1976 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1995 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2002/* 2021/*
2003 * Refresh the screen 2022 * Refresh the screen
2004 * drawn_text/drawn_rend contain the screen information before the update. 2023 * drawn_text/drawn_rend contain the screen information before the update.
2005 * screen.text/screen.rend contain what the screen will change to. 2024 * screen.text/screen.rend contain what the screen will change to.
2006 */ 2025 */
2007void 2026void ecb_hot
2008rxvt_term::scr_refresh () NOTHROW 2027rxvt_term::scr_refresh () NOTHROW
2009{ 2028{
2010 unsigned char have_bg,
2011 showcursor; /* show the cursor */
2012 int16_t col, row, /* column/row we're processing */ 2029 int16_t col, row, /* column/row we're processing */
2013 ocrow; /* old cursor row */ 2030 ocrow; /* old cursor row */
2014 int i; /* tmp */ 2031 int i; /* tmp */
2015#ifndef NO_CURSORCOLOR 2032#ifndef NO_CURSORCOLOR
2016 rend_t cc1; /* store colours at cursor position (s) */ 2033 rend_t cc1; /* store colours at cursor position (s) */
… …
2027 /* 2044 /*
2028 * A: set up vars 2045 * A: set up vars
2029 */ 2046 */
2030 refresh_count = 0; 2047 refresh_count = 0;
2031 2048
2049 unsigned int old_screen_flags = screen.flags;
2032 have_bg = 0; 2050 bool have_bg = 0;
2033#ifdef HAVE_BG_PIXMAP 2051#ifdef HAVE_BG_PIXMAP
2034 have_bg = bgPixmap.pixmap != None; 2052 have_bg = bg_img != 0;
2035#endif 2053#endif
2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2054 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2037 2055
2038 /* 2056 /*
2039 * B: reverse any characters which are selected 2057 * B: reverse any characters which are selected
2040 */ 2058 */
2041 scr_reverse_selection (); 2059 scr_reverse_selection ();
2042 2060
2061 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2062#if ENABLE_OVERLAY
2063 scr_swap_overlay ();
2064#endif
2065
2066 bool showcursor = screen.flags & Screen_VisibleCursor;
2067
2043 /* 2068 /*
2044 * C: set the cursor character (s) 2069 * C: set the cursor character (s)
2045 */ 2070 */
2046 { 2071 {
2047 unsigned char setoldcursor; 2072 bool setoldcursor;
2048 2073
2049 showcursor = (screen.flags & Screen_VisibleCursor);
2050#ifdef CURSOR_BLINK 2074#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2075 if (hidden_cursor)
2052 showcursor = 0; 2076 showcursor = 0;
2053#endif 2077#endif
2054 2078
… …
2082 ccol2 = bgcolor_of (rstyle); 2106 ccol2 = bgcolor_of (rstyle);
2083#else 2107#else
2084 ccol2 = Color_bg; 2108 ccol2 = Color_bg;
2085#endif 2109#endif
2086 2110
2087 if (showcursor && focus) 2111 if (focus)
2088 { 2112 {
2089 if (option (Opt_cursorUnderline)) 2113 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2114 *crp ^= RS_Uline;
2091 else 2115 else
2092 { 2116 {
… …
2127 oldcursor.col = screen.cur.col; 2151 oldcursor.col = screen.cur.col;
2128 } 2152 }
2129 } 2153 }
2130 } 2154 }
2131 2155
2132 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2133#if ENABLE_OVERLAY
2134 scr_swap_overlay ();
2135#endif
2136
2137#ifndef NO_SLOW_LINK_SUPPORT 2156#ifndef NO_SLOW_LINK_SUPPORT
2138 /* 2157 /*
2139 * D: CopyArea pass - very useful for slower links 2158 * D: CopyArea pass - very useful for slower links
2140 * This has been deliberately kept simple. 2159 * This has been deliberately kept simple.
2141 */ 2160 */
… …
2145 { 2164 {
2146 int16_t nits; 2165 int16_t nits;
2147 int i = num_scr; 2166 int i = num_scr;
2148 int j; 2167 int j;
2149 int len, wlen; 2168 int len, wlen;
2150 dLocal (int, num_scr);
2151 2169
2152 j = nrow; 2170 j = nrow;
2153 wlen = len = -1; 2171 wlen = len = -1;
2154 row = i > 0 ? 0 : j - 1; 2172 row = i > 0 ? 0 : j - 1;
2155 2173
… …
2230 continue; 2248 continue;
2231 2249
2232 // redraw one or more characters 2250 // redraw one or more characters
2233 2251
2234 // seek to the beginning of wide characters 2252 // seek to the beginning of wide characters
2235 while (expect_false (stp[col] == NOCHAR && col > 0)) 2253 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2236 --col; 2254 --col;
2237 2255
2238 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2256 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2239 text_t *text = stp + col; 2257 text_t *text = stp + col;
2240 int count = 1; 2258 int count = 1;
2241 2259
2242 dtp[col] = stp[col]; 2260 dtp[col] = stp[col];
2243 drp[col] = rend; 2261 drp[col] = rend;
… …
2247 for (i = 0; ++col < ncol; ) 2265 for (i = 0; ++col < ncol; )
2248 { 2266 {
2249 if (stp[col] == NOCHAR) 2267 if (stp[col] == NOCHAR)
2250 { 2268 {
2251 dtp[col] = stp[col]; 2269 dtp[col] = stp[col];
2252 drp[col] = rend; 2270 drp[col] = srp[col];
2271
2253 count++; 2272 count++;
2254 i++; 2273 i++;
2255 2274
2256 continue; 2275 continue;
2257 } 2276 }
… …
2277 2296
2278 col--; /* went one too far. move back */ 2297 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2298 count -= i; /* dump any matching trailing chars */
2280 2299
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2300 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2301 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2302 count++, i--;
2284 2303
2285 /* 2304 /*
2286 * Determine the attributes for the string 2305 * Determine the attributes for the string
2287 */ 2306 */
2288 int fore = fgcolor_of (rend); // desired foreground 2307 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2308 int back = bgcolor_of (rend); // desired background
2290 2309
2291 // only do special processing if any attributes are set, which is unlikely 2310 // only do special processing if any attributes are set, which is unlikely
2292 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2311 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293 { 2312 {
2294 bool invert = rend & RS_RVid; 2313 bool invert = rend & RS_RVid;
2295 2314
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2315#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2316 if (rend & RS_Bold && fore == Color_fg)
… …
2316 2335
2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2336 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318 fore = Color_UL; 2337 fore = Color_UL;
2319#endif 2338#endif
2320 2339
2340#ifdef OPTION_HC
2341 if (rend & RS_Sel)
2342 {
2343 /* invert the column if no highlightColor is set or it is the
2344 * current cursor column */
2345 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2346 && ISSET_PIXCOLOR (Color_HC))
2347 {
2348 if (ISSET_PIXCOLOR (Color_HTC))
2349 fore = Color_HTC;
2350 // if invert is 0 reverse video is set so we use bg color as fg color
2351 else if (!invert)
2352 fore = back;
2353
2354 back = Color_HC;
2355 invert = 0;
2356 }
2357 }
2358#endif
2359
2321 if (invert) 2360 if (invert)
2322 { 2361 {
2323#ifdef OPTION_HC
2324 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2325 || !ISSET_PIXCOLOR (Color_HC))
2326#endif
2327 /* invert the column if no highlightColor is set or it is the
2328 * current cursor column */
2329 ::swap (fore, back); 2362 ::swap (fore, back);
2330#ifdef OPTION_HC
2331 else if (ISSET_PIXCOLOR (Color_HC))
2332 back = Color_HC;
2333#endif
2334 2363
2335#ifndef NO_BOLD_UNDERLINE_REVERSE 2364#ifndef NO_BOLD_UNDERLINE_REVERSE
2336# ifndef OPTION_HC
2337 if (ISSET_PIXCOLOR (Color_RV))
2338 back = Color_RV;
2339# endif
2340 if (fore == back) 2365 if (fore == back)
2341 { 2366 {
2342 fore = Color_bg; 2367 fore = Color_bg;
2343 back = Color_fg; 2368 back = Color_fg;
2344 } 2369 }
… …
2380 /* 2405 /*
2381 * Actually do the drawing of the string here 2406 * Actually do the drawing of the string here
2382 */ 2407 */
2383 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2408 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2384 2409
2385 if (expect_true (have_bg && back == Color_bg)) 2410 if (ecb_likely (have_bg && back == Color_bg))
2386 { 2411 {
2387 // this is very ugly, maybe push it into ->draw? 2412 // this is very ugly, maybe push it into ->draw?
2388 2413
2389 for (i = 0; i < count; i++) /* don't draw empty strings */ 2414 for (i = 0; i < count; i++) /* don't draw empty strings */
2390 if (text[i] != ' ') 2415 if (text[i] != ' ')
… …
2397 did_clear: ; 2422 did_clear: ;
2398 } 2423 }
2399 else 2424 else
2400 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2425 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2401 2426
2402 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2427 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2403 { 2428 {
2404#if ENABLE_FRILLS 2429#if ENABLE_FRILLS
2405 if (ISSET_PIXCOLOR (Color_underline)) 2430 if (ISSET_PIXCOLOR (Color_underline))
2406 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2431 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2407 else 2432 else
… …
2412 xpixel, ypixel + font->ascent + 1, 2437 xpixel, ypixel + font->ascent + 1,
2413 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2438 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2414 } 2439 }
2415 } /* for (col....) */ 2440 } /* for (col....) */
2416 } /* for (row....) */ 2441 } /* for (row....) */
2417
2418#if ENABLE_OVERLAY
2419 scr_swap_overlay ();
2420#endif
2421 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2422 2442
2423 /* 2443 /*
2424 * G: cleanup cursor and display outline cursor if necessary 2444 * G: cleanup cursor and display outline cursor if necessary
2425 */ 2445 */
2426 if (showcursor) 2446 if (showcursor)
… …
2458 2478
2459 XDrawRectangle (dpy, vt, gc, 2479 XDrawRectangle (dpy, vt, gc,
2460 Col2Pixel (col), 2480 Col2Pixel (col),
2461 Row2Pixel (oldcursor.row), 2481 Row2Pixel (oldcursor.row),
2462 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2482 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2463 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2483 (unsigned int) (Height2Pixel (1) - 1));
2464 } 2484 }
2465 } 2485 }
2466 2486
2467 /* 2487 /*
2468 * H: cleanup selection 2488 * H: cleanup selection
2469 */ 2489 */
2490#if ENABLE_OVERLAY
2491 scr_swap_overlay ();
2492#endif
2493 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2494
2470 scr_reverse_selection (); 2495 scr_reverse_selection ();
2471 2496
2497 screen.flags = old_screen_flags;
2472 num_scr = 0; 2498 num_scr = 0;
2473 num_scr_allow = 1; 2499 num_scr_allow = 1;
2474} 2500}
2475 2501
2476void 2502void ecb_cold
2477rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2503rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2478{ 2504{
2479 if (!l.t) 2505 if (!l.valid ())
2480 return; 2506 return;
2481 2507
2482 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2508 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2483 2509
2484 for (int i = ncol; i--; ) 2510 for (int i = ncol; i--; )
2485 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2511 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2486} 2512}
2487 2513
2488void 2514void ecb_cold
2489rxvt_term::scr_remap_chars () NOTHROW 2515rxvt_term::scr_remap_chars () NOTHROW
2490{ 2516{
2491 for (int i = total_rows; i--; ) 2517 for (int i = total_rows; i--; )
2492 scr_remap_chars (row_buf [i]); 2518 scr_remap_chars (row_buf [i]);
2493 2519
… …
2496 scr_remap_chars (drawn_buf [i]); 2522 scr_remap_chars (drawn_buf [i]);
2497 scr_remap_chars (swap_buf [i]); 2523 scr_remap_chars (swap_buf [i]);
2498 } 2524 }
2499} 2525}
2500 2526
2501void 2527void ecb_cold
2502rxvt_term::scr_recolour () NOTHROW 2528rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2529{
2530 bool transparent = false;
2531
2504#ifdef HAVE_BG_PIXMAP 2532#ifdef HAVE_BG_PIXMAP
2505 bgPixmap.apply (); 2533 if (bg_img != 0)
2506#else 2534 {
2535# if ENABLE_TRANSPARENCY
2536 if (bg_flags & BG_IS_TRANSPARENT)
2537 {
2538 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2539 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2507 2540
2541 transparent = true;
2542 }
2543 else
2544# endif
2545 {
2546 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2547 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2548 }
2549 }
2550 else
2551#endif
2552 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2554 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2555 }
2556
2557 XClearWindow (dpy, parent);
2511 2558
2512 if (scrollBar.win) 2559 if (scrollBar.win)
2513 { 2560 {
2561 if (transparent)
2562 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2563 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2564 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2515 scrollBar.state = STATE_IDLE; 2565 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2566 scrollBar.show (0);
2517 } 2567 }
2518 2568
2519#endif 2569 if (refresh)
2520 2570 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2571 scr_clear ();
2523 scr_touch (true); 2572 scr_touch (true);
2573 }
2524 want_refresh = 1; 2574 want_refresh = 1;
2525} 2575}
2526 2576
2527/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2528void 2578void
… …
2585 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2635 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2586 srp[col] ^= rstyle; 2636 srp[col] ^= rstyle;
2587} 2637}
2588 2638
2589/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2590void 2640void ecb_hot
2591rxvt_term::scr_reverse_selection () NOTHROW 2641rxvt_term::scr_reverse_selection () NOTHROW
2592{ 2642{
2593 if (selection.op 2643 if (selection.op
2594 && current_screen == selection.screen 2644 && current_screen == selection.screen
2595 && selection.end.row >= view_start) 2645 && selection.end.row >= view_start)
2596 { 2646 {
2597#if !ENABLE_MINIMAL 2647#if !ENABLE_MINIMAL
2598 if (selection.rect) 2648 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2649 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2651 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2652 else
2603#endif 2653#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2654 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2655 selection.end.row, selection.end.col,
2606 RS_RVid); 2656 RS_Sel | RS_RVid);
2607 } 2657 }
2608} 2658}
2609 2659
2610/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2611/* 2661/*
… …
2614 */ 2664 */
2615#if 0 2665#if 0
2616void 2666void
2617rxvt_term::scr_dump (int fd) NOTHROW 2667rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2668{
2619 int row, wrote; 2669 // if this method is needed, it can be implemented by factoring the
2620 unsigned int width, towrite; 2670 // relevant code in scr_printscreen
2621 char r1[] = "\n";
2622
2623 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++)
2625 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2627 : ncol;
2628 for (towrite = width; towrite; towrite -= wrote)
2629 {
2630 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2631 towrite);
2632 if (wrote < 0)
2633 return; /* XXX: death, no report */
2634 }
2635 if (row_buf[row].l >= 0)
2636 if (write (fd, r1, 1) <= 0)
2637 return; /* XXX: death, no report */
2638 }
2639} 2671}
2640#endif 2672#endif
2641 2673
2642/* ------------------------------------------------------------------------- * 2674/* ------------------------------------------------------------------------- *
2643 * CHARACTER SELECTION * 2675 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2676 * ------------------------------------------------------------------------- */
2645void 2677void
2646rxvt_term::selection_check (int check_more) NOTHROW 2678rxvt_term::selection_check (int check_more) NOTHROW
2647{ 2679{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2680 if (!selection.op)
2651 return; 2681 return;
2652 2682
2653 pos.row = pos.col = 0;
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2683 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2684 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2685 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2686 || (check_more == 1
2658 && current_screen == selection.screen 2687 && current_screen == selection.screen
2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2688 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2689 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2661 || (check_more == 2
2662 && ROWCOL_IS_BEFORE (selection.beg, pos)
2663 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos))
2666 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row
2668 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2690 CLEAR_ALL_SELECTION ();
2670} 2691}
2671 2692
2672/* ------------------------------------------------------------------------- */ 2693/* ------------------------------------------------------------------------- */
2673/* 2694/*
2674 * Paste a selection direct to the command fd 2695 * Paste a selection direct to the command fd
2675 */ 2696 */
2676void 2697void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2698rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2699{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2700 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2701 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2702 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2703 data[i] = C0_CR;
2683 2704
2684 if (priv_modes & PrivMode_BracketPaste) 2705 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~"); 2706 tt_printf ("\x1b[200~");
2686 2707
2687 tt_write (data, len); 2708 tt_write (data, len);
2688 2709
2689 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2711 tt_printf ("\x1b[201~");
2691} 2712}
2692 2713
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2714void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2715rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2716{
2701 if (prop == None) /* check for failed XConvertSelection */ 2717 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702 {
2703 if ((selection_type & Sel_CompoundText))
2704 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum);
2710 }
2711
2712 if ((selection_type & Sel_UTF8String))
2713 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 }
2722
2723 return;
2724 }
2725
2726 unsigned long bytes_after;
2727 XTextProperty ct;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after,
2734 &ct.value) != Success)
2735 {
2736 ct.value = 0;
2737 goto bailout;
2738 }
2739
2740 if (ct.encoding == None)
2741 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763
2764 if (ct.value == 0)
2765 goto bailout;
2766
2767 if (ct.encoding == xa[XA_INCR])
2768 {
2769 // INCR selection, start handshake
2770 if (!delete_prop)
2771 XDeleteProperty (dpy, win, prop);
2772
2773 selection_wait = Sel_incr;
2774 incr_buf_fill = 0;
2775 incr_ev.start (10);
2776
2777 goto bailout;
2778 }
2779
2780 if (ct.nitems == 0)
2781 {
2782 if (selection_wait == Sel_incr)
2783 {
2784 XFree (ct.value);
2785
2786 // finally complete, now paste the whole thing
2787 selection_wait = Sel_normal;
2788 ct.value = (unsigned char *)incr_buf;
2789 ct.nitems = incr_buf_fill;
2790 incr_buf = 0;
2791 incr_buf_size = 0;
2792 incr_ev.stop ();
2793 }
2794 else
2795 {
2796 if (selection_wait == Sel_normal
2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798 {
2799 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented
2802 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False);
2804 }
2805
2806 goto bailout;
2807 }
2808 }
2809 else if (selection_wait == Sel_incr)
2810 {
2811 incr_ev.start (10);
2812
2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817 }
2818
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems;
2821
2822 goto bailout;
2823 }
2824
2825 char **cl;
2826 int cr;
2827
2828#if !ENABLE_MINIMAL
2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830 // so recode it manually
2831 if (ct.encoding == xa[XA_UTF8_STRING])
2832 {
2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834 char *s = rxvt_wcstombs (w);
2835 free (w);
2836 // TODO: strlen == only the first element will be converted. well...
2837 paste (s, strlen (s));
2838 free (s);
2839 }
2840 else
2841#endif
2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843 && cl)
2844 {
2845 for (int i = 0; i < cr; i++)
2846 paste (cl[i], strlen (cl[i]));
2847
2848 XFreeStringList (cl);
2849 }
2850 else
2851 paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853bailout:
2854 XFree (ct.value);
2855
2856 if (selection_wait == Sel_normal)
2857 selection_wait = Sel_none;
2858}
2859
2860void
2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862{
2863 selection_wait = Sel_none;
2864
2865 incr_buf_size = 0;
2866 free (incr_buf);
2867
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869}
2870
2871void
2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873{
2874 if (prop == None || selection_wait != Sel_incr)
2875 return; 2718 return;
2876 2719
2877 selection_paste (win, prop, true); 2720 tt_paste (data, len);
2878} 2721}
2879 2722
2880/* ------------------------------------------------------------------------- */ 2723/* ------------------------------------------------------------------------- */
2881/* 2724/*
2882 * Request the current selection: 2725 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2726 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2727 * as fallback
2885 * > CUT_BUFFER0
2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2887 * will auto fallback to CUT_BUFFER0
2888 * EXT: button 2 release 2728 * EXT: button 2 release
2889 */ 2729 */
2890void 2730void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2731rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2732{
2893 if (selection.text && selnum == Sel_Primary) 2733 if (!selection_req)
2894 {
2895 /* internal selection */
2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2897 paste (str, strlen (str));
2898 free (str);
2899 return;
2900 } 2734 {
2901 else 2735 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2736 selection_req->run ();
2902 { 2737 }
2903 selection_request_time = tm;
2904 selection_wait = Sel_normal;
2905
2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return;
2910#else
2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return;
2914#endif
2915 }
2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2919}
2920
2921int
2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923{
2924 Atom sel;
2925
2926 selection_type |= selnum;
2927
2928 if (selnum == Sel_Primary)
2929 sel = XA_PRIMARY;
2930 else if (selnum == Sel_Secondary)
2931 sel = XA_SECONDARY;
2932 else
2933 sel = xa[XA_CLIPBOARD];
2934
2935 if (XGetSelectionOwner (dpy, sel) != None)
2936 {
2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938 vt, selection_request_time);
2939 return 1;
2940 }
2941
2942 return 0;
2943} 2738}
2944 2739
2945/* ------------------------------------------------------------------------- */ 2740/* ------------------------------------------------------------------------- */
2946/* 2741/*
2947 * Clear all selected text 2742 * Clear all selected text
2948 * EXT: SelectionClear 2743 * EXT: SelectionClear
2949 */ 2744 */
2950void 2745void
2951rxvt_term::selection_clear () NOTHROW 2746rxvt_term::selection_clear (bool clipboard) NOTHROW
2952{ 2747{
2748 if (!clipboard)
2749 {
2953 want_refresh = 1; 2750 want_refresh = 1;
2954 free (selection.text); 2751 free (selection.text);
2955 selection.text = NULL; 2752 selection.text = NULL;
2956 selection.len = 0; 2753 selection.len = 0;
2957 CLEAR_SELECTION (); 2754 CLEAR_SELECTION ();
2958 2755
2959 if (display->selection_owner == this) 2756 if (display->selection_owner == this)
2960 display->selection_owner = 0; 2757 display->selection_owner = 0;
2758 }
2759 else
2760 {
2761 free (selection.clip_text);
2762 selection.clip_text = NULL;
2763 selection.clip_len = 0;
2764
2765 if (display->clipboard_owner == this)
2766 display->clipboard_owner = 0;
2767 }
2961} 2768}
2962 2769
2963/* ------------------------------------------------------------------------- */ 2770/* ------------------------------------------------------------------------- */
2964/* 2771/*
2965 * Copy a selection into the cut buffer 2772 * Copy a selection into the cut buffer
2966 * EXT: button 1 or 3 release 2773 * EXT: button 1 or 3 release
2967 */ 2774 */
2968void 2775void
2969rxvt_term::selection_make (Time tm) 2776rxvt_term::selection_make (Time tm)
2970{ 2777{
2971 int i; 2778 int size;
2972 wchar_t *new_selection_text; 2779 wchar_t *new_selection_text;
2973 text_t *t; 2780 text_t *t;
2974 2781
2975 switch (selection.op) 2782 switch (selection.op)
2976 { 2783 {
… …
2992 return; /* nothing selected, go away */ 2799 return; /* nothing selected, go away */
2993 2800
2994 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2801 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2995 return; 2802 return;
2996 2803
2997 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2804 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2998 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2805 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2999 2806
3000 int ofs = 0; 2807 int ofs = 0;
3001 int extra = 0; 2808 int extra = 0;
3002 2809
3003 int col = selection.beg.col; 2810 int col = selection.beg.col;
… …
3009 { 2816 {
3010#if !ENABLE_MINIMAL 2817#if !ENABLE_MINIMAL
3011 if (selection.rect) 2818 if (selection.rect)
3012 { 2819 {
3013 col = selection.beg.col; 2820 col = selection.beg.col;
3014 end_col = ncol + 1; 2821 end_col = selection.end.col;
3015 } 2822 }
3016 else 2823 else
3017#endif 2824#endif
3018 end_col = ROW(row).l; 2825 end_col = ROW(row).l;
3019 2826
3020 col = max (col, 0); 2827 col = max (col, 0);
3021 2828
3022 if (row == selection.end.row 2829 if (row == selection.end.row)
3023#if !ENABLE_MINIMAL
3024 || selection.rect
3025#endif
3026 )
3027 min_it (end_col, selection.end.col); 2830 min_it (end_col, selection.end.col);
3028 2831
3029 t = ROW(row).t + col; 2832 t = ROW(row).t + col;
3030 2833
3031 for (; col < end_col; col++) 2834 for (; col < end_col; col++)
… …
3039 2842
3040 extra -= (len - 1); 2843 extra -= (len - 1);
3041 2844
3042 if (extra < 0) 2845 if (extra < 0)
3043 { 2846 {
3044 extra += i; 2847 extra += size;
3045 i += i; 2848 size += size;
3046 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2849 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3047 } 2850 }
3048 2851
3049 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2852 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3050 } 2853 }
3051#endif 2854#endif
… …
3063 2866
3064 new_selection_text[ofs++] = C0_LF; 2867 new_selection_text[ofs++] = C0_LF;
3065 } 2868 }
3066 else 2869 else
3067#endif 2870#endif
3068 if (!ROW(row).is_longer () && row != selection.end.row) 2871 if (!ROW(row).is_longer ()
2872 && (row != selection.end.row || end_col != selection.end.col)
2873 && (row != selection.beg.row || selection.beg.col < ncol))
3069 new_selection_text[ofs++] = C0_LF; 2874 new_selection_text[ofs++] = C0_LF;
3070 } 2875 }
3071
3072 if (end_col != selection.end.col)
3073 new_selection_text[ofs++] = C0_LF;
3074 2876
3075 new_selection_text[ofs] = 0; 2877 new_selection_text[ofs] = 0;
3076 2878
3077 if (ofs == 0) 2879 if (ofs == 0)
3078 { 2880 {
… …
3091 2893
3092 selection_grab (tm); 2894 selection_grab (tm);
3093} 2895}
3094 2896
3095bool 2897bool
3096rxvt_term::selection_grab (Time tm) NOTHROW 2898rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3097{ 2899{
2900 Atom sel;
2901
2902 if (!clipboard)
2903 {
3098 selection_time = tm; 2904 selection_time = tm;
2905 sel = XA_PRIMARY;
2906 }
2907 else
2908 {
2909 clipboard_time = tm;
2910 sel = xa[XA_CLIPBOARD];
2911 }
3099 2912
3100 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2913 XSetSelectionOwner (dpy, sel, vt, tm);
3101 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2914 if (XGetSelectionOwner (dpy, sel) == vt)
3102 { 2915 {
3103 display->set_selection_owner (this); 2916 display->set_selection_owner (this, clipboard);
3104 return true; 2917 return true;
3105 } 2918 }
3106 else 2919 else
3107 { 2920 {
3108 selection_clear (); 2921 selection_clear (clipboard);
3109 return false; 2922 return false;
3110 } 2923 }
3111 2924
3112#if 0 2925#if 0
3113 XTextProperty ct; 2926 XTextProperty ct;
… …
3123/* ------------------------------------------------------------------------- */ 2936/* ------------------------------------------------------------------------- */
3124/* 2937/*
3125 * Mark or select text based upon number of clicks: 1, 2, or 3 2938 * Mark or select text based upon number of clicks: 1, 2, or 3
3126 * EXT: button 1 press 2939 * EXT: button 1 press
3127 */ 2940 */
3128void 2941void ecb_cold
3129rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2942rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3130{ 2943{
3131 clicks = ((clicks - 1) % 3) + 1; 2944 clicks = ((clicks - 1) % 3) + 1;
3132 selection.clicks = clicks; /* save clicks so extend will work */ 2945 selection.clicks = clicks; /* save clicks so extend will work */
3133 2946
… …
3152 2965
3153/* ------------------------------------------------------------------------- */ 2966/* ------------------------------------------------------------------------- */
3154/* 2967/*
3155 * Mark a selection at the specified col/row 2968 * Mark a selection at the specified col/row
3156 */ 2969 */
3157void 2970void ecb_cold
3158rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2971rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3159{ 2972{
3160 want_refresh = 1; 2973 want_refresh = 1;
3161 2974
3162 selection.mark.row = row + view_start; 2975 selection.mark.row = row + view_start;
… …
3189/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3002/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3190#define DELIMIT_TEXT(x) \ 3003#define DELIMIT_TEXT(x) \
3191 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3004 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3192#define DELIMIT_REND(x) 1 3005#define DELIMIT_REND(x) 1
3193 3006
3194void 3007void ecb_cold
3195rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3008rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3196{ 3009{
3197 int col, row, dirnadd, tcol, trow, w1, w2; 3010 int col, row, dirnadd, tcol, trow, w1, w2;
3198 row_col_t bound; 3011 row_col_t bound;
3199 text_t *stp; 3012 text_t *stp;
… …
3273 * EXT: button 3 press; button 1 or 3 drag 3086 * EXT: button 3 press; button 1 or 3 drag
3274 * flag == 0 ==> button 1 3087 * flag == 0 ==> button 1
3275 * flag == 1 ==> button 3 press 3088 * flag == 1 ==> button 3 press
3276 * flag == 2 ==> button 3 motion 3089 * flag == 2 ==> button 3 motion
3277 */ 3090 */
3278void 3091void ecb_cold
3279rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3092rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3280{ 3093{
3281 int col = clamp (Pixel2Col (x), 0, ncol); 3094 int col = clamp (Pixel2Col (x), 0, ncol);
3282 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3095 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3283 3096
… …
3309 3122
3310/* ------------------------------------------------------------------------- */ 3123/* ------------------------------------------------------------------------- */
3311/* 3124/*
3312 * Extend the selection to the specified col/row 3125 * Extend the selection to the specified col/row
3313 */ 3126 */
3314void 3127void ecb_cold
3315rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3128rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3316{ 3129{
3317 row_col_t pos; 3130 row_col_t pos;
3318 enum { 3131 enum {
3319 LEFT, RIGHT 3132 LEFT, RIGHT
… …
3510 ::swap (selection.beg.col, selection.end.col); 3323 ::swap (selection.beg.col, selection.end.col);
3511#endif 3324#endif
3512} 3325}
3513 3326
3514#if !ENABLE_MINIMAL 3327#if !ENABLE_MINIMAL
3515void 3328void ecb_cold
3516rxvt_term::selection_remove_trailing_spaces () NOTHROW 3329rxvt_term::selection_remove_trailing_spaces () NOTHROW
3517{ 3330{
3518 int32_t end_col, end_row; 3331 int32_t end_col, end_row;
3519 text_t *stp; 3332 text_t *stp;
3520 3333
… …
3558/* ------------------------------------------------------------------------- */ 3371/* ------------------------------------------------------------------------- */
3559/* 3372/*
3560 * Double click on button 3 when already selected 3373 * Double click on button 3 when already selected
3561 * EXT: button 3 double click 3374 * EXT: button 3 double click
3562 */ 3375 */
3563void 3376void ecb_cold
3564rxvt_term::selection_rotate (int x, int y) NOTHROW 3377rxvt_term::selection_rotate (int x, int y) NOTHROW
3565{ 3378{
3566 selection.clicks = selection.clicks % 3 + 1; 3379 selection.clicks = selection.clicks % 3 + 1;
3567 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3380 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3568} 3381}
… …
3570/* ------------------------------------------------------------------------- */ 3383/* ------------------------------------------------------------------------- */
3571/* 3384/*
3572 * Respond to a request for our current selection 3385 * Respond to a request for our current selection
3573 * EXT: SelectionRequest 3386 * EXT: SelectionRequest
3574 */ 3387 */
3575void 3388void ecb_cold
3576rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3389rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3577{ 3390{
3391 Atom property = rq.property == None ? rq.target : rq.property;
3578 XSelectionEvent ev; 3392 XSelectionEvent ev;
3579 3393
3580 ev.type = SelectionNotify; 3394 ev.type = SelectionNotify;
3581 ev.property = None; 3395 ev.property = None;
3582 ev.display = rq.display; 3396 ev.display = rq.display;
… …
3597 *target++ = xa[XA_COMPOUND_TEXT]; 3411 *target++ = xa[XA_COMPOUND_TEXT];
3598#if X_HAVE_UTF8_STRING 3412#if X_HAVE_UTF8_STRING
3599 *target++ = xa[XA_UTF8_STRING]; 3413 *target++ = xa[XA_UTF8_STRING];
3600#endif 3414#endif
3601 3415
3602 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3416 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3603 32, PropModeReplace, 3417 32, PropModeReplace,
3604 (unsigned char *)target_list, target - target_list); 3418 (unsigned char *)target_list, target - target_list);
3605 ev.property = rq.property; 3419 ev.property = property;
3606 } 3420 }
3607#if TODO // TODO 3421#if TODO // TODO
3608 else if (rq.target == xa[XA_MULTIPLE]) 3422 else if (rq.target == xa[XA_MULTIPLE])
3609 { 3423 {
3610 /* TODO: Handle MULTIPLE */ 3424 /* TODO: Handle MULTIPLE */
3611 } 3425 }
3612#endif 3426#endif
3613 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3427 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3614 { 3428 {
3615 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3429 XChangeProperty (dpy, rq.requestor, property, rq.target,
3616 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3430 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3617 ev.property = rq.property; 3431 ev.property = property;
3432 }
3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3434 {
3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3436 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3437 ev.property = property;
3618 } 3438 }
3619 else if (rq.target == XA_STRING 3439 else if (rq.target == XA_STRING
3620 || rq.target == xa[XA_TEXT] 3440 || rq.target == xa[XA_TEXT]
3621 || rq.target == xa[XA_COMPOUND_TEXT] 3441 || rq.target == xa[XA_COMPOUND_TEXT]
3622 || rq.target == xa[XA_UTF8_STRING] 3442 || rq.target == xa[XA_UTF8_STRING]
… …
3654 { 3474 {
3655 target = xa[XA_COMPOUND_TEXT]; 3475 target = xa[XA_COMPOUND_TEXT];
3656 style = enc_compound_text; 3476 style = enc_compound_text;
3657 } 3477 }
3658 3478
3659 if (selection.text) 3479 if (rq.selection == XA_PRIMARY && selection.text)
3660 { 3480 {
3661 cl = selection.text; 3481 cl = selection.text;
3662 selectlen = selection.len; 3482 selectlen = selection.len;
3483 }
3484 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3485 {
3486 cl = selection.clip_text;
3487 selectlen = selection.clip_len;
3663 } 3488 }
3664 else 3489 else
3665 { 3490 {
3666 cl = L""; 3491 cl = L"";
3667 selectlen = 0; 3492 selectlen = 0;
… …
3688 ct.value = (unsigned char *)cl; 3513 ct.value = (unsigned char *)cl;
3689 ct.nitems = selectlen; 3514 ct.nitems = selectlen;
3690 ct.encoding = target; 3515 ct.encoding = target;
3691 } 3516 }
3692 3517
3693 XChangeProperty (dpy, rq.requestor, rq.property, 3518 XChangeProperty (dpy, rq.requestor, property,
3694 ct.encoding, 8, PropModeReplace, 3519 ct.encoding, 8, PropModeReplace,
3695 ct.value, (int)ct.nitems); 3520 ct.value, (int)ct.nitems);
3696 ev.property = rq.property; 3521 ev.property = property;
3697 3522
3698 if (freect) 3523 if (freect)
3699 XFree (ct.value); 3524 XFree (ct.value);
3700 } 3525 }
3701 3526
3702 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3527 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3703} 3528}
3704 3529
3705/* ------------------------------------------------------------------------- */ 3530/* ------------------------------------------------------------------------- */
3706#ifdef USE_XIM 3531#if USE_XIM
3707void 3532void ecb_cold
3708rxvt_term::im_set_position (XPoint &pos) NOTHROW 3533rxvt_term::im_set_position (XPoint &pos) NOTHROW
3709{ 3534{
3710 XWindowAttributes xwa; 3535 XWindowAttributes xwa;
3711 3536
3712 XGetWindowAttributes (dpy, vt, &xwa); 3537 XGetWindowAttributes (dpy, vt, &xwa);
… …
3735 h += 2; min_it (h, nrow); 3560 h += 2; min_it (h, nrow);
3736 3561
3737 x -= 1; clamp_it (x, 0, ncol - w); 3562 x -= 1; clamp_it (x, 0, ncol - w);
3738 y -= 1; clamp_it (y, 0, nrow - h); 3563 y -= 1; clamp_it (y, 0, nrow - h);
3739 3564
3740 ov_x = x; ov_y = y; 3565 ov.x = x; ov.y = y;
3741 ov_w = w; ov_h = h; 3566 ov.w = w; ov.h = h;
3742 3567
3743 ov_text = new text_t *[h]; 3568 ov.text = new text_t *[h];
3744 ov_rend = new rend_t *[h]; 3569 ov.rend = new rend_t *[h];
3745 3570
3746 for (y = 0; y < h; y++) 3571 for (y = 0; y < h; y++)
3747 { 3572 {
3748 text_t *tp = ov_text[y] = new text_t[w]; 3573 text_t *tp = ov.text[y] = new text_t[w];
3749 rend_t *rp = ov_rend[y] = new rend_t[w]; 3574 rend_t *rp = ov.rend[y] = new rend_t[w];
3750 3575
3751 text_t t0, t1, t2; 3576 text_t t0, t1, t2;
3752 rend_t r = OVERLAY_RSTYLE; 3577 rend_t r = OVERLAY_RSTYLE;
3753 3578
3754 if (y == 0) 3579 if (y == 0)
… …
3773} 3598}
3774 3599
3775void 3600void
3776rxvt_term::scr_overlay_off () NOTHROW 3601rxvt_term::scr_overlay_off () NOTHROW
3777{ 3602{
3778 if (!ov_text) 3603 if (!ov.text)
3779 return; 3604 return;
3780 3605
3781 want_refresh = 1; 3606 want_refresh = 1;
3782 3607
3783 for (int y = 0; y < ov_h; y++) 3608 for (int y = 0; y < ov.h; y++)
3784 { 3609 {
3785 delete [] ov_text[y]; 3610 delete [] ov.text[y];
3786 delete [] ov_rend[y]; 3611 delete [] ov.rend[y];
3787 } 3612 }
3788 3613
3789 delete [] ov_text; ov_text = 0; 3614 delete [] ov.text; ov.text = 0;
3790 delete [] ov_rend; ov_rend = 0; 3615 delete [] ov.rend; ov.rend = 0;
3791} 3616}
3792 3617
3793void 3618void
3794rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3619rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3795{ 3620{
3796 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3621 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3797 return; 3622 return;
3798 3623
3799 x++, y++; 3624 x++, y++;
3800 3625
3801 ov_text[y][x] = text; 3626 ov.text[y][x] = text;
3802 ov_rend[y][x] = rend; 3627 ov.rend[y][x] = rend;
3803} 3628}
3804 3629
3805void 3630void
3806rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3631rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3807{ 3632{
… …
3826} 3651}
3827 3652
3828void 3653void
3829rxvt_term::scr_swap_overlay () NOTHROW 3654rxvt_term::scr_swap_overlay () NOTHROW
3830{ 3655{
3831 if (!ov_text) 3656 if (!ov.text)
3832 return; 3657 return;
3833 3658
3659 // hide cursor if it is within the overlay area
3660 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3661 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3662 screen.flags &= ~Screen_VisibleCursor;
3663
3834 // swap screen mem with overlay 3664 // swap screen mem with overlay
3835 for (int y = ov_h; y--; ) 3665 for (int y = ov.h; y--; )
3836 { 3666 {
3837 text_t *t1 = ov_text[y]; 3667 text_t *t1 = ov.text[y];
3838 rend_t *r1 = ov_rend[y]; 3668 rend_t *r1 = ov.rend[y];
3839 3669
3840 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3670 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3841 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3671 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3842 3672
3843 for (int x = ov_w; x--; ) 3673 for (int x = ov.w; x--; )
3844 { 3674 {
3845 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3675 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3846 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3676 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3847 } 3677 }
3848 } 3678 }

Diff Legend

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