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.340 by sf-exg, Sat Apr 17 23:00:45 2010 UTC vs.
Revision 1.415 by root, Mon May 28 14:25:16 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! 33#include "salloc.C" // HACK, should be a separate compile!
34 34
35static inline void
35static inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
36{ 37{
37 while (len--) 38 while (len--)
38 *start++ = value; 39 *start++ = value;
39} 40}
40 41
41/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
45 44
46/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
… …
99 98
100/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
101void 100void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 102{
104 if (!l.t) 103 if (!l.valid ())
105 { 104 {
106 lalloc (l); 105 l.alloc ();
107 col = 0; 106 col = 0;
108 width = ncol; 107 width = ncol;
109 } 108 }
110 109
111 l.touch (); 110 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 141 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 142 col--;
144 143
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 144 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
147 148
148 // found start, nuke 149 // found start, nuke
149 do { 150 do {
150 l.t[col] = ' '; 151 l.t[col] = ' ';
151 l.r[col] = rend; 152 l.r[col] = rend;
… …
156/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
159 160
160void 161void
162rxvt_term::scr_alloc ()
163{
164 int tsize = sizeof (text_t) * ncol;
165 int rsize = sizeof (rend_t) * ncol;
166
167 // we assume that rend_t size is a sufficient alignment
168 // factor for tetx_t and line_t values, and we only
169 // need to adjust tsize.
170 tsize = (tsize + sizeof (rend_t) - 1);
171 tsize -= tsize % sizeof (rend_t);
172
173 int all_rows = total_rows + nrow + nrow;
174
175 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
176 chunk = rxvt_malloc (chunk_size);
177
178 char *base = (char *)chunk + sizeof (line_t) * all_rows;
179
180 for (int row = 0; row < all_rows; ++row)
181 {
182 line_t &l = ((line_t *)chunk) [row];
183
184 l.t = (text_t *)base; base += tsize;
185 l.r = (rend_t *)base; base += rsize;
186 l.l = -1;
187 l.f = 0;
188 }
189
190 drawn_buf = (line_t *)chunk;
191 swap_buf = drawn_buf + nrow;
192 row_buf = swap_buf + nrow;
193}
194
195void
161rxvt_term::scr_reset () 196rxvt_term::scr_reset ()
162{ 197{
198#if ENABLE_OVERLAY
199 scr_overlay_off ();
200#endif
201
163 view_start = 0; 202 view_start = 0;
164 num_scr = 0; 203 num_scr = 0;
165 204
166 if (ncol == 0) 205 if (ncol == 0)
167 ncol = 80; 206 ncol = 80;
… …
187 total_rows = nrow + saveLines; 226 total_rows = nrow + saveLines;
188 227
189 screen.tscroll = 0; 228 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 229 screen.bscroll = nrow - 1;
191 230
231 void *prev_chunk = chunk;
232 line_t *prev_drawn_buf = drawn_buf;
233 line_t *prev_swap_buf = swap_buf;
234 line_t *prev_row_buf = row_buf;
235
236 int common_col = min (prev_ncol, ncol);
237
238 scr_alloc ();
239
192 if (!row_buf) 240 if (!prev_row_buf)
193 { 241 {
194 /* 242 /*
195 * first time called so just malloc everything: don't rely on realloc 243 * first time called so just malloc everything: don't rely on realloc
196 */ 244 */
197 top_row = 0; 245 top_row = 0;
198 term_start = 0; 246 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 247
214 memset (charsets, 'B', sizeof (charsets)); 248 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 249 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 250 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 251 screen.cur.row = screen.cur.col = 0;
… …
240 { 274 {
241 /* 275 /*
242 * add or delete rows as appropriate 276 * add or delete rows as appropriate
243 */ 277 */
244 278
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--; ) 279 for (int row = min (nrow, prev_nrow); row--; )
263 { 280 {
264 lresize (drawn_buf[row]); 281 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
265 lresize (swap_buf [row]); 282 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
266 }
267 283
268 for (int row = prev_nrow; row < nrow; row++) 284 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
285 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
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);
269 { 288 }
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 289
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 290 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 291 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 292 int q = total_rows; // rewrapped row
280 293
… …
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 301 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 302
290 do 303 do
291 { 304 {
292 p = MOD (p - 1, prev_total_rows); 305 p = MOD (p - 1, prev_total_rows);
293 assert (old_buf [MOD (p, prev_total_rows)].t); 306 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
294 int plines = 1; 307 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 308 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 309
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 310 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 311 {
299 p = MOD (p - 1, prev_total_rows); 312 p = MOD (p - 1, prev_total_rows);
300 313
301 plines++; 314 plines++;
302 llen += prev_ncol; 315 llen += prev_ncol;
… …
315 328
316 // re-assemble the full line by destination lines 329 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 330 for (int qrow = q; qlines--; qrow++)
318 { 331 {
319 qline = row_buf + qrow; 332 qline = row_buf + qrow;
320 lalloc (*qline); 333 qline->alloc (); // redundant with next line
321 qline->l = ncol; 334 qline->l = ncol;
322 qline->is_longer (1); 335 qline->is_longer (1);
323 336
324 int qcol = 0; 337 int qcol = 0;
325 338
… …
340 // this seems to upset applications/shells/readline 353 // this seems to upset applications/shells/readline
341 // least. 354 // least.
342 if (prow == ocur.row) 355 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 356 screen.cur.row = q - (total_rows - nrow);
344 357
345 line_t &pline = old_buf [prow]; 358 line_t &pline = prev_row_buf [prow];
346 359
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 360 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 361
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 362 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 363 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 384 {
372 // if no scrollback exists (yet), wing, instead of wrap 385 // if no scrollback exists (yet), wing, instead of wrap
373 386
374 for (int row = min (nrow, prev_nrow); row--; ) 387 for (int row = min (nrow, prev_nrow); row--; )
375 { 388 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 389 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 390 line_t &dst = row_buf [row];
378 391
379 qline = pline; 392 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
380 lresize (qline); 393
394 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
395 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
381 } 396 }
382 397
383 for (int row = prev_nrow; row < nrow; row++) 398 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 399 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 400
388 term_start = 0; 401 term_start = 0;
389 } 402 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 403
395 clamp_it (screen.cur.row, 0, nrow - 1); 404 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 405 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 406 }
398 407
408 for (int row = nrow; row--; )
409 {
410 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
411 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
412 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
413 }
414
415 free (prev_chunk);
416
399 free (tabs); 417 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 418 tabs = (char *)rxvt_malloc (ncol);
401 419
402 for (int col = ncol; --col; ) 420 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 421 tabs [col] = col % TABSIZE == 0;
404 422
405 CLEAR_ALL_SELECTION (); 423 CLEAR_ALL_SELECTION ();
406 424
407 prev_nrow = nrow; 425 prev_nrow = nrow;
… …
417 * Free everything. That way malloc debugging can find leakage. 435 * Free everything. That way malloc debugging can find leakage.
418 */ 436 */
419void 437void
420rxvt_term::scr_release () NOTHROW 438rxvt_term::scr_release () NOTHROW
421{ 439{
422 if (row_buf) 440 free (chunk);
423 {
424 delete talloc; talloc = 0;
425 delete ralloc; ralloc = 0;
426
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); 441 free (tabs);
433 tabs = 0;
434 }
435} 442}
436 443
437/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
438/* 445/*
439 * Hard/Soft reset 446 * Hard/Soft reset
440 */ 447 */
441void 448void
442rxvt_term::scr_poweron () 449rxvt_term::scr_poweron ()
443{ 450{
444 scr_release (); 451 scr_release ();
452
453 row_buf = 0;
454 tabs = 0;
445 prev_nrow = prev_ncol = 0; 455 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 456 rvideo_mode = false;
447 scr_soft_reset (); 457 scr_soft_reset ();
448 scr_reset (); 458 scr_reset ();
449 459
450 scr_clear (true); 460 scr_clear (true);
451 scr_refresh (); 461 scr_refresh ();
452} 462}
453 463
454void 464void
455rxvt_term::scr_soft_reset () 465rxvt_term::scr_soft_reset () NOTHROW
456{ 466{
457 /* only affects modes, nothing drastic such as clearing the screen */ 467 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 468#if ENABLE_OVERLAY
459 scr_overlay_off (); 469 scr_overlay_off ();
460#endif 470#endif
… …
515 assert (s->cur.row >= 0); 525 assert (s->cur.row >= 0);
516 assert (s->cur.col >= 0); 526 assert (s->cur.col >= 0);
517} 527}
518 528
519void 529void
520rxvt_term::scr_swap_screen () 530rxvt_term::scr_swap_screen () NOTHROW
521{ 531{
522 if (!option (Opt_secondaryScreen)) 532 if (!option (Opt_secondaryScreen))
523 return; 533 return;
524 534
525 for (int i = prev_nrow; i--; ) 535 for (int i = prev_nrow; i--; )
… …
544 return; 554 return;
545 555
546 want_refresh = 1; 556 want_refresh = 1;
547 view_start = 0; 557 view_start = 0;
548 558
549 selection_check (2); /* check for boundary cross */ 559 /* check for boundary cross */
560 row_col_t pos;
561 pos.row = pos.col = 0;
562 if (ROWCOL_IS_BEFORE (selection.beg, pos)
563 && ROWCOL_IS_AFTER (selection.end, pos))
564 CLEAR_SELECTION ();
550 565
551 current_screen = scrn; 566 current_screen = scrn;
552 567
553#if NSCREENS 568#if NSCREENS
554 if (option (Opt_secondaryScreen)) 569 if (option (Opt_secondaryScreen))
… …
633 648
634 if (count > 0 649 if (count > 0
635 && row1 == 0 650 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 651 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 652 {
653 min_it (count, total_rows - (nrow - (row2 + 1)));
654
638 top_row = max (top_row - count, -saveLines); 655 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 656
643 // sever bottommost line 657 // sever bottommost line
644 { 658 {
645 line_t &l = ROW(row2 - count); 659 line_t &l = ROW(row2);
646 l.is_longer (0); 660 l.is_longer (0);
647 l.touch (); 661 l.touch ();
648 } 662 }
649 663
664 // scroll everything up 'count' lines
665 term_start = (term_start + count) % total_rows;
666
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
650 // erase newly scrolled-in lines 679 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 680 for (int i = count; i--; )
652 { 681 {
653 line_t &l = ROW(nrow - 1 - i); 682 line_t &l = ROW(row2 - i);
654 683
655 // optimize if already cleared, can be significant on slow machines 684 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 685 // 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))) 686 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 { 687 {
659 scr_blank_line (l, 0, l.l, rstyle); 688 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 689 l.l = 0;
… …
662 } 691 }
663 else 692 else
664 scr_blank_screen_mem (l, rstyle); 693 scr_blank_screen_mem (l, rstyle);
665 } 694 }
666 695
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 696 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen
698 && selection.beg.row <= row2)
681 { 699 {
682 selection.beg.row -= count; 700 selection.beg.row -= count;
683 selection.end.row -= count; 701 selection.end.row -= count;
684 selection.mark.row -= count; 702 selection.mark.row -= count;
685 703
686 if (selection.beg.row < top_row 704 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 } 705 }
694 706
695 // finally move the view window, if desired 707 // finally move the view window, if desired
696 if (option (Opt_scrollWithBuffer) 708 if (option (Opt_scrollWithBuffer)
697 && view_start != 0 709 && view_start != 0
… …
727 } 739 }
728 740
729 // use a simple and robust scrolling algorithm, this 741 // use a simple and robust scrolling algorithm, this
730 // part of scr_scroll_text is not time-critical. 742 // part of scr_scroll_text is not time-critical.
731 743
744 // sever line above scroll region
745 if (row1)
746 {
747 line_t &l = ROW(row1 - 1);
748 l.is_longer (0);
749 l.touch ();
750 }
751
732 int rows = row2 - row1 + 1; 752 int rows = row2 - row1 + 1;
733 753
734 min_it (count, rows); 754 min_it (count, rows);
735 755
736 line_t *temp_buf = row_buf + total_rows; 756 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
737 757
738 for (int row = 0; row < rows; row++) 758 for (int row = 0; row < rows; row++)
739 { 759 {
740 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 760 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
741 761
… …
743 scr_blank_screen_mem (temp_buf [row], rstyle); 763 scr_blank_screen_mem (temp_buf [row], rstyle);
744 } 764 }
745 765
746 for (int row = 0; row < rows; row++) 766 for (int row = 0; row < rows; row++)
747 ROW(row1 + row) = temp_buf [row]; 767 ROW(row1 + row) = temp_buf [row];
768
769 // sever bottommost line
770 {
771 line_t &l = ROW(row2);
772 l.is_longer (0);
773 l.touch ();
774 }
748 } 775 }
749 776
750 return count; 777 return count;
751} 778}
752 779
… …
758rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 785rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
759{ 786{
760 if (len <= 0) /* sanity */ 787 if (len <= 0) /* sanity */
761 return; 788 return;
762 789
763 unsigned char checksel; 790 bool checksel;
764 unicode_t c; 791 unicode_t c;
765 int ncol = this->ncol; 792 int ncol = this->ncol;
766 const wchar_t *strend = str + len; 793 const wchar_t *strend = str + len;
767 794
768 want_refresh = 1; 795 want_refresh = 1;
… …
794 821
795 while (str < strend) 822 while (str < strend)
796 { 823 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 824 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 825
799 if (expect_false (c < 0x20)) 826 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 827 if (c == C0_LF)
801 { 828 {
802 max_it (line->l, screen.cur.col); 829 max_it (line->l, screen.cur.col);
803 830
804 screen.flags &= ~Screen_WrapNext; 831 screen.flags &= ~Screen_WrapNext;
… …
823 { 850 {
824 scr_tab (1, true); 851 scr_tab (1, true);
825 continue; 852 continue;
826 } 853 }
827 854
828 if (expect_false ( 855 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 856 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 857 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 858 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 859 ))
833 { 860 {
… …
838 * should be a similar check. 865 * should be a similar check.
839 */ 866 */
840 CLEAR_SELECTION (); 867 CLEAR_SELECTION ();
841 } 868 }
842 869
843 if (expect_false (screen.flags & Screen_WrapNext)) 870 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 871 {
845 scr_do_wrap (); 872 scr_do_wrap ();
846 873
847 line->l = ncol; 874 line->l = ncol;
848 line->is_longer (1); 875 line->is_longer (1);
… …
850 row = screen.cur.row; 877 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 878 line = &ROW(row); /* _must_ refresh */
852 } 879 }
853 880
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 881 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 882 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 883 c = 0xfffd;
857 884
858 // rely on wcwidth to tell us the character width, do wcwidth before 885 // rely on wcwidth to tell us the character width, do wcwidth before
859 // further replacements, as wcwidth might return -1 for the line 886 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 887 // drawing characters below as they might be invalid in the current
861 // locale. 888 // locale.
862 int width = WCWIDTH (c); 889 int width = WCWIDTH (c);
863 890
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 891 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 892 {
866 // vt100 special graphics and line drawing 893 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 894 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 895 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 896 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 909 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 910 width = 1; // vt100 line drawing characters are always single-width
884 } 911 }
885 } 912 }
886 913
887 if (expect_false (screen.flags & Screen_Insert)) 914 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 915 scr_insdel_chars (width, INSERT);
889 916
890 if (width != 0) 917 if (width != 0)
891 { 918 {
892#if !UNICODE_3 919#if !UNICODE_3
… …
897# else 924# else
898 c = 0xfffd; 925 c = 0xfffd;
899# endif 926# endif
900#endif 927#endif
901 928
929 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
930
931 // if the character doesn't fit into the remaining columns...
932 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
933 {
934 if (screen.flags & Screen_Autowrap)
935 {
936 // ... artificially enlargen the previous one
937 c = NOCHAR;
938 // and try the same character next loop iteration
939 --str;
940 }
941 else
942 screen.cur.col = ncol - width;
943 }
944
902 // nuke the character at this position, if required 945 // nuke the character at this position, if required
903 if (expect_false ( 946 // due to wonderful coincidences everywhere else in this loop
947 // we never have to check for overwriting a wide char itself,
948 // only its tail.
904 line->t[screen.cur.col] == NOCHAR 949 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); 950 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 951
921 line->touch (); 952 line->touch ();
922 953
923 do 954 do
924 { 955 {
925 line->t[screen.cur.col] = c; 956 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 957 line->r[screen.cur.col] = rend;
927 958
928 if (expect_true (screen.cur.col < ncol - 1)) 959 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 960 screen.cur.col++;
930 else 961 else
931 { 962 {
932 line->l = ncol; 963 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 964 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 965 screen.flags |= Screen_WrapNext;
935 break; 966
967 goto end_of_line;
936 } 968 }
937 969
938 c = NOCHAR; 970 c = NOCHAR;
939 } 971 }
940 while (expect_false (--width > 0)); 972 while (ecb_unlikely (--width > 0));
941 973
942 // pad with spaces when overwriting wide character with smaller one 974 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 975 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 976 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 977 line->t[c] = ' ';
950 line->r[c] = rend; 978 line->r[c] = rend;
951 }
952 } 979 }
980
981end_of_line:
982 ;
953 } 983 }
954#if ENABLE_COMBINING 984#if ENABLE_COMBINING
955 else // width == 0 985 else // width == 0
956 { 986 {
957 if (c != 0xfeff) // ignore BOM 987 if (c != 0xfeff) // ignore BOM
… …
1020 1050
1021 want_refresh = 1; 1051 want_refresh = 1;
1022#endif 1052#endif
1023 } 1053 }
1024 } 1054 }
1055 else if (screen.flags & Screen_WrapNext)
1056 screen.flags &= ~Screen_WrapNext;
1025 else 1057 else
1026 scr_gotorc (0, -1, RELATIVE); 1058 scr_gotorc (0, -1, RELATIVE);
1027} 1059}
1028 1060
1029/* ------------------------------------------------------------------------- */ 1061/* ------------------------------------------------------------------------- */
… …
1285 scr_blank_line (line, col, num, rstyle); 1317 scr_blank_line (line, col, num, rstyle);
1286} 1318}
1287 1319
1288/* ------------------------------------------------------------------------- */ 1320/* ------------------------------------------------------------------------- */
1289/* 1321/*
1290 * Erase part of whole of the screen 1322 * Erase part or whole of the screen
1291 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1323 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1292 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1324 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1293 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1325 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1294 */ 1326 */
1295void 1327void
… …
1304 ZERO_SCROLLBACK (); 1336 ZERO_SCROLLBACK ();
1305 1337
1306 switch (mode) 1338 switch (mode)
1307 { 1339 {
1308 case 0: /* erase to end of screen */ 1340 case 0: /* erase to end of screen */
1309 selection_check (1);
1310 scr_erase_line (0); 1341 scr_erase_line (0);
1311 row = screen.cur.row + 1; /* possible OOB */ 1342 row = screen.cur.row + 1; /* possible OOB */
1312 num = nrow - row; 1343 num = nrow - row;
1313 break; 1344 break;
1314 case 1: /* erase to beginning of screen */ 1345 case 1: /* erase to beginning of screen */
1315 selection_check (3);
1316 scr_erase_line (1); 1346 scr_erase_line (1);
1317 row = 0; 1347 row = 0;
1318 num = screen.cur.row; 1348 num = screen.cur.row;
1319 break; 1349 break;
1320 case 2: /* erase whole screen */ 1350 case 2: /* erase whole screen */
1321 selection_check (3);
1322 row = 0; 1351 row = 0;
1323 num = nrow; 1352 num = nrow;
1324 break; 1353 break;
1325 default: 1354 default:
1326 return; 1355 return;
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1364 if (row >= nrow) /* Out Of Bounds */
1336 return; 1365 return;
1337 1366
1338 min_it (num, nrow - row); 1367 min_it (num, nrow - row);
1339 1368
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)) 1369 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1370 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1371 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1372 {
1347 ren = DEFAULT_RSTYLE; 1373 ren = DEFAULT_RSTYLE;
1348 1374
1349 if (mapped && !view_start) 1375 if (mapped)
1350 XClearArea (dpy, vt, 0, 1376 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1377 Row2Pixel (row - view_start), (unsigned int)vt_width,
1352 (unsigned int)Height2Pixel (num), False); 1378 (unsigned int)Height2Pixel (num), False);
1353 } 1379 }
1354 else 1380 else
1355 { 1381 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1382 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1383
1358 if (mapped && !view_start) 1384 if (mapped)
1359 { 1385 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1386 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1387 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1388 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1389 0, Row2Pixel (row - view_start),
1364 (unsigned int)width, 1390 (unsigned int)vt_width,
1365 (unsigned int)Height2Pixel (num)); 1391 (unsigned int)Height2Pixel (num));
1366 gcvalue.foreground = pix_colors[Color_fg]; 1392 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1393 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 } 1394 }
1369 } 1395 }
1370 1396
1371 for (; num--; row++) 1397 for (; num--; row++)
1372 { 1398 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1399 scr_blank_screen_mem (ROW(row), rstyle);
1374 1400
1375 if (!view_start) 1401 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1402 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1403 }
1378} 1404}
1379 1405
1380#if !ENABLE_MINIMAL 1406#if !ENABLE_MINIMAL
1381void 1407void
… …
1400 1426
1401 want_refresh = 1; 1427 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1428 ZERO_SCROLLBACK ();
1403 1429
1404 num_scr_allow = 0; 1430 num_scr_allow = 0;
1405 selection_check (3); 1431
1432 row_col_t pos;
1433 pos.row = pos.col = 0;
1434 if (ROWCOL_IS_AFTER (selection.end, pos))
1435 CLEAR_SELECTION ();
1406 1436
1407 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1437 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1408 for (int row = nrow; row--; ) 1438 for (int row = nrow; row--; )
1409 { 1439 {
1410 line_t &line = ROW(row); 1440 line_t &line = ROW(row);
… …
1680 { 1710 {
1681 rvideo_state = on; 1711 rvideo_state = on;
1682 1712
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1713 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1714#ifdef HAVE_BG_PIXMAP
1685 if (bgPixmap.pixmap == None) 1715 if (bg_pixmap == None)
1686#endif 1716#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1717 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1718
1689 XGCValues gcvalue; 1719 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1720 gcvalue.foreground = pix_colors[Color_fg];
… …
1851 * Refresh the entire screen 1881 * Refresh the entire screen
1852 */ 1882 */
1853void 1883void
1854rxvt_term::scr_touch (bool refresh) NOTHROW 1884rxvt_term::scr_touch (bool refresh) NOTHROW
1855{ 1885{
1856 scr_expose (0, 0, width, height, refresh); 1886 scr_expose (0, 0, vt_width, vt_height, refresh);
1857} 1887}
1858 1888
1859/* ------------------------------------------------------------------------- */ 1889/* ------------------------------------------------------------------------- */
1860/* 1890/*
1861 * Move the display so that the line represented by scrollbar value Y is at 1891 * Move the display so that the line represented by scrollbar value Y is at
… …
1917 1947
1918# ifndef NO_MAPALERT 1948# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1949# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1950 if (option (Opt_mapAlert))
1921# endif 1951# endif
1922 XMapWindow (dpy, parent[0]); 1952 XMapWindow (dpy, parent);
1923# endif 1953# endif
1924 1954
1925# if ENABLE_FRILLS 1955# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1956 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1957 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1970 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1971#endif
1942} 1972}
1943 1973
1944/* ------------------------------------------------------------------------- */ 1974/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */
1946void 1975void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1976rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1977{
1949#ifdef PRINTPIPE 1978#ifdef PRINTPIPE
1950 int nrows, row_start; 1979 int nrows, row_start;
… …
2024 * A: set up vars 2053 * A: set up vars
2025 */ 2054 */
2026 refresh_count = 0; 2055 refresh_count = 0;
2027 2056
2028 unsigned int old_screen_flags = screen.flags; 2057 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2058 bool have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2059#ifdef HAVE_BG_PIXMAP
2031 have_bg = bgPixmap.pixmap != None; 2060 have_bg = bg_pixmap != None;
2032#endif 2061#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2062 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2063
2035 /* 2064 /*
2036 * B: reverse any characters which are selected 2065 * B: reverse any characters which are selected
… …
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2069 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY 2070#if ENABLE_OVERLAY
2042 scr_swap_overlay (); 2071 scr_swap_overlay ();
2043#endif 2072#endif
2044 2073
2045 char showcursor = screen.flags & Screen_VisibleCursor; 2074 bool showcursor = screen.flags & Screen_VisibleCursor;
2046 2075
2047 /* 2076 /*
2048 * C: set the cursor character (s) 2077 * C: set the cursor character (s)
2049 */ 2078 */
2050 { 2079 {
2051 unsigned char setoldcursor; 2080 bool setoldcursor;
2052 2081
2053#ifdef CURSOR_BLINK 2082#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2083 if (hidden_cursor)
2055 showcursor = 0; 2084 showcursor = 0;
2056#endif 2085#endif
… …
2143 { 2172 {
2144 int16_t nits; 2173 int16_t nits;
2145 int i = num_scr; 2174 int i = num_scr;
2146 int j; 2175 int j;
2147 int len, wlen; 2176 int len, wlen;
2148 dLocal (int, num_scr);
2149 2177
2150 j = nrow; 2178 j = nrow;
2151 wlen = len = -1; 2179 wlen = len = -1;
2152 row = i > 0 ? 0 : j - 1; 2180 row = i > 0 ? 0 : j - 1;
2153 2181
… …
2228 continue; 2256 continue;
2229 2257
2230 // redraw one or more characters 2258 // redraw one or more characters
2231 2259
2232 // seek to the beginning of wide characters 2260 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2261 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2262 --col;
2235 2263
2236 rend_t rend = srp[col]; /* screen rendition (target rendition) */ 2264 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2265 text_t *text = stp + col;
2238 int count = 1; 2266 int count = 1;
… …
2276 2304
2277 col--; /* went one too far. move back */ 2305 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2306 count -= i; /* dump any matching trailing chars */
2279 2307
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2308 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2309 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2310 count++, i--;
2283 2311
2284 /* 2312 /*
2285 * Determine the attributes for the string 2313 * Determine the attributes for the string
2286 */ 2314 */
2287 int fore = fgcolor_of (rend); // desired foreground 2315 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2316 int back = bgcolor_of (rend); // desired background
2289 2317
2290 // only do special processing if any attributes are set, which is unlikely 2318 // only do special processing if any attributes are set, which is unlikely
2291 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) 2319 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2320 {
2293 bool invert = rend & RS_RVid; 2321 bool invert = rend & RS_RVid;
2294 2322
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2323#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2324 if (rend & RS_Bold && fore == Color_fg)
… …
2328 if (ISSET_PIXCOLOR (Color_HTC)) 2356 if (ISSET_PIXCOLOR (Color_HTC))
2329 fore = Color_HTC; 2357 fore = Color_HTC;
2330 // if invert is 0 reverse video is set so we use bg color as fg color 2358 // if invert is 0 reverse video is set so we use bg color as fg color
2331 else if (!invert) 2359 else if (!invert)
2332 fore = back; 2360 fore = back;
2361
2333 back = Color_HC; 2362 back = Color_HC;
2334 invert = 0; 2363 invert = 0;
2335 } 2364 }
2336 } 2365 }
2337#endif 2366#endif
… …
2384 /* 2413 /*
2385 * Actually do the drawing of the string here 2414 * Actually do the drawing of the string here
2386 */ 2415 */
2387 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2416 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2388 2417
2389 if (expect_true (have_bg && back == Color_bg)) 2418 if (ecb_likely (have_bg && back == Color_bg))
2390 { 2419 {
2391 // this is very ugly, maybe push it into ->draw? 2420 // this is very ugly, maybe push it into ->draw?
2392 2421
2393 for (i = 0; i < count; i++) /* don't draw empty strings */ 2422 for (i = 0; i < count; i++) /* don't draw empty strings */
2394 if (text[i] != ' ') 2423 if (text[i] != ' ')
… …
2401 did_clear: ; 2430 did_clear: ;
2402 } 2431 }
2403 else 2432 else
2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2433 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2405 2434
2406 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2435 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2407 { 2436 {
2408#if ENABLE_FRILLS 2437#if ENABLE_FRILLS
2409 if (ISSET_PIXCOLOR (Color_underline)) 2438 if (ISSET_PIXCOLOR (Color_underline))
2410 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2439 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2411 else 2440 else
… …
2457 2486
2458 XDrawRectangle (dpy, vt, gc, 2487 XDrawRectangle (dpy, vt, gc,
2459 Col2Pixel (col), 2488 Col2Pixel (col),
2460 Row2Pixel (oldcursor.row), 2489 Row2Pixel (oldcursor.row),
2461 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2490 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2462 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2491 (unsigned int) (Height2Pixel (1) - 1));
2463 } 2492 }
2464 } 2493 }
2465 2494
2466 /* 2495 /*
2467 * H: cleanup selection 2496 * H: cleanup selection
… …
2479} 2508}
2480 2509
2481void 2510void
2482rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2511rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2483{ 2512{
2484 if (!l.t) 2513 if (!l.valid ())
2485 return; 2514 return;
2486 2515
2487 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2516 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2488 2517
2489 for (int i = ncol; i--; ) 2518 for (int i = ncol; i--; )
… …
2502 scr_remap_chars (swap_buf [i]); 2531 scr_remap_chars (swap_buf [i]);
2503 } 2532 }
2504} 2533}
2505 2534
2506void 2535void
2507rxvt_term::scr_recolour () NOTHROW 2536rxvt_term::scr_recolour (bool refresh) NOTHROW
2508{ 2537{
2538 bool transparent = false;
2539
2509#ifdef HAVE_BG_PIXMAP 2540#ifdef HAVE_BG_PIXMAP
2510 bgPixmap.apply (); 2541 if (bg_pixmap != None)
2511#else 2542 {
2543# ifdef ENABLE_TRANSPARENCY
2544 if (bg_flags & BG_IS_TRANSPARENT)
2545 {
2546 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2547 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2512 2548
2549 transparent = true;
2550 }
2551 else
2552# endif
2553 {
2554 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2555 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2556 }
2557 }
2558 else
2559#endif
2560 {
2513 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2561 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2514 XClearWindow (dpy, parent[0]);
2515 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2562 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2563 }
2564
2565 XClearWindow (dpy, parent);
2516 2566
2517 if (scrollBar.win) 2567 if (scrollBar.win)
2518 { 2568 {
2569 if (transparent)
2570 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2571 else
2519 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2572 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2520 scrollBar.state = STATE_IDLE; 2573 scrollBar.state = SB_STATE_IDLE;
2521 scrollBar.show (0); 2574 scrollBar.show (0);
2522 } 2575 }
2523 2576
2524#endif 2577 if (refresh)
2525 2578 {
2526 /* bgPixmap.apply () does not do the following : */
2527 scr_clear (); 2579 scr_clear ();
2528 scr_touch (true); 2580 scr_touch (true);
2581 }
2529 want_refresh = 1; 2582 want_refresh = 1;
2530} 2583}
2531 2584
2532/* ------------------------------------------------------------------------- */ 2585/* ------------------------------------------------------------------------- */
2533void 2586void
… …
2619 */ 2672 */
2620#if 0 2673#if 0
2621void 2674void
2622rxvt_term::scr_dump (int fd) NOTHROW 2675rxvt_term::scr_dump (int fd) NOTHROW
2623{ 2676{
2624 int row, wrote; 2677 // if this method is needed, it can be implemented by factoring the
2625 unsigned int width, towrite; 2678 // relevant code in scr_printscreen
2626 char r1[] = "\n";
2627
2628 for (row = saveLines + top_row;
2629 row < saveLines + nrow - 1; row++)
2630 {
2631 width = row_buf[row].l >= 0 ? row_buf[row].l
2632 : ncol;
2633 for (towrite = width; towrite; towrite -= wrote)
2634 {
2635 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2636 towrite);
2637 if (wrote < 0)
2638 return; /* XXX: death, no report */
2639 }
2640 if (row_buf[row].l >= 0)
2641 if (write (fd, r1, 1) <= 0)
2642 return; /* XXX: death, no report */
2643 }
2644} 2679}
2645#endif 2680#endif
2646 2681
2647/* ------------------------------------------------------------------------- * 2682/* ------------------------------------------------------------------------- *
2648 * CHARACTER SELECTION * 2683 * CHARACTER SELECTION *
2649 * ------------------------------------------------------------------------- */ 2684 * ------------------------------------------------------------------------- */
2650void 2685void
2651rxvt_term::selection_check (int check_more) NOTHROW 2686rxvt_term::selection_check (int check_more) NOTHROW
2652{ 2687{
2653 row_col_t pos;
2654
2655 if (!selection.op) 2688 if (!selection.op)
2656 return; 2689 return;
2657 2690
2658 pos.row = pos.col = 0;
2659 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2691 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2660 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2661 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2693 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2662 || (check_more == 1 2694 || (check_more == 1
2663 && current_screen == selection.screen 2695 && current_screen == selection.screen
2664 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2696 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2665 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2697 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2666 || (check_more == 2
2667 && ROWCOL_IS_BEFORE (selection.beg, pos)
2668 && ROWCOL_IS_AFTER (selection.end, pos))
2669 || (check_more == 3
2670 && ROWCOL_IS_AFTER (selection.end, pos))
2671 || (check_more == 4 /* screen width change */
2672 && (selection.beg.row != selection.end.row
2673 || selection.end.col > ncol)))
2674 CLEAR_SELECTION (); 2698 CLEAR_ALL_SELECTION ();
2675} 2699}
2676 2700
2677/* ------------------------------------------------------------------------- */ 2701/* ------------------------------------------------------------------------- */
2678/* 2702/*
2679 * Paste a selection direct to the command fd 2703 * Paste a selection direct to the command fd
2680 */ 2704 */
2681void 2705void
2682rxvt_term::paste (char *data, unsigned int len) NOTHROW 2706rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2683{ 2707{
2684 /* convert normal newline chars into common keyboard Return key sequence */ 2708 /* convert normal newline chars into common keyboard Return key sequence */
2685 for (unsigned int i = 0; i < len; i++) 2709 for (unsigned int i = 0; i < len; i++)
2686 if (data[i] == C0_LF) 2710 if (data[i] == C0_LF)
2687 data[i] = C0_CR; 2711 data[i] = C0_CR;
2688 2712
2689 if (priv_modes & PrivMode_BracketPaste) 2713 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[200~"); 2714 tt_printf ("\x1b[200~");
2691 2715
2692 tt_write (data, len); 2716 tt_write (data, len);
2693 2717
2694 if (priv_modes & PrivMode_BracketPaste) 2718 if (priv_modes & PrivMode_BracketPaste)
2695 tt_printf ("\e[201~"); 2719 tt_printf ("\x1b[201~");
2696} 2720}
2697 2721
2698/* ------------------------------------------------------------------------- */
2699/*
2700 * Respond to a notification that a primary selection has been sent
2701 * EXT: SelectionNotify
2702 */
2703void 2722void
2704rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2723rxvt_term::paste (char *data, unsigned int len) NOTHROW
2705{ 2724{
2706 if (prop == None) /* check for failed XConvertSelection */ 2725 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2707 {
2708 if ((selection_type & Sel_CompoundText))
2709 {
2710 int selnum = selection_type & Sel_whereMask;
2711
2712 selection_type = 0;
2713 if (selnum != Sel_direct)
2714 selection_request_other (XA_STRING, selnum);
2715 }
2716
2717 if ((selection_type & Sel_UTF8String))
2718 {
2719 int selnum = selection_type & Sel_whereMask;
2720
2721 selection_type = Sel_CompoundText;
2722 if (selnum != Sel_direct)
2723 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2724 else
2725 selection_type = 0;
2726 }
2727
2728 return;
2729 }
2730
2731 unsigned long bytes_after;
2732 XTextProperty ct;
2733
2734 if (XGetWindowProperty (dpy, win, prop,
2735 0, PROP_SIZE / 4,
2736 delete_prop, AnyPropertyType,
2737 &ct.encoding, &ct.format,
2738 &ct.nitems, &bytes_after,
2739 &ct.value) != Success)
2740 {
2741 ct.value = 0;
2742 goto bailout;
2743 }
2744
2745 if (ct.encoding == None)
2746 goto bailout;
2747
2748 if (bytes_after)
2749 {
2750 // fetch and append remaining data
2751 XTextProperty ct2;
2752
2753 if (XGetWindowProperty (dpy, win, prop,
2754 ct.nitems / 4, (bytes_after + 3) / 4,
2755 delete_prop, AnyPropertyType,
2756 &ct2.encoding, &ct2.format,
2757 &ct2.nitems, &bytes_after,
2758 &ct2.value) != Success)
2759 goto bailout;
2760
2761 // realloc should be compatible to XFree, here, and elsewhere, too
2762 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2763 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2764 ct.nitems += ct2.nitems;
2765
2766 XFree (ct2.value);
2767 }
2768
2769 if (ct.value == 0)
2770 goto bailout;
2771
2772 if (ct.encoding == xa[XA_INCR])
2773 {
2774 // INCR selection, start handshake
2775 if (!delete_prop)
2776 XDeleteProperty (dpy, win, prop);
2777
2778 selection_wait = Sel_incr;
2779 incr_buf_fill = 0;
2780 incr_ev.start (10);
2781
2782 goto bailout;
2783 }
2784
2785 if (ct.nitems == 0)
2786 {
2787 if (selection_wait == Sel_incr)
2788 {
2789 XFree (ct.value);
2790
2791 // finally complete, now paste the whole thing
2792 selection_wait = Sel_normal;
2793 ct.value = (unsigned char *)incr_buf;
2794 ct.nitems = incr_buf_fill;
2795 incr_buf = 0;
2796 incr_buf_size = 0;
2797 incr_ev.stop ();
2798 }
2799 else
2800 {
2801 if (selection_wait == Sel_normal
2802 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2803 {
2804 /*
2805 * pass through again trying CUT_BUFFER0 if we've come from
2806 * XConvertSelection () but nothing was presented
2807 */
2808 selection_paste (display->root, XA_CUT_BUFFER0, False);
2809 }
2810
2811 goto bailout;
2812 }
2813 }
2814 else if (selection_wait == Sel_incr)
2815 {
2816 incr_ev.start (10);
2817
2818 while (incr_buf_fill + ct.nitems > incr_buf_size)
2819 {
2820 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2821 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2822 }
2823
2824 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2825 incr_buf_fill += ct.nitems;
2826
2827 goto bailout;
2828 }
2829
2830 char **cl;
2831 int cr;
2832
2833#if !ENABLE_MINIMAL
2834 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2835 // so recode it manually
2836 if (ct.encoding == xa[XA_UTF8_STRING])
2837 {
2838 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2839 char *s = rxvt_wcstombs (w);
2840 free (w);
2841 // TODO: strlen == only the first element will be converted. well...
2842 paste (s, strlen (s));
2843 free (s);
2844 }
2845 else
2846#endif
2847 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2848 && cl)
2849 {
2850 for (int i = 0; i < cr; i++)
2851 paste (cl[i], strlen (cl[i]));
2852
2853 XFreeStringList (cl);
2854 }
2855 else
2856 paste ((char *)ct.value, ct.nitems); // paste raw
2857
2858bailout:
2859 XFree (ct.value);
2860
2861 if (selection_wait == Sel_normal)
2862 selection_wait = Sel_none;
2863}
2864
2865void
2866rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2867{
2868 selection_wait = Sel_none;
2869
2870 incr_buf_size = 0;
2871 free (incr_buf);
2872
2873 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2874}
2875
2876void
2877rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2878{
2879 if (prop == None || selection_wait != Sel_incr)
2880 return; 2726 return;
2881 2727
2882 selection_paste (win, prop, true); 2728 tt_paste (data, len);
2883} 2729}
2884 2730
2885/* ------------------------------------------------------------------------- */ 2731/* ------------------------------------------------------------------------- */
2886/* 2732/*
2887 * Request the current selection: 2733 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2888 * Order: > internal selection if available 2734 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2889 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2735 * as fallback
2890 * > CUT_BUFFER0
2891 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2892 * will auto fallback to CUT_BUFFER0
2893 * EXT: button 2 release 2736 * EXT: button 2 release
2894 */ 2737 */
2895void 2738void
2896rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2739rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2897{ 2740{
2898 if (selection.text && selnum == Sel_Primary) 2741 if (!selection_req)
2899 {
2900 /* internal selection */
2901 char *str = rxvt_wcstombs (selection.text, selection.len);
2902 paste (str, strlen (str));
2903 free (str);
2904 return;
2905 } 2742 {
2906 else 2743 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2744 selection_req->run ();
2907 { 2745 }
2908 selection_request_time = tm;
2909 selection_wait = Sel_normal;
2910
2911#if X_HAVE_UTF8_STRING
2912 selection_type = Sel_UTF8String;
2913 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2914 return;
2915#else
2916 selection_type = Sel_CompoundText;
2917 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2918 return;
2919#endif
2920 }
2921
2922 selection_wait = Sel_none; /* don't loop in selection_paste () */
2923 selection_paste (display->root, XA_CUT_BUFFER0, false);
2924}
2925
2926int
2927rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2928{
2929 Atom sel;
2930
2931 selection_type |= selnum;
2932
2933 if (selnum == Sel_Primary)
2934 sel = XA_PRIMARY;
2935 else if (selnum == Sel_Secondary)
2936 sel = XA_SECONDARY;
2937 else
2938 sel = xa[XA_CLIPBOARD];
2939
2940 if (XGetSelectionOwner (dpy, sel) != None)
2941 {
2942 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2943 vt, selection_request_time);
2944 return 1;
2945 }
2946
2947 return 0;
2948} 2746}
2949 2747
2950/* ------------------------------------------------------------------------- */ 2748/* ------------------------------------------------------------------------- */
2951/* 2749/*
2952 * Clear all selected text 2750 * Clear all selected text
… …
2975 if (display->clipboard_owner == this) 2773 if (display->clipboard_owner == this)
2976 display->clipboard_owner = 0; 2774 display->clipboard_owner = 0;
2977 } 2775 }
2978} 2776}
2979 2777
2980void
2981rxvt_term::clipboard_copy (Time tm)
2982{
2983 if (selection.len > 0)
2984 {
2985 free (selection.clip_text);
2986 selection.clip_len = selection.len;
2987 selection.clip_text = (wchar_t *) malloc (sizeof (wchar_t) * selection.clip_len);
2988 memcpy (selection.clip_text, selection.text,
2989 sizeof (wchar_t) * selection.clip_len);
2990 selection_grab (tm, true);
2991 }
2992}
2993
2994/* ------------------------------------------------------------------------- */ 2778/* ------------------------------------------------------------------------- */
2995/* 2779/*
2996 * Copy a selection into the cut buffer 2780 * Copy a selection into the cut buffer
2997 * EXT: button 1 or 3 release 2781 * EXT: button 1 or 3 release
2998 */ 2782 */
2999void 2783void
3000rxvt_term::selection_make (Time tm) 2784rxvt_term::selection_make (Time tm)
3001{ 2785{
3002 int i; 2786 int size;
3003 wchar_t *new_selection_text; 2787 wchar_t *new_selection_text;
3004 text_t *t; 2788 text_t *t;
3005 2789
3006 switch (selection.op) 2790 switch (selection.op)
3007 { 2791 {
… …
3023 return; /* nothing selected, go away */ 2807 return; /* nothing selected, go away */
3024 2808
3025 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2809 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3026 return; 2810 return;
3027 2811
3028 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2812 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3029 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2813 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3030 2814
3031 int ofs = 0; 2815 int ofs = 0;
3032 int extra = 0; 2816 int extra = 0;
3033 2817
3034 int col = selection.beg.col; 2818 int col = selection.beg.col;
… …
3040 { 2824 {
3041#if !ENABLE_MINIMAL 2825#if !ENABLE_MINIMAL
3042 if (selection.rect) 2826 if (selection.rect)
3043 { 2827 {
3044 col = selection.beg.col; 2828 col = selection.beg.col;
3045 end_col = ncol + 1; 2829 end_col = selection.end.col;
3046 } 2830 }
3047 else 2831 else
3048#endif 2832#endif
3049 end_col = ROW(row).l; 2833 end_col = ROW(row).l;
3050 2834
3051 col = max (col, 0); 2835 col = max (col, 0);
3052 2836
3053 if (row == selection.end.row 2837 if (row == selection.end.row)
3054#if !ENABLE_MINIMAL
3055 || selection.rect
3056#endif
3057 )
3058 min_it (end_col, selection.end.col); 2838 min_it (end_col, selection.end.col);
3059 2839
3060 t = ROW(row).t + col; 2840 t = ROW(row).t + col;
3061 2841
3062 for (; col < end_col; col++) 2842 for (; col < end_col; col++)
… …
3070 2850
3071 extra -= (len - 1); 2851 extra -= (len - 1);
3072 2852
3073 if (extra < 0) 2853 if (extra < 0)
3074 { 2854 {
3075 extra += i; 2855 extra += size;
3076 i += i; 2856 size += size;
3077 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2857 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3078 } 2858 }
3079 2859
3080 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2860 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3081 } 2861 }
3082#endif 2862#endif
… …
3094 2874
3095 new_selection_text[ofs++] = C0_LF; 2875 new_selection_text[ofs++] = C0_LF;
3096 } 2876 }
3097 else 2877 else
3098#endif 2878#endif
3099 if (!ROW(row).is_longer () && row != selection.end.row) 2879 if (!ROW(row).is_longer ()
2880 && (row != selection.end.row || end_col != selection.end.col)
2881 && (row != selection.beg.row || selection.beg.col < ncol))
3100 new_selection_text[ofs++] = C0_LF; 2882 new_selection_text[ofs++] = C0_LF;
3101 } 2883 }
3102
3103 if (end_col != selection.end.col)
3104 new_selection_text[ofs++] = C0_LF;
3105 2884
3106 new_selection_text[ofs] = 0; 2885 new_selection_text[ofs] = 0;
3107 2886
3108 if (ofs == 0) 2887 if (ofs == 0)
3109 { 2888 {
… …
3615 * EXT: SelectionRequest 3394 * EXT: SelectionRequest
3616 */ 3395 */
3617void 3396void
3618rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3397rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3619{ 3398{
3399 Atom property = rq.property == None ? rq.target : rq.property;
3620 XSelectionEvent ev; 3400 XSelectionEvent ev;
3621 3401
3622 ev.type = SelectionNotify; 3402 ev.type = SelectionNotify;
3623 ev.property = None; 3403 ev.property = None;
3624 ev.display = rq.display; 3404 ev.display = rq.display;
… …
3639 *target++ = xa[XA_COMPOUND_TEXT]; 3419 *target++ = xa[XA_COMPOUND_TEXT];
3640#if X_HAVE_UTF8_STRING 3420#if X_HAVE_UTF8_STRING
3641 *target++ = xa[XA_UTF8_STRING]; 3421 *target++ = xa[XA_UTF8_STRING];
3642#endif 3422#endif
3643 3423
3644 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3424 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3645 32, PropModeReplace, 3425 32, PropModeReplace,
3646 (unsigned char *)target_list, target - target_list); 3426 (unsigned char *)target_list, target - target_list);
3647 ev.property = rq.property; 3427 ev.property = property;
3648 } 3428 }
3649#if TODO // TODO 3429#if TODO // TODO
3650 else if (rq.target == xa[XA_MULTIPLE]) 3430 else if (rq.target == xa[XA_MULTIPLE])
3651 { 3431 {
3652 /* TODO: Handle MULTIPLE */ 3432 /* TODO: Handle MULTIPLE */
3653 } 3433 }
3654#endif 3434#endif
3655 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3435 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3656 { 3436 {
3657 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3437 XChangeProperty (dpy, rq.requestor, property, rq.target,
3658 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3438 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3659 ev.property = rq.property; 3439 ev.property = property;
3660 } 3440 }
3661 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3441 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3662 { 3442 {
3663 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3443 XChangeProperty (dpy, rq.requestor, property, rq.target,
3664 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3444 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3665 ev.property = rq.property; 3445 ev.property = property;
3666 } 3446 }
3667 else if (rq.target == XA_STRING 3447 else if (rq.target == XA_STRING
3668 || rq.target == xa[XA_TEXT] 3448 || rq.target == xa[XA_TEXT]
3669 || rq.target == xa[XA_COMPOUND_TEXT] 3449 || rq.target == xa[XA_COMPOUND_TEXT]
3670 || rq.target == xa[XA_UTF8_STRING] 3450 || rq.target == xa[XA_UTF8_STRING]
… …
3741 ct.value = (unsigned char *)cl; 3521 ct.value = (unsigned char *)cl;
3742 ct.nitems = selectlen; 3522 ct.nitems = selectlen;
3743 ct.encoding = target; 3523 ct.encoding = target;
3744 } 3524 }
3745 3525
3746 XChangeProperty (dpy, rq.requestor, rq.property, 3526 XChangeProperty (dpy, rq.requestor, property,
3747 ct.encoding, 8, PropModeReplace, 3527 ct.encoding, 8, PropModeReplace,
3748 ct.value, (int)ct.nitems); 3528 ct.value, (int)ct.nitems);
3749 ev.property = rq.property; 3529 ev.property = property;
3750 3530
3751 if (freect) 3531 if (freect)
3752 XFree (ct.value); 3532 XFree (ct.value);
3753 } 3533 }
3754 3534

Diff Legend

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