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.419 by root, Fri Jun 1 08:12:09 2012 UTC

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

Diff Legend

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