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.319 by root, Tue Nov 4 23:08:44 2008 UTC vs.
Revision 1.422 by root, Thu Jun 28 15:19:15 2012 UTC

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

Diff Legend

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