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.316 by root, Tue Nov 4 15:02:35 2008 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

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

Diff Legend

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