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.335 by root, Tue Mar 30 23:00:35 2010 UTC vs.
Revision 1.423 by sf-exg, Fri Jun 29 14:01:53 2012 UTC

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

Diff Legend

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