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

Diff Legend

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