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.422 by root, Thu Jun 28 15:19:15 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
163 view_start = 0; 200 view_start = 0;
164 num_scr = 0; 201 num_scr = 0;
165 202
166 if (ncol == 0) 203 if (ncol == 0)
167 ncol = 80; 204 ncol = 80;
… …
187 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
188 225
189 screen.tscroll = 0; 226 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
191 228
229 void *prev_chunk = chunk;
230 line_t *prev_drawn_buf = drawn_buf;
231 line_t *prev_swap_buf = swap_buf;
232 line_t *prev_row_buf = row_buf;
233
234 int common_col = min (prev_ncol, ncol);
235
236 scr_alloc ();
237
192 if (!row_buf) 238 if (!prev_row_buf)
193 { 239 {
194 /* 240 /*
195 * first time called so just malloc everything: don't rely on realloc 241 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
196 */ 242 */
197 top_row = 0; 243 top_row = 0;
198 term_start = 0; 244 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 245
214 memset (charsets, 'B', sizeof (charsets)); 246 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 247 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 248 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 249 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 263 selection.text = NULL;
232 selection.len = 0; 264 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 265 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 266 selection.screen = PRIMARY;
235 selection.clicks = 0; 267 selection.clicks = 0;
268 selection.clip_text = NULL;
269 selection.clip_len = 0;
236 } 270 }
237 else 271 else
238 { 272 {
239 /* 273 /*
240 * add or delete rows as appropriate 274 * add or delete rows as appropriate
241 */ 275 */
242 276
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--; ) 277 for (int row = min (nrow, prev_nrow); row--; )
261 { 278 {
262 lresize (drawn_buf[row]); 279 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 280 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
264 }
265 281
266 for (int row = prev_nrow; row < nrow; row++) 282 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
283 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
284 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
267 { 286 }
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 287
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 288 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 289 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 290 int q = total_rows; // rewrapped row
278 291
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 299 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 300
288 do 301 do
289 { 302 {
290 p = MOD (p - 1, prev_total_rows); 303 p = MOD (p - 1, prev_total_rows);
291 assert (old_buf [MOD (p, prev_total_rows)].t); 304 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
292 int plines = 1; 305 int plines = 1;
293 int llen = old_buf [MOD (p, prev_total_rows)].l; 306 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
294 307
295 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 308 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
296 { 309 {
297 p = MOD (p - 1, prev_total_rows); 310 p = MOD (p - 1, prev_total_rows);
298 311
299 plines++; 312 plines++;
300 llen += prev_ncol; 313 llen += prev_ncol;
… …
313 326
314 // re-assemble the full line by destination lines 327 // re-assemble the full line by destination lines
315 for (int qrow = q; qlines--; qrow++) 328 for (int qrow = q; qlines--; qrow++)
316 { 329 {
317 qline = row_buf + qrow; 330 qline = row_buf + qrow;
318 lalloc (*qline); 331 qline->alloc (); // redundant with next line
319 qline->l = ncol; 332 qline->l = ncol;
320 qline->is_longer (1); 333 qline->is_longer (1);
321 334
322 int qcol = 0; 335 int qcol = 0;
323 336
… …
338 // this seems to upset applications/shells/readline 351 // this seems to upset applications/shells/readline
339 // least. 352 // least.
340 if (prow == ocur.row) 353 if (prow == ocur.row)
341 screen.cur.row = q - (total_rows - nrow); 354 screen.cur.row = q - (total_rows - nrow);
342 355
343 line_t &pline = old_buf [prow]; 356 line_t &pline = prev_row_buf [prow];
344 357
345 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 358 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
346 359
347 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 360 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
348 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 361 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
369 { 382 {
370 // if no scrollback exists (yet), wing, instead of wrap 383 // if no scrollback exists (yet), wing, instead of wrap
371 384
372 for (int row = min (nrow, prev_nrow); row--; ) 385 for (int row = min (nrow, prev_nrow); row--; )
373 { 386 {
374 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 387 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
375 line_t &qline = row_buf [row]; 388 line_t &dst = row_buf [row];
376 389
377 qline = pline; 390 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
378 lresize (qline); 391
392 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
393 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
379 } 394 }
380 395
381 for (int row = prev_nrow; row < nrow; row++) 396 for (int row = prev_nrow; row < nrow; row++)
382 {
383 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 397 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
384 }
385 398
386 term_start = 0; 399 term_start = 0;
387 } 400 }
388
389 free (old_buf);
390 delete old_ta;
391 delete old_ra;
392 401
393 clamp_it (screen.cur.row, 0, nrow - 1); 402 clamp_it (screen.cur.row, 0, nrow - 1);
394 clamp_it (screen.cur.col, 0, ncol - 1); 403 clamp_it (screen.cur.col, 0, ncol - 1);
395 } 404 }
396 405
406 for (int row = nrow; row--; )
407 {
408 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
409 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
410 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
411 }
412
413 free (prev_chunk);
414
397 free (tabs); 415 free (tabs);
398 tabs = (char *)rxvt_malloc (ncol); 416 tabs = (char *)rxvt_malloc (ncol);
399 417
400 for (int col = ncol; --col; ) 418 for (int col = ncol; col--; )
401 tabs [col] = col % TABSIZE == 0; 419 tabs [col] = col % TABSIZE == 0;
402 420
403 CLEAR_ALL_SELECTION (); 421 CLEAR_ALL_SELECTION ();
404 422
405 prev_nrow = nrow; 423 prev_nrow = nrow;
… …
408 tt_winch (); 426 tt_winch ();
409 427
410 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 428 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
411} 429}
412 430
413/* ------------------------------------------------------------------------- */ 431void ecb_cold
414/*
415 * Free everything. That way malloc debugging can find leakage.
416 */
417void
418rxvt_term::scr_release () NOTHROW 432rxvt_term::scr_release () NOTHROW
419{ 433{
420 if (row_buf) 434 chunk_free (chunk, chunk_size);
421 { 435 chunk = 0;
422 delete talloc; talloc = 0; 436 row_buf = 0;
423 delete ralloc; ralloc = 0;
424 437
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); 438 free (tabs);
431 tabs = 0; 439 tabs = 0;
432 }
433} 440}
434 441
435/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
436/* 443/*
437 * Hard/Soft reset 444 * Hard/Soft reset
438 */ 445 */
439void 446void ecb_cold
440rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
441{ 448{
442 scr_release (); 449 scr_release ();
450
443 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
444 rvideo_mode = false; 452 rvideo_mode = false;
445 scr_soft_reset (); 453 scr_soft_reset ();
446 scr_reset (); 454 scr_reset ();
447 455
448 scr_clear (true); 456 scr_clear (true);
449 scr_refresh (); 457 scr_refresh ();
450} 458}
451 459
452void 460void ecb_cold
453rxvt_term::scr_soft_reset () 461rxvt_term::scr_soft_reset () NOTHROW
454{ 462{
455 /* only affects modes, nothing drastic such as clearing the screen */ 463 /* only affects modes, nothing drastic such as clearing the screen */
456#if ENABLE_OVERLAY 464#if ENABLE_OVERLAY
457 scr_overlay_off (); 465 scr_overlay_off ();
458#endif 466#endif
… …
513 assert (s->cur.row >= 0); 521 assert (s->cur.row >= 0);
514 assert (s->cur.col >= 0); 522 assert (s->cur.col >= 0);
515} 523}
516 524
517void 525void
518rxvt_term::scr_swap_screen () 526rxvt_term::scr_swap_screen () NOTHROW
519{ 527{
520 if (!option (Opt_secondaryScreen)) 528 if (!option (Opt_secondaryScreen))
521 return; 529 return;
522 530
523 for (int i = prev_nrow; i--; ) 531 for (int i = prev_nrow; i--; )
… …
542 return; 550 return;
543 551
544 want_refresh = 1; 552 want_refresh = 1;
545 view_start = 0; 553 view_start = 0;
546 554
547 selection_check (2); /* check for boundary cross */ 555 /* check for boundary cross */
556 row_col_t pos;
557 pos.row = pos.col = 0;
558 if (ROWCOL_IS_BEFORE (selection.beg, pos)
559 && ROWCOL_IS_AFTER (selection.end, pos))
560 CLEAR_SELECTION ();
548 561
549 int i = current_screen; current_screen = scrn; scrn = i; 562 current_screen = scrn;
550 563
551#if NSCREENS 564#if NSCREENS
552 if (option (Opt_secondaryScreen)) 565 if (option (Opt_secondaryScreen))
553 { 566 {
554 num_scr = 0; 567 num_scr = 0;
… …
618/* 631/*
619 * Scroll text between <row1> and <row2> inclusive, by <count> lines 632 * Scroll text between <row1> and <row2> inclusive, by <count> lines
620 * count positive ==> scroll up 633 * count positive ==> scroll up
621 * count negative ==> scroll down 634 * count negative ==> scroll down
622 */ 635 */
623int 636int ecb_hot
624rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 637rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
625{ 638{
626 if (count == 0 || (row1 > row2)) 639 if (count == 0 || (row1 > row2))
627 return 0; 640 return 0;
628 641
… …
631 644
632 if (count > 0 645 if (count > 0
633 && row1 == 0 646 && row1 == 0
634 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 647 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
635 { 648 {
649 min_it (count, total_rows - (nrow - (row2 + 1)));
650
636 top_row = max (top_row - count, -saveLines); 651 top_row = max (top_row - count, -saveLines);
637
638 // scroll everything up 'count' lines
639 term_start = (term_start + count) % total_rows;
640 652
641 // sever bottommost line 653 // sever bottommost line
642 { 654 {
643 line_t &l = ROW(row2 - count); 655 line_t &l = ROW(row2);
644 l.is_longer (0); 656 l.is_longer (0);
645 l.touch (); 657 l.touch ();
646 } 658 }
647 659
660 // scroll everything up 'count' lines
661 term_start = (term_start + count) % total_rows;
662
663 // now copy lines below the scroll region bottom to the
664 // bottom of the screen again, so they look as if they
665 // hadn't moved.
666 for (int i = nrow; --i > row2; )
667 {
668 line_t &l1 = ROW(i - count);
669 line_t &l2 = ROW(i);
670
671 ::swap (l1, l2);
672 l2.touch ();
673 }
674
648 // erase newly scrolled-in lines 675 // erase newly scrolled-in lines
649 for (int i = count; i--; ) 676 for (int i = count; i--; )
650 { 677 {
651 line_t &l = ROW(nrow - 1 - i); 678 line_t &l = ROW(row2 - i);
652 679
653 // optimize if already cleared, can be significant on slow machines 680 // optimise if already cleared, can be significant on slow machines
654 // could be rolled into scr_blank_screen_mem 681 // 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))) 682 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
656 { 683 {
657 scr_blank_line (l, 0, l.l, rstyle); 684 scr_blank_line (l, 0, l.l, rstyle);
658 l.l = 0; 685 l.l = 0;
… …
660 } 687 }
661 else 688 else
662 scr_blank_screen_mem (l, rstyle); 689 scr_blank_screen_mem (l, rstyle);
663 } 690 }
664 691
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 692 // move and/or clear selection, if any
678 if (selection.op && current_screen == selection.screen) 693 if (selection.op && current_screen == selection.screen
694 && selection.beg.row <= row2)
679 { 695 {
680 selection.beg.row -= count; 696 selection.beg.row -= count;
681 selection.end.row -= count; 697 selection.end.row -= count;
682 selection.mark.row -= count; 698 selection.mark.row -= count;
683 699
684 if (selection.beg.row < top_row 700 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 } 701 }
692 702
693 // finally move the view window, if desired 703 // finally move the view window, if desired
694 if (option (Opt_scrollWithBuffer) 704 if (option (Opt_scrollWithBuffer)
695 && view_start != 0 705 && view_start != 0
… …
725 } 735 }
726 736
727 // use a simple and robust scrolling algorithm, this 737 // use a simple and robust scrolling algorithm, this
728 // part of scr_scroll_text is not time-critical. 738 // part of scr_scroll_text is not time-critical.
729 739
740 // sever line above scroll region
741 if (row1)
742 {
743 line_t &l = ROW(row1 - 1);
744 l.is_longer (0);
745 l.touch ();
746 }
747
730 int rows = row2 - row1 + 1; 748 int rows = row2 - row1 + 1;
731 749
732 min_it (count, rows); 750 min_it (count, rows);
733 751
734 line_t *temp_buf = row_buf + total_rows; 752 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
735 753
736 for (int row = 0; row < rows; row++) 754 for (int row = 0; row < rows; row++)
737 { 755 {
738 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 756 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
739 757
… …
741 scr_blank_screen_mem (temp_buf [row], rstyle); 759 scr_blank_screen_mem (temp_buf [row], rstyle);
742 } 760 }
743 761
744 for (int row = 0; row < rows; row++) 762 for (int row = 0; row < rows; row++)
745 ROW(row1 + row) = temp_buf [row]; 763 ROW(row1 + row) = temp_buf [row];
764
765 // sever bottommost line
766 {
767 line_t &l = ROW(row2);
768 l.is_longer (0);
769 l.touch ();
770 }
746 } 771 }
747 772
748 return count; 773 return count;
749} 774}
750 775
751/* ------------------------------------------------------------------------- */ 776/* ------------------------------------------------------------------------- */
752/* 777/*
753 * Add text given in <str> of length <len> to screen struct 778 * Add text given in <str> of length <len> to screen struct
754 */ 779 */
755void 780void ecb_hot
756rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 781rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
757{ 782{
758 if (len <= 0) /* sanity */ 783 if (len <= 0) /* sanity */
759 return; 784 return;
760 785
761 unsigned char checksel; 786 bool checksel;
762 unicode_t c; 787 unicode_t c;
763 int ncol = this->ncol; 788 int ncol = this->ncol;
764 const wchar_t *strend = str + len; 789 const wchar_t *strend = str + len;
765 790
766 want_refresh = 1; 791 want_refresh = 1;
… …
792 817
793 while (str < strend) 818 while (str < strend)
794 { 819 {
795 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 820 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
796 821
797 if (expect_false (c < 0x20)) 822 if (ecb_unlikely (c < 0x20))
798 if (c == C0_LF) 823 if (c == C0_LF)
799 { 824 {
800 max_it (line->l, screen.cur.col); 825 max_it (line->l, screen.cur.col);
801 826
802 screen.flags &= ~Screen_WrapNext; 827 screen.flags &= ~Screen_WrapNext;
… …
821 { 846 {
822 scr_tab (1, true); 847 scr_tab (1, true);
823 continue; 848 continue;
824 } 849 }
825 850
826 if (expect_false ( 851 if (ecb_unlikely (
827 checksel /* see if we're writing within selection */ 852 checksel /* see if we're writing within selection */
828 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 853 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
829 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 854 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
830 )) 855 ))
831 { 856 {
… …
836 * should be a similar check. 861 * should be a similar check.
837 */ 862 */
838 CLEAR_SELECTION (); 863 CLEAR_SELECTION ();
839 } 864 }
840 865
841 if (expect_false (screen.flags & Screen_WrapNext)) 866 if (ecb_unlikely (screen.flags & Screen_WrapNext))
842 { 867 {
843 scr_do_wrap (); 868 scr_do_wrap ();
844 869
845 line->l = ncol; 870 line->l = ncol;
846 line->is_longer (1); 871 line->is_longer (1);
… …
848 row = screen.cur.row; 873 row = screen.cur.row;
849 line = &ROW(row); /* _must_ refresh */ 874 line = &ROW(row); /* _must_ refresh */
850 } 875 }
851 876
852 // some utf-8 decoders "decode" surrogate characters: let's fix this. 877 // some utf-8 decoders "decode" surrogate characters: let's fix this.
853 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 878 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
854 c = 0xfffd; 879 c = 0xfffd;
855 880
856 // rely on wcwidth to tell us the character width, do wcwidth before 881 // rely on wcwidth to tell us the character width, do wcwidth before
857 // further replacements, as wcwidth might return -1 for the line 882 // further replacements, as wcwidth might return -1 for the line
858 // drawing characters below as they might be invalid in the current 883 // drawing characters below as they might be invalid in the current
859 // locale. 884 // locale.
860 int width = WCWIDTH (c); 885 int width = WCWIDTH (c);
861 886
862 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 887 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
863 { 888 {
864 // vt100 special graphics and line drawing 889 // vt100 special graphics and line drawing
865 // 5f-7e standard vt100 890 // 5f-7e standard vt100
866 // 40-5e rxvt extension for extra curses acs chars 891 // 40-5e rxvt extension for extra curses acs chars
867 static uint16_t vt100_0[62] = { // 41 .. 7e 892 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
880 c = vt100_0[c - 0x41]; 905 c = vt100_0[c - 0x41];
881 width = 1; // vt100 line drawing characters are always single-width 906 width = 1; // vt100 line drawing characters are always single-width
882 } 907 }
883 } 908 }
884 909
885 if (expect_false (screen.flags & Screen_Insert)) 910 if (ecb_unlikely (screen.flags & Screen_Insert))
886 scr_insdel_chars (width, INSERT); 911 scr_insdel_chars (width, INSERT);
887 912
888 if (width != 0) 913 if (width != 0)
889 { 914 {
890#if !UNICODE_3 915#if !UNICODE_3
… …
895# else 920# else
896 c = 0xfffd; 921 c = 0xfffd;
897# endif 922# endif
898#endif 923#endif
899 924
925 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
926
927 // if the character doesn't fit into the remaining columns...
928 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
929 {
930 if (screen.flags & Screen_Autowrap)
931 {
932 // ... artificially enlargen the previous one
933 c = NOCHAR;
934 // and try the same character next loop iteration
935 --str;
936 }
937 else
938 screen.cur.col = ncol - width;
939 }
940
900 // nuke the character at this position, if required 941 // nuke the character at this position, if required
901 if (expect_false ( 942 // due to wonderful coincidences everywhere else in this loop
943 // we never have to check for overwriting a wide char itself,
944 // only its tail.
902 line->t[screen.cur.col] == NOCHAR 945 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); 946 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 947
919 line->touch (); 948 line->touch ();
920 949
921 do 950 do
922 { 951 {
923 line->t[screen.cur.col] = c; 952 line->t[screen.cur.col] = c;
924 line->r[screen.cur.col] = rend; 953 line->r[screen.cur.col] = rend;
925 954
926 if (expect_true (screen.cur.col < ncol - 1)) 955 if (ecb_likely (screen.cur.col < ncol - 1))
927 screen.cur.col++; 956 screen.cur.col++;
928 else 957 else
929 { 958 {
930 line->l = ncol; 959 line->l = ncol;
931 if (screen.flags & Screen_Autowrap) 960 if (screen.flags & Screen_Autowrap)
932 screen.flags |= Screen_WrapNext; 961 screen.flags |= Screen_WrapNext;
933 break; 962
963 goto end_of_line;
934 } 964 }
935 965
936 c = NOCHAR; 966 c = NOCHAR;
937 } 967 }
938 while (expect_false (--width > 0)); 968 while (ecb_unlikely (--width > 0));
939 969
940 // pad with spaces when overwriting wide character with smaller one 970 // pad with spaces when overwriting wide character with smaller one
941 if (expect_false (!width)) 971 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
942 { 972 {
943 line->touch ();
944
945 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
946 {
947 line->t[c] = ' '; 973 line->t[c] = ' ';
948 line->r[c] = rend; 974 line->r[c] = rend;
949 }
950 } 975 }
976
977end_of_line:
978 ;
951 } 979 }
952#if ENABLE_COMBINING 980#if ENABLE_COMBINING
953 else // width == 0 981 else // width == 0
954 { 982 {
955 if (c != 0xfeff) // ignore BOM 983 if (c != 0xfeff) // ignore BOM
… …
1018 1046
1019 want_refresh = 1; 1047 want_refresh = 1;
1020#endif 1048#endif
1021 } 1049 }
1022 } 1050 }
1051 else if (screen.flags & Screen_WrapNext)
1052 screen.flags &= ~Screen_WrapNext;
1023 else 1053 else
1024 scr_gotorc (0, -1, RELATIVE); 1054 scr_gotorc (0, -1, RELATIVE);
1025} 1055}
1026 1056
1027/* ------------------------------------------------------------------------- */ 1057/* ------------------------------------------------------------------------- */
… …
1105 * XTERM_SEQ: ESC 6 1135 * XTERM_SEQ: ESC 6
1106 * Move cursor left in row. If we're at the left boundary, shift everything 1136 * Move cursor left in row. If we're at the left boundary, shift everything
1107 * in that row right. Clear left column. 1137 * in that row right. Clear left column.
1108 */ 1138 */
1109#if !ENABLE_MINIMAL 1139#if !ENABLE_MINIMAL
1110void 1140void ecb_cold
1111rxvt_term::scr_backindex () NOTHROW 1141rxvt_term::scr_backindex () NOTHROW
1112{ 1142{
1113 if (screen.cur.col > 0) 1143 if (screen.cur.col > 0)
1114 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1144 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1115 else 1145 else
… …
1122 * XTERM_SEQ: ESC 9 1152 * XTERM_SEQ: ESC 9
1123 * Move cursor right in row. If we're at the right boundary, shift everything 1153 * Move cursor right in row. If we're at the right boundary, shift everything
1124 * in that row left. Clear right column. 1154 * in that row left. Clear right column.
1125 */ 1155 */
1126#if !ENABLE_MINIMAL 1156#if !ENABLE_MINIMAL
1127void 1157void ecb_cold
1128rxvt_term::scr_forwardindex () NOTHROW 1158rxvt_term::scr_forwardindex () NOTHROW
1129{ 1159{
1130 if (screen.cur.col < ncol - 1) 1160 if (screen.cur.col < ncol - 1)
1131 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1161 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1132 else 1162 else
… …
1283 scr_blank_line (line, col, num, rstyle); 1313 scr_blank_line (line, col, num, rstyle);
1284} 1314}
1285 1315
1286/* ------------------------------------------------------------------------- */ 1316/* ------------------------------------------------------------------------- */
1287/* 1317/*
1288 * Erase part of whole of the screen 1318 * Erase part or whole of the screen
1289 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1319 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1290 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1320 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1291 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1321 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1292 */ 1322 */
1293void 1323void
… …
1302 ZERO_SCROLLBACK (); 1332 ZERO_SCROLLBACK ();
1303 1333
1304 switch (mode) 1334 switch (mode)
1305 { 1335 {
1306 case 0: /* erase to end of screen */ 1336 case 0: /* erase to end of screen */
1307 selection_check (1);
1308 scr_erase_line (0); 1337 scr_erase_line (0);
1309 row = screen.cur.row + 1; /* possible OOB */ 1338 row = screen.cur.row + 1; /* possible OOB */
1310 num = nrow - row; 1339 num = nrow - row;
1311 break; 1340 break;
1312 case 1: /* erase to beginning of screen */ 1341 case 1: /* erase to beginning of screen */
1313 selection_check (3);
1314 scr_erase_line (1); 1342 scr_erase_line (1);
1315 row = 0; 1343 row = 0;
1316 num = screen.cur.row; 1344 num = screen.cur.row;
1317 break; 1345 break;
1318 case 2: /* erase whole screen */ 1346 case 2: /* erase whole screen */
1319 selection_check (3);
1320 row = 0; 1347 row = 0;
1321 num = nrow; 1348 num = nrow;
1322 break; 1349 break;
1323 default: 1350 default:
1324 return; 1351 return;
… …
1333 if (row >= nrow) /* Out Of Bounds */ 1360 if (row >= nrow) /* Out Of Bounds */
1334 return; 1361 return;
1335 1362
1336 min_it (num, nrow - row); 1363 min_it (num, nrow - row);
1337 1364
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)) 1365 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1342 ren = (rend_t) ~RS_None; 1366 ren = (rend_t) ~RS_None;
1343 else if (GET_BASEBG (rstyle) == Color_bg) 1367 else if (GET_BASEBG (rstyle) == Color_bg)
1344 { 1368 {
1345 ren = DEFAULT_RSTYLE; 1369 ren = DEFAULT_RSTYLE;
1346 1370
1347 if (mapped && !view_start) 1371 if (mapped)
1348 XClearArea (dpy, vt, 0, 1372 XClearArea (dpy, vt, 0,
1349 Row2Pixel (row - view_start), (unsigned int)width, 1373 Row2Pixel (row - view_start), (unsigned int)vt_width,
1350 (unsigned int)Height2Pixel (num), False); 1374 (unsigned int)Height2Pixel (num), False);
1351 } 1375 }
1352 else 1376 else
1353 { 1377 {
1354 ren = rstyle & (RS_fgMask | RS_bgMask); 1378 ren = rstyle & (RS_fgMask | RS_bgMask);
1355 1379
1356 if (mapped && !view_start) 1380 if (mapped)
1357 { 1381 {
1358 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1382 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1359 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1383 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1360 XFillRectangle (dpy, vt, gc, 1384 XFillRectangle (dpy, vt, gc,
1361 0, Row2Pixel (row - view_start), 1385 0, Row2Pixel (row - view_start),
1362 (unsigned int)width, 1386 (unsigned int)vt_width,
1363 (unsigned int)Height2Pixel (num)); 1387 (unsigned int)Height2Pixel (num));
1364 gcvalue.foreground = pix_colors[Color_fg]; 1388 gcvalue.foreground = pix_colors[Color_fg];
1365 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1389 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1366 } 1390 }
1367 } 1391 }
1368 1392
1369 for (; num--; row++) 1393 for (; num--; row++)
1370 { 1394 {
1371 scr_blank_screen_mem (ROW(row), rstyle); 1395 scr_blank_screen_mem (ROW(row), rstyle);
1372 1396
1373 if (!view_start) 1397 if (row - view_start < nrow)
1374 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1398 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1375 } 1399 }
1376} 1400}
1377 1401
1378#if !ENABLE_MINIMAL 1402#if !ENABLE_MINIMAL
1379void 1403void
… …
1389/* ------------------------------------------------------------------------- */ 1413/* ------------------------------------------------------------------------- */
1390/* 1414/*
1391 * Fill the screen with `E's 1415 * Fill the screen with `E's
1392 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1416 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1393 */ 1417 */
1394void 1418void ecb_cold
1395rxvt_term::scr_E () NOTHROW 1419rxvt_term::scr_E () NOTHROW
1396{ 1420{
1397 rend_t fs; 1421 rend_t fs;
1398 1422
1399 want_refresh = 1; 1423 want_refresh = 1;
1400 ZERO_SCROLLBACK (); 1424 ZERO_SCROLLBACK ();
1401 1425
1402 num_scr_allow = 0; 1426 num_scr_allow = 0;
1403 selection_check (3); 1427
1428 row_col_t pos;
1429 pos.row = pos.col = 0;
1430 if (ROWCOL_IS_AFTER (selection.end, pos))
1431 CLEAR_SELECTION ();
1404 1432
1405 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1433 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1406 for (int row = nrow; row--; ) 1434 for (int row = nrow; row--; )
1407 { 1435 {
1408 line_t &line = ROW(row); 1436 line_t &line = ROW(row);
… …
1559/* ------------------------------------------------------------------------- */ 1587/* ------------------------------------------------------------------------- */
1560/* 1588/*
1561 * Set the scrolling region 1589 * Set the scrolling region
1562 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1590 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1563 */ 1591 */
1564void 1592void ecb_cold
1565rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1593rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1566{ 1594{
1567 max_it (top, 0); 1595 max_it (top, 0);
1568 min_it (bot, nrow - 1); 1596 min_it (bot, nrow - 1);
1569 1597
… …
1579/* 1607/*
1580 * Make the cursor visible/invisible 1608 * Make the cursor visible/invisible
1581 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1609 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1582 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1610 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1583 */ 1611 */
1584void 1612void ecb_cold
1585rxvt_term::scr_cursor_visible (int mode) NOTHROW 1613rxvt_term::scr_cursor_visible (int mode) NOTHROW
1586{ 1614{
1587 want_refresh = 1; 1615 want_refresh = 1;
1588 1616
1589 if (mode) 1617 if (mode)
… …
1596/* 1624/*
1597 * Set/unset automatic wrapping 1625 * Set/unset automatic wrapping
1598 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1626 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1599 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1627 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1600 */ 1628 */
1601void 1629void ecb_cold
1602rxvt_term::scr_autowrap (int mode) NOTHROW 1630rxvt_term::scr_autowrap (int mode) NOTHROW
1603{ 1631{
1604 if (mode) 1632 if (mode)
1605 screen.flags |= Screen_Autowrap; 1633 screen.flags |= Screen_Autowrap;
1606 else 1634 else
… …
1615 * Relative mode: line numbers are relative to top margin of scrolling region 1643 * Relative mode: line numbers are relative to top margin of scrolling region
1616 * and the cursor cannot be moved outside. 1644 * and the cursor cannot be moved outside.
1617 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1645 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1618 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1646 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1619 */ 1647 */
1620void 1648void ecb_cold
1621rxvt_term::scr_relative_origin (int mode) NOTHROW 1649rxvt_term::scr_relative_origin (int mode) NOTHROW
1622{ 1650{
1623 if (mode) 1651 if (mode)
1624 screen.flags |= Screen_Relative; 1652 screen.flags |= Screen_Relative;
1625 else 1653 else
… …
1632/* 1660/*
1633 * Set insert/replace mode 1661 * Set insert/replace mode
1634 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1662 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1635 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1663 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1636 */ 1664 */
1637void 1665void ecb_cold
1638rxvt_term::scr_insert_mode (int mode) NOTHROW 1666rxvt_term::scr_insert_mode (int mode) NOTHROW
1639{ 1667{
1640 if (mode) 1668 if (mode)
1641 screen.flags |= Screen_Insert; 1669 screen.flags |= Screen_Insert;
1642 else 1670 else
… …
1648 * Set/Unset tabs 1676 * Set/Unset tabs
1649 * XTERM_SEQ: Set tab at current column : ESC H 1677 * XTERM_SEQ: Set tab at current column : ESC H
1650 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1678 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1651 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1679 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1652 */ 1680 */
1653void 1681void ecb_cold
1654rxvt_term::scr_set_tab (int mode) NOTHROW 1682rxvt_term::scr_set_tab (int mode) NOTHROW
1655{ 1683{
1656 if (mode < 0) 1684 if (mode < 0)
1657 memset (tabs, 0, ncol); 1685 memset (tabs, 0, ncol);
1658 else if (screen.cur.col < ncol) 1686 else if (screen.cur.col < ncol)
… …
1678 { 1706 {
1679 rvideo_state = on; 1707 rvideo_state = on;
1680 1708
1681 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1709 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1682#ifdef HAVE_BG_PIXMAP 1710#ifdef HAVE_BG_PIXMAP
1683 if (bgPixmap.pixmap == None) 1711 if (bg_img == 0)
1684#endif 1712#endif
1685 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1713 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1686 1714
1687 XGCValues gcvalue; 1715 XGCValues gcvalue;
1688 gcvalue.foreground = pix_colors[Color_fg]; 1716 gcvalue.foreground = pix_colors[Color_fg];
… …
1697/* ------------------------------------------------------------------------- */ 1725/* ------------------------------------------------------------------------- */
1698/* 1726/*
1699 * Report current cursor position 1727 * Report current cursor position
1700 * XTERM_SEQ: Report position: ESC [ 6 n 1728 * XTERM_SEQ: Report position: ESC [ 6 n
1701 */ 1729 */
1702void 1730void ecb_cold
1703rxvt_term::scr_report_position () NOTHROW 1731rxvt_term::scr_report_position () NOTHROW
1704{ 1732{
1705 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1733 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1706} 1734}
1707 1735
… …
1710 * ------------------------------------------------------------------------- */ 1738 * ------------------------------------------------------------------------- */
1711 1739
1712/* 1740/*
1713 * Set font style 1741 * Set font style
1714 */ 1742 */
1715void 1743void ecb_cold
1716rxvt_term::set_font_style () NOTHROW 1744rxvt_term::set_font_style () NOTHROW
1717{ 1745{
1718#if 0 1746#if 0
1719 switch (charsets [screen.charset]) 1747 switch (charsets [screen.charset])
1720 { 1748 {
… …
1742 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1770 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1743 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1771 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1744 * XTERM_SEQ: Invoke G2 character set: ESC N 1772 * XTERM_SEQ: Invoke G2 character set: ESC N
1745 * XTERM_SEQ: Invoke G3 character set: ESC O 1773 * XTERM_SEQ: Invoke G3 character set: ESC O
1746 */ 1774 */
1747void 1775void ecb_cold
1748rxvt_term::scr_charset_choose (int set) NOTHROW 1776rxvt_term::scr_charset_choose (int set) NOTHROW
1749{ 1777{
1750 screen.charset = set; 1778 screen.charset = set;
1751 set_font_style (); 1779 set_font_style ();
1752} 1780}
… …
1773 * ------------------------------------------------------------------------- */ 1801 * ------------------------------------------------------------------------- */
1774 1802
1775/* 1803/*
1776 * refresh matching text. 1804 * refresh matching text.
1777 */ 1805 */
1778bool 1806bool ecb_cold
1779rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1807rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1780{ 1808{
1781 bool found = false; 1809 bool found = false;
1782 1810
1783 for (int i = 0; i < nrow; i++) 1811 for (int i = 0; i < nrow; i++)
… …
1802 PART_BEG = 0, 1830 PART_BEG = 0,
1803 PART_END, 1831 PART_END,
1804 RC_COUNT 1832 RC_COUNT
1805}; 1833};
1806 1834
1807void 1835void ecb_hot
1808rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1836rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1809{ 1837{
1810 int i; 1838 int i;
1811 row_col_t rc[RC_COUNT]; 1839 row_col_t rc[RC_COUNT];
1812 1840
… …
1832 for (i = PART_BEG; i < RC_COUNT; i++) 1860 for (i = PART_BEG; i < RC_COUNT; i++)
1833 { 1861 {
1834 min_it (rc[i].col, ncol - 1); 1862 min_it (rc[i].col, ncol - 1);
1835 min_it (rc[i].row, nrow - 1); 1863 min_it (rc[i].row, nrow - 1);
1836 } 1864 }
1837// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1865
1838 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1866 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); 1867 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1840 1868
1841 num_scr_allow = 0; 1869 num_scr_allow = 0;
1842 1870
… …
1849 * Refresh the entire screen 1877 * Refresh the entire screen
1850 */ 1878 */
1851void 1879void
1852rxvt_term::scr_touch (bool refresh) NOTHROW 1880rxvt_term::scr_touch (bool refresh) NOTHROW
1853{ 1881{
1854 scr_expose (0, 0, width, height, refresh); 1882 scr_expose (0, 0, vt_width, vt_height, refresh);
1855} 1883}
1856 1884
1857/* ------------------------------------------------------------------------- */ 1885/* ------------------------------------------------------------------------- */
1858/* 1886/*
1859 * Move the display so that the line represented by scrollbar value Y is at 1887 * Move the display so that the line represented by scrollbar value Y is at
… …
1915 1943
1916# ifndef NO_MAPALERT 1944# ifndef NO_MAPALERT
1917# ifdef MAPALERT_OPTION 1945# ifdef MAPALERT_OPTION
1918 if (option (Opt_mapAlert)) 1946 if (option (Opt_mapAlert))
1919# endif 1947# endif
1920 XMapWindow (dpy, parent[0]); 1948 XMapWindow (dpy, parent);
1921# endif 1949# endif
1922 1950
1923# if ENABLE_FRILLS 1951# if ENABLE_FRILLS
1924 if (option (Opt_urgentOnBell)) 1952 if (option (Opt_urgentOnBell))
1925 set_urgency (1); 1953 set_urgency (1);
… …
1933 1961
1934 bell_ev.start (VISUAL_BELL_DURATION); 1962 bell_ev.start (VISUAL_BELL_DURATION);
1935 } 1963 }
1936 else 1964 else
1937 XBell (dpy, 0); 1965 XBell (dpy, 0);
1966 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1938#endif 1967#endif
1939} 1968}
1940 1969
1941/* ------------------------------------------------------------------------- */ 1970/* ------------------------------------------------------------------------- */
1942/* ARGSUSED */ 1971void ecb_cold
1943void
1944rxvt_term::scr_printscreen (int fullhist) NOTHROW 1972rxvt_term::scr_printscreen (int fullhist) NOTHROW
1945{ 1973{
1946#ifdef PRINTPIPE 1974#ifdef PRINTPIPE
1947 int nrows, row_start; 1975 int nrows, row_start;
1948 FILE *fd = popen_printer (); 1976 FILE *fd = popen_printer ();
… …
1997/* 2025/*
1998 * Refresh the screen 2026 * Refresh the screen
1999 * drawn_text/drawn_rend contain the screen information before the update. 2027 * drawn_text/drawn_rend contain the screen information before the update.
2000 * screen.text/screen.rend contain what the screen will change to. 2028 * screen.text/screen.rend contain what the screen will change to.
2001 */ 2029 */
2002void 2030void ecb_hot
2003rxvt_term::scr_refresh () NOTHROW 2031rxvt_term::scr_refresh () NOTHROW
2004{ 2032{
2005 int16_t col, row, /* column/row we're processing */ 2033 int16_t col, row, /* column/row we're processing */
2006 ocrow; /* old cursor row */ 2034 ocrow; /* old cursor row */
2007 int i; /* tmp */ 2035 int i; /* tmp */
… …
2021 * A: set up vars 2049 * A: set up vars
2022 */ 2050 */
2023 refresh_count = 0; 2051 refresh_count = 0;
2024 2052
2025 unsigned int old_screen_flags = screen.flags; 2053 unsigned int old_screen_flags = screen.flags;
2026 char have_bg = 0; 2054 bool have_bg = 0;
2027#ifdef HAVE_BG_PIXMAP 2055#ifdef HAVE_BG_PIXMAP
2028 have_bg = bgPixmap.pixmap != None; 2056 have_bg = bg_img != 0;
2029#endif 2057#endif
2030 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2058 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2031 2059
2032 /* 2060 /*
2033 * B: reverse any characters which are selected 2061 * B: reverse any characters which are selected
… …
2037 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2065 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2038#if ENABLE_OVERLAY 2066#if ENABLE_OVERLAY
2039 scr_swap_overlay (); 2067 scr_swap_overlay ();
2040#endif 2068#endif
2041 2069
2042 char showcursor = screen.flags & Screen_VisibleCursor; 2070 bool showcursor = screen.flags & Screen_VisibleCursor;
2043 2071
2044 /* 2072 /*
2045 * C: set the cursor character (s) 2073 * C: set the cursor character (s)
2046 */ 2074 */
2047 { 2075 {
2048 unsigned char setoldcursor; 2076 bool setoldcursor;
2049 2077
2050#ifdef CURSOR_BLINK 2078#ifdef CURSOR_BLINK
2051 if (hidden_cursor) 2079 if (hidden_cursor)
2052 showcursor = 0; 2080 showcursor = 0;
2053#endif 2081#endif
… …
2082 ccol2 = bgcolor_of (rstyle); 2110 ccol2 = bgcolor_of (rstyle);
2083#else 2111#else
2084 ccol2 = Color_bg; 2112 ccol2 = Color_bg;
2085#endif 2113#endif
2086 2114
2087 if (showcursor && focus) 2115 if (focus)
2088 { 2116 {
2089 if (option (Opt_cursorUnderline)) 2117 if (option (Opt_cursorUnderline))
2090 *crp ^= RS_Uline; 2118 *crp ^= RS_Uline;
2091 else 2119 else
2092 { 2120 {
… …
2140 { 2168 {
2141 int16_t nits; 2169 int16_t nits;
2142 int i = num_scr; 2170 int i = num_scr;
2143 int j; 2171 int j;
2144 int len, wlen; 2172 int len, wlen;
2145 dLocal (int, num_scr);
2146 2173
2147 j = nrow; 2174 j = nrow;
2148 wlen = len = -1; 2175 wlen = len = -1;
2149 row = i > 0 ? 0 : j - 1; 2176 row = i > 0 ? 0 : j - 1;
2150 2177
… …
2225 continue; 2252 continue;
2226 2253
2227 // redraw one or more characters 2254 // redraw one or more characters
2228 2255
2229 // seek to the beginning of wide characters 2256 // seek to the beginning of wide characters
2230 while (expect_false (stp[col] == NOCHAR && col > 0)) 2257 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2231 --col; 2258 --col;
2232 2259
2233 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2260 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2234 text_t *text = stp + col; 2261 text_t *text = stp + col;
2235 int count = 1; 2262 int count = 1;
2236 2263
2237 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2238 drp[col] = rend; 2265 drp[col] = rend;
… …
2273 2300
2274 col--; /* went one too far. move back */ 2301 col--; /* went one too far. move back */
2275 count -= i; /* dump any matching trailing chars */ 2302 count -= i; /* dump any matching trailing chars */
2276 2303
2277 // sometimes we optimize away the trailing NOCHAR's, add them back 2304 // sometimes we optimize away the trailing NOCHAR's, add them back
2278 while (expect_false (i && text[count] == NOCHAR)) 2305 while (ecb_unlikely (i && text[count] == NOCHAR))
2279 count++, i--; 2306 count++, i--;
2280 2307
2281 /* 2308 /*
2282 * Determine the attributes for the string 2309 * Determine the attributes for the string
2283 */ 2310 */
2284 int fore = fgcolor_of (rend); // desired foreground 2311 int fore = fgcolor_of (rend); // desired foreground
2285 int back = bgcolor_of (rend); // desired background 2312 int back = bgcolor_of (rend); // desired background
2286 2313
2287 // only do special processing if any attributes are set, which is unlikely 2314 // 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))) 2315 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2289 { 2316 {
2290 bool invert = rend & RS_RVid; 2317 bool invert = rend & RS_RVid;
2291 2318
2292#ifndef NO_BOLD_UNDERLINE_REVERSE 2319#ifndef NO_BOLD_UNDERLINE_REVERSE
2293 if (rend & RS_Bold && fore == Color_fg) 2320 if (rend & RS_Bold && fore == Color_fg)
… …
2312 2339
2313 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2340 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2314 fore = Color_UL; 2341 fore = Color_UL;
2315#endif 2342#endif
2316 2343
2344#ifdef OPTION_HC
2345 if (rend & RS_Sel)
2346 {
2347 /* invert the column if no highlightColor is set or it is the
2348 * current cursor column */
2349 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2350 && ISSET_PIXCOLOR (Color_HC))
2351 {
2352 if (ISSET_PIXCOLOR (Color_HTC))
2353 fore = Color_HTC;
2354 // if invert is 0 reverse video is set so we use bg color as fg color
2355 else if (!invert)
2356 fore = back;
2357
2358 back = Color_HC;
2359 invert = 0;
2360 }
2361 }
2362#endif
2363
2317 if (invert) 2364 if (invert)
2318 { 2365 {
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); 2366 ::swap (fore, back);
2326#ifdef OPTION_HC
2327 else if (ISSET_PIXCOLOR (Color_HC))
2328 back = Color_HC;
2329#endif
2330 2367
2331#ifndef NO_BOLD_UNDERLINE_REVERSE 2368#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) 2369 if (fore == back)
2337 { 2370 {
2338 fore = Color_bg; 2371 fore = Color_bg;
2339 back = Color_fg; 2372 back = Color_fg;
2340 } 2373 }
… …
2376 /* 2409 /*
2377 * Actually do the drawing of the string here 2410 * Actually do the drawing of the string here
2378 */ 2411 */
2379 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2412 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2380 2413
2381 if (expect_true (have_bg && back == Color_bg)) 2414 if (ecb_likely (have_bg && back == Color_bg))
2382 { 2415 {
2383 // this is very ugly, maybe push it into ->draw? 2416 // this is very ugly, maybe push it into ->draw?
2384 2417
2385 for (i = 0; i < count; i++) /* don't draw empty strings */ 2418 for (i = 0; i < count; i++) /* don't draw empty strings */
2386 if (text[i] != ' ') 2419 if (text[i] != ' ')
… …
2393 did_clear: ; 2426 did_clear: ;
2394 } 2427 }
2395 else 2428 else
2396 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2429 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2397 2430
2398 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2431 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2399 { 2432 {
2400#if ENABLE_FRILLS 2433#if ENABLE_FRILLS
2401 if (ISSET_PIXCOLOR (Color_underline)) 2434 if (ISSET_PIXCOLOR (Color_underline))
2402 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2435 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2403 else 2436 else
… …
2449 2482
2450 XDrawRectangle (dpy, vt, gc, 2483 XDrawRectangle (dpy, vt, gc,
2451 Col2Pixel (col), 2484 Col2Pixel (col),
2452 Row2Pixel (oldcursor.row), 2485 Row2Pixel (oldcursor.row),
2453 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2486 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2454 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2487 (unsigned int) (Height2Pixel (1) - 1));
2455 } 2488 }
2456 } 2489 }
2457 2490
2458 /* 2491 /*
2459 * H: cleanup selection 2492 * H: cleanup selection
… …
2468 screen.flags = old_screen_flags; 2501 screen.flags = old_screen_flags;
2469 num_scr = 0; 2502 num_scr = 0;
2470 num_scr_allow = 1; 2503 num_scr_allow = 1;
2471} 2504}
2472 2505
2473void 2506void ecb_cold
2474rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2507rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2475{ 2508{
2476 if (!l.t) 2509 if (!l.valid ())
2477 return; 2510 return;
2478 2511
2479 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2512 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2480 2513
2481 for (int i = ncol; i--; ) 2514 for (int i = ncol; i--; )
2482 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2515 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2483} 2516}
2484 2517
2485void 2518void ecb_cold
2486rxvt_term::scr_remap_chars () NOTHROW 2519rxvt_term::scr_remap_chars () NOTHROW
2487{ 2520{
2488 for (int i = total_rows; i--; ) 2521 for (int i = total_rows; i--; )
2489 scr_remap_chars (row_buf [i]); 2522 scr_remap_chars (row_buf [i]);
2490 2523
… …
2493 scr_remap_chars (drawn_buf [i]); 2526 scr_remap_chars (drawn_buf [i]);
2494 scr_remap_chars (swap_buf [i]); 2527 scr_remap_chars (swap_buf [i]);
2495 } 2528 }
2496} 2529}
2497 2530
2498void 2531void ecb_cold
2499rxvt_term::scr_recolour () NOTHROW 2532rxvt_term::scr_recolour (bool refresh) NOTHROW
2500{ 2533{
2534 bool transparent = false;
2535
2501#ifdef HAVE_BG_PIXMAP 2536#ifdef HAVE_BG_PIXMAP
2502 bgPixmap.apply (); 2537 if (bg_img != 0)
2503#else 2538 {
2539# if ENABLE_TRANSPARENCY
2540 if (bg_flags & BG_IS_TRANSPARENT)
2541 {
2542 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2543 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2504 2544
2545 transparent = true;
2546 }
2547 else
2548# endif
2549 {
2550 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2551 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2552 }
2553 }
2554 else
2555#endif
2556 {
2505 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2557 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2506 XClearWindow (dpy, parent[0]);
2507 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2558 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2559 }
2560
2561 XClearWindow (dpy, parent);
2508 2562
2509 if (scrollBar.win) 2563 if (scrollBar.win)
2510 { 2564 {
2565 if (transparent)
2566 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2567 else
2511 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2568 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2512 scrollBar.state = STATE_IDLE; 2569 scrollBar.state = SB_STATE_IDLE;
2513 scrollBar.show (0); 2570 scrollBar.show (0);
2514 } 2571 }
2515 2572
2516#endif 2573 if (refresh)
2517 2574 {
2518 /* bgPixmap.apply () does not do the following : */
2519 scr_clear (); 2575 scr_clear ();
2520 scr_touch (true); 2576 scr_touch (true);
2577 }
2521 want_refresh = 1; 2578 want_refresh = 1;
2522} 2579}
2523 2580
2524/* ------------------------------------------------------------------------- */ 2581/* ------------------------------------------------------------------------- */
2525void 2582void
… …
2582 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2639 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2583 srp[col] ^= rstyle; 2640 srp[col] ^= rstyle;
2584} 2641}
2585 2642
2586/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2587void 2644void ecb_hot
2588rxvt_term::scr_reverse_selection () NOTHROW 2645rxvt_term::scr_reverse_selection () NOTHROW
2589{ 2646{
2590 if (selection.op 2647 if (selection.op
2591 && current_screen == selection.screen 2648 && current_screen == selection.screen
2592 && selection.end.row >= view_start) 2649 && selection.end.row >= view_start)
2593 { 2650 {
2594#if !ENABLE_MINIMAL 2651#if !ENABLE_MINIMAL
2595 if (selection.rect) 2652 if (selection.rect)
2596 scr_xor_rect (selection.beg.row, selection.beg.col, 2653 scr_xor_rect (selection.beg.row, selection.beg.col,
2597 selection.end.row, selection.end.col, 2654 selection.end.row, selection.end.col,
2598 RS_RVid, RS_RVid | RS_Uline); 2655 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2599 else 2656 else
2600#endif 2657#endif
2601 scr_xor_span (selection.beg.row, selection.beg.col, 2658 scr_xor_span (selection.beg.row, selection.beg.col,
2602 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2603 RS_RVid); 2660 RS_Sel | RS_RVid);
2604 } 2661 }
2605} 2662}
2606 2663
2607/* ------------------------------------------------------------------------- */ 2664/* ------------------------------------------------------------------------- */
2608/* 2665/*
… …
2611 */ 2668 */
2612#if 0 2669#if 0
2613void 2670void
2614rxvt_term::scr_dump (int fd) NOTHROW 2671rxvt_term::scr_dump (int fd) NOTHROW
2615{ 2672{
2616 int row, wrote; 2673 // if this method is needed, it can be implemented by factoring the
2617 unsigned int width, towrite; 2674 // 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} 2675}
2637#endif 2676#endif
2638 2677
2639/* ------------------------------------------------------------------------- * 2678/* ------------------------------------------------------------------------- *
2640 * CHARACTER SELECTION * 2679 * CHARACTER SELECTION *
2641 * ------------------------------------------------------------------------- */ 2680 * ------------------------------------------------------------------------- */
2642void 2681void
2643rxvt_term::selection_check (int check_more) NOTHROW 2682rxvt_term::selection_check (int check_more) NOTHROW
2644{ 2683{
2645 row_col_t pos;
2646
2647 if (!selection.op) 2684 if (!selection.op)
2648 return; 2685 return;
2649 2686
2650 pos.row = pos.col = 0;
2651 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2652 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2653 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2654 || (check_more == 1 2690 || (check_more == 1
2655 && current_screen == selection.screen 2691 && current_screen == selection.screen
2656 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2657 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && 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 (); 2694 CLEAR_ALL_SELECTION ();
2667} 2695}
2668 2696
2669/* ------------------------------------------------------------------------- */ 2697/* ------------------------------------------------------------------------- */
2670/* 2698/*
2671 * Paste a selection direct to the command fd 2699 * Paste a selection direct to the command fd
2672 */ 2700 */
2673void 2701void
2674rxvt_term::paste (char *data, unsigned int len) NOTHROW 2702rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2675{ 2703{
2676 /* convert normal newline chars into common keyboard Return key sequence */ 2704 /* convert normal newline chars into common keyboard Return key sequence */
2677 for (unsigned int i = 0; i < len; i++) 2705 for (unsigned int i = 0; i < len; i++)
2678 if (data[i] == C0_LF) 2706 if (data[i] == C0_LF)
2679 data[i] = C0_CR; 2707 data[i] = C0_CR;
2680 2708
2681 if (priv_modes & PrivMode_BracketPaste) 2709 if (priv_modes & PrivMode_BracketPaste)
2682 tt_printf ("\e[200~"); 2710 tt_printf ("\x1b[200~");
2683 2711
2684 tt_write (data, len); 2712 tt_write (data, len);
2685 2713
2686 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2687 tt_printf ("\e[201~"); 2715 tt_printf ("\x1b[201~");
2688} 2716}
2689 2717
2690/* ------------------------------------------------------------------------- */
2691/*
2692 * Respond to a notification that a primary selection has been sent
2693 * EXT: SelectionNotify
2694 */
2695void 2718void
2696rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2719rxvt_term::paste (char *data, unsigned int len) NOTHROW
2697{ 2720{
2698 if (prop == None) /* check for failed XConvertSelection */ 2721 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; 2722 return;
2873 2723
2874 selection_paste (win, prop, true); 2724 tt_paste (data, len);
2875} 2725}
2876 2726
2877/* ------------------------------------------------------------------------- */ 2727/* ------------------------------------------------------------------------- */
2878/* 2728/*
2879 * Request the current selection: 2729 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2880 * Order: > internal selection if available 2730 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2881 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2731 * 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 2732 * EXT: button 2 release
2886 */ 2733 */
2887void 2734void
2888rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2735rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2889{ 2736{
2890 if (selection.text && selnum == Sel_Primary) 2737 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 } 2738 {
2898 else 2739 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2740 selection_req->run ();
2899 { 2741 }
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} 2742}
2941 2743
2942/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2943/* 2745/*
2944 * Clear all selected text 2746 * Clear all selected text
2945 * EXT: SelectionClear 2747 * EXT: SelectionClear
2946 */ 2748 */
2947void 2749void
2948rxvt_term::selection_clear () NOTHROW 2750rxvt_term::selection_clear (bool clipboard) NOTHROW
2949{ 2751{
2752 if (!clipboard)
2753 {
2950 want_refresh = 1; 2754 want_refresh = 1;
2951 free (selection.text); 2755 free (selection.text);
2952 selection.text = NULL; 2756 selection.text = NULL;
2953 selection.len = 0; 2757 selection.len = 0;
2954 CLEAR_SELECTION (); 2758 CLEAR_SELECTION ();
2955 2759
2956 if (display->selection_owner == this) 2760 if (display->selection_owner == this)
2957 display->selection_owner = 0; 2761 display->selection_owner = 0;
2762 }
2763 else
2764 {
2765 free (selection.clip_text);
2766 selection.clip_text = NULL;
2767 selection.clip_len = 0;
2768
2769 if (display->clipboard_owner == this)
2770 display->clipboard_owner = 0;
2771 }
2958} 2772}
2959 2773
2960/* ------------------------------------------------------------------------- */ 2774/* ------------------------------------------------------------------------- */
2961/* 2775/*
2962 * Copy a selection into the cut buffer 2776 * Copy a selection into the cut buffer
2963 * EXT: button 1 or 3 release 2777 * EXT: button 1 or 3 release
2964 */ 2778 */
2965void 2779void
2966rxvt_term::selection_make (Time tm) 2780rxvt_term::selection_make (Time tm)
2967{ 2781{
2968 int i; 2782 int size;
2969 wchar_t *new_selection_text; 2783 wchar_t *new_selection_text;
2970 text_t *t; 2784 text_t *t;
2971 2785
2972 switch (selection.op) 2786 switch (selection.op)
2973 { 2787 {
… …
2989 return; /* nothing selected, go away */ 2803 return; /* nothing selected, go away */
2990 2804
2991 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2805 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2992 return; 2806 return;
2993 2807
2994 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2808 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2995 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2809 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2996 2810
2997 int ofs = 0; 2811 int ofs = 0;
2998 int extra = 0; 2812 int extra = 0;
2999 2813
3000 int col = selection.beg.col; 2814 int col = selection.beg.col;
… …
3006 { 2820 {
3007#if !ENABLE_MINIMAL 2821#if !ENABLE_MINIMAL
3008 if (selection.rect) 2822 if (selection.rect)
3009 { 2823 {
3010 col = selection.beg.col; 2824 col = selection.beg.col;
3011 end_col = ncol + 1; 2825 end_col = selection.end.col;
3012 } 2826 }
3013 else 2827 else
3014#endif 2828#endif
3015 end_col = ROW(row).l; 2829 end_col = ROW(row).l;
3016 2830
3017 col = max (col, 0); 2831 col = max (col, 0);
3018 2832
3019 if (row == selection.end.row 2833 if (row == selection.end.row)
3020#if !ENABLE_MINIMAL
3021 || selection.rect
3022#endif
3023 )
3024 min_it (end_col, selection.end.col); 2834 min_it (end_col, selection.end.col);
3025 2835
3026 t = ROW(row).t + col; 2836 t = ROW(row).t + col;
3027 2837
3028 for (; col < end_col; col++) 2838 for (; col < end_col; col++)
… …
3036 2846
3037 extra -= (len - 1); 2847 extra -= (len - 1);
3038 2848
3039 if (extra < 0) 2849 if (extra < 0)
3040 { 2850 {
3041 extra += i; 2851 extra += size;
3042 i += i; 2852 size += size;
3043 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3044 } 2854 }
3045 2855
3046 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3047 } 2857 }
3048#endif 2858#endif
… …
3060 2870
3061 new_selection_text[ofs++] = C0_LF; 2871 new_selection_text[ofs++] = C0_LF;
3062 } 2872 }
3063 else 2873 else
3064#endif 2874#endif
3065 if (!ROW(row).is_longer () && row != selection.end.row) 2875 if (!ROW(row).is_longer ()
2876 && (row != selection.end.row || end_col != selection.end.col)
2877 && (row != selection.beg.row || selection.beg.col < ncol))
3066 new_selection_text[ofs++] = C0_LF; 2878 new_selection_text[ofs++] = C0_LF;
3067 } 2879 }
3068
3069 if (end_col != selection.end.col)
3070 new_selection_text[ofs++] = C0_LF;
3071 2880
3072 new_selection_text[ofs] = 0; 2881 new_selection_text[ofs] = 0;
3073 2882
3074 if (ofs == 0) 2883 if (ofs == 0)
3075 { 2884 {
… …
3088 2897
3089 selection_grab (tm); 2898 selection_grab (tm);
3090} 2899}
3091 2900
3092bool 2901bool
3093rxvt_term::selection_grab (Time tm) NOTHROW 2902rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3094{ 2903{
2904 Atom sel;
2905
2906 if (!clipboard)
2907 {
3095 selection_time = tm; 2908 selection_time = tm;
2909 sel = XA_PRIMARY;
2910 }
2911 else
2912 {
2913 clipboard_time = tm;
2914 sel = xa[XA_CLIPBOARD];
2915 }
3096 2916
3097 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2917 XSetSelectionOwner (dpy, sel, vt, tm);
3098 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2918 if (XGetSelectionOwner (dpy, sel) == vt)
3099 { 2919 {
3100 display->set_selection_owner (this); 2920 display->set_selection_owner (this, clipboard);
3101 return true; 2921 return true;
3102 } 2922 }
3103 else 2923 else
3104 { 2924 {
3105 selection_clear (); 2925 selection_clear (clipboard);
3106 return false; 2926 return false;
3107 } 2927 }
3108 2928
3109#if 0 2929#if 0
3110 XTextProperty ct; 2930 XTextProperty ct;
… …
3120/* ------------------------------------------------------------------------- */ 2940/* ------------------------------------------------------------------------- */
3121/* 2941/*
3122 * Mark or select text based upon number of clicks: 1, 2, or 3 2942 * Mark or select text based upon number of clicks: 1, 2, or 3
3123 * EXT: button 1 press 2943 * EXT: button 1 press
3124 */ 2944 */
3125void 2945void ecb_cold
3126rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2946rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3127{ 2947{
3128 clicks = ((clicks - 1) % 3) + 1; 2948 clicks = ((clicks - 1) % 3) + 1;
3129 selection.clicks = clicks; /* save clicks so extend will work */ 2949 selection.clicks = clicks; /* save clicks so extend will work */
3130 2950
… …
3149 2969
3150/* ------------------------------------------------------------------------- */ 2970/* ------------------------------------------------------------------------- */
3151/* 2971/*
3152 * Mark a selection at the specified col/row 2972 * Mark a selection at the specified col/row
3153 */ 2973 */
3154void 2974void ecb_cold
3155rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2975rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3156{ 2976{
3157 want_refresh = 1; 2977 want_refresh = 1;
3158 2978
3159 selection.mark.row = row + view_start; 2979 selection.mark.row = row + view_start;
… …
3186/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3006/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3187#define DELIMIT_TEXT(x) \ 3007#define DELIMIT_TEXT(x) \
3188 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3008 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3189#define DELIMIT_REND(x) 1 3009#define DELIMIT_REND(x) 1
3190 3010
3191void 3011void ecb_cold
3192rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3012rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3193{ 3013{
3194 int col, row, dirnadd, tcol, trow, w1, w2; 3014 int col, row, dirnadd, tcol, trow, w1, w2;
3195 row_col_t bound; 3015 row_col_t bound;
3196 text_t *stp; 3016 text_t *stp;
… …
3270 * EXT: button 3 press; button 1 or 3 drag 3090 * EXT: button 3 press; button 1 or 3 drag
3271 * flag == 0 ==> button 1 3091 * flag == 0 ==> button 1
3272 * flag == 1 ==> button 3 press 3092 * flag == 1 ==> button 3 press
3273 * flag == 2 ==> button 3 motion 3093 * flag == 2 ==> button 3 motion
3274 */ 3094 */
3275void 3095void ecb_cold
3276rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3096rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3277{ 3097{
3278 int col = clamp (Pixel2Col (x), 0, ncol); 3098 int col = clamp (Pixel2Col (x), 0, ncol);
3279 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3099 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3280 3100
… …
3306 3126
3307/* ------------------------------------------------------------------------- */ 3127/* ------------------------------------------------------------------------- */
3308/* 3128/*
3309 * Extend the selection to the specified col/row 3129 * Extend the selection to the specified col/row
3310 */ 3130 */
3311void 3131void ecb_cold
3312rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3132rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3313{ 3133{
3314 row_col_t pos; 3134 row_col_t pos;
3315 enum { 3135 enum {
3316 LEFT, RIGHT 3136 LEFT, RIGHT
… …
3507 ::swap (selection.beg.col, selection.end.col); 3327 ::swap (selection.beg.col, selection.end.col);
3508#endif 3328#endif
3509} 3329}
3510 3330
3511#if !ENABLE_MINIMAL 3331#if !ENABLE_MINIMAL
3512void 3332void ecb_cold
3513rxvt_term::selection_remove_trailing_spaces () NOTHROW 3333rxvt_term::selection_remove_trailing_spaces () NOTHROW
3514{ 3334{
3515 int32_t end_col, end_row; 3335 int32_t end_col, end_row;
3516 text_t *stp; 3336 text_t *stp;
3517 3337
… …
3555/* ------------------------------------------------------------------------- */ 3375/* ------------------------------------------------------------------------- */
3556/* 3376/*
3557 * Double click on button 3 when already selected 3377 * Double click on button 3 when already selected
3558 * EXT: button 3 double click 3378 * EXT: button 3 double click
3559 */ 3379 */
3560void 3380void ecb_cold
3561rxvt_term::selection_rotate (int x, int y) NOTHROW 3381rxvt_term::selection_rotate (int x, int y) NOTHROW
3562{ 3382{
3563 selection.clicks = selection.clicks % 3 + 1; 3383 selection.clicks = selection.clicks % 3 + 1;
3564 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3384 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3565} 3385}
… …
3567/* ------------------------------------------------------------------------- */ 3387/* ------------------------------------------------------------------------- */
3568/* 3388/*
3569 * Respond to a request for our current selection 3389 * Respond to a request for our current selection
3570 * EXT: SelectionRequest 3390 * EXT: SelectionRequest
3571 */ 3391 */
3572void 3392void ecb_cold
3573rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3393rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3574{ 3394{
3395 Atom property = rq.property == None ? rq.target : rq.property;
3575 XSelectionEvent ev; 3396 XSelectionEvent ev;
3576 3397
3577 ev.type = SelectionNotify; 3398 ev.type = SelectionNotify;
3578 ev.property = None; 3399 ev.property = None;
3579 ev.display = rq.display; 3400 ev.display = rq.display;
… …
3594 *target++ = xa[XA_COMPOUND_TEXT]; 3415 *target++ = xa[XA_COMPOUND_TEXT];
3595#if X_HAVE_UTF8_STRING 3416#if X_HAVE_UTF8_STRING
3596 *target++ = xa[XA_UTF8_STRING]; 3417 *target++ = xa[XA_UTF8_STRING];
3597#endif 3418#endif
3598 3419
3599 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3420 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3600 32, PropModeReplace, 3421 32, PropModeReplace,
3601 (unsigned char *)target_list, target - target_list); 3422 (unsigned char *)target_list, target - target_list);
3602 ev.property = rq.property; 3423 ev.property = property;
3603 } 3424 }
3604#if TODO // TODO 3425#if TODO // TODO
3605 else if (rq.target == xa[XA_MULTIPLE]) 3426 else if (rq.target == xa[XA_MULTIPLE])
3606 { 3427 {
3607 /* TODO: Handle MULTIPLE */ 3428 /* TODO: Handle MULTIPLE */
3608 } 3429 }
3609#endif 3430#endif
3610 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3431 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3611 { 3432 {
3612 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3433 XChangeProperty (dpy, rq.requestor, property, rq.target,
3613 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3434 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3614 ev.property = rq.property; 3435 ev.property = property;
3436 }
3437 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3438 {
3439 XChangeProperty (dpy, rq.requestor, property, rq.target,
3440 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3441 ev.property = property;
3615 } 3442 }
3616 else if (rq.target == XA_STRING 3443 else if (rq.target == XA_STRING
3617 || rq.target == xa[XA_TEXT] 3444 || rq.target == xa[XA_TEXT]
3618 || rq.target == xa[XA_COMPOUND_TEXT] 3445 || rq.target == xa[XA_COMPOUND_TEXT]
3619 || rq.target == xa[XA_UTF8_STRING] 3446 || rq.target == xa[XA_UTF8_STRING]
… …
3651 { 3478 {
3652 target = xa[XA_COMPOUND_TEXT]; 3479 target = xa[XA_COMPOUND_TEXT];
3653 style = enc_compound_text; 3480 style = enc_compound_text;
3654 } 3481 }
3655 3482
3656 if (selection.text) 3483 if (rq.selection == XA_PRIMARY && selection.text)
3657 { 3484 {
3658 cl = selection.text; 3485 cl = selection.text;
3659 selectlen = selection.len; 3486 selectlen = selection.len;
3487 }
3488 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3489 {
3490 cl = selection.clip_text;
3491 selectlen = selection.clip_len;
3660 } 3492 }
3661 else 3493 else
3662 { 3494 {
3663 cl = L""; 3495 cl = L"";
3664 selectlen = 0; 3496 selectlen = 0;
… …
3685 ct.value = (unsigned char *)cl; 3517 ct.value = (unsigned char *)cl;
3686 ct.nitems = selectlen; 3518 ct.nitems = selectlen;
3687 ct.encoding = target; 3519 ct.encoding = target;
3688 } 3520 }
3689 3521
3690 XChangeProperty (dpy, rq.requestor, rq.property, 3522 XChangeProperty (dpy, rq.requestor, property,
3691 ct.encoding, 8, PropModeReplace, 3523 ct.encoding, 8, PropModeReplace,
3692 ct.value, (int)ct.nitems); 3524 ct.value, (int)ct.nitems);
3693 ev.property = rq.property; 3525 ev.property = property;
3694 3526
3695 if (freect) 3527 if (freect)
3696 XFree (ct.value); 3528 XFree (ct.value);
3697 } 3529 }
3698 3530
3699 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3531 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3700} 3532}
3701 3533
3702/* ------------------------------------------------------------------------- */ 3534/* ------------------------------------------------------------------------- */
3703#ifdef USE_XIM 3535#if USE_XIM
3704void 3536void ecb_cold
3705rxvt_term::im_set_position (XPoint &pos) NOTHROW 3537rxvt_term::im_set_position (XPoint &pos) NOTHROW
3706{ 3538{
3707 XWindowAttributes xwa; 3539 XWindowAttributes xwa;
3708 3540
3709 XGetWindowAttributes (dpy, vt, &xwa); 3541 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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