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

Diff Legend

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