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.429 by root, Sun Jan 13 20:11:21 2013 UTC

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

Diff Legend

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