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.351 by sf-exg, Fri Oct 15 11:07:45 2010 UTC vs.
Revision 1.436 by sf-exg, Sun Mar 24 10:15:27 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a separate 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 /*
196 * first time called so just malloc everything: don't rely on realloc
197 */
198 top_row = 0; 259 top_row = 0;
199 term_start = 0; 260 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 261
215 memset (charsets, 'B', sizeof (charsets)); 262 memset (charsets, 'B', sizeof (charsets));
216 rstyle = DEFAULT_RSTYLE; 263 rstyle = DEFAULT_RSTYLE;
217 screen.flags = Screen_DefaultFlags; 264 screen.flags = Screen_DefaultFlags;
218 screen.cur.row = screen.cur.col = 0; 265 screen.cur.row = screen.cur.col = 0;
… …
241 { 288 {
242 /* 289 /*
243 * add or delete rows as appropriate 290 * add or delete rows as appropriate
244 */ 291 */
245 292
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 293 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 294
263 for (int row = min (nrow, prev_nrow); row--; ) 295 for (int row = min (nrow, prev_nrow); row--; )
264 { 296 {
265 lresize (drawn_buf[row]); 297 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
266 lresize (swap_buf [row]); 298 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
267 } 299 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
268 300
269 for (int row = prev_nrow; row < nrow; row++) 301 copy_line (swap_buf [row], prev_swap_buf [row]);
270 { 302 }
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 303
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 304 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows); 305 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row 306 int q = total_rows; // rewrapped row
281 307
… …
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 315 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 316
291 do 317 do
292 { 318 {
293 p = MOD (p - 1, prev_total_rows); 319 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t); 320 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1; 321 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 322 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
297 323
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 324 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
299 { 325 {
300 p = MOD (p - 1, prev_total_rows); 326 p = MOD (p - 1, prev_total_rows);
301 327
302 plines++; 328 plines++;
303 llen += prev_ncol; 329 llen += prev_ncol;
… …
316 342
317 // re-assemble the full line by destination lines 343 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 344 for (int qrow = q; qlines--; qrow++)
319 { 345 {
320 qline = row_buf + qrow; 346 qline = row_buf + qrow;
321 lalloc (*qline); 347 qline->alloc (); // redundant with next line
322 qline->l = ncol; 348 qline->l = ncol;
323 qline->is_longer (1); 349 qline->is_longer (1);
324 350
325 int qcol = 0; 351 int qcol = 0;
326 352
… …
341 // this seems to upset applications/shells/readline 367 // this seems to upset applications/shells/readline
342 // least. 368 // least.
343 if (prow == ocur.row) 369 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow); 370 screen.cur.row = q - (total_rows - nrow);
345 371
346 line_t &pline = old_buf [prow]; 372 line_t &pline = prev_row_buf [prow];
347 373
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 374 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349 375
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 376 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 377 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
372 { 398 {
373 // if no scrollback exists (yet), wing, instead of wrap 399 // if no scrollback exists (yet), wing, instead of wrap
374 400
375 for (int row = min (nrow, prev_nrow); row--; ) 401 for (int row = min (nrow, prev_nrow); row--; )
376 { 402 {
377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 403 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
378 line_t &qline = row_buf [row]; 404 line_t &dst = row_buf [row];
379 405
380 qline = pline; 406 copy_line (dst, src);
381 lresize (qline);
382 } 407 }
383 408
384 for (int row = prev_nrow; row < nrow; row++) 409 for (int row = prev_nrow; row < nrow; row++)
385 {
386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 410 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
387 }
388 411
389 term_start = 0; 412 term_start = 0;
390 } 413 }
391
392 free (old_buf);
393 delete old_ta;
394 delete old_ra;
395 414
396 clamp_it (screen.cur.row, 0, nrow - 1); 415 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1); 416 clamp_it (screen.cur.col, 0, ncol - 1);
398 } 417 }
399 418
419 for (int row = nrow; row--; )
420 {
421 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
422 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
423 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
424 }
425
426 chunk_free (prev_chunk, prev_chunk_size);
427
400 free (tabs); 428 free (tabs);
401 tabs = (char *)rxvt_malloc (ncol); 429 tabs = (char *)rxvt_malloc (ncol);
402 430
403 for (int col = ncol; --col; ) 431 for (int col = ncol; col--; )
404 tabs [col] = col % TABSIZE == 0; 432 tabs [col] = col % TABSIZE == 0;
405 433
406 CLEAR_ALL_SELECTION (); 434 CLEAR_ALL_SELECTION ();
407 435
408 prev_nrow = nrow; 436 prev_nrow = nrow;
… …
411 tt_winch (); 439 tt_winch ();
412 440
413 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 441 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
414} 442}
415 443
416/* ------------------------------------------------------------------------- */ 444void ecb_cold
417/*
418 * Free everything. That way malloc debugging can find leakage.
419 */
420void
421rxvt_term::scr_release () NOTHROW 445rxvt_term::scr_release () NOTHROW
422{ 446{
423 if (row_buf) 447 chunk_free (chunk, chunk_size);
424 { 448 chunk = 0;
425 delete talloc; talloc = 0; 449 row_buf = 0;
426 delete ralloc; ralloc = 0;
427 450
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); 451 free (tabs);
434 tabs = 0; 452 tabs = 0;
435 }
436} 453}
437 454
438/* ------------------------------------------------------------------------- */ 455/* ------------------------------------------------------------------------- */
439/* 456/*
440 * Hard/Soft reset 457 * Hard/Soft reset
441 */ 458 */
442void 459void ecb_cold
443rxvt_term::scr_poweron () 460rxvt_term::scr_poweron ()
444{ 461{
445 scr_release (); 462 scr_release ();
463
446 prev_nrow = prev_ncol = 0; 464 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false; 465 rvideo_mode = false;
448 scr_soft_reset (); 466 scr_soft_reset ();
449 scr_reset (); 467 scr_reset ();
450 468
451 scr_clear (true); 469 scr_clear (true);
452 scr_refresh (); 470 scr_refresh ();
453} 471}
454 472
455void 473void ecb_cold
456rxvt_term::scr_soft_reset () 474rxvt_term::scr_soft_reset () NOTHROW
457{ 475{
458 /* only affects modes, nothing drastic such as clearing the screen */ 476 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY 477#if ENABLE_OVERLAY
460 scr_overlay_off (); 478 scr_overlay_off ();
461#endif 479#endif
… …
516 assert (s->cur.row >= 0); 534 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 535 assert (s->cur.col >= 0);
518} 536}
519 537
520void 538void
521rxvt_term::scr_swap_screen () 539rxvt_term::scr_swap_screen () NOTHROW
522{ 540{
523 if (!option (Opt_secondaryScreen)) 541 if (!option (Opt_secondaryScreen))
524 return; 542 return;
525 543
526 for (int i = prev_nrow; i--; ) 544 for (int i = prev_nrow; i--; )
… …
545 return; 563 return;
546 564
547 want_refresh = 1; 565 want_refresh = 1;
548 view_start = 0; 566 view_start = 0;
549 567
550 selection_check (2); /* check for boundary cross */ 568 /* check for boundary cross */
569 row_col_t pos;
570 pos.row = pos.col = 0;
571 if (ROWCOL_IS_BEFORE (selection.beg, pos)
572 && ROWCOL_IS_AFTER (selection.end, pos))
573 CLEAR_SELECTION ();
551 574
552 current_screen = scrn; 575 current_screen = scrn;
553 576
554#if NSCREENS 577#if NSCREENS
555 if (option (Opt_secondaryScreen)) 578 if (option (Opt_secondaryScreen))
… …
621/* 644/*
622 * Scroll text between <row1> and <row2> inclusive, by <count> lines 645 * Scroll text between <row1> and <row2> inclusive, by <count> lines
623 * count positive ==> scroll up 646 * count positive ==> scroll up
624 * count negative ==> scroll down 647 * count negative ==> scroll down
625 */ 648 */
626int 649int ecb_hot
627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 650rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
628{ 651{
629 if (count == 0 || (row1 > row2)) 652 if (count == 0 || (row1 > row2))
630 return 0; 653 return 0;
631 654
… …
634 657
635 if (count > 0 658 if (count > 0
636 && row1 == 0 659 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 660 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 { 661 {
662 min_it (count, total_rows - (nrow - (row2 + 1)));
663
639 top_row = max (top_row - count, -saveLines); 664 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643 665
644 // sever bottommost line 666 // sever bottommost line
645 { 667 {
646 line_t &l = ROW(row2 - count); 668 line_t &l = ROW(row2);
647 l.is_longer (0); 669 l.is_longer (0);
648 l.touch (); 670 l.touch ();
649 } 671 }
650 672
673 // scroll everything up 'count' lines
674 term_start = (term_start + count) % total_rows;
675
676 // now copy lines below the scroll region bottom to the
677 // bottom of the screen again, so they look as if they
678 // hadn't moved.
679 for (int i = nrow; --i > row2; )
680 {
681 line_t &l1 = ROW(i - count);
682 line_t &l2 = ROW(i);
683
684 ::swap (l1, l2);
685 l2.touch ();
686 }
687
651 // erase newly scrolled-in lines 688 // erase newly scrolled-in lines
652 for (int i = count; i--; ) 689 for (int i = count; i--; )
653 { 690 {
654 line_t &l = ROW(nrow - 1 - i); 691 line_t &l = ROW(row2 - i);
655 692
656 // optimize if already cleared, can be significant on slow machines 693 // optimise if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem 694 // 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))) 695 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 { 696 {
660 scr_blank_line (l, 0, l.l, rstyle); 697 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0; 698 l.l = 0;
… …
663 } 700 }
664 else 701 else
665 scr_blank_screen_mem (l, rstyle); 702 scr_blank_screen_mem (l, rstyle);
666 } 703 }
667 704
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 705 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen) 706 if (selection.op && current_screen == selection.screen
707 && selection.beg.row <= row2)
682 { 708 {
683 selection.beg.row -= count; 709 selection.beg.row -= count;
684 selection.end.row -= count; 710 selection.end.row -= count;
685 selection.mark.row -= count; 711 selection.mark.row -= count;
686 712
687 if (selection.beg.row < top_row 713 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 } 714 }
695 715
696 // finally move the view window, if desired 716 // finally move the view window, if desired
697 if (option (Opt_scrollWithBuffer) 717 if (option (Opt_scrollWithBuffer)
698 && view_start != 0 718 && view_start != 0
… …
728 } 748 }
729 749
730 // use a simple and robust scrolling algorithm, this 750 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical. 751 // part of scr_scroll_text is not time-critical.
732 752
753 // sever line above scroll region
754 if (row1)
755 {
756 line_t &l = ROW(row1 - 1);
757 l.is_longer (0);
758 l.touch ();
759 }
760
733 int rows = row2 - row1 + 1; 761 int rows = row2 - row1 + 1;
734 762
735 min_it (count, rows); 763 min_it (count, rows);
736 764
737 line_t *temp_buf = row_buf + total_rows; 765 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
738 766
739 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
740 { 768 {
741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 769 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
742 770
… …
744 scr_blank_screen_mem (temp_buf [row], rstyle); 772 scr_blank_screen_mem (temp_buf [row], rstyle);
745 } 773 }
746 774
747 for (int row = 0; row < rows; row++) 775 for (int row = 0; row < rows; row++)
748 ROW(row1 + row) = temp_buf [row]; 776 ROW(row1 + row) = temp_buf [row];
777
778 // sever bottommost line
779 {
780 line_t &l = ROW(row2);
781 l.is_longer (0);
782 l.touch ();
783 }
749 } 784 }
750 785
751 return count; 786 return count;
752} 787}
753 788
754/* ------------------------------------------------------------------------- */ 789/* ------------------------------------------------------------------------- */
755/* 790/*
756 * Add text given in <str> of length <len> to screen struct 791 * Add text given in <str> of length <len> to screen struct
757 */ 792 */
758void 793void ecb_hot
759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 794rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
760{ 795{
761 if (len <= 0) /* sanity */ 796 if (len <= 0) /* sanity */
762 return; 797 return;
763 798
764 unsigned char checksel; 799 bool checksel;
765 unicode_t c; 800 unicode_t c;
766 int ncol = this->ncol; 801 int ncol = this->ncol;
767 const wchar_t *strend = str + len; 802 const wchar_t *strend = str + len;
768 803
769 want_refresh = 1; 804 want_refresh = 1;
… …
795 830
796 while (str < strend) 831 while (str < strend)
797 { 832 {
798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 833 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
799 834
800 if (expect_false (c < 0x20)) 835 if (ecb_unlikely (c < 0x20))
801 if (c == C0_LF) 836 if (c == C0_LF)
802 { 837 {
803 max_it (line->l, screen.cur.col); 838 max_it (line->l, screen.cur.col);
804 839
805 screen.flags &= ~Screen_WrapNext; 840 screen.flags &= ~Screen_WrapNext;
… …
824 { 859 {
825 scr_tab (1, true); 860 scr_tab (1, true);
826 continue; 861 continue;
827 } 862 }
828 863
829 if (expect_false ( 864 if (ecb_unlikely (
830 checksel /* see if we're writing within selection */ 865 checksel /* see if we're writing within selection */
831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 866 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
832 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 867 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 )) 868 ))
834 { 869 {
… …
839 * should be a similar check. 874 * should be a similar check.
840 */ 875 */
841 CLEAR_SELECTION (); 876 CLEAR_SELECTION ();
842 } 877 }
843 878
844 if (expect_false (screen.flags & Screen_WrapNext)) 879 if (ecb_unlikely (screen.flags & Screen_WrapNext))
845 { 880 {
846 scr_do_wrap (); 881 scr_do_wrap ();
847 882
848 line->l = ncol; 883 line->l = ncol;
849 line->is_longer (1); 884 line->is_longer (1);
… …
851 row = screen.cur.row; 886 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */ 887 line = &ROW(row); /* _must_ refresh */
853 } 888 }
854 889
855 // some utf-8 decoders "decode" surrogate characters: let's fix this. 890 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 891 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd; 892 c = 0xfffd;
858 893
859 // rely on wcwidth to tell us the character width, do wcwidth before 894 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line 895 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current 896 // drawing characters below as they might be invalid in the current
862 // locale. 897 // locale.
863 int width = WCWIDTH (c); 898 int width = WCWIDTH (c);
864 899
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 900 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
866 { 901 {
867 // vt100 special graphics and line drawing 902 // vt100 special graphics and line drawing
868 // 5f-7e standard vt100 903 // 5f-7e standard vt100
869 // 40-5e rxvt extension for extra curses acs chars 904 // 40-5e rxvt extension for extra curses acs chars
870 static uint16_t vt100_0[62] = { // 41 .. 7e 905 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
883 c = vt100_0[c - 0x41]; 918 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width 919 width = 1; // vt100 line drawing characters are always single-width
885 } 920 }
886 } 921 }
887 922
888 if (expect_false (screen.flags & Screen_Insert)) 923 if (ecb_unlikely (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT); 924 scr_insdel_chars (width, INSERT);
890 925
891 if (width != 0) 926 if (width != 0)
892 { 927 {
893#if !UNICODE_3 928#if !UNICODE_3
… …
901#endif 936#endif
902 937
903 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 938 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904 939
905 // if the character doesn't fit into the remaining columns... 940 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width)) 941 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
907 { 942 {
908 if (screen.flags & Screen_Autowrap) 943 if (screen.flags & Screen_Autowrap)
909 { 944 {
910 // ... artificially enlargen the previous one 945 // ... artificially enlargen the previous one
911 c = NOCHAR; 946 c = NOCHAR;
… …
915 else 950 else
916 screen.cur.col = ncol - width; 951 screen.cur.col = ncol - width;
917 } 952 }
918 953
919 // nuke the character at this position, if required 954 // nuke the character at this position, if required
920 if (expect_false ( 955 // due to wonderful coincidences everywhere else in this loop
956 // we never have to check for overwriting a wide char itself,
957 // only its tail.
921 line->t[screen.cur.col] == NOCHAR 958 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
922 || (screen.cur.col < ncol - 1
923 && line->t[screen.cur.col + 1] == NOCHAR)
924 ))
925 scr_kill_char (*line, screen.cur.col); 959 scr_kill_char (*line, screen.cur.col);
926 960
927 line->touch (); 961 line->touch ();
928 962
929 do 963 do
930 { 964 {
931 line->t[screen.cur.col] = c; 965 line->t[screen.cur.col] = c;
932 line->r[screen.cur.col] = rend; 966 line->r[screen.cur.col] = rend;
933 967
934 if (expect_true (screen.cur.col < ncol - 1)) 968 if (ecb_likely (screen.cur.col < ncol - 1))
935 screen.cur.col++; 969 screen.cur.col++;
936 else 970 else
937 { 971 {
938 line->l = ncol; 972 line->l = ncol;
939 if (screen.flags & Screen_Autowrap) 973 if (screen.flags & Screen_Autowrap)
940 screen.flags |= Screen_WrapNext; 974 screen.flags |= Screen_WrapNext;
941 break; 975
976 goto end_of_line;
942 } 977 }
943 978
944 c = NOCHAR; 979 c = NOCHAR;
945 } 980 }
946 while (expect_false (--width > 0)); 981 while (ecb_unlikely (--width > 0));
947 982
948 // pad with spaces when overwriting wide character with smaller one 983 // pad with spaces when overwriting wide character with smaller one
949 if (expect_false (!width)) 984 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
950 { 985 {
951 line->touch ();
952
953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
954 {
955 line->t[c] = ' '; 986 line->t[c] = ' ';
956 line->r[c] = rend; 987 line->r[c] = rend;
957 }
958 } 988 }
989
990end_of_line:
991 ;
959 } 992 }
960#if ENABLE_COMBINING 993#if ENABLE_COMBINING
961 else // width == 0 994 else // width == 0
962 { 995 {
963 if (c != 0xfeff) // ignore BOM 996 if (c != 0xfeff) // ignore BOM
… …
1115 * XTERM_SEQ: ESC 6 1148 * XTERM_SEQ: ESC 6
1116 * Move cursor left in row. If we're at the left boundary, shift everything 1149 * Move cursor left in row. If we're at the left boundary, shift everything
1117 * in that row right. Clear left column. 1150 * in that row right. Clear left column.
1118 */ 1151 */
1119#if !ENABLE_MINIMAL 1152#if !ENABLE_MINIMAL
1120void 1153void ecb_cold
1121rxvt_term::scr_backindex () NOTHROW 1154rxvt_term::scr_backindex () NOTHROW
1122{ 1155{
1123 if (screen.cur.col > 0) 1156 if (screen.cur.col > 0)
1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1157 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1125 else 1158 else
… …
1132 * XTERM_SEQ: ESC 9 1165 * XTERM_SEQ: ESC 9
1133 * Move cursor right in row. If we're at the right boundary, shift everything 1166 * Move cursor right in row. If we're at the right boundary, shift everything
1134 * in that row left. Clear right column. 1167 * in that row left. Clear right column.
1135 */ 1168 */
1136#if !ENABLE_MINIMAL 1169#if !ENABLE_MINIMAL
1137void 1170void ecb_cold
1138rxvt_term::scr_forwardindex () NOTHROW 1171rxvt_term::scr_forwardindex () NOTHROW
1139{ 1172{
1140 if (screen.cur.col < ncol - 1) 1173 if (screen.cur.col < ncol - 1)
1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1174 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1142 else 1175 else
… …
1293 scr_blank_line (line, col, num, rstyle); 1326 scr_blank_line (line, col, num, rstyle);
1294} 1327}
1295 1328
1296/* ------------------------------------------------------------------------- */ 1329/* ------------------------------------------------------------------------- */
1297/* 1330/*
1298 * Erase part of whole of the screen 1331 * Erase part or whole of the screen
1299 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1332 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1300 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1333 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1301 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1334 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1302 */ 1335 */
1303void 1336void
… …
1312 ZERO_SCROLLBACK (); 1345 ZERO_SCROLLBACK ();
1313 1346
1314 switch (mode) 1347 switch (mode)
1315 { 1348 {
1316 case 0: /* erase to end of screen */ 1349 case 0: /* erase to end of screen */
1317 selection_check (1);
1318 scr_erase_line (0); 1350 scr_erase_line (0);
1319 row = screen.cur.row + 1; /* possible OOB */ 1351 row = screen.cur.row + 1; /* possible OOB */
1320 num = nrow - row; 1352 num = nrow - row;
1321 break; 1353 break;
1322 case 1: /* erase to beginning of screen */ 1354 case 1: /* erase to beginning of screen */
1323 selection_check (3);
1324 scr_erase_line (1); 1355 scr_erase_line (1);
1325 row = 0; 1356 row = 0;
1326 num = screen.cur.row; 1357 num = screen.cur.row;
1327 break; 1358 break;
1328 case 2: /* erase whole screen */ 1359 case 2: /* erase whole screen */
1329 selection_check (3);
1330 row = 0; 1360 row = 0;
1331 num = nrow; 1361 num = nrow;
1332 break; 1362 break;
1333 default: 1363 default:
1334 return; 1364 return;
… …
1351 { 1381 {
1352 ren = DEFAULT_RSTYLE; 1382 ren = DEFAULT_RSTYLE;
1353 1383
1354 if (mapped) 1384 if (mapped)
1355 XClearArea (dpy, vt, 0, 1385 XClearArea (dpy, vt, 0,
1356 Row2Pixel (row - view_start), (unsigned int)width, 1386 Row2Pixel (row - view_start), (unsigned int)vt_width,
1357 (unsigned int)Height2Pixel (num), False); 1387 (unsigned int)Height2Pixel (num), False);
1358 } 1388 }
1359 else 1389 else
1360 { 1390 {
1361 ren = rstyle & (RS_fgMask | RS_bgMask); 1391 ren = rstyle & (RS_fgMask | RS_bgMask);
… …
1364 { 1394 {
1365 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1395 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1366 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1396 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1367 XFillRectangle (dpy, vt, gc, 1397 XFillRectangle (dpy, vt, gc,
1368 0, Row2Pixel (row - view_start), 1398 0, Row2Pixel (row - view_start),
1369 (unsigned int)width, 1399 (unsigned int)vt_width,
1370 (unsigned int)Height2Pixel (num)); 1400 (unsigned int)Height2Pixel (num));
1371 gcvalue.foreground = pix_colors[Color_fg]; 1401 gcvalue.foreground = pix_colors[Color_fg];
1372 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1402 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1373 } 1403 }
1374 } 1404 }
… …
1396/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1397/* 1427/*
1398 * Fill the screen with `E's 1428 * Fill the screen with `E's
1399 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1429 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1400 */ 1430 */
1401void 1431void ecb_cold
1402rxvt_term::scr_E () NOTHROW 1432rxvt_term::scr_E () NOTHROW
1403{ 1433{
1404 rend_t fs; 1434 rend_t fs;
1405 1435
1406 want_refresh = 1; 1436 want_refresh = 1;
1407 ZERO_SCROLLBACK (); 1437 ZERO_SCROLLBACK ();
1408 1438
1409 num_scr_allow = 0; 1439 num_scr_allow = 0;
1410 selection_check (3); 1440
1441 row_col_t pos;
1442 pos.row = pos.col = 0;
1443 if (ROWCOL_IS_AFTER (selection.end, pos))
1444 CLEAR_SELECTION ();
1411 1445
1412 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1446 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1413 for (int row = nrow; row--; ) 1447 for (int row = nrow; row--; )
1414 { 1448 {
1415 line_t &line = ROW(row); 1449 line_t &line = ROW(row);
… …
1566/* ------------------------------------------------------------------------- */ 1600/* ------------------------------------------------------------------------- */
1567/* 1601/*
1568 * Set the scrolling region 1602 * Set the scrolling region
1569 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1603 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1570 */ 1604 */
1571void 1605void ecb_cold
1572rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1606rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1573{ 1607{
1574 max_it (top, 0); 1608 max_it (top, 0);
1575 min_it (bot, nrow - 1); 1609 min_it (bot, nrow - 1);
1576 1610
… …
1586/* 1620/*
1587 * Make the cursor visible/invisible 1621 * Make the cursor visible/invisible
1588 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1622 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1589 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1623 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1590 */ 1624 */
1591void 1625void ecb_cold
1592rxvt_term::scr_cursor_visible (int mode) NOTHROW 1626rxvt_term::scr_cursor_visible (int mode) NOTHROW
1593{ 1627{
1594 want_refresh = 1; 1628 want_refresh = 1;
1595 1629
1596 if (mode) 1630 if (mode)
… …
1603/* 1637/*
1604 * Set/unset automatic wrapping 1638 * Set/unset automatic wrapping
1605 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1639 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1606 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1640 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1607 */ 1641 */
1608void 1642void ecb_cold
1609rxvt_term::scr_autowrap (int mode) NOTHROW 1643rxvt_term::scr_autowrap (int mode) NOTHROW
1610{ 1644{
1611 if (mode) 1645 if (mode)
1612 screen.flags |= Screen_Autowrap; 1646 screen.flags |= Screen_Autowrap;
1613 else 1647 else
… …
1622 * Relative mode: line numbers are relative to top margin of scrolling region 1656 * Relative mode: line numbers are relative to top margin of scrolling region
1623 * and the cursor cannot be moved outside. 1657 * and the cursor cannot be moved outside.
1624 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1658 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1625 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1659 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1626 */ 1660 */
1627void 1661void ecb_cold
1628rxvt_term::scr_relative_origin (int mode) NOTHROW 1662rxvt_term::scr_relative_origin (int mode) NOTHROW
1629{ 1663{
1630 if (mode) 1664 if (mode)
1631 screen.flags |= Screen_Relative; 1665 screen.flags |= Screen_Relative;
1632 else 1666 else
… …
1639/* 1673/*
1640 * Set insert/replace mode 1674 * Set insert/replace mode
1641 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1675 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1642 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1676 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1643 */ 1677 */
1644void 1678void ecb_cold
1645rxvt_term::scr_insert_mode (int mode) NOTHROW 1679rxvt_term::scr_insert_mode (int mode) NOTHROW
1646{ 1680{
1647 if (mode) 1681 if (mode)
1648 screen.flags |= Screen_Insert; 1682 screen.flags |= Screen_Insert;
1649 else 1683 else
… …
1655 * Set/Unset tabs 1689 * Set/Unset tabs
1656 * XTERM_SEQ: Set tab at current column : ESC H 1690 * XTERM_SEQ: Set tab at current column : ESC H
1657 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1691 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1658 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1692 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1659 */ 1693 */
1660void 1694void ecb_cold
1661rxvt_term::scr_set_tab (int mode) NOTHROW 1695rxvt_term::scr_set_tab (int mode) NOTHROW
1662{ 1696{
1663 if (mode < 0) 1697 if (mode < 0)
1664 memset (tabs, 0, ncol); 1698 memset (tabs, 0, ncol);
1665 else if (screen.cur.col < ncol) 1699 else if (screen.cur.col < ncol)
… …
1684 if (rvideo_state != on) 1718 if (rvideo_state != on)
1685 { 1719 {
1686 rvideo_state = on; 1720 rvideo_state = on;
1687 1721
1688 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1722 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1689#ifdef HAVE_BG_PIXMAP 1723#ifdef HAVE_IMG
1690 if (bgPixmap.pixmap == None) 1724 if (bg_img == 0)
1691#endif 1725#endif
1692 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1726 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1693 1727
1694 XGCValues gcvalue; 1728 XGCValues gcvalue;
1695 gcvalue.foreground = pix_colors[Color_fg]; 1729 gcvalue.foreground = pix_colors[Color_fg];
… …
1704/* ------------------------------------------------------------------------- */ 1738/* ------------------------------------------------------------------------- */
1705/* 1739/*
1706 * Report current cursor position 1740 * Report current cursor position
1707 * XTERM_SEQ: Report position: ESC [ 6 n 1741 * XTERM_SEQ: Report position: ESC [ 6 n
1708 */ 1742 */
1709void 1743void ecb_cold
1710rxvt_term::scr_report_position () NOTHROW 1744rxvt_term::scr_report_position () NOTHROW
1711{ 1745{
1712 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1746 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1713} 1747}
1714 1748
… …
1717 * ------------------------------------------------------------------------- */ 1751 * ------------------------------------------------------------------------- */
1718 1752
1719/* 1753/*
1720 * Set font style 1754 * Set font style
1721 */ 1755 */
1722void 1756void ecb_cold
1723rxvt_term::set_font_style () NOTHROW 1757rxvt_term::set_font_style () NOTHROW
1724{ 1758{
1725#if 0 1759#if 0
1726 switch (charsets [screen.charset]) 1760 switch (charsets [screen.charset])
1727 { 1761 {
… …
1749 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1783 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1750 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1784 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1751 * XTERM_SEQ: Invoke G2 character set: ESC N 1785 * XTERM_SEQ: Invoke G2 character set: ESC N
1752 * XTERM_SEQ: Invoke G3 character set: ESC O 1786 * XTERM_SEQ: Invoke G3 character set: ESC O
1753 */ 1787 */
1754void 1788void ecb_cold
1755rxvt_term::scr_charset_choose (int set) NOTHROW 1789rxvt_term::scr_charset_choose (int set) NOTHROW
1756{ 1790{
1757 screen.charset = set; 1791 screen.charset = set;
1758 set_font_style (); 1792 set_font_style ();
1759} 1793}
… …
1780 * ------------------------------------------------------------------------- */ 1814 * ------------------------------------------------------------------------- */
1781 1815
1782/* 1816/*
1783 * refresh matching text. 1817 * refresh matching text.
1784 */ 1818 */
1785bool 1819bool ecb_cold
1786rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1820rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1787{ 1821{
1788 bool found = false; 1822 bool found = false;
1789 1823
1790 for (int i = 0; i < nrow; i++) 1824 for (int i = 0; i < nrow; i++)
… …
1809 PART_BEG = 0, 1843 PART_BEG = 0,
1810 PART_END, 1844 PART_END,
1811 RC_COUNT 1845 RC_COUNT
1812}; 1846};
1813 1847
1814void 1848void ecb_hot
1815rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1849rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1816{ 1850{
1817 int i; 1851 int i;
1818 row_col_t rc[RC_COUNT]; 1852 row_col_t rc[RC_COUNT];
1819 1853
… …
1856 * Refresh the entire screen 1890 * Refresh the entire screen
1857 */ 1891 */
1858void 1892void
1859rxvt_term::scr_touch (bool refresh) NOTHROW 1893rxvt_term::scr_touch (bool refresh) NOTHROW
1860{ 1894{
1861 scr_expose (0, 0, width, height, refresh); 1895 scr_expose (0, 0, vt_width, vt_height, refresh);
1862} 1896}
1863 1897
1864/* ------------------------------------------------------------------------- */ 1898/* ------------------------------------------------------------------------- */
1865/* 1899/*
1866 * Move the display so that the line represented by scrollbar value Y is at 1900 * Move the display so that the line represented by scrollbar value Y is at
… …
1922 1956
1923# ifndef NO_MAPALERT 1957# ifndef NO_MAPALERT
1924# ifdef MAPALERT_OPTION 1958# ifdef MAPALERT_OPTION
1925 if (option (Opt_mapAlert)) 1959 if (option (Opt_mapAlert))
1926# endif 1960# endif
1927 XMapWindow (dpy, parent[0]); 1961 XMapWindow (dpy, parent);
1928# endif 1962# endif
1929 1963
1930# if ENABLE_FRILLS 1964# if ENABLE_FRILLS
1931 if (option (Opt_urgentOnBell)) 1965 if (option (Opt_urgentOnBell))
1932 set_urgency (1); 1966 set_urgency (1);
… …
1945 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1979 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1980#endif
1947} 1981}
1948 1982
1949/* ------------------------------------------------------------------------- */ 1983/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1984void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1985rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1986{
1954#ifdef PRINTPIPE 1987#ifdef PRINTPIPE
1955 int nrows, row_start; 1988 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1989 FILE *fd = popen_printer ();
… …
2005/* 2038/*
2006 * Refresh the screen 2039 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2040 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2041 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2042 */
2010void 2043void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2044rxvt_term::scr_refresh () NOTHROW
2012{ 2045{
2013 int16_t col, row, /* column/row we're processing */ 2046 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2047 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2048 int i; /* tmp */
2016#ifndef NO_CURSORCOLOR
2017 rend_t cc1; /* store colours at cursor position (s) */
2018#endif
2019 rend_t *crp; // cursor rendition pointer
2020 rend_t ccol1, /* Cursor colour */ 2049 rend_t ccol1, /* Cursor colour */
2021 ccol2; /* Cursor colour2 */ 2050 ccol2; /* Cursor colour2 */
2051 rend_t cur_rend;
2052 int cur_col;
2022 2053
2023 want_refresh = 0; /* screen is current */ 2054 want_refresh = 0; /* screen is current */
2024 2055
2025 if (refresh_type == NO_REFRESH || !mapped) 2056 if (refresh_type == NO_REFRESH || !mapped)
2026 return; 2057 return;
… …
2029 * A: set up vars 2060 * A: set up vars
2030 */ 2061 */
2031 refresh_count = 0; 2062 refresh_count = 0;
2032 2063
2033 unsigned int old_screen_flags = screen.flags; 2064 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2065 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2066#ifdef HAVE_IMG
2036 have_bg = bgPixmap.pixmap != None; 2067 have_bg = bg_img != 0;
2037#endif 2068#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2069 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2070
2040 /* 2071 /*
2041 * B: reverse any characters which are selected 2072 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2076 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2077#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2078 scr_swap_overlay ();
2048#endif 2079#endif
2049 2080
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2081 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2082
2052 /* 2083 /*
2053 * C: set the cursor character (s) 2084 * C: set the cursor character (s)
2054 */ 2085 */
2055 { 2086 {
2056 unsigned char setoldcursor; 2087 bool setoldcursor;
2057 2088
2058#ifdef CURSOR_BLINK 2089#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2090 if (hidden_cursor)
2060 showcursor = 0; 2091 showcursor = 0;
2061#endif 2092#endif
… …
2065 int col = screen.cur.col; 2096 int col = screen.cur.col;
2066 2097
2067 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2098 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2068 col--; 2099 col--;
2069 2100
2070 crp = &ROW(screen.cur.row).r[col]; 2101 cur_rend = ROW(screen.cur.row).r[col];
2102 cur_col = col;
2071 2103
2072#ifndef NO_CURSORCOLOR 2104#ifndef NO_CURSORCOLOR
2073 cc1 = *crp & (RS_fgMask | RS_bgMask);
2074 if (ISSET_PIXCOLOR (Color_cursor)) 2105 if (ISSET_PIXCOLOR (Color_cursor))
2075 ccol1 = Color_cursor; 2106 ccol1 = Color_cursor;
2076 else 2107 else
2077#endif 2108#endif
2078#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2109#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2092 ccol2 = Color_bg; 2123 ccol2 = Color_bg;
2093#endif 2124#endif
2094 2125
2095 if (focus) 2126 if (focus)
2096 { 2127 {
2128 rend_t rend = cur_rend;
2129
2097 if (option (Opt_cursorUnderline)) 2130 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2131 rend ^= RS_Uline;
2099 else 2132 else
2100 { 2133 {
2101 *crp ^= RS_RVid; 2134 rend ^= RS_RVid;
2102 *crp = SET_FGCOLOR (*crp, ccol1); 2135 rend = SET_FGCOLOR (rend, ccol1);
2103 *crp = SET_BGCOLOR (*crp, ccol2); 2136 rend = SET_BGCOLOR (rend, ccol2);
2104 } 2137 }
2138
2139 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2105 } 2140 }
2106 } 2141 }
2107 2142
2108 /* make sure no outline cursor is left around */ 2143 /* make sure no outline cursor is left around */
2109 setoldcursor = 0; 2144 setoldcursor = 0;
… …
2148 { 2183 {
2149 int16_t nits; 2184 int16_t nits;
2150 int i = num_scr; 2185 int i = num_scr;
2151 int j; 2186 int j;
2152 int len, wlen; 2187 int len, wlen;
2153 dLocal (int, num_scr);
2154 2188
2155 j = nrow; 2189 j = nrow;
2156 wlen = len = -1; 2190 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2191 row = i > 0 ? 0 : j - 1;
2158 2192
… …
2233 continue; 2267 continue;
2234 2268
2235 // redraw one or more characters 2269 // redraw one or more characters
2236 2270
2237 // seek to the beginning of wide characters 2271 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2272 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2273 --col;
2240 2274
2241 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2275 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2276 text_t *text = stp + col;
2243 int count = 1; 2277 int count = 1;
… …
2281 2315
2282 col--; /* went one too far. move back */ 2316 col--; /* went one too far. move back */
2283 count -= i; /* dump any matching trailing chars */ 2317 count -= i; /* dump any matching trailing chars */
2284 2318
2285 // sometimes we optimize away the trailing NOCHAR's, add them back 2319 // sometimes we optimize away the trailing NOCHAR's, add them back
2286 while (expect_false (i && text[count] == NOCHAR)) 2320 while (ecb_unlikely (i && text[count] == NOCHAR))
2287 count++, i--; 2321 count++, i--;
2288 2322
2289 /* 2323 /*
2290 * Determine the attributes for the string 2324 * Determine the attributes for the string
2291 */ 2325 */
2292 int fore = fgcolor_of (rend); // desired foreground 2326 int fore = fgcolor_of (rend); // desired foreground
2293 int back = bgcolor_of (rend); // desired background 2327 int back = bgcolor_of (rend); // desired background
2294 2328
2295 // only do special processing if any attributes are set, which is unlikely 2329 // only do special processing if any attributes are set, which is unlikely
2296 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2330 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2297 { 2331 {
2298 bool invert = rend & RS_RVid; 2332 bool invert = rend & RS_RVid;
2299 2333
2300#ifndef NO_BOLD_UNDERLINE_REVERSE 2334#ifndef NO_BOLD_UNDERLINE_REVERSE
2301 if (rend & RS_Bold && fore == Color_fg) 2335 if (rend & RS_Bold && fore == Color_fg)
… …
2390 /* 2424 /*
2391 * Actually do the drawing of the string here 2425 * Actually do the drawing of the string here
2392 */ 2426 */
2393 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2427 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2394 2428
2395 if (expect_true (have_bg && back == Color_bg)) 2429 if (ecb_likely (have_bg && back == Color_bg))
2396 { 2430 {
2397 // this is very ugly, maybe push it into ->draw? 2431 // this is very ugly, maybe push it into ->draw?
2398 2432
2399 for (i = 0; i < count; i++) /* don't draw empty strings */ 2433 for (i = 0; i < count; i++) /* don't draw empty strings */
2400 if (text[i] != ' ') 2434 if (text[i] != ' ')
… …
2407 did_clear: ; 2441 did_clear: ;
2408 } 2442 }
2409 else 2443 else
2410 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2444 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2411 2445
2412 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2446 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2413 { 2447 {
2414#if ENABLE_FRILLS 2448#if ENABLE_FRILLS
2415 if (ISSET_PIXCOLOR (Color_underline)) 2449 if (ISSET_PIXCOLOR (Color_underline))
2416 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2450 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2417 else 2451 else
… …
2429 * G: cleanup cursor and display outline cursor if necessary 2463 * G: cleanup cursor and display outline cursor if necessary
2430 */ 2464 */
2431 if (showcursor) 2465 if (showcursor)
2432 { 2466 {
2433 if (focus) 2467 if (focus)
2434 { 2468 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2435 if (option (Opt_cursorUnderline))
2436 *crp ^= RS_Uline;
2437 else
2438 {
2439 *crp ^= RS_RVid;
2440#ifndef NO_CURSORCOLOR
2441 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2442#endif
2443 }
2444 }
2445 else if (oldcursor.row >= 0) 2469 else if (oldcursor.row >= 0)
2446 { 2470 {
2447 int cursorwidth = 1; 2471 int cursorwidth = 1;
2448 int col = oldcursor.col; 2472 int col = oldcursor.col;
2449 2473
… …
2463 2487
2464 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2465 Col2Pixel (col), 2489 Col2Pixel (col),
2466 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2467 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2468 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2469 } 2493 }
2470 } 2494 }
2471 2495
2472 /* 2496 /*
2473 * H: cleanup selection 2497 * H: cleanup selection
… …
2482 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2483 num_scr = 0; 2507 num_scr = 0;
2484 num_scr_allow = 1; 2508 num_scr_allow = 1;
2485} 2509}
2486 2510
2487void 2511void ecb_cold
2488rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2489{ 2513{
2490 if (!l.t) 2514 if (!l.valid ())
2491 return; 2515 return;
2492 2516
2493 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2517 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2494 2518
2495 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2496 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2520 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2497} 2521}
2498 2522
2499void 2523void ecb_cold
2500rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2501{ 2525{
2502 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2503 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2504 2528
… …
2507 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2508 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2509 } 2533 }
2510} 2534}
2511 2535
2512void 2536void ecb_cold
2513rxvt_term::scr_recolour () NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2514{ 2538{
2515#ifdef HAVE_BG_PIXMAP 2539 bool transparent = false;
2516 bgPixmap.apply ();
2517#else
2518 2540
2541#ifdef HAVE_IMG
2542 if (bg_img != 0)
2543 {
2544# if ENABLE_TRANSPARENCY
2545 if (bg_flags & BG_IS_TRANSPARENT)
2546 {
2547 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2548 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2549
2550 transparent = true;
2551 }
2552 else
2553# endif
2554 {
2555 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2556 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2557 }
2558 }
2559 else
2560#endif
2561 {
2519 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2520 XClearWindow (dpy, parent[0]);
2521 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2563 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2564 }
2565
2566 XClearWindow (dpy, parent);
2522 2567
2523 if (scrollBar.win) 2568 if (scrollBar.win)
2524 { 2569 {
2570 if (transparent)
2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2572 else
2525 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2526 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2527 scrollBar.show (0); 2575 scrollBar.show (0);
2528 } 2576 }
2529 2577
2530#endif 2578 if (refresh)
2531 2579 {
2532 /* bgPixmap.apply () does not do the following : */
2533 scr_clear (); 2580 scr_clear ();
2534 scr_touch (true); 2581 scr_touch (true);
2582 }
2535 want_refresh = 1; 2583 want_refresh = 1;
2536} 2584}
2537 2585
2538/* ------------------------------------------------------------------------- */ 2586/* ------------------------------------------------------------------------- */
2539void 2587void
… …
2596 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2597 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2598} 2646}
2599 2647
2600/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2601void 2649void ecb_hot
2602rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2603{ 2651{
2604 if (selection.op 2652 if (selection.op
2605 && current_screen == selection.screen 2653 && current_screen == selection.screen
2606 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
… …
2625 */ 2673 */
2626#if 0 2674#if 0
2627void 2675void
2628rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2629{ 2677{
2630 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2631 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2632 char r1[] = "\n";
2633
2634 for (row = saveLines + top_row;
2635 row < saveLines + nrow - 1; row++)
2636 {
2637 width = row_buf[row].l >= 0 ? row_buf[row].l
2638 : ncol;
2639 for (towrite = width; towrite; towrite -= wrote)
2640 {
2641 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2642 towrite);
2643 if (wrote < 0)
2644 return; /* XXX: death, no report */
2645 }
2646 if (row_buf[row].l >= 0)
2647 if (write (fd, r1, 1) <= 0)
2648 return; /* XXX: death, no report */
2649 }
2650} 2680}
2651#endif 2681#endif
2652 2682
2653/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2654 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2655 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2656void 2686void
2657rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2658{ 2688{
2659 row_col_t pos;
2660
2661 if (!selection.op) 2689 if (!selection.op)
2662 return; 2690 return;
2663 2691
2664 pos.row = pos.col = 0;
2665 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2666 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2667 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2668 || (check_more == 1 2695 || (check_more == 1
2669 && current_screen == selection.screen 2696 && current_screen == selection.screen
2670 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2671 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2672 || (check_more == 2
2673 && ROWCOL_IS_BEFORE (selection.beg, pos)
2674 && ROWCOL_IS_AFTER (selection.end, pos))
2675 || (check_more == 3
2676 && ROWCOL_IS_AFTER (selection.end, pos))
2677 || (check_more == 4 /* screen width change */
2678 && (selection.beg.row != selection.end.row
2679 || selection.end.col > ncol)))
2680 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2700}
2701
2702void
2703rxvt_term::selection_changed () NOTHROW
2704{
2705 line_t &r1 = ROW (selection.beg.row);
2706 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2707 --selection.beg.col;
2708
2709 line_t &r2 = ROW (selection.end.row);
2710 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2711 ++selection.end.col;
2712
2713 want_refresh = 1;
2681} 2714}
2682 2715
2683/* ------------------------------------------------------------------------- */ 2716/* ------------------------------------------------------------------------- */
2684/* 2717/*
2685 * Paste a selection direct to the command fd 2718 * Paste a selection direct to the command fd
… …
2691 for (unsigned int i = 0; i < len; i++) 2724 for (unsigned int i = 0; i < len; i++)
2692 if (data[i] == C0_LF) 2725 if (data[i] == C0_LF)
2693 data[i] = C0_CR; 2726 data[i] = C0_CR;
2694 2727
2695 if (priv_modes & PrivMode_BracketPaste) 2728 if (priv_modes & PrivMode_BracketPaste)
2696 tt_printf ("\e[200~"); 2729 tt_printf ("\x1b[200~");
2697 2730
2698 tt_write (data, len); 2731 tt_write (data, len);
2699 2732
2700 if (priv_modes & PrivMode_BracketPaste) 2733 if (priv_modes & PrivMode_BracketPaste)
2701 tt_printf ("\e[201~"); 2734 tt_printf ("\x1b[201~");
2702} 2735}
2703 2736
2704void 2737void
2705rxvt_term::paste (char *data, unsigned int len) NOTHROW 2738rxvt_term::paste (char *data, unsigned int len) NOTHROW
2706{ 2739{
… …
2710 tt_paste (data, len); 2743 tt_paste (data, len);
2711} 2744}
2712 2745
2713/* ------------------------------------------------------------------------- */ 2746/* ------------------------------------------------------------------------- */
2714/* 2747/*
2715 * Respond to a notification that a primary selection has been sent 2748 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2716 * EXT: SelectionNotify 2749 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2717 */ 2750 * as fallback
2718void
2719rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2720{
2721 if (prop == None) /* check for failed XConvertSelection */
2722 {
2723 if ((selection_type & Sel_CompoundText))
2724 {
2725 int selnum = selection_type & Sel_whereMask;
2726
2727 selection_type = 0;
2728 if (selnum != Sel_direct)
2729 selection_request_other (XA_STRING, selnum);
2730 }
2731
2732 if ((selection_type & Sel_UTF8String))
2733 {
2734 int selnum = selection_type & Sel_whereMask;
2735
2736 selection_type = Sel_CompoundText;
2737 if (selnum != Sel_direct)
2738 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2739 else
2740 selection_type = 0;
2741 }
2742
2743 return;
2744 }
2745
2746 unsigned long bytes_after;
2747 XTextProperty ct;
2748
2749 if (XGetWindowProperty (dpy, win, prop,
2750 0, PROP_SIZE / 4,
2751 delete_prop, AnyPropertyType,
2752 &ct.encoding, &ct.format,
2753 &ct.nitems, &bytes_after,
2754 &ct.value) != Success)
2755 {
2756 ct.value = 0;
2757 goto bailout;
2758 }
2759
2760 if (ct.encoding == None)
2761 goto bailout;
2762
2763 if (bytes_after)
2764 {
2765 // fetch and append remaining data
2766 XTextProperty ct2;
2767
2768 if (XGetWindowProperty (dpy, win, prop,
2769 ct.nitems / 4, (bytes_after + 3) / 4,
2770 delete_prop, AnyPropertyType,
2771 &ct2.encoding, &ct2.format,
2772 &ct2.nitems, &bytes_after,
2773 &ct2.value) != Success)
2774 goto bailout;
2775
2776 // realloc should be compatible to XFree, here, and elsewhere, too
2777 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2778 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2779 ct.nitems += ct2.nitems;
2780
2781 XFree (ct2.value);
2782 }
2783
2784 if (ct.value == 0)
2785 goto bailout;
2786
2787 if (ct.encoding == xa[XA_INCR])
2788 {
2789 // INCR selection, start handshake
2790 if (!delete_prop)
2791 XDeleteProperty (dpy, win, prop);
2792
2793 selection_wait = Sel_incr;
2794 incr_buf_fill = 0;
2795 incr_ev.start (10);
2796
2797 goto bailout;
2798 }
2799
2800 if (ct.nitems == 0)
2801 {
2802 if (selection_wait == Sel_incr)
2803 {
2804 XFree (ct.value);
2805
2806 // finally complete, now paste the whole thing
2807 selection_wait = Sel_normal;
2808 ct.value = (unsigned char *)incr_buf;
2809 ct.nitems = incr_buf_fill;
2810 incr_buf = 0;
2811 incr_buf_size = 0;
2812 incr_ev.stop ();
2813 }
2814 else
2815 {
2816 if (selection_wait == Sel_normal
2817 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2818 {
2819 /*
2820 * pass through again trying CUT_BUFFER0 if we've come from
2821 * XConvertSelection () but nothing was presented
2822 */
2823 selection_paste (display->root, XA_CUT_BUFFER0, False);
2824 }
2825
2826 goto bailout;
2827 }
2828 }
2829 else if (selection_wait == Sel_incr)
2830 {
2831 incr_ev.start (10);
2832
2833 while (incr_buf_fill + ct.nitems > incr_buf_size)
2834 {
2835 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2836 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2837 }
2838
2839 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2840 incr_buf_fill += ct.nitems;
2841
2842 goto bailout;
2843 }
2844
2845 char **cl;
2846 int cr;
2847
2848#if !ENABLE_MINIMAL
2849 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2850 // so recode it manually
2851 if (ct.encoding == xa[XA_UTF8_STRING])
2852 {
2853 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2854 char *s = rxvt_wcstombs (w);
2855 free (w);
2856 // TODO: strlen == only the first element will be converted. well...
2857 paste (s, strlen (s));
2858 free (s);
2859 }
2860 else
2861#endif
2862 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2863 && cl)
2864 {
2865 for (int i = 0; i < cr; i++)
2866 paste (cl[i], strlen (cl[i]));
2867
2868 XFreeStringList (cl);
2869 }
2870 else
2871 paste ((char *)ct.value, ct.nitems); // paste raw
2872
2873bailout:
2874 XFree (ct.value);
2875
2876 if (selection_wait == Sel_normal)
2877 selection_wait = Sel_none;
2878}
2879
2880void
2881rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2882{
2883 selection_wait = Sel_none;
2884
2885 incr_buf_size = 0;
2886 free (incr_buf);
2887
2888 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2889}
2890
2891void
2892rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2893{
2894 if (prop == None || selection_wait != Sel_incr)
2895 return;
2896
2897 selection_paste (win, prop, true);
2898}
2899
2900/* ------------------------------------------------------------------------- */
2901/*
2902 * Request the current selection:
2903 * Order: > internal selection if available
2904 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2905 * > CUT_BUFFER0
2906 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2907 * will auto fallback to CUT_BUFFER0
2908 * EXT: button 2 release 2751 * EXT: button 2 release
2909 */ 2752 */
2910void 2753void
2911rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2754rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2912{ 2755{
2913 if (selection.text && selnum == Sel_Primary) 2756 if (!selection_req)
2914 {
2915 /* internal selection */
2916 char *str = rxvt_wcstombs (selection.text, selection.len);
2917 paste (str, strlen (str));
2918 free (str);
2919 return;
2920 } 2757 {
2921 else 2758 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2759 selection_req->run ();
2922 { 2760 }
2923 selection_request_time = tm;
2924 selection_wait = Sel_normal;
2925
2926#if X_HAVE_UTF8_STRING
2927 selection_type = Sel_UTF8String;
2928 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2929 return;
2930#else
2931 selection_type = Sel_CompoundText;
2932 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2933 return;
2934#endif
2935 }
2936
2937 selection_wait = Sel_none; /* don't loop in selection_paste () */
2938 selection_paste (display->root, XA_CUT_BUFFER0, false);
2939}
2940
2941int
2942rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2943{
2944 Atom sel;
2945
2946 selection_type |= selnum;
2947
2948 if (selnum == Sel_Primary)
2949 sel = XA_PRIMARY;
2950 else if (selnum == Sel_Secondary)
2951 sel = XA_SECONDARY;
2952 else
2953 sel = xa[XA_CLIPBOARD];
2954
2955 if (XGetSelectionOwner (dpy, sel) != None)
2956 {
2957 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2958 vt, selection_request_time);
2959 return 1;
2960 }
2961
2962 return 0;
2963} 2761}
2964 2762
2965/* ------------------------------------------------------------------------- */ 2763/* ------------------------------------------------------------------------- */
2966/* 2764/*
2967 * Clear all selected text 2765 * Clear all selected text
… …
2998 * EXT: button 1 or 3 release 2796 * EXT: button 1 or 3 release
2999 */ 2797 */
3000void 2798void
3001rxvt_term::selection_make (Time tm) 2799rxvt_term::selection_make (Time tm)
3002{ 2800{
3003 int i; 2801 int size;
3004 wchar_t *new_selection_text; 2802 wchar_t *new_selection_text;
3005 text_t *t; 2803 text_t *t;
3006 2804
3007 switch (selection.op) 2805 switch (selection.op)
3008 { 2806 {
… …
3024 return; /* nothing selected, go away */ 2822 return; /* nothing selected, go away */
3025 2823
3026 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2824 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3027 return; 2825 return;
3028 2826
3029 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2827 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3030 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2828 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3031 2829
3032 int ofs = 0; 2830 int ofs = 0;
3033 int extra = 0; 2831 int extra = 0;
3034 2832
3035 int col = selection.beg.col; 2833 int col = selection.beg.col;
… …
3041 { 2839 {
3042#if !ENABLE_MINIMAL 2840#if !ENABLE_MINIMAL
3043 if (selection.rect) 2841 if (selection.rect)
3044 { 2842 {
3045 col = selection.beg.col; 2843 col = selection.beg.col;
3046 end_col = ncol + 1; 2844 end_col = selection.end.col;
3047 } 2845 }
3048 else 2846 else
3049#endif 2847#endif
3050 end_col = ROW(row).l; 2848 end_col = ROW(row).l;
3051 2849
3052 col = max (col, 0); 2850 col = max (col, 0);
3053 2851
3054 if (row == selection.end.row 2852 if (row == selection.end.row)
3055#if !ENABLE_MINIMAL
3056 || selection.rect
3057#endif
3058 )
3059 min_it (end_col, selection.end.col); 2853 min_it (end_col, selection.end.col);
3060 2854
3061 t = ROW(row).t + col; 2855 t = ROW(row).t + col;
3062 2856
3063 for (; col < end_col; col++) 2857 for (; col < end_col; col++)
… …
3071 2865
3072 extra -= (len - 1); 2866 extra -= (len - 1);
3073 2867
3074 if (extra < 0) 2868 if (extra < 0)
3075 { 2869 {
3076 extra += i; 2870 extra += size;
3077 i += i; 2871 size += size;
3078 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2872 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3079 } 2873 }
3080 2874
3081 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2875 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3082 } 2876 }
3083#endif 2877#endif
… …
3095 2889
3096 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3097 } 2891 }
3098 else 2892 else
3099#endif 2893#endif
3100 if (!ROW(row).is_longer () && row != selection.end.row) 2894 if (!ROW(row).is_longer ()
2895 && (row != selection.end.row || end_col != selection.end.col)
2896 && (row != selection.beg.row || selection.beg.col < ncol))
3101 new_selection_text[ofs++] = C0_LF; 2897 new_selection_text[ofs++] = C0_LF;
3102 } 2898 }
3103
3104 if (end_col != selection.end.col)
3105 new_selection_text[ofs++] = C0_LF;
3106 2899
3107 new_selection_text[ofs] = 0; 2900 new_selection_text[ofs] = 0;
3108 2901
3109 if (ofs == 0) 2902 if (ofs == 0)
3110 { 2903 {
… …
3166/* ------------------------------------------------------------------------- */ 2959/* ------------------------------------------------------------------------- */
3167/* 2960/*
3168 * Mark or select text based upon number of clicks: 1, 2, or 3 2961 * Mark or select text based upon number of clicks: 1, 2, or 3
3169 * EXT: button 1 press 2962 * EXT: button 1 press
3170 */ 2963 */
3171void 2964void ecb_cold
3172rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2965rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3173{ 2966{
3174 clicks = ((clicks - 1) % 3) + 1; 2967 clicks = ((clicks - 1) % 3) + 1;
3175 selection.clicks = clicks; /* save clicks so extend will work */ 2968 selection.clicks = clicks; /* save clicks so extend will work */
3176 2969
… …
3195 2988
3196/* ------------------------------------------------------------------------- */ 2989/* ------------------------------------------------------------------------- */
3197/* 2990/*
3198 * Mark a selection at the specified col/row 2991 * Mark a selection at the specified col/row
3199 */ 2992 */
3200void 2993void ecb_cold
3201rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2994rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3202{ 2995{
3203 want_refresh = 1; 2996 want_refresh = 1;
3204 2997
3205 selection.mark.row = row + view_start; 2998 selection.mark.row = row + view_start;
… …
3228 * Word select: select text for 2 clicks 3021 * Word select: select text for 2 clicks
3229 * We now only find out the boundary in one direction 3022 * We now only find out the boundary in one direction
3230 */ 3023 */
3231 3024
3232/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3025/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3233#define DELIMIT_TEXT(x) \ 3026#define DELIMIT_TEXT(x) \
3234 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3027 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3235#define DELIMIT_REND(x) 1 3028#define DELIMIT_REND(x) 1
3236 3029
3237void 3030void ecb_cold
3238rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3031rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3239{ 3032{
3240 int col, row, dirnadd, tcol, trow, w1, w2; 3033 int col, row, dirnadd, tcol, trow, w1, w2;
3241 row_col_t bound; 3034 row_col_t bound;
3242 text_t *stp; 3035 text_t *stp;
… …
3316 * EXT: button 3 press; button 1 or 3 drag 3109 * EXT: button 3 press; button 1 or 3 drag
3317 * flag == 0 ==> button 1 3110 * flag == 0 ==> button 1
3318 * flag == 1 ==> button 3 press 3111 * flag == 1 ==> button 3 press
3319 * flag == 2 ==> button 3 motion 3112 * flag == 2 ==> button 3 motion
3320 */ 3113 */
3321void 3114void ecb_cold
3322rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3115rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3323{ 3116{
3324 int col = clamp (Pixel2Col (x), 0, ncol); 3117 int col = clamp (Pixel2Col (x), 0, ncol);
3325 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3118 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3326 3119
… …
3352 3145
3353/* ------------------------------------------------------------------------- */ 3146/* ------------------------------------------------------------------------- */
3354/* 3147/*
3355 * Extend the selection to the specified col/row 3148 * Extend the selection to the specified col/row
3356 */ 3149 */
3357void 3150void ecb_cold
3358rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3151rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3359{ 3152{
3360 row_col_t pos; 3153 row_col_t pos;
3361 enum { 3154 enum {
3362 LEFT, RIGHT 3155 LEFT, RIGHT
3363 } closeto = RIGHT; 3156 } closeto = RIGHT;
3364
3365 want_refresh = 1;
3366 3157
3367 switch (selection.op) 3158 switch (selection.op)
3368 { 3159 {
3369 case SELECTION_INIT: 3160 case SELECTION_INIT:
3370 CLEAR_SELECTION (); 3161 CLEAR_SELECTION ();
… …
3550 3341
3551#if !ENABLE_MINIMAL 3342#if !ENABLE_MINIMAL
3552 if (selection.rect && selection.beg.col > selection.end.col) 3343 if (selection.rect && selection.beg.col > selection.end.col)
3553 ::swap (selection.beg.col, selection.end.col); 3344 ::swap (selection.beg.col, selection.end.col);
3554#endif 3345#endif
3346
3347 selection_changed ();
3555} 3348}
3556 3349
3557#if !ENABLE_MINIMAL 3350#if !ENABLE_MINIMAL
3558void 3351void ecb_cold
3559rxvt_term::selection_remove_trailing_spaces () NOTHROW 3352rxvt_term::selection_remove_trailing_spaces () NOTHROW
3560{ 3353{
3561 int32_t end_col, end_row; 3354 int32_t end_col, end_row;
3562 text_t *stp; 3355 text_t *stp;
3563 3356
… …
3601/* ------------------------------------------------------------------------- */ 3394/* ------------------------------------------------------------------------- */
3602/* 3395/*
3603 * Double click on button 3 when already selected 3396 * Double click on button 3 when already selected
3604 * EXT: button 3 double click 3397 * EXT: button 3 double click
3605 */ 3398 */
3606void 3399void ecb_cold
3607rxvt_term::selection_rotate (int x, int y) NOTHROW 3400rxvt_term::selection_rotate (int x, int y) NOTHROW
3608{ 3401{
3609 selection.clicks = selection.clicks % 3 + 1; 3402 selection.clicks = selection.clicks % 3 + 1;
3610 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3403 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3611} 3404}
… …
3613/* ------------------------------------------------------------------------- */ 3406/* ------------------------------------------------------------------------- */
3614/* 3407/*
3615 * Respond to a request for our current selection 3408 * Respond to a request for our current selection
3616 * EXT: SelectionRequest 3409 * EXT: SelectionRequest
3617 */ 3410 */
3618void 3411void ecb_cold
3619rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3412rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3620{ 3413{
3414 Atom property = rq.property == None ? rq.target : rq.property;
3621 XSelectionEvent ev; 3415 XSelectionEvent ev;
3622 3416
3623 ev.type = SelectionNotify; 3417 ev.type = SelectionNotify;
3624 ev.property = None; 3418 ev.property = None;
3625 ev.display = rq.display; 3419 ev.display = rq.display;
… …
3640 *target++ = xa[XA_COMPOUND_TEXT]; 3434 *target++ = xa[XA_COMPOUND_TEXT];
3641#if X_HAVE_UTF8_STRING 3435#if X_HAVE_UTF8_STRING
3642 *target++ = xa[XA_UTF8_STRING]; 3436 *target++ = xa[XA_UTF8_STRING];
3643#endif 3437#endif
3644 3438
3645 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3439 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3646 32, PropModeReplace, 3440 32, PropModeReplace,
3647 (unsigned char *)target_list, target - target_list); 3441 (unsigned char *)target_list, target - target_list);
3648 ev.property = rq.property; 3442 ev.property = property;
3649 } 3443 }
3650#if TODO // TODO 3444#if TODO // TODO
3651 else if (rq.target == xa[XA_MULTIPLE]) 3445 else if (rq.target == xa[XA_MULTIPLE])
3652 { 3446 {
3653 /* TODO: Handle MULTIPLE */ 3447 /* TODO: Handle MULTIPLE */
3654 } 3448 }
3655#endif 3449#endif
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3450 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3657 { 3451 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3452 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3453 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3660 ev.property = rq.property; 3454 ev.property = property;
3661 } 3455 }
3662 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3456 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3663 { 3457 {
3664 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3458 XChangeProperty (dpy, rq.requestor, property, rq.target,
3665 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3459 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3666 ev.property = rq.property; 3460 ev.property = property;
3667 } 3461 }
3668 else if (rq.target == XA_STRING 3462 else if (rq.target == XA_STRING
3669 || rq.target == xa[XA_TEXT] 3463 || rq.target == xa[XA_TEXT]
3670 || rq.target == xa[XA_COMPOUND_TEXT] 3464 || rq.target == xa[XA_COMPOUND_TEXT]
3671 || rq.target == xa[XA_UTF8_STRING] 3465 || rq.target == xa[XA_UTF8_STRING]
… …
3742 ct.value = (unsigned char *)cl; 3536 ct.value = (unsigned char *)cl;
3743 ct.nitems = selectlen; 3537 ct.nitems = selectlen;
3744 ct.encoding = target; 3538 ct.encoding = target;
3745 } 3539 }
3746 3540
3747 XChangeProperty (dpy, rq.requestor, rq.property, 3541 XChangeProperty (dpy, rq.requestor, property,
3748 ct.encoding, 8, PropModeReplace, 3542 ct.encoding, 8, PropModeReplace,
3749 ct.value, (int)ct.nitems); 3543 ct.value, (int)ct.nitems);
3750 ev.property = rq.property; 3544 ev.property = property;
3751 3545
3752 if (freect) 3546 if (freect)
3753 XFree (ct.value); 3547 XFree (ct.value);
3754 } 3548 }
3755 3549
3756 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3550 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3757} 3551}
3758 3552
3759/* ------------------------------------------------------------------------- */ 3553/* ------------------------------------------------------------------------- */
3760#ifdef USE_XIM 3554#if USE_XIM
3761void 3555void ecb_cold
3762rxvt_term::im_set_position (XPoint &pos) NOTHROW 3556rxvt_term::im_set_position (XPoint &pos) NOTHROW
3763{ 3557{
3764 XWindowAttributes xwa; 3558 XWindowAttributes xwa;
3765 3559
3766 XGetWindowAttributes (dpy, vt, &xwa); 3560 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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