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.332 by sf-exg, Mon Jan 18 10:05:55 2010 UTC vs.
Revision 1.436 by sf-exg, Sun Mar 24 10:15:27 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;
152 col++; 151 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
154} 153}
155 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
156/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
159 168
160void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
161rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
162{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
163 view_start = 0; 220 view_start = 0;
164 num_scr = 0; 221 num_scr = 0;
165 222
166 if (ncol == 0) 223 if (ncol == 0)
167 ncol = 80; 224 ncol = 80;
… …
187 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
188 245
189 screen.tscroll = 0; 246 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
191 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
192 if (!row_buf) 257 if (!prev_row_buf)
193 { 258 {
194 /*
195 * first time called so just malloc everything: don't rely on realloc
196 */
197 top_row = 0; 259 top_row = 0;
198 term_start = 0; 260 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 261
214 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 279 selection.text = NULL;
232 selection.len = 0; 280 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 281 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 282 selection.screen = PRIMARY;
235 selection.clicks = 0; 283 selection.clicks = 0;
284 selection.clip_text = NULL;
285 selection.clip_len = 0;
236 } 286 }
237 else 287 else
238 { 288 {
239 /* 289 /*
240 * add or delete rows as appropriate 290 * add or delete rows as appropriate
241 */ 291 */
242 292
243 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 int common_col = min (prev_ncol, ncol);
244 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246#if 0
247 if (nrow < prev_nrow)
248 {
249 for (int row = nrow; row < prev_nrow; row++)
250 {
251 lfree (swap_buf [row]);
252 lfree (drawn_buf[row]);
253 }
254 }
255#endif
256
257 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259 294
260 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
261 { 296 {
262 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
264 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
265 300
266 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
267 { 302 }
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 }
271
272 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274 303
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
278 307
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 316
288 do 317 do
289 { 318 {
290 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
291 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292 int plines = 1; 321 int plines = 1;
293 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
294 323
295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
296 { 325 {
297 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
298 327
299 plines++; 328 plines++;
300 llen += prev_ncol; 329 llen += prev_ncol;
… …
313 342
314 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
315 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
316 { 345 {
317 qline = row_buf + qrow; 346 qline = row_buf + qrow;
318 lalloc (*qline); 347 qline->alloc (); // redundant with next line
319 qline->l = ncol; 348 qline->l = ncol;
320 qline->is_longer (1); 349 qline->is_longer (1);
321 350
322 int qcol = 0; 351 int qcol = 0;
323 352
… …
338 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
339 // least. 368 // least.
340 if (prow == ocur.row) 369 if (prow == ocur.row)
341 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
342 371
343 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
344 373
345 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
346 375
347 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
348 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
369 { 398 {
370 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
371 400
372 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
373 { 402 {
374 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
375 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
376 405
377 qline = pline; 406 copy_line (dst, src);
378 lresize (qline);
379 } 407 }
380 408
381 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
382 {
383 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
384 }
385 411
386 term_start = 0; 412 term_start = 0;
387 } 413 }
388
389 free (old_buf);
390 delete old_ta;
391 delete old_ra;
392 414
393 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
394 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
395 } 417 }
396 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
397 free (tabs); 428 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
399 430
400 for (int col = ncol; --col; ) 431 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
402 433
403 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
404 435
405 prev_nrow = nrow; 436 prev_nrow = nrow;
… …
408 tt_winch (); 439 tt_winch ();
409 440
410 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
411} 442}
412 443
413/* ------------------------------------------------------------------------- */ 444void ecb_cold
414/*
415 * Free everything. That way malloc debugging can find leakage.
416 */
417void
418rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
419{ 446{
420 if (row_buf) 447 chunk_free (chunk, chunk_size);
421 { 448 chunk = 0;
422 delete talloc; talloc = 0; 449 row_buf = 0;
423 delete ralloc; ralloc = 0;
424 450
425 free (row_buf);
426 free (swap_buf);
427 free (drawn_buf);
428 row_buf = 0; // signal that we freed all the arrays above
429
430 free (tabs); 451 free (tabs);
431 tabs = 0; 452 tabs = 0;
432 }
433} 453}
434 454
435/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
436/* 456/*
437 * Hard/Soft reset 457 * Hard/Soft reset
438 */ 458 */
439void 459void ecb_cold
440rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
441{ 461{
442 scr_release (); 462 scr_release ();
463
443 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false; 465 rvideo_mode = false;
445 scr_soft_reset (); 466 scr_soft_reset ();
446 scr_reset (); 467 scr_reset ();
447 468
448 scr_clear (true); 469 scr_clear (true);
449 scr_refresh (); 470 scr_refresh ();
450} 471}
451 472
452void 473void ecb_cold
453rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
454{ 475{
455 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
457 scr_overlay_off (); 478 scr_overlay_off ();
458#endif 479#endif
… …
513 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
514 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
515} 536}
516 537
517void 538void
518rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
519{ 540{
520 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
521 return; 542 return;
522 543
523 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
542 return; 563 return;
543 564
544 want_refresh = 1; 565 want_refresh = 1;
545 view_start = 0; 566 view_start = 0;
546 567
547 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
548 574
549 current_screen = scrn; 575 current_screen = scrn;
550 576
551#if NSCREENS 577#if NSCREENS
552 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
618/* 644/*
619 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
620 * count positive ==> scroll up 646 * count positive ==> scroll up
621 * count negative ==> scroll down 647 * count negative ==> scroll down
622 */ 648 */
623int 649int ecb_hot
624rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
625{ 651{
626 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
627 return 0; 653 return 0;
628 654
… …
631 657
632 if (count > 0 658 if (count > 0
633 && row1 == 0 659 && row1 == 0
634 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
635 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
636 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
637
638 // scroll everything up 'count' lines
639 term_start = (term_start + count) % total_rows;
640 665
641 // sever bottommost line 666 // sever bottommost line
642 { 667 {
643 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
644 l.is_longer (0); 669 l.is_longer (0);
645 l.touch (); 670 l.touch ();
646 } 671 }
647 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
648 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
649 for (int i = count; i--; ) 689 for (int i = count; i--; )
650 { 690 {
651 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
652 692
653 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem 694 // could be rolled into scr_blank_screen_mem
655 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
656 { 696 {
657 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0; 698 l.l = 0;
… …
660 } 700 }
661 else 701 else
662 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
663 } 703 }
664 704
665 // now copy lines below the scroll region bottom to the
666 // bottom of the screen again, so they look as if they
667 // hadn't moved.
668 for (int i = nrow; --i > row2; )
669 {
670 line_t &l1 = ROW(i - count);
671 line_t &l2 = ROW(i);
672
673 ::swap (l1, l2);
674 l2.touch ();
675 }
676
677 // move and/or clear selection, if any 705 // move and/or clear selection, if any
678 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
679 { 708 {
680 selection.beg.row -= count; 709 selection.beg.row -= count;
681 selection.end.row -= count; 710 selection.end.row -= count;
682 selection.mark.row -= count; 711 selection.mark.row -= count;
683 712
684 if (selection.beg.row < top_row 713 selection_check (0);
685 || selection.end.row < top_row
686 || selection.mark.row < top_row)
687 {
688 CLEAR_ALL_SELECTION ();
689 selection.op = SELECTION_CLEAR;
690 }
691 } 714 }
692 715
693 // finally move the view window, if desired 716 // finally move the view window, if desired
694 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
695 && view_start != 0 718 && view_start != 0
… …
725 } 748 }
726 749
727 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
728 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
729 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
730 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
731 762
732 min_it (count, rows); 763 min_it (count, rows);
733 764
734 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
735 766
736 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
737 { 768 {
738 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
739 770
… …
741 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
742 } 773 }
743 774
744 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
745 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
746 } 784 }
747 785
748 return count; 786 return count;
749} 787}
750 788
751/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
752/* 790/*
753 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
754 */ 792 */
755void 793void ecb_hot
756rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
757{ 795{
758 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
759 return; 797 return;
760 798
761 unsigned char checksel; 799 bool checksel;
762 unicode_t c; 800 unicode_t c;
763 int ncol = this->ncol; 801 int ncol = this->ncol;
764 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
765 803
766 want_refresh = 1; 804 want_refresh = 1;
… …
792 830
793 while (str < strend) 831 while (str < strend)
794 { 832 {
795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
796 834
797 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
798 if (c == C0_LF) 836 if (c == C0_LF)
799 { 837 {
800 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
801 839
802 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
821 { 859 {
822 scr_tab (1, true); 860 scr_tab (1, true);
823 continue; 861 continue;
824 } 862 }
825 863
826 if (expect_false ( 864 if (ecb_unlikely (
827 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
829 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 )) 868 ))
831 { 869 {
… …
836 * should be a similar check. 874 * should be a similar check.
837 */ 875 */
838 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
839 } 877 }
840 878
841 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
842 { 880 {
843 scr_do_wrap (); 881 scr_do_wrap ();
844 882
845 line->l = ncol; 883 line->l = ncol;
846 line->is_longer (1); 884 line->is_longer (1);
… …
848 row = screen.cur.row; 886 row = screen.cur.row;
849 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
850 } 888 }
851 889
852 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
854 c = 0xfffd; 892 c = 0xfffd;
855 893
856 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
857 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
858 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
859 // locale. 897 // locale.
860 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
861 899
862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
863 { 901 {
864 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
865 // 5f-7e standard vt100 903 // 5f-7e standard vt100
866 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
867 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
880 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
881 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
882 } 920 }
883 } 921 }
884 922
885 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
886 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
887 925
888 if (width != 0) 926 if (width != 0)
889 { 927 {
890#if !UNICODE_3 928#if !UNICODE_3
… …
895# else 933# else
896 c = 0xfffd; 934 c = 0xfffd;
897# endif 935# endif
898#endif 936#endif
899 937
938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
939
940 // if the character doesn't fit into the remaining columns...
941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
942 {
943 if (screen.flags & Screen_Autowrap)
944 {
945 // ... artificially enlargen the previous one
946 c = NOCHAR;
947 // and try the same character next loop iteration
948 --str;
949 }
950 else
951 screen.cur.col = ncol - width;
952 }
953
900 // nuke the character at this position, if required 954 // nuke the character at this position, if required
901 if (expect_false ( 955 // due to wonderful coincidences everywhere else in this loop
956 // we never have to check for overwriting a wide char itself,
957 // only its tail.
902 line->t[screen.cur.col] == NOCHAR 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
903 || (screen.cur.col < ncol - 1
904 && line->t[screen.cur.col + 1] == NOCHAR)
905 ))
906 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
907
908 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
909
910 // if the character doesn't fit into the remaining columns...
911 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
912 {
913 // ... artificially enlargen the previous one
914 c = NOCHAR;
915 // and try the same character next loop iteration
916 --str;
917 }
918 960
919 line->touch (); 961 line->touch ();
920 962
921 do 963 do
922 { 964 {
923 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
924 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
925 967
926 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
927 screen.cur.col++; 969 screen.cur.col++;
928 else 970 else
929 { 971 {
930 line->l = ncol; 972 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 974 screen.flags |= Screen_WrapNext;
933 break; 975
976 goto end_of_line;
934 } 977 }
935 978
936 c = NOCHAR; 979 c = NOCHAR;
937 } 980 }
938 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
939 982
940 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
942 { 985 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 986 line->t[c] = ' ';
948 line->r[c] = rend; 987 line->r[c] = rend;
949 }
950 } 988 }
989
990end_of_line:
991 ;
951 } 992 }
952#if ENABLE_COMBINING 993#if ENABLE_COMBINING
953 else // width == 0 994 else // width == 0
954 { 995 {
955 if (c != 0xfeff) // ignore BOM 996 if (c != 0xfeff) // ignore BOM
… …
1018 1059
1019 want_refresh = 1; 1060 want_refresh = 1;
1020#endif 1061#endif
1021 } 1062 }
1022 } 1063 }
1064 else if (screen.flags & Screen_WrapNext)
1065 screen.flags &= ~Screen_WrapNext;
1023 else 1066 else
1024 scr_gotorc (0, -1, RELATIVE); 1067 scr_gotorc (0, -1, RELATIVE);
1025} 1068}
1026 1069
1027/* ------------------------------------------------------------------------- */ 1070/* ------------------------------------------------------------------------- */
… …
1105 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1106 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1107 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1108 */ 1151 */
1109#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1110void 1153void ecb_cold
1111rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1112{ 1155{
1113 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1115 else 1158 else
… …
1122 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1123 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1124 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1125 */ 1168 */
1126#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1127void 1170void ecb_cold
1128rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1129{ 1172{
1130 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1132 else 1175 else
… …
1283 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1284} 1327}
1285 1328
1286/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1287/* 1330/*
1288 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1335 */
1293void 1336void
… …
1302 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1303 1346
1304 switch (mode) 1347 switch (mode)
1305 { 1348 {
1306 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1350 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1352 num = nrow - row;
1311 break; 1353 break;
1312 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1355 scr_erase_line (1);
1315 row = 0; 1356 row = 0;
1316 num = screen.cur.row; 1357 num = screen.cur.row;
1317 break; 1358 break;
1318 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1360 row = 0;
1321 num = nrow; 1361 num = nrow;
1322 break; 1362 break;
1323 default: 1363 default:
1324 return; 1364 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1373 if (row >= nrow) /* Out Of Bounds */
1334 return; 1374 return;
1335 1375
1336 min_it (num, nrow - row); 1376 min_it (num, nrow - row);
1337 1377
1338 // TODO: the code below does not work when view_start != 0
1339 // the workaround is to disable the clear and use a normal refresh
1340 // when view_start != 0. mysterious.
1341 if (rstyle & (RS_RVid | RS_Uline)) 1378 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1379 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1380 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1381 {
1345 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1346 1383
1347 if (mapped && !view_start) 1384 if (mapped)
1348 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1350 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1351 } 1388 }
1352 else 1389 else
1353 { 1390 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1392
1356 if (mapped && !view_start) 1393 if (mapped)
1357 { 1394 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1362 (unsigned int)width, 1399 (unsigned int)vt_width,
1363 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1364 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1365 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 } 1403 }
1367 } 1404 }
1368 1405
1369 for (; num--; row++) 1406 for (; num--; row++)
1370 { 1407 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1408 scr_blank_screen_mem (ROW(row), rstyle);
1372 1409
1373 if (!view_start) 1410 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1411 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1412 }
1376} 1413}
1377 1414
1378#if !ENABLE_MINIMAL 1415#if !ENABLE_MINIMAL
1379void 1416void
… …
1389/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1390/* 1427/*
1391 * Fill the screen with `E's 1428 * Fill the screen with `E's
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1430 */
1394void 1431void ecb_cold
1395rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1396{ 1433{
1397 rend_t fs; 1434 rend_t fs;
1398 1435
1399 want_refresh = 1; 1436 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1401 1438
1402 num_scr_allow = 0; 1439 num_scr_allow = 0;
1403 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1404 1445
1405 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1406 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1407 { 1448 {
1408 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1559/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1560/* 1601/*
1561 * Set the scrolling region 1602 * Set the scrolling region
1562 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1563 */ 1604 */
1564void 1605void ecb_cold
1565rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1566{ 1607{
1567 max_it (top, 0); 1608 max_it (top, 0);
1568 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1569 1610
… …
1579/* 1620/*
1580 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1581 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1582 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1583 */ 1624 */
1584void 1625void ecb_cold
1585rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1586{ 1627{
1587 want_refresh = 1; 1628 want_refresh = 1;
1588 1629
1589 if (mode) 1630 if (mode)
… …
1596/* 1637/*
1597 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1598 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1599 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1600 */ 1641 */
1601void 1642void ecb_cold
1602rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1603{ 1644{
1604 if (mode) 1645 if (mode)
1605 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1606 else 1647 else
… …
1615 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1616 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1617 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1618 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1619 */ 1660 */
1620void 1661void ecb_cold
1621rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1622{ 1663{
1623 if (mode) 1664 if (mode)
1624 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1625 else 1666 else
… …
1632/* 1673/*
1633 * Set insert/replace mode 1674 * Set insert/replace mode
1634 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1635 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1636 */ 1677 */
1637void 1678void ecb_cold
1638rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1639{ 1680{
1640 if (mode) 1681 if (mode)
1641 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1642 else 1683 else
… …
1648 * Set/Unset tabs 1689 * Set/Unset tabs
1649 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1650 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1651 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1652 */ 1693 */
1653void 1694void ecb_cold
1654rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1655{ 1696{
1656 if (mode < 0) 1697 if (mode < 0)
1657 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1658 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1677 if (rvideo_state != on) 1718 if (rvideo_state != on)
1678 { 1719 {
1679 rvideo_state = on; 1720 rvideo_state = on;
1680 1721
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1683 if (bgPixmap.pixmap == None) 1724 if (bg_img == 0)
1684#endif 1725#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1727
1687 XGCValues gcvalue; 1728 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1697/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1698/* 1739/*
1699 * Report current cursor position 1740 * Report current cursor position
1700 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1701 */ 1742 */
1702void 1743void ecb_cold
1703rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1704{ 1745{
1705 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1706} 1747}
1707 1748
… …
1710 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1711 1752
1712/* 1753/*
1713 * Set font style 1754 * Set font style
1714 */ 1755 */
1715void 1756void ecb_cold
1716rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1717{ 1758{
1718#if 0 1759#if 0
1719 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1720 { 1761 {
… …
1742 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1743 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1744 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1745 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1746 */ 1787 */
1747void 1788void ecb_cold
1748rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1749{ 1790{
1750 screen.charset = set; 1791 screen.charset = set;
1751 set_font_style (); 1792 set_font_style ();
1752} 1793}
… …
1773 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1774 1815
1775/* 1816/*
1776 * refresh matching text. 1817 * refresh matching text.
1777 */ 1818 */
1778bool 1819bool ecb_cold
1779rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1780{ 1821{
1781 bool found = false; 1822 bool found = false;
1782 1823
1783 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1802 PART_BEG = 0, 1843 PART_BEG = 0,
1803 PART_END, 1844 PART_END,
1804 RC_COUNT 1845 RC_COUNT
1805}; 1846};
1806 1847
1807void 1848void ecb_hot
1808rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1809{ 1850{
1810 int i; 1851 int i;
1811 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1812 1853
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1873 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1874 {
1834 min_it (rc[i].col, ncol - 1); 1875 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1876 min_it (rc[i].row, nrow - 1);
1836 } 1877 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1878
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1879 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1839 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1880 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1881
1841 num_scr_allow = 0; 1882 num_scr_allow = 0;
1842 1883
… …
1849 * Refresh the entire screen 1890 * Refresh the entire screen
1850 */ 1891 */
1851void 1892void
1852rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1853{ 1894{
1854 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1855} 1896}
1856 1897
1857/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1858/* 1899/*
1859 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
… …
1915 1956
1916# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1959 if (option (Opt_mapAlert))
1919# endif 1960# endif
1920 XMapWindow (dpy, parent[0]); 1961 XMapWindow (dpy, parent);
1921# endif 1962# endif
1922 1963
1923# if ENABLE_FRILLS 1964# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1965 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1966 set_urgency (1);
… …
1938 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1939#endif 1980#endif
1940} 1981}
1941 1982
1942/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1943/* ARGSUSED */ 1984void ecb_cold
1944void
1945rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1946{ 1986{
1947#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1948 int nrows, row_start; 1988 int nrows, row_start;
1949 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
1998/* 2038/*
1999 * Refresh the screen 2039 * Refresh the screen
2000 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2001 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2002 */ 2042 */
2003void 2043void ecb_hot
2004rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2005{ 2045{
2006 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2007 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2008 int i; /* tmp */ 2048 int i; /* tmp */
2009#ifndef NO_CURSORCOLOR
2010 rend_t cc1; /* store colours at cursor position (s) */
2011#endif
2012 rend_t *crp; // cursor rendition pointer
2013 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2014 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2015 2053
2016 want_refresh = 0; /* screen is current */ 2054 want_refresh = 0; /* screen is current */
2017 2055
2018 if (refresh_type == NO_REFRESH || !mapped) 2056 if (refresh_type == NO_REFRESH || !mapped)
2019 return; 2057 return;
… …
2022 * A: set up vars 2060 * A: set up vars
2023 */ 2061 */
2024 refresh_count = 0; 2062 refresh_count = 0;
2025 2063
2026 unsigned int old_screen_flags = screen.flags; 2064 unsigned int old_screen_flags = screen.flags;
2027 char have_bg = 0; 2065 bool have_bg = 0;
2028#ifdef HAVE_BG_PIXMAP 2066#ifdef HAVE_IMG
2029 have_bg = bgPixmap.pixmap != None; 2067 have_bg = bg_img != 0;
2030#endif 2068#endif
2031 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2069 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2032 2070
2033 /* 2071 /*
2034 * B: reverse any characters which are selected 2072 * B: reverse any characters which are selected
… …
2038 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2076 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2039#if ENABLE_OVERLAY 2077#if ENABLE_OVERLAY
2040 scr_swap_overlay (); 2078 scr_swap_overlay ();
2041#endif 2079#endif
2042 2080
2043 char showcursor = screen.flags & Screen_VisibleCursor; 2081 bool showcursor = screen.flags & Screen_VisibleCursor;
2044 2082
2045 /* 2083 /*
2046 * C: set the cursor character (s) 2084 * C: set the cursor character (s)
2047 */ 2085 */
2048 { 2086 {
2049 unsigned char setoldcursor; 2087 bool setoldcursor;
2050 2088
2051#ifdef CURSOR_BLINK 2089#ifdef CURSOR_BLINK
2052 if (hidden_cursor) 2090 if (hidden_cursor)
2053 showcursor = 0; 2091 showcursor = 0;
2054#endif 2092#endif
… …
2058 int col = screen.cur.col; 2096 int col = screen.cur.col;
2059 2097
2060 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2061 col--; 2099 col--;
2062 2100
2063 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2064 2103
2065#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2066 cc1 = *crp & (RS_fgMask | RS_bgMask);
2067 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2068 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2069 else 2107 else
2070#endif 2108#endif
2071#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2083 ccol2 = bgcolor_of (rstyle); 2121 ccol2 = bgcolor_of (rstyle);
2084#else 2122#else
2085 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2086#endif 2124#endif
2087 2125
2088 if (showcursor && focus) 2126 if (focus)
2089 { 2127 {
2128 rend_t rend = cur_rend;
2129
2090 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2091 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2092 else 2132 else
2093 { 2133 {
2094 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2095 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2096 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2097 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2098 } 2140 }
2099 } 2141 }
2100 2142
2101 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2102 setoldcursor = 0; 2144 setoldcursor = 0;
… …
2141 { 2183 {
2142 int16_t nits; 2184 int16_t nits;
2143 int i = num_scr; 2185 int i = num_scr;
2144 int j; 2186 int j;
2145 int len, wlen; 2187 int len, wlen;
2146 dLocal (int, num_scr);
2147 2188
2148 j = nrow; 2189 j = nrow;
2149 wlen = len = -1; 2190 wlen = len = -1;
2150 row = i > 0 ? 0 : j - 1; 2191 row = i > 0 ? 0 : j - 1;
2151 2192
… …
2226 continue; 2267 continue;
2227 2268
2228 // redraw one or more characters 2269 // redraw one or more characters
2229 2270
2230 // seek to the beginning of wide characters 2271 // seek to the beginning of wide characters
2231 while (expect_false (stp[col] == NOCHAR && col > 0)) 2272 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2232 --col; 2273 --col;
2233 2274
2234 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2275 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2235 text_t *text = stp + col; 2276 text_t *text = stp + col;
2236 int count = 1; 2277 int count = 1;
2237 2278
2238 dtp[col] = stp[col]; 2279 dtp[col] = stp[col];
2239 drp[col] = rend; 2280 drp[col] = rend;
… …
2274 2315
2275 col--; /* went one too far. move back */ 2316 col--; /* went one too far. move back */
2276 count -= i; /* dump any matching trailing chars */ 2317 count -= i; /* dump any matching trailing chars */
2277 2318
2278 // sometimes we optimize away the trailing NOCHAR's, add them back 2319 // sometimes we optimize away the trailing NOCHAR's, add them back
2279 while (expect_false (i && text[count] == NOCHAR)) 2320 while (ecb_unlikely (i && text[count] == NOCHAR))
2280 count++, i--; 2321 count++, i--;
2281 2322
2282 /* 2323 /*
2283 * Determine the attributes for the string 2324 * Determine the attributes for the string
2284 */ 2325 */
2285 int fore = fgcolor_of (rend); // desired foreground 2326 int fore = fgcolor_of (rend); // desired foreground
2286 int back = bgcolor_of (rend); // desired background 2327 int back = bgcolor_of (rend); // desired background
2287 2328
2288 // only do special processing if any attributes are set, which is unlikely 2329 // only do special processing if any attributes are set, which is unlikely
2289 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2330 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2290 { 2331 {
2291 bool invert = rend & RS_RVid; 2332 bool invert = rend & RS_RVid;
2292 2333
2293#ifndef NO_BOLD_UNDERLINE_REVERSE 2334#ifndef NO_BOLD_UNDERLINE_REVERSE
2294 if (rend & RS_Bold && fore == Color_fg) 2335 if (rend & RS_Bold && fore == Color_fg)
… …
2313 2354
2314 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2355 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2315 fore = Color_UL; 2356 fore = Color_UL;
2316#endif 2357#endif
2317 2358
2359#ifdef OPTION_HC
2360 if (rend & RS_Sel)
2361 {
2362 /* invert the column if no highlightColor is set or it is the
2363 * current cursor column */
2364 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2365 && ISSET_PIXCOLOR (Color_HC))
2366 {
2367 if (ISSET_PIXCOLOR (Color_HTC))
2368 fore = Color_HTC;
2369 // if invert is 0 reverse video is set so we use bg color as fg color
2370 else if (!invert)
2371 fore = back;
2372
2373 back = Color_HC;
2374 invert = 0;
2375 }
2376 }
2377#endif
2378
2318 if (invert) 2379 if (invert)
2319 { 2380 {
2320#ifdef OPTION_HC
2321 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2322 || !ISSET_PIXCOLOR (Color_HC))
2323#endif
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 ::swap (fore, back); 2381 ::swap (fore, back);
2327#ifdef OPTION_HC
2328 else if (ISSET_PIXCOLOR (Color_HC))
2329 back = Color_HC;
2330#endif
2331 2382
2332#ifndef NO_BOLD_UNDERLINE_REVERSE 2383#ifndef NO_BOLD_UNDERLINE_REVERSE
2333# ifndef OPTION_HC
2334 if (ISSET_PIXCOLOR (Color_RV))
2335 back = Color_RV;
2336# endif
2337 if (fore == back) 2384 if (fore == back)
2338 { 2385 {
2339 fore = Color_bg; 2386 fore = Color_bg;
2340 back = Color_fg; 2387 back = Color_fg;
2341 } 2388 }
… …
2377 /* 2424 /*
2378 * Actually do the drawing of the string here 2425 * Actually do the drawing of the string here
2379 */ 2426 */
2380 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2427 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2381 2428
2382 if (expect_true (have_bg && back == Color_bg)) 2429 if (ecb_likely (have_bg && back == Color_bg))
2383 { 2430 {
2384 // this is very ugly, maybe push it into ->draw? 2431 // this is very ugly, maybe push it into ->draw?
2385 2432
2386 for (i = 0; i < count; i++) /* don't draw empty strings */ 2433 for (i = 0; i < count; i++) /* don't draw empty strings */
2387 if (text[i] != ' ') 2434 if (text[i] != ' ')
… …
2394 did_clear: ; 2441 did_clear: ;
2395 } 2442 }
2396 else 2443 else
2397 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2444 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2398 2445
2399 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2446 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2400 { 2447 {
2401#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2402 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2403 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2404 else 2451 else
… …
2416 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2417 */ 2464 */
2418 if (showcursor) 2465 if (showcursor)
2419 { 2466 {
2420 if (focus) 2467 if (focus)
2421 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2422 if (option (Opt_cursorUnderline))
2423 *crp ^= RS_Uline;
2424 else
2425 {
2426 *crp ^= RS_RVid;
2427#ifndef NO_CURSORCOLOR
2428 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2429#endif
2430 }
2431 }
2432 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2433 { 2470 {
2434 int cursorwidth = 1; 2471 int cursorwidth = 1;
2435 int col = oldcursor.col; 2472 int col = oldcursor.col;
2436 2473
… …
2450 2487
2451 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2452 Col2Pixel (col), 2489 Col2Pixel (col),
2453 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2454 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2455 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2456 } 2493 }
2457 } 2494 }
2458 2495
2459 /* 2496 /*
2460 * H: cleanup selection 2497 * H: cleanup selection
… …
2469 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2470 num_scr = 0; 2507 num_scr = 0;
2471 num_scr_allow = 1; 2508 num_scr_allow = 1;
2472} 2509}
2473 2510
2474void 2511void ecb_cold
2475rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2476{ 2513{
2477 if (!l.t) 2514 if (!l.valid ())
2478 return; 2515 return;
2479 2516
2480 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
2481 2518
2482 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2483 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]));
2484} 2521}
2485 2522
2486void 2523void ecb_cold
2487rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2488{ 2525{
2489 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2490 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2491 2528
… …
2494 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2495 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2496 } 2533 }
2497} 2534}
2498 2535
2499void 2536void ecb_cold
2500rxvt_term::scr_recolour () NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2501{ 2538{
2502#ifdef HAVE_BG_PIXMAP 2539 bool transparent = false;
2503 bgPixmap.apply ();
2504#else
2505 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 {
2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2507 XClearWindow (dpy, parent[0]);
2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2563 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2564 }
2565
2566 XClearWindow (dpy, parent);
2509 2567
2510 if (scrollBar.win) 2568 if (scrollBar.win)
2511 { 2569 {
2570 if (transparent)
2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2572 else
2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2513 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2514 scrollBar.show (0); 2575 scrollBar.show (0);
2515 } 2576 }
2516 2577
2517#endif 2578 if (refresh)
2518 2579 {
2519 /* bgPixmap.apply () does not do the following : */
2520 scr_clear (); 2580 scr_clear ();
2521 scr_touch (true); 2581 scr_touch (true);
2582 }
2522 want_refresh = 1; 2583 want_refresh = 1;
2523} 2584}
2524 2585
2525/* ------------------------------------------------------------------------- */ 2586/* ------------------------------------------------------------------------- */
2526void 2587void
… …
2583 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2584 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2585} 2646}
2586 2647
2587/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2588void 2649void ecb_hot
2589rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2590{ 2651{
2591 if (selection.op 2652 if (selection.op
2592 && current_screen == selection.screen 2653 && current_screen == selection.screen
2593 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
2594 { 2655 {
2595#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2596 if (selection.rect) 2657 if (selection.rect)
2597 scr_xor_rect (selection.beg.row, selection.beg.col, 2658 scr_xor_rect (selection.beg.row, selection.beg.col,
2598 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2599 RS_RVid, RS_RVid | RS_Uline); 2660 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2600 else 2661 else
2601#endif 2662#endif
2602 scr_xor_span (selection.beg.row, selection.beg.col, 2663 scr_xor_span (selection.beg.row, selection.beg.col,
2603 selection.end.row, selection.end.col, 2664 selection.end.row, selection.end.col,
2604 RS_RVid); 2665 RS_Sel | RS_RVid);
2605 } 2666 }
2606} 2667}
2607 2668
2608/* ------------------------------------------------------------------------- */ 2669/* ------------------------------------------------------------------------- */
2609/* 2670/*
… …
2612 */ 2673 */
2613#if 0 2674#if 0
2614void 2675void
2615rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2616{ 2677{
2617 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2618 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2619 char r1[] = "\n";
2620
2621 for (row = saveLines + top_row;
2622 row < saveLines + nrow - 1; row++)
2623 {
2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2625 : ncol;
2626 for (towrite = width; towrite; towrite -= wrote)
2627 {
2628 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2629 towrite);
2630 if (wrote < 0)
2631 return; /* XXX: death, no report */
2632 }
2633 if (row_buf[row].l >= 0)
2634 if (write (fd, r1, 1) <= 0)
2635 return; /* XXX: death, no report */
2636 }
2637} 2680}
2638#endif 2681#endif
2639 2682
2640/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2641 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2642 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2643void 2686void
2644rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2645{ 2688{
2646 row_col_t pos;
2647
2648 if (!selection.op) 2689 if (!selection.op)
2649 return; 2690 return;
2650 2691
2651 pos.row = pos.col = 0;
2652 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2653 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2654 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2655 || (check_more == 1 2695 || (check_more == 1
2656 && current_screen == selection.screen 2696 && current_screen == selection.screen
2657 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2658 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2659 || (check_more == 2
2660 && ROWCOL_IS_BEFORE (selection.beg, pos)
2661 && ROWCOL_IS_AFTER (selection.end, pos))
2662 || (check_more == 3
2663 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 4 /* screen width change */
2665 && (selection.beg.row != selection.end.row
2666 || selection.end.col > ncol)))
2667 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2700}
2701
2702void
2703rxvt_term::selection_changed () NOTHROW
2704{
2705 line_t &r1 = ROW (selection.beg.row);
2706 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2707 --selection.beg.col;
2708
2709 line_t &r2 = ROW (selection.end.row);
2710 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2711 ++selection.end.col;
2712
2713 want_refresh = 1;
2668} 2714}
2669 2715
2670/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2671/* 2717/*
2672 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
2673 */ 2719 */
2674void 2720void
2675rxvt_term::paste (char *data, unsigned int len) NOTHROW 2721rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2676{ 2722{
2677 /* convert normal newline chars into common keyboard Return key sequence */ 2723 /* convert normal newline chars into common keyboard Return key sequence */
2678 for (unsigned int i = 0; i < len; i++) 2724 for (unsigned int i = 0; i < len; i++)
2679 if (data[i] == C0_LF) 2725 if (data[i] == C0_LF)
2680 data[i] = C0_CR; 2726 data[i] = C0_CR;
2681 2727
2682 if (priv_modes & PrivMode_BracketPaste) 2728 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~"); 2729 tt_printf ("\x1b[200~");
2684 2730
2685 tt_write (data, len); 2731 tt_write (data, len);
2686 2732
2687 if (priv_modes & PrivMode_BracketPaste) 2733 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~"); 2734 tt_printf ("\x1b[201~");
2689} 2735}
2690 2736
2691/* ------------------------------------------------------------------------- */
2692/*
2693 * Respond to a notification that a primary selection has been sent
2694 * EXT: SelectionNotify
2695 */
2696void 2737void
2697rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2738rxvt_term::paste (char *data, unsigned int len) NOTHROW
2698{ 2739{
2699 if (prop == None) /* check for failed XConvertSelection */ 2740 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2700 {
2701 if ((selection_type & Sel_CompoundText))
2702 {
2703 int selnum = selection_type & Sel_whereMask;
2704
2705 selection_type = 0;
2706 if (selnum != Sel_direct)
2707 selection_request_other (XA_STRING, selnum);
2708 }
2709
2710 if ((selection_type & Sel_UTF8String))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = Sel_CompoundText;
2715 if (selnum != Sel_direct)
2716 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2717 else
2718 selection_type = 0;
2719 }
2720
2721 return;
2722 }
2723
2724 unsigned long bytes_after;
2725 XTextProperty ct;
2726
2727 if (XGetWindowProperty (dpy, win, prop,
2728 0, PROP_SIZE / 4,
2729 delete_prop, AnyPropertyType,
2730 &ct.encoding, &ct.format,
2731 &ct.nitems, &bytes_after,
2732 &ct.value) != Success)
2733 {
2734 ct.value = 0;
2735 goto bailout;
2736 }
2737
2738 if (ct.encoding == None)
2739 goto bailout;
2740
2741 if (bytes_after)
2742 {
2743 // fetch and append remaining data
2744 XTextProperty ct2;
2745
2746 if (XGetWindowProperty (dpy, win, prop,
2747 ct.nitems / 4, (bytes_after + 3) / 4,
2748 delete_prop, AnyPropertyType,
2749 &ct2.encoding, &ct2.format,
2750 &ct2.nitems, &bytes_after,
2751 &ct2.value) != Success)
2752 goto bailout;
2753
2754 // realloc should be compatible to XFree, here, and elsewhere, too
2755 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2756 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2757 ct.nitems += ct2.nitems;
2758
2759 XFree (ct2.value);
2760 }
2761
2762 if (ct.value == 0)
2763 goto bailout;
2764
2765 if (ct.encoding == xa[XA_INCR])
2766 {
2767 // INCR selection, start handshake
2768 if (!delete_prop)
2769 XDeleteProperty (dpy, win, prop);
2770
2771 selection_wait = Sel_incr;
2772 incr_buf_fill = 0;
2773 incr_ev.start (10);
2774
2775 goto bailout;
2776 }
2777
2778 if (ct.nitems == 0)
2779 {
2780 if (selection_wait == Sel_incr)
2781 {
2782 XFree (ct.value);
2783
2784 // finally complete, now paste the whole thing
2785 selection_wait = Sel_normal;
2786 ct.value = (unsigned char *)incr_buf;
2787 ct.nitems = incr_buf_fill;
2788 incr_buf = 0;
2789 incr_buf_size = 0;
2790 incr_ev.stop ();
2791 }
2792 else
2793 {
2794 if (selection_wait == Sel_normal
2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2796 {
2797 /*
2798 * pass through again trying CUT_BUFFER0 if we've come from
2799 * XConvertSelection () but nothing was presented
2800 */
2801 selection_paste (display->root, XA_CUT_BUFFER0, False);
2802 }
2803
2804 goto bailout;
2805 }
2806 }
2807 else if (selection_wait == Sel_incr)
2808 {
2809 incr_ev.start (10);
2810
2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2812 {
2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2815 }
2816
2817 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2818 incr_buf_fill += ct.nitems;
2819
2820 goto bailout;
2821 }
2822
2823 char **cl;
2824 int cr;
2825
2826#if !ENABLE_MINIMAL
2827 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2828 // so recode it manually
2829 if (ct.encoding == xa[XA_UTF8_STRING])
2830 {
2831 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2832 char *s = rxvt_wcstombs (w);
2833 free (w);
2834 // TODO: strlen == only the first element will be converted. well...
2835 paste (s, strlen (s));
2836 free (s);
2837 }
2838 else
2839#endif
2840 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2841 && cl)
2842 {
2843 for (int i = 0; i < cr; i++)
2844 paste (cl[i], strlen (cl[i]));
2845
2846 XFreeStringList (cl);
2847 }
2848 else
2849 paste ((char *)ct.value, ct.nitems); // paste raw
2850
2851bailout:
2852 XFree (ct.value);
2853
2854 if (selection_wait == Sel_normal)
2855 selection_wait = Sel_none;
2856}
2857
2858void
2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2860{
2861 selection_wait = Sel_none;
2862
2863 incr_buf_size = 0;
2864 free (incr_buf);
2865
2866 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2867}
2868
2869void
2870rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2871{
2872 if (prop == None || selection_wait != Sel_incr)
2873 return; 2741 return;
2874 2742
2875 selection_paste (win, prop, true); 2743 tt_paste (data, len);
2876} 2744}
2877 2745
2878/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2879/* 2747/*
2880 * Request the current selection: 2748 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2881 * Order: > internal selection if available 2749 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2750 * as fallback
2883 * > CUT_BUFFER0
2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2885 * will auto fallback to CUT_BUFFER0
2886 * EXT: button 2 release 2751 * EXT: button 2 release
2887 */ 2752 */
2888void 2753void
2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2754rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2890{ 2755{
2891 if (selection.text && selnum == Sel_Primary) 2756 if (!selection_req)
2892 {
2893 /* internal selection */
2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2895 paste (str, strlen (str));
2896 free (str);
2897 return;
2898 } 2757 {
2899 else 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2759 selection_req->run ();
2900 { 2760 }
2901 selection_request_time = tm;
2902 selection_wait = Sel_normal;
2903
2904#if X_HAVE_UTF8_STRING
2905 selection_type = Sel_UTF8String;
2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2907 return;
2908#else
2909 selection_type = Sel_CompoundText;
2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2911 return;
2912#endif
2913 }
2914
2915 selection_wait = Sel_none; /* don't loop in selection_paste () */
2916 selection_paste (display->root, XA_CUT_BUFFER0, false);
2917}
2918
2919int
2920rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2921{
2922 Atom sel;
2923
2924 selection_type |= selnum;
2925
2926 if (selnum == Sel_Primary)
2927 sel = XA_PRIMARY;
2928 else if (selnum == Sel_Secondary)
2929 sel = XA_SECONDARY;
2930 else
2931 sel = xa[XA_CLIPBOARD];
2932
2933 if (XGetSelectionOwner (dpy, sel) != None)
2934 {
2935 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2936 vt, selection_request_time);
2937 return 1;
2938 }
2939
2940 return 0;
2941} 2761}
2942 2762
2943/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2944/* 2764/*
2945 * Clear all selected text 2765 * Clear all selected text
2946 * EXT: SelectionClear 2766 * EXT: SelectionClear
2947 */ 2767 */
2948void 2768void
2949rxvt_term::selection_clear () NOTHROW 2769rxvt_term::selection_clear (bool clipboard) NOTHROW
2950{ 2770{
2771 if (!clipboard)
2772 {
2951 want_refresh = 1; 2773 want_refresh = 1;
2952 free (selection.text); 2774 free (selection.text);
2953 selection.text = NULL; 2775 selection.text = NULL;
2954 selection.len = 0; 2776 selection.len = 0;
2955 CLEAR_SELECTION (); 2777 CLEAR_SELECTION ();
2956 2778
2957 if (display->selection_owner == this) 2779 if (display->selection_owner == this)
2958 display->selection_owner = 0; 2780 display->selection_owner = 0;
2781 }
2782 else
2783 {
2784 free (selection.clip_text);
2785 selection.clip_text = NULL;
2786 selection.clip_len = 0;
2787
2788 if (display->clipboard_owner == this)
2789 display->clipboard_owner = 0;
2790 }
2959} 2791}
2960 2792
2961/* ------------------------------------------------------------------------- */ 2793/* ------------------------------------------------------------------------- */
2962/* 2794/*
2963 * Copy a selection into the cut buffer 2795 * Copy a selection into the cut buffer
2964 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2965 */ 2797 */
2966void 2798void
2967rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
2968{ 2800{
2969 int i; 2801 int size;
2970 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
2971 text_t *t; 2803 text_t *t;
2972 2804
2973 switch (selection.op) 2805 switch (selection.op)
2974 { 2806 {
… …
2990 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
2991 2823
2992 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2993 return; 2825 return;
2994 2826
2995 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2996 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2997 2829
2998 int ofs = 0; 2830 int ofs = 0;
2999 int extra = 0; 2831 int extra = 0;
3000 2832
3001 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
3007 { 2839 {
3008#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
3009 if (selection.rect) 2841 if (selection.rect)
3010 { 2842 {
3011 col = selection.beg.col; 2843 col = selection.beg.col;
3012 end_col = ncol + 1; 2844 end_col = selection.end.col;
3013 } 2845 }
3014 else 2846 else
3015#endif 2847#endif
3016 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
3017 2849
3018 col = max (col, 0); 2850 col = max (col, 0);
3019 2851
3020 if (row == selection.end.row 2852 if (row == selection.end.row)
3021#if !ENABLE_MINIMAL
3022 || selection.rect
3023#endif
3024 )
3025 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
3026 2854
3027 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
3028 2856
3029 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3037 2865
3038 extra -= (len - 1); 2866 extra -= (len - 1);
3039 2867
3040 if (extra < 0) 2868 if (extra < 0)
3041 { 2869 {
3042 extra += i; 2870 extra += size;
3043 i += i; 2871 size += size;
3044 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3045 } 2873 }
3046 2874
3047 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3048 } 2876 }
3049#endif 2877#endif
… …
3061 2889
3062 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3063 } 2891 }
3064 else 2892 else
3065#endif 2893#endif
3066 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3067 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3068 } 2898 }
3069
3070 if (end_col != selection.end.col)
3071 new_selection_text[ofs++] = C0_LF;
3072 2899
3073 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3074 2901
3075 if (ofs == 0) 2902 if (ofs == 0)
3076 { 2903 {
… …
3089 2916
3090 selection_grab (tm); 2917 selection_grab (tm);
3091} 2918}
3092 2919
3093bool 2920bool
3094rxvt_term::selection_grab (Time tm) NOTHROW 2921rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3095{ 2922{
2923 Atom sel;
2924
2925 if (!clipboard)
2926 {
3096 selection_time = tm; 2927 selection_time = tm;
2928 sel = XA_PRIMARY;
2929 }
2930 else
2931 {
2932 clipboard_time = tm;
2933 sel = xa[XA_CLIPBOARD];
2934 }
3097 2935
3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2936 XSetSelectionOwner (dpy, sel, vt, tm);
3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2937 if (XGetSelectionOwner (dpy, sel) == vt)
3100 { 2938 {
3101 display->set_selection_owner (this); 2939 display->set_selection_owner (this, clipboard);
3102 return true; 2940 return true;
3103 } 2941 }
3104 else 2942 else
3105 { 2943 {
3106 selection_clear (); 2944 selection_clear (clipboard);
3107 return false; 2945 return false;
3108 } 2946 }
3109 2947
3110#if 0 2948#if 0
3111 XTextProperty ct; 2949 XTextProperty ct;
… …
3121/* ------------------------------------------------------------------------- */ 2959/* ------------------------------------------------------------------------- */
3122/* 2960/*
3123 * Mark or select text based upon number of clicks: 1, 2, or 3 2961 * Mark or select text based upon number of clicks: 1, 2, or 3
3124 * EXT: button 1 press 2962 * EXT: button 1 press
3125 */ 2963 */
3126void 2964void ecb_cold
3127rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2965rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3128{ 2966{
3129 clicks = ((clicks - 1) % 3) + 1; 2967 clicks = ((clicks - 1) % 3) + 1;
3130 selection.clicks = clicks; /* save clicks so extend will work */ 2968 selection.clicks = clicks; /* save clicks so extend will work */
3131 2969
… …
3150 2988
3151/* ------------------------------------------------------------------------- */ 2989/* ------------------------------------------------------------------------- */
3152/* 2990/*
3153 * Mark a selection at the specified col/row 2991 * Mark a selection at the specified col/row
3154 */ 2992 */
3155void 2993void ecb_cold
3156rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2994rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3157{ 2995{
3158 want_refresh = 1; 2996 want_refresh = 1;
3159 2997
3160 selection.mark.row = row + view_start; 2998 selection.mark.row = row + view_start;
… …
3183 * Word select: select text for 2 clicks 3021 * Word select: select text for 2 clicks
3184 * We now only find out the boundary in one direction 3022 * We now only find out the boundary in one direction
3185 */ 3023 */
3186 3024
3187/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3025/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3188#define DELIMIT_TEXT(x) \ 3026#define DELIMIT_TEXT(x) \
3189 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3027 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3190#define DELIMIT_REND(x) 1 3028#define DELIMIT_REND(x) 1
3191 3029
3192void 3030void ecb_cold
3193rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3031rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3194{ 3032{
3195 int col, row, dirnadd, tcol, trow, w1, w2; 3033 int col, row, dirnadd, tcol, trow, w1, w2;
3196 row_col_t bound; 3034 row_col_t bound;
3197 text_t *stp; 3035 text_t *stp;
… …
3271 * EXT: button 3 press; button 1 or 3 drag 3109 * EXT: button 3 press; button 1 or 3 drag
3272 * flag == 0 ==> button 1 3110 * flag == 0 ==> button 1
3273 * flag == 1 ==> button 3 press 3111 * flag == 1 ==> button 3 press
3274 * flag == 2 ==> button 3 motion 3112 * flag == 2 ==> button 3 motion
3275 */ 3113 */
3276void 3114void ecb_cold
3277rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3115rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3278{ 3116{
3279 int col = clamp (Pixel2Col (x), 0, ncol); 3117 int col = clamp (Pixel2Col (x), 0, ncol);
3280 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3118 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3281 3119
… …
3307 3145
3308/* ------------------------------------------------------------------------- */ 3146/* ------------------------------------------------------------------------- */
3309/* 3147/*
3310 * Extend the selection to the specified col/row 3148 * Extend the selection to the specified col/row
3311 */ 3149 */
3312void 3150void ecb_cold
3313rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3151rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3314{ 3152{
3315 row_col_t pos; 3153 row_col_t pos;
3316 enum { 3154 enum {
3317 LEFT, RIGHT 3155 LEFT, RIGHT
3318 } closeto = RIGHT; 3156 } closeto = RIGHT;
3319
3320 want_refresh = 1;
3321 3157
3322 switch (selection.op) 3158 switch (selection.op)
3323 { 3159 {
3324 case SELECTION_INIT: 3160 case SELECTION_INIT:
3325 CLEAR_SELECTION (); 3161 CLEAR_SELECTION ();
… …
3505 3341
3506#if !ENABLE_MINIMAL 3342#if !ENABLE_MINIMAL
3507 if (selection.rect && selection.beg.col > selection.end.col) 3343 if (selection.rect && selection.beg.col > selection.end.col)
3508 ::swap (selection.beg.col, selection.end.col); 3344 ::swap (selection.beg.col, selection.end.col);
3509#endif 3345#endif
3346
3347 selection_changed ();
3510} 3348}
3511 3349
3512#if !ENABLE_MINIMAL 3350#if !ENABLE_MINIMAL
3513void 3351void ecb_cold
3514rxvt_term::selection_remove_trailing_spaces () NOTHROW 3352rxvt_term::selection_remove_trailing_spaces () NOTHROW
3515{ 3353{
3516 int32_t end_col, end_row; 3354 int32_t end_col, end_row;
3517 text_t *stp; 3355 text_t *stp;
3518 3356
… …
3556/* ------------------------------------------------------------------------- */ 3394/* ------------------------------------------------------------------------- */
3557/* 3395/*
3558 * Double click on button 3 when already selected 3396 * Double click on button 3 when already selected
3559 * EXT: button 3 double click 3397 * EXT: button 3 double click
3560 */ 3398 */
3561void 3399void ecb_cold
3562rxvt_term::selection_rotate (int x, int y) NOTHROW 3400rxvt_term::selection_rotate (int x, int y) NOTHROW
3563{ 3401{
3564 selection.clicks = selection.clicks % 3 + 1; 3402 selection.clicks = selection.clicks % 3 + 1;
3565 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3403 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3566} 3404}
… …
3568/* ------------------------------------------------------------------------- */ 3406/* ------------------------------------------------------------------------- */
3569/* 3407/*
3570 * Respond to a request for our current selection 3408 * Respond to a request for our current selection
3571 * EXT: SelectionRequest 3409 * EXT: SelectionRequest
3572 */ 3410 */
3573void 3411void ecb_cold
3574rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3575{ 3413{
3414 Atom property = rq.property == None ? rq.target : rq.property;
3576 XSelectionEvent ev; 3415 XSelectionEvent ev;
3577 3416
3578 ev.type = SelectionNotify; 3417 ev.type = SelectionNotify;
3579 ev.property = None; 3418 ev.property = None;
3580 ev.display = rq.display; 3419 ev.display = rq.display;
… …
3595 *target++ = xa[XA_COMPOUND_TEXT]; 3434 *target++ = xa[XA_COMPOUND_TEXT];
3596#if X_HAVE_UTF8_STRING 3435#if X_HAVE_UTF8_STRING
3597 *target++ = xa[XA_UTF8_STRING]; 3436 *target++ = xa[XA_UTF8_STRING];
3598#endif 3437#endif
3599 3438
3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3439 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3601 32, PropModeReplace, 3440 32, PropModeReplace,
3602 (unsigned char *)target_list, target - target_list); 3441 (unsigned char *)target_list, target - target_list);
3603 ev.property = rq.property; 3442 ev.property = property;
3604 } 3443 }
3605#if TODO // TODO 3444#if TODO // TODO
3606 else if (rq.target == xa[XA_MULTIPLE]) 3445 else if (rq.target == xa[XA_MULTIPLE])
3607 { 3446 {
3608 /* TODO: Handle MULTIPLE */ 3447 /* TODO: Handle MULTIPLE */
3609 } 3448 }
3610#endif 3449#endif
3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3612 { 3451 {
3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3614 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3453 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3615 ev.property = rq.property; 3454 ev.property = property;
3455 }
3456 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3457 {
3458 XChangeProperty (dpy, rq.requestor, property, rq.target,
3459 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3460 ev.property = property;
3616 } 3461 }
3617 else if (rq.target == XA_STRING 3462 else if (rq.target == XA_STRING
3618 || rq.target == xa[XA_TEXT] 3463 || rq.target == xa[XA_TEXT]
3619 || rq.target == xa[XA_COMPOUND_TEXT] 3464 || rq.target == xa[XA_COMPOUND_TEXT]
3620 || rq.target == xa[XA_UTF8_STRING] 3465 || rq.target == xa[XA_UTF8_STRING]
… …
3652 { 3497 {
3653 target = xa[XA_COMPOUND_TEXT]; 3498 target = xa[XA_COMPOUND_TEXT];
3654 style = enc_compound_text; 3499 style = enc_compound_text;
3655 } 3500 }
3656 3501
3657 if (selection.text) 3502 if (rq.selection == XA_PRIMARY && selection.text)
3658 { 3503 {
3659 cl = selection.text; 3504 cl = selection.text;
3660 selectlen = selection.len; 3505 selectlen = selection.len;
3506 }
3507 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3508 {
3509 cl = selection.clip_text;
3510 selectlen = selection.clip_len;
3661 } 3511 }
3662 else 3512 else
3663 { 3513 {
3664 cl = L""; 3514 cl = L"";
3665 selectlen = 0; 3515 selectlen = 0;
… …
3686 ct.value = (unsigned char *)cl; 3536 ct.value = (unsigned char *)cl;
3687 ct.nitems = selectlen; 3537 ct.nitems = selectlen;
3688 ct.encoding = target; 3538 ct.encoding = target;
3689 } 3539 }
3690 3540
3691 XChangeProperty (dpy, rq.requestor, rq.property, 3541 XChangeProperty (dpy, rq.requestor, property,
3692 ct.encoding, 8, PropModeReplace, 3542 ct.encoding, 8, PropModeReplace,
3693 ct.value, (int)ct.nitems); 3543 ct.value, (int)ct.nitems);
3694 ev.property = rq.property; 3544 ev.property = property;
3695 3545
3696 if (freect) 3546 if (freect)
3697 XFree (ct.value); 3547 XFree (ct.value);
3698 } 3548 }
3699 3549
3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3550 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3701} 3551}
3702 3552
3703/* ------------------------------------------------------------------------- */ 3553/* ------------------------------------------------------------------------- */
3704#ifdef USE_XIM 3554#if USE_XIM
3705void 3555void ecb_cold
3706rxvt_term::im_set_position (XPoint &pos) NOTHROW 3556rxvt_term::im_set_position (XPoint &pos) NOTHROW
3707{ 3557{
3708 XWindowAttributes xwa; 3558 XWindowAttributes xwa;
3709 3559
3710 XGetWindowAttributes (dpy, vt, &xwa); 3560 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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