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.314 by root, Tue Nov 4 14:34:13 2008 UTC vs.
Revision 1.424 by root, Fri Jun 29 22:10:09 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
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 (' '));
147 144
145 l.touch ();
146
148 // found begin, 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;
152 col++; 151 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
163#if ENABLE_OVERLAY 196#if ENABLE_OVERLAY
164 scr_overlay_off (); 197 scr_overlay_off ();
165#endif 198#endif
166 199
167 rvideo_mode = false;
168 view_start = 0; 200 view_start = 0;
169 num_scr = 0; 201 num_scr = 0;
170 202
171 if (ncol == 0) 203 if (ncol == 0)
172 ncol = 80; 204 ncol = 80;
… …
174 if (nrow == 0) 206 if (nrow == 0)
175 nrow = 24; 207 nrow = 24;
176 208
177 if (ncol == prev_ncol && nrow == prev_nrow) 209 if (ncol == prev_ncol && nrow == prev_nrow)
178 return; 210 return;
179
180 if (current_screen != PRIMARY)
181 scr_swap_screen ();
182 211
183 // we need at least two lines for wrapping to work correctly 212 // we need at least two lines for wrapping to work correctly
184 while (nrow + saveLines < 2) 213 while (nrow + saveLines < 2)
185 { 214 {
186 //TODO//FIXME 215 //TODO//FIXME
… …
195 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
196 225
197 screen.tscroll = 0; 226 screen.tscroll = 0;
198 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
199 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
200 if (!row_buf) 239 if (!prev_row_buf)
201 { 240 {
202 /* 241 /*
203 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
204 */ 243 */
205 top_row = 0; 244 top_row = 0;
206 term_start = 0; 245 term_start = 0;
207
208 talloc = new rxvt_salloc (ncol * sizeof (text_t));
209 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
210
211 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
212 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
213 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
214
215 for (int row = nrow; row--; )
216 {
217 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
218 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
219 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
220 }
221 246
222 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
223 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
224 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
225 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
239 selection.text = NULL; 264 selection.text = NULL;
240 selection.len = 0; 265 selection.len = 0;
241 selection.op = SELECTION_CLEAR; 266 selection.op = SELECTION_CLEAR;
242 selection.screen = PRIMARY; 267 selection.screen = PRIMARY;
243 selection.clicks = 0; 268 selection.clicks = 0;
269 selection.clip_text = NULL;
270 selection.clip_len = 0;
244 } 271 }
245 else 272 else
246 { 273 {
247 /* 274 /*
248 * add or delete rows as appropriate 275 * add or delete rows as appropriate
249 */ 276 */
250 277
251 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
252 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
253
254#if 0
255 if (nrow < prev_nrow)
256 {
257 for (int row = nrow; row < prev_nrow; row++)
258 {
259 lfree (swap_buf [row]);
260 lfree (drawn_buf[row]);
261 }
262 }
263#endif
264
265 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267
268 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
269 { 279 {
270 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
271 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 }
273 282
274 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
275 { 287 }
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 }
279
280 line_t *old_buf = row_buf;
281 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
282 288
283 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
284 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
285 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
286 292
287 if (top_row) 293 if (top_row)
288 { 294 {
289 // Re-wrap lines. This is rather ugly, possibly because I am too dumb 295 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
290 // to come up with a lean and mean algorithm. 296 // to come up with a lean and mean algorithm.
297 // TODO: maybe optimise when width didn't change
291 298
292 row_col_t ocur = screen.cur; 299 row_col_t ocur = screen.cur;
293 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
294 301
295 do 302 do
296 { 303 {
297 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
298#ifdef DEBUG_STRICT
299 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
300#endif
301 int plines = 1; 306 int plines = 1;
302 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
303 308
304 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
305 { 310 {
306 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
307 312
308 plines++; 313 plines++;
309 llen += prev_ncol; 314 llen += prev_ncol;
… …
322 327
323 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
324 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
325 { 330 {
326 qline = row_buf + qrow; 331 qline = row_buf + qrow;
327 lalloc (*qline); 332 qline->alloc (); // redundant with next line
328 qline->l = ncol; 333 qline->l = ncol;
329 qline->is_longer (1); 334 qline->is_longer (1);
330 335
331 int qcol = 0; 336 int qcol = 0;
332 337
… …
347 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
348 // least. 353 // least.
349 if (prow == ocur.row) 354 if (prow == ocur.row)
350 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
351 356
352 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
353 358
354 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
355 360
356 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
357 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
378 { 383 {
379 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
380 385
381 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
382 { 387 {
383 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
384 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
385 390
386 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
387 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
388 } 395 }
389 396
390 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
391 {
392 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
393 }
394 399
395 term_start = 0; 400 term_start = 0;
396 } 401 }
397
398 free (old_buf);
399 delete old_ta;
400 delete old_ra;
401 402
402 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
405 }
404 406
407 for (int row = nrow; row--; )
408 {
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 }
413
414 printf ("pc %p\n", prev_chunk);//D
415 chunk_free (prev_chunk, prev_chunk_size);
416
405 free (tabs); 417 free (tabs);
406 } 418 tabs = (char *)rxvt_malloc (ncol);
419
420 for (int col = ncol; col--; )
421 tabs [col] = col % TABSIZE == 0;
407 422
408 CLEAR_ALL_SELECTION (); 423 CLEAR_ALL_SELECTION ();
409 424
410 prev_nrow = nrow; 425 prev_nrow = nrow;
411 prev_ncol = ncol; 426 prev_ncol = ncol;
412 427
413 tabs = (char *)rxvt_malloc (ncol); 428 tt_winch ();
414 429
415 for (int col = ncol; --col; ) 430 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
416 tabs [col] = col % TABSIZE == 0; 431}
432
433void ecb_cold
434rxvt_term::scr_release () NOTHROW
435{
436 chunk_free (chunk, chunk_size);
437 chunk = 0;
438 row_buf = 0;
439
440 free (tabs);
441 tabs = 0;
442}
443
444/* ------------------------------------------------------------------------- */
445/*
446 * Hard/Soft reset
447 */
448void ecb_cold
449rxvt_term::scr_poweron ()
450{
451 scr_release ();
452
453 prev_nrow = prev_ncol = 0;
454 rvideo_mode = false;
455 scr_soft_reset ();
456 scr_reset ();
457
458 scr_clear (true);
459 scr_refresh ();
460}
461
462void ecb_cold
463rxvt_term::scr_soft_reset () NOTHROW
464{
465 /* only affects modes, nothing drastic such as clearing the screen */
466#if ENABLE_OVERLAY
467 scr_overlay_off ();
468#endif
417 469
418 if (current_screen != PRIMARY) 470 if (current_screen != PRIMARY)
419 scr_swap_screen (); 471 scr_swap_screen ();
420 472
421 tt_winch (); 473 scr_scroll_region (0, MAX_ROWS - 1);
422 474 scr_rendition (0, ~RS_None);
423 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 475 scr_insert_mode (0);
424}
425
426/* ------------------------------------------------------------------------- */
427/*
428 * Free everything. That way malloc debugging can find leakage.
429 */
430void
431rxvt_term::scr_release () NOTHROW
432{
433 if (row_buf)
434 {
435 delete talloc; talloc = 0;
436 delete ralloc; ralloc = 0;
437
438 free (row_buf);
439 free (swap_buf);
440 free (drawn_buf);
441 free (tabs);
442
443 row_buf = 0; // signal that we freed all the arrays
444 }
445}
446
447/* ------------------------------------------------------------------------- */
448/*
449 * Hard reset
450 */
451void
452rxvt_term::scr_poweron ()
453{
454 scr_release ();
455 prev_nrow = prev_ncol = 0;
456 scr_reset ();
457
458 scr_clear (true);
459 scr_refresh ();
460} 476}
461 477
462/* ------------------------------------------------------------------------- * 478/* ------------------------------------------------------------------------- *
463 * PROCESS SCREEN COMMANDS * 479 * PROCESS SCREEN COMMANDS *
464 * ------------------------------------------------------------------------- */ 480 * ------------------------------------------------------------------------- */
… …
502 } 518 }
503 519
504 /* boundary check in case screen size changed between SAVE and RESTORE */ 520 /* boundary check in case screen size changed between SAVE and RESTORE */
505 min_it (s->cur.row, nrow - 1); 521 min_it (s->cur.row, nrow - 1);
506 min_it (s->cur.col, ncol - 1); 522 min_it (s->cur.col, ncol - 1);
507#ifdef DEBUG_STRICT
508 assert (s->cur.row >= 0); 523 assert (s->cur.row >= 0);
509 assert (s->cur.col >= 0); 524 assert (s->cur.col >= 0);
510#endif
511} 525}
512 526
513void 527void
514rxvt_term::scr_swap_screen () 528rxvt_term::scr_swap_screen () NOTHROW
515{ 529{
516 if (!option (Opt_secondaryScreen)) 530 if (!option (Opt_secondaryScreen))
517 return; 531 return;
518 532
519 for (int i = prev_nrow; i--; ) 533 for (int i = prev_nrow; i--; )
… …
538 return; 552 return;
539 553
540 want_refresh = 1; 554 want_refresh = 1;
541 view_start = 0; 555 view_start = 0;
542 556
543 selection_check (2); /* check for boundary cross */ 557 /* check for boundary cross */
558 row_col_t pos;
559 pos.row = pos.col = 0;
560 if (ROWCOL_IS_BEFORE (selection.beg, pos)
561 && ROWCOL_IS_AFTER (selection.end, pos))
562 CLEAR_SELECTION ();
544 563
545 int i = current_screen; current_screen = scrn; scrn = i; 564 current_screen = scrn;
546 565
547#if NSCREENS 566#if NSCREENS
548 if (option (Opt_secondaryScreen)) 567 if (option (Opt_secondaryScreen))
549 { 568 {
550 num_scr = 0; 569 num_scr = 0;
… …
614/* 633/*
615 * Scroll text between <row1> and <row2> inclusive, by <count> lines 634 * Scroll text between <row1> and <row2> inclusive, by <count> lines
616 * count positive ==> scroll up 635 * count positive ==> scroll up
617 * count negative ==> scroll down 636 * count negative ==> scroll down
618 */ 637 */
619int 638int ecb_hot
620rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 639rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
621{ 640{
622 if (count == 0 || (row1 > row2)) 641 if (count == 0 || (row1 > row2))
623 return 0; 642 return 0;
624 643
… …
627 646
628 if (count > 0 647 if (count > 0
629 && row1 == 0 648 && row1 == 0
630 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 649 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
631 { 650 {
651 min_it (count, total_rows - (nrow - (row2 + 1)));
652
632 top_row = max (top_row - count, -saveLines); 653 top_row = max (top_row - count, -saveLines);
633
634 // scroll everything up 'count' lines
635 term_start = (term_start + count) % total_rows;
636 654
637 // sever bottommost line 655 // sever bottommost line
638 { 656 {
639 line_t &l = ROW(row2 - count); 657 line_t &l = ROW(row2);
640 l.is_longer (0); 658 l.is_longer (0);
641 l.touch (); 659 l.touch ();
642 } 660 }
643 661
662 // scroll everything up 'count' lines
663 term_start = (term_start + count) % total_rows;
664
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
644 // erase newly scrolled-in lines 677 // erase newly scrolled-in lines
645 for (int i = count; i--; ) 678 for (int i = count; i--; )
646 { 679 {
647 line_t &l = ROW(nrow - 1 - i); 680 line_t &l = ROW(row2 - i);
648 681
649 // optimize if already cleared, can be significant on slow machines 682 // optimise if already cleared, can be significant on slow machines
650 // could be rolled into scr_blank_screen_mem 683 // could be rolled into scr_blank_screen_mem
651 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 684 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
652 { 685 {
653 scr_blank_line (l, 0, l.l, rstyle); 686 scr_blank_line (l, 0, l.l, rstyle);
654 l.l = 0; 687 l.l = 0;
… …
656 } 689 }
657 else 690 else
658 scr_blank_screen_mem (l, rstyle); 691 scr_blank_screen_mem (l, rstyle);
659 } 692 }
660 693
661 // now copy lines below the scroll region bottom to the
662 // bottom of the screen again, so they look as if they
663 // hadn't moved.
664 for (int i = nrow; --i > row2; )
665 {
666 line_t &l1 = ROW(i - count);
667 line_t &l2 = ROW(i);
668
669 ::swap (l1, l2);
670 l2.touch ();
671 }
672
673 // move and/or clear selection, if any 694 // move and/or clear selection, if any
674 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen
696 && selection.beg.row <= row2)
675 { 697 {
676 selection.beg.row -= count; 698 selection.beg.row -= count;
677 selection.end.row -= count; 699 selection.end.row -= count;
678 selection.mark.row -= count; 700 selection.mark.row -= count;
679 701
680 if (selection.beg.row < top_row 702 selection_check (0);
681 || selection.end.row < top_row
682 || selection.mark.row < top_row)
683 {
684 CLEAR_ALL_SELECTION ();
685 selection.op = SELECTION_CLEAR;
686 }
687 } 703 }
688 704
689 // finally move the view window, if desired 705 // finally move the view window, if desired
690 if (option (Opt_scrollWithBuffer) 706 if (option (Opt_scrollWithBuffer)
691 && view_start != 0 707 && view_start != 0
… …
721 } 737 }
722 738
723 // use a simple and robust scrolling algorithm, this 739 // use a simple and robust scrolling algorithm, this
724 // part of scr_scroll_text is not time-critical. 740 // part of scr_scroll_text is not time-critical.
725 741
742 // sever line above scroll region
743 if (row1)
744 {
745 line_t &l = ROW(row1 - 1);
746 l.is_longer (0);
747 l.touch ();
748 }
749
726 int rows = row2 - row1 + 1; 750 int rows = row2 - row1 + 1;
727 751
728 min_it (count, rows); 752 min_it (count, rows);
729 753
730 line_t *temp_buf = row_buf + total_rows; 754 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
731 755
732 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
733 { 757 {
734 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 758 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
735 759
… …
737 scr_blank_screen_mem (temp_buf [row], rstyle); 761 scr_blank_screen_mem (temp_buf [row], rstyle);
738 } 762 }
739 763
740 for (int row = 0; row < rows; row++) 764 for (int row = 0; row < rows; row++)
741 ROW(row1 + row) = temp_buf [row]; 765 ROW(row1 + row) = temp_buf [row];
766
767 // sever bottommost line
768 {
769 line_t &l = ROW(row2);
770 l.is_longer (0);
771 l.touch ();
772 }
742 } 773 }
743 774
744 return count; 775 return count;
745} 776}
746 777
747/* ------------------------------------------------------------------------- */ 778/* ------------------------------------------------------------------------- */
748/* 779/*
749 * Add text given in <str> of length <len> to screen struct 780 * Add text given in <str> of length <len> to screen struct
750 */ 781 */
751void 782void ecb_hot
752rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 783rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
753{ 784{
754 if (len <= 0) /* sanity */ 785 if (len <= 0) /* sanity */
755 return; 786 return;
756 787
757 unsigned char checksel; 788 bool checksel;
758 unicode_t c; 789 unicode_t c;
759 int ncol = this->ncol; 790 int ncol = this->ncol;
760 const wchar_t *strend = str + len; 791 const wchar_t *strend = str + len;
761 792
762 want_refresh = 1; 793 want_refresh = 1;
… …
775 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 806 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
776 screen.cur.row -= minlines; 807 screen.cur.row -= minlines;
777 } 808 }
778 } 809 }
779 810
780#ifdef DEBUG_STRICT
781 assert (screen.cur.col < ncol); 811 assert (screen.cur.col < ncol);
782 assert (screen.cur.row < nrow 812 assert (screen.cur.row < nrow
783 && screen.cur.row >= top_row); 813 && screen.cur.row >= top_row);
784#endif
785 int row = screen.cur.row; 814 int row = screen.cur.row;
786 815
787 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 816 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
788 817
789 line_t *line = &ROW(row); 818 line_t *line = &ROW(row);
790 819
791 while (str < strend) 820 while (str < strend)
792 { 821 {
793 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 822 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
794 823
795 if (expect_false (c < 0x20)) 824 if (ecb_unlikely (c < 0x20))
796 if (c == C0_LF) 825 if (c == C0_LF)
797 { 826 {
798 max_it (line->l, screen.cur.col); 827 max_it (line->l, screen.cur.col);
799 828
800 screen.flags &= ~Screen_WrapNext; 829 screen.flags &= ~Screen_WrapNext;
… …
819 { 848 {
820 scr_tab (1, true); 849 scr_tab (1, true);
821 continue; 850 continue;
822 } 851 }
823 852
824 if (expect_false ( 853 if (ecb_unlikely (
825 checksel /* see if we're writing within selection */ 854 checksel /* see if we're writing within selection */
826 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 855 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
827 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 856 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
828 )) 857 ))
829 { 858 {
… …
834 * should be a similar check. 863 * should be a similar check.
835 */ 864 */
836 CLEAR_SELECTION (); 865 CLEAR_SELECTION ();
837 } 866 }
838 867
839 if (expect_false (screen.flags & Screen_WrapNext)) 868 if (ecb_unlikely (screen.flags & Screen_WrapNext))
840 { 869 {
841 scr_do_wrap (); 870 scr_do_wrap ();
842 871
843 line->l = ncol; 872 line->l = ncol;
844 line->is_longer (1); 873 line->is_longer (1);
… …
846 row = screen.cur.row; 875 row = screen.cur.row;
847 line = &ROW(row); /* _must_ refresh */ 876 line = &ROW(row); /* _must_ refresh */
848 } 877 }
849 878
850 // some utf-8 decoders "decode" surrogate characters: let's fix this. 879 // some utf-8 decoders "decode" surrogate characters: let's fix this.
851 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 880 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
852 c = 0xfffd; 881 c = 0xfffd;
853 882
854 // rely on wcwidth to tell us the character width, do wcwidth before 883 // rely on wcwidth to tell us the character width, do wcwidth before
855 // further replacements, as wcwidth might return -1 for the line 884 // further replacements, as wcwidth might return -1 for the line
856 // drawing characters below as they might be invalid in the current 885 // drawing characters below as they might be invalid in the current
857 // locale. 886 // locale.
858 int width = WCWIDTH (c); 887 int width = WCWIDTH (c);
859 888
860 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 889 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
861 { 890 {
862 // vt100 special graphics and line drawing 891 // vt100 special graphics and line drawing
863 // 5f-7e standard vt100 892 // 5f-7e standard vt100
864 // 40-5e rxvt extension for extra curses acs chars 893 // 40-5e rxvt extension for extra curses acs chars
865 static uint16_t vt100_0[62] = { // 41 .. 7e 894 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
878 c = vt100_0[c - 0x41]; 907 c = vt100_0[c - 0x41];
879 width = 1; // vt100 line drawing characters are always single-width 908 width = 1; // vt100 line drawing characters are always single-width
880 } 909 }
881 } 910 }
882 911
883 if (expect_false (screen.flags & Screen_Insert)) 912 if (ecb_unlikely (screen.flags & Screen_Insert))
884 scr_insdel_chars (width, INSERT); 913 scr_insdel_chars (width, INSERT);
885 914
886 if (width != 0) 915 if (width != 0)
887 { 916 {
888#if !UNICODE_3 917#if !UNICODE_3
… …
893# else 922# else
894 c = 0xfffd; 923 c = 0xfffd;
895# endif 924# endif
896#endif 925#endif
897 926
927 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
928
929 // if the character doesn't fit into the remaining columns...
930 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
931 {
932 if (screen.flags & Screen_Autowrap)
933 {
934 // ... artificially enlargen the previous one
935 c = NOCHAR;
936 // and try the same character next loop iteration
937 --str;
938 }
939 else
940 screen.cur.col = ncol - width;
941 }
942
898 // nuke the character at this position, if required 943 // nuke the character at this position, if required
899 if (expect_false ( 944 // due to wonderful coincidences everywhere else in this loop
945 // we never have to check for overwriting a wide char itself,
946 // only its tail.
900 line->t[screen.cur.col] == NOCHAR 947 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
901 || (screen.cur.col < ncol - 1
902 && line->t[screen.cur.col + 1] == NOCHAR)
903 ))
904 scr_kill_char (*line, screen.cur.col); 948 scr_kill_char (*line, screen.cur.col);
905
906 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
907
908 // if the character doesn't fit into the remaining columns...
909 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
910 {
911 // ...output spaces
912 c = ' ';
913 // and try the same character next loop iteration
914 --str;
915 }
916 949
917 line->touch (); 950 line->touch ();
918 951
919 do 952 do
920 { 953 {
921 line->t[screen.cur.col] = c; 954 line->t[screen.cur.col] = c;
922 line->r[screen.cur.col] = rend; 955 line->r[screen.cur.col] = rend;
923 956
924 if (expect_true (screen.cur.col < ncol - 1)) 957 if (ecb_likely (screen.cur.col < ncol - 1))
925 screen.cur.col++; 958 screen.cur.col++;
926 else 959 else
927 { 960 {
928 line->l = ncol; 961 line->l = ncol;
929 if (screen.flags & Screen_Autowrap) 962 if (screen.flags & Screen_Autowrap)
930 screen.flags |= Screen_WrapNext; 963 screen.flags |= Screen_WrapNext;
931 break; 964
965 goto end_of_line;
932 } 966 }
933 967
934 c = NOCHAR; 968 c = NOCHAR;
935 } 969 }
936 while (expect_false (--width > 0)); 970 while (ecb_unlikely (--width > 0));
937 971
938 // pad with spaces when overwriting wide character with smaller one 972 // pad with spaces when overwriting wide character with smaller one
939 if (expect_false (!width)) 973 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
940 { 974 {
941 line->touch ();
942
943 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
944 {
945 line->t[c] = ' '; 975 line->t[c] = ' ';
946 line->r[c] = rend; 976 line->r[c] = rend;
947 }
948 } 977 }
978
979end_of_line:
980 ;
949 } 981 }
950#if ENABLE_COMBINING 982#if ENABLE_COMBINING
951 else // width == 0 983 else // width == 0
952 { 984 {
953 if (c != 0xfeff) // ignore BOM 985 if (c != 0xfeff) // ignore BOM
… …
993#endif 1025#endif
994 } 1026 }
995 1027
996 max_it (line->l, screen.cur.col); 1028 max_it (line->l, screen.cur.col);
997 1029
998#ifdef DEBUG_STRICT
999 assert (screen.cur.row >= 0); 1030 assert (screen.cur.row >= 0);
1000#endif
1001} 1031}
1002 1032
1003/* ------------------------------------------------------------------------- */ 1033/* ------------------------------------------------------------------------- */
1004/* 1034/*
1005 * Process Backspace. Move back the cursor back a position, wrap if have to 1035 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1018 1048
1019 want_refresh = 1; 1049 want_refresh = 1;
1020#endif 1050#endif
1021 } 1051 }
1022 } 1052 }
1053 else if (screen.flags & Screen_WrapNext)
1054 screen.flags &= ~Screen_WrapNext;
1023 else 1055 else
1024 scr_gotorc (0, -1, RELATIVE); 1056 scr_gotorc (0, -1, RELATIVE);
1025} 1057}
1026 1058
1027/* ------------------------------------------------------------------------- */ 1059/* ------------------------------------------------------------------------- */
… …
1105 * XTERM_SEQ: ESC 6 1137 * XTERM_SEQ: ESC 6
1106 * Move cursor left in row. If we're at the left boundary, shift everything 1138 * Move cursor left in row. If we're at the left boundary, shift everything
1107 * in that row right. Clear left column. 1139 * in that row right. Clear left column.
1108 */ 1140 */
1109#if !ENABLE_MINIMAL 1141#if !ENABLE_MINIMAL
1110void 1142void ecb_cold
1111rxvt_term::scr_backindex () NOTHROW 1143rxvt_term::scr_backindex () NOTHROW
1112{ 1144{
1113 if (screen.cur.col > 0) 1145 if (screen.cur.col > 0)
1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1146 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1115 else 1147 else
… …
1122 * XTERM_SEQ: ESC 9 1154 * XTERM_SEQ: ESC 9
1123 * Move cursor right in row. If we're at the right boundary, shift everything 1155 * Move cursor right in row. If we're at the right boundary, shift everything
1124 * in that row left. Clear right column. 1156 * in that row left. Clear right column.
1125 */ 1157 */
1126#if !ENABLE_MINIMAL 1158#if !ENABLE_MINIMAL
1127void 1159void ecb_cold
1128rxvt_term::scr_forwardindex () NOTHROW 1160rxvt_term::scr_forwardindex () NOTHROW
1129{ 1161{
1130 if (screen.cur.col < ncol - 1) 1162 if (screen.cur.col < ncol - 1)
1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1163 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1132 else 1164 else
… …
1283 scr_blank_line (line, col, num, rstyle); 1315 scr_blank_line (line, col, num, rstyle);
1284} 1316}
1285 1317
1286/* ------------------------------------------------------------------------- */ 1318/* ------------------------------------------------------------------------- */
1287/* 1319/*
1288 * Erase part of whole of the screen 1320 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1321 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1322 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1323 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1324 */
1293void 1325void
… …
1302 ZERO_SCROLLBACK (); 1334 ZERO_SCROLLBACK ();
1303 1335
1304 switch (mode) 1336 switch (mode)
1305 { 1337 {
1306 case 0: /* erase to end of screen */ 1338 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1339 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1340 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1341 num = nrow - row;
1311 break; 1342 break;
1312 case 1: /* erase to beginning of screen */ 1343 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1344 scr_erase_line (1);
1315 row = 0; 1345 row = 0;
1316 num = screen.cur.row; 1346 num = screen.cur.row;
1317 break; 1347 break;
1318 case 2: /* erase whole screen */ 1348 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1349 row = 0;
1321 num = nrow; 1350 num = nrow;
1322 break; 1351 break;
1323 default: 1352 default:
1324 return; 1353 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1362 if (row >= nrow) /* Out Of Bounds */
1334 return; 1363 return;
1335 1364
1336 min_it (num, nrow - row); 1365 min_it (num, nrow - row);
1337 1366
1338 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1339 if (rstyle & (RS_RVid | RS_Uline)) 1367 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1340 ren = (rend_t) ~RS_None; 1368 ren = (rend_t) ~RS_None;
1341 else if (GET_BASEBG (rstyle) == Color_bg) 1369 else if (GET_BASEBG (rstyle) == Color_bg)
1342 { 1370 {
1343 ren = DEFAULT_RSTYLE; 1371 ren = DEFAULT_RSTYLE;
1344 1372
1345 if (mapped) 1373 if (mapped)
1346 XClearArea (dpy, vt, 0, 1374 XClearArea (dpy, vt, 0,
1347 Row2Pixel (row), (unsigned int)width, 1375 Row2Pixel (row - view_start), (unsigned int)vt_width,
1348 (unsigned int)Height2Pixel (num), False); 1376 (unsigned int)Height2Pixel (num), False);
1349 } 1377 }
1350 else 1378 else
1351 { 1379 {
1352 ren = rstyle & (RS_fgMask | RS_bgMask); 1380 ren = rstyle & (RS_fgMask | RS_bgMask);
1353 1381
1382 if (mapped)
1383 {
1354 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1384 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1355 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1385 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1356 XFillRectangle (dpy, vt, gc, 1386 XFillRectangle (dpy, vt, gc,
1357 0, Row2Pixel (row), 1387 0, Row2Pixel (row - view_start),
1358 (unsigned int)width, 1388 (unsigned int)vt_width,
1359 (unsigned int)Height2Pixel (num)); 1389 (unsigned int)Height2Pixel (num));
1360 gcvalue.foreground = pix_colors[Color_fg]; 1390 gcvalue.foreground = pix_colors[Color_fg];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1391 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1392 }
1362 } 1393 }
1363 1394
1364 for (; num--; row++) 1395 for (; num--; row++)
1365 { 1396 {
1366 scr_blank_screen_mem (ROW(row), rstyle); 1397 scr_blank_screen_mem (ROW(row), rstyle);
1398
1399 if (row - view_start < nrow)
1367 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1400 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1368 } 1401 }
1369} 1402}
1370 1403
1371#if !ENABLE_MINIMAL 1404#if !ENABLE_MINIMAL
1372void 1405void
… …
1382/* ------------------------------------------------------------------------- */ 1415/* ------------------------------------------------------------------------- */
1383/* 1416/*
1384 * Fill the screen with `E's 1417 * Fill the screen with `E's
1385 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1418 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1386 */ 1419 */
1387void 1420void ecb_cold
1388rxvt_term::scr_E () NOTHROW 1421rxvt_term::scr_E () NOTHROW
1389{ 1422{
1390 rend_t fs; 1423 rend_t fs;
1391 1424
1392 want_refresh = 1; 1425 want_refresh = 1;
1393 ZERO_SCROLLBACK (); 1426 ZERO_SCROLLBACK ();
1394 1427
1395 num_scr_allow = 0; 1428 num_scr_allow = 0;
1396 selection_check (3); 1429
1430 row_col_t pos;
1431 pos.row = pos.col = 0;
1432 if (ROWCOL_IS_AFTER (selection.end, pos))
1433 CLEAR_SELECTION ();
1397 1434
1398 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1435 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1399 for (int row = nrow; row--; ) 1436 for (int row = nrow; row--; )
1400 { 1437 {
1401 line_t &line = ROW(row); 1438 line_t &line = ROW(row);
… …
1464 line_t *line = &ROW(row); 1501 line_t *line = &ROW(row);
1465 1502
1466 line->touch (); 1503 line->touch ();
1467 line->is_longer (0); 1504 line->is_longer (0);
1468 1505
1506 // nuke wide spanning the start
1507 if (line->t[screen.cur.col] == NOCHAR)
1508 scr_kill_char (*line, screen.cur.col);
1509
1469 switch (insdel) 1510 switch (insdel)
1470 { 1511 {
1471 case INSERT: 1512 case INSERT:
1472 line->l = min (line->l + count, ncol); 1513 line->l = min (line->l + count, ncol);
1514
1515 if (line->t[screen.cur.col] == NOCHAR)
1516 scr_kill_char (*line, screen.cur.col);
1473 1517
1474 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--) 1518 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1475 { 1519 {
1476 line->t[col] = line->t[col - count]; 1520 line->t[col] = line->t[col - count];
1477 line->r[col] = line->r[col - count]; 1521 line->r[col] = line->r[col - count];
… …
1498 case ERASE: 1542 case ERASE:
1499 screen.cur.col += count; /* don't worry if > ncol */ 1543 screen.cur.col += count; /* don't worry if > ncol */
1500 selection_check (1); 1544 selection_check (1);
1501 screen.cur.col -= count; 1545 screen.cur.col -= count;
1502 1546
1547 // nuke wide char after the end
1548 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1549 scr_kill_char (*line, screen.cur.col + count);
1550
1503 scr_blank_line (*line, screen.cur.col, count, rstyle); 1551 scr_blank_line (*line, screen.cur.col, count, rstyle);
1504 break; 1552 break;
1505 1553
1506 case DELETE: 1554 case DELETE:
1507 {
1508 line->l = max (line->l - count, 0); 1555 line->l = max (line->l - count, 0);
1509 1556
1510 rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1557 // nuke wide char spanning the end
1558 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1559 scr_kill_char (*line, screen.cur.col + count);
1511 1560
1512 for (int col = screen.cur.col; (col + count) < ncol; col++) 1561 for (int col = screen.cur.col; (col + count) < ncol; col++)
1513 { 1562 {
1514 line->t[col] = line->t[col + count]; 1563 line->t[col] = line->t[col + count];
1515 line->r[col] = line->r[col + count]; 1564 line->r[col] = line->r[col + count];
1516 } 1565 }
1517 1566
1518 // nuke wide char at the end
1519 if (line->t[screen.cur.col] == NOCHAR)
1520 scr_kill_char (*line, screen.cur.col);
1521
1522 scr_blank_line (*line, ncol - count, count, tr); 1567 scr_blank_line (*line, ncol - count, count, rstyle);
1523 1568
1524 if (selection.op && current_screen == selection.screen 1569 if (selection.op && current_screen == selection.screen
1525 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1570 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1526 { 1571 {
1527 if (selection.end.row != screen.cur.row 1572 if (selection.end.row != screen.cur.row
1528 || (screen.cur.col >= selection.beg.col - count) 1573 || (screen.cur.col >= selection.beg.col - count)
1529 || selection.end.col >= ncol) 1574 || selection.end.col >= ncol)
1530 CLEAR_SELECTION (); 1575 CLEAR_SELECTION ();
1531 else 1576 else
1532 { 1577 {
1533 /* shift selection */ 1578 /* shift selection */
1534 selection.beg.col -= count; 1579 selection.beg.col -= count;
1535 selection.mark.col -= count; /* XXX: yes? */ 1580 selection.mark.col -= count; /* XXX: yes? */
1536 selection.end.col -= count; 1581 selection.end.col -= count;
1537 } 1582 }
1538 }
1539 } 1583 }
1540 1584
1541 break; 1585 break;
1542 } 1586 }
1543} 1587}
… …
1545/* ------------------------------------------------------------------------- */ 1589/* ------------------------------------------------------------------------- */
1546/* 1590/*
1547 * Set the scrolling region 1591 * Set the scrolling region
1548 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1592 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1549 */ 1593 */
1550void 1594void ecb_cold
1551rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1595rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1552{ 1596{
1553 max_it (top, 0); 1597 max_it (top, 0);
1554 min_it (bot, nrow - 1); 1598 min_it (bot, nrow - 1);
1555 1599
… …
1565/* 1609/*
1566 * Make the cursor visible/invisible 1610 * Make the cursor visible/invisible
1567 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1611 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1568 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1612 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1569 */ 1613 */
1570void 1614void ecb_cold
1571rxvt_term::scr_cursor_visible (int mode) NOTHROW 1615rxvt_term::scr_cursor_visible (int mode) NOTHROW
1572{ 1616{
1573 want_refresh = 1; 1617 want_refresh = 1;
1574 1618
1575 if (mode) 1619 if (mode)
… …
1582/* 1626/*
1583 * Set/unset automatic wrapping 1627 * Set/unset automatic wrapping
1584 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1628 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1585 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1629 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1586 */ 1630 */
1587void 1631void ecb_cold
1588rxvt_term::scr_autowrap (int mode) NOTHROW 1632rxvt_term::scr_autowrap (int mode) NOTHROW
1589{ 1633{
1590 if (mode) 1634 if (mode)
1591 screen.flags |= Screen_Autowrap; 1635 screen.flags |= Screen_Autowrap;
1592 else 1636 else
… …
1601 * Relative mode: line numbers are relative to top margin of scrolling region 1645 * Relative mode: line numbers are relative to top margin of scrolling region
1602 * and the cursor cannot be moved outside. 1646 * and the cursor cannot be moved outside.
1603 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1647 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1604 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1648 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1605 */ 1649 */
1606void 1650void ecb_cold
1607rxvt_term::scr_relative_origin (int mode) NOTHROW 1651rxvt_term::scr_relative_origin (int mode) NOTHROW
1608{ 1652{
1609 if (mode) 1653 if (mode)
1610 screen.flags |= Screen_Relative; 1654 screen.flags |= Screen_Relative;
1611 else 1655 else
… …
1618/* 1662/*
1619 * Set insert/replace mode 1663 * Set insert/replace mode
1620 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1664 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1621 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1665 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1622 */ 1666 */
1623void 1667void ecb_cold
1624rxvt_term::scr_insert_mode (int mode) NOTHROW 1668rxvt_term::scr_insert_mode (int mode) NOTHROW
1625{ 1669{
1626 if (mode) 1670 if (mode)
1627 screen.flags |= Screen_Insert; 1671 screen.flags |= Screen_Insert;
1628 else 1672 else
… …
1634 * Set/Unset tabs 1678 * Set/Unset tabs
1635 * XTERM_SEQ: Set tab at current column : ESC H 1679 * XTERM_SEQ: Set tab at current column : ESC H
1636 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1680 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1637 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1681 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1638 */ 1682 */
1639void 1683void ecb_cold
1640rxvt_term::scr_set_tab (int mode) NOTHROW 1684rxvt_term::scr_set_tab (int mode) NOTHROW
1641{ 1685{
1642 if (mode < 0) 1686 if (mode < 0)
1643 memset (tabs, 0, ncol); 1687 memset (tabs, 0, ncol);
1644 else if (screen.cur.col < ncol) 1688 else if (screen.cur.col < ncol)
… …
1664 { 1708 {
1665 rvideo_state = on; 1709 rvideo_state = on;
1666 1710
1667 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1711 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1668#ifdef HAVE_BG_PIXMAP 1712#ifdef HAVE_BG_PIXMAP
1669 if (bgPixmap.pixmap == None) 1713 if (bg_img == 0)
1670#endif 1714#endif
1671 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1715 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1672 1716
1673 XGCValues gcvalue; 1717 XGCValues gcvalue;
1674 gcvalue.foreground = pix_colors[Color_fg]; 1718 gcvalue.foreground = pix_colors[Color_fg];
… …
1683/* ------------------------------------------------------------------------- */ 1727/* ------------------------------------------------------------------------- */
1684/* 1728/*
1685 * Report current cursor position 1729 * Report current cursor position
1686 * XTERM_SEQ: Report position: ESC [ 6 n 1730 * XTERM_SEQ: Report position: ESC [ 6 n
1687 */ 1731 */
1688void 1732void ecb_cold
1689rxvt_term::scr_report_position () NOTHROW 1733rxvt_term::scr_report_position () NOTHROW
1690{ 1734{
1691 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1735 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1692} 1736}
1693 1737
… …
1696 * ------------------------------------------------------------------------- */ 1740 * ------------------------------------------------------------------------- */
1697 1741
1698/* 1742/*
1699 * Set font style 1743 * Set font style
1700 */ 1744 */
1701void 1745void ecb_cold
1702rxvt_term::set_font_style () NOTHROW 1746rxvt_term::set_font_style () NOTHROW
1703{ 1747{
1704#if 0 1748#if 0
1705 switch (charsets [screen.charset]) 1749 switch (charsets [screen.charset])
1706 { 1750 {
… …
1728 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1772 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1729 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1773 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1730 * XTERM_SEQ: Invoke G2 character set: ESC N 1774 * XTERM_SEQ: Invoke G2 character set: ESC N
1731 * XTERM_SEQ: Invoke G3 character set: ESC O 1775 * XTERM_SEQ: Invoke G3 character set: ESC O
1732 */ 1776 */
1733void 1777void ecb_cold
1734rxvt_term::scr_charset_choose (int set) NOTHROW 1778rxvt_term::scr_charset_choose (int set) NOTHROW
1735{ 1779{
1736 screen.charset = set; 1780 screen.charset = set;
1737 set_font_style (); 1781 set_font_style ();
1738} 1782}
… …
1759 * ------------------------------------------------------------------------- */ 1803 * ------------------------------------------------------------------------- */
1760 1804
1761/* 1805/*
1762 * refresh matching text. 1806 * refresh matching text.
1763 */ 1807 */
1764bool 1808bool ecb_cold
1765rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1809rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1766{ 1810{
1767 bool found = false; 1811 bool found = false;
1768 1812
1769 for (int i = 0; i < nrow; i++) 1813 for (int i = 0; i < nrow; i++)
… …
1788 PART_BEG = 0, 1832 PART_BEG = 0,
1789 PART_END, 1833 PART_END,
1790 RC_COUNT 1834 RC_COUNT
1791}; 1835};
1792 1836
1793void 1837void ecb_hot
1794rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1838rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1795{ 1839{
1796 int i; 1840 int i;
1797 row_col_t rc[RC_COUNT]; 1841 row_col_t rc[RC_COUNT];
1798 1842
… …
1818 for (i = PART_BEG; i < RC_COUNT; i++) 1862 for (i = PART_BEG; i < RC_COUNT; i++)
1819 { 1863 {
1820 min_it (rc[i].col, ncol - 1); 1864 min_it (rc[i].col, ncol - 1);
1821 min_it (rc[i].row, nrow - 1); 1865 min_it (rc[i].row, nrow - 1);
1822 } 1866 }
1823// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1867
1824 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1868 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1825 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1869 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1826 1870
1827 num_scr_allow = 0; 1871 num_scr_allow = 0;
1828 1872
… …
1835 * Refresh the entire screen 1879 * Refresh the entire screen
1836 */ 1880 */
1837void 1881void
1838rxvt_term::scr_touch (bool refresh) NOTHROW 1882rxvt_term::scr_touch (bool refresh) NOTHROW
1839{ 1883{
1840 scr_expose (0, 0, width, height, refresh); 1884 scr_expose (0, 0, vt_width, vt_height, refresh);
1841} 1885}
1842 1886
1843/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1844/* 1888/*
1845 * Move the display so that the line represented by scrollbar value Y is at 1889 * Move the display so that the line represented by scrollbar value Y is at
… …
1901 1945
1902# ifndef NO_MAPALERT 1946# ifndef NO_MAPALERT
1903# ifdef MAPALERT_OPTION 1947# ifdef MAPALERT_OPTION
1904 if (option (Opt_mapAlert)) 1948 if (option (Opt_mapAlert))
1905# endif 1949# endif
1906 XMapWindow (dpy, parent[0]); 1950 XMapWindow (dpy, parent);
1907# endif 1951# endif
1908 1952
1909# if ENABLE_FRILLS 1953# if ENABLE_FRILLS
1910 if (option (Opt_urgentOnBell)) 1954 if (option (Opt_urgentOnBell))
1911 set_urgency (1); 1955 set_urgency (1);
… …
1919 1963
1920 bell_ev.start (VISUAL_BELL_DURATION); 1964 bell_ev.start (VISUAL_BELL_DURATION);
1921 } 1965 }
1922 else 1966 else
1923 XBell (dpy, 0); 1967 XBell (dpy, 0);
1968 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1924#endif 1969#endif
1925} 1970}
1926 1971
1927/* ------------------------------------------------------------------------- */ 1972/* ------------------------------------------------------------------------- */
1928/* ARGSUSED */ 1973void ecb_cold
1929void
1930rxvt_term::scr_printscreen (int fullhist) NOTHROW 1974rxvt_term::scr_printscreen (int fullhist) NOTHROW
1931{ 1975{
1932#ifdef PRINTPIPE 1976#ifdef PRINTPIPE
1933 int nrows, row_start; 1977 int nrows, row_start;
1934 FILE *fd = popen_printer (); 1978 FILE *fd = popen_printer ();
… …
1947 row_start = view_start; 1991 row_start = view_start;
1948 } 1992 }
1949 1993
1950 wctomb (0, 0); 1994 wctomb (0, 0);
1951 1995
1952 for (int r1 = 0; r1 < nrows; r1++) 1996 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1953 { 1997 {
1954 text_t *tp = ROW(r1).t; 1998 text_t *tp = ROW(r1).t;
1955 int len = ROW(r1).l; 1999 int len = ROW(r1).l;
1956 2000
1957 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2001 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1983/* 2027/*
1984 * Refresh the screen 2028 * Refresh the screen
1985 * drawn_text/drawn_rend contain the screen information before the update. 2029 * drawn_text/drawn_rend contain the screen information before the update.
1986 * screen.text/screen.rend contain what the screen will change to. 2030 * screen.text/screen.rend contain what the screen will change to.
1987 */ 2031 */
1988void 2032void ecb_hot
1989rxvt_term::scr_refresh () NOTHROW 2033rxvt_term::scr_refresh () NOTHROW
1990{ 2034{
1991 unsigned char have_bg,
1992 showcursor; /* show the cursor */
1993 int16_t col, row, /* column/row we're processing */ 2035 int16_t col, row, /* column/row we're processing */
1994 ocrow; /* old cursor row */ 2036 ocrow; /* old cursor row */
1995 int i; /* tmp */ 2037 int i; /* tmp */
1996#ifndef NO_CURSORCOLOR 2038#ifndef NO_CURSORCOLOR
1997 rend_t cc1; /* store colours at cursor position (s) */ 2039 rend_t cc1; /* store colours at cursor position (s) */
… …
2008 /* 2050 /*
2009 * A: set up vars 2051 * A: set up vars
2010 */ 2052 */
2011 refresh_count = 0; 2053 refresh_count = 0;
2012 2054
2055 unsigned int old_screen_flags = screen.flags;
2013 have_bg = 0; 2056 bool have_bg = 0;
2014#ifdef HAVE_BG_PIXMAP 2057#ifdef HAVE_BG_PIXMAP
2015 have_bg = bgPixmap.pixmap != None; 2058 have_bg = bg_img != 0;
2016#endif 2059#endif
2017 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2060 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2018 2061
2019 /* 2062 /*
2020 * B: reverse any characters which are selected 2063 * B: reverse any characters which are selected
2021 */ 2064 */
2022 scr_reverse_selection (); 2065 scr_reverse_selection ();
2023 2066
2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2068#if ENABLE_OVERLAY
2069 scr_swap_overlay ();
2070#endif
2071
2072 bool showcursor = screen.flags & Screen_VisibleCursor;
2073
2024 /* 2074 /*
2025 * C: set the cursor character (s) 2075 * C: set the cursor character (s)
2026 */ 2076 */
2027 { 2077 {
2028 unsigned char setoldcursor; 2078 bool setoldcursor;
2029 2079
2030 showcursor = (screen.flags & Screen_VisibleCursor);
2031#ifdef CURSOR_BLINK 2080#ifdef CURSOR_BLINK
2032 if (hidden_cursor) 2081 if (hidden_cursor)
2033 showcursor = 0; 2082 showcursor = 0;
2034#endif 2083#endif
2035 2084
… …
2063 ccol2 = bgcolor_of (rstyle); 2112 ccol2 = bgcolor_of (rstyle);
2064#else 2113#else
2065 ccol2 = Color_bg; 2114 ccol2 = Color_bg;
2066#endif 2115#endif
2067 2116
2068 if (showcursor && focus) 2117 if (focus)
2069 { 2118 {
2070 if (option (Opt_cursorUnderline)) 2119 if (option (Opt_cursorUnderline))
2071 *crp ^= RS_Uline; 2120 *crp ^= RS_Uline;
2072 else 2121 else
2073 { 2122 {
… …
2108 oldcursor.col = screen.cur.col; 2157 oldcursor.col = screen.cur.col;
2109 } 2158 }
2110 } 2159 }
2111 } 2160 }
2112 2161
2113 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2114#if ENABLE_OVERLAY
2115 scr_swap_overlay ();
2116#endif
2117
2118#ifndef NO_SLOW_LINK_SUPPORT 2162#ifndef NO_SLOW_LINK_SUPPORT
2119 /* 2163 /*
2120 * D: CopyArea pass - very useful for slower links 2164 * D: CopyArea pass - very useful for slower links
2121 * This has been deliberately kept simple. 2165 * This has been deliberately kept simple.
2122 */ 2166 */
… …
2126 { 2170 {
2127 int16_t nits; 2171 int16_t nits;
2128 int i = num_scr; 2172 int i = num_scr;
2129 int j; 2173 int j;
2130 int len, wlen; 2174 int len, wlen;
2131 dLocal (int, num_scr);
2132 2175
2133 j = nrow; 2176 j = nrow;
2134 wlen = len = -1; 2177 wlen = len = -1;
2135 row = i > 0 ? 0 : j - 1; 2178 row = i > 0 ? 0 : j - 1;
2136 2179
… …
2211 continue; 2254 continue;
2212 2255
2213 // redraw one or more characters 2256 // redraw one or more characters
2214 2257
2215 // seek to the beginning of wide characters 2258 // seek to the beginning of wide characters
2216 while (expect_false (stp[col] == NOCHAR && col > 0)) 2259 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2217 --col; 2260 --col;
2218 2261
2219 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2262 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2220 text_t *text = stp + col; 2263 text_t *text = stp + col;
2221 int count = 1; 2264 int count = 1;
2222 2265
2223 dtp[col] = stp[col]; 2266 dtp[col] = stp[col];
2224 drp[col] = rend; 2267 drp[col] = rend;
… …
2228 for (i = 0; ++col < ncol; ) 2271 for (i = 0; ++col < ncol; )
2229 { 2272 {
2230 if (stp[col] == NOCHAR) 2273 if (stp[col] == NOCHAR)
2231 { 2274 {
2232 dtp[col] = stp[col]; 2275 dtp[col] = stp[col];
2233 drp[col] = rend; 2276 drp[col] = srp[col];
2277
2234 count++; 2278 count++;
2235 i++; 2279 i++;
2236 2280
2237 continue; 2281 continue;
2238 } 2282 }
… …
2258 2302
2259 col--; /* went one too far. move back */ 2303 col--; /* went one too far. move back */
2260 count -= i; /* dump any matching trailing chars */ 2304 count -= i; /* dump any matching trailing chars */
2261 2305
2262 // sometimes we optimize away the trailing NOCHAR's, add them back 2306 // sometimes we optimize away the trailing NOCHAR's, add them back
2263 while (expect_false (i && text[count] == NOCHAR)) 2307 while (ecb_unlikely (i && text[count] == NOCHAR))
2264 count++, i--; 2308 count++, i--;
2265 2309
2266 /* 2310 /*
2267 * Determine the attributes for the string 2311 * Determine the attributes for the string
2268 */ 2312 */
2269 int fore = fgcolor_of (rend); // desired foreground 2313 int fore = fgcolor_of (rend); // desired foreground
2270 int back = bgcolor_of (rend); // desired background 2314 int back = bgcolor_of (rend); // desired background
2271 2315
2272 // only do special processing if any attributes are set, which is unlikely 2316 // only do special processing if any attributes are set, which is unlikely
2273 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2317 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2274 { 2318 {
2275 bool invert = rend & RS_RVid; 2319 bool invert = rend & RS_RVid;
2276 2320
2277#ifndef NO_BOLD_UNDERLINE_REVERSE 2321#ifndef NO_BOLD_UNDERLINE_REVERSE
2278 if (rend & RS_Bold && fore == Color_fg) 2322 if (rend & RS_Bold && fore == Color_fg)
… …
2297 2341
2298 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2342 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2299 fore = Color_UL; 2343 fore = Color_UL;
2300#endif 2344#endif
2301 2345
2346#ifdef OPTION_HC
2347 if (rend & RS_Sel)
2348 {
2349 /* invert the column if no highlightColor is set or it is the
2350 * current cursor column */
2351 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2352 && ISSET_PIXCOLOR (Color_HC))
2353 {
2354 if (ISSET_PIXCOLOR (Color_HTC))
2355 fore = Color_HTC;
2356 // if invert is 0 reverse video is set so we use bg color as fg color
2357 else if (!invert)
2358 fore = back;
2359
2360 back = Color_HC;
2361 invert = 0;
2362 }
2363 }
2364#endif
2365
2302 if (invert) 2366 if (invert)
2303 { 2367 {
2304#ifdef OPTION_HC
2305 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2306 || !ISSET_PIXCOLOR (Color_HC))
2307#endif
2308 /* invert the column if no highlightColor is set or it is the
2309 * current cursor column */
2310 ::swap (fore, back); 2368 ::swap (fore, back);
2311#ifdef OPTION_HC
2312 else if (ISSET_PIXCOLOR (Color_HC))
2313 back = Color_HC;
2314#endif
2315 2369
2316#ifndef NO_BOLD_UNDERLINE_REVERSE 2370#ifndef NO_BOLD_UNDERLINE_REVERSE
2317# ifndef OPTION_HC
2318 if (ISSET_PIXCOLOR (Color_RV))
2319 back = Color_RV;
2320# endif
2321 if (fore == back) 2371 if (fore == back)
2322 { 2372 {
2323 fore = Color_bg; 2373 fore = Color_bg;
2324 back = Color_fg; 2374 back = Color_fg;
2325 } 2375 }
… …
2361 /* 2411 /*
2362 * Actually do the drawing of the string here 2412 * Actually do the drawing of the string here
2363 */ 2413 */
2364 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2414 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2365 2415
2366 if (expect_true (have_bg && back == Color_bg)) 2416 if (ecb_likely (have_bg && back == Color_bg))
2367 { 2417 {
2368 // this is very ugly, maybe push it into ->draw? 2418 // this is very ugly, maybe push it into ->draw?
2369 2419
2370 for (i = 0; i < count; i++) /* don't draw empty strings */ 2420 for (i = 0; i < count; i++) /* don't draw empty strings */
2371 if (text[i] != ' ') 2421 if (text[i] != ' ')
… …
2378 did_clear: ; 2428 did_clear: ;
2379 } 2429 }
2380 else 2430 else
2381 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2431 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2382 2432
2383 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2433 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2384 { 2434 {
2385#if ENABLE_FRILLS 2435#if ENABLE_FRILLS
2386 if (ISSET_PIXCOLOR (Color_underline)) 2436 if (ISSET_PIXCOLOR (Color_underline))
2387 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2437 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2388 else 2438 else
… …
2393 xpixel, ypixel + font->ascent + 1, 2443 xpixel, ypixel + font->ascent + 1,
2394 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2444 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2395 } 2445 }
2396 } /* for (col....) */ 2446 } /* for (col....) */
2397 } /* for (row....) */ 2447 } /* for (row....) */
2398
2399#if ENABLE_OVERLAY
2400 scr_swap_overlay ();
2401#endif
2402 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2403 2448
2404 /* 2449 /*
2405 * G: cleanup cursor and display outline cursor if necessary 2450 * G: cleanup cursor and display outline cursor if necessary
2406 */ 2451 */
2407 if (showcursor) 2452 if (showcursor)
… …
2439 2484
2440 XDrawRectangle (dpy, vt, gc, 2485 XDrawRectangle (dpy, vt, gc,
2441 Col2Pixel (col), 2486 Col2Pixel (col),
2442 Row2Pixel (oldcursor.row), 2487 Row2Pixel (oldcursor.row),
2443 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2488 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2444 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2489 (unsigned int) (Height2Pixel (1) - 1));
2445 } 2490 }
2446 } 2491 }
2447 2492
2448 /* 2493 /*
2449 * H: cleanup selection 2494 * H: cleanup selection
2450 */ 2495 */
2496#if ENABLE_OVERLAY
2497 scr_swap_overlay ();
2498#endif
2499 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2500
2451 scr_reverse_selection (); 2501 scr_reverse_selection ();
2452 2502
2503 screen.flags = old_screen_flags;
2453 num_scr = 0; 2504 num_scr = 0;
2454 num_scr_allow = 1; 2505 num_scr_allow = 1;
2455} 2506}
2456 2507
2457void 2508void ecb_cold
2458rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2509rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2459{ 2510{
2460 if (!l.t) 2511 if (!l.valid ())
2461 return; 2512 return;
2462 2513
2463 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2514 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2464 2515
2465 for (int i = ncol; i--; ) 2516 for (int i = ncol; i--; )
2466 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2517 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2467} 2518}
2468 2519
2469void 2520void ecb_cold
2470rxvt_term::scr_remap_chars () NOTHROW 2521rxvt_term::scr_remap_chars () NOTHROW
2471{ 2522{
2472 for (int i = total_rows; i--; ) 2523 for (int i = total_rows; i--; )
2473 scr_remap_chars (row_buf [i]); 2524 scr_remap_chars (row_buf [i]);
2474 2525
… …
2477 scr_remap_chars (drawn_buf [i]); 2528 scr_remap_chars (drawn_buf [i]);
2478 scr_remap_chars (swap_buf [i]); 2529 scr_remap_chars (swap_buf [i]);
2479 } 2530 }
2480} 2531}
2481 2532
2482void 2533void ecb_cold
2483rxvt_term::scr_recolour () NOTHROW 2534rxvt_term::scr_recolour (bool refresh) NOTHROW
2484{ 2535{
2536 bool transparent = false;
2537
2485#ifdef HAVE_BG_PIXMAP 2538#ifdef HAVE_BG_PIXMAP
2486 bgPixmap.apply (); 2539 if (bg_img != 0)
2487#else 2540 {
2541# if ENABLE_TRANSPARENCY
2542 if (bg_flags & BG_IS_TRANSPARENT)
2543 {
2544 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2545 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2488 2546
2547 transparent = true;
2548 }
2549 else
2550# endif
2551 {
2552 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2553 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2554 }
2555 }
2556 else
2557#endif
2558 {
2489 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2490 XClearWindow (dpy, parent[0]);
2491 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2560 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2561 }
2562
2563 XClearWindow (dpy, parent);
2492 2564
2493 if (scrollBar.win) 2565 if (scrollBar.win)
2494 { 2566 {
2567 if (transparent)
2568 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2569 else
2495 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2570 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2496 scrollBar.state = STATE_IDLE; 2571 scrollBar.state = SB_STATE_IDLE;
2497 scrollBar.show (0); 2572 scrollBar.show (0);
2498 } 2573 }
2499 2574
2500#endif 2575 if (refresh)
2501 2576 {
2502 /* bgPixmap.apply () does not do the following : */
2503 scr_clear (); 2577 scr_clear ();
2504 scr_touch (true); 2578 scr_touch (true);
2579 }
2505 want_refresh = 1; 2580 want_refresh = 1;
2506} 2581}
2507 2582
2508/* ------------------------------------------------------------------------- */ 2583/* ------------------------------------------------------------------------- */
2509void 2584void
… …
2566 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2641 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2567 srp[col] ^= rstyle; 2642 srp[col] ^= rstyle;
2568} 2643}
2569 2644
2570/* ------------------------------------------------------------------------- */ 2645/* ------------------------------------------------------------------------- */
2571void 2646void ecb_hot
2572rxvt_term::scr_reverse_selection () NOTHROW 2647rxvt_term::scr_reverse_selection () NOTHROW
2573{ 2648{
2574 if (selection.op 2649 if (selection.op
2575 && current_screen == selection.screen 2650 && current_screen == selection.screen
2576 && selection.end.row >= view_start) 2651 && selection.end.row >= view_start)
2577 { 2652 {
2578#if !ENABLE_MINIMAL 2653#if !ENABLE_MINIMAL
2579 if (selection.rect) 2654 if (selection.rect)
2580 scr_xor_rect (selection.beg.row, selection.beg.col, 2655 scr_xor_rect (selection.beg.row, selection.beg.col,
2581 selection.end.row, selection.end.col, 2656 selection.end.row, selection.end.col,
2582 RS_RVid, RS_RVid | RS_Uline); 2657 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2583 else 2658 else
2584#endif 2659#endif
2585 scr_xor_span (selection.beg.row, selection.beg.col, 2660 scr_xor_span (selection.beg.row, selection.beg.col,
2586 selection.end.row, selection.end.col, 2661 selection.end.row, selection.end.col,
2587 RS_RVid); 2662 RS_Sel | RS_RVid);
2588 } 2663 }
2589} 2664}
2590 2665
2591/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2592/* 2667/*
… …
2595 */ 2670 */
2596#if 0 2671#if 0
2597void 2672void
2598rxvt_term::scr_dump (int fd) NOTHROW 2673rxvt_term::scr_dump (int fd) NOTHROW
2599{ 2674{
2600 int row, wrote; 2675 // if this method is needed, it can be implemented by factoring the
2601 unsigned int width, towrite; 2676 // relevant code in scr_printscreen
2602 char r1[] = "\n";
2603
2604 for (row = saveLines + top_row;
2605 row < saveLines + nrow - 1; row++)
2606 {
2607 width = row_buf[row].l >= 0 ? row_buf[row].l
2608 : ncol;
2609 for (towrite = width; towrite; towrite -= wrote)
2610 {
2611 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2612 towrite);
2613 if (wrote < 0)
2614 return; /* XXX: death, no report */
2615 }
2616 if (row_buf[row].l >= 0)
2617 if (write (fd, r1, 1) <= 0)
2618 return; /* XXX: death, no report */
2619 }
2620} 2677}
2621#endif 2678#endif
2622 2679
2623/* ------------------------------------------------------------------------- * 2680/* ------------------------------------------------------------------------- *
2624 * CHARACTER SELECTION * 2681 * CHARACTER SELECTION *
2625 * ------------------------------------------------------------------------- */ 2682 * ------------------------------------------------------------------------- */
2626void 2683void
2627rxvt_term::selection_check (int check_more) NOTHROW 2684rxvt_term::selection_check (int check_more) NOTHROW
2628{ 2685{
2629 row_col_t pos;
2630
2631 if (!selection.op) 2686 if (!selection.op)
2632 return; 2687 return;
2633 2688
2634 pos.row = pos.col = 0;
2635 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2689 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2636 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2637 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2638 || (check_more == 1 2692 || (check_more == 1
2639 && current_screen == selection.screen 2693 && current_screen == selection.screen
2640 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2694 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2641 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2695 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2642 || (check_more == 2
2643 && ROWCOL_IS_BEFORE (selection.beg, pos)
2644 && ROWCOL_IS_AFTER (selection.end, pos))
2645 || (check_more == 3
2646 && ROWCOL_IS_AFTER (selection.end, pos))
2647 || (check_more == 4 /* screen width change */
2648 && (selection.beg.row != selection.end.row
2649 || selection.end.col > ncol)))
2650 CLEAR_SELECTION (); 2696 CLEAR_ALL_SELECTION ();
2651} 2697}
2652 2698
2653/* ------------------------------------------------------------------------- */ 2699/* ------------------------------------------------------------------------- */
2654/* 2700/*
2655 * Paste a selection direct to the command fd 2701 * Paste a selection direct to the command fd
2656 */ 2702 */
2657void 2703void
2658rxvt_term::paste (char *data, unsigned int len) NOTHROW 2704rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2659{ 2705{
2660 /* convert normal newline chars into common keyboard Return key sequence */ 2706 /* convert normal newline chars into common keyboard Return key sequence */
2661 for (unsigned int i = 0; i < len; i++) 2707 for (unsigned int i = 0; i < len; i++)
2662 if (data[i] == C0_LF) 2708 if (data[i] == C0_LF)
2663 data[i] = C0_CR; 2709 data[i] = C0_CR;
2664 2710
2665 if (priv_modes & PrivMode_BracketPaste) 2711 if (priv_modes & PrivMode_BracketPaste)
2666 tt_printf ("\e[200~"); 2712 tt_printf ("\x1b[200~");
2667 2713
2668 tt_write (data, len); 2714 tt_write (data, len);
2669 2715
2670 if (priv_modes & PrivMode_BracketPaste) 2716 if (priv_modes & PrivMode_BracketPaste)
2671 tt_printf ("\e[201~"); 2717 tt_printf ("\x1b[201~");
2672} 2718}
2673 2719
2674/* ------------------------------------------------------------------------- */
2675/*
2676 * Respond to a notification that a primary selection has been sent
2677 * EXT: SelectionNotify
2678 */
2679void 2720void
2680rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2721rxvt_term::paste (char *data, unsigned int len) NOTHROW
2681{ 2722{
2682 if (prop == None) /* check for failed XConvertSelection */ 2723 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2683 {
2684 if ((selection_type & Sel_CompoundText))
2685 {
2686 int selnum = selection_type & Sel_whereMask;
2687
2688 selection_type = 0;
2689 if (selnum != Sel_direct)
2690 selection_request_other (XA_STRING, selnum);
2691 }
2692
2693 if ((selection_type & Sel_UTF8String))
2694 {
2695 int selnum = selection_type & Sel_whereMask;
2696
2697 selection_type = Sel_CompoundText;
2698 if (selnum != Sel_direct)
2699 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2700 else
2701 selection_type = 0;
2702 }
2703
2704 return;
2705 }
2706
2707 unsigned long bytes_after;
2708 XTextProperty ct;
2709
2710 if (XGetWindowProperty (dpy, win, prop,
2711 0, PROP_SIZE / 4,
2712 delete_prop, AnyPropertyType,
2713 &ct.encoding, &ct.format,
2714 &ct.nitems, &bytes_after,
2715 &ct.value) != Success)
2716 {
2717 ct.value = 0;
2718 goto bailout;
2719 }
2720
2721 if (ct.encoding == None)
2722 goto bailout;
2723
2724 if (bytes_after)
2725 {
2726 // fetch and append remaining data
2727 XTextProperty ct2;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 ct.nitems / 4, (bytes_after + 3) / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct2.encoding, &ct2.format,
2733 &ct2.nitems, &bytes_after,
2734 &ct2.value) != Success)
2735 goto bailout;
2736
2737 // realloc should be compatible to XFree, here, and elsewhere, too
2738 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2739 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2740 ct.nitems += ct2.nitems;
2741
2742 XFree (ct2.value);
2743 }
2744
2745 if (ct.value == 0)
2746 goto bailout;
2747
2748 if (ct.encoding == xa[XA_INCR])
2749 {
2750 // INCR selection, start handshake
2751 if (!delete_prop)
2752 XDeleteProperty (dpy, win, prop);
2753
2754 selection_wait = Sel_incr;
2755 incr_buf_fill = 0;
2756 incr_ev.start (10);
2757
2758 goto bailout;
2759 }
2760
2761 if (ct.nitems == 0)
2762 {
2763 if (selection_wait == Sel_incr)
2764 {
2765 XFree (ct.value);
2766
2767 // finally complete, now paste the whole thing
2768 selection_wait = Sel_normal;
2769 ct.value = (unsigned char *)incr_buf;
2770 ct.nitems = incr_buf_fill;
2771 incr_buf = 0;
2772 incr_buf_size = 0;
2773 incr_ev.stop ();
2774 }
2775 else
2776 {
2777 if (selection_wait == Sel_normal
2778 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2779 {
2780 /*
2781 * pass through again trying CUT_BUFFER0 if we've come from
2782 * XConvertSelection () but nothing was presented
2783 */
2784 selection_paste (display->root, XA_CUT_BUFFER0, False);
2785 }
2786
2787 goto bailout;
2788 }
2789 }
2790 else if (selection_wait == Sel_incr)
2791 {
2792 incr_ev.start (10);
2793
2794 while (incr_buf_fill + ct.nitems > incr_buf_size)
2795 {
2796 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2797 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2798 }
2799
2800 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2801 incr_buf_fill += ct.nitems;
2802
2803 goto bailout;
2804 }
2805
2806 char **cl;
2807 int cr;
2808
2809#if !ENABLE_MINIMAL
2810 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2811 // so recode it manually
2812 if (ct.encoding == xa[XA_UTF8_STRING])
2813 {
2814 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2815 char *s = rxvt_wcstombs (w);
2816 free (w);
2817 // TODO: strlen == only the first element will be converted. well...
2818 paste (s, strlen (s));
2819 free (s);
2820 }
2821 else
2822#endif
2823 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2824 && cl)
2825 {
2826 for (int i = 0; i < cr; i++)
2827 paste (cl[i], strlen (cl[i]));
2828
2829 XFreeStringList (cl);
2830 }
2831 else
2832 paste ((char *)ct.value, ct.nitems); // paste raw
2833
2834bailout:
2835 XFree (ct.value);
2836
2837 if (selection_wait == Sel_normal)
2838 selection_wait = Sel_none;
2839}
2840
2841void
2842rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2843{
2844 selection_wait = Sel_none;
2845
2846 incr_buf_size = 0;
2847 free (incr_buf);
2848
2849 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2850}
2851
2852void
2853rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2854{
2855 if (prop == None || selection_wait != Sel_incr)
2856 return; 2724 return;
2857 2725
2858 selection_paste (win, prop, true); 2726 tt_paste (data, len);
2859} 2727}
2860 2728
2861/* ------------------------------------------------------------------------- */ 2729/* ------------------------------------------------------------------------- */
2862/* 2730/*
2863 * Request the current selection: 2731 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2864 * Order: > internal selection if available 2732 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2865 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2733 * as fallback
2866 * > CUT_BUFFER0
2867 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2868 * will auto fallback to CUT_BUFFER0
2869 * EXT: button 2 release 2734 * EXT: button 2 release
2870 */ 2735 */
2871void 2736void
2872rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2737rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2873{ 2738{
2874 if (selection.text && selnum == Sel_Primary) 2739 if (!selection_req)
2875 {
2876 /* internal selection */
2877 char *str = rxvt_wcstombs (selection.text, selection.len);
2878 paste (str, strlen (str));
2879 free (str);
2880 return;
2881 } 2740 {
2882 else 2741 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2742 selection_req->run ();
2883 { 2743 }
2884 selection_request_time = tm;
2885 selection_wait = Sel_normal;
2886
2887#if X_HAVE_UTF8_STRING
2888 selection_type = Sel_UTF8String;
2889 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2890 return;
2891#else
2892 selection_type = Sel_CompoundText;
2893 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2894 return;
2895#endif
2896 }
2897
2898 selection_wait = Sel_none; /* don't loop in selection_paste () */
2899 selection_paste (display->root, XA_CUT_BUFFER0, false);
2900}
2901
2902int
2903rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2904{
2905 Atom sel;
2906
2907 selection_type |= selnum;
2908
2909 if (selnum == Sel_Primary)
2910 sel = XA_PRIMARY;
2911 else if (selnum == Sel_Secondary)
2912 sel = XA_SECONDARY;
2913 else
2914 sel = xa[XA_CLIPBOARD];
2915
2916 if (XGetSelectionOwner (dpy, sel) != None)
2917 {
2918 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2919 vt, selection_request_time);
2920 return 1;
2921 }
2922
2923 return 0;
2924} 2744}
2925 2745
2926/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2927/* 2747/*
2928 * Clear all selected text 2748 * Clear all selected text
2929 * EXT: SelectionClear 2749 * EXT: SelectionClear
2930 */ 2750 */
2931void 2751void
2932rxvt_term::selection_clear () NOTHROW 2752rxvt_term::selection_clear (bool clipboard) NOTHROW
2933{ 2753{
2754 if (!clipboard)
2755 {
2934 want_refresh = 1; 2756 want_refresh = 1;
2935 free (selection.text); 2757 free (selection.text);
2936 selection.text = NULL; 2758 selection.text = NULL;
2937 selection.len = 0; 2759 selection.len = 0;
2938 CLEAR_SELECTION (); 2760 CLEAR_SELECTION ();
2939 2761
2940 if (display->selection_owner == this) 2762 if (display->selection_owner == this)
2941 display->selection_owner = 0; 2763 display->selection_owner = 0;
2764 }
2765 else
2766 {
2767 free (selection.clip_text);
2768 selection.clip_text = NULL;
2769 selection.clip_len = 0;
2770
2771 if (display->clipboard_owner == this)
2772 display->clipboard_owner = 0;
2773 }
2942} 2774}
2943 2775
2944/* ------------------------------------------------------------------------- */ 2776/* ------------------------------------------------------------------------- */
2945/* 2777/*
2946 * Copy a selection into the cut buffer 2778 * Copy a selection into the cut buffer
2947 * EXT: button 1 or 3 release 2779 * EXT: button 1 or 3 release
2948 */ 2780 */
2949void 2781void
2950rxvt_term::selection_make (Time tm) 2782rxvt_term::selection_make (Time tm)
2951{ 2783{
2952 int i; 2784 int size;
2953 wchar_t *new_selection_text; 2785 wchar_t *new_selection_text;
2954 text_t *t; 2786 text_t *t;
2955 2787
2956 switch (selection.op) 2788 switch (selection.op)
2957 { 2789 {
… …
2973 return; /* nothing selected, go away */ 2805 return; /* nothing selected, go away */
2974 2806
2975 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2807 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2976 return; 2808 return;
2977 2809
2978 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2810 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2979 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2811 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2980 2812
2981 int ofs = 0; 2813 int ofs = 0;
2982 int extra = 0; 2814 int extra = 0;
2983 2815
2984 int col = selection.beg.col; 2816 int col = selection.beg.col;
… …
2990 { 2822 {
2991#if !ENABLE_MINIMAL 2823#if !ENABLE_MINIMAL
2992 if (selection.rect) 2824 if (selection.rect)
2993 { 2825 {
2994 col = selection.beg.col; 2826 col = selection.beg.col;
2995 end_col = ncol + 1; 2827 end_col = selection.end.col;
2996 } 2828 }
2997 else 2829 else
2998#endif 2830#endif
2999 end_col = ROW(row).l; 2831 end_col = ROW(row).l;
3000 2832
3001 col = max (col, 0); 2833 col = max (col, 0);
3002 2834
3003 if (row == selection.end.row 2835 if (row == selection.end.row)
3004#if !ENABLE_MINIMAL
3005 || selection.rect
3006#endif
3007 )
3008 min_it (end_col, selection.end.col); 2836 min_it (end_col, selection.end.col);
3009 2837
3010 t = ROW(row).t + col; 2838 t = ROW(row).t + col;
3011 2839
3012 for (; col < end_col; col++) 2840 for (; col < end_col; col++)
… …
3020 2848
3021 extra -= (len - 1); 2849 extra -= (len - 1);
3022 2850
3023 if (extra < 0) 2851 if (extra < 0)
3024 { 2852 {
3025 extra += i; 2853 extra += size;
3026 i += i; 2854 size += size;
3027 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2855 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3028 } 2856 }
3029 2857
3030 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2858 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3031 } 2859 }
3032#endif 2860#endif
… …
3044 2872
3045 new_selection_text[ofs++] = C0_LF; 2873 new_selection_text[ofs++] = C0_LF;
3046 } 2874 }
3047 else 2875 else
3048#endif 2876#endif
3049 if (!ROW(row).is_longer () && row != selection.end.row) 2877 if (!ROW(row).is_longer ()
2878 && (row != selection.end.row || end_col != selection.end.col)
2879 && (row != selection.beg.row || selection.beg.col < ncol))
3050 new_selection_text[ofs++] = C0_LF; 2880 new_selection_text[ofs++] = C0_LF;
3051 } 2881 }
3052
3053 if (end_col != selection.end.col)
3054 new_selection_text[ofs++] = C0_LF;
3055 2882
3056 new_selection_text[ofs] = 0; 2883 new_selection_text[ofs] = 0;
3057 2884
3058 if (ofs == 0) 2885 if (ofs == 0)
3059 { 2886 {
… …
3072 2899
3073 selection_grab (tm); 2900 selection_grab (tm);
3074} 2901}
3075 2902
3076bool 2903bool
3077rxvt_term::selection_grab (Time tm) NOTHROW 2904rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3078{ 2905{
2906 Atom sel;
2907
2908 if (!clipboard)
2909 {
3079 selection_time = tm; 2910 selection_time = tm;
2911 sel = XA_PRIMARY;
2912 }
2913 else
2914 {
2915 clipboard_time = tm;
2916 sel = xa[XA_CLIPBOARD];
2917 }
3080 2918
3081 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2919 XSetSelectionOwner (dpy, sel, vt, tm);
3082 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2920 if (XGetSelectionOwner (dpy, sel) == vt)
3083 { 2921 {
3084 display->set_selection_owner (this); 2922 display->set_selection_owner (this, clipboard);
3085 return true; 2923 return true;
3086 } 2924 }
3087 else 2925 else
3088 { 2926 {
3089 selection_clear (); 2927 selection_clear (clipboard);
3090 return false; 2928 return false;
3091 } 2929 }
3092 2930
3093#if 0 2931#if 0
3094 XTextProperty ct; 2932 XTextProperty ct;
… …
3104/* ------------------------------------------------------------------------- */ 2942/* ------------------------------------------------------------------------- */
3105/* 2943/*
3106 * Mark or select text based upon number of clicks: 1, 2, or 3 2944 * Mark or select text based upon number of clicks: 1, 2, or 3
3107 * EXT: button 1 press 2945 * EXT: button 1 press
3108 */ 2946 */
3109void 2947void ecb_cold
3110rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2948rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3111{ 2949{
3112 clicks = ((clicks - 1) % 3) + 1; 2950 clicks = ((clicks - 1) % 3) + 1;
3113 selection.clicks = clicks; /* save clicks so extend will work */ 2951 selection.clicks = clicks; /* save clicks so extend will work */
3114 2952
… …
3133 2971
3134/* ------------------------------------------------------------------------- */ 2972/* ------------------------------------------------------------------------- */
3135/* 2973/*
3136 * Mark a selection at the specified col/row 2974 * Mark a selection at the specified col/row
3137 */ 2975 */
3138void 2976void ecb_cold
3139rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2977rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3140{ 2978{
3141 want_refresh = 1; 2979 want_refresh = 1;
3142 2980
3143 selection.mark.row = row + view_start; 2981 selection.mark.row = row + view_start;
… …
3170/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3008/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3171#define DELIMIT_TEXT(x) \ 3009#define DELIMIT_TEXT(x) \
3172 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3010 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3173#define DELIMIT_REND(x) 1 3011#define DELIMIT_REND(x) 1
3174 3012
3175void 3013void ecb_cold
3176rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3014rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3177{ 3015{
3178 int col, row, dirnadd, tcol, trow, w1, w2; 3016 int col, row, dirnadd, tcol, trow, w1, w2;
3179 row_col_t bound; 3017 row_col_t bound;
3180 text_t *stp; 3018 text_t *stp;
… …
3254 * EXT: button 3 press; button 1 or 3 drag 3092 * EXT: button 3 press; button 1 or 3 drag
3255 * flag == 0 ==> button 1 3093 * flag == 0 ==> button 1
3256 * flag == 1 ==> button 3 press 3094 * flag == 1 ==> button 3 press
3257 * flag == 2 ==> button 3 motion 3095 * flag == 2 ==> button 3 motion
3258 */ 3096 */
3259void 3097void ecb_cold
3260rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3098rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3261{ 3099{
3262 int col = clamp (Pixel2Col (x), 0, ncol); 3100 int col = clamp (Pixel2Col (x), 0, ncol);
3263 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3101 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3264 3102
… …
3290 3128
3291/* ------------------------------------------------------------------------- */ 3129/* ------------------------------------------------------------------------- */
3292/* 3130/*
3293 * Extend the selection to the specified col/row 3131 * Extend the selection to the specified col/row
3294 */ 3132 */
3295void 3133void ecb_cold
3296rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3134rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3297{ 3135{
3298 row_col_t pos; 3136 row_col_t pos;
3299 enum { 3137 enum {
3300 LEFT, RIGHT 3138 LEFT, RIGHT
… …
3491 ::swap (selection.beg.col, selection.end.col); 3329 ::swap (selection.beg.col, selection.end.col);
3492#endif 3330#endif
3493} 3331}
3494 3332
3495#if !ENABLE_MINIMAL 3333#if !ENABLE_MINIMAL
3496void 3334void ecb_cold
3497rxvt_term::selection_remove_trailing_spaces () NOTHROW 3335rxvt_term::selection_remove_trailing_spaces () NOTHROW
3498{ 3336{
3499 int32_t end_col, end_row; 3337 int32_t end_col, end_row;
3500 text_t *stp; 3338 text_t *stp;
3501 3339
… …
3539/* ------------------------------------------------------------------------- */ 3377/* ------------------------------------------------------------------------- */
3540/* 3378/*
3541 * Double click on button 3 when already selected 3379 * Double click on button 3 when already selected
3542 * EXT: button 3 double click 3380 * EXT: button 3 double click
3543 */ 3381 */
3544void 3382void ecb_cold
3545rxvt_term::selection_rotate (int x, int y) NOTHROW 3383rxvt_term::selection_rotate (int x, int y) NOTHROW
3546{ 3384{
3547 selection.clicks = selection.clicks % 3 + 1; 3385 selection.clicks = selection.clicks % 3 + 1;
3548 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3386 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3549} 3387}
… …
3551/* ------------------------------------------------------------------------- */ 3389/* ------------------------------------------------------------------------- */
3552/* 3390/*
3553 * Respond to a request for our current selection 3391 * Respond to a request for our current selection
3554 * EXT: SelectionRequest 3392 * EXT: SelectionRequest
3555 */ 3393 */
3556void 3394void ecb_cold
3557rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3395rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3558{ 3396{
3397 Atom property = rq.property == None ? rq.target : rq.property;
3559 XSelectionEvent ev; 3398 XSelectionEvent ev;
3560 3399
3561 ev.type = SelectionNotify; 3400 ev.type = SelectionNotify;
3562 ev.property = None; 3401 ev.property = None;
3563 ev.display = rq.display; 3402 ev.display = rq.display;
… …
3578 *target++ = xa[XA_COMPOUND_TEXT]; 3417 *target++ = xa[XA_COMPOUND_TEXT];
3579#if X_HAVE_UTF8_STRING 3418#if X_HAVE_UTF8_STRING
3580 *target++ = xa[XA_UTF8_STRING]; 3419 *target++ = xa[XA_UTF8_STRING];
3581#endif 3420#endif
3582 3421
3583 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3422 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3584 32, PropModeReplace, 3423 32, PropModeReplace,
3585 (unsigned char *)target_list, target - target_list); 3424 (unsigned char *)target_list, target - target_list);
3586 ev.property = rq.property; 3425 ev.property = property;
3587 } 3426 }
3588#if TODO // TODO 3427#if TODO // TODO
3589 else if (rq.target == xa[XA_MULTIPLE]) 3428 else if (rq.target == xa[XA_MULTIPLE])
3590 { 3429 {
3591 /* TODO: Handle MULTIPLE */ 3430 /* TODO: Handle MULTIPLE */
3592 } 3431 }
3593#endif 3432#endif
3594 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3433 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3595 { 3434 {
3596 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3435 XChangeProperty (dpy, rq.requestor, property, rq.target,
3597 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3436 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3598 ev.property = rq.property; 3437 ev.property = property;
3438 }
3439 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3440 {
3441 XChangeProperty (dpy, rq.requestor, property, rq.target,
3442 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3443 ev.property = property;
3599 } 3444 }
3600 else if (rq.target == XA_STRING 3445 else if (rq.target == XA_STRING
3601 || rq.target == xa[XA_TEXT] 3446 || rq.target == xa[XA_TEXT]
3602 || rq.target == xa[XA_COMPOUND_TEXT] 3447 || rq.target == xa[XA_COMPOUND_TEXT]
3603 || rq.target == xa[XA_UTF8_STRING] 3448 || rq.target == xa[XA_UTF8_STRING]
… …
3635 { 3480 {
3636 target = xa[XA_COMPOUND_TEXT]; 3481 target = xa[XA_COMPOUND_TEXT];
3637 style = enc_compound_text; 3482 style = enc_compound_text;
3638 } 3483 }
3639 3484
3640 if (selection.text) 3485 if (rq.selection == XA_PRIMARY && selection.text)
3641 { 3486 {
3642 cl = selection.text; 3487 cl = selection.text;
3643 selectlen = selection.len; 3488 selectlen = selection.len;
3489 }
3490 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3491 {
3492 cl = selection.clip_text;
3493 selectlen = selection.clip_len;
3644 } 3494 }
3645 else 3495 else
3646 { 3496 {
3647 cl = L""; 3497 cl = L"";
3648 selectlen = 0; 3498 selectlen = 0;
… …
3669 ct.value = (unsigned char *)cl; 3519 ct.value = (unsigned char *)cl;
3670 ct.nitems = selectlen; 3520 ct.nitems = selectlen;
3671 ct.encoding = target; 3521 ct.encoding = target;
3672 } 3522 }
3673 3523
3674 XChangeProperty (dpy, rq.requestor, rq.property, 3524 XChangeProperty (dpy, rq.requestor, property,
3675 ct.encoding, 8, PropModeReplace, 3525 ct.encoding, 8, PropModeReplace,
3676 ct.value, (int)ct.nitems); 3526 ct.value, (int)ct.nitems);
3677 ev.property = rq.property; 3527 ev.property = property;
3678 3528
3679 if (freect) 3529 if (freect)
3680 XFree (ct.value); 3530 XFree (ct.value);
3681 } 3531 }
3682 3532
3683 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3533 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3684} 3534}
3685 3535
3686/* ------------------------------------------------------------------------- */ 3536/* ------------------------------------------------------------------------- */
3687#ifdef USE_XIM 3537#if USE_XIM
3688void 3538void ecb_cold
3689rxvt_term::im_set_position (XPoint &pos) NOTHROW 3539rxvt_term::im_set_position (XPoint &pos) NOTHROW
3690{ 3540{
3691 XWindowAttributes xwa; 3541 XWindowAttributes xwa;
3692 3542
3693 XGetWindowAttributes (dpy, vt, &xwa); 3543 XGetWindowAttributes (dpy, vt, &xwa);
… …
3716 h += 2; min_it (h, nrow); 3566 h += 2; min_it (h, nrow);
3717 3567
3718 x -= 1; clamp_it (x, 0, ncol - w); 3568 x -= 1; clamp_it (x, 0, ncol - w);
3719 y -= 1; clamp_it (y, 0, nrow - h); 3569 y -= 1; clamp_it (y, 0, nrow - h);
3720 3570
3721 ov_x = x; ov_y = y; 3571 ov.x = x; ov.y = y;
3722 ov_w = w; ov_h = h; 3572 ov.w = w; ov.h = h;
3723 3573
3724 ov_text = new text_t *[h]; 3574 ov.text = new text_t *[h];
3725 ov_rend = new rend_t *[h]; 3575 ov.rend = new rend_t *[h];
3726 3576
3727 for (y = 0; y < h; y++) 3577 for (y = 0; y < h; y++)
3728 { 3578 {
3729 text_t *tp = ov_text[y] = new text_t[w]; 3579 text_t *tp = ov.text[y] = new text_t[w];
3730 rend_t *rp = ov_rend[y] = new rend_t[w]; 3580 rend_t *rp = ov.rend[y] = new rend_t[w];
3731 3581
3732 text_t t0, t1, t2; 3582 text_t t0, t1, t2;
3733 rend_t r = OVERLAY_RSTYLE; 3583 rend_t r = OVERLAY_RSTYLE;
3734 3584
3735 if (y == 0) 3585 if (y == 0)
… …
3754} 3604}
3755 3605
3756void 3606void
3757rxvt_term::scr_overlay_off () NOTHROW 3607rxvt_term::scr_overlay_off () NOTHROW
3758{ 3608{
3759 if (!ov_text) 3609 if (!ov.text)
3760 return; 3610 return;
3761 3611
3762 want_refresh = 1; 3612 want_refresh = 1;
3763 3613
3764 for (int y = 0; y < ov_h; y++) 3614 for (int y = 0; y < ov.h; y++)
3765 { 3615 {
3766 delete [] ov_text[y]; 3616 delete [] ov.text[y];
3767 delete [] ov_rend[y]; 3617 delete [] ov.rend[y];
3768 } 3618 }
3769 3619
3770 delete [] ov_text; ov_text = 0; 3620 delete [] ov.text; ov.text = 0;
3771 delete [] ov_rend; ov_rend = 0; 3621 delete [] ov.rend; ov.rend = 0;
3772} 3622}
3773 3623
3774void 3624void
3775rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3625rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3776{ 3626{
3777 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3627 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3778 return; 3628 return;
3779 3629
3780 x++, y++; 3630 x++, y++;
3781 3631
3782 ov_text[y][x] = text; 3632 ov.text[y][x] = text;
3783 ov_rend[y][x] = rend; 3633 ov.rend[y][x] = rend;
3784} 3634}
3785 3635
3786void 3636void
3787rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3637rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3788{ 3638{
… …
3807} 3657}
3808 3658
3809void 3659void
3810rxvt_term::scr_swap_overlay () NOTHROW 3660rxvt_term::scr_swap_overlay () NOTHROW
3811{ 3661{
3812 if (!ov_text) 3662 if (!ov.text)
3813 return; 3663 return;
3814 3664
3665 // hide cursor if it is within the overlay area
3666 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3667 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3668 screen.flags &= ~Screen_VisibleCursor;
3669
3815 // swap screen mem with overlay 3670 // swap screen mem with overlay
3816 for (int y = ov_h; y--; ) 3671 for (int y = ov.h; y--; )
3817 { 3672 {
3818 text_t *t1 = ov_text[y]; 3673 text_t *t1 = ov.text[y];
3819 rend_t *r1 = ov_rend[y]; 3674 rend_t *r1 = ov.rend[y];
3820 3675
3821 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3676 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3822 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3677 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3823 3678
3824 for (int x = ov_w; x--; ) 3679 for (int x = ov.w; x--; )
3825 { 3680 {
3826 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3681 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3827 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3682 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3828 } 3683 }
3829 } 3684 }

Diff Legend

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