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.344 by sf-exg, Wed Jul 21 09:00:43 2010 UTC vs.
Revision 1.435 by sf-exg, Sun Mar 24 10:12:04 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!
34
35static inline void 33static inline void
36fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
37{ 35{
38 while (len--) 36 while (len--)
39 *start++ = value; 37 *start++ = value;
40} 38}
41 39
42/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
45#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
46 42
47/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
100 96
101/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
102void 98void
103rxvt_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
104{ 100{
105 if (!l.t) 101 if (!l.valid ())
106 { 102 {
107 lalloc (l); 103 l.alloc ();
108 col = 0; 104 col = 0;
109 width = ncol; 105 width = ncol;
110 } 106 }
111 107
112 l.touch (); 108 l.touch ();
… …
143 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
144 col--; 140 col--;
145 141
146 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
148 146
149 // found start, nuke 147 // found start, nuke
150 do { 148 do {
151 l.t[col] = ' '; 149 l.t[col] = ' ';
152 l.r[col] = rend; 150 l.r[col] = rend;
153 col++; 151 col++;
154 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
155} 153}
156 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
157/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
158 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
159 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
160 168
161void 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
162rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
163{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
164 view_start = 0; 220 view_start = 0;
165 num_scr = 0; 221 num_scr = 0;
166 222
167 if (ncol == 0) 223 if (ncol == 0)
168 ncol = 80; 224 ncol = 80;
… …
188 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
189 245
190 screen.tscroll = 0; 246 screen.tscroll = 0;
191 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
192 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
193 if (!row_buf) 257 if (!prev_row_buf)
194 { 258 {
195 /* 259 /*
196 * 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
197 */ 261 */
198 top_row = 0; 262 top_row = 0;
199 term_start = 0; 263 term_start = 0;
200
201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203
204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207
208 for (int row = nrow; row--; )
209 {
210 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 }
214 264
215 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
218 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
241 { 291 {
242 /* 292 /*
243 * add or delete rows as appropriate 293 * add or delete rows as appropriate
244 */ 294 */
245 295
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 296 int common_col = min (prev_ncol, ncol);
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
250 if (nrow < prev_nrow)
251 {
252 for (int row = nrow; row < prev_nrow; row++)
253 {
254 lfree (swap_buf [row]);
255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 297
263 for (int row = min (nrow, prev_nrow); row--; ) 298 for (int row = min (nrow, prev_nrow); row--; )
264 { 299 {
265 lresize (drawn_buf[row]); 300 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 301 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
267 } 302 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
268 303
269 for (int row = prev_nrow; row < nrow; row++) 304 copy_line (swap_buf [row], prev_swap_buf [row]);
270 { 305 }
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277 306
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 307 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 308 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 309 int q = total_rows; // rewrapped row
281 310
… …
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 318 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 319
291 do 320 do
292 { 321 {
293 p = MOD (p - 1, prev_total_rows); 322 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 323 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 324 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 325 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 326
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 327 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 328 {
300 p = MOD (p - 1, prev_total_rows); 329 p = MOD (p - 1, prev_total_rows);
301 330
302 plines++; 331 plines++;
303 llen += prev_ncol; 332 llen += prev_ncol;
… …
316 345
317 // re-assemble the full line by destination lines 346 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 347 for (int qrow = q; qlines--; qrow++)
319 { 348 {
320 qline = row_buf + qrow; 349 qline = row_buf + qrow;
321 lalloc (*qline); 350 qline->alloc (); // redundant with next line
322 qline->l = ncol; 351 qline->l = ncol;
323 qline->is_longer (1); 352 qline->is_longer (1);
324 353
325 int qcol = 0; 354 int qcol = 0;
326 355
… …
341 // this seems to upset applications/shells/readline 370 // this seems to upset applications/shells/readline
342 // least. 371 // least.
343 if (prow == ocur.row) 372 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 373 screen.cur.row = q - (total_rows - nrow);
345 374
346 line_t &pline = old_buf [prow]; 375 line_t &pline = prev_row_buf [prow];
347 376
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 377 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 378
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 379 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 380 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 401 {
373 // if no scrollback exists (yet), wing, instead of wrap 402 // if no scrollback exists (yet), wing, instead of wrap
374 403
375 for (int row = min (nrow, prev_nrow); row--; ) 404 for (int row = min (nrow, prev_nrow); row--; )
376 { 405 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 406 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 407 line_t &dst = row_buf [row];
379 408
380 qline = pline; 409 copy_line (dst, src);
381 lresize (qline);
382 } 410 }
383 411
384 for (int row = prev_nrow; row < nrow; row++) 412 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 413 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 414
389 term_start = 0; 415 term_start = 0;
390 } 416 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 417
396 clamp_it (screen.cur.row, 0, nrow - 1); 418 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 419 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 420 }
399 421
422 for (int row = nrow; row--; )
423 {
424 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
425 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
426 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
427 }
428
429 chunk_free (prev_chunk, prev_chunk_size);
430
400 free (tabs); 431 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 432 tabs = (char *)rxvt_malloc (ncol);
402 433
403 for (int col = ncol; --col; ) 434 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 435 tabs [col] = col % TABSIZE == 0;
405 436
406 CLEAR_ALL_SELECTION (); 437 CLEAR_ALL_SELECTION ();
407 438
408 prev_nrow = nrow; 439 prev_nrow = nrow;
… …
411 tt_winch (); 442 tt_winch ();
412 443
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 444 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 445}
415 446
416/* ------------------------------------------------------------------------- */ 447void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 448rxvt_term::scr_release () NOTHROW
422{ 449{
423 if (row_buf) 450 chunk_free (chunk, chunk_size);
424 { 451 chunk = 0;
425 delete talloc; talloc = 0; 452 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 453
428 free (row_buf);
429 free (swap_buf);
430 free (drawn_buf);
431 row_buf = 0; // signal that we freed all the arrays above
432
433 free (tabs); 454 free (tabs);
434 tabs = 0; 455 tabs = 0;
435 }
436} 456}
437 457
438/* ------------------------------------------------------------------------- */ 458/* ------------------------------------------------------------------------- */
439/* 459/*
440 * Hard/Soft reset 460 * Hard/Soft reset
441 */ 461 */
442void 462void ecb_cold
443rxvt_term::scr_poweron () 463rxvt_term::scr_poweron ()
444{ 464{
445 scr_release (); 465 scr_release ();
466
446 prev_nrow = prev_ncol = 0; 467 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 468 rvideo_mode = false;
448 scr_soft_reset (); 469 scr_soft_reset ();
449 scr_reset (); 470 scr_reset ();
450 471
451 scr_clear (true); 472 scr_clear (true);
452 scr_refresh (); 473 scr_refresh ();
453} 474}
454 475
455void 476void ecb_cold
456rxvt_term::scr_soft_reset () 477rxvt_term::scr_soft_reset () NOTHROW
457{ 478{
458 /* only affects modes, nothing drastic such as clearing the screen */ 479 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 480#if ENABLE_OVERLAY
460 scr_overlay_off (); 481 scr_overlay_off ();
461#endif 482#endif
… …
516 assert (s->cur.row >= 0); 537 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 538 assert (s->cur.col >= 0);
518} 539}
519 540
520void 541void
521rxvt_term::scr_swap_screen () 542rxvt_term::scr_swap_screen () NOTHROW
522{ 543{
523 if (!option (Opt_secondaryScreen)) 544 if (!option (Opt_secondaryScreen))
524 return; 545 return;
525 546
526 for (int i = prev_nrow; i--; ) 547 for (int i = prev_nrow; i--; )
… …
545 return; 566 return;
546 567
547 want_refresh = 1; 568 want_refresh = 1;
548 view_start = 0; 569 view_start = 0;
549 570
550 selection_check (2); /* check for boundary cross */ 571 /* check for boundary cross */
572 row_col_t pos;
573 pos.row = pos.col = 0;
574 if (ROWCOL_IS_BEFORE (selection.beg, pos)
575 && ROWCOL_IS_AFTER (selection.end, pos))
576 CLEAR_SELECTION ();
551 577
552 current_screen = scrn; 578 current_screen = scrn;
553 579
554#if NSCREENS 580#if NSCREENS
555 if (option (Opt_secondaryScreen)) 581 if (option (Opt_secondaryScreen))
… …
621/* 647/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 648 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 649 * count positive ==> scroll up
624 * count negative ==> scroll down 650 * count negative ==> scroll down
625 */ 651 */
626int 652int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 653rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628{ 654{
629 if (count == 0 || (row1 > row2)) 655 if (count == 0 || (row1 > row2))
630 return 0; 656 return 0;
631 657
… …
634 660
635 if (count > 0 661 if (count > 0
636 && row1 == 0 662 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 663 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 664 {
665 min_it (count, total_rows - (nrow - (row2 + 1)));
666
639 top_row = max (top_row - count, -saveLines); 667 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 668
644 // sever bottommost line 669 // sever bottommost line
645 { 670 {
646 line_t &l = ROW(row2 - count); 671 line_t &l = ROW(row2);
647 l.is_longer (0); 672 l.is_longer (0);
648 l.touch (); 673 l.touch ();
649 } 674 }
650 675
676 // scroll everything up 'count' lines
677 term_start = (term_start + count) % total_rows;
678
679 // now copy lines below the scroll region bottom to the
680 // bottom of the screen again, so they look as if they
681 // hadn't moved.
682 for (int i = nrow; --i > row2; )
683 {
684 line_t &l1 = ROW(i - count);
685 line_t &l2 = ROW(i);
686
687 ::swap (l1, l2);
688 l2.touch ();
689 }
690
651 // erase newly scrolled-in lines 691 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 692 for (int i = count; i--; )
653 { 693 {
654 line_t &l = ROW(nrow - 1 - i); 694 line_t &l = ROW(row2 - i);
655 695
656 // optimize if already cleared, can be significant on slow machines 696 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 697 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 698 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 699 {
660 scr_blank_line (l, 0, l.l, rstyle); 700 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 701 l.l = 0;
… …
663 } 703 }
664 else 704 else
665 scr_blank_screen_mem (l, rstyle); 705 scr_blank_screen_mem (l, rstyle);
666 } 706 }
667 707
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any 708 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 709 if (selection.op && current_screen == selection.screen
710 && selection.beg.row <= row2)
682 { 711 {
683 selection.beg.row -= count; 712 selection.beg.row -= count;
684 selection.end.row -= count; 713 selection.end.row -= count;
685 selection.mark.row -= count; 714 selection.mark.row -= count;
686 715
687 if (selection.beg.row < top_row 716 selection_check (0);
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 } 717 }
695 718
696 // finally move the view window, if desired 719 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 720 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 721 && view_start != 0
… …
728 } 751 }
729 752
730 // use a simple and robust scrolling algorithm, this 753 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 754 // part of scr_scroll_text is not time-critical.
732 755
756 // sever line above scroll region
757 if (row1)
758 {
759 line_t &l = ROW(row1 - 1);
760 l.is_longer (0);
761 l.touch ();
762 }
763
733 int rows = row2 - row1 + 1; 764 int rows = row2 - row1 + 1;
734 765
735 min_it (count, rows); 766 min_it (count, rows);
736 767
737 line_t *temp_buf = row_buf + total_rows; 768 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 769
739 for (int row = 0; row < rows; row++) 770 for (int row = 0; row < rows; row++)
740 { 771 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 772 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 773
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 775 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 776 }
746 777
747 for (int row = 0; row < rows; row++) 778 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 779 ROW(row1 + row) = temp_buf [row];
780
781 // sever bottommost line
782 {
783 line_t &l = ROW(row2);
784 l.is_longer (0);
785 l.touch ();
786 }
749 } 787 }
750 788
751 return count; 789 return count;
752} 790}
753 791
754/* ------------------------------------------------------------------------- */ 792/* ------------------------------------------------------------------------- */
755/* 793/*
756 * Add text given in <str> of length <len> to screen struct 794 * Add text given in <str> of length <len> to screen struct
757 */ 795 */
758void 796void ecb_hot
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 797rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760{ 798{
761 if (len <= 0) /* sanity */ 799 if (len <= 0) /* sanity */
762 return; 800 return;
763 801
764 unsigned char checksel; 802 bool checksel;
765 unicode_t c; 803 unicode_t c;
766 int ncol = this->ncol; 804 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 805 const wchar_t *strend = str + len;
768 806
769 want_refresh = 1; 807 want_refresh = 1;
… …
795 833
796 while (str < strend) 834 while (str < strend)
797 { 835 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 836 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 837
800 if (expect_false (c < 0x20)) 838 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 839 if (c == C0_LF)
802 { 840 {
803 max_it (line->l, screen.cur.col); 841 max_it (line->l, screen.cur.col);
804 842
805 screen.flags &= ~Screen_WrapNext; 843 screen.flags &= ~Screen_WrapNext;
… …
824 { 862 {
825 scr_tab (1, true); 863 scr_tab (1, true);
826 continue; 864 continue;
827 } 865 }
828 866
829 if (expect_false ( 867 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 868 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 869 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 870 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 871 ))
834 { 872 {
… …
839 * should be a similar check. 877 * should be a similar check.
840 */ 878 */
841 CLEAR_SELECTION (); 879 CLEAR_SELECTION ();
842 } 880 }
843 881
844 if (expect_false (screen.flags & Screen_WrapNext)) 882 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 883 {
846 scr_do_wrap (); 884 scr_do_wrap ();
847 885
848 line->l = ncol; 886 line->l = ncol;
849 line->is_longer (1); 887 line->is_longer (1);
… …
851 row = screen.cur.row; 889 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 890 line = &ROW(row); /* _must_ refresh */
853 } 891 }
854 892
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 893 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 894 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 895 c = 0xfffd;
858 896
859 // rely on wcwidth to tell us the character width, do wcwidth before 897 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 898 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 899 // drawing characters below as they might be invalid in the current
862 // locale. 900 // locale.
863 int width = WCWIDTH (c); 901 int width = WCWIDTH (c);
864 902
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 903 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 904 {
867 // vt100 special graphics and line drawing 905 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 906 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 907 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 908 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 921 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 922 width = 1; // vt100 line drawing characters are always single-width
885 } 923 }
886 } 924 }
887 925
888 if (expect_false (screen.flags & Screen_Insert)) 926 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 927 scr_insdel_chars (width, INSERT);
890 928
891 if (width != 0) 929 if (width != 0)
892 { 930 {
893#if !UNICODE_3 931#if !UNICODE_3
… …
898# else 936# else
899 c = 0xfffd; 937 c = 0xfffd;
900# endif 938# endif
901#endif 939#endif
902 940
941 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
942
943 // if the character doesn't fit into the remaining columns...
944 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
945 {
946 if (screen.flags & Screen_Autowrap)
947 {
948 // ... artificially enlargen the previous one
949 c = NOCHAR;
950 // and try the same character next loop iteration
951 --str;
952 }
953 else
954 screen.cur.col = ncol - width;
955 }
956
903 // nuke the character at this position, if required 957 // nuke the character at this position, if required
904 if (expect_false ( 958 // due to wonderful coincidences everywhere else in this loop
959 // we never have to check for overwriting a wide char itself,
960 // only its tail.
905 line->t[screen.cur.col] == NOCHAR 961 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col); 962 scr_kill_char (*line, screen.cur.col);
910
911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921 963
922 line->touch (); 964 line->touch ();
923 965
924 do 966 do
925 { 967 {
926 line->t[screen.cur.col] = c; 968 line->t[screen.cur.col] = c;
927 line->r[screen.cur.col] = rend; 969 line->r[screen.cur.col] = rend;
928 970
929 if (expect_true (screen.cur.col < ncol - 1)) 971 if (ecb_likely (screen.cur.col < ncol - 1))
930 screen.cur.col++; 972 screen.cur.col++;
931 else 973 else
932 { 974 {
933 line->l = ncol; 975 line->l = ncol;
934 if (screen.flags & Screen_Autowrap) 976 if (screen.flags & Screen_Autowrap)
935 screen.flags |= Screen_WrapNext; 977 screen.flags |= Screen_WrapNext;
936 break; 978
979 goto end_of_line;
937 } 980 }
938 981
939 c = NOCHAR; 982 c = NOCHAR;
940 } 983 }
941 while (expect_false (--width > 0)); 984 while (ecb_unlikely (--width > 0));
942 985
943 // pad with spaces when overwriting wide character with smaller one 986 // pad with spaces when overwriting wide character with smaller one
944 if (expect_false (!width)) 987 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
945 { 988 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
950 line->t[c] = ' '; 989 line->t[c] = ' ';
951 line->r[c] = rend; 990 line->r[c] = rend;
952 }
953 } 991 }
992
993end_of_line:
994 ;
954 } 995 }
955#if ENABLE_COMBINING 996#if ENABLE_COMBINING
956 else // width == 0 997 else // width == 0
957 { 998 {
958 if (c != 0xfeff) // ignore BOM 999 if (c != 0xfeff) // ignore BOM
… …
1021 1062
1022 want_refresh = 1; 1063 want_refresh = 1;
1023#endif 1064#endif
1024 } 1065 }
1025 } 1066 }
1067 else if (screen.flags & Screen_WrapNext)
1068 screen.flags &= ~Screen_WrapNext;
1026 else 1069 else
1027 scr_gotorc (0, -1, RELATIVE); 1070 scr_gotorc (0, -1, RELATIVE);
1028} 1071}
1029 1072
1030/* ------------------------------------------------------------------------- */ 1073/* ------------------------------------------------------------------------- */
… …
1108 * XTERM_SEQ: ESC 6 1151 * XTERM_SEQ: ESC 6
1109 * Move cursor left in row. If we're at the left boundary, shift everything 1152 * Move cursor left in row. If we're at the left boundary, shift everything
1110 * in that row right. Clear left column. 1153 * in that row right. Clear left column.
1111 */ 1154 */
1112#if !ENABLE_MINIMAL 1155#if !ENABLE_MINIMAL
1113void 1156void ecb_cold
1114rxvt_term::scr_backindex () NOTHROW 1157rxvt_term::scr_backindex () NOTHROW
1115{ 1158{
1116 if (screen.cur.col > 0) 1159 if (screen.cur.col > 0)
1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1160 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1118 else 1161 else
… …
1125 * XTERM_SEQ: ESC 9 1168 * XTERM_SEQ: ESC 9
1126 * Move cursor right in row. If we're at the right boundary, shift everything 1169 * Move cursor right in row. If we're at the right boundary, shift everything
1127 * in that row left. Clear right column. 1170 * in that row left. Clear right column.
1128 */ 1171 */
1129#if !ENABLE_MINIMAL 1172#if !ENABLE_MINIMAL
1130void 1173void ecb_cold
1131rxvt_term::scr_forwardindex () NOTHROW 1174rxvt_term::scr_forwardindex () NOTHROW
1132{ 1175{
1133 if (screen.cur.col < ncol - 1) 1176 if (screen.cur.col < ncol - 1)
1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1177 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1135 else 1178 else
… …
1286 scr_blank_line (line, col, num, rstyle); 1329 scr_blank_line (line, col, num, rstyle);
1287} 1330}
1288 1331
1289/* ------------------------------------------------------------------------- */ 1332/* ------------------------------------------------------------------------- */
1290/* 1333/*
1291 * Erase part of whole of the screen 1334 * Erase part or whole of the screen
1292 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1335 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1293 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1336 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1294 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1337 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1295 */ 1338 */
1296void 1339void
… …
1305 ZERO_SCROLLBACK (); 1348 ZERO_SCROLLBACK ();
1306 1349
1307 switch (mode) 1350 switch (mode)
1308 { 1351 {
1309 case 0: /* erase to end of screen */ 1352 case 0: /* erase to end of screen */
1310 selection_check (1);
1311 scr_erase_line (0); 1353 scr_erase_line (0);
1312 row = screen.cur.row + 1; /* possible OOB */ 1354 row = screen.cur.row + 1; /* possible OOB */
1313 num = nrow - row; 1355 num = nrow - row;
1314 break; 1356 break;
1315 case 1: /* erase to beginning of screen */ 1357 case 1: /* erase to beginning of screen */
1316 selection_check (3);
1317 scr_erase_line (1); 1358 scr_erase_line (1);
1318 row = 0; 1359 row = 0;
1319 num = screen.cur.row; 1360 num = screen.cur.row;
1320 break; 1361 break;
1321 case 2: /* erase whole screen */ 1362 case 2: /* erase whole screen */
1322 selection_check (3);
1323 row = 0; 1363 row = 0;
1324 num = nrow; 1364 num = nrow;
1325 break; 1365 break;
1326 default: 1366 default:
1327 return; 1367 return;
… …
1336 if (row >= nrow) /* Out Of Bounds */ 1376 if (row >= nrow) /* Out Of Bounds */
1337 return; 1377 return;
1338 1378
1339 min_it (num, nrow - row); 1379 min_it (num, nrow - row);
1340 1380
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline)) 1381 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1345 ren = (rend_t) ~RS_None; 1382 ren = (rend_t) ~RS_None;
1346 else if (GET_BASEBG (rstyle) == Color_bg) 1383 else if (GET_BASEBG (rstyle) == Color_bg)
1347 { 1384 {
1348 ren = DEFAULT_RSTYLE; 1385 ren = DEFAULT_RSTYLE;
1349 1386
1350 if (mapped && !view_start) 1387 if (mapped)
1351 XClearArea (dpy, vt, 0, 1388 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width, 1389 Row2Pixel (row - view_start), (unsigned int)vt_width,
1353 (unsigned int)Height2Pixel (num), False); 1390 (unsigned int)Height2Pixel (num), False);
1354 } 1391 }
1355 else 1392 else
1356 { 1393 {
1357 ren = rstyle & (RS_fgMask | RS_bgMask); 1394 ren = rstyle & (RS_fgMask | RS_bgMask);
1358 1395
1359 if (mapped && !view_start) 1396 if (mapped)
1360 { 1397 {
1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1398 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1362 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1399 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1363 XFillRectangle (dpy, vt, gc, 1400 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start), 1401 0, Row2Pixel (row - view_start),
1365 (unsigned int)width, 1402 (unsigned int)vt_width,
1366 (unsigned int)Height2Pixel (num)); 1403 (unsigned int)Height2Pixel (num));
1367 gcvalue.foreground = pix_colors[Color_fg]; 1404 gcvalue.foreground = pix_colors[Color_fg];
1368 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1405 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 } 1406 }
1370 } 1407 }
1371 1408
1372 for (; num--; row++) 1409 for (; num--; row++)
1373 { 1410 {
1374 scr_blank_screen_mem (ROW(row), rstyle); 1411 scr_blank_screen_mem (ROW(row), rstyle);
1375 1412
1376 if (!view_start) 1413 if (row - view_start < nrow)
1377 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1414 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1378 } 1415 }
1379} 1416}
1380 1417
1381#if !ENABLE_MINIMAL 1418#if !ENABLE_MINIMAL
1382void 1419void
… …
1392/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1393/* 1430/*
1394 * Fill the screen with `E's 1431 * Fill the screen with `E's
1395 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1432 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1396 */ 1433 */
1397void 1434void ecb_cold
1398rxvt_term::scr_E () NOTHROW 1435rxvt_term::scr_E () NOTHROW
1399{ 1436{
1400 rend_t fs; 1437 rend_t fs;
1401 1438
1402 want_refresh = 1; 1439 want_refresh = 1;
1403 ZERO_SCROLLBACK (); 1440 ZERO_SCROLLBACK ();
1404 1441
1405 num_scr_allow = 0; 1442 num_scr_allow = 0;
1406 selection_check (3); 1443
1444 row_col_t pos;
1445 pos.row = pos.col = 0;
1446 if (ROWCOL_IS_AFTER (selection.end, pos))
1447 CLEAR_SELECTION ();
1407 1448
1408 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1449 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1409 for (int row = nrow; row--; ) 1450 for (int row = nrow; row--; )
1410 { 1451 {
1411 line_t &line = ROW(row); 1452 line_t &line = ROW(row);
… …
1562/* ------------------------------------------------------------------------- */ 1603/* ------------------------------------------------------------------------- */
1563/* 1604/*
1564 * Set the scrolling region 1605 * Set the scrolling region
1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1606 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1566 */ 1607 */
1567void 1608void ecb_cold
1568rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1609rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1569{ 1610{
1570 max_it (top, 0); 1611 max_it (top, 0);
1571 min_it (bot, nrow - 1); 1612 min_it (bot, nrow - 1);
1572 1613
… …
1582/* 1623/*
1583 * Make the cursor visible/invisible 1624 * Make the cursor visible/invisible
1584 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1625 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1585 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1626 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1586 */ 1627 */
1587void 1628void ecb_cold
1588rxvt_term::scr_cursor_visible (int mode) NOTHROW 1629rxvt_term::scr_cursor_visible (int mode) NOTHROW
1589{ 1630{
1590 want_refresh = 1; 1631 want_refresh = 1;
1591 1632
1592 if (mode) 1633 if (mode)
… …
1599/* 1640/*
1600 * Set/unset automatic wrapping 1641 * Set/unset automatic wrapping
1601 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1642 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1602 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1643 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1603 */ 1644 */
1604void 1645void ecb_cold
1605rxvt_term::scr_autowrap (int mode) NOTHROW 1646rxvt_term::scr_autowrap (int mode) NOTHROW
1606{ 1647{
1607 if (mode) 1648 if (mode)
1608 screen.flags |= Screen_Autowrap; 1649 screen.flags |= Screen_Autowrap;
1609 else 1650 else
… …
1618 * Relative mode: line numbers are relative to top margin of scrolling region 1659 * Relative mode: line numbers are relative to top margin of scrolling region
1619 * and the cursor cannot be moved outside. 1660 * and the cursor cannot be moved outside.
1620 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1661 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1621 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1662 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1622 */ 1663 */
1623void 1664void ecb_cold
1624rxvt_term::scr_relative_origin (int mode) NOTHROW 1665rxvt_term::scr_relative_origin (int mode) NOTHROW
1625{ 1666{
1626 if (mode) 1667 if (mode)
1627 screen.flags |= Screen_Relative; 1668 screen.flags |= Screen_Relative;
1628 else 1669 else
… …
1635/* 1676/*
1636 * Set insert/replace mode 1677 * Set insert/replace mode
1637 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1678 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1638 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1679 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1639 */ 1680 */
1640void 1681void ecb_cold
1641rxvt_term::scr_insert_mode (int mode) NOTHROW 1682rxvt_term::scr_insert_mode (int mode) NOTHROW
1642{ 1683{
1643 if (mode) 1684 if (mode)
1644 screen.flags |= Screen_Insert; 1685 screen.flags |= Screen_Insert;
1645 else 1686 else
… …
1651 * Set/Unset tabs 1692 * Set/Unset tabs
1652 * XTERM_SEQ: Set tab at current column : ESC H 1693 * XTERM_SEQ: Set tab at current column : ESC H
1653 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1694 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1654 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1695 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1655 */ 1696 */
1656void 1697void ecb_cold
1657rxvt_term::scr_set_tab (int mode) NOTHROW 1698rxvt_term::scr_set_tab (int mode) NOTHROW
1658{ 1699{
1659 if (mode < 0) 1700 if (mode < 0)
1660 memset (tabs, 0, ncol); 1701 memset (tabs, 0, ncol);
1661 else if (screen.cur.col < ncol) 1702 else if (screen.cur.col < ncol)
… …
1680 if (rvideo_state != on) 1721 if (rvideo_state != on)
1681 { 1722 {
1682 rvideo_state = on; 1723 rvideo_state = on;
1683 1724
1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1725 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP 1726#ifdef HAVE_IMG
1686 if (bgPixmap.pixmap == None) 1727 if (bg_img == 0)
1687#endif 1728#endif
1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1729 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1689 1730
1690 XGCValues gcvalue; 1731 XGCValues gcvalue;
1691 gcvalue.foreground = pix_colors[Color_fg]; 1732 gcvalue.foreground = pix_colors[Color_fg];
… …
1700/* ------------------------------------------------------------------------- */ 1741/* ------------------------------------------------------------------------- */
1701/* 1742/*
1702 * Report current cursor position 1743 * Report current cursor position
1703 * XTERM_SEQ: Report position: ESC [ 6 n 1744 * XTERM_SEQ: Report position: ESC [ 6 n
1704 */ 1745 */
1705void 1746void ecb_cold
1706rxvt_term::scr_report_position () NOTHROW 1747rxvt_term::scr_report_position () NOTHROW
1707{ 1748{
1708 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1749 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1709} 1750}
1710 1751
… …
1713 * ------------------------------------------------------------------------- */ 1754 * ------------------------------------------------------------------------- */
1714 1755
1715/* 1756/*
1716 * Set font style 1757 * Set font style
1717 */ 1758 */
1718void 1759void ecb_cold
1719rxvt_term::set_font_style () NOTHROW 1760rxvt_term::set_font_style () NOTHROW
1720{ 1761{
1721#if 0 1762#if 0
1722 switch (charsets [screen.charset]) 1763 switch (charsets [screen.charset])
1723 { 1764 {
… …
1745 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1786 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1746 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1787 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1747 * XTERM_SEQ: Invoke G2 character set: ESC N 1788 * XTERM_SEQ: Invoke G2 character set: ESC N
1748 * XTERM_SEQ: Invoke G3 character set: ESC O 1789 * XTERM_SEQ: Invoke G3 character set: ESC O
1749 */ 1790 */
1750void 1791void ecb_cold
1751rxvt_term::scr_charset_choose (int set) NOTHROW 1792rxvt_term::scr_charset_choose (int set) NOTHROW
1752{ 1793{
1753 screen.charset = set; 1794 screen.charset = set;
1754 set_font_style (); 1795 set_font_style ();
1755} 1796}
… …
1776 * ------------------------------------------------------------------------- */ 1817 * ------------------------------------------------------------------------- */
1777 1818
1778/* 1819/*
1779 * refresh matching text. 1820 * refresh matching text.
1780 */ 1821 */
1781bool 1822bool ecb_cold
1782rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1823rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1783{ 1824{
1784 bool found = false; 1825 bool found = false;
1785 1826
1786 for (int i = 0; i < nrow; i++) 1827 for (int i = 0; i < nrow; i++)
… …
1805 PART_BEG = 0, 1846 PART_BEG = 0,
1806 PART_END, 1847 PART_END,
1807 RC_COUNT 1848 RC_COUNT
1808}; 1849};
1809 1850
1810void 1851void ecb_hot
1811rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1852rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1812{ 1853{
1813 int i; 1854 int i;
1814 row_col_t rc[RC_COUNT]; 1855 row_col_t rc[RC_COUNT];
1815 1856
… …
1852 * Refresh the entire screen 1893 * Refresh the entire screen
1853 */ 1894 */
1854void 1895void
1855rxvt_term::scr_touch (bool refresh) NOTHROW 1896rxvt_term::scr_touch (bool refresh) NOTHROW
1856{ 1897{
1857 scr_expose (0, 0, width, height, refresh); 1898 scr_expose (0, 0, vt_width, vt_height, refresh);
1858} 1899}
1859 1900
1860/* ------------------------------------------------------------------------- */ 1901/* ------------------------------------------------------------------------- */
1861/* 1902/*
1862 * Move the display so that the line represented by scrollbar value Y is at 1903 * Move the display so that the line represented by scrollbar value Y is at
… …
1918 1959
1919# ifndef NO_MAPALERT 1960# ifndef NO_MAPALERT
1920# ifdef MAPALERT_OPTION 1961# ifdef MAPALERT_OPTION
1921 if (option (Opt_mapAlert)) 1962 if (option (Opt_mapAlert))
1922# endif 1963# endif
1923 XMapWindow (dpy, parent[0]); 1964 XMapWindow (dpy, parent);
1924# endif 1965# endif
1925 1966
1926# if ENABLE_FRILLS 1967# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell)) 1968 if (option (Opt_urgentOnBell))
1928 set_urgency (1); 1969 set_urgency (1);
… …
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1982 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1942#endif 1983#endif
1943} 1984}
1944 1985
1945/* ------------------------------------------------------------------------- */ 1986/* ------------------------------------------------------------------------- */
1946/* ARGSUSED */ 1987void ecb_cold
1947void
1948rxvt_term::scr_printscreen (int fullhist) NOTHROW 1988rxvt_term::scr_printscreen (int fullhist) NOTHROW
1949{ 1989{
1950#ifdef PRINTPIPE 1990#ifdef PRINTPIPE
1951 int nrows, row_start; 1991 int nrows, row_start;
1952 FILE *fd = popen_printer (); 1992 FILE *fd = popen_printer ();
… …
2001/* 2041/*
2002 * Refresh the screen 2042 * Refresh the screen
2003 * drawn_text/drawn_rend contain the screen information before the update. 2043 * drawn_text/drawn_rend contain the screen information before the update.
2004 * screen.text/screen.rend contain what the screen will change to. 2044 * screen.text/screen.rend contain what the screen will change to.
2005 */ 2045 */
2006void 2046void ecb_hot
2007rxvt_term::scr_refresh () NOTHROW 2047rxvt_term::scr_refresh () NOTHROW
2008{ 2048{
2009 int16_t col, row, /* column/row we're processing */ 2049 int16_t col, row, /* column/row we're processing */
2010 ocrow; /* old cursor row */ 2050 ocrow; /* old cursor row */
2011 int i; /* tmp */ 2051 int i; /* tmp */
2012#ifndef NO_CURSORCOLOR
2013 rend_t cc1; /* store colours at cursor position (s) */
2014#endif
2015 rend_t *crp; // cursor rendition pointer
2016 rend_t ccol1, /* Cursor colour */ 2052 rend_t ccol1, /* Cursor colour */
2017 ccol2; /* Cursor colour2 */ 2053 ccol2; /* Cursor colour2 */
2054 rend_t cur_rend;
2055 int cur_col;
2018 2056
2019 want_refresh = 0; /* screen is current */ 2057 want_refresh = 0; /* screen is current */
2020 2058
2021 if (refresh_type == NO_REFRESH || !mapped) 2059 if (refresh_type == NO_REFRESH || !mapped)
2022 return; 2060 return;
… …
2025 * A: set up vars 2063 * A: set up vars
2026 */ 2064 */
2027 refresh_count = 0; 2065 refresh_count = 0;
2028 2066
2029 unsigned int old_screen_flags = screen.flags; 2067 unsigned int old_screen_flags = screen.flags;
2030 char have_bg = 0; 2068 bool have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP 2069#ifdef HAVE_IMG
2032 have_bg = bgPixmap.pixmap != None; 2070 have_bg = bg_img != 0;
2033#endif 2071#endif
2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2072 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2035 2073
2036 /* 2074 /*
2037 * B: reverse any characters which are selected 2075 * B: reverse any characters which are selected
… …
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2079 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY 2080#if ENABLE_OVERLAY
2043 scr_swap_overlay (); 2081 scr_swap_overlay ();
2044#endif 2082#endif
2045 2083
2046 char showcursor = screen.flags & Screen_VisibleCursor; 2084 bool showcursor = screen.flags & Screen_VisibleCursor;
2047 2085
2048 /* 2086 /*
2049 * C: set the cursor character (s) 2087 * C: set the cursor character (s)
2050 */ 2088 */
2051 { 2089 {
2052 unsigned char setoldcursor; 2090 bool setoldcursor;
2053 2091
2054#ifdef CURSOR_BLINK 2092#ifdef CURSOR_BLINK
2055 if (hidden_cursor) 2093 if (hidden_cursor)
2056 showcursor = 0; 2094 showcursor = 0;
2057#endif 2095#endif
… …
2061 int col = screen.cur.col; 2099 int col = screen.cur.col;
2062 2100
2063 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2101 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2064 col--; 2102 col--;
2065 2103
2066 crp = &ROW(screen.cur.row).r[col]; 2104 cur_rend = ROW(screen.cur.row).r[col];
2105 cur_col = col;
2067 2106
2068#ifndef NO_CURSORCOLOR 2107#ifndef NO_CURSORCOLOR
2069 cc1 = *crp & (RS_fgMask | RS_bgMask);
2070 if (ISSET_PIXCOLOR (Color_cursor)) 2108 if (ISSET_PIXCOLOR (Color_cursor))
2071 ccol1 = Color_cursor; 2109 ccol1 = Color_cursor;
2072 else 2110 else
2073#endif 2111#endif
2074#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2112#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2088 ccol2 = Color_bg; 2126 ccol2 = Color_bg;
2089#endif 2127#endif
2090 2128
2091 if (focus) 2129 if (focus)
2092 { 2130 {
2131 rend_t rend = cur_rend;
2132
2093 if (option (Opt_cursorUnderline)) 2133 if (option (Opt_cursorUnderline))
2094 *crp ^= RS_Uline; 2134 rend ^= RS_Uline;
2095 else 2135 else
2096 { 2136 {
2097 *crp ^= RS_RVid; 2137 rend ^= RS_RVid;
2098 *crp = SET_FGCOLOR (*crp, ccol1); 2138 rend = SET_FGCOLOR (rend, ccol1);
2099 *crp = SET_BGCOLOR (*crp, ccol2); 2139 rend = SET_BGCOLOR (rend, ccol2);
2100 } 2140 }
2141
2142 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2101 } 2143 }
2102 } 2144 }
2103 2145
2104 /* make sure no outline cursor is left around */ 2146 /* make sure no outline cursor is left around */
2105 setoldcursor = 0; 2147 setoldcursor = 0;
… …
2144 { 2186 {
2145 int16_t nits; 2187 int16_t nits;
2146 int i = num_scr; 2188 int i = num_scr;
2147 int j; 2189 int j;
2148 int len, wlen; 2190 int len, wlen;
2149 dLocal (int, num_scr);
2150 2191
2151 j = nrow; 2192 j = nrow;
2152 wlen = len = -1; 2193 wlen = len = -1;
2153 row = i > 0 ? 0 : j - 1; 2194 row = i > 0 ? 0 : j - 1;
2154 2195
… …
2229 continue; 2270 continue;
2230 2271
2231 // redraw one or more characters 2272 // redraw one or more characters
2232 2273
2233 // seek to the beginning of wide characters 2274 // seek to the beginning of wide characters
2234 while (expect_false (stp[col] == NOCHAR && col > 0)) 2275 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2235 --col; 2276 --col;
2236 2277
2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2278 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2238 text_t *text = stp + col; 2279 text_t *text = stp + col;
2239 int count = 1; 2280 int count = 1;
… …
2277 2318
2278 col--; /* went one too far. move back */ 2319 col--; /* went one too far. move back */
2279 count -= i; /* dump any matching trailing chars */ 2320 count -= i; /* dump any matching trailing chars */
2280 2321
2281 // sometimes we optimize away the trailing NOCHAR's, add them back 2322 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR)) 2323 while (ecb_unlikely (i && text[count] == NOCHAR))
2283 count++, i--; 2324 count++, i--;
2284 2325
2285 /* 2326 /*
2286 * Determine the attributes for the string 2327 * Determine the attributes for the string
2287 */ 2328 */
2288 int fore = fgcolor_of (rend); // desired foreground 2329 int fore = fgcolor_of (rend); // desired foreground
2289 int back = bgcolor_of (rend); // desired background 2330 int back = bgcolor_of (rend); // desired background
2290 2331
2291 // only do special processing if any attributes are set, which is unlikely 2332 // only do special processing if any attributes are set, which is unlikely
2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2333 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2293 { 2334 {
2294 bool invert = rend & RS_RVid; 2335 bool invert = rend & RS_RVid;
2295 2336
2296#ifndef NO_BOLD_UNDERLINE_REVERSE 2337#ifndef NO_BOLD_UNDERLINE_REVERSE
2297 if (rend & RS_Bold && fore == Color_fg) 2338 if (rend & RS_Bold && fore == Color_fg)
… …
2386 /* 2427 /*
2387 * Actually do the drawing of the string here 2428 * Actually do the drawing of the string here
2388 */ 2429 */
2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2430 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2390 2431
2391 if (expect_true (have_bg && back == Color_bg)) 2432 if (ecb_likely (have_bg && back == Color_bg))
2392 { 2433 {
2393 // this is very ugly, maybe push it into ->draw? 2434 // this is very ugly, maybe push it into ->draw?
2394 2435
2395 for (i = 0; i < count; i++) /* don't draw empty strings */ 2436 for (i = 0; i < count; i++) /* don't draw empty strings */
2396 if (text[i] != ' ') 2437 if (text[i] != ' ')
… …
2403 did_clear: ; 2444 did_clear: ;
2404 } 2445 }
2405 else 2446 else
2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2447 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2407 2448
2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2449 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2409 { 2450 {
2410#if ENABLE_FRILLS 2451#if ENABLE_FRILLS
2411 if (ISSET_PIXCOLOR (Color_underline)) 2452 if (ISSET_PIXCOLOR (Color_underline))
2412 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2453 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2413 else 2454 else
… …
2425 * G: cleanup cursor and display outline cursor if necessary 2466 * G: cleanup cursor and display outline cursor if necessary
2426 */ 2467 */
2427 if (showcursor) 2468 if (showcursor)
2428 { 2469 {
2429 if (focus) 2470 if (focus)
2430 { 2471 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2431 if (option (Opt_cursorUnderline))
2432 *crp ^= RS_Uline;
2433 else
2434 {
2435 *crp ^= RS_RVid;
2436#ifndef NO_CURSORCOLOR
2437 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2438#endif
2439 }
2440 }
2441 else if (oldcursor.row >= 0) 2472 else if (oldcursor.row >= 0)
2442 { 2473 {
2443 int cursorwidth = 1; 2474 int cursorwidth = 1;
2444 int col = oldcursor.col; 2475 int col = oldcursor.col;
2445 2476
… …
2459 2490
2460 XDrawRectangle (dpy, vt, gc, 2491 XDrawRectangle (dpy, vt, gc,
2461 Col2Pixel (col), 2492 Col2Pixel (col),
2462 Row2Pixel (oldcursor.row), 2493 Row2Pixel (oldcursor.row),
2463 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2494 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2464 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2495 (unsigned int) (Height2Pixel (1) - 1));
2465 } 2496 }
2466 } 2497 }
2467 2498
2468 /* 2499 /*
2469 * H: cleanup selection 2500 * H: cleanup selection
… …
2478 screen.flags = old_screen_flags; 2509 screen.flags = old_screen_flags;
2479 num_scr = 0; 2510 num_scr = 0;
2480 num_scr_allow = 1; 2511 num_scr_allow = 1;
2481} 2512}
2482 2513
2483void 2514void ecb_cold
2484rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2515rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2485{ 2516{
2486 if (!l.t) 2517 if (!l.valid ())
2487 return; 2518 return;
2488 2519
2489 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2520 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2490 2521
2491 for (int i = ncol; i--; ) 2522 for (int i = ncol; i--; )
2492 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2523 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2493} 2524}
2494 2525
2495void 2526void ecb_cold
2496rxvt_term::scr_remap_chars () NOTHROW 2527rxvt_term::scr_remap_chars () NOTHROW
2497{ 2528{
2498 for (int i = total_rows; i--; ) 2529 for (int i = total_rows; i--; )
2499 scr_remap_chars (row_buf [i]); 2530 scr_remap_chars (row_buf [i]);
2500 2531
… …
2503 scr_remap_chars (drawn_buf [i]); 2534 scr_remap_chars (drawn_buf [i]);
2504 scr_remap_chars (swap_buf [i]); 2535 scr_remap_chars (swap_buf [i]);
2505 } 2536 }
2506} 2537}
2507 2538
2508void 2539void ecb_cold
2509rxvt_term::scr_recolour () NOTHROW 2540rxvt_term::scr_recolour (bool refresh) NOTHROW
2510{ 2541{
2511#ifdef HAVE_BG_PIXMAP 2542 bool transparent = false;
2512 bgPixmap.apply ();
2513#else
2514 2543
2544#ifdef HAVE_IMG
2545 if (bg_img != 0)
2546 {
2547# if ENABLE_TRANSPARENCY
2548 if (bg_flags & BG_IS_TRANSPARENT)
2549 {
2550 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2551 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2552
2553 transparent = true;
2554 }
2555 else
2556# endif
2557 {
2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2559 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2560 }
2561 }
2562 else
2563#endif
2564 {
2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2565 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2516 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2566 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2567 }
2568
2569 XClearWindow (dpy, parent);
2518 2570
2519 if (scrollBar.win) 2571 if (scrollBar.win)
2520 { 2572 {
2573 if (transparent)
2574 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2575 else
2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2576 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2522 scrollBar.state = STATE_IDLE; 2577 scrollBar.state = SB_STATE_IDLE;
2523 scrollBar.show (0); 2578 scrollBar.show (0);
2524 } 2579 }
2525 2580
2526#endif 2581 if (refresh)
2527 2582 {
2528 /* bgPixmap.apply () does not do the following : */
2529 scr_clear (); 2583 scr_clear ();
2530 scr_touch (true); 2584 scr_touch (true);
2585 }
2531 want_refresh = 1; 2586 want_refresh = 1;
2532} 2587}
2533 2588
2534/* ------------------------------------------------------------------------- */ 2589/* ------------------------------------------------------------------------- */
2535void 2590void
… …
2592 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2647 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2593 srp[col] ^= rstyle; 2648 srp[col] ^= rstyle;
2594} 2649}
2595 2650
2596/* ------------------------------------------------------------------------- */ 2651/* ------------------------------------------------------------------------- */
2597void 2652void ecb_hot
2598rxvt_term::scr_reverse_selection () NOTHROW 2653rxvt_term::scr_reverse_selection () NOTHROW
2599{ 2654{
2600 if (selection.op 2655 if (selection.op
2601 && current_screen == selection.screen 2656 && current_screen == selection.screen
2602 && selection.end.row >= view_start) 2657 && selection.end.row >= view_start)
… …
2621 */ 2676 */
2622#if 0 2677#if 0
2623void 2678void
2624rxvt_term::scr_dump (int fd) NOTHROW 2679rxvt_term::scr_dump (int fd) NOTHROW
2625{ 2680{
2626 int row, wrote; 2681 // if this method is needed, it can be implemented by factoring the
2627 unsigned int width, towrite; 2682 // relevant code in scr_printscreen
2628 char r1[] = "\n";
2629
2630 for (row = saveLines + top_row;
2631 row < saveLines + nrow - 1; row++)
2632 {
2633 width = row_buf[row].l >= 0 ? row_buf[row].l
2634 : ncol;
2635 for (towrite = width; towrite; towrite -= wrote)
2636 {
2637 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2638 towrite);
2639 if (wrote < 0)
2640 return; /* XXX: death, no report */
2641 }
2642 if (row_buf[row].l >= 0)
2643 if (write (fd, r1, 1) <= 0)
2644 return; /* XXX: death, no report */
2645 }
2646} 2683}
2647#endif 2684#endif
2648 2685
2649/* ------------------------------------------------------------------------- * 2686/* ------------------------------------------------------------------------- *
2650 * CHARACTER SELECTION * 2687 * CHARACTER SELECTION *
2651 * ------------------------------------------------------------------------- */ 2688 * ------------------------------------------------------------------------- */
2652void 2689void
2653rxvt_term::selection_check (int check_more) NOTHROW 2690rxvt_term::selection_check (int check_more) NOTHROW
2654{ 2691{
2655 row_col_t pos;
2656
2657 if (!selection.op) 2692 if (!selection.op)
2658 return; 2693 return;
2659 2694
2660 pos.row = pos.col = 0;
2661 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2695 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2662 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2696 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2663 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2697 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2664 || (check_more == 1 2698 || (check_more == 1
2665 && current_screen == selection.screen 2699 && current_screen == selection.screen
2666 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2700 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2667 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2701 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2668 || (check_more == 2
2669 && ROWCOL_IS_BEFORE (selection.beg, pos)
2670 && ROWCOL_IS_AFTER (selection.end, pos))
2671 || (check_more == 3
2672 && ROWCOL_IS_AFTER (selection.end, pos))
2673 || (check_more == 4 /* screen width change */
2674 && (selection.beg.row != selection.end.row
2675 || selection.end.col > ncol)))
2676 CLEAR_SELECTION (); 2702 CLEAR_ALL_SELECTION ();
2703}
2704
2705void
2706rxvt_term::selection_changed () NOTHROW
2707{
2708 line_t &r1 = ROW (selection.beg.row);
2709 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2710 --selection.beg.col;
2711
2712 line_t &r2 = ROW (selection.end.row);
2713 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2714 ++selection.end.col;
2715
2716 want_refresh = 1;
2677} 2717}
2678 2718
2679/* ------------------------------------------------------------------------- */ 2719/* ------------------------------------------------------------------------- */
2680/* 2720/*
2681 * Paste a selection direct to the command fd 2721 * Paste a selection direct to the command fd
2682 */ 2722 */
2683void 2723void
2684rxvt_term::paste (char *data, unsigned int len) NOTHROW 2724rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2685{ 2725{
2686 /* convert normal newline chars into common keyboard Return key sequence */ 2726 /* convert normal newline chars into common keyboard Return key sequence */
2687 for (unsigned int i = 0; i < len; i++) 2727 for (unsigned int i = 0; i < len; i++)
2688 if (data[i] == C0_LF) 2728 if (data[i] == C0_LF)
2689 data[i] = C0_CR; 2729 data[i] = C0_CR;
2690 2730
2691 if (priv_modes & PrivMode_BracketPaste) 2731 if (priv_modes & PrivMode_BracketPaste)
2692 tt_printf ("\e[200~"); 2732 tt_printf ("\x1b[200~");
2693 2733
2694 tt_write (data, len); 2734 tt_write (data, len);
2695 2735
2696 if (priv_modes & PrivMode_BracketPaste) 2736 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~"); 2737 tt_printf ("\x1b[201~");
2698} 2738}
2699 2739
2700/* ------------------------------------------------------------------------- */
2701/*
2702 * Respond to a notification that a primary selection has been sent
2703 * EXT: SelectionNotify
2704 */
2705void 2740void
2706rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2741rxvt_term::paste (char *data, unsigned int len) NOTHROW
2707{ 2742{
2708 if (prop == None) /* check for failed XConvertSelection */ 2743 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2709 {
2710 if ((selection_type & Sel_CompoundText))
2711 {
2712 int selnum = selection_type & Sel_whereMask;
2713
2714 selection_type = 0;
2715 if (selnum != Sel_direct)
2716 selection_request_other (XA_STRING, selnum);
2717 }
2718
2719 if ((selection_type & Sel_UTF8String))
2720 {
2721 int selnum = selection_type & Sel_whereMask;
2722
2723 selection_type = Sel_CompoundText;
2724 if (selnum != Sel_direct)
2725 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2726 else
2727 selection_type = 0;
2728 }
2729
2730 return;
2731 }
2732
2733 unsigned long bytes_after;
2734 XTextProperty ct;
2735
2736 if (XGetWindowProperty (dpy, win, prop,
2737 0, PROP_SIZE / 4,
2738 delete_prop, AnyPropertyType,
2739 &ct.encoding, &ct.format,
2740 &ct.nitems, &bytes_after,
2741 &ct.value) != Success)
2742 {
2743 ct.value = 0;
2744 goto bailout;
2745 }
2746
2747 if (ct.encoding == None)
2748 goto bailout;
2749
2750 if (bytes_after)
2751 {
2752 // fetch and append remaining data
2753 XTextProperty ct2;
2754
2755 if (XGetWindowProperty (dpy, win, prop,
2756 ct.nitems / 4, (bytes_after + 3) / 4,
2757 delete_prop, AnyPropertyType,
2758 &ct2.encoding, &ct2.format,
2759 &ct2.nitems, &bytes_after,
2760 &ct2.value) != Success)
2761 goto bailout;
2762
2763 // realloc should be compatible to XFree, here, and elsewhere, too
2764 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2765 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2766 ct.nitems += ct2.nitems;
2767
2768 XFree (ct2.value);
2769 }
2770
2771 if (ct.value == 0)
2772 goto bailout;
2773
2774 if (ct.encoding == xa[XA_INCR])
2775 {
2776 // INCR selection, start handshake
2777 if (!delete_prop)
2778 XDeleteProperty (dpy, win, prop);
2779
2780 selection_wait = Sel_incr;
2781 incr_buf_fill = 0;
2782 incr_ev.start (10);
2783
2784 goto bailout;
2785 }
2786
2787 if (ct.nitems == 0)
2788 {
2789 if (selection_wait == Sel_incr)
2790 {
2791 XFree (ct.value);
2792
2793 // finally complete, now paste the whole thing
2794 selection_wait = Sel_normal;
2795 ct.value = (unsigned char *)incr_buf;
2796 ct.nitems = incr_buf_fill;
2797 incr_buf = 0;
2798 incr_buf_size = 0;
2799 incr_ev.stop ();
2800 }
2801 else
2802 {
2803 if (selection_wait == Sel_normal
2804 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2805 {
2806 /*
2807 * pass through again trying CUT_BUFFER0 if we've come from
2808 * XConvertSelection () but nothing was presented
2809 */
2810 selection_paste (display->root, XA_CUT_BUFFER0, False);
2811 }
2812
2813 goto bailout;
2814 }
2815 }
2816 else if (selection_wait == Sel_incr)
2817 {
2818 incr_ev.start (10);
2819
2820 while (incr_buf_fill + ct.nitems > incr_buf_size)
2821 {
2822 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2823 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2824 }
2825
2826 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2827 incr_buf_fill += ct.nitems;
2828
2829 goto bailout;
2830 }
2831
2832 char **cl;
2833 int cr;
2834
2835#if !ENABLE_MINIMAL
2836 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2837 // so recode it manually
2838 if (ct.encoding == xa[XA_UTF8_STRING])
2839 {
2840 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2841 char *s = rxvt_wcstombs (w);
2842 free (w);
2843 // TODO: strlen == only the first element will be converted. well...
2844 paste (s, strlen (s));
2845 free (s);
2846 }
2847 else
2848#endif
2849 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2850 && cl)
2851 {
2852 for (int i = 0; i < cr; i++)
2853 paste (cl[i], strlen (cl[i]));
2854
2855 XFreeStringList (cl);
2856 }
2857 else
2858 paste ((char *)ct.value, ct.nitems); // paste raw
2859
2860bailout:
2861 XFree (ct.value);
2862
2863 if (selection_wait == Sel_normal)
2864 selection_wait = Sel_none;
2865}
2866
2867void
2868rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2869{
2870 selection_wait = Sel_none;
2871
2872 incr_buf_size = 0;
2873 free (incr_buf);
2874
2875 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2876}
2877
2878void
2879rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2880{
2881 if (prop == None || selection_wait != Sel_incr)
2882 return; 2744 return;
2883 2745
2884 selection_paste (win, prop, true); 2746 tt_paste (data, len);
2885} 2747}
2886 2748
2887/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2888/* 2750/*
2889 * Request the current selection: 2751 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2890 * Order: > internal selection if available 2752 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2891 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2753 * as fallback
2892 * > CUT_BUFFER0
2893 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2894 * will auto fallback to CUT_BUFFER0
2895 * EXT: button 2 release 2754 * EXT: button 2 release
2896 */ 2755 */
2897void 2756void
2898rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2757rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2899{ 2758{
2900 if (selection.text && selnum == Sel_Primary) 2759 if (!selection_req)
2901 {
2902 /* internal selection */
2903 char *str = rxvt_wcstombs (selection.text, selection.len);
2904 paste (str, strlen (str));
2905 free (str);
2906 return;
2907 } 2760 {
2908 else 2761 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2762 selection_req->run ();
2909 { 2763 }
2910 selection_request_time = tm;
2911 selection_wait = Sel_normal;
2912
2913#if X_HAVE_UTF8_STRING
2914 selection_type = Sel_UTF8String;
2915 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2916 return;
2917#else
2918 selection_type = Sel_CompoundText;
2919 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2920 return;
2921#endif
2922 }
2923
2924 selection_wait = Sel_none; /* don't loop in selection_paste () */
2925 selection_paste (display->root, XA_CUT_BUFFER0, false);
2926}
2927
2928int
2929rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2930{
2931 Atom sel;
2932
2933 selection_type |= selnum;
2934
2935 if (selnum == Sel_Primary)
2936 sel = XA_PRIMARY;
2937 else if (selnum == Sel_Secondary)
2938 sel = XA_SECONDARY;
2939 else
2940 sel = xa[XA_CLIPBOARD];
2941
2942 if (XGetSelectionOwner (dpy, sel) != None)
2943 {
2944 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2945 vt, selection_request_time);
2946 return 1;
2947 }
2948
2949 return 0;
2950} 2764}
2951 2765
2952/* ------------------------------------------------------------------------- */ 2766/* ------------------------------------------------------------------------- */
2953/* 2767/*
2954 * Clear all selected text 2768 * Clear all selected text
… …
2985 * EXT: button 1 or 3 release 2799 * EXT: button 1 or 3 release
2986 */ 2800 */
2987void 2801void
2988rxvt_term::selection_make (Time tm) 2802rxvt_term::selection_make (Time tm)
2989{ 2803{
2990 int i; 2804 int size;
2991 wchar_t *new_selection_text; 2805 wchar_t *new_selection_text;
2992 text_t *t; 2806 text_t *t;
2993 2807
2994 switch (selection.op) 2808 switch (selection.op)
2995 { 2809 {
… …
3011 return; /* nothing selected, go away */ 2825 return; /* nothing selected, go away */
3012 2826
3013 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2827 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3014 return; 2828 return;
3015 2829
3016 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2830 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3017 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2831 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3018 2832
3019 int ofs = 0; 2833 int ofs = 0;
3020 int extra = 0; 2834 int extra = 0;
3021 2835
3022 int col = selection.beg.col; 2836 int col = selection.beg.col;
… …
3028 { 2842 {
3029#if !ENABLE_MINIMAL 2843#if !ENABLE_MINIMAL
3030 if (selection.rect) 2844 if (selection.rect)
3031 { 2845 {
3032 col = selection.beg.col; 2846 col = selection.beg.col;
3033 end_col = ncol + 1; 2847 end_col = selection.end.col;
3034 } 2848 }
3035 else 2849 else
3036#endif 2850#endif
3037 end_col = ROW(row).l; 2851 end_col = ROW(row).l;
3038 2852
3039 col = max (col, 0); 2853 col = max (col, 0);
3040 2854
3041 if (row == selection.end.row 2855 if (row == selection.end.row)
3042#if !ENABLE_MINIMAL
3043 || selection.rect
3044#endif
3045 )
3046 min_it (end_col, selection.end.col); 2856 min_it (end_col, selection.end.col);
3047 2857
3048 t = ROW(row).t + col; 2858 t = ROW(row).t + col;
3049 2859
3050 for (; col < end_col; col++) 2860 for (; col < end_col; col++)
… …
3058 2868
3059 extra -= (len - 1); 2869 extra -= (len - 1);
3060 2870
3061 if (extra < 0) 2871 if (extra < 0)
3062 { 2872 {
3063 extra += i; 2873 extra += size;
3064 i += i; 2874 size += size;
3065 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2875 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3066 } 2876 }
3067 2877
3068 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2878 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3069 } 2879 }
3070#endif 2880#endif
… …
3082 2892
3083 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
3084 } 2894 }
3085 else 2895 else
3086#endif 2896#endif
3087 if (!ROW(row).is_longer () && row != selection.end.row) 2897 if (!ROW(row).is_longer ()
2898 && (row != selection.end.row || end_col != selection.end.col)
2899 && (row != selection.beg.row || selection.beg.col < ncol))
3088 new_selection_text[ofs++] = C0_LF; 2900 new_selection_text[ofs++] = C0_LF;
3089 } 2901 }
3090
3091 if (end_col != selection.end.col)
3092 new_selection_text[ofs++] = C0_LF;
3093 2902
3094 new_selection_text[ofs] = 0; 2903 new_selection_text[ofs] = 0;
3095 2904
3096 if (ofs == 0) 2905 if (ofs == 0)
3097 { 2906 {
… …
3153/* ------------------------------------------------------------------------- */ 2962/* ------------------------------------------------------------------------- */
3154/* 2963/*
3155 * Mark or select text based upon number of clicks: 1, 2, or 3 2964 * Mark or select text based upon number of clicks: 1, 2, or 3
3156 * EXT: button 1 press 2965 * EXT: button 1 press
3157 */ 2966 */
3158void 2967void ecb_cold
3159rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2968rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3160{ 2969{
3161 clicks = ((clicks - 1) % 3) + 1; 2970 clicks = ((clicks - 1) % 3) + 1;
3162 selection.clicks = clicks; /* save clicks so extend will work */ 2971 selection.clicks = clicks; /* save clicks so extend will work */
3163 2972
… …
3182 2991
3183/* ------------------------------------------------------------------------- */ 2992/* ------------------------------------------------------------------------- */
3184/* 2993/*
3185 * Mark a selection at the specified col/row 2994 * Mark a selection at the specified col/row
3186 */ 2995 */
3187void 2996void ecb_cold
3188rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2997rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3189{ 2998{
3190 want_refresh = 1; 2999 want_refresh = 1;
3191 3000
3192 selection.mark.row = row + view_start; 3001 selection.mark.row = row + view_start;
… …
3215 * Word select: select text for 2 clicks 3024 * Word select: select text for 2 clicks
3216 * We now only find out the boundary in one direction 3025 * We now only find out the boundary in one direction
3217 */ 3026 */
3218 3027
3219/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3028/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3220#define DELIMIT_TEXT(x) \ 3029#define DELIMIT_TEXT(x) \
3221 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3030 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3222#define DELIMIT_REND(x) 1 3031#define DELIMIT_REND(x) 1
3223 3032
3224void 3033void ecb_cold
3225rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3034rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3226{ 3035{
3227 int col, row, dirnadd, tcol, trow, w1, w2; 3036 int col, row, dirnadd, tcol, trow, w1, w2;
3228 row_col_t bound; 3037 row_col_t bound;
3229 text_t *stp; 3038 text_t *stp;
… …
3303 * EXT: button 3 press; button 1 or 3 drag 3112 * EXT: button 3 press; button 1 or 3 drag
3304 * flag == 0 ==> button 1 3113 * flag == 0 ==> button 1
3305 * flag == 1 ==> button 3 press 3114 * flag == 1 ==> button 3 press
3306 * flag == 2 ==> button 3 motion 3115 * flag == 2 ==> button 3 motion
3307 */ 3116 */
3308void 3117void ecb_cold
3309rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3118rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3310{ 3119{
3311 int col = clamp (Pixel2Col (x), 0, ncol); 3120 int col = clamp (Pixel2Col (x), 0, ncol);
3312 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3121 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3313 3122
… …
3339 3148
3340/* ------------------------------------------------------------------------- */ 3149/* ------------------------------------------------------------------------- */
3341/* 3150/*
3342 * Extend the selection to the specified col/row 3151 * Extend the selection to the specified col/row
3343 */ 3152 */
3344void 3153void ecb_cold
3345rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3154rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3346{ 3155{
3347 row_col_t pos; 3156 row_col_t pos;
3348 enum { 3157 enum {
3349 LEFT, RIGHT 3158 LEFT, RIGHT
3350 } closeto = RIGHT; 3159 } closeto = RIGHT;
3351
3352 want_refresh = 1;
3353 3160
3354 switch (selection.op) 3161 switch (selection.op)
3355 { 3162 {
3356 case SELECTION_INIT: 3163 case SELECTION_INIT:
3357 CLEAR_SELECTION (); 3164 CLEAR_SELECTION ();
… …
3537 3344
3538#if !ENABLE_MINIMAL 3345#if !ENABLE_MINIMAL
3539 if (selection.rect && selection.beg.col > selection.end.col) 3346 if (selection.rect && selection.beg.col > selection.end.col)
3540 ::swap (selection.beg.col, selection.end.col); 3347 ::swap (selection.beg.col, selection.end.col);
3541#endif 3348#endif
3349
3350 selection_changed ();
3542} 3351}
3543 3352
3544#if !ENABLE_MINIMAL 3353#if !ENABLE_MINIMAL
3545void 3354void ecb_cold
3546rxvt_term::selection_remove_trailing_spaces () NOTHROW 3355rxvt_term::selection_remove_trailing_spaces () NOTHROW
3547{ 3356{
3548 int32_t end_col, end_row; 3357 int32_t end_col, end_row;
3549 text_t *stp; 3358 text_t *stp;
3550 3359
… …
3588/* ------------------------------------------------------------------------- */ 3397/* ------------------------------------------------------------------------- */
3589/* 3398/*
3590 * Double click on button 3 when already selected 3399 * Double click on button 3 when already selected
3591 * EXT: button 3 double click 3400 * EXT: button 3 double click
3592 */ 3401 */
3593void 3402void ecb_cold
3594rxvt_term::selection_rotate (int x, int y) NOTHROW 3403rxvt_term::selection_rotate (int x, int y) NOTHROW
3595{ 3404{
3596 selection.clicks = selection.clicks % 3 + 1; 3405 selection.clicks = selection.clicks % 3 + 1;
3597 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3406 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3598} 3407}
… …
3600/* ------------------------------------------------------------------------- */ 3409/* ------------------------------------------------------------------------- */
3601/* 3410/*
3602 * Respond to a request for our current selection 3411 * Respond to a request for our current selection
3603 * EXT: SelectionRequest 3412 * EXT: SelectionRequest
3604 */ 3413 */
3605void 3414void ecb_cold
3606rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3415rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3607{ 3416{
3417 Atom property = rq.property == None ? rq.target : rq.property;
3608 XSelectionEvent ev; 3418 XSelectionEvent ev;
3609 3419
3610 ev.type = SelectionNotify; 3420 ev.type = SelectionNotify;
3611 ev.property = None; 3421 ev.property = None;
3612 ev.display = rq.display; 3422 ev.display = rq.display;
… …
3627 *target++ = xa[XA_COMPOUND_TEXT]; 3437 *target++ = xa[XA_COMPOUND_TEXT];
3628#if X_HAVE_UTF8_STRING 3438#if X_HAVE_UTF8_STRING
3629 *target++ = xa[XA_UTF8_STRING]; 3439 *target++ = xa[XA_UTF8_STRING];
3630#endif 3440#endif
3631 3441
3632 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3442 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3633 32, PropModeReplace, 3443 32, PropModeReplace,
3634 (unsigned char *)target_list, target - target_list); 3444 (unsigned char *)target_list, target - target_list);
3635 ev.property = rq.property; 3445 ev.property = property;
3636 } 3446 }
3637#if TODO // TODO 3447#if TODO // TODO
3638 else if (rq.target == xa[XA_MULTIPLE]) 3448 else if (rq.target == xa[XA_MULTIPLE])
3639 { 3449 {
3640 /* TODO: Handle MULTIPLE */ 3450 /* TODO: Handle MULTIPLE */
3641 } 3451 }
3642#endif 3452#endif
3643 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3453 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3644 { 3454 {
3645 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3455 XChangeProperty (dpy, rq.requestor, property, rq.target,
3646 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3456 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3647 ev.property = rq.property; 3457 ev.property = property;
3648 } 3458 }
3649 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3459 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3650 { 3460 {
3651 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3461 XChangeProperty (dpy, rq.requestor, property, rq.target,
3652 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3462 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3653 ev.property = rq.property; 3463 ev.property = property;
3654 } 3464 }
3655 else if (rq.target == XA_STRING 3465 else if (rq.target == XA_STRING
3656 || rq.target == xa[XA_TEXT] 3466 || rq.target == xa[XA_TEXT]
3657 || rq.target == xa[XA_COMPOUND_TEXT] 3467 || rq.target == xa[XA_COMPOUND_TEXT]
3658 || rq.target == xa[XA_UTF8_STRING] 3468 || rq.target == xa[XA_UTF8_STRING]
… …
3729 ct.value = (unsigned char *)cl; 3539 ct.value = (unsigned char *)cl;
3730 ct.nitems = selectlen; 3540 ct.nitems = selectlen;
3731 ct.encoding = target; 3541 ct.encoding = target;
3732 } 3542 }
3733 3543
3734 XChangeProperty (dpy, rq.requestor, rq.property, 3544 XChangeProperty (dpy, rq.requestor, property,
3735 ct.encoding, 8, PropModeReplace, 3545 ct.encoding, 8, PropModeReplace,
3736 ct.value, (int)ct.nitems); 3546 ct.value, (int)ct.nitems);
3737 ev.property = rq.property; 3547 ev.property = property;
3738 3548
3739 if (freect) 3549 if (freect)
3740 XFree (ct.value); 3550 XFree (ct.value);
3741 } 3551 }
3742 3552
3743 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3553 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3744} 3554}
3745 3555
3746/* ------------------------------------------------------------------------- */ 3556/* ------------------------------------------------------------------------- */
3747#ifdef USE_XIM 3557#if USE_XIM
3748void 3558void ecb_cold
3749rxvt_term::im_set_position (XPoint &pos) NOTHROW 3559rxvt_term::im_set_position (XPoint &pos) NOTHROW
3750{ 3560{
3751 XWindowAttributes xwa; 3561 XWindowAttributes xwa;
3752 3562
3753 XGetWindowAttributes (dpy, vt, &xwa); 3563 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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