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.320 by root, Tue Nov 4 23:20:17 2008 UTC vs.
Revision 1.431 by root, Sun Jan 13 20:19:24 2013 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 = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
163 scr_soft_reset (); 196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
164 view_start = 0; 200 view_start = 0;
165
166 num_scr = 0; 201 num_scr = 0;
167 202
168 if (ncol == 0) 203 if (ncol == 0)
169 ncol = 80; 204 ncol = 80;
170 205
… …
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 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
194 if (!row_buf) 239 if (!prev_row_buf)
195 { 240 {
196 /* 241 /*
197 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
198 */ 243 */
199 top_row = 0; 244 top_row = 0;
200 term_start = 0; 245 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 246
216 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
217 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
218 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
219 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
233 selection.text = NULL; 264 selection.text = NULL;
234 selection.len = 0; 265 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 266 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 267 selection.screen = PRIMARY;
237 selection.clicks = 0; 268 selection.clicks = 0;
269 selection.clip_text = NULL;
270 selection.clip_len = 0;
238 } 271 }
239 else 272 else
240 { 273 {
241 /* 274 /*
242 * add or delete rows as appropriate 275 * add or delete rows as appropriate
243 */ 276 */
244 277
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--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
263 { 279 {
264 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
265 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
266 }
267 282
268 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
269 { 290 }
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 291
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
280 295
281 if (top_row) 296 if (top_row)
282 { 297 {
283 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 298 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 299 // to come up with a lean and mean algorithm.
300 // TODO: maybe optimise when width didn't change
285 301
286 row_col_t ocur = screen.cur; 302 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 303 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 304
289 do 305 do
290 { 306 {
291 p = MOD (p - 1, prev_total_rows); 307 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
294#endif
295 int plines = 1; 309 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 311
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 312 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 313 {
300 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
301 315
302 plines++; 316 plines++;
303 llen += prev_ncol; 317 llen += prev_ncol;
… …
316 330
317 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
319 { 333 {
320 qline = row_buf + qrow; 334 qline = row_buf + qrow;
321 lalloc (*qline); 335 qline->alloc (); // redundant with next line
322 qline->l = ncol; 336 qline->l = ncol;
323 qline->is_longer (1); 337 qline->is_longer (1);
324 338
325 int qcol = 0; 339 int qcol = 0;
326 340
… …
341 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
342 // least. 356 // least.
343 if (prow == ocur.row) 357 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
345 359
346 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
347 361
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 363
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 386 {
373 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
374 388
375 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
376 { 390 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
379 393
380 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
381 lresize (qline); 395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = min (src.l, ncol);
399 dst.f = src.f;
382 } 400 }
383 401
384 for (int row = prev_nrow; row < nrow; row++) 402 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 403 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 404
389 term_start = 0; 405 term_start = 0;
390 } 406 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 407
396 clamp_it (screen.cur.row, 0, nrow - 1); 408 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 409 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 410 }
399 411
412 for (int row = nrow; row--; )
413 {
414 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
415 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
416 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
417 }
418
419 chunk_free (prev_chunk, prev_chunk_size);
420
421 free (tabs);
422 tabs = (char *)rxvt_malloc (ncol);
423
424 for (int col = ncol; col--; )
425 tabs [col] = col % TABSIZE == 0;
426
400 CLEAR_ALL_SELECTION (); 427 CLEAR_ALL_SELECTION ();
401 428
402 prev_nrow = nrow; 429 prev_nrow = nrow;
403 prev_ncol = ncol; 430 prev_ncol = ncol;
404 431
405 tt_winch (); 432 tt_winch ();
406 433
407 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 434 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
408} 435}
409 436
410/* ------------------------------------------------------------------------- */ 437void ecb_cold
411/*
412 * Free everything. That way malloc debugging can find leakage.
413 */
414void
415rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
416{ 439{
417 if (row_buf) 440 chunk_free (chunk, chunk_size);
418 { 441 chunk = 0;
419 delete talloc; talloc = 0; 442 row_buf = 0;
420 delete ralloc; ralloc = 0;
421 443
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); 444 free (tabs);
428 tabs = 0; 445 tabs = 0;
429 }
430} 446}
431 447
432/* ------------------------------------------------------------------------- */ 448/* ------------------------------------------------------------------------- */
433/* 449/*
434 * Hard/Soft reset 450 * Hard/Soft reset
435 */ 451 */
436void 452void ecb_cold
437rxvt_term::scr_poweron () 453rxvt_term::scr_poweron ()
438{ 454{
439 scr_release (); 455 scr_release ();
456
440 prev_nrow = prev_ncol = 0; 457 prev_nrow = prev_ncol = 0;
458 rvideo_mode = false;
459 scr_soft_reset ();
441 scr_reset (); 460 scr_reset ();
442 461
443 scr_clear (true); 462 scr_clear (true);
444 scr_refresh (); 463 scr_refresh ();
445} 464}
446 465
447void 466void ecb_cold
448rxvt_term::scr_soft_reset () 467rxvt_term::scr_soft_reset () NOTHROW
449{ 468{
450 /* only affects modes, nothing drastic such as clearing the screen */ 469 /* only affects modes, nothing drastic such as clearing the screen */
451#if ENABLE_OVERLAY 470#if ENABLE_OVERLAY
452 scr_overlay_off (); 471 scr_overlay_off ();
453#endif 472#endif
454 473
455 rvideo_mode = false;
456
457 if (current_screen != PRIMARY) 474 if (current_screen != PRIMARY)
458 scr_swap_screen (); 475 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 476
466 scr_scroll_region (0, MAX_ROWS - 1); 477 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None); 478 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0); 479 scr_insert_mode (0);
469} 480}
… …
511 } 522 }
512 523
513 /* boundary check in case screen size changed between SAVE and RESTORE */ 524 /* boundary check in case screen size changed between SAVE and RESTORE */
514 min_it (s->cur.row, nrow - 1); 525 min_it (s->cur.row, nrow - 1);
515 min_it (s->cur.col, ncol - 1); 526 min_it (s->cur.col, ncol - 1);
516#ifdef DEBUG_STRICT
517 assert (s->cur.row >= 0); 527 assert (s->cur.row >= 0);
518 assert (s->cur.col >= 0); 528 assert (s->cur.col >= 0);
519#endif
520} 529}
521 530
522void 531void
523rxvt_term::scr_swap_screen () 532rxvt_term::scr_swap_screen () NOTHROW
524{ 533{
525 if (!option (Opt_secondaryScreen)) 534 if (!option (Opt_secondaryScreen))
526 return; 535 return;
527 536
528 for (int i = prev_nrow; i--; ) 537 for (int i = prev_nrow; i--; )
… …
547 return; 556 return;
548 557
549 want_refresh = 1; 558 want_refresh = 1;
550 view_start = 0; 559 view_start = 0;
551 560
552 selection_check (2); /* check for boundary cross */ 561 /* check for boundary cross */
562 row_col_t pos;
563 pos.row = pos.col = 0;
564 if (ROWCOL_IS_BEFORE (selection.beg, pos)
565 && ROWCOL_IS_AFTER (selection.end, pos))
566 CLEAR_SELECTION ();
553 567
554 int i = current_screen; current_screen = scrn; scrn = i; 568 current_screen = scrn;
555 569
556#if NSCREENS 570#if NSCREENS
557 if (option (Opt_secondaryScreen)) 571 if (option (Opt_secondaryScreen))
558 { 572 {
559 num_scr = 0; 573 num_scr = 0;
… …
623/* 637/*
624 * Scroll text between <row1> and <row2> inclusive, by <count> lines 638 * Scroll text between <row1> and <row2> inclusive, by <count> lines
625 * count positive ==> scroll up 639 * count positive ==> scroll up
626 * count negative ==> scroll down 640 * count negative ==> scroll down
627 */ 641 */
628int 642int ecb_hot
629rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 643rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
630{ 644{
631 if (count == 0 || (row1 > row2)) 645 if (count == 0 || (row1 > row2))
632 return 0; 646 return 0;
633 647
… …
636 650
637 if (count > 0 651 if (count > 0
638 && row1 == 0 652 && row1 == 0
639 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 653 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
640 { 654 {
655 min_it (count, total_rows - (nrow - (row2 + 1)));
656
641 top_row = max (top_row - count, -saveLines); 657 top_row = max (top_row - count, -saveLines);
642
643 // scroll everything up 'count' lines
644 term_start = (term_start + count) % total_rows;
645 658
646 // sever bottommost line 659 // sever bottommost line
647 { 660 {
648 line_t &l = ROW(row2 - count); 661 line_t &l = ROW(row2);
649 l.is_longer (0); 662 l.is_longer (0);
650 l.touch (); 663 l.touch ();
651 } 664 }
652 665
666 // scroll everything up 'count' lines
667 term_start = (term_start + count) % total_rows;
668
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 }
680
653 // erase newly scrolled-in lines 681 // erase newly scrolled-in lines
654 for (int i = count; i--; ) 682 for (int i = count; i--; )
655 { 683 {
656 line_t &l = ROW(nrow - 1 - i); 684 line_t &l = ROW(row2 - i);
657 685
658 // optimize if already cleared, can be significant on slow machines 686 // optimise if already cleared, can be significant on slow machines
659 // could be rolled into scr_blank_screen_mem 687 // 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))) 688 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
661 { 689 {
662 scr_blank_line (l, 0, l.l, rstyle); 690 scr_blank_line (l, 0, l.l, rstyle);
663 l.l = 0; 691 l.l = 0;
… …
665 } 693 }
666 else 694 else
667 scr_blank_screen_mem (l, rstyle); 695 scr_blank_screen_mem (l, rstyle);
668 } 696 }
669 697
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 698 // move and/or clear selection, if any
683 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen
700 && selection.beg.row <= row2)
684 { 701 {
685 selection.beg.row -= count; 702 selection.beg.row -= count;
686 selection.end.row -= count; 703 selection.end.row -= count;
687 selection.mark.row -= count; 704 selection.mark.row -= count;
688 705
689 if (selection.beg.row < top_row 706 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 } 707 }
697 708
698 // finally move the view window, if desired 709 // finally move the view window, if desired
699 if (option (Opt_scrollWithBuffer) 710 if (option (Opt_scrollWithBuffer)
700 && view_start != 0 711 && view_start != 0
… …
730 } 741 }
731 742
732 // use a simple and robust scrolling algorithm, this 743 // use a simple and robust scrolling algorithm, this
733 // part of scr_scroll_text is not time-critical. 744 // part of scr_scroll_text is not time-critical.
734 745
746 // sever line above scroll region
747 if (row1)
748 {
749 line_t &l = ROW(row1 - 1);
750 l.is_longer (0);
751 l.touch ();
752 }
753
735 int rows = row2 - row1 + 1; 754 int rows = row2 - row1 + 1;
736 755
737 min_it (count, rows); 756 min_it (count, rows);
738 757
739 line_t *temp_buf = row_buf + total_rows; 758 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
740 759
741 for (int row = 0; row < rows; row++) 760 for (int row = 0; row < rows; row++)
742 { 761 {
743 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 762 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
744 763
… …
746 scr_blank_screen_mem (temp_buf [row], rstyle); 765 scr_blank_screen_mem (temp_buf [row], rstyle);
747 } 766 }
748 767
749 for (int row = 0; row < rows; row++) 768 for (int row = 0; row < rows; row++)
750 ROW(row1 + row) = temp_buf [row]; 769 ROW(row1 + row) = temp_buf [row];
770
771 // sever bottommost line
772 {
773 line_t &l = ROW(row2);
774 l.is_longer (0);
775 l.touch ();
776 }
751 } 777 }
752 778
753 return count; 779 return count;
754} 780}
755 781
756/* ------------------------------------------------------------------------- */ 782/* ------------------------------------------------------------------------- */
757/* 783/*
758 * Add text given in <str> of length <len> to screen struct 784 * Add text given in <str> of length <len> to screen struct
759 */ 785 */
760void 786void ecb_hot
761rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 787rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
762{ 788{
763 if (len <= 0) /* sanity */ 789 if (len <= 0) /* sanity */
764 return; 790 return;
765 791
766 unsigned char checksel; 792 bool checksel;
767 unicode_t c; 793 unicode_t c;
768 int ncol = this->ncol; 794 int ncol = this->ncol;
769 const wchar_t *strend = str + len; 795 const wchar_t *strend = str + len;
770 796
771 want_refresh = 1; 797 want_refresh = 1;
… …
784 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 810 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
785 screen.cur.row -= minlines; 811 screen.cur.row -= minlines;
786 } 812 }
787 } 813 }
788 814
789#ifdef DEBUG_STRICT
790 assert (screen.cur.col < ncol); 815 assert (screen.cur.col < ncol);
791 assert (screen.cur.row < nrow 816 assert (screen.cur.row < nrow
792 && screen.cur.row >= top_row); 817 && screen.cur.row >= top_row);
793#endif
794 int row = screen.cur.row; 818 int row = screen.cur.row;
795 819
796 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 820 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
797 821
798 line_t *line = &ROW(row); 822 line_t *line = &ROW(row);
799 823
800 while (str < strend) 824 while (str < strend)
801 { 825 {
802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 826 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
803 827
804 if (expect_false (c < 0x20)) 828 if (ecb_unlikely (c < 0x20))
805 if (c == C0_LF) 829 if (c == C0_LF)
806 { 830 {
807 max_it (line->l, screen.cur.col); 831 max_it (line->l, screen.cur.col);
808 832
809 screen.flags &= ~Screen_WrapNext; 833 screen.flags &= ~Screen_WrapNext;
… …
828 { 852 {
829 scr_tab (1, true); 853 scr_tab (1, true);
830 continue; 854 continue;
831 } 855 }
832 856
833 if (expect_false ( 857 if (ecb_unlikely (
834 checksel /* see if we're writing within selection */ 858 checksel /* see if we're writing within selection */
835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 859 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
836 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 860 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 )) 861 ))
838 { 862 {
… …
843 * should be a similar check. 867 * should be a similar check.
844 */ 868 */
845 CLEAR_SELECTION (); 869 CLEAR_SELECTION ();
846 } 870 }
847 871
848 if (expect_false (screen.flags & Screen_WrapNext)) 872 if (ecb_unlikely (screen.flags & Screen_WrapNext))
849 { 873 {
850 scr_do_wrap (); 874 scr_do_wrap ();
851 875
852 line->l = ncol; 876 line->l = ncol;
853 line->is_longer (1); 877 line->is_longer (1);
… …
855 row = screen.cur.row; 879 row = screen.cur.row;
856 line = &ROW(row); /* _must_ refresh */ 880 line = &ROW(row); /* _must_ refresh */
857 } 881 }
858 882
859 // some utf-8 decoders "decode" surrogate characters: let's fix this. 883 // some utf-8 decoders "decode" surrogate characters: let's fix this.
860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 884 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
861 c = 0xfffd; 885 c = 0xfffd;
862 886
863 // rely on wcwidth to tell us the character width, do wcwidth before 887 // rely on wcwidth to tell us the character width, do wcwidth before
864 // further replacements, as wcwidth might return -1 for the line 888 // further replacements, as wcwidth might return -1 for the line
865 // drawing characters below as they might be invalid in the current 889 // drawing characters below as they might be invalid in the current
866 // locale. 890 // locale.
867 int width = WCWIDTH (c); 891 int width = WCWIDTH (c);
868 892
869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 893 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
870 { 894 {
871 // vt100 special graphics and line drawing 895 // vt100 special graphics and line drawing
872 // 5f-7e standard vt100 896 // 5f-7e standard vt100
873 // 40-5e rxvt extension for extra curses acs chars 897 // 40-5e rxvt extension for extra curses acs chars
874 static uint16_t vt100_0[62] = { // 41 .. 7e 898 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
887 c = vt100_0[c - 0x41]; 911 c = vt100_0[c - 0x41];
888 width = 1; // vt100 line drawing characters are always single-width 912 width = 1; // vt100 line drawing characters are always single-width
889 } 913 }
890 } 914 }
891 915
892 if (expect_false (screen.flags & Screen_Insert)) 916 if (ecb_unlikely (screen.flags & Screen_Insert))
893 scr_insdel_chars (width, INSERT); 917 scr_insdel_chars (width, INSERT);
894 918
895 if (width != 0) 919 if (width != 0)
896 { 920 {
897#if !UNICODE_3 921#if !UNICODE_3
… …
902# else 926# else
903 c = 0xfffd; 927 c = 0xfffd;
904# endif 928# endif
905#endif 929#endif
906 930
931 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
932
933 // if the character doesn't fit into the remaining columns...
934 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
935 {
936 if (screen.flags & Screen_Autowrap)
937 {
938 // ... artificially enlargen the previous one
939 c = NOCHAR;
940 // and try the same character next loop iteration
941 --str;
942 }
943 else
944 screen.cur.col = ncol - width;
945 }
946
907 // nuke the character at this position, if required 947 // nuke the character at this position, if required
908 if (expect_false ( 948 // due to wonderful coincidences everywhere else in this loop
949 // we never have to check for overwriting a wide char itself,
950 // only its tail.
909 line->t[screen.cur.col] == NOCHAR 951 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); 952 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 953
926 line->touch (); 954 line->touch ();
927 955
928 do 956 do
929 { 957 {
930 line->t[screen.cur.col] = c; 958 line->t[screen.cur.col] = c;
931 line->r[screen.cur.col] = rend; 959 line->r[screen.cur.col] = rend;
932 960
933 if (expect_true (screen.cur.col < ncol - 1)) 961 if (ecb_likely (screen.cur.col < ncol - 1))
934 screen.cur.col++; 962 screen.cur.col++;
935 else 963 else
936 { 964 {
937 line->l = ncol; 965 line->l = ncol;
938 if (screen.flags & Screen_Autowrap) 966 if (screen.flags & Screen_Autowrap)
939 screen.flags |= Screen_WrapNext; 967 screen.flags |= Screen_WrapNext;
940 break; 968
969 goto end_of_line;
941 } 970 }
942 971
943 c = NOCHAR; 972 c = NOCHAR;
944 } 973 }
945 while (expect_false (--width > 0)); 974 while (ecb_unlikely (--width > 0));
946 975
947 // pad with spaces when overwriting wide character with smaller one 976 // pad with spaces when overwriting wide character with smaller one
948 if (expect_false (!width)) 977 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
949 { 978 {
950 line->touch ();
951
952 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
953 {
954 line->t[c] = ' '; 979 line->t[c] = ' ';
955 line->r[c] = rend; 980 line->r[c] = rend;
956 }
957 } 981 }
982
983end_of_line:
984 ;
958 } 985 }
959#if ENABLE_COMBINING 986#if ENABLE_COMBINING
960 else // width == 0 987 else // width == 0
961 { 988 {
962 if (c != 0xfeff) // ignore BOM 989 if (c != 0xfeff) // ignore BOM
… …
1002#endif 1029#endif
1003 } 1030 }
1004 1031
1005 max_it (line->l, screen.cur.col); 1032 max_it (line->l, screen.cur.col);
1006 1033
1007#ifdef DEBUG_STRICT
1008 assert (screen.cur.row >= 0); 1034 assert (screen.cur.row >= 0);
1009#endif
1010} 1035}
1011 1036
1012/* ------------------------------------------------------------------------- */ 1037/* ------------------------------------------------------------------------- */
1013/* 1038/*
1014 * Process Backspace. Move back the cursor back a position, wrap if have to 1039 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1027 1052
1028 want_refresh = 1; 1053 want_refresh = 1;
1029#endif 1054#endif
1030 } 1055 }
1031 } 1056 }
1057 else if (screen.flags & Screen_WrapNext)
1058 screen.flags &= ~Screen_WrapNext;
1032 else 1059 else
1033 scr_gotorc (0, -1, RELATIVE); 1060 scr_gotorc (0, -1, RELATIVE);
1034} 1061}
1035 1062
1036/* ------------------------------------------------------------------------- */ 1063/* ------------------------------------------------------------------------- */
… …
1114 * XTERM_SEQ: ESC 6 1141 * XTERM_SEQ: ESC 6
1115 * Move cursor left in row. If we're at the left boundary, shift everything 1142 * Move cursor left in row. If we're at the left boundary, shift everything
1116 * in that row right. Clear left column. 1143 * in that row right. Clear left column.
1117 */ 1144 */
1118#if !ENABLE_MINIMAL 1145#if !ENABLE_MINIMAL
1119void 1146void ecb_cold
1120rxvt_term::scr_backindex () NOTHROW 1147rxvt_term::scr_backindex () NOTHROW
1121{ 1148{
1122 if (screen.cur.col > 0) 1149 if (screen.cur.col > 0)
1123 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1150 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1124 else 1151 else
… …
1131 * XTERM_SEQ: ESC 9 1158 * XTERM_SEQ: ESC 9
1132 * Move cursor right in row. If we're at the right boundary, shift everything 1159 * Move cursor right in row. If we're at the right boundary, shift everything
1133 * in that row left. Clear right column. 1160 * in that row left. Clear right column.
1134 */ 1161 */
1135#if !ENABLE_MINIMAL 1162#if !ENABLE_MINIMAL
1136void 1163void ecb_cold
1137rxvt_term::scr_forwardindex () NOTHROW 1164rxvt_term::scr_forwardindex () NOTHROW
1138{ 1165{
1139 if (screen.cur.col < ncol - 1) 1166 if (screen.cur.col < ncol - 1)
1140 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1167 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1141 else 1168 else
… …
1292 scr_blank_line (line, col, num, rstyle); 1319 scr_blank_line (line, col, num, rstyle);
1293} 1320}
1294 1321
1295/* ------------------------------------------------------------------------- */ 1322/* ------------------------------------------------------------------------- */
1296/* 1323/*
1297 * Erase part of whole of the screen 1324 * Erase part or whole of the screen
1298 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1325 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1299 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1326 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1300 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1327 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1301 */ 1328 */
1302void 1329void
… …
1311 ZERO_SCROLLBACK (); 1338 ZERO_SCROLLBACK ();
1312 1339
1313 switch (mode) 1340 switch (mode)
1314 { 1341 {
1315 case 0: /* erase to end of screen */ 1342 case 0: /* erase to end of screen */
1316 selection_check (1);
1317 scr_erase_line (0); 1343 scr_erase_line (0);
1318 row = screen.cur.row + 1; /* possible OOB */ 1344 row = screen.cur.row + 1; /* possible OOB */
1319 num = nrow - row; 1345 num = nrow - row;
1320 break; 1346 break;
1321 case 1: /* erase to beginning of screen */ 1347 case 1: /* erase to beginning of screen */
1322 selection_check (3);
1323 scr_erase_line (1); 1348 scr_erase_line (1);
1324 row = 0; 1349 row = 0;
1325 num = screen.cur.row; 1350 num = screen.cur.row;
1326 break; 1351 break;
1327 case 2: /* erase whole screen */ 1352 case 2: /* erase whole screen */
1328 selection_check (3);
1329 row = 0; 1353 row = 0;
1330 num = nrow; 1354 num = nrow;
1331 break; 1355 break;
1332 default: 1356 default:
1333 return; 1357 return;
… …
1342 if (row >= nrow) /* Out Of Bounds */ 1366 if (row >= nrow) /* Out Of Bounds */
1343 return; 1367 return;
1344 1368
1345 min_it (num, nrow - row); 1369 min_it (num, nrow - row);
1346 1370
1347 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1348 if (rstyle & (RS_RVid | RS_Uline)) 1371 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1349 ren = (rend_t) ~RS_None; 1372 ren = (rend_t) ~RS_None;
1350 else if (GET_BASEBG (rstyle) == Color_bg) 1373 else if (GET_BASEBG (rstyle) == Color_bg)
1351 { 1374 {
1352 ren = DEFAULT_RSTYLE; 1375 ren = DEFAULT_RSTYLE;
1353 1376
1354 if (mapped) 1377 if (mapped)
1355 XClearArea (dpy, vt, 0, 1378 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row), (unsigned int)width, 1379 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1380 (unsigned int)Height2Pixel (num), False);
1358 } 1381 }
1359 else 1382 else
1360 { 1383 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1384 ren = rstyle & (RS_fgMask | RS_bgMask);
1362 1385
1386 if (mapped)
1387 {
1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1388 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1364 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1365 XFillRectangle (dpy, vt, gc, 1390 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row), 1391 0, Row2Pixel (row - view_start),
1367 (unsigned int)width, 1392 (unsigned int)vt_width,
1368 (unsigned int)Height2Pixel (num)); 1393 (unsigned int)Height2Pixel (num));
1369 gcvalue.foreground = pix_colors[Color_fg]; 1394 gcvalue.foreground = pix_colors[Color_fg];
1370 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1395 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1396 }
1371 } 1397 }
1372 1398
1373 for (; num--; row++) 1399 for (; num--; row++)
1374 { 1400 {
1375 scr_blank_screen_mem (ROW(row), rstyle); 1401 scr_blank_screen_mem (ROW(row), rstyle);
1402
1403 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1404 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1405 }
1378} 1406}
1379 1407
1380#if !ENABLE_MINIMAL 1408#if !ENABLE_MINIMAL
1381void 1409void
… …
1391/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1392/* 1420/*
1393 * Fill the screen with `E's 1421 * Fill the screen with `E's
1394 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1422 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1395 */ 1423 */
1396void 1424void ecb_cold
1397rxvt_term::scr_E () NOTHROW 1425rxvt_term::scr_E () NOTHROW
1398{ 1426{
1399 rend_t fs; 1427 rend_t fs;
1400 1428
1401 want_refresh = 1; 1429 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1430 ZERO_SCROLLBACK ();
1403 1431
1404 num_scr_allow = 0; 1432 num_scr_allow = 0;
1405 selection_check (3); 1433
1434 row_col_t pos;
1435 pos.row = pos.col = 0;
1436 if (ROWCOL_IS_AFTER (selection.end, pos))
1437 CLEAR_SELECTION ();
1406 1438
1407 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1439 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1408 for (int row = nrow; row--; ) 1440 for (int row = nrow; row--; )
1409 { 1441 {
1410 line_t &line = ROW(row); 1442 line_t &line = ROW(row);
… …
1534 { 1566 {
1535 line->t[col] = line->t[col + count]; 1567 line->t[col] = line->t[col + count];
1536 line->r[col] = line->r[col + count]; 1568 line->r[col] = line->r[col + count];
1537 } 1569 }
1538 1570
1539 scr_blank_line (*line, ncol - count, count, 1571 scr_blank_line (*line, ncol - count, count, rstyle);
1540 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1541 1572
1542 if (selection.op && current_screen == selection.screen 1573 if (selection.op && current_screen == selection.screen
1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1574 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1544 { 1575 {
1545 if (selection.end.row != screen.cur.row 1576 if (selection.end.row != screen.cur.row
… …
1562/* ------------------------------------------------------------------------- */ 1593/* ------------------------------------------------------------------------- */
1563/* 1594/*
1564 * Set the scrolling region 1595 * Set the scrolling region
1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1596 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1566 */ 1597 */
1567void 1598void ecb_cold
1568rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1599rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1569{ 1600{
1570 max_it (top, 0); 1601 max_it (top, 0);
1571 min_it (bot, nrow - 1); 1602 min_it (bot, nrow - 1);
1572 1603
… …
1582/* 1613/*
1583 * Make the cursor visible/invisible 1614 * Make the cursor visible/invisible
1584 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1615 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1585 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1616 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1586 */ 1617 */
1587void 1618void ecb_cold
1588rxvt_term::scr_cursor_visible (int mode) NOTHROW 1619rxvt_term::scr_cursor_visible (int mode) NOTHROW
1589{ 1620{
1590 want_refresh = 1; 1621 want_refresh = 1;
1591 1622
1592 if (mode) 1623 if (mode)
… …
1599/* 1630/*
1600 * Set/unset automatic wrapping 1631 * Set/unset automatic wrapping
1601 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1632 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1602 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1633 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1603 */ 1634 */
1604void 1635void ecb_cold
1605rxvt_term::scr_autowrap (int mode) NOTHROW 1636rxvt_term::scr_autowrap (int mode) NOTHROW
1606{ 1637{
1607 if (mode) 1638 if (mode)
1608 screen.flags |= Screen_Autowrap; 1639 screen.flags |= Screen_Autowrap;
1609 else 1640 else
… …
1618 * Relative mode: line numbers are relative to top margin of scrolling region 1649 * Relative mode: line numbers are relative to top margin of scrolling region
1619 * and the cursor cannot be moved outside. 1650 * and the cursor cannot be moved outside.
1620 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1651 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1621 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1652 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1622 */ 1653 */
1623void 1654void ecb_cold
1624rxvt_term::scr_relative_origin (int mode) NOTHROW 1655rxvt_term::scr_relative_origin (int mode) NOTHROW
1625{ 1656{
1626 if (mode) 1657 if (mode)
1627 screen.flags |= Screen_Relative; 1658 screen.flags |= Screen_Relative;
1628 else 1659 else
… …
1635/* 1666/*
1636 * Set insert/replace mode 1667 * Set insert/replace mode
1637 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1668 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1638 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1669 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1639 */ 1670 */
1640void 1671void ecb_cold
1641rxvt_term::scr_insert_mode (int mode) NOTHROW 1672rxvt_term::scr_insert_mode (int mode) NOTHROW
1642{ 1673{
1643 if (mode) 1674 if (mode)
1644 screen.flags |= Screen_Insert; 1675 screen.flags |= Screen_Insert;
1645 else 1676 else
… …
1651 * Set/Unset tabs 1682 * Set/Unset tabs
1652 * XTERM_SEQ: Set tab at current column : ESC H 1683 * XTERM_SEQ: Set tab at current column : ESC H
1653 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1684 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1654 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1685 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1655 */ 1686 */
1656void 1687void ecb_cold
1657rxvt_term::scr_set_tab (int mode) NOTHROW 1688rxvt_term::scr_set_tab (int mode) NOTHROW
1658{ 1689{
1659 if (mode < 0) 1690 if (mode < 0)
1660 memset (tabs, 0, ncol); 1691 memset (tabs, 0, ncol);
1661 else if (screen.cur.col < ncol) 1692 else if (screen.cur.col < ncol)
… …
1680 if (rvideo_state != on) 1711 if (rvideo_state != on)
1681 { 1712 {
1682 rvideo_state = on; 1713 rvideo_state = on;
1683 1714
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1715 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1716#ifdef HAVE_IMG
1686 if (bgPixmap.pixmap == None) 1717 if (bg_img == 0)
1687#endif 1718#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1719 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1720
1690 XGCValues gcvalue; 1721 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1722 gcvalue.foreground = pix_colors[Color_fg];
… …
1700/* ------------------------------------------------------------------------- */ 1731/* ------------------------------------------------------------------------- */
1701/* 1732/*
1702 * Report current cursor position 1733 * Report current cursor position
1703 * XTERM_SEQ: Report position: ESC [ 6 n 1734 * XTERM_SEQ: Report position: ESC [ 6 n
1704 */ 1735 */
1705void 1736void ecb_cold
1706rxvt_term::scr_report_position () NOTHROW 1737rxvt_term::scr_report_position () NOTHROW
1707{ 1738{
1708 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1739 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1709} 1740}
1710 1741
… …
1713 * ------------------------------------------------------------------------- */ 1744 * ------------------------------------------------------------------------- */
1714 1745
1715/* 1746/*
1716 * Set font style 1747 * Set font style
1717 */ 1748 */
1718void 1749void ecb_cold
1719rxvt_term::set_font_style () NOTHROW 1750rxvt_term::set_font_style () NOTHROW
1720{ 1751{
1721#if 0 1752#if 0
1722 switch (charsets [screen.charset]) 1753 switch (charsets [screen.charset])
1723 { 1754 {
… …
1745 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1776 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1746 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1777 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1747 * XTERM_SEQ: Invoke G2 character set: ESC N 1778 * XTERM_SEQ: Invoke G2 character set: ESC N
1748 * XTERM_SEQ: Invoke G3 character set: ESC O 1779 * XTERM_SEQ: Invoke G3 character set: ESC O
1749 */ 1780 */
1750void 1781void ecb_cold
1751rxvt_term::scr_charset_choose (int set) NOTHROW 1782rxvt_term::scr_charset_choose (int set) NOTHROW
1752{ 1783{
1753 screen.charset = set; 1784 screen.charset = set;
1754 set_font_style (); 1785 set_font_style ();
1755} 1786}
… …
1776 * ------------------------------------------------------------------------- */ 1807 * ------------------------------------------------------------------------- */
1777 1808
1778/* 1809/*
1779 * refresh matching text. 1810 * refresh matching text.
1780 */ 1811 */
1781bool 1812bool ecb_cold
1782rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1813rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1783{ 1814{
1784 bool found = false; 1815 bool found = false;
1785 1816
1786 for (int i = 0; i < nrow; i++) 1817 for (int i = 0; i < nrow; i++)
… …
1805 PART_BEG = 0, 1836 PART_BEG = 0,
1806 PART_END, 1837 PART_END,
1807 RC_COUNT 1838 RC_COUNT
1808}; 1839};
1809 1840
1810void 1841void ecb_hot
1811rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1842rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1812{ 1843{
1813 int i; 1844 int i;
1814 row_col_t rc[RC_COUNT]; 1845 row_col_t rc[RC_COUNT];
1815 1846
… …
1835 for (i = PART_BEG; i < RC_COUNT; i++) 1866 for (i = PART_BEG; i < RC_COUNT; i++)
1836 { 1867 {
1837 min_it (rc[i].col, ncol - 1); 1868 min_it (rc[i].col, ncol - 1);
1838 min_it (rc[i].row, nrow - 1); 1869 min_it (rc[i].row, nrow - 1);
1839 } 1870 }
1840// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1871
1841 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1872 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1873 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1843 1874
1844 num_scr_allow = 0; 1875 num_scr_allow = 0;
1845 1876
… …
1852 * Refresh the entire screen 1883 * Refresh the entire screen
1853 */ 1884 */
1854void 1885void
1855rxvt_term::scr_touch (bool refresh) NOTHROW 1886rxvt_term::scr_touch (bool refresh) NOTHROW
1856{ 1887{
1857 scr_expose (0, 0, width, height, refresh); 1888 scr_expose (0, 0, vt_width, vt_height, refresh);
1858} 1889}
1859 1890
1860/* ------------------------------------------------------------------------- */ 1891/* ------------------------------------------------------------------------- */
1861/* 1892/*
1862 * Move the display so that the line represented by scrollbar value Y is at 1893 * Move the display so that the line represented by scrollbar value Y is at
… …
1918 1949
1919# ifndef NO_MAPALERT 1950# ifndef NO_MAPALERT
1920# ifdef MAPALERT_OPTION 1951# ifdef MAPALERT_OPTION
1921 if (option (Opt_mapAlert)) 1952 if (option (Opt_mapAlert))
1922# endif 1953# endif
1923 XMapWindow (dpy, parent[0]); 1954 XMapWindow (dpy, parent);
1924# endif 1955# endif
1925 1956
1926# if ENABLE_FRILLS 1957# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell)) 1958 if (option (Opt_urgentOnBell))
1928 set_urgency (1); 1959 set_urgency (1);
… …
1936 1967
1937 bell_ev.start (VISUAL_BELL_DURATION); 1968 bell_ev.start (VISUAL_BELL_DURATION);
1938 } 1969 }
1939 else 1970 else
1940 XBell (dpy, 0); 1971 XBell (dpy, 0);
1972 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1973#endif
1942} 1974}
1943 1975
1944/* ------------------------------------------------------------------------- */ 1976/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */ 1977void ecb_cold
1946void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1978rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1979{
1949#ifdef PRINTPIPE 1980#ifdef PRINTPIPE
1950 int nrows, row_start; 1981 int nrows, row_start;
1951 FILE *fd = popen_printer (); 1982 FILE *fd = popen_printer ();
… …
1964 row_start = view_start; 1995 row_start = view_start;
1965 } 1996 }
1966 1997
1967 wctomb (0, 0); 1998 wctomb (0, 0);
1968 1999
1969 for (int r1 = 0; r1 < nrows; r1++) 2000 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1970 { 2001 {
1971 text_t *tp = ROW(r1).t; 2002 text_t *tp = ROW(r1).t;
1972 int len = ROW(r1).l; 2003 int len = ROW(r1).l;
1973 2004
1974 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2005 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2000/* 2031/*
2001 * Refresh the screen 2032 * Refresh the screen
2002 * drawn_text/drawn_rend contain the screen information before the update. 2033 * drawn_text/drawn_rend contain the screen information before the update.
2003 * screen.text/screen.rend contain what the screen will change to. 2034 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2035 */
2005void 2036void ecb_hot
2006rxvt_term::scr_refresh () NOTHROW 2037rxvt_term::scr_refresh () NOTHROW
2007{ 2038{
2008 unsigned char have_bg,
2009 showcursor; /* show the cursor */
2010 int16_t col, row, /* column/row we're processing */ 2039 int16_t col, row, /* column/row we're processing */
2011 ocrow; /* old cursor row */ 2040 ocrow; /* old cursor row */
2012 int i; /* tmp */ 2041 int i; /* tmp */
2013#ifndef NO_CURSORCOLOR 2042#ifndef NO_CURSORCOLOR
2014 rend_t cc1; /* store colours at cursor position (s) */ 2043 rend_t cc1; /* store colours at cursor position (s) */
… …
2025 /* 2054 /*
2026 * A: set up vars 2055 * A: set up vars
2027 */ 2056 */
2028 refresh_count = 0; 2057 refresh_count = 0;
2029 2058
2059 unsigned int old_screen_flags = screen.flags;
2030 have_bg = 0; 2060 bool have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2061#ifdef HAVE_IMG
2032 have_bg = bgPixmap.pixmap != None; 2062 have_bg = bg_img != 0;
2033#endif 2063#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2064 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2065
2036 /* 2066 /*
2037 * B: reverse any characters which are selected 2067 * B: reverse any characters which are selected
2038 */ 2068 */
2039 scr_reverse_selection (); 2069 scr_reverse_selection ();
2040 2070
2071 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2072#if ENABLE_OVERLAY
2073 scr_swap_overlay ();
2074#endif
2075
2076 bool showcursor = screen.flags & Screen_VisibleCursor;
2077
2041 /* 2078 /*
2042 * C: set the cursor character (s) 2079 * C: set the cursor character (s)
2043 */ 2080 */
2044 { 2081 {
2045 unsigned char setoldcursor; 2082 bool setoldcursor;
2046 2083
2047 showcursor = (screen.flags & Screen_VisibleCursor);
2048#ifdef CURSOR_BLINK 2084#ifdef CURSOR_BLINK
2049 if (hidden_cursor) 2085 if (hidden_cursor)
2050 showcursor = 0; 2086 showcursor = 0;
2051#endif 2087#endif
2052 2088
… …
2080 ccol2 = bgcolor_of (rstyle); 2116 ccol2 = bgcolor_of (rstyle);
2081#else 2117#else
2082 ccol2 = Color_bg; 2118 ccol2 = Color_bg;
2083#endif 2119#endif
2084 2120
2085 if (showcursor && focus) 2121 if (focus)
2086 { 2122 {
2087 if (option (Opt_cursorUnderline)) 2123 if (option (Opt_cursorUnderline))
2088 *crp ^= RS_Uline; 2124 *crp ^= RS_Uline;
2089 else 2125 else
2090 { 2126 {
… …
2125 oldcursor.col = screen.cur.col; 2161 oldcursor.col = screen.cur.col;
2126 } 2162 }
2127 } 2163 }
2128 } 2164 }
2129 2165
2130 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2131#if ENABLE_OVERLAY
2132 scr_swap_overlay ();
2133#endif
2134
2135#ifndef NO_SLOW_LINK_SUPPORT 2166#ifndef NO_SLOW_LINK_SUPPORT
2136 /* 2167 /*
2137 * D: CopyArea pass - very useful for slower links 2168 * D: CopyArea pass - very useful for slower links
2138 * This has been deliberately kept simple. 2169 * This has been deliberately kept simple.
2139 */ 2170 */
… …
2143 { 2174 {
2144 int16_t nits; 2175 int16_t nits;
2145 int i = num_scr; 2176 int i = num_scr;
2146 int j; 2177 int j;
2147 int len, wlen; 2178 int len, wlen;
2148 dLocal (int, num_scr);
2149 2179
2150 j = nrow; 2180 j = nrow;
2151 wlen = len = -1; 2181 wlen = len = -1;
2152 row = i > 0 ? 0 : j - 1; 2182 row = i > 0 ? 0 : j - 1;
2153 2183
… …
2228 continue; 2258 continue;
2229 2259
2230 // redraw one or more characters 2260 // redraw one or more characters
2231 2261
2232 // seek to the beginning of wide characters 2262 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2263 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2264 --col;
2235 2265
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2266 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2267 text_t *text = stp + col;
2238 int count = 1; 2268 int count = 1;
2239 2269
2240 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2241 drp[col] = rend; 2271 drp[col] = rend;
… …
2245 for (i = 0; ++col < ncol; ) 2275 for (i = 0; ++col < ncol; )
2246 { 2276 {
2247 if (stp[col] == NOCHAR) 2277 if (stp[col] == NOCHAR)
2248 { 2278 {
2249 dtp[col] = stp[col]; 2279 dtp[col] = stp[col];
2250 drp[col] = rend; 2280 drp[col] = srp[col];
2281
2251 count++; 2282 count++;
2252 i++; 2283 i++;
2253 2284
2254 continue; 2285 continue;
2255 } 2286 }
… …
2275 2306
2276 col--; /* went one too far. move back */ 2307 col--; /* went one too far. move back */
2277 count -= i; /* dump any matching trailing chars */ 2308 count -= i; /* dump any matching trailing chars */
2278 2309
2279 // sometimes we optimize away the trailing NOCHAR's, add them back 2310 // sometimes we optimize away the trailing NOCHAR's, add them back
2280 while (expect_false (i && text[count] == NOCHAR)) 2311 while (ecb_unlikely (i && text[count] == NOCHAR))
2281 count++, i--; 2312 count++, i--;
2282 2313
2283 /* 2314 /*
2284 * Determine the attributes for the string 2315 * Determine the attributes for the string
2285 */ 2316 */
2286 int fore = fgcolor_of (rend); // desired foreground 2317 int fore = fgcolor_of (rend); // desired foreground
2287 int back = bgcolor_of (rend); // desired background 2318 int back = bgcolor_of (rend); // desired background
2288 2319
2289 // only do special processing if any attributes are set, which is unlikely 2320 // only do special processing if any attributes are set, which is unlikely
2290 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2321 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2291 { 2322 {
2292 bool invert = rend & RS_RVid; 2323 bool invert = rend & RS_RVid;
2293 2324
2294#ifndef NO_BOLD_UNDERLINE_REVERSE 2325#ifndef NO_BOLD_UNDERLINE_REVERSE
2295 if (rend & RS_Bold && fore == Color_fg) 2326 if (rend & RS_Bold && fore == Color_fg)
… …
2314 2345
2315 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2346 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2316 fore = Color_UL; 2347 fore = Color_UL;
2317#endif 2348#endif
2318 2349
2350#ifdef OPTION_HC
2351 if (rend & RS_Sel)
2352 {
2353 /* invert the column if no highlightColor is set or it is the
2354 * current cursor column */
2355 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2356 && ISSET_PIXCOLOR (Color_HC))
2357 {
2358 if (ISSET_PIXCOLOR (Color_HTC))
2359 fore = Color_HTC;
2360 // if invert is 0 reverse video is set so we use bg color as fg color
2361 else if (!invert)
2362 fore = back;
2363
2364 back = Color_HC;
2365 invert = 0;
2366 }
2367 }
2368#endif
2369
2319 if (invert) 2370 if (invert)
2320 { 2371 {
2321#ifdef OPTION_HC
2322 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2323 || !ISSET_PIXCOLOR (Color_HC))
2324#endif
2325 /* invert the column if no highlightColor is set or it is the
2326 * current cursor column */
2327 ::swap (fore, back); 2372 ::swap (fore, back);
2328#ifdef OPTION_HC
2329 else if (ISSET_PIXCOLOR (Color_HC))
2330 back = Color_HC;
2331#endif
2332 2373
2333#ifndef NO_BOLD_UNDERLINE_REVERSE 2374#ifndef NO_BOLD_UNDERLINE_REVERSE
2334# ifndef OPTION_HC
2335 if (ISSET_PIXCOLOR (Color_RV))
2336 back = Color_RV;
2337# endif
2338 if (fore == back) 2375 if (fore == back)
2339 { 2376 {
2340 fore = Color_bg; 2377 fore = Color_bg;
2341 back = Color_fg; 2378 back = Color_fg;
2342 } 2379 }
… …
2378 /* 2415 /*
2379 * Actually do the drawing of the string here 2416 * Actually do the drawing of the string here
2380 */ 2417 */
2381 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2418 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2382 2419
2383 if (expect_true (have_bg && back == Color_bg)) 2420 if (ecb_likely (have_bg && back == Color_bg))
2384 { 2421 {
2385 // this is very ugly, maybe push it into ->draw? 2422 // this is very ugly, maybe push it into ->draw?
2386 2423
2387 for (i = 0; i < count; i++) /* don't draw empty strings */ 2424 for (i = 0; i < count; i++) /* don't draw empty strings */
2388 if (text[i] != ' ') 2425 if (text[i] != ' ')
… …
2395 did_clear: ; 2432 did_clear: ;
2396 } 2433 }
2397 else 2434 else
2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2435 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2399 2436
2400 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2437 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2401 { 2438 {
2402#if ENABLE_FRILLS 2439#if ENABLE_FRILLS
2403 if (ISSET_PIXCOLOR (Color_underline)) 2440 if (ISSET_PIXCOLOR (Color_underline))
2404 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2441 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2405 else 2442 else
… …
2410 xpixel, ypixel + font->ascent + 1, 2447 xpixel, ypixel + font->ascent + 1,
2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2448 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2412 } 2449 }
2413 } /* for (col....) */ 2450 } /* for (col....) */
2414 } /* for (row....) */ 2451 } /* for (row....) */
2415
2416#if ENABLE_OVERLAY
2417 scr_swap_overlay ();
2418#endif
2419 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2420 2452
2421 /* 2453 /*
2422 * G: cleanup cursor and display outline cursor if necessary 2454 * G: cleanup cursor and display outline cursor if necessary
2423 */ 2455 */
2424 if (showcursor) 2456 if (showcursor)
… …
2456 2488
2457 XDrawRectangle (dpy, vt, gc, 2489 XDrawRectangle (dpy, vt, gc,
2458 Col2Pixel (col), 2490 Col2Pixel (col),
2459 Row2Pixel (oldcursor.row), 2491 Row2Pixel (oldcursor.row),
2460 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2492 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2461 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2493 (unsigned int) (Height2Pixel (1) - 1));
2462 } 2494 }
2463 } 2495 }
2464 2496
2465 /* 2497 /*
2466 * H: cleanup selection 2498 * H: cleanup selection
2467 */ 2499 */
2500#if ENABLE_OVERLAY
2501 scr_swap_overlay ();
2502#endif
2503 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2504
2468 scr_reverse_selection (); 2505 scr_reverse_selection ();
2469 2506
2507 screen.flags = old_screen_flags;
2470 num_scr = 0; 2508 num_scr = 0;
2471 num_scr_allow = 1; 2509 num_scr_allow = 1;
2472} 2510}
2473 2511
2474void 2512void ecb_cold
2475rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2513rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2476{ 2514{
2477 if (!l.t) 2515 if (!l.valid ())
2478 return; 2516 return;
2479 2517
2480 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2518 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2481 2519
2482 for (int i = ncol; i--; ) 2520 for (int i = ncol; i--; )
2483 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2521 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2484} 2522}
2485 2523
2486void 2524void ecb_cold
2487rxvt_term::scr_remap_chars () NOTHROW 2525rxvt_term::scr_remap_chars () NOTHROW
2488{ 2526{
2489 for (int i = total_rows; i--; ) 2527 for (int i = total_rows; i--; )
2490 scr_remap_chars (row_buf [i]); 2528 scr_remap_chars (row_buf [i]);
2491 2529
… …
2494 scr_remap_chars (drawn_buf [i]); 2532 scr_remap_chars (drawn_buf [i]);
2495 scr_remap_chars (swap_buf [i]); 2533 scr_remap_chars (swap_buf [i]);
2496 } 2534 }
2497} 2535}
2498 2536
2499void 2537void ecb_cold
2500rxvt_term::scr_recolour () NOTHROW 2538rxvt_term::scr_recolour (bool refresh) NOTHROW
2501{ 2539{
2502#ifdef HAVE_BG_PIXMAP 2540 bool transparent = false;
2503 bgPixmap.apply ();
2504#else
2505 2541
2542#ifdef HAVE_IMG
2543 if (bg_img != 0)
2544 {
2545# if ENABLE_TRANSPARENCY
2546 if (bg_flags & BG_IS_TRANSPARENT)
2547 {
2548 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2549 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2550
2551 transparent = true;
2552 }
2553 else
2554# endif
2555 {
2556 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2557 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2558 }
2559 }
2560 else
2561#endif
2562 {
2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2563 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2507 XClearWindow (dpy, parent[0]);
2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2564 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2565 }
2566
2567 XClearWindow (dpy, parent);
2509 2568
2510 if (scrollBar.win) 2569 if (scrollBar.win)
2511 { 2570 {
2571 if (transparent)
2572 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2573 else
2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2574 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2513 scrollBar.state = STATE_IDLE; 2575 scrollBar.state = SB_STATE_IDLE;
2514 scrollBar.show (0); 2576 scrollBar.show (0);
2515 } 2577 }
2516 2578
2517#endif 2579 if (refresh)
2518 2580 {
2519 /* bgPixmap.apply () does not do the following : */
2520 scr_clear (); 2581 scr_clear ();
2521 scr_touch (true); 2582 scr_touch (true);
2583 }
2522 want_refresh = 1; 2584 want_refresh = 1;
2523} 2585}
2524 2586
2525/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2526void 2588void
… …
2583 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2645 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2584 srp[col] ^= rstyle; 2646 srp[col] ^= rstyle;
2585} 2647}
2586 2648
2587/* ------------------------------------------------------------------------- */ 2649/* ------------------------------------------------------------------------- */
2588void 2650void ecb_hot
2589rxvt_term::scr_reverse_selection () NOTHROW 2651rxvt_term::scr_reverse_selection () NOTHROW
2590{ 2652{
2591 if (selection.op 2653 if (selection.op
2592 && current_screen == selection.screen 2654 && current_screen == selection.screen
2593 && selection.end.row >= view_start) 2655 && selection.end.row >= view_start)
2594 { 2656 {
2595#if !ENABLE_MINIMAL 2657#if !ENABLE_MINIMAL
2596 if (selection.rect) 2658 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2659 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2660 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2661 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2662 else
2601#endif 2663#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2664 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2665 selection.end.row, selection.end.col,
2604 RS_RVid); 2666 RS_Sel | RS_RVid);
2605 } 2667 }
2606} 2668}
2607 2669
2608/* ------------------------------------------------------------------------- */ 2670/* ------------------------------------------------------------------------- */
2609/* 2671/*
… …
2612 */ 2674 */
2613#if 0 2675#if 0
2614void 2676void
2615rxvt_term::scr_dump (int fd) NOTHROW 2677rxvt_term::scr_dump (int fd) NOTHROW
2616{ 2678{
2617 int row, wrote; 2679 // if this method is needed, it can be implemented by factoring the
2618 unsigned int width, towrite; 2680 // relevant code in scr_printscreen
2619 char r1[] = "\n";
2620
2621 for (row = saveLines + top_row;
2622 row < saveLines + nrow - 1; row++)
2623 {
2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2625 : ncol;
2626 for (towrite = width; towrite; towrite -= wrote)
2627 {
2628 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2629 towrite);
2630 if (wrote < 0)
2631 return; /* XXX: death, no report */
2632 }
2633 if (row_buf[row].l >= 0)
2634 if (write (fd, r1, 1) <= 0)
2635 return; /* XXX: death, no report */
2636 }
2637} 2681}
2638#endif 2682#endif
2639 2683
2640/* ------------------------------------------------------------------------- * 2684/* ------------------------------------------------------------------------- *
2641 * CHARACTER SELECTION * 2685 * CHARACTER SELECTION *
2642 * ------------------------------------------------------------------------- */ 2686 * ------------------------------------------------------------------------- */
2643void 2687void
2644rxvt_term::selection_check (int check_more) NOTHROW 2688rxvt_term::selection_check (int check_more) NOTHROW
2645{ 2689{
2646 row_col_t pos;
2647
2648 if (!selection.op) 2690 if (!selection.op)
2649 return; 2691 return;
2650 2692
2651 pos.row = pos.col = 0;
2652 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2693 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2653 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2654 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2695 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2655 || (check_more == 1 2696 || (check_more == 1
2656 && current_screen == selection.screen 2697 && current_screen == selection.screen
2657 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2698 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2658 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2699 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2659 || (check_more == 2
2660 && ROWCOL_IS_BEFORE (selection.beg, pos)
2661 && ROWCOL_IS_AFTER (selection.end, pos))
2662 || (check_more == 3
2663 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 4 /* screen width change */
2665 && (selection.beg.row != selection.end.row
2666 || selection.end.col > ncol)))
2667 CLEAR_SELECTION (); 2700 CLEAR_ALL_SELECTION ();
2668} 2701}
2669 2702
2670/* ------------------------------------------------------------------------- */ 2703/* ------------------------------------------------------------------------- */
2671/* 2704/*
2672 * Paste a selection direct to the command fd 2705 * Paste a selection direct to the command fd
2673 */ 2706 */
2674void 2707void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2708rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2676{ 2709{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2710 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2711 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2712 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2713 data[i] = C0_CR;
2681 2714
2682 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~"); 2716 tt_printf ("\x1b[200~");
2684 2717
2685 tt_write (data, len); 2718 tt_write (data, len);
2686 2719
2687 if (priv_modes & PrivMode_BracketPaste) 2720 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~"); 2721 tt_printf ("\x1b[201~");
2689} 2722}
2690 2723
2691/* ------------------------------------------------------------------------- */
2692/*
2693 * Respond to a notification that a primary selection has been sent
2694 * EXT: SelectionNotify
2695 */
2696void 2724void
2697rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2725rxvt_term::paste (char *data, unsigned int len) NOTHROW
2698{ 2726{
2699 if (prop == None) /* check for failed XConvertSelection */ 2727 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2700 {
2701 if ((selection_type & Sel_CompoundText))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = 0;
2706 if (selnum != Sel_direct)
2707 selection_request_other (XA_STRING, selnum);
2708 }
2709
2710 if ((selection_type & Sel_UTF8String))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = Sel_CompoundText;
2715 if (selnum != Sel_direct)
2716 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2717 else
2718 selection_type = 0;
2719 }
2720
2721 return;
2722 }
2723
2724 unsigned long bytes_after;
2725 XTextProperty ct;
2726
2727 if (XGetWindowProperty (dpy, win, prop,
2728 0, PROP_SIZE / 4,
2729 delete_prop, AnyPropertyType,
2730 &ct.encoding, &ct.format,
2731 &ct.nitems, &bytes_after,
2732 &ct.value) != Success)
2733 {
2734 ct.value = 0;
2735 goto bailout;
2736 }
2737
2738 if (ct.encoding == None)
2739 goto bailout;
2740
2741 if (bytes_after)
2742 {
2743 // fetch and append remaining data
2744 XTextProperty ct2;
2745
2746 if (XGetWindowProperty (dpy, win, prop,
2747 ct.nitems / 4, (bytes_after + 3) / 4,
2748 delete_prop, AnyPropertyType,
2749 &ct2.encoding, &ct2.format,
2750 &ct2.nitems, &bytes_after,
2751 &ct2.value) != Success)
2752 goto bailout;
2753
2754 // realloc should be compatible to XFree, here, and elsewhere, too
2755 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2756 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2757 ct.nitems += ct2.nitems;
2758
2759 XFree (ct2.value);
2760 }
2761
2762 if (ct.value == 0)
2763 goto bailout;
2764
2765 if (ct.encoding == xa[XA_INCR])
2766 {
2767 // INCR selection, start handshake
2768 if (!delete_prop)
2769 XDeleteProperty (dpy, win, prop);
2770
2771 selection_wait = Sel_incr;
2772 incr_buf_fill = 0;
2773 incr_ev.start (10);
2774
2775 goto bailout;
2776 }
2777
2778 if (ct.nitems == 0)
2779 {
2780 if (selection_wait == Sel_incr)
2781 {
2782 XFree (ct.value);
2783
2784 // finally complete, now paste the whole thing
2785 selection_wait = Sel_normal;
2786 ct.value = (unsigned char *)incr_buf;
2787 ct.nitems = incr_buf_fill;
2788 incr_buf = 0;
2789 incr_buf_size = 0;
2790 incr_ev.stop ();
2791 }
2792 else
2793 {
2794 if (selection_wait == Sel_normal
2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2796 {
2797 /*
2798 * pass through again trying CUT_BUFFER0 if we've come from
2799 * XConvertSelection () but nothing was presented
2800 */
2801 selection_paste (display->root, XA_CUT_BUFFER0, False);
2802 }
2803
2804 goto bailout;
2805 }
2806 }
2807 else if (selection_wait == Sel_incr)
2808 {
2809 incr_ev.start (10);
2810
2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2812 {
2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2815 }
2816
2817 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2818 incr_buf_fill += ct.nitems;
2819
2820 goto bailout;
2821 }
2822
2823 char **cl;
2824 int cr;
2825
2826#if !ENABLE_MINIMAL
2827 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2828 // so recode it manually
2829 if (ct.encoding == xa[XA_UTF8_STRING])
2830 {
2831 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2832 char *s = rxvt_wcstombs (w);
2833 free (w);
2834 // TODO: strlen == only the first element will be converted. well...
2835 paste (s, strlen (s));
2836 free (s);
2837 }
2838 else
2839#endif
2840 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2841 && cl)
2842 {
2843 for (int i = 0; i < cr; i++)
2844 paste (cl[i], strlen (cl[i]));
2845
2846 XFreeStringList (cl);
2847 }
2848 else
2849 paste ((char *)ct.value, ct.nitems); // paste raw
2850
2851bailout:
2852 XFree (ct.value);
2853
2854 if (selection_wait == Sel_normal)
2855 selection_wait = Sel_none;
2856}
2857
2858void
2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2860{
2861 selection_wait = Sel_none;
2862
2863 incr_buf_size = 0;
2864 free (incr_buf);
2865
2866 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2867}
2868
2869void
2870rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2871{
2872 if (prop == None || selection_wait != Sel_incr)
2873 return; 2728 return;
2874 2729
2875 selection_paste (win, prop, true); 2730 tt_paste (data, len);
2876} 2731}
2877 2732
2878/* ------------------------------------------------------------------------- */ 2733/* ------------------------------------------------------------------------- */
2879/* 2734/*
2880 * Request the current selection: 2735 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2881 * Order: > internal selection if available 2736 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2737 * as fallback
2883 * > CUT_BUFFER0
2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2885 * will auto fallback to CUT_BUFFER0
2886 * EXT: button 2 release 2738 * EXT: button 2 release
2887 */ 2739 */
2888void 2740void
2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2741rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2890{ 2742{
2891 if (selection.text && selnum == Sel_Primary) 2743 if (!selection_req)
2892 {
2893 /* internal selection */
2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2895 paste (str, strlen (str));
2896 free (str);
2897 return;
2898 } 2744 {
2899 else 2745 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2746 selection_req->run ();
2900 { 2747 }
2901 selection_request_time = tm;
2902 selection_wait = Sel_normal;
2903
2904#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return;
2908#else
2909 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return;
2912#endif
2913 }
2914
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false);
2917}
2918
2919int
2920rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2921{
2922 Atom sel;
2923
2924 selection_type |= selnum;
2925
2926 if (selnum == Sel_Primary)
2927 sel = XA_PRIMARY;
2928 else if (selnum == Sel_Secondary)
2929 sel = XA_SECONDARY;
2930 else
2931 sel = xa[XA_CLIPBOARD];
2932
2933 if (XGetSelectionOwner (dpy, sel) != None)
2934 {
2935 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2936 vt, selection_request_time);
2937 return 1;
2938 }
2939
2940 return 0;
2941} 2748}
2942 2749
2943/* ------------------------------------------------------------------------- */ 2750/* ------------------------------------------------------------------------- */
2944/* 2751/*
2945 * Clear all selected text 2752 * Clear all selected text
2946 * EXT: SelectionClear 2753 * EXT: SelectionClear
2947 */ 2754 */
2948void 2755void
2949rxvt_term::selection_clear () NOTHROW 2756rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2757{
2758 if (!clipboard)
2759 {
2951 want_refresh = 1; 2760 want_refresh = 1;
2952 free (selection.text); 2761 free (selection.text);
2953 selection.text = NULL; 2762 selection.text = NULL;
2954 selection.len = 0; 2763 selection.len = 0;
2955 CLEAR_SELECTION (); 2764 CLEAR_SELECTION ();
2956 2765
2957 if (display->selection_owner == this) 2766 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2767 display->selection_owner = 0;
2768 }
2769 else
2770 {
2771 free (selection.clip_text);
2772 selection.clip_text = NULL;
2773 selection.clip_len = 0;
2774
2775 if (display->clipboard_owner == this)
2776 display->clipboard_owner = 0;
2777 }
2959} 2778}
2960 2779
2961/* ------------------------------------------------------------------------- */ 2780/* ------------------------------------------------------------------------- */
2962/* 2781/*
2963 * Copy a selection into the cut buffer 2782 * Copy a selection into the cut buffer
2964 * EXT: button 1 or 3 release 2783 * EXT: button 1 or 3 release
2965 */ 2784 */
2966void 2785void
2967rxvt_term::selection_make (Time tm) 2786rxvt_term::selection_make (Time tm)
2968{ 2787{
2969 int i; 2788 int size;
2970 wchar_t *new_selection_text; 2789 wchar_t *new_selection_text;
2971 text_t *t; 2790 text_t *t;
2972 2791
2973 switch (selection.op) 2792 switch (selection.op)
2974 { 2793 {
… …
2990 return; /* nothing selected, go away */ 2809 return; /* nothing selected, go away */
2991 2810
2992 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2811 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2993 return; 2812 return;
2994 2813
2995 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2814 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2815 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2997 2816
2998 int ofs = 0; 2817 int ofs = 0;
2999 int extra = 0; 2818 int extra = 0;
3000 2819
3001 int col = selection.beg.col; 2820 int col = selection.beg.col;
… …
3007 { 2826 {
3008#if !ENABLE_MINIMAL 2827#if !ENABLE_MINIMAL
3009 if (selection.rect) 2828 if (selection.rect)
3010 { 2829 {
3011 col = selection.beg.col; 2830 col = selection.beg.col;
3012 end_col = ncol + 1; 2831 end_col = selection.end.col;
3013 } 2832 }
3014 else 2833 else
3015#endif 2834#endif
3016 end_col = ROW(row).l; 2835 end_col = ROW(row).l;
3017 2836
3018 col = max (col, 0); 2837 col = max (col, 0);
3019 2838
3020 if (row == selection.end.row 2839 if (row == selection.end.row)
3021#if !ENABLE_MINIMAL
3022 || selection.rect
3023#endif
3024 )
3025 min_it (end_col, selection.end.col); 2840 min_it (end_col, selection.end.col);
3026 2841
3027 t = ROW(row).t + col; 2842 t = ROW(row).t + col;
3028 2843
3029 for (; col < end_col; col++) 2844 for (; col < end_col; col++)
… …
3037 2852
3038 extra -= (len - 1); 2853 extra -= (len - 1);
3039 2854
3040 if (extra < 0) 2855 if (extra < 0)
3041 { 2856 {
3042 extra += i; 2857 extra += size;
3043 i += i; 2858 size += size;
3044 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2859 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3045 } 2860 }
3046 2861
3047 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2862 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3048 } 2863 }
3049#endif 2864#endif
… …
3061 2876
3062 new_selection_text[ofs++] = C0_LF; 2877 new_selection_text[ofs++] = C0_LF;
3063 } 2878 }
3064 else 2879 else
3065#endif 2880#endif
3066 if (!ROW(row).is_longer () && row != selection.end.row) 2881 if (!ROW(row).is_longer ()
2882 && (row != selection.end.row || end_col != selection.end.col)
2883 && (row != selection.beg.row || selection.beg.col < ncol))
3067 new_selection_text[ofs++] = C0_LF; 2884 new_selection_text[ofs++] = C0_LF;
3068 } 2885 }
3069
3070 if (end_col != selection.end.col)
3071 new_selection_text[ofs++] = C0_LF;
3072 2886
3073 new_selection_text[ofs] = 0; 2887 new_selection_text[ofs] = 0;
3074 2888
3075 if (ofs == 0) 2889 if (ofs == 0)
3076 { 2890 {
… …
3089 2903
3090 selection_grab (tm); 2904 selection_grab (tm);
3091} 2905}
3092 2906
3093bool 2907bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 2908rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 2909{
2910 Atom sel;
2911
2912 if (!clipboard)
2913 {
3096 selection_time = tm; 2914 selection_time = tm;
2915 sel = XA_PRIMARY;
2916 }
2917 else
2918 {
2919 clipboard_time = tm;
2920 sel = xa[XA_CLIPBOARD];
2921 }
3097 2922
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2923 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2924 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 2925 {
3101 display->set_selection_owner (this); 2926 display->set_selection_owner (this, clipboard);
3102 return true; 2927 return true;
3103 } 2928 }
3104 else 2929 else
3105 { 2930 {
3106 selection_clear (); 2931 selection_clear (clipboard);
3107 return false; 2932 return false;
3108 } 2933 }
3109 2934
3110#if 0 2935#if 0
3111 XTextProperty ct; 2936 XTextProperty ct;
… …
3121/* ------------------------------------------------------------------------- */ 2946/* ------------------------------------------------------------------------- */
3122/* 2947/*
3123 * Mark or select text based upon number of clicks: 1, 2, or 3 2948 * Mark or select text based upon number of clicks: 1, 2, or 3
3124 * EXT: button 1 press 2949 * EXT: button 1 press
3125 */ 2950 */
3126void 2951void ecb_cold
3127rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2952rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3128{ 2953{
3129 clicks = ((clicks - 1) % 3) + 1; 2954 clicks = ((clicks - 1) % 3) + 1;
3130 selection.clicks = clicks; /* save clicks so extend will work */ 2955 selection.clicks = clicks; /* save clicks so extend will work */
3131 2956
… …
3150 2975
3151/* ------------------------------------------------------------------------- */ 2976/* ------------------------------------------------------------------------- */
3152/* 2977/*
3153 * Mark a selection at the specified col/row 2978 * Mark a selection at the specified col/row
3154 */ 2979 */
3155void 2980void ecb_cold
3156rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2981rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3157{ 2982{
3158 want_refresh = 1; 2983 want_refresh = 1;
3159 2984
3160 selection.mark.row = row + view_start; 2985 selection.mark.row = row + view_start;
… …
3187/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3012/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3188#define DELIMIT_TEXT(x) \ 3013#define DELIMIT_TEXT(x) \
3189 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3014 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3190#define DELIMIT_REND(x) 1 3015#define DELIMIT_REND(x) 1
3191 3016
3192void 3017void ecb_cold
3193rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3018rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3194{ 3019{
3195 int col, row, dirnadd, tcol, trow, w1, w2; 3020 int col, row, dirnadd, tcol, trow, w1, w2;
3196 row_col_t bound; 3021 row_col_t bound;
3197 text_t *stp; 3022 text_t *stp;
… …
3271 * EXT: button 3 press; button 1 or 3 drag 3096 * EXT: button 3 press; button 1 or 3 drag
3272 * flag == 0 ==> button 1 3097 * flag == 0 ==> button 1
3273 * flag == 1 ==> button 3 press 3098 * flag == 1 ==> button 3 press
3274 * flag == 2 ==> button 3 motion 3099 * flag == 2 ==> button 3 motion
3275 */ 3100 */
3276void 3101void ecb_cold
3277rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3102rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3278{ 3103{
3279 int col = clamp (Pixel2Col (x), 0, ncol); 3104 int col = clamp (Pixel2Col (x), 0, ncol);
3280 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3105 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3281 3106
… …
3307 3132
3308/* ------------------------------------------------------------------------- */ 3133/* ------------------------------------------------------------------------- */
3309/* 3134/*
3310 * Extend the selection to the specified col/row 3135 * Extend the selection to the specified col/row
3311 */ 3136 */
3312void 3137void ecb_cold
3313rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3138rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3314{ 3139{
3315 row_col_t pos; 3140 row_col_t pos;
3316 enum { 3141 enum {
3317 LEFT, RIGHT 3142 LEFT, RIGHT
… …
3508 ::swap (selection.beg.col, selection.end.col); 3333 ::swap (selection.beg.col, selection.end.col);
3509#endif 3334#endif
3510} 3335}
3511 3336
3512#if !ENABLE_MINIMAL 3337#if !ENABLE_MINIMAL
3513void 3338void ecb_cold
3514rxvt_term::selection_remove_trailing_spaces () NOTHROW 3339rxvt_term::selection_remove_trailing_spaces () NOTHROW
3515{ 3340{
3516 int32_t end_col, end_row; 3341 int32_t end_col, end_row;
3517 text_t *stp; 3342 text_t *stp;
3518 3343
… …
3556/* ------------------------------------------------------------------------- */ 3381/* ------------------------------------------------------------------------- */
3557/* 3382/*
3558 * Double click on button 3 when already selected 3383 * Double click on button 3 when already selected
3559 * EXT: button 3 double click 3384 * EXT: button 3 double click
3560 */ 3385 */
3561void 3386void ecb_cold
3562rxvt_term::selection_rotate (int x, int y) NOTHROW 3387rxvt_term::selection_rotate (int x, int y) NOTHROW
3563{ 3388{
3564 selection.clicks = selection.clicks % 3 + 1; 3389 selection.clicks = selection.clicks % 3 + 1;
3565 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3390 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3566} 3391}
… …
3568/* ------------------------------------------------------------------------- */ 3393/* ------------------------------------------------------------------------- */
3569/* 3394/*
3570 * Respond to a request for our current selection 3395 * Respond to a request for our current selection
3571 * EXT: SelectionRequest 3396 * EXT: SelectionRequest
3572 */ 3397 */
3573void 3398void ecb_cold
3574rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3399rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3575{ 3400{
3401 Atom property = rq.property == None ? rq.target : rq.property;
3576 XSelectionEvent ev; 3402 XSelectionEvent ev;
3577 3403
3578 ev.type = SelectionNotify; 3404 ev.type = SelectionNotify;
3579 ev.property = None; 3405 ev.property = None;
3580 ev.display = rq.display; 3406 ev.display = rq.display;
… …
3595 *target++ = xa[XA_COMPOUND_TEXT]; 3421 *target++ = xa[XA_COMPOUND_TEXT];
3596#if X_HAVE_UTF8_STRING 3422#if X_HAVE_UTF8_STRING
3597 *target++ = xa[XA_UTF8_STRING]; 3423 *target++ = xa[XA_UTF8_STRING];
3598#endif 3424#endif
3599 3425
3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3426 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3601 32, PropModeReplace, 3427 32, PropModeReplace,
3602 (unsigned char *)target_list, target - target_list); 3428 (unsigned char *)target_list, target - target_list);
3603 ev.property = rq.property; 3429 ev.property = property;
3604 } 3430 }
3605#if TODO // TODO 3431#if TODO // TODO
3606 else if (rq.target == xa[XA_MULTIPLE]) 3432 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3433 {
3608 /* TODO: Handle MULTIPLE */ 3434 /* TODO: Handle MULTIPLE */
3609 } 3435 }
3610#endif 3436#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3438 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3440 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3615 ev.property = rq.property; 3441 ev.property = property;
3442 }
3443 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3444 {
3445 XChangeProperty (dpy, rq.requestor, property, rq.target,
3446 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3447 ev.property = property;
3616 } 3448 }
3617 else if (rq.target == XA_STRING 3449 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3450 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3451 || rq.target == xa[XA_COMPOUND_TEXT]
3620 || rq.target == xa[XA_UTF8_STRING] 3452 || rq.target == xa[XA_UTF8_STRING]
… …
3652 { 3484 {
3653 target = xa[XA_COMPOUND_TEXT]; 3485 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3486 style = enc_compound_text;
3655 } 3487 }
3656 3488
3657 if (selection.text) 3489 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3490 {
3659 cl = selection.text; 3491 cl = selection.text;
3660 selectlen = selection.len; 3492 selectlen = selection.len;
3493 }
3494 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3495 {
3496 cl = selection.clip_text;
3497 selectlen = selection.clip_len;
3661 } 3498 }
3662 else 3499 else
3663 { 3500 {
3664 cl = L""; 3501 cl = L"";
3665 selectlen = 0; 3502 selectlen = 0;
… …
3686 ct.value = (unsigned char *)cl; 3523 ct.value = (unsigned char *)cl;
3687 ct.nitems = selectlen; 3524 ct.nitems = selectlen;
3688 ct.encoding = target; 3525 ct.encoding = target;
3689 } 3526 }
3690 3527
3691 XChangeProperty (dpy, rq.requestor, rq.property, 3528 XChangeProperty (dpy, rq.requestor, property,
3692 ct.encoding, 8, PropModeReplace, 3529 ct.encoding, 8, PropModeReplace,
3693 ct.value, (int)ct.nitems); 3530 ct.value, (int)ct.nitems);
3694 ev.property = rq.property; 3531 ev.property = property;
3695 3532
3696 if (freect) 3533 if (freect)
3697 XFree (ct.value); 3534 XFree (ct.value);
3698 } 3535 }
3699 3536
3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3537 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3701} 3538}
3702 3539
3703/* ------------------------------------------------------------------------- */ 3540/* ------------------------------------------------------------------------- */
3704#ifdef USE_XIM 3541#if USE_XIM
3705void 3542void ecb_cold
3706rxvt_term::im_set_position (XPoint &pos) NOTHROW 3543rxvt_term::im_set_position (XPoint &pos) NOTHROW
3707{ 3544{
3708 XWindowAttributes xwa; 3545 XWindowAttributes xwa;
3709 3546
3710 XGetWindowAttributes (dpy, vt, &xwa); 3547 XGetWindowAttributes (dpy, vt, &xwa);
… …
3733 h += 2; min_it (h, nrow); 3570 h += 2; min_it (h, nrow);
3734 3571
3735 x -= 1; clamp_it (x, 0, ncol - w); 3572 x -= 1; clamp_it (x, 0, ncol - w);
3736 y -= 1; clamp_it (y, 0, nrow - h); 3573 y -= 1; clamp_it (y, 0, nrow - h);
3737 3574
3738 ov_x = x; ov_y = y; 3575 ov.x = x; ov.y = y;
3739 ov_w = w; ov_h = h; 3576 ov.w = w; ov.h = h;
3740 3577
3741 ov_text = new text_t *[h]; 3578 ov.text = new text_t *[h];
3742 ov_rend = new rend_t *[h]; 3579 ov.rend = new rend_t *[h];
3743 3580
3744 for (y = 0; y < h; y++) 3581 for (y = 0; y < h; y++)
3745 { 3582 {
3746 text_t *tp = ov_text[y] = new text_t[w]; 3583 text_t *tp = ov.text[y] = new text_t[w];
3747 rend_t *rp = ov_rend[y] = new rend_t[w]; 3584 rend_t *rp = ov.rend[y] = new rend_t[w];
3748 3585
3749 text_t t0, t1, t2; 3586 text_t t0, t1, t2;
3750 rend_t r = OVERLAY_RSTYLE; 3587 rend_t r = OVERLAY_RSTYLE;
3751 3588
3752 if (y == 0) 3589 if (y == 0)
… …
3771} 3608}
3772 3609
3773void 3610void
3774rxvt_term::scr_overlay_off () NOTHROW 3611rxvt_term::scr_overlay_off () NOTHROW
3775{ 3612{
3776 if (!ov_text) 3613 if (!ov.text)
3777 return; 3614 return;
3778 3615
3779 want_refresh = 1; 3616 want_refresh = 1;
3780 3617
3781 for (int y = 0; y < ov_h; y++) 3618 for (int y = 0; y < ov.h; y++)
3782 { 3619 {
3783 delete [] ov_text[y]; 3620 delete [] ov.text[y];
3784 delete [] ov_rend[y]; 3621 delete [] ov.rend[y];
3785 } 3622 }
3786 3623
3787 delete [] ov_text; ov_text = 0; 3624 delete [] ov.text; ov.text = 0;
3788 delete [] ov_rend; ov_rend = 0; 3625 delete [] ov.rend; ov.rend = 0;
3789} 3626}
3790 3627
3791void 3628void
3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3629rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3793{ 3630{
3794 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3631 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3795 return; 3632 return;
3796 3633
3797 x++, y++; 3634 x++, y++;
3798 3635
3799 ov_text[y][x] = text; 3636 ov.text[y][x] = text;
3800 ov_rend[y][x] = rend; 3637 ov.rend[y][x] = rend;
3801} 3638}
3802 3639
3803void 3640void
3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3641rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3805{ 3642{
… …
3824} 3661}
3825 3662
3826void 3663void
3827rxvt_term::scr_swap_overlay () NOTHROW 3664rxvt_term::scr_swap_overlay () NOTHROW
3828{ 3665{
3829 if (!ov_text) 3666 if (!ov.text)
3830 return; 3667 return;
3831 3668
3669 // hide cursor if it is within the overlay area
3670 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3671 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3672 screen.flags &= ~Screen_VisibleCursor;
3673
3832 // swap screen mem with overlay 3674 // swap screen mem with overlay
3833 for (int y = ov_h; y--; ) 3675 for (int y = ov.h; y--; )
3834 { 3676 {
3835 text_t *t1 = ov_text[y]; 3677 text_t *t1 = ov.text[y];
3836 rend_t *r1 = ov_rend[y]; 3678 rend_t *r1 = ov.rend[y];
3837 3679
3838 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3680 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3839 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3681 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3840 3682
3841 for (int x = ov_w; x--; ) 3683 for (int x = ov.w; x--; )
3842 { 3684 {
3843 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3685 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3844 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3686 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3845 } 3687 }
3846 } 3688 }

Diff Legend

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