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.339 by sf-exg, Sat Apr 17 06:48:27 2010 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
163 view_start = 0; 200 view_start = 0;
164 num_scr = 0; 201 num_scr = 0;
165 202
166 if (ncol == 0) 203 if (ncol == 0)
167 ncol = 80; 204 ncol = 80;
… …
187 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
188 225
189 screen.tscroll = 0; 226 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
191 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
192 if (!row_buf) 239 if (!prev_row_buf)
193 { 240 {
194 /* 241 /*
195 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
196 */ 243 */
197 top_row = 0; 244 top_row = 0;
198 term_start = 0; 245 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 246
214 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
240 { 273 {
241 /* 274 /*
242 * add or delete rows as appropriate 275 * add or delete rows as appropriate
243 */ 276 */
244 277
245 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
246 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
247
248#if 0
249 if (nrow < prev_nrow)
250 {
251 for (int row = nrow; row < prev_nrow; row++)
252 {
253 lfree (swap_buf [row]);
254 lfree (drawn_buf[row]);
255 }
256 }
257#endif
258
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
261
262 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
263 { 279 {
264 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
265 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
266 }
267 282
268 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285
286 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
287 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
288 swap_buf [row].l = min (prev_swap_buf [row].l, ncol);
289 swap_buf [row].f = prev_swap_buf [row].f;
269 { 290 }
270 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
271 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
272 }
273
274 line_t *old_buf = row_buf;
275 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 291
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 292 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 293 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 294 int q = total_rows; // rewrapped row
280 295
… …
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 303 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 304
290 do 305 do
291 { 306 {
292 p = MOD (p - 1, prev_total_rows); 307 p = MOD (p - 1, prev_total_rows);
293 assert (old_buf [MOD (p, prev_total_rows)].t); 308 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
294 int plines = 1; 309 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 310 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 311
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 312 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 313 {
299 p = MOD (p - 1, prev_total_rows); 314 p = MOD (p - 1, prev_total_rows);
300 315
301 plines++; 316 plines++;
302 llen += prev_ncol; 317 llen += prev_ncol;
… …
315 330
316 // re-assemble the full line by destination lines 331 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 332 for (int qrow = q; qlines--; qrow++)
318 { 333 {
319 qline = row_buf + qrow; 334 qline = row_buf + qrow;
320 lalloc (*qline); 335 qline->alloc (); // redundant with next line
321 qline->l = ncol; 336 qline->l = ncol;
322 qline->is_longer (1); 337 qline->is_longer (1);
323 338
324 int qcol = 0; 339 int qcol = 0;
325 340
… …
340 // this seems to upset applications/shells/readline 355 // this seems to upset applications/shells/readline
341 // least. 356 // least.
342 if (prow == ocur.row) 357 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 358 screen.cur.row = q - (total_rows - nrow);
344 359
345 line_t &pline = old_buf [prow]; 360 line_t &pline = prev_row_buf [prow];
346 361
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 362 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 363
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 364 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 365 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 386 {
372 // if no scrollback exists (yet), wing, instead of wrap 387 // if no scrollback exists (yet), wing, instead of wrap
373 388
374 for (int row = min (nrow, prev_nrow); row--; ) 389 for (int row = min (nrow, prev_nrow); row--; )
375 { 390 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 391 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 392 line_t &dst = row_buf [row];
378 393
379 qline = pline; 394 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
380 lresize (qline); 395
396 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
397 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
398 dst.l = common_col;
381 } 399 }
382 400
383 for (int row = prev_nrow; row < nrow; row++) 401 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 402 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 403
388 term_start = 0; 404 term_start = 0;
389 } 405 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 406
395 clamp_it (screen.cur.row, 0, nrow - 1); 407 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 408 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 409 }
398 410
411 for (int row = nrow; row--; )
412 {
413 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
414 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
415 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
416 }
417
418 chunk_free (prev_chunk, prev_chunk_size);
419
399 free (tabs); 420 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 421 tabs = (char *)rxvt_malloc (ncol);
401 422
402 for (int col = ncol; --col; ) 423 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 424 tabs [col] = col % TABSIZE == 0;
404 425
405 CLEAR_ALL_SELECTION (); 426 CLEAR_ALL_SELECTION ();
406 427
407 prev_nrow = nrow; 428 prev_nrow = nrow;
… …
410 tt_winch (); 431 tt_winch ();
411 432
412 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 433 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413} 434}
414 435
415/* ------------------------------------------------------------------------- */ 436void ecb_cold
416/*
417 * Free everything. That way malloc debugging can find leakage.
418 */
419void
420rxvt_term::scr_release () NOTHROW 437rxvt_term::scr_release () NOTHROW
421{ 438{
422 if (row_buf) 439 chunk_free (chunk, chunk_size);
423 { 440 chunk = 0;
424 delete talloc; talloc = 0; 441 row_buf = 0;
425 delete ralloc; ralloc = 0;
426 442
427 free (row_buf);
428 free (swap_buf);
429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
432 free (tabs); 443 free (tabs);
433 tabs = 0; 444 tabs = 0;
434 }
435} 445}
436 446
437/* ------------------------------------------------------------------------- */ 447/* ------------------------------------------------------------------------- */
438/* 448/*
439 * Hard/Soft reset 449 * Hard/Soft reset
440 */ 450 */
441void 451void ecb_cold
442rxvt_term::scr_poweron () 452rxvt_term::scr_poweron ()
443{ 453{
444 scr_release (); 454 scr_release ();
455
445 prev_nrow = prev_ncol = 0; 456 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 457 rvideo_mode = false;
447 scr_soft_reset (); 458 scr_soft_reset ();
448 scr_reset (); 459 scr_reset ();
449 460
450 scr_clear (true); 461 scr_clear (true);
451 scr_refresh (); 462 scr_refresh ();
452} 463}
453 464
454void 465void ecb_cold
455rxvt_term::scr_soft_reset () 466rxvt_term::scr_soft_reset () NOTHROW
456{ 467{
457 /* only affects modes, nothing drastic such as clearing the screen */ 468 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 469#if ENABLE_OVERLAY
459 scr_overlay_off (); 470 scr_overlay_off ();
460#endif 471#endif
… …
515 assert (s->cur.row >= 0); 526 assert (s->cur.row >= 0);
516 assert (s->cur.col >= 0); 527 assert (s->cur.col >= 0);
517} 528}
518 529
519void 530void
520rxvt_term::scr_swap_screen () 531rxvt_term::scr_swap_screen () NOTHROW
521{ 532{
522 if (!option (Opt_secondaryScreen)) 533 if (!option (Opt_secondaryScreen))
523 return; 534 return;
524 535
525 for (int i = prev_nrow; i--; ) 536 for (int i = prev_nrow; i--; )
… …
544 return; 555 return;
545 556
546 want_refresh = 1; 557 want_refresh = 1;
547 view_start = 0; 558 view_start = 0;
548 559
549 selection_check (2); /* check for boundary cross */ 560 /* check for boundary cross */
561 row_col_t pos;
562 pos.row = pos.col = 0;
563 if (ROWCOL_IS_BEFORE (selection.beg, pos)
564 && ROWCOL_IS_AFTER (selection.end, pos))
565 CLEAR_SELECTION ();
550 566
551 current_screen = scrn; 567 current_screen = scrn;
552 568
553#if NSCREENS 569#if NSCREENS
554 if (option (Opt_secondaryScreen)) 570 if (option (Opt_secondaryScreen))
… …
620/* 636/*
621 * Scroll text between <row1> and <row2> inclusive, by <count> lines 637 * Scroll text between <row1> and <row2> inclusive, by <count> lines
622 * count positive ==> scroll up 638 * count positive ==> scroll up
623 * count negative ==> scroll down 639 * count negative ==> scroll down
624 */ 640 */
625int 641int ecb_hot
626rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 642rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
627{ 643{
628 if (count == 0 || (row1 > row2)) 644 if (count == 0 || (row1 > row2))
629 return 0; 645 return 0;
630 646
… …
633 649
634 if (count > 0 650 if (count > 0
635 && row1 == 0 651 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 652 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 653 {
654 min_it (count, total_rows - (nrow - (row2 + 1)));
655
638 top_row = max (top_row - count, -saveLines); 656 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 657
643 // sever bottommost line 658 // sever bottommost line
644 { 659 {
645 line_t &l = ROW(row2 - count); 660 line_t &l = ROW(row2);
646 l.is_longer (0); 661 l.is_longer (0);
647 l.touch (); 662 l.touch ();
648 } 663 }
649 664
665 // scroll everything up 'count' lines
666 term_start = (term_start + count) % total_rows;
667
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
650 // erase newly scrolled-in lines 680 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 681 for (int i = count; i--; )
652 { 682 {
653 line_t &l = ROW(nrow - 1 - i); 683 line_t &l = ROW(row2 - i);
654 684
655 // optimize if already cleared, can be significant on slow machines 685 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 686 // could be rolled into scr_blank_screen_mem
657 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 687 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 { 688 {
659 scr_blank_line (l, 0, l.l, rstyle); 689 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 690 l.l = 0;
… …
662 } 692 }
663 else 693 else
664 scr_blank_screen_mem (l, rstyle); 694 scr_blank_screen_mem (l, rstyle);
665 } 695 }
666 696
667 // now copy lines below the scroll region bottom to the
668 // bottom of the screen again, so they look as if they
669 // hadn't moved.
670 for (int i = nrow; --i > row2; )
671 {
672 line_t &l1 = ROW(i - count);
673 line_t &l2 = ROW(i);
674
675 ::swap (l1, l2);
676 l2.touch ();
677 }
678
679 // move and/or clear selection, if any 697 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 698 if (selection.op && current_screen == selection.screen
699 && selection.beg.row <= row2)
681 { 700 {
682 selection.beg.row -= count; 701 selection.beg.row -= count;
683 selection.end.row -= count; 702 selection.end.row -= count;
684 selection.mark.row -= count; 703 selection.mark.row -= count;
685 704
686 if (selection.beg.row < top_row 705 selection_check (0);
687 || selection.end.row < top_row
688 || selection.mark.row < top_row)
689 {
690 CLEAR_ALL_SELECTION ();
691 selection.op = SELECTION_CLEAR;
692 }
693 } 706 }
694 707
695 // finally move the view window, if desired 708 // finally move the view window, if desired
696 if (option (Opt_scrollWithBuffer) 709 if (option (Opt_scrollWithBuffer)
697 && view_start != 0 710 && view_start != 0
… …
727 } 740 }
728 741
729 // use a simple and robust scrolling algorithm, this 742 // use a simple and robust scrolling algorithm, this
730 // part of scr_scroll_text is not time-critical. 743 // part of scr_scroll_text is not time-critical.
731 744
745 // sever line above scroll region
746 if (row1)
747 {
748 line_t &l = ROW(row1 - 1);
749 l.is_longer (0);
750 l.touch ();
751 }
752
732 int rows = row2 - row1 + 1; 753 int rows = row2 - row1 + 1;
733 754
734 min_it (count, rows); 755 min_it (count, rows);
735 756
736 line_t *temp_buf = row_buf + total_rows; 757 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
737 758
738 for (int row = 0; row < rows; row++) 759 for (int row = 0; row < rows; row++)
739 { 760 {
740 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 761 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
741 762
… …
743 scr_blank_screen_mem (temp_buf [row], rstyle); 764 scr_blank_screen_mem (temp_buf [row], rstyle);
744 } 765 }
745 766
746 for (int row = 0; row < rows; row++) 767 for (int row = 0; row < rows; row++)
747 ROW(row1 + row) = temp_buf [row]; 768 ROW(row1 + row) = temp_buf [row];
769
770 // sever bottommost line
771 {
772 line_t &l = ROW(row2);
773 l.is_longer (0);
774 l.touch ();
775 }
748 } 776 }
749 777
750 return count; 778 return count;
751} 779}
752 780
753/* ------------------------------------------------------------------------- */ 781/* ------------------------------------------------------------------------- */
754/* 782/*
755 * Add text given in <str> of length <len> to screen struct 783 * Add text given in <str> of length <len> to screen struct
756 */ 784 */
757void 785void ecb_hot
758rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 786rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
759{ 787{
760 if (len <= 0) /* sanity */ 788 if (len <= 0) /* sanity */
761 return; 789 return;
762 790
763 unsigned char checksel; 791 bool checksel;
764 unicode_t c; 792 unicode_t c;
765 int ncol = this->ncol; 793 int ncol = this->ncol;
766 const wchar_t *strend = str + len; 794 const wchar_t *strend = str + len;
767 795
768 want_refresh = 1; 796 want_refresh = 1;
… …
794 822
795 while (str < strend) 823 while (str < strend)
796 { 824 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 825 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 826
799 if (expect_false (c < 0x20)) 827 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 828 if (c == C0_LF)
801 { 829 {
802 max_it (line->l, screen.cur.col); 830 max_it (line->l, screen.cur.col);
803 831
804 screen.flags &= ~Screen_WrapNext; 832 screen.flags &= ~Screen_WrapNext;
… …
823 { 851 {
824 scr_tab (1, true); 852 scr_tab (1, true);
825 continue; 853 continue;
826 } 854 }
827 855
828 if (expect_false ( 856 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 857 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 858 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 859 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 860 ))
833 { 861 {
… …
838 * should be a similar check. 866 * should be a similar check.
839 */ 867 */
840 CLEAR_SELECTION (); 868 CLEAR_SELECTION ();
841 } 869 }
842 870
843 if (expect_false (screen.flags & Screen_WrapNext)) 871 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 872 {
845 scr_do_wrap (); 873 scr_do_wrap ();
846 874
847 line->l = ncol; 875 line->l = ncol;
848 line->is_longer (1); 876 line->is_longer (1);
… …
850 row = screen.cur.row; 878 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 879 line = &ROW(row); /* _must_ refresh */
852 } 880 }
853 881
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 882 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 883 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 884 c = 0xfffd;
857 885
858 // rely on wcwidth to tell us the character width, do wcwidth before 886 // rely on wcwidth to tell us the character width, do wcwidth before
859 // further replacements, as wcwidth might return -1 for the line 887 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 888 // drawing characters below as they might be invalid in the current
861 // locale. 889 // locale.
862 int width = WCWIDTH (c); 890 int width = WCWIDTH (c);
863 891
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 892 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 893 {
866 // vt100 special graphics and line drawing 894 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 895 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 896 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 897 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 910 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 911 width = 1; // vt100 line drawing characters are always single-width
884 } 912 }
885 } 913 }
886 914
887 if (expect_false (screen.flags & Screen_Insert)) 915 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 916 scr_insdel_chars (width, INSERT);
889 917
890 if (width != 0) 918 if (width != 0)
891 { 919 {
892#if !UNICODE_3 920#if !UNICODE_3
… …
897# else 925# else
898 c = 0xfffd; 926 c = 0xfffd;
899# endif 927# endif
900#endif 928#endif
901 929
930 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
931
932 // if the character doesn't fit into the remaining columns...
933 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
934 {
935 if (screen.flags & Screen_Autowrap)
936 {
937 // ... artificially enlargen the previous one
938 c = NOCHAR;
939 // and try the same character next loop iteration
940 --str;
941 }
942 else
943 screen.cur.col = ncol - width;
944 }
945
902 // nuke the character at this position, if required 946 // nuke the character at this position, if required
903 if (expect_false ( 947 // due to wonderful coincidences everywhere else in this loop
948 // we never have to check for overwriting a wide char itself,
949 // only its tail.
904 line->t[screen.cur.col] == NOCHAR 950 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
905 || (screen.cur.col < ncol - 1
906 && line->t[screen.cur.col + 1] == NOCHAR)
907 ))
908 scr_kill_char (*line, screen.cur.col); 951 scr_kill_char (*line, screen.cur.col);
909
910 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
911
912 // if the character doesn't fit into the remaining columns...
913 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
914 {
915 // ... artificially enlargen the previous one
916 c = NOCHAR;
917 // and try the same character next loop iteration
918 --str;
919 }
920 952
921 line->touch (); 953 line->touch ();
922 954
923 do 955 do
924 { 956 {
925 line->t[screen.cur.col] = c; 957 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 958 line->r[screen.cur.col] = rend;
927 959
928 if (expect_true (screen.cur.col < ncol - 1)) 960 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 961 screen.cur.col++;
930 else 962 else
931 { 963 {
932 line->l = ncol; 964 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 965 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 966 screen.flags |= Screen_WrapNext;
935 break; 967
968 goto end_of_line;
936 } 969 }
937 970
938 c = NOCHAR; 971 c = NOCHAR;
939 } 972 }
940 while (expect_false (--width > 0)); 973 while (ecb_unlikely (--width > 0));
941 974
942 // pad with spaces when overwriting wide character with smaller one 975 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 976 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 977 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 978 line->t[c] = ' ';
950 line->r[c] = rend; 979 line->r[c] = rend;
951 }
952 } 980 }
981
982end_of_line:
983 ;
953 } 984 }
954#if ENABLE_COMBINING 985#if ENABLE_COMBINING
955 else // width == 0 986 else // width == 0
956 { 987 {
957 if (c != 0xfeff) // ignore BOM 988 if (c != 0xfeff) // ignore BOM
… …
1020 1051
1021 want_refresh = 1; 1052 want_refresh = 1;
1022#endif 1053#endif
1023 } 1054 }
1024 } 1055 }
1056 else if (screen.flags & Screen_WrapNext)
1057 screen.flags &= ~Screen_WrapNext;
1025 else 1058 else
1026 scr_gotorc (0, -1, RELATIVE); 1059 scr_gotorc (0, -1, RELATIVE);
1027} 1060}
1028 1061
1029/* ------------------------------------------------------------------------- */ 1062/* ------------------------------------------------------------------------- */
… …
1107 * XTERM_SEQ: ESC 6 1140 * XTERM_SEQ: ESC 6
1108 * Move cursor left in row. If we're at the left boundary, shift everything 1141 * Move cursor left in row. If we're at the left boundary, shift everything
1109 * in that row right. Clear left column. 1142 * in that row right. Clear left column.
1110 */ 1143 */
1111#if !ENABLE_MINIMAL 1144#if !ENABLE_MINIMAL
1112void 1145void ecb_cold
1113rxvt_term::scr_backindex () NOTHROW 1146rxvt_term::scr_backindex () NOTHROW
1114{ 1147{
1115 if (screen.cur.col > 0) 1148 if (screen.cur.col > 0)
1116 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1149 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1117 else 1150 else
… …
1124 * XTERM_SEQ: ESC 9 1157 * XTERM_SEQ: ESC 9
1125 * Move cursor right in row. If we're at the right boundary, shift everything 1158 * Move cursor right in row. If we're at the right boundary, shift everything
1126 * in that row left. Clear right column. 1159 * in that row left. Clear right column.
1127 */ 1160 */
1128#if !ENABLE_MINIMAL 1161#if !ENABLE_MINIMAL
1129void 1162void ecb_cold
1130rxvt_term::scr_forwardindex () NOTHROW 1163rxvt_term::scr_forwardindex () NOTHROW
1131{ 1164{
1132 if (screen.cur.col < ncol - 1) 1165 if (screen.cur.col < ncol - 1)
1133 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1166 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1134 else 1167 else
… …
1285 scr_blank_line (line, col, num, rstyle); 1318 scr_blank_line (line, col, num, rstyle);
1286} 1319}
1287 1320
1288/* ------------------------------------------------------------------------- */ 1321/* ------------------------------------------------------------------------- */
1289/* 1322/*
1290 * Erase part of whole of the screen 1323 * Erase part or whole of the screen
1291 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1324 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1292 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1325 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1293 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1326 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1294 */ 1327 */
1295void 1328void
… …
1304 ZERO_SCROLLBACK (); 1337 ZERO_SCROLLBACK ();
1305 1338
1306 switch (mode) 1339 switch (mode)
1307 { 1340 {
1308 case 0: /* erase to end of screen */ 1341 case 0: /* erase to end of screen */
1309 selection_check (1);
1310 scr_erase_line (0); 1342 scr_erase_line (0);
1311 row = screen.cur.row + 1; /* possible OOB */ 1343 row = screen.cur.row + 1; /* possible OOB */
1312 num = nrow - row; 1344 num = nrow - row;
1313 break; 1345 break;
1314 case 1: /* erase to beginning of screen */ 1346 case 1: /* erase to beginning of screen */
1315 selection_check (3);
1316 scr_erase_line (1); 1347 scr_erase_line (1);
1317 row = 0; 1348 row = 0;
1318 num = screen.cur.row; 1349 num = screen.cur.row;
1319 break; 1350 break;
1320 case 2: /* erase whole screen */ 1351 case 2: /* erase whole screen */
1321 selection_check (3);
1322 row = 0; 1352 row = 0;
1323 num = nrow; 1353 num = nrow;
1324 break; 1354 break;
1325 default: 1355 default:
1326 return; 1356 return;
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1365 if (row >= nrow) /* Out Of Bounds */
1336 return; 1366 return;
1337 1367
1338 min_it (num, nrow - row); 1368 min_it (num, nrow - row);
1339 1369
1340 // TODO: the code below does not work when view_start != 0
1341 // the workaround is to disable the clear and use a normal refresh
1342 // when view_start != 0. mysterious.
1343 if (rstyle & (RS_RVid | RS_Uline)) 1370 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1371 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1372 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1373 {
1347 ren = DEFAULT_RSTYLE; 1374 ren = DEFAULT_RSTYLE;
1348 1375
1349 if (mapped && !view_start) 1376 if (mapped)
1350 XClearArea (dpy, vt, 0, 1377 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1378 Row2Pixel (row - view_start), (unsigned int)vt_width,
1352 (unsigned int)Height2Pixel (num), False); 1379 (unsigned int)Height2Pixel (num), False);
1353 } 1380 }
1354 else 1381 else
1355 { 1382 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1383 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1384
1358 if (mapped && !view_start) 1385 if (mapped)
1359 { 1386 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1387 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1388 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1389 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1390 0, Row2Pixel (row - view_start),
1364 (unsigned int)width, 1391 (unsigned int)vt_width,
1365 (unsigned int)Height2Pixel (num)); 1392 (unsigned int)Height2Pixel (num));
1366 gcvalue.foreground = pix_colors[Color_fg]; 1393 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 } 1395 }
1369 } 1396 }
1370 1397
1371 for (; num--; row++) 1398 for (; num--; row++)
1372 { 1399 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1400 scr_blank_screen_mem (ROW(row), rstyle);
1374 1401
1375 if (!view_start) 1402 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1403 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1404 }
1378} 1405}
1379 1406
1380#if !ENABLE_MINIMAL 1407#if !ENABLE_MINIMAL
1381void 1408void
… …
1391/* ------------------------------------------------------------------------- */ 1418/* ------------------------------------------------------------------------- */
1392/* 1419/*
1393 * Fill the screen with `E's 1420 * Fill the screen with `E's
1394 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1421 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1395 */ 1422 */
1396void 1423void ecb_cold
1397rxvt_term::scr_E () NOTHROW 1424rxvt_term::scr_E () NOTHROW
1398{ 1425{
1399 rend_t fs; 1426 rend_t fs;
1400 1427
1401 want_refresh = 1; 1428 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1429 ZERO_SCROLLBACK ();
1403 1430
1404 num_scr_allow = 0; 1431 num_scr_allow = 0;
1405 selection_check (3); 1432
1433 row_col_t pos;
1434 pos.row = pos.col = 0;
1435 if (ROWCOL_IS_AFTER (selection.end, pos))
1436 CLEAR_SELECTION ();
1406 1437
1407 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1438 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1408 for (int row = nrow; row--; ) 1439 for (int row = nrow; row--; )
1409 { 1440 {
1410 line_t &line = ROW(row); 1441 line_t &line = ROW(row);
… …
1561/* ------------------------------------------------------------------------- */ 1592/* ------------------------------------------------------------------------- */
1562/* 1593/*
1563 * Set the scrolling region 1594 * Set the scrolling region
1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1595 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1565 */ 1596 */
1566void 1597void ecb_cold
1567rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1598rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1568{ 1599{
1569 max_it (top, 0); 1600 max_it (top, 0);
1570 min_it (bot, nrow - 1); 1601 min_it (bot, nrow - 1);
1571 1602
… …
1581/* 1612/*
1582 * Make the cursor visible/invisible 1613 * Make the cursor visible/invisible
1583 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1614 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1584 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1615 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1585 */ 1616 */
1586void 1617void ecb_cold
1587rxvt_term::scr_cursor_visible (int mode) NOTHROW 1618rxvt_term::scr_cursor_visible (int mode) NOTHROW
1588{ 1619{
1589 want_refresh = 1; 1620 want_refresh = 1;
1590 1621
1591 if (mode) 1622 if (mode)
… …
1598/* 1629/*
1599 * Set/unset automatic wrapping 1630 * Set/unset automatic wrapping
1600 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1631 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1601 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1632 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1602 */ 1633 */
1603void 1634void ecb_cold
1604rxvt_term::scr_autowrap (int mode) NOTHROW 1635rxvt_term::scr_autowrap (int mode) NOTHROW
1605{ 1636{
1606 if (mode) 1637 if (mode)
1607 screen.flags |= Screen_Autowrap; 1638 screen.flags |= Screen_Autowrap;
1608 else 1639 else
… …
1617 * Relative mode: line numbers are relative to top margin of scrolling region 1648 * Relative mode: line numbers are relative to top margin of scrolling region
1618 * and the cursor cannot be moved outside. 1649 * and the cursor cannot be moved outside.
1619 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1650 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1620 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1651 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1621 */ 1652 */
1622void 1653void ecb_cold
1623rxvt_term::scr_relative_origin (int mode) NOTHROW 1654rxvt_term::scr_relative_origin (int mode) NOTHROW
1624{ 1655{
1625 if (mode) 1656 if (mode)
1626 screen.flags |= Screen_Relative; 1657 screen.flags |= Screen_Relative;
1627 else 1658 else
… …
1634/* 1665/*
1635 * Set insert/replace mode 1666 * Set insert/replace mode
1636 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1667 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1637 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1668 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1638 */ 1669 */
1639void 1670void ecb_cold
1640rxvt_term::scr_insert_mode (int mode) NOTHROW 1671rxvt_term::scr_insert_mode (int mode) NOTHROW
1641{ 1672{
1642 if (mode) 1673 if (mode)
1643 screen.flags |= Screen_Insert; 1674 screen.flags |= Screen_Insert;
1644 else 1675 else
… …
1650 * Set/Unset tabs 1681 * Set/Unset tabs
1651 * XTERM_SEQ: Set tab at current column : ESC H 1682 * XTERM_SEQ: Set tab at current column : ESC H
1652 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1683 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1653 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1684 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1654 */ 1685 */
1655void 1686void ecb_cold
1656rxvt_term::scr_set_tab (int mode) NOTHROW 1687rxvt_term::scr_set_tab (int mode) NOTHROW
1657{ 1688{
1658 if (mode < 0) 1689 if (mode < 0)
1659 memset (tabs, 0, ncol); 1690 memset (tabs, 0, ncol);
1660 else if (screen.cur.col < ncol) 1691 else if (screen.cur.col < ncol)
… …
1679 if (rvideo_state != on) 1710 if (rvideo_state != on)
1680 { 1711 {
1681 rvideo_state = on; 1712 rvideo_state = on;
1682 1713
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1714 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1715#ifdef HAVE_IMG
1685 if (bgPixmap.pixmap == None) 1716 if (bg_img == 0)
1686#endif 1717#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1718 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1719
1689 XGCValues gcvalue; 1720 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1721 gcvalue.foreground = pix_colors[Color_fg];
… …
1699/* ------------------------------------------------------------------------- */ 1730/* ------------------------------------------------------------------------- */
1700/* 1731/*
1701 * Report current cursor position 1732 * Report current cursor position
1702 * XTERM_SEQ: Report position: ESC [ 6 n 1733 * XTERM_SEQ: Report position: ESC [ 6 n
1703 */ 1734 */
1704void 1735void ecb_cold
1705rxvt_term::scr_report_position () NOTHROW 1736rxvt_term::scr_report_position () NOTHROW
1706{ 1737{
1707 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1738 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1708} 1739}
1709 1740
… …
1712 * ------------------------------------------------------------------------- */ 1743 * ------------------------------------------------------------------------- */
1713 1744
1714/* 1745/*
1715 * Set font style 1746 * Set font style
1716 */ 1747 */
1717void 1748void ecb_cold
1718rxvt_term::set_font_style () NOTHROW 1749rxvt_term::set_font_style () NOTHROW
1719{ 1750{
1720#if 0 1751#if 0
1721 switch (charsets [screen.charset]) 1752 switch (charsets [screen.charset])
1722 { 1753 {
… …
1744 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1775 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1745 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1776 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1746 * XTERM_SEQ: Invoke G2 character set: ESC N 1777 * XTERM_SEQ: Invoke G2 character set: ESC N
1747 * XTERM_SEQ: Invoke G3 character set: ESC O 1778 * XTERM_SEQ: Invoke G3 character set: ESC O
1748 */ 1779 */
1749void 1780void ecb_cold
1750rxvt_term::scr_charset_choose (int set) NOTHROW 1781rxvt_term::scr_charset_choose (int set) NOTHROW
1751{ 1782{
1752 screen.charset = set; 1783 screen.charset = set;
1753 set_font_style (); 1784 set_font_style ();
1754} 1785}
… …
1775 * ------------------------------------------------------------------------- */ 1806 * ------------------------------------------------------------------------- */
1776 1807
1777/* 1808/*
1778 * refresh matching text. 1809 * refresh matching text.
1779 */ 1810 */
1780bool 1811bool ecb_cold
1781rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1812rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1782{ 1813{
1783 bool found = false; 1814 bool found = false;
1784 1815
1785 for (int i = 0; i < nrow; i++) 1816 for (int i = 0; i < nrow; i++)
… …
1804 PART_BEG = 0, 1835 PART_BEG = 0,
1805 PART_END, 1836 PART_END,
1806 RC_COUNT 1837 RC_COUNT
1807}; 1838};
1808 1839
1809void 1840void ecb_hot
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1841rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1811{ 1842{
1812 int i; 1843 int i;
1813 row_col_t rc[RC_COUNT]; 1844 row_col_t rc[RC_COUNT];
1814 1845
… …
1851 * Refresh the entire screen 1882 * Refresh the entire screen
1852 */ 1883 */
1853void 1884void
1854rxvt_term::scr_touch (bool refresh) NOTHROW 1885rxvt_term::scr_touch (bool refresh) NOTHROW
1855{ 1886{
1856 scr_expose (0, 0, width, height, refresh); 1887 scr_expose (0, 0, vt_width, vt_height, refresh);
1857} 1888}
1858 1889
1859/* ------------------------------------------------------------------------- */ 1890/* ------------------------------------------------------------------------- */
1860/* 1891/*
1861 * Move the display so that the line represented by scrollbar value Y is at 1892 * Move the display so that the line represented by scrollbar value Y is at
… …
1917 1948
1918# ifndef NO_MAPALERT 1949# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1950# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1951 if (option (Opt_mapAlert))
1921# endif 1952# endif
1922 XMapWindow (dpy, parent[0]); 1953 XMapWindow (dpy, parent);
1923# endif 1954# endif
1924 1955
1925# if ENABLE_FRILLS 1956# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1957 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1958 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1971 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1972#endif
1942} 1973}
1943 1974
1944/* ------------------------------------------------------------------------- */ 1975/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */ 1976void ecb_cold
1946void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1977rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1978{
1949#ifdef PRINTPIPE 1979#ifdef PRINTPIPE
1950 int nrows, row_start; 1980 int nrows, row_start;
1951 FILE *fd = popen_printer (); 1981 FILE *fd = popen_printer ();
… …
2000/* 2030/*
2001 * Refresh the screen 2031 * Refresh the screen
2002 * drawn_text/drawn_rend contain the screen information before the update. 2032 * drawn_text/drawn_rend contain the screen information before the update.
2003 * screen.text/screen.rend contain what the screen will change to. 2033 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2034 */
2005void 2035void ecb_hot
2006rxvt_term::scr_refresh () NOTHROW 2036rxvt_term::scr_refresh () NOTHROW
2007{ 2037{
2008 int16_t col, row, /* column/row we're processing */ 2038 int16_t col, row, /* column/row we're processing */
2009 ocrow; /* old cursor row */ 2039 ocrow; /* old cursor row */
2010 int i; /* tmp */ 2040 int i; /* tmp */
… …
2024 * A: set up vars 2054 * A: set up vars
2025 */ 2055 */
2026 refresh_count = 0; 2056 refresh_count = 0;
2027 2057
2028 unsigned int old_screen_flags = screen.flags; 2058 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2059 bool have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2060#ifdef HAVE_IMG
2031 have_bg = bgPixmap.pixmap != None; 2061 have_bg = bg_img != 0;
2032#endif 2062#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2063 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2064
2035 /* 2065 /*
2036 * B: reverse any characters which are selected 2066 * B: reverse any characters which are selected
… …
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2070 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY 2071#if ENABLE_OVERLAY
2042 scr_swap_overlay (); 2072 scr_swap_overlay ();
2043#endif 2073#endif
2044 2074
2045 char showcursor = screen.flags & Screen_VisibleCursor; 2075 bool showcursor = screen.flags & Screen_VisibleCursor;
2046 2076
2047 /* 2077 /*
2048 * C: set the cursor character (s) 2078 * C: set the cursor character (s)
2049 */ 2079 */
2050 { 2080 {
2051 unsigned char setoldcursor; 2081 bool setoldcursor;
2052 2082
2053#ifdef CURSOR_BLINK 2083#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2084 if (hidden_cursor)
2055 showcursor = 0; 2085 showcursor = 0;
2056#endif 2086#endif
… …
2143 { 2173 {
2144 int16_t nits; 2174 int16_t nits;
2145 int i = num_scr; 2175 int i = num_scr;
2146 int j; 2176 int j;
2147 int len, wlen; 2177 int len, wlen;
2148 dLocal (int, num_scr);
2149 2178
2150 j = nrow; 2179 j = nrow;
2151 wlen = len = -1; 2180 wlen = len = -1;
2152 row = i > 0 ? 0 : j - 1; 2181 row = i > 0 ? 0 : j - 1;
2153 2182
… …
2228 continue; 2257 continue;
2229 2258
2230 // redraw one or more characters 2259 // redraw one or more characters
2231 2260
2232 // seek to the beginning of wide characters 2261 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2262 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2263 --col;
2235 2264
2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2265 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2266 text_t *text = stp + col;
2238 int count = 1; 2267 int count = 1;
… …
2276 2305
2277 col--; /* went one too far. move back */ 2306 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2307 count -= i; /* dump any matching trailing chars */
2279 2308
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2309 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2310 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2311 count++, i--;
2283 2312
2284 /* 2313 /*
2285 * Determine the attributes for the string 2314 * Determine the attributes for the string
2286 */ 2315 */
2287 int fore = fgcolor_of (rend); // desired foreground 2316 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2317 int back = bgcolor_of (rend); // desired background
2289 2318
2290 // only do special processing if any attributes are set, which is unlikely 2319 // only do special processing if any attributes are set, which is unlikely
2291 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2320 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2321 {
2293 bool invert = rend & RS_RVid; 2322 bool invert = rend & RS_RVid;
2294 2323
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2324#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2325 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2344
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2345 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2346 fore = Color_UL;
2318#endif 2347#endif
2319 2348
2349#ifdef OPTION_HC
2350 if (rend & RS_Sel)
2351 {
2352 /* invert the column if no highlightColor is set or it is the
2353 * current cursor column */
2354 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2355 && ISSET_PIXCOLOR (Color_HC))
2356 {
2357 if (ISSET_PIXCOLOR (Color_HTC))
2358 fore = Color_HTC;
2359 // if invert is 0 reverse video is set so we use bg color as fg color
2360 else if (!invert)
2361 fore = back;
2362
2363 back = Color_HC;
2364 invert = 0;
2365 }
2366 }
2367#endif
2368
2320 if (invert) 2369 if (invert)
2321 { 2370 {
2322#ifdef OPTION_HC
2323 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2324 || !ISSET_PIXCOLOR (Color_HC))
2325#endif
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 ::swap (fore, back); 2371 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2372
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2373#ifndef NO_BOLD_UNDERLINE_REVERSE
2335# ifndef OPTION_HC
2336 if (ISSET_PIXCOLOR (Color_RV))
2337 back = Color_RV;
2338# endif
2339 if (fore == back) 2374 if (fore == back)
2340 { 2375 {
2341 fore = Color_bg; 2376 fore = Color_bg;
2342 back = Color_fg; 2377 back = Color_fg;
2343 } 2378 }
… …
2379 /* 2414 /*
2380 * Actually do the drawing of the string here 2415 * Actually do the drawing of the string here
2381 */ 2416 */
2382 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2417 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2383 2418
2384 if (expect_true (have_bg && back == Color_bg)) 2419 if (ecb_likely (have_bg && back == Color_bg))
2385 { 2420 {
2386 // this is very ugly, maybe push it into ->draw? 2421 // this is very ugly, maybe push it into ->draw?
2387 2422
2388 for (i = 0; i < count; i++) /* don't draw empty strings */ 2423 for (i = 0; i < count; i++) /* don't draw empty strings */
2389 if (text[i] != ' ') 2424 if (text[i] != ' ')
… …
2396 did_clear: ; 2431 did_clear: ;
2397 } 2432 }
2398 else 2433 else
2399 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2434 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2400 2435
2401 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2436 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2402 { 2437 {
2403#if ENABLE_FRILLS 2438#if ENABLE_FRILLS
2404 if (ISSET_PIXCOLOR (Color_underline)) 2439 if (ISSET_PIXCOLOR (Color_underline))
2405 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2440 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2406 else 2441 else
… …
2452 2487
2453 XDrawRectangle (dpy, vt, gc, 2488 XDrawRectangle (dpy, vt, gc,
2454 Col2Pixel (col), 2489 Col2Pixel (col),
2455 Row2Pixel (oldcursor.row), 2490 Row2Pixel (oldcursor.row),
2456 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2491 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2457 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2492 (unsigned int) (Height2Pixel (1) - 1));
2458 } 2493 }
2459 } 2494 }
2460 2495
2461 /* 2496 /*
2462 * H: cleanup selection 2497 * H: cleanup selection
… …
2471 screen.flags = old_screen_flags; 2506 screen.flags = old_screen_flags;
2472 num_scr = 0; 2507 num_scr = 0;
2473 num_scr_allow = 1; 2508 num_scr_allow = 1;
2474} 2509}
2475 2510
2476void 2511void ecb_cold
2477rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2512rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2478{ 2513{
2479 if (!l.t) 2514 if (!l.valid ())
2480 return; 2515 return;
2481 2516
2482 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
2483 2518
2484 for (int i = ncol; i--; ) 2519 for (int i = ncol; i--; )
2485 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]));
2486} 2521}
2487 2522
2488void 2523void ecb_cold
2489rxvt_term::scr_remap_chars () NOTHROW 2524rxvt_term::scr_remap_chars () NOTHROW
2490{ 2525{
2491 for (int i = total_rows; i--; ) 2526 for (int i = total_rows; i--; )
2492 scr_remap_chars (row_buf [i]); 2527 scr_remap_chars (row_buf [i]);
2493 2528
… …
2496 scr_remap_chars (drawn_buf [i]); 2531 scr_remap_chars (drawn_buf [i]);
2497 scr_remap_chars (swap_buf [i]); 2532 scr_remap_chars (swap_buf [i]);
2498 } 2533 }
2499} 2534}
2500 2535
2501void 2536void ecb_cold
2502rxvt_term::scr_recolour () NOTHROW 2537rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2538{
2504#ifdef HAVE_BG_PIXMAP 2539 bool transparent = false;
2505 bgPixmap.apply ();
2506#else
2507 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 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2562 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2563 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2564 }
2565
2566 XClearWindow (dpy, parent);
2511 2567
2512 if (scrollBar.win) 2568 if (scrollBar.win)
2513 { 2569 {
2570 if (transparent)
2571 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2572 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2573 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2515 scrollBar.state = STATE_IDLE; 2574 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2575 scrollBar.show (0);
2517 } 2576 }
2518 2577
2519#endif 2578 if (refresh)
2520 2579 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2580 scr_clear ();
2523 scr_touch (true); 2581 scr_touch (true);
2582 }
2524 want_refresh = 1; 2583 want_refresh = 1;
2525} 2584}
2526 2585
2527/* ------------------------------------------------------------------------- */ 2586/* ------------------------------------------------------------------------- */
2528void 2587void
… …
2585 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2644 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2586 srp[col] ^= rstyle; 2645 srp[col] ^= rstyle;
2587} 2646}
2588 2647
2589/* ------------------------------------------------------------------------- */ 2648/* ------------------------------------------------------------------------- */
2590void 2649void ecb_hot
2591rxvt_term::scr_reverse_selection () NOTHROW 2650rxvt_term::scr_reverse_selection () NOTHROW
2592{ 2651{
2593 if (selection.op 2652 if (selection.op
2594 && current_screen == selection.screen 2653 && current_screen == selection.screen
2595 && selection.end.row >= view_start) 2654 && selection.end.row >= view_start)
2596 { 2655 {
2597#if !ENABLE_MINIMAL 2656#if !ENABLE_MINIMAL
2598 if (selection.rect) 2657 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2658 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2659 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2660 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2661 else
2603#endif 2662#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2663 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2664 selection.end.row, selection.end.col,
2606 RS_RVid); 2665 RS_Sel | RS_RVid);
2607 } 2666 }
2608} 2667}
2609 2668
2610/* ------------------------------------------------------------------------- */ 2669/* ------------------------------------------------------------------------- */
2611/* 2670/*
… …
2614 */ 2673 */
2615#if 0 2674#if 0
2616void 2675void
2617rxvt_term::scr_dump (int fd) NOTHROW 2676rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2677{
2619 int row, wrote; 2678 // if this method is needed, it can be implemented by factoring the
2620 unsigned int width, towrite; 2679 // relevant code in scr_printscreen
2621 char r1[] = "\n";
2622
2623 for (row = saveLines + top_row;
2624 row < saveLines + nrow - 1; row++)
2625 {
2626 width = row_buf[row].l >= 0 ? row_buf[row].l
2627 : ncol;
2628 for (towrite = width; towrite; towrite -= wrote)
2629 {
2630 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2631 towrite);
2632 if (wrote < 0)
2633 return; /* XXX: death, no report */
2634 }
2635 if (row_buf[row].l >= 0)
2636 if (write (fd, r1, 1) <= 0)
2637 return; /* XXX: death, no report */
2638 }
2639} 2680}
2640#endif 2681#endif
2641 2682
2642/* ------------------------------------------------------------------------- * 2683/* ------------------------------------------------------------------------- *
2643 * CHARACTER SELECTION * 2684 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2685 * ------------------------------------------------------------------------- */
2645void 2686void
2646rxvt_term::selection_check (int check_more) NOTHROW 2687rxvt_term::selection_check (int check_more) NOTHROW
2647{ 2688{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2689 if (!selection.op)
2651 return; 2690 return;
2652 2691
2653 pos.row = pos.col = 0;
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2692 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2694 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2695 || (check_more == 1
2658 && current_screen == selection.screen 2696 && current_screen == selection.screen
2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2697 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2698 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2661 || (check_more == 2
2662 && ROWCOL_IS_BEFORE (selection.beg, pos)
2663 && ROWCOL_IS_AFTER (selection.end, pos))
2664 || (check_more == 3
2665 && ROWCOL_IS_AFTER (selection.end, pos))
2666 || (check_more == 4 /* screen width change */
2667 && (selection.beg.row != selection.end.row
2668 || selection.end.col > ncol)))
2669 CLEAR_SELECTION (); 2699 CLEAR_ALL_SELECTION ();
2670} 2700}
2671 2701
2672/* ------------------------------------------------------------------------- */ 2702/* ------------------------------------------------------------------------- */
2673/* 2703/*
2674 * Paste a selection direct to the command fd 2704 * Paste a selection direct to the command fd
2675 */ 2705 */
2676void 2706void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2707rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2708{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2709 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2710 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2711 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2712 data[i] = C0_CR;
2683 2713
2684 if (priv_modes & PrivMode_BracketPaste) 2714 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~"); 2715 tt_printf ("\x1b[200~");
2686 2716
2687 tt_write (data, len); 2717 tt_write (data, len);
2688 2718
2689 if (priv_modes & PrivMode_BracketPaste) 2719 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2720 tt_printf ("\x1b[201~");
2691} 2721}
2692 2722
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2723void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2724rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2725{
2701 if (prop == None) /* check for failed XConvertSelection */ 2726 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2702 {
2703 if ((selection_type & Sel_CompoundText))
2704 {
2705 int selnum = selection_type & Sel_whereMask;
2706
2707 selection_type = 0;
2708 if (selnum != Sel_direct)
2709 selection_request_other (XA_STRING, selnum);
2710 }
2711
2712 if ((selection_type & Sel_UTF8String))
2713 {
2714 int selnum = selection_type & Sel_whereMask;
2715
2716 selection_type = Sel_CompoundText;
2717 if (selnum != Sel_direct)
2718 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2719 else
2720 selection_type = 0;
2721 }
2722
2723 return;
2724 }
2725
2726 unsigned long bytes_after;
2727 XTextProperty ct;
2728
2729 if (XGetWindowProperty (dpy, win, prop,
2730 0, PROP_SIZE / 4,
2731 delete_prop, AnyPropertyType,
2732 &ct.encoding, &ct.format,
2733 &ct.nitems, &bytes_after,
2734 &ct.value) != Success)
2735 {
2736 ct.value = 0;
2737 goto bailout;
2738 }
2739
2740 if (ct.encoding == None)
2741 goto bailout;
2742
2743 if (bytes_after)
2744 {
2745 // fetch and append remaining data
2746 XTextProperty ct2;
2747
2748 if (XGetWindowProperty (dpy, win, prop,
2749 ct.nitems / 4, (bytes_after + 3) / 4,
2750 delete_prop, AnyPropertyType,
2751 &ct2.encoding, &ct2.format,
2752 &ct2.nitems, &bytes_after,
2753 &ct2.value) != Success)
2754 goto bailout;
2755
2756 // realloc should be compatible to XFree, here, and elsewhere, too
2757 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2758 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2759 ct.nitems += ct2.nitems;
2760
2761 XFree (ct2.value);
2762 }
2763
2764 if (ct.value == 0)
2765 goto bailout;
2766
2767 if (ct.encoding == xa[XA_INCR])
2768 {
2769 // INCR selection, start handshake
2770 if (!delete_prop)
2771 XDeleteProperty (dpy, win, prop);
2772
2773 selection_wait = Sel_incr;
2774 incr_buf_fill = 0;
2775 incr_ev.start (10);
2776
2777 goto bailout;
2778 }
2779
2780 if (ct.nitems == 0)
2781 {
2782 if (selection_wait == Sel_incr)
2783 {
2784 XFree (ct.value);
2785
2786 // finally complete, now paste the whole thing
2787 selection_wait = Sel_normal;
2788 ct.value = (unsigned char *)incr_buf;
2789 ct.nitems = incr_buf_fill;
2790 incr_buf = 0;
2791 incr_buf_size = 0;
2792 incr_ev.stop ();
2793 }
2794 else
2795 {
2796 if (selection_wait == Sel_normal
2797 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2798 {
2799 /*
2800 * pass through again trying CUT_BUFFER0 if we've come from
2801 * XConvertSelection () but nothing was presented
2802 */
2803 selection_paste (display->root, XA_CUT_BUFFER0, False);
2804 }
2805
2806 goto bailout;
2807 }
2808 }
2809 else if (selection_wait == Sel_incr)
2810 {
2811 incr_ev.start (10);
2812
2813 while (incr_buf_fill + ct.nitems > incr_buf_size)
2814 {
2815 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2816 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2817 }
2818
2819 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2820 incr_buf_fill += ct.nitems;
2821
2822 goto bailout;
2823 }
2824
2825 char **cl;
2826 int cr;
2827
2828#if !ENABLE_MINIMAL
2829 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2830 // so recode it manually
2831 if (ct.encoding == xa[XA_UTF8_STRING])
2832 {
2833 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2834 char *s = rxvt_wcstombs (w);
2835 free (w);
2836 // TODO: strlen == only the first element will be converted. well...
2837 paste (s, strlen (s));
2838 free (s);
2839 }
2840 else
2841#endif
2842 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2843 && cl)
2844 {
2845 for (int i = 0; i < cr; i++)
2846 paste (cl[i], strlen (cl[i]));
2847
2848 XFreeStringList (cl);
2849 }
2850 else
2851 paste ((char *)ct.value, ct.nitems); // paste raw
2852
2853bailout:
2854 XFree (ct.value);
2855
2856 if (selection_wait == Sel_normal)
2857 selection_wait = Sel_none;
2858}
2859
2860void
2861rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2862{
2863 selection_wait = Sel_none;
2864
2865 incr_buf_size = 0;
2866 free (incr_buf);
2867
2868 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2869}
2870
2871void
2872rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2873{
2874 if (prop == None || selection_wait != Sel_incr)
2875 return; 2727 return;
2876 2728
2877 selection_paste (win, prop, true); 2729 tt_paste (data, len);
2878} 2730}
2879 2731
2880/* ------------------------------------------------------------------------- */ 2732/* ------------------------------------------------------------------------- */
2881/* 2733/*
2882 * Request the current selection: 2734 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2735 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2736 * as fallback
2885 * > CUT_BUFFER0
2886 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2887 * will auto fallback to CUT_BUFFER0
2888 * EXT: button 2 release 2737 * EXT: button 2 release
2889 */ 2738 */
2890void 2739void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2740rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2741{
2893 if (selection.text && selnum == Sel_Primary) 2742 if (!selection_req)
2894 {
2895 /* internal selection */
2896 char *str = rxvt_wcstombs (selection.text, selection.len);
2897 paste (str, strlen (str));
2898 free (str);
2899 return;
2900 } 2743 {
2901 else 2744 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2745 selection_req->run ();
2902 { 2746 }
2903 selection_request_time = tm;
2904 selection_wait = Sel_normal;
2905
2906#if X_HAVE_UTF8_STRING
2907 selection_type = Sel_UTF8String;
2908 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2909 return;
2910#else
2911 selection_type = Sel_CompoundText;
2912 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2913 return;
2914#endif
2915 }
2916
2917 selection_wait = Sel_none; /* don't loop in selection_paste () */
2918 selection_paste (display->root, XA_CUT_BUFFER0, false);
2919}
2920
2921int
2922rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2923{
2924 Atom sel;
2925
2926 selection_type |= selnum;
2927
2928 if (selnum == Sel_Primary)
2929 sel = XA_PRIMARY;
2930 else if (selnum == Sel_Secondary)
2931 sel = XA_SECONDARY;
2932 else
2933 sel = xa[XA_CLIPBOARD];
2934
2935 if (XGetSelectionOwner (dpy, sel) != None)
2936 {
2937 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2938 vt, selection_request_time);
2939 return 1;
2940 }
2941
2942 return 0;
2943} 2747}
2944 2748
2945/* ------------------------------------------------------------------------- */ 2749/* ------------------------------------------------------------------------- */
2946/* 2750/*
2947 * Clear all selected text 2751 * Clear all selected text
… …
2970 if (display->clipboard_owner == this) 2774 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2775 display->clipboard_owner = 0;
2972 } 2776 }
2973} 2777}
2974 2778
2975void
2976rxvt_term::clipboard_copy (Time tm)
2977{
2978 if (selection.len > 0)
2979 {
2980 free (selection.clip_text);
2981 selection.clip_len = selection.len;
2982 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2983 memcpy (selection.clip_text, selection.text,
2984 sizeof (wchar_t) * selection.clip_len);
2985 selection_grab (tm, true);
2986 }
2987}
2988
2989/* ------------------------------------------------------------------------- */ 2779/* ------------------------------------------------------------------------- */
2990/* 2780/*
2991 * Copy a selection into the cut buffer 2781 * Copy a selection into the cut buffer
2992 * EXT: button 1 or 3 release 2782 * EXT: button 1 or 3 release
2993 */ 2783 */
2994void 2784void
2995rxvt_term::selection_make (Time tm) 2785rxvt_term::selection_make (Time tm)
2996{ 2786{
2997 int i; 2787 int size;
2998 wchar_t *new_selection_text; 2788 wchar_t *new_selection_text;
2999 text_t *t; 2789 text_t *t;
3000 2790
3001 switch (selection.op) 2791 switch (selection.op)
3002 { 2792 {
… …
3018 return; /* nothing selected, go away */ 2808 return; /* nothing selected, go away */
3019 2809
3020 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2810 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3021 return; 2811 return;
3022 2812
3023 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2813 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3024 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2814 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3025 2815
3026 int ofs = 0; 2816 int ofs = 0;
3027 int extra = 0; 2817 int extra = 0;
3028 2818
3029 int col = selection.beg.col; 2819 int col = selection.beg.col;
… …
3035 { 2825 {
3036#if !ENABLE_MINIMAL 2826#if !ENABLE_MINIMAL
3037 if (selection.rect) 2827 if (selection.rect)
3038 { 2828 {
3039 col = selection.beg.col; 2829 col = selection.beg.col;
3040 end_col = ncol + 1; 2830 end_col = selection.end.col;
3041 } 2831 }
3042 else 2832 else
3043#endif 2833#endif
3044 end_col = ROW(row).l; 2834 end_col = ROW(row).l;
3045 2835
3046 col = max (col, 0); 2836 col = max (col, 0);
3047 2837
3048 if (row == selection.end.row 2838 if (row == selection.end.row)
3049#if !ENABLE_MINIMAL
3050 || selection.rect
3051#endif
3052 )
3053 min_it (end_col, selection.end.col); 2839 min_it (end_col, selection.end.col);
3054 2840
3055 t = ROW(row).t + col; 2841 t = ROW(row).t + col;
3056 2842
3057 for (; col < end_col; col++) 2843 for (; col < end_col; col++)
… …
3065 2851
3066 extra -= (len - 1); 2852 extra -= (len - 1);
3067 2853
3068 if (extra < 0) 2854 if (extra < 0)
3069 { 2855 {
3070 extra += i; 2856 extra += size;
3071 i += i; 2857 size += size;
3072 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2858 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3073 } 2859 }
3074 2860
3075 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2861 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3076 } 2862 }
3077#endif 2863#endif
… …
3089 2875
3090 new_selection_text[ofs++] = C0_LF; 2876 new_selection_text[ofs++] = C0_LF;
3091 } 2877 }
3092 else 2878 else
3093#endif 2879#endif
3094 if (!ROW(row).is_longer () && row != selection.end.row) 2880 if (!ROW(row).is_longer ()
2881 && (row != selection.end.row || end_col != selection.end.col)
2882 && (row != selection.beg.row || selection.beg.col < ncol))
3095 new_selection_text[ofs++] = C0_LF; 2883 new_selection_text[ofs++] = C0_LF;
3096 } 2884 }
3097
3098 if (end_col != selection.end.col)
3099 new_selection_text[ofs++] = C0_LF;
3100 2885
3101 new_selection_text[ofs] = 0; 2886 new_selection_text[ofs] = 0;
3102 2887
3103 if (ofs == 0) 2888 if (ofs == 0)
3104 { 2889 {
… …
3160/* ------------------------------------------------------------------------- */ 2945/* ------------------------------------------------------------------------- */
3161/* 2946/*
3162 * Mark or select text based upon number of clicks: 1, 2, or 3 2947 * Mark or select text based upon number of clicks: 1, 2, or 3
3163 * EXT: button 1 press 2948 * EXT: button 1 press
3164 */ 2949 */
3165void 2950void ecb_cold
3166rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2951rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3167{ 2952{
3168 clicks = ((clicks - 1) % 3) + 1; 2953 clicks = ((clicks - 1) % 3) + 1;
3169 selection.clicks = clicks; /* save clicks so extend will work */ 2954 selection.clicks = clicks; /* save clicks so extend will work */
3170 2955
… …
3189 2974
3190/* ------------------------------------------------------------------------- */ 2975/* ------------------------------------------------------------------------- */
3191/* 2976/*
3192 * Mark a selection at the specified col/row 2977 * Mark a selection at the specified col/row
3193 */ 2978 */
3194void 2979void ecb_cold
3195rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2980rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3196{ 2981{
3197 want_refresh = 1; 2982 want_refresh = 1;
3198 2983
3199 selection.mark.row = row + view_start; 2984 selection.mark.row = row + view_start;
… …
3226/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3011/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3227#define DELIMIT_TEXT(x) \ 3012#define DELIMIT_TEXT(x) \
3228 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3013 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3229#define DELIMIT_REND(x) 1 3014#define DELIMIT_REND(x) 1
3230 3015
3231void 3016void ecb_cold
3232rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3017rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3233{ 3018{
3234 int col, row, dirnadd, tcol, trow, w1, w2; 3019 int col, row, dirnadd, tcol, trow, w1, w2;
3235 row_col_t bound; 3020 row_col_t bound;
3236 text_t *stp; 3021 text_t *stp;
… …
3310 * EXT: button 3 press; button 1 or 3 drag 3095 * EXT: button 3 press; button 1 or 3 drag
3311 * flag == 0 ==> button 1 3096 * flag == 0 ==> button 1
3312 * flag == 1 ==> button 3 press 3097 * flag == 1 ==> button 3 press
3313 * flag == 2 ==> button 3 motion 3098 * flag == 2 ==> button 3 motion
3314 */ 3099 */
3315void 3100void ecb_cold
3316rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3101rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3317{ 3102{
3318 int col = clamp (Pixel2Col (x), 0, ncol); 3103 int col = clamp (Pixel2Col (x), 0, ncol);
3319 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3104 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3320 3105
… …
3346 3131
3347/* ------------------------------------------------------------------------- */ 3132/* ------------------------------------------------------------------------- */
3348/* 3133/*
3349 * Extend the selection to the specified col/row 3134 * Extend the selection to the specified col/row
3350 */ 3135 */
3351void 3136void ecb_cold
3352rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3137rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3353{ 3138{
3354 row_col_t pos; 3139 row_col_t pos;
3355 enum { 3140 enum {
3356 LEFT, RIGHT 3141 LEFT, RIGHT
… …
3547 ::swap (selection.beg.col, selection.end.col); 3332 ::swap (selection.beg.col, selection.end.col);
3548#endif 3333#endif
3549} 3334}
3550 3335
3551#if !ENABLE_MINIMAL 3336#if !ENABLE_MINIMAL
3552void 3337void ecb_cold
3553rxvt_term::selection_remove_trailing_spaces () NOTHROW 3338rxvt_term::selection_remove_trailing_spaces () NOTHROW
3554{ 3339{
3555 int32_t end_col, end_row; 3340 int32_t end_col, end_row;
3556 text_t *stp; 3341 text_t *stp;
3557 3342
… …
3595/* ------------------------------------------------------------------------- */ 3380/* ------------------------------------------------------------------------- */
3596/* 3381/*
3597 * Double click on button 3 when already selected 3382 * Double click on button 3 when already selected
3598 * EXT: button 3 double click 3383 * EXT: button 3 double click
3599 */ 3384 */
3600void 3385void ecb_cold
3601rxvt_term::selection_rotate (int x, int y) NOTHROW 3386rxvt_term::selection_rotate (int x, int y) NOTHROW
3602{ 3387{
3603 selection.clicks = selection.clicks % 3 + 1; 3388 selection.clicks = selection.clicks % 3 + 1;
3604 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3389 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3605} 3390}
… …
3607/* ------------------------------------------------------------------------- */ 3392/* ------------------------------------------------------------------------- */
3608/* 3393/*
3609 * Respond to a request for our current selection 3394 * Respond to a request for our current selection
3610 * EXT: SelectionRequest 3395 * EXT: SelectionRequest
3611 */ 3396 */
3612void 3397void ecb_cold
3613rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3398rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3614{ 3399{
3400 Atom property = rq.property == None ? rq.target : rq.property;
3615 XSelectionEvent ev; 3401 XSelectionEvent ev;
3616 3402
3617 ev.type = SelectionNotify; 3403 ev.type = SelectionNotify;
3618 ev.property = None; 3404 ev.property = None;
3619 ev.display = rq.display; 3405 ev.display = rq.display;
… …
3634 *target++ = xa[XA_COMPOUND_TEXT]; 3420 *target++ = xa[XA_COMPOUND_TEXT];
3635#if X_HAVE_UTF8_STRING 3421#if X_HAVE_UTF8_STRING
3636 *target++ = xa[XA_UTF8_STRING]; 3422 *target++ = xa[XA_UTF8_STRING];
3637#endif 3423#endif
3638 3424
3639 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3425 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3640 32, PropModeReplace, 3426 32, PropModeReplace,
3641 (unsigned char *)target_list, target - target_list); 3427 (unsigned char *)target_list, target - target_list);
3642 ev.property = rq.property; 3428 ev.property = property;
3643 } 3429 }
3644#if TODO // TODO 3430#if TODO // TODO
3645 else if (rq.target == xa[XA_MULTIPLE]) 3431 else if (rq.target == xa[XA_MULTIPLE])
3646 { 3432 {
3647 /* TODO: Handle MULTIPLE */ 3433 /* TODO: Handle MULTIPLE */
3648 } 3434 }
3649#endif 3435#endif
3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3436 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3651 { 3437 {
3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3438 XChangeProperty (dpy, rq.requestor, property, rq.target,
3653 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3439 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property; 3440 ev.property = property;
3655 } 3441 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3442 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 { 3443 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3444 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3445 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3660 ev.property = rq.property; 3446 ev.property = property;
3661 } 3447 }
3662 else if (rq.target == XA_STRING 3448 else if (rq.target == XA_STRING
3663 || rq.target == xa[XA_TEXT] 3449 || rq.target == xa[XA_TEXT]
3664 || rq.target == xa[XA_COMPOUND_TEXT] 3450 || rq.target == xa[XA_COMPOUND_TEXT]
3665 || rq.target == xa[XA_UTF8_STRING] 3451 || rq.target == xa[XA_UTF8_STRING]
… …
3736 ct.value = (unsigned char *)cl; 3522 ct.value = (unsigned char *)cl;
3737 ct.nitems = selectlen; 3523 ct.nitems = selectlen;
3738 ct.encoding = target; 3524 ct.encoding = target;
3739 } 3525 }
3740 3526
3741 XChangeProperty (dpy, rq.requestor, rq.property, 3527 XChangeProperty (dpy, rq.requestor, property,
3742 ct.encoding, 8, PropModeReplace, 3528 ct.encoding, 8, PropModeReplace,
3743 ct.value, (int)ct.nitems); 3529 ct.value, (int)ct.nitems);
3744 ev.property = rq.property; 3530 ev.property = property;
3745 3531
3746 if (freect) 3532 if (freect)
3747 XFree (ct.value); 3533 XFree (ct.value);
3748 } 3534 }
3749 3535
3750 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3536 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3751} 3537}
3752 3538
3753/* ------------------------------------------------------------------------- */ 3539/* ------------------------------------------------------------------------- */
3754#ifdef USE_XIM 3540#if USE_XIM
3755void 3541void ecb_cold
3756rxvt_term::im_set_position (XPoint &pos) NOTHROW 3542rxvt_term::im_set_position (XPoint &pos) NOTHROW
3757{ 3543{
3758 XWindowAttributes xwa; 3544 XWindowAttributes xwa;
3759 3545
3760 XGetWindowAttributes (dpy, vt, &xwa); 3546 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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