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.334 by sf-exg, Sun Feb 14 11:04:11 2010 UTC vs.
Revision 1.434 by root, Sat Feb 16 17:26:53 2013 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
152 col++; 151 col++;
153 } while (col < ncol && l.t[col] == NOCHAR); 152 } while (col < ncol && l.t[col] == NOCHAR);
154} 153}
155 154
155// set the rendition of a single wide character beginning at the given column
156void
157rxvt_term::scr_set_char_rend (line_t &l, int col, rend_t rend)
158{
159 do {
160 l.r[col] = rend;
161 col++;
162 } while (col < ncol && l.t[col] == NOCHAR);
163}
164
156/* ------------------------------------------------------------------------- * 165/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 166 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 167 * ------------------------------------------------------------------------- */
159 168
160void 169void
170rxvt_term::scr_alloc () NOTHROW
171{
172 int tsize = sizeof (text_t) * ncol;
173 int rsize = sizeof (rend_t) * ncol;
174
175 // we assume that rend_t size is a sufficient alignment
176 // factor for text_t and line_t values, and we only
177 // need to adjust tsize.
178 tsize = (tsize + sizeof (rend_t) - 1);
179 tsize -= tsize % sizeof (rend_t);
180
181 int all_rows = total_rows + nrow + nrow;
182
183 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
184 chunk = chunk_alloc (chunk_size, 0);
185
186 char *base = (char *)chunk + sizeof (line_t) * all_rows;
187
188 for (int row = 0; row < all_rows; ++row)
189 {
190 line_t &l = ((line_t *)chunk) [row];
191
192 l.t = (text_t *)base; base += tsize;
193 l.r = (rend_t *)base; base += rsize;
194 l.l = -1;
195 l.f = 0;
196 }
197
198 drawn_buf = (line_t *)chunk;
199 swap_buf = drawn_buf + nrow;
200 row_buf = swap_buf + nrow;
201}
202
203void
204rxvt_term::copy_line (line_t &dst, line_t &src)
205{
206 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
207 dst.l = min (src.l, ncol);
208 memcpy (dst.t, src.t, sizeof (text_t) * dst.l);
209 memcpy (dst.r, src.r, sizeof (rend_t) * dst.l);
210 dst.f = src.f;
211}
212
213void ecb_cold
161rxvt_term::scr_reset () 214rxvt_term::scr_reset ()
162{ 215{
216#if ENABLE_OVERLAY
217 scr_overlay_off ();
218#endif
219
163 view_start = 0; 220 view_start = 0;
164 num_scr = 0; 221 num_scr = 0;
165 222
166 if (ncol == 0) 223 if (ncol == 0)
167 ncol = 80; 224 ncol = 80;
… …
187 total_rows = nrow + saveLines; 244 total_rows = nrow + saveLines;
188 245
189 screen.tscroll = 0; 246 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 247 screen.bscroll = nrow - 1;
191 248
249 void *prev_chunk = chunk;
250 size_t prev_chunk_size = chunk_size;
251 line_t *prev_drawn_buf = drawn_buf;
252 line_t *prev_swap_buf = swap_buf;
253 line_t *prev_row_buf = row_buf;
254
255 scr_alloc ();
256
192 if (!row_buf) 257 if (!prev_row_buf)
193 { 258 {
194 /* 259 /*
195 * first time called so just malloc everything: don't rely on realloc 260 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
196 */ 261 */
197 top_row = 0; 262 top_row = 0;
198 term_start = 0; 263 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 264
214 memset (charsets, 'B', sizeof (charsets)); 265 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 266 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 267 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 268 screen.cur.row = screen.cur.col = 0;
… …
240 { 291 {
241 /* 292 /*
242 * add or delete rows as appropriate 293 * add or delete rows as appropriate
243 */ 294 */
244 295
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--; ) 296 for (int row = min (nrow, prev_nrow); row--; )
263 { 297 {
264 lresize (drawn_buf[row]); 298 copy_line (drawn_buf [row], prev_drawn_buf [row]);
265 lresize (swap_buf [row]); 299 copy_line (swap_buf [row], prev_swap_buf [row]);
266 }
267
268 for (int row = prev_nrow; row < nrow; row++)
269 { 300 }
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 301
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 302 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start + top_row , prev_total_rows); 303 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 304 int q = total_rows; // rewrapped row
280 305
… …
288 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 313 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
289 314
290 do 315 do
291 { 316 {
292 p = MOD (p - 1, prev_total_rows); 317 p = MOD (p - 1, prev_total_rows);
293 assert (old_buf [MOD (p, prev_total_rows)].t); 318 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
294 int plines = 1; 319 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 320 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 321
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 322 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 323 {
299 p = MOD (p - 1, prev_total_rows); 324 p = MOD (p - 1, prev_total_rows);
300 325
301 plines++; 326 plines++;
302 llen += prev_ncol; 327 llen += prev_ncol;
… …
315 340
316 // re-assemble the full line by destination lines 341 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 342 for (int qrow = q; qlines--; qrow++)
318 { 343 {
319 qline = row_buf + qrow; 344 qline = row_buf + qrow;
320 lalloc (*qline); 345 qline->alloc (); // redundant with next line
321 qline->l = ncol; 346 qline->l = ncol;
322 qline->is_longer (1); 347 qline->is_longer (1);
323 348
324 int qcol = 0; 349 int qcol = 0;
325 350
… …
340 // this seems to upset applications/shells/readline 365 // this seems to upset applications/shells/readline
341 // least. 366 // least.
342 if (prow == ocur.row) 367 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 368 screen.cur.row = q - (total_rows - nrow);
344 369
345 line_t &pline = old_buf [prow]; 370 line_t &pline = prev_row_buf [prow];
346 371
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 372 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 373
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 374 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 375 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 396 {
372 // if no scrollback exists (yet), wing, instead of wrap 397 // if no scrollback exists (yet), wing, instead of wrap
373 398
374 for (int row = min (nrow, prev_nrow); row--; ) 399 for (int row = min (nrow, prev_nrow); row--; )
375 { 400 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 401 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 402 line_t &dst = row_buf [row];
378 403
379 qline = pline; 404 copy_line (dst, src);
380 lresize (qline);
381 } 405 }
382 406
383 for (int row = prev_nrow; row < nrow; row++) 407 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 408 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 409
388 term_start = 0; 410 term_start = 0;
389 } 411 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 412
395 clamp_it (screen.cur.row, 0, nrow - 1); 413 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 414 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 415 }
398 416
417 for (int row = nrow; row--; )
418 {
419 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
420 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
421 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
422 }
423
424 chunk_free (prev_chunk, prev_chunk_size);
425
399 free (tabs); 426 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 427 tabs = (char *)rxvt_malloc (ncol);
401 428
402 for (int col = ncol; --col; ) 429 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 430 tabs [col] = col % TABSIZE == 0;
404 431
405 CLEAR_ALL_SELECTION (); 432 CLEAR_ALL_SELECTION ();
406 433
407 prev_nrow = nrow; 434 prev_nrow = nrow;
… …
410 tt_winch (); 437 tt_winch ();
411 438
412 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 439 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413} 440}
414 441
415/* ------------------------------------------------------------------------- */ 442void ecb_cold
416/*
417 * Free everything. That way malloc debugging can find leakage.
418 */
419void
420rxvt_term::scr_release () NOTHROW 443rxvt_term::scr_release () NOTHROW
421{ 444{
422 if (row_buf) 445 chunk_free (chunk, chunk_size);
423 { 446 chunk = 0;
424 delete talloc; talloc = 0; 447 row_buf = 0;
425 delete ralloc; ralloc = 0;
426 448
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); 449 free (tabs);
433 tabs = 0; 450 tabs = 0;
434 }
435} 451}
436 452
437/* ------------------------------------------------------------------------- */ 453/* ------------------------------------------------------------------------- */
438/* 454/*
439 * Hard/Soft reset 455 * Hard/Soft reset
440 */ 456 */
441void 457void ecb_cold
442rxvt_term::scr_poweron () 458rxvt_term::scr_poweron ()
443{ 459{
444 scr_release (); 460 scr_release ();
461
445 prev_nrow = prev_ncol = 0; 462 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 463 rvideo_mode = false;
447 scr_soft_reset (); 464 scr_soft_reset ();
448 scr_reset (); 465 scr_reset ();
449 466
450 scr_clear (true); 467 scr_clear (true);
451 scr_refresh (); 468 scr_refresh ();
452} 469}
453 470
454void 471void ecb_cold
455rxvt_term::scr_soft_reset () 472rxvt_term::scr_soft_reset () NOTHROW
456{ 473{
457 /* only affects modes, nothing drastic such as clearing the screen */ 474 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 475#if ENABLE_OVERLAY
459 scr_overlay_off (); 476 scr_overlay_off ();
460#endif 477#endif
… …
515 assert (s->cur.row >= 0); 532 assert (s->cur.row >= 0);
516 assert (s->cur.col >= 0); 533 assert (s->cur.col >= 0);
517} 534}
518 535
519void 536void
520rxvt_term::scr_swap_screen () 537rxvt_term::scr_swap_screen () NOTHROW
521{ 538{
522 if (!option (Opt_secondaryScreen)) 539 if (!option (Opt_secondaryScreen))
523 return; 540 return;
524 541
525 for (int i = prev_nrow; i--; ) 542 for (int i = prev_nrow; i--; )
… …
544 return; 561 return;
545 562
546 want_refresh = 1; 563 want_refresh = 1;
547 view_start = 0; 564 view_start = 0;
548 565
549 selection_check (2); /* check for boundary cross */ 566 /* check for boundary cross */
567 row_col_t pos;
568 pos.row = pos.col = 0;
569 if (ROWCOL_IS_BEFORE (selection.beg, pos)
570 && ROWCOL_IS_AFTER (selection.end, pos))
571 CLEAR_SELECTION ();
550 572
551 current_screen = scrn; 573 current_screen = scrn;
552 574
553#if NSCREENS 575#if NSCREENS
554 if (option (Opt_secondaryScreen)) 576 if (option (Opt_secondaryScreen))
… …
620/* 642/*
621 * Scroll text between <row1> and <row2> inclusive, by <count> lines 643 * Scroll text between <row1> and <row2> inclusive, by <count> lines
622 * count positive ==> scroll up 644 * count positive ==> scroll up
623 * count negative ==> scroll down 645 * count negative ==> scroll down
624 */ 646 */
625int 647int ecb_hot
626rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 648rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
627{ 649{
628 if (count == 0 || (row1 > row2)) 650 if (count == 0 || (row1 > row2))
629 return 0; 651 return 0;
630 652
… …
633 655
634 if (count > 0 656 if (count > 0
635 && row1 == 0 657 && row1 == 0
636 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 658 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
637 { 659 {
660 min_it (count, total_rows - (nrow - (row2 + 1)));
661
638 top_row = max (top_row - count, -saveLines); 662 top_row = max (top_row - count, -saveLines);
639
640 // scroll everything up 'count' lines
641 term_start = (term_start + count) % total_rows;
642 663
643 // sever bottommost line 664 // sever bottommost line
644 { 665 {
645 line_t &l = ROW(row2 - count); 666 line_t &l = ROW(row2);
646 l.is_longer (0); 667 l.is_longer (0);
647 l.touch (); 668 l.touch ();
648 } 669 }
649 670
671 // scroll everything up 'count' lines
672 term_start = (term_start + count) % total_rows;
673
674 // now copy lines below the scroll region bottom to the
675 // bottom of the screen again, so they look as if they
676 // hadn't moved.
677 for (int i = nrow; --i > row2; )
678 {
679 line_t &l1 = ROW(i - count);
680 line_t &l2 = ROW(i);
681
682 ::swap (l1, l2);
683 l2.touch ();
684 }
685
650 // erase newly scrolled-in lines 686 // erase newly scrolled-in lines
651 for (int i = count; i--; ) 687 for (int i = count; i--; )
652 { 688 {
653 line_t &l = ROW(nrow - 1 - i); 689 line_t &l = ROW(row2 - i);
654 690
655 // optimize if already cleared, can be significant on slow machines 691 // optimise if already cleared, can be significant on slow machines
656 // could be rolled into scr_blank_screen_mem 692 // 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))) 693 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
658 { 694 {
659 scr_blank_line (l, 0, l.l, rstyle); 695 scr_blank_line (l, 0, l.l, rstyle);
660 l.l = 0; 696 l.l = 0;
… …
662 } 698 }
663 else 699 else
664 scr_blank_screen_mem (l, rstyle); 700 scr_blank_screen_mem (l, rstyle);
665 } 701 }
666 702
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 703 // move and/or clear selection, if any
680 if (selection.op && current_screen == selection.screen) 704 if (selection.op && current_screen == selection.screen
705 && selection.beg.row <= row2)
681 { 706 {
682 selection.beg.row -= count; 707 selection.beg.row -= count;
683 selection.end.row -= count; 708 selection.end.row -= count;
684 selection.mark.row -= count; 709 selection.mark.row -= count;
685 710
686 if (selection.beg.row < top_row 711 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 } 712 }
694 713
695 // finally move the view window, if desired 714 // finally move the view window, if desired
696 if (option (Opt_scrollWithBuffer) 715 if (option (Opt_scrollWithBuffer)
697 && view_start != 0 716 && view_start != 0
… …
727 } 746 }
728 747
729 // use a simple and robust scrolling algorithm, this 748 // use a simple and robust scrolling algorithm, this
730 // part of scr_scroll_text is not time-critical. 749 // part of scr_scroll_text is not time-critical.
731 750
751 // sever line above scroll region
752 if (row1)
753 {
754 line_t &l = ROW(row1 - 1);
755 l.is_longer (0);
756 l.touch ();
757 }
758
732 int rows = row2 - row1 + 1; 759 int rows = row2 - row1 + 1;
733 760
734 min_it (count, rows); 761 min_it (count, rows);
735 762
736 line_t *temp_buf = row_buf + total_rows; 763 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
737 764
738 for (int row = 0; row < rows; row++) 765 for (int row = 0; row < rows; row++)
739 { 766 {
740 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 767 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
741 768
… …
743 scr_blank_screen_mem (temp_buf [row], rstyle); 770 scr_blank_screen_mem (temp_buf [row], rstyle);
744 } 771 }
745 772
746 for (int row = 0; row < rows; row++) 773 for (int row = 0; row < rows; row++)
747 ROW(row1 + row) = temp_buf [row]; 774 ROW(row1 + row) = temp_buf [row];
775
776 // sever bottommost line
777 {
778 line_t &l = ROW(row2);
779 l.is_longer (0);
780 l.touch ();
781 }
748 } 782 }
749 783
750 return count; 784 return count;
751} 785}
752 786
753/* ------------------------------------------------------------------------- */ 787/* ------------------------------------------------------------------------- */
754/* 788/*
755 * Add text given in <str> of length <len> to screen struct 789 * Add text given in <str> of length <len> to screen struct
756 */ 790 */
757void 791void ecb_hot
758rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 792rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
759{ 793{
760 if (len <= 0) /* sanity */ 794 if (len <= 0) /* sanity */
761 return; 795 return;
762 796
763 unsigned char checksel; 797 bool checksel;
764 unicode_t c; 798 unicode_t c;
765 int ncol = this->ncol; 799 int ncol = this->ncol;
766 const wchar_t *strend = str + len; 800 const wchar_t *strend = str + len;
767 801
768 want_refresh = 1; 802 want_refresh = 1;
… …
794 828
795 while (str < strend) 829 while (str < strend)
796 { 830 {
797 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 831 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
798 832
799 if (expect_false (c < 0x20)) 833 if (ecb_unlikely (c < 0x20))
800 if (c == C0_LF) 834 if (c == C0_LF)
801 { 835 {
802 max_it (line->l, screen.cur.col); 836 max_it (line->l, screen.cur.col);
803 837
804 screen.flags &= ~Screen_WrapNext; 838 screen.flags &= ~Screen_WrapNext;
… …
823 { 857 {
824 scr_tab (1, true); 858 scr_tab (1, true);
825 continue; 859 continue;
826 } 860 }
827 861
828 if (expect_false ( 862 if (ecb_unlikely (
829 checksel /* see if we're writing within selection */ 863 checksel /* see if we're writing within selection */
830 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 864 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
831 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 865 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
832 )) 866 ))
833 { 867 {
… …
838 * should be a similar check. 872 * should be a similar check.
839 */ 873 */
840 CLEAR_SELECTION (); 874 CLEAR_SELECTION ();
841 } 875 }
842 876
843 if (expect_false (screen.flags & Screen_WrapNext)) 877 if (ecb_unlikely (screen.flags & Screen_WrapNext))
844 { 878 {
845 scr_do_wrap (); 879 scr_do_wrap ();
846 880
847 line->l = ncol; 881 line->l = ncol;
848 line->is_longer (1); 882 line->is_longer (1);
… …
850 row = screen.cur.row; 884 row = screen.cur.row;
851 line = &ROW(row); /* _must_ refresh */ 885 line = &ROW(row); /* _must_ refresh */
852 } 886 }
853 887
854 // some utf-8 decoders "decode" surrogate characters: let's fix this. 888 // some utf-8 decoders "decode" surrogate characters: let's fix this.
855 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 889 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
856 c = 0xfffd; 890 c = 0xfffd;
857 891
858 // rely on wcwidth to tell us the character width, do wcwidth before 892 // rely on wcwidth to tell us the character width, do wcwidth before
859 // further replacements, as wcwidth might return -1 for the line 893 // further replacements, as wcwidth might return -1 for the line
860 // drawing characters below as they might be invalid in the current 894 // drawing characters below as they might be invalid in the current
861 // locale. 895 // locale.
862 int width = WCWIDTH (c); 896 int width = WCWIDTH (c);
863 897
864 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 898 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
865 { 899 {
866 // vt100 special graphics and line drawing 900 // vt100 special graphics and line drawing
867 // 5f-7e standard vt100 901 // 5f-7e standard vt100
868 // 40-5e rxvt extension for extra curses acs chars 902 // 40-5e rxvt extension for extra curses acs chars
869 static uint16_t vt100_0[62] = { // 41 .. 7e 903 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
882 c = vt100_0[c - 0x41]; 916 c = vt100_0[c - 0x41];
883 width = 1; // vt100 line drawing characters are always single-width 917 width = 1; // vt100 line drawing characters are always single-width
884 } 918 }
885 } 919 }
886 920
887 if (expect_false (screen.flags & Screen_Insert)) 921 if (ecb_unlikely (screen.flags & Screen_Insert))
888 scr_insdel_chars (width, INSERT); 922 scr_insdel_chars (width, INSERT);
889 923
890 if (width != 0) 924 if (width != 0)
891 { 925 {
892#if !UNICODE_3 926#if !UNICODE_3
… …
897# else 931# else
898 c = 0xfffd; 932 c = 0xfffd;
899# endif 933# endif
900#endif 934#endif
901 935
936 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
937
938 // if the character doesn't fit into the remaining columns...
939 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
940 {
941 if (screen.flags & Screen_Autowrap)
942 {
943 // ... artificially enlargen the previous one
944 c = NOCHAR;
945 // and try the same character next loop iteration
946 --str;
947 }
948 else
949 screen.cur.col = ncol - width;
950 }
951
902 // nuke the character at this position, if required 952 // nuke the character at this position, if required
903 if (expect_false ( 953 // due to wonderful coincidences everywhere else in this loop
954 // we never have to check for overwriting a wide char itself,
955 // only its tail.
904 line->t[screen.cur.col] == NOCHAR 956 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); 957 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 958
921 line->touch (); 959 line->touch ();
922 960
923 do 961 do
924 { 962 {
925 line->t[screen.cur.col] = c; 963 line->t[screen.cur.col] = c;
926 line->r[screen.cur.col] = rend; 964 line->r[screen.cur.col] = rend;
927 965
928 if (expect_true (screen.cur.col < ncol - 1)) 966 if (ecb_likely (screen.cur.col < ncol - 1))
929 screen.cur.col++; 967 screen.cur.col++;
930 else 968 else
931 { 969 {
932 line->l = ncol; 970 line->l = ncol;
933 if (screen.flags & Screen_Autowrap) 971 if (screen.flags & Screen_Autowrap)
934 screen.flags |= Screen_WrapNext; 972 screen.flags |= Screen_WrapNext;
935 break; 973
974 goto end_of_line;
936 } 975 }
937 976
938 c = NOCHAR; 977 c = NOCHAR;
939 } 978 }
940 while (expect_false (--width > 0)); 979 while (ecb_unlikely (--width > 0));
941 980
942 // pad with spaces when overwriting wide character with smaller one 981 // pad with spaces when overwriting wide character with smaller one
943 if (expect_false (!width)) 982 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
944 { 983 {
945 line->touch ();
946
947 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
948 {
949 line->t[c] = ' '; 984 line->t[c] = ' ';
950 line->r[c] = rend; 985 line->r[c] = rend;
951 }
952 } 986 }
987
988end_of_line:
989 ;
953 } 990 }
954#if ENABLE_COMBINING 991#if ENABLE_COMBINING
955 else // width == 0 992 else // width == 0
956 { 993 {
957 if (c != 0xfeff) // ignore BOM 994 if (c != 0xfeff) // ignore BOM
… …
1020 1057
1021 want_refresh = 1; 1058 want_refresh = 1;
1022#endif 1059#endif
1023 } 1060 }
1024 } 1061 }
1062 else if (screen.flags & Screen_WrapNext)
1063 screen.flags &= ~Screen_WrapNext;
1025 else 1064 else
1026 scr_gotorc (0, -1, RELATIVE); 1065 scr_gotorc (0, -1, RELATIVE);
1027} 1066}
1028 1067
1029/* ------------------------------------------------------------------------- */ 1068/* ------------------------------------------------------------------------- */
… …
1107 * XTERM_SEQ: ESC 6 1146 * XTERM_SEQ: ESC 6
1108 * Move cursor left in row. If we're at the left boundary, shift everything 1147 * Move cursor left in row. If we're at the left boundary, shift everything
1109 * in that row right. Clear left column. 1148 * in that row right. Clear left column.
1110 */ 1149 */
1111#if !ENABLE_MINIMAL 1150#if !ENABLE_MINIMAL
1112void 1151void ecb_cold
1113rxvt_term::scr_backindex () NOTHROW 1152rxvt_term::scr_backindex () NOTHROW
1114{ 1153{
1115 if (screen.cur.col > 0) 1154 if (screen.cur.col > 0)
1116 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1117 else 1156 else
… …
1124 * XTERM_SEQ: ESC 9 1163 * XTERM_SEQ: ESC 9
1125 * Move cursor right in row. If we're at the right boundary, shift everything 1164 * Move cursor right in row. If we're at the right boundary, shift everything
1126 * in that row left. Clear right column. 1165 * in that row left. Clear right column.
1127 */ 1166 */
1128#if !ENABLE_MINIMAL 1167#if !ENABLE_MINIMAL
1129void 1168void ecb_cold
1130rxvt_term::scr_forwardindex () NOTHROW 1169rxvt_term::scr_forwardindex () NOTHROW
1131{ 1170{
1132 if (screen.cur.col < ncol - 1) 1171 if (screen.cur.col < ncol - 1)
1133 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1172 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1134 else 1173 else
… …
1285 scr_blank_line (line, col, num, rstyle); 1324 scr_blank_line (line, col, num, rstyle);
1286} 1325}
1287 1326
1288/* ------------------------------------------------------------------------- */ 1327/* ------------------------------------------------------------------------- */
1289/* 1328/*
1290 * Erase part of whole of the screen 1329 * Erase part or whole of the screen
1291 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1330 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1292 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1331 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1293 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1332 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1294 */ 1333 */
1295void 1334void
… …
1304 ZERO_SCROLLBACK (); 1343 ZERO_SCROLLBACK ();
1305 1344
1306 switch (mode) 1345 switch (mode)
1307 { 1346 {
1308 case 0: /* erase to end of screen */ 1347 case 0: /* erase to end of screen */
1309 selection_check (1);
1310 scr_erase_line (0); 1348 scr_erase_line (0);
1311 row = screen.cur.row + 1; /* possible OOB */ 1349 row = screen.cur.row + 1; /* possible OOB */
1312 num = nrow - row; 1350 num = nrow - row;
1313 break; 1351 break;
1314 case 1: /* erase to beginning of screen */ 1352 case 1: /* erase to beginning of screen */
1315 selection_check (3);
1316 scr_erase_line (1); 1353 scr_erase_line (1);
1317 row = 0; 1354 row = 0;
1318 num = screen.cur.row; 1355 num = screen.cur.row;
1319 break; 1356 break;
1320 case 2: /* erase whole screen */ 1357 case 2: /* erase whole screen */
1321 selection_check (3);
1322 row = 0; 1358 row = 0;
1323 num = nrow; 1359 num = nrow;
1324 break; 1360 break;
1325 default: 1361 default:
1326 return; 1362 return;
… …
1335 if (row >= nrow) /* Out Of Bounds */ 1371 if (row >= nrow) /* Out Of Bounds */
1336 return; 1372 return;
1337 1373
1338 min_it (num, nrow - row); 1374 min_it (num, nrow - row);
1339 1375
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)) 1376 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1344 ren = (rend_t) ~RS_None; 1377 ren = (rend_t) ~RS_None;
1345 else if (GET_BASEBG (rstyle) == Color_bg) 1378 else if (GET_BASEBG (rstyle) == Color_bg)
1346 { 1379 {
1347 ren = DEFAULT_RSTYLE; 1380 ren = DEFAULT_RSTYLE;
1348 1381
1349 if (mapped && !view_start) 1382 if (mapped)
1350 XClearArea (dpy, vt, 0, 1383 XClearArea (dpy, vt, 0,
1351 Row2Pixel (row - view_start), (unsigned int)width, 1384 Row2Pixel (row - view_start), (unsigned int)vt_width,
1352 (unsigned int)Height2Pixel (num), False); 1385 (unsigned int)Height2Pixel (num), False);
1353 } 1386 }
1354 else 1387 else
1355 { 1388 {
1356 ren = rstyle & (RS_fgMask | RS_bgMask); 1389 ren = rstyle & (RS_fgMask | RS_bgMask);
1357 1390
1358 if (mapped && !view_start) 1391 if (mapped)
1359 { 1392 {
1360 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1393 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1361 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1394 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1362 XFillRectangle (dpy, vt, gc, 1395 XFillRectangle (dpy, vt, gc,
1363 0, Row2Pixel (row - view_start), 1396 0, Row2Pixel (row - view_start),
1364 (unsigned int)width, 1397 (unsigned int)vt_width,
1365 (unsigned int)Height2Pixel (num)); 1398 (unsigned int)Height2Pixel (num));
1366 gcvalue.foreground = pix_colors[Color_fg]; 1399 gcvalue.foreground = pix_colors[Color_fg];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1400 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 } 1401 }
1369 } 1402 }
1370 1403
1371 for (; num--; row++) 1404 for (; num--; row++)
1372 { 1405 {
1373 scr_blank_screen_mem (ROW(row), rstyle); 1406 scr_blank_screen_mem (ROW(row), rstyle);
1374 1407
1375 if (!view_start) 1408 if (row - view_start < nrow)
1376 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1409 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1377 } 1410 }
1378} 1411}
1379 1412
1380#if !ENABLE_MINIMAL 1413#if !ENABLE_MINIMAL
1381void 1414void
… …
1391/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1392/* 1425/*
1393 * Fill the screen with `E's 1426 * Fill the screen with `E's
1394 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1427 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1395 */ 1428 */
1396void 1429void ecb_cold
1397rxvt_term::scr_E () NOTHROW 1430rxvt_term::scr_E () NOTHROW
1398{ 1431{
1399 rend_t fs; 1432 rend_t fs;
1400 1433
1401 want_refresh = 1; 1434 want_refresh = 1;
1402 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1403 1436
1404 num_scr_allow = 0; 1437 num_scr_allow = 0;
1405 selection_check (3); 1438
1439 row_col_t pos;
1440 pos.row = pos.col = 0;
1441 if (ROWCOL_IS_AFTER (selection.end, pos))
1442 CLEAR_SELECTION ();
1406 1443
1407 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1444 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1408 for (int row = nrow; row--; ) 1445 for (int row = nrow; row--; )
1409 { 1446 {
1410 line_t &line = ROW(row); 1447 line_t &line = ROW(row);
… …
1561/* ------------------------------------------------------------------------- */ 1598/* ------------------------------------------------------------------------- */
1562/* 1599/*
1563 * Set the scrolling region 1600 * Set the scrolling region
1564 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1601 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1565 */ 1602 */
1566void 1603void ecb_cold
1567rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1604rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1568{ 1605{
1569 max_it (top, 0); 1606 max_it (top, 0);
1570 min_it (bot, nrow - 1); 1607 min_it (bot, nrow - 1);
1571 1608
… …
1581/* 1618/*
1582 * Make the cursor visible/invisible 1619 * Make the cursor visible/invisible
1583 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1620 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1584 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1621 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1585 */ 1622 */
1586void 1623void ecb_cold
1587rxvt_term::scr_cursor_visible (int mode) NOTHROW 1624rxvt_term::scr_cursor_visible (int mode) NOTHROW
1588{ 1625{
1589 want_refresh = 1; 1626 want_refresh = 1;
1590 1627
1591 if (mode) 1628 if (mode)
… …
1598/* 1635/*
1599 * Set/unset automatic wrapping 1636 * Set/unset automatic wrapping
1600 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1637 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1601 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1638 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1602 */ 1639 */
1603void 1640void ecb_cold
1604rxvt_term::scr_autowrap (int mode) NOTHROW 1641rxvt_term::scr_autowrap (int mode) NOTHROW
1605{ 1642{
1606 if (mode) 1643 if (mode)
1607 screen.flags |= Screen_Autowrap; 1644 screen.flags |= Screen_Autowrap;
1608 else 1645 else
… …
1617 * Relative mode: line numbers are relative to top margin of scrolling region 1654 * Relative mode: line numbers are relative to top margin of scrolling region
1618 * and the cursor cannot be moved outside. 1655 * and the cursor cannot be moved outside.
1619 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1656 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1620 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1657 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1621 */ 1658 */
1622void 1659void ecb_cold
1623rxvt_term::scr_relative_origin (int mode) NOTHROW 1660rxvt_term::scr_relative_origin (int mode) NOTHROW
1624{ 1661{
1625 if (mode) 1662 if (mode)
1626 screen.flags |= Screen_Relative; 1663 screen.flags |= Screen_Relative;
1627 else 1664 else
… …
1634/* 1671/*
1635 * Set insert/replace mode 1672 * Set insert/replace mode
1636 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1673 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1637 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1674 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1638 */ 1675 */
1639void 1676void ecb_cold
1640rxvt_term::scr_insert_mode (int mode) NOTHROW 1677rxvt_term::scr_insert_mode (int mode) NOTHROW
1641{ 1678{
1642 if (mode) 1679 if (mode)
1643 screen.flags |= Screen_Insert; 1680 screen.flags |= Screen_Insert;
1644 else 1681 else
… …
1650 * Set/Unset tabs 1687 * Set/Unset tabs
1651 * XTERM_SEQ: Set tab at current column : ESC H 1688 * XTERM_SEQ: Set tab at current column : ESC H
1652 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1689 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1653 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1690 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1654 */ 1691 */
1655void 1692void ecb_cold
1656rxvt_term::scr_set_tab (int mode) NOTHROW 1693rxvt_term::scr_set_tab (int mode) NOTHROW
1657{ 1694{
1658 if (mode < 0) 1695 if (mode < 0)
1659 memset (tabs, 0, ncol); 1696 memset (tabs, 0, ncol);
1660 else if (screen.cur.col < ncol) 1697 else if (screen.cur.col < ncol)
… …
1679 if (rvideo_state != on) 1716 if (rvideo_state != on)
1680 { 1717 {
1681 rvideo_state = on; 1718 rvideo_state = on;
1682 1719
1683 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1720 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1684#ifdef HAVE_BG_PIXMAP 1721#ifdef HAVE_IMG
1685 if (bgPixmap.pixmap == None) 1722 if (bg_img == 0)
1686#endif 1723#endif
1687 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1724 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1688 1725
1689 XGCValues gcvalue; 1726 XGCValues gcvalue;
1690 gcvalue.foreground = pix_colors[Color_fg]; 1727 gcvalue.foreground = pix_colors[Color_fg];
… …
1699/* ------------------------------------------------------------------------- */ 1736/* ------------------------------------------------------------------------- */
1700/* 1737/*
1701 * Report current cursor position 1738 * Report current cursor position
1702 * XTERM_SEQ: Report position: ESC [ 6 n 1739 * XTERM_SEQ: Report position: ESC [ 6 n
1703 */ 1740 */
1704void 1741void ecb_cold
1705rxvt_term::scr_report_position () NOTHROW 1742rxvt_term::scr_report_position () NOTHROW
1706{ 1743{
1707 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1744 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1708} 1745}
1709 1746
… …
1712 * ------------------------------------------------------------------------- */ 1749 * ------------------------------------------------------------------------- */
1713 1750
1714/* 1751/*
1715 * Set font style 1752 * Set font style
1716 */ 1753 */
1717void 1754void ecb_cold
1718rxvt_term::set_font_style () NOTHROW 1755rxvt_term::set_font_style () NOTHROW
1719{ 1756{
1720#if 0 1757#if 0
1721 switch (charsets [screen.charset]) 1758 switch (charsets [screen.charset])
1722 { 1759 {
… …
1744 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1781 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1745 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1782 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1746 * XTERM_SEQ: Invoke G2 character set: ESC N 1783 * XTERM_SEQ: Invoke G2 character set: ESC N
1747 * XTERM_SEQ: Invoke G3 character set: ESC O 1784 * XTERM_SEQ: Invoke G3 character set: ESC O
1748 */ 1785 */
1749void 1786void ecb_cold
1750rxvt_term::scr_charset_choose (int set) NOTHROW 1787rxvt_term::scr_charset_choose (int set) NOTHROW
1751{ 1788{
1752 screen.charset = set; 1789 screen.charset = set;
1753 set_font_style (); 1790 set_font_style ();
1754} 1791}
… …
1775 * ------------------------------------------------------------------------- */ 1812 * ------------------------------------------------------------------------- */
1776 1813
1777/* 1814/*
1778 * refresh matching text. 1815 * refresh matching text.
1779 */ 1816 */
1780bool 1817bool ecb_cold
1781rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1818rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1782{ 1819{
1783 bool found = false; 1820 bool found = false;
1784 1821
1785 for (int i = 0; i < nrow; i++) 1822 for (int i = 0; i < nrow; i++)
… …
1804 PART_BEG = 0, 1841 PART_BEG = 0,
1805 PART_END, 1842 PART_END,
1806 RC_COUNT 1843 RC_COUNT
1807}; 1844};
1808 1845
1809void 1846void ecb_hot
1810rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1847rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1811{ 1848{
1812 int i; 1849 int i;
1813 row_col_t rc[RC_COUNT]; 1850 row_col_t rc[RC_COUNT];
1814 1851
… …
1851 * Refresh the entire screen 1888 * Refresh the entire screen
1852 */ 1889 */
1853void 1890void
1854rxvt_term::scr_touch (bool refresh) NOTHROW 1891rxvt_term::scr_touch (bool refresh) NOTHROW
1855{ 1892{
1856 scr_expose (0, 0, width, height, refresh); 1893 scr_expose (0, 0, vt_width, vt_height, refresh);
1857} 1894}
1858 1895
1859/* ------------------------------------------------------------------------- */ 1896/* ------------------------------------------------------------------------- */
1860/* 1897/*
1861 * Move the display so that the line represented by scrollbar value Y is at 1898 * Move the display so that the line represented by scrollbar value Y is at
… …
1917 1954
1918# ifndef NO_MAPALERT 1955# ifndef NO_MAPALERT
1919# ifdef MAPALERT_OPTION 1956# ifdef MAPALERT_OPTION
1920 if (option (Opt_mapAlert)) 1957 if (option (Opt_mapAlert))
1921# endif 1958# endif
1922 XMapWindow (dpy, parent[0]); 1959 XMapWindow (dpy, parent);
1923# endif 1960# endif
1924 1961
1925# if ENABLE_FRILLS 1962# if ENABLE_FRILLS
1926 if (option (Opt_urgentOnBell)) 1963 if (option (Opt_urgentOnBell))
1927 set_urgency (1); 1964 set_urgency (1);
… …
1940 HOOK_INVOKE ((this, HOOK_BELL, DT_END)); 1977 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1941#endif 1978#endif
1942} 1979}
1943 1980
1944/* ------------------------------------------------------------------------- */ 1981/* ------------------------------------------------------------------------- */
1945/* ARGSUSED */ 1982void ecb_cold
1946void
1947rxvt_term::scr_printscreen (int fullhist) NOTHROW 1983rxvt_term::scr_printscreen (int fullhist) NOTHROW
1948{ 1984{
1949#ifdef PRINTPIPE 1985#ifdef PRINTPIPE
1950 int nrows, row_start; 1986 int nrows, row_start;
1951 FILE *fd = popen_printer (); 1987 FILE *fd = popen_printer ();
… …
2000/* 2036/*
2001 * Refresh the screen 2037 * Refresh the screen
2002 * drawn_text/drawn_rend contain the screen information before the update. 2038 * drawn_text/drawn_rend contain the screen information before the update.
2003 * screen.text/screen.rend contain what the screen will change to. 2039 * screen.text/screen.rend contain what the screen will change to.
2004 */ 2040 */
2005void 2041void ecb_hot
2006rxvt_term::scr_refresh () NOTHROW 2042rxvt_term::scr_refresh () NOTHROW
2007{ 2043{
2008 int16_t col, row, /* column/row we're processing */ 2044 int16_t col, row, /* column/row we're processing */
2009 ocrow; /* old cursor row */ 2045 ocrow; /* old cursor row */
2010 int i; /* tmp */ 2046 int i; /* tmp */
2011#ifndef NO_CURSORCOLOR
2012 rend_t cc1; /* store colours at cursor position (s) */
2013#endif
2014 rend_t *crp; // cursor rendition pointer
2015 rend_t ccol1, /* Cursor colour */ 2047 rend_t ccol1, /* Cursor colour */
2016 ccol2; /* Cursor colour2 */ 2048 ccol2; /* Cursor colour2 */
2049 rend_t cur_rend;
2050 int cur_col;
2017 2051
2018 want_refresh = 0; /* screen is current */ 2052 want_refresh = 0; /* screen is current */
2019 2053
2020 if (refresh_type == NO_REFRESH || !mapped) 2054 if (refresh_type == NO_REFRESH || !mapped)
2021 return; 2055 return;
… …
2024 * A: set up vars 2058 * A: set up vars
2025 */ 2059 */
2026 refresh_count = 0; 2060 refresh_count = 0;
2027 2061
2028 unsigned int old_screen_flags = screen.flags; 2062 unsigned int old_screen_flags = screen.flags;
2029 char have_bg = 0; 2063 bool have_bg = 0;
2030#ifdef HAVE_BG_PIXMAP 2064#ifdef HAVE_IMG
2031 have_bg = bgPixmap.pixmap != None; 2065 have_bg = bg_img != 0;
2032#endif 2066#endif
2033 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2067 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2034 2068
2035 /* 2069 /*
2036 * B: reverse any characters which are selected 2070 * B: reverse any characters which are selected
… …
2040 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2074 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2041#if ENABLE_OVERLAY 2075#if ENABLE_OVERLAY
2042 scr_swap_overlay (); 2076 scr_swap_overlay ();
2043#endif 2077#endif
2044 2078
2045 char showcursor = screen.flags & Screen_VisibleCursor; 2079 bool showcursor = screen.flags & Screen_VisibleCursor;
2046 2080
2047 /* 2081 /*
2048 * C: set the cursor character (s) 2082 * C: set the cursor character (s)
2049 */ 2083 */
2050 { 2084 {
2051 unsigned char setoldcursor; 2085 bool setoldcursor;
2052 2086
2053#ifdef CURSOR_BLINK 2087#ifdef CURSOR_BLINK
2054 if (hidden_cursor) 2088 if (hidden_cursor)
2055 showcursor = 0; 2089 showcursor = 0;
2056#endif 2090#endif
… …
2060 int col = screen.cur.col; 2094 int col = screen.cur.col;
2061 2095
2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2096 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2063 col--; 2097 col--;
2064 2098
2065 crp = &ROW(screen.cur.row).r[col]; 2099 cur_rend = ROW(screen.cur.row).r[col];
2100 cur_col = col;
2066 2101
2067#ifndef NO_CURSORCOLOR 2102#ifndef NO_CURSORCOLOR
2068 cc1 = *crp & (RS_fgMask | RS_bgMask);
2069 if (ISSET_PIXCOLOR (Color_cursor)) 2103 if (ISSET_PIXCOLOR (Color_cursor))
2070 ccol1 = Color_cursor; 2104 ccol1 = Color_cursor;
2071 else 2105 else
2072#endif 2106#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2107#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
… …
2085 ccol2 = bgcolor_of (rstyle); 2119 ccol2 = bgcolor_of (rstyle);
2086#else 2120#else
2087 ccol2 = Color_bg; 2121 ccol2 = Color_bg;
2088#endif 2122#endif
2089 2123
2090 if (showcursor && focus) 2124 if (focus)
2091 { 2125 {
2126 rend_t rend = cur_rend;
2127
2092 if (option (Opt_cursorUnderline)) 2128 if (option (Opt_cursorUnderline))
2093 *crp ^= RS_Uline; 2129 rend ^= RS_Uline;
2094 else 2130 else
2095 { 2131 {
2096 *crp ^= RS_RVid; 2132 rend ^= RS_RVid;
2097 *crp = SET_FGCOLOR (*crp, ccol1); 2133 rend = SET_FGCOLOR (rend, ccol1);
2098 *crp = SET_BGCOLOR (*crp, ccol2); 2134 rend = SET_BGCOLOR (rend, ccol2);
2099 } 2135 }
2136
2137 scr_set_char_rend (ROW(screen.cur.row), cur_col, rend);
2100 } 2138 }
2101 } 2139 }
2102 2140
2103 /* make sure no outline cursor is left around */ 2141 /* make sure no outline cursor is left around */
2104 setoldcursor = 0; 2142 setoldcursor = 0;
… …
2143 { 2181 {
2144 int16_t nits; 2182 int16_t nits;
2145 int i = num_scr; 2183 int i = num_scr;
2146 int j; 2184 int j;
2147 int len, wlen; 2185 int len, wlen;
2148 dLocal (int, num_scr);
2149 2186
2150 j = nrow; 2187 j = nrow;
2151 wlen = len = -1; 2188 wlen = len = -1;
2152 row = i > 0 ? 0 : j - 1; 2189 row = i > 0 ? 0 : j - 1;
2153 2190
… …
2228 continue; 2265 continue;
2229 2266
2230 // redraw one or more characters 2267 // redraw one or more characters
2231 2268
2232 // seek to the beginning of wide characters 2269 // seek to the beginning of wide characters
2233 while (expect_false (stp[col] == NOCHAR && col > 0)) 2270 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2234 --col; 2271 --col;
2235 2272
2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2273 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2237 text_t *text = stp + col; 2274 text_t *text = stp + col;
2238 int count = 1; 2275 int count = 1;
2239 2276
2240 dtp[col] = stp[col]; 2277 dtp[col] = stp[col];
2241 drp[col] = rend; 2278 drp[col] = rend;
… …
2276 2313
2277 col--; /* went one too far. move back */ 2314 col--; /* went one too far. move back */
2278 count -= i; /* dump any matching trailing chars */ 2315 count -= i; /* dump any matching trailing chars */
2279 2316
2280 // sometimes we optimize away the trailing NOCHAR's, add them back 2317 // sometimes we optimize away the trailing NOCHAR's, add them back
2281 while (expect_false (i && text[count] == NOCHAR)) 2318 while (ecb_unlikely (i && text[count] == NOCHAR))
2282 count++, i--; 2319 count++, i--;
2283 2320
2284 /* 2321 /*
2285 * Determine the attributes for the string 2322 * Determine the attributes for the string
2286 */ 2323 */
2287 int fore = fgcolor_of (rend); // desired foreground 2324 int fore = fgcolor_of (rend); // desired foreground
2288 int back = bgcolor_of (rend); // desired background 2325 int back = bgcolor_of (rend); // desired background
2289 2326
2290 // only do special processing if any attributes are set, which is unlikely 2327 // 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))) 2328 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2292 { 2329 {
2293 bool invert = rend & RS_RVid; 2330 bool invert = rend & RS_RVid;
2294 2331
2295#ifndef NO_BOLD_UNDERLINE_REVERSE 2332#ifndef NO_BOLD_UNDERLINE_REVERSE
2296 if (rend & RS_Bold && fore == Color_fg) 2333 if (rend & RS_Bold && fore == Color_fg)
… …
2315 2352
2316 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2353 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2317 fore = Color_UL; 2354 fore = Color_UL;
2318#endif 2355#endif
2319 2356
2357#ifdef OPTION_HC
2358 if (rend & RS_Sel)
2359 {
2360 /* invert the column if no highlightColor is set or it is the
2361 * current cursor column */
2362 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2363 && ISSET_PIXCOLOR (Color_HC))
2364 {
2365 if (ISSET_PIXCOLOR (Color_HTC))
2366 fore = Color_HTC;
2367 // if invert is 0 reverse video is set so we use bg color as fg color
2368 else if (!invert)
2369 fore = back;
2370
2371 back = Color_HC;
2372 invert = 0;
2373 }
2374 }
2375#endif
2376
2320 if (invert) 2377 if (invert)
2321 { 2378 {
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); 2379 ::swap (fore, back);
2329#ifdef OPTION_HC
2330 else if (ISSET_PIXCOLOR (Color_HC))
2331 back = Color_HC;
2332#endif
2333 2380
2334#ifndef NO_BOLD_UNDERLINE_REVERSE 2381#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) 2382 if (fore == back)
2340 { 2383 {
2341 fore = Color_bg; 2384 fore = Color_bg;
2342 back = Color_fg; 2385 back = Color_fg;
2343 } 2386 }
… …
2379 /* 2422 /*
2380 * Actually do the drawing of the string here 2423 * Actually do the drawing of the string here
2381 */ 2424 */
2382 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2425 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2383 2426
2384 if (expect_true (have_bg && back == Color_bg)) 2427 if (ecb_likely (have_bg && back == Color_bg))
2385 { 2428 {
2386 // this is very ugly, maybe push it into ->draw? 2429 // this is very ugly, maybe push it into ->draw?
2387 2430
2388 for (i = 0; i < count; i++) /* don't draw empty strings */ 2431 for (i = 0; i < count; i++) /* don't draw empty strings */
2389 if (text[i] != ' ') 2432 if (text[i] != ' ')
… …
2396 did_clear: ; 2439 did_clear: ;
2397 } 2440 }
2398 else 2441 else
2399 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2442 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2400 2443
2401 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2444 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2402 { 2445 {
2403#if ENABLE_FRILLS 2446#if ENABLE_FRILLS
2404 if (ISSET_PIXCOLOR (Color_underline)) 2447 if (ISSET_PIXCOLOR (Color_underline))
2405 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2448 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2406 else 2449 else
… …
2418 * G: cleanup cursor and display outline cursor if necessary 2461 * G: cleanup cursor and display outline cursor if necessary
2419 */ 2462 */
2420 if (showcursor) 2463 if (showcursor)
2421 { 2464 {
2422 if (focus) 2465 if (focus)
2423 { 2466 scr_set_char_rend (ROW(screen.cur.row), cur_col, cur_rend);
2424 if (option (Opt_cursorUnderline))
2425 *crp ^= RS_Uline;
2426 else
2427 {
2428 *crp ^= RS_RVid;
2429#ifndef NO_CURSORCOLOR
2430 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2431#endif
2432 }
2433 }
2434 else if (oldcursor.row >= 0) 2467 else if (oldcursor.row >= 0)
2435 { 2468 {
2436 int cursorwidth = 1; 2469 int cursorwidth = 1;
2437 int col = oldcursor.col; 2470 int col = oldcursor.col;
2438 2471
… …
2452 2485
2453 XDrawRectangle (dpy, vt, gc, 2486 XDrawRectangle (dpy, vt, gc,
2454 Col2Pixel (col), 2487 Col2Pixel (col),
2455 Row2Pixel (oldcursor.row), 2488 Row2Pixel (oldcursor.row),
2456 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2489 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2457 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2490 (unsigned int) (Height2Pixel (1) - 1));
2458 } 2491 }
2459 } 2492 }
2460 2493
2461 /* 2494 /*
2462 * H: cleanup selection 2495 * H: cleanup selection
… …
2471 screen.flags = old_screen_flags; 2504 screen.flags = old_screen_flags;
2472 num_scr = 0; 2505 num_scr = 0;
2473 num_scr_allow = 1; 2506 num_scr_allow = 1;
2474} 2507}
2475 2508
2476void 2509void ecb_cold
2477rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2510rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2478{ 2511{
2479 if (!l.t) 2512 if (!l.valid ())
2480 return; 2513 return;
2481 2514
2482 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2515 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2483 2516
2484 for (int i = ncol; i--; ) 2517 for (int i = ncol; i--; )
2485 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2518 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2486} 2519}
2487 2520
2488void 2521void ecb_cold
2489rxvt_term::scr_remap_chars () NOTHROW 2522rxvt_term::scr_remap_chars () NOTHROW
2490{ 2523{
2491 for (int i = total_rows; i--; ) 2524 for (int i = total_rows; i--; )
2492 scr_remap_chars (row_buf [i]); 2525 scr_remap_chars (row_buf [i]);
2493 2526
… …
2496 scr_remap_chars (drawn_buf [i]); 2529 scr_remap_chars (drawn_buf [i]);
2497 scr_remap_chars (swap_buf [i]); 2530 scr_remap_chars (swap_buf [i]);
2498 } 2531 }
2499} 2532}
2500 2533
2501void 2534void ecb_cold
2502rxvt_term::scr_recolour () NOTHROW 2535rxvt_term::scr_recolour (bool refresh) NOTHROW
2503{ 2536{
2504#ifdef HAVE_BG_PIXMAP 2537 bool transparent = false;
2505 bgPixmap.apply ();
2506#else
2507 2538
2539#ifdef HAVE_IMG
2540 if (bg_img != 0)
2541 {
2542# if ENABLE_TRANSPARENCY
2543 if (bg_flags & BG_IS_TRANSPARENT)
2544 {
2545 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2546 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2547
2548 transparent = true;
2549 }
2550 else
2551# endif
2552 {
2553 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2554 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2555 }
2556 }
2557 else
2558#endif
2559 {
2508 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2560 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2509 XClearWindow (dpy, parent[0]);
2510 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2561 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2562 }
2563
2564 XClearWindow (dpy, parent);
2511 2565
2512 if (scrollBar.win) 2566 if (scrollBar.win)
2513 { 2567 {
2568 if (transparent)
2569 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2570 else
2514 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2571 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2515 scrollBar.state = STATE_IDLE; 2572 scrollBar.state = SB_STATE_IDLE;
2516 scrollBar.show (0); 2573 scrollBar.show (0);
2517 } 2574 }
2518 2575
2519#endif 2576 if (refresh)
2520 2577 {
2521 /* bgPixmap.apply () does not do the following : */
2522 scr_clear (); 2578 scr_clear ();
2523 scr_touch (true); 2579 scr_touch (true);
2580 }
2524 want_refresh = 1; 2581 want_refresh = 1;
2525} 2582}
2526 2583
2527/* ------------------------------------------------------------------------- */ 2584/* ------------------------------------------------------------------------- */
2528void 2585void
… …
2585 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2642 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2586 srp[col] ^= rstyle; 2643 srp[col] ^= rstyle;
2587} 2644}
2588 2645
2589/* ------------------------------------------------------------------------- */ 2646/* ------------------------------------------------------------------------- */
2590void 2647void ecb_hot
2591rxvt_term::scr_reverse_selection () NOTHROW 2648rxvt_term::scr_reverse_selection () NOTHROW
2592{ 2649{
2593 if (selection.op 2650 if (selection.op
2594 && current_screen == selection.screen 2651 && current_screen == selection.screen
2595 && selection.end.row >= view_start) 2652 && selection.end.row >= view_start)
2596 { 2653 {
2597#if !ENABLE_MINIMAL 2654#if !ENABLE_MINIMAL
2598 if (selection.rect) 2655 if (selection.rect)
2599 scr_xor_rect (selection.beg.row, selection.beg.col, 2656 scr_xor_rect (selection.beg.row, selection.beg.col,
2600 selection.end.row, selection.end.col, 2657 selection.end.row, selection.end.col,
2601 RS_RVid, RS_RVid | RS_Uline); 2658 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2602 else 2659 else
2603#endif 2660#endif
2604 scr_xor_span (selection.beg.row, selection.beg.col, 2661 scr_xor_span (selection.beg.row, selection.beg.col,
2605 selection.end.row, selection.end.col, 2662 selection.end.row, selection.end.col,
2606 RS_RVid); 2663 RS_Sel | RS_RVid);
2607 } 2664 }
2608} 2665}
2609 2666
2610/* ------------------------------------------------------------------------- */ 2667/* ------------------------------------------------------------------------- */
2611/* 2668/*
… …
2614 */ 2671 */
2615#if 0 2672#if 0
2616void 2673void
2617rxvt_term::scr_dump (int fd) NOTHROW 2674rxvt_term::scr_dump (int fd) NOTHROW
2618{ 2675{
2619 int row, wrote; 2676 // if this method is needed, it can be implemented by factoring the
2620 unsigned int width, towrite; 2677 // 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} 2678}
2640#endif 2679#endif
2641 2680
2642/* ------------------------------------------------------------------------- * 2681/* ------------------------------------------------------------------------- *
2643 * CHARACTER SELECTION * 2682 * CHARACTER SELECTION *
2644 * ------------------------------------------------------------------------- */ 2683 * ------------------------------------------------------------------------- */
2645void 2684void
2646rxvt_term::selection_check (int check_more) NOTHROW 2685rxvt_term::selection_check (int check_more) NOTHROW
2647{ 2686{
2648 row_col_t pos;
2649
2650 if (!selection.op) 2687 if (!selection.op)
2651 return; 2688 return;
2652 2689
2653 pos.row = pos.col = 0;
2654 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2690 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2655 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2691 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2656 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2692 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2657 || (check_more == 1 2693 || (check_more == 1
2658 && current_screen == selection.screen 2694 && current_screen == selection.screen
2659 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2695 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2660 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2696 && 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 (); 2697 CLEAR_ALL_SELECTION ();
2698}
2699
2700void
2701rxvt_term::selection_changed () NOTHROW
2702{
2703 line_t &r1 = ROW (selection.beg.row);
2704 while (selection.beg.col > 0 && r1.t [selection.beg.col] == NOCHAR)
2705 --selection.beg.col;
2706
2707 line_t &r2 = ROW (selection.end.row);
2708 while (selection.end.col < r2.l && r2.t [selection.end.col] == NOCHAR)
2709 ++selection.end.col;
2710
2711 want_refresh = 1;
2670} 2712}
2671 2713
2672/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2673/* 2715/*
2674 * Paste a selection direct to the command fd 2716 * Paste a selection direct to the command fd
2675 */ 2717 */
2676void 2718void
2677rxvt_term::paste (char *data, unsigned int len) NOTHROW 2719rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2678{ 2720{
2679 /* convert normal newline chars into common keyboard Return key sequence */ 2721 /* convert normal newline chars into common keyboard Return key sequence */
2680 for (unsigned int i = 0; i < len; i++) 2722 for (unsigned int i = 0; i < len; i++)
2681 if (data[i] == C0_LF) 2723 if (data[i] == C0_LF)
2682 data[i] = C0_CR; 2724 data[i] = C0_CR;
2683 2725
2684 if (priv_modes & PrivMode_BracketPaste) 2726 if (priv_modes & PrivMode_BracketPaste)
2685 tt_printf ("\e[200~"); 2727 tt_printf ("\x1b[200~");
2686 2728
2687 tt_write (data, len); 2729 tt_write (data, len);
2688 2730
2689 if (priv_modes & PrivMode_BracketPaste) 2731 if (priv_modes & PrivMode_BracketPaste)
2690 tt_printf ("\e[201~"); 2732 tt_printf ("\x1b[201~");
2691} 2733}
2692 2734
2693/* ------------------------------------------------------------------------- */
2694/*
2695 * Respond to a notification that a primary selection has been sent
2696 * EXT: SelectionNotify
2697 */
2698void 2735void
2699rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2736rxvt_term::paste (char *data, unsigned int len) NOTHROW
2700{ 2737{
2701 if (prop == None) /* check for failed XConvertSelection */ 2738 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; 2739 return;
2876 2740
2877 selection_paste (win, prop, true); 2741 tt_paste (data, len);
2878} 2742}
2879 2743
2880/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2881/* 2745/*
2882 * Request the current selection: 2746 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2883 * Order: > internal selection if available 2747 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2884 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2748 * 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 2749 * EXT: button 2 release
2889 */ 2750 */
2890void 2751void
2891rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2752rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2892{ 2753{
2893 if (selection.text && selnum == Sel_Primary) 2754 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 } 2755 {
2901 else 2756 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2757 selection_req->run ();
2902 { 2758 }
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} 2759}
2944 2760
2945/* ------------------------------------------------------------------------- */ 2761/* ------------------------------------------------------------------------- */
2946/* 2762/*
2947 * Clear all selected text 2763 * Clear all selected text
… …
2970 if (display->clipboard_owner == this) 2786 if (display->clipboard_owner == this)
2971 display->clipboard_owner = 0; 2787 display->clipboard_owner = 0;
2972 } 2788 }
2973} 2789}
2974 2790
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/* ------------------------------------------------------------------------- */ 2791/* ------------------------------------------------------------------------- */
2990/* 2792/*
2991 * Copy a selection into the cut buffer 2793 * Copy a selection into the cut buffer
2992 * EXT: button 1 or 3 release 2794 * EXT: button 1 or 3 release
2993 */ 2795 */
2994void 2796void
2995rxvt_term::selection_make (Time tm) 2797rxvt_term::selection_make (Time tm)
2996{ 2798{
2997 int i; 2799 int size;
2998 wchar_t *new_selection_text; 2800 wchar_t *new_selection_text;
2999 text_t *t; 2801 text_t *t;
3000 2802
3001 switch (selection.op) 2803 switch (selection.op)
3002 { 2804 {
… …
3018 return; /* nothing selected, go away */ 2820 return; /* nothing selected, go away */
3019 2821
3020 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2822 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3021 return; 2823 return;
3022 2824
3023 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2825 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3024 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2826 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3025 2827
3026 int ofs = 0; 2828 int ofs = 0;
3027 int extra = 0; 2829 int extra = 0;
3028 2830
3029 int col = selection.beg.col; 2831 int col = selection.beg.col;
… …
3035 { 2837 {
3036#if !ENABLE_MINIMAL 2838#if !ENABLE_MINIMAL
3037 if (selection.rect) 2839 if (selection.rect)
3038 { 2840 {
3039 col = selection.beg.col; 2841 col = selection.beg.col;
3040 end_col = ncol + 1; 2842 end_col = selection.end.col;
3041 } 2843 }
3042 else 2844 else
3043#endif 2845#endif
3044 end_col = ROW(row).l; 2846 end_col = ROW(row).l;
3045 2847
3046 col = max (col, 0); 2848 col = max (col, 0);
3047 2849
3048 if (row == selection.end.row 2850 if (row == selection.end.row)
3049#if !ENABLE_MINIMAL
3050 || selection.rect
3051#endif
3052 )
3053 min_it (end_col, selection.end.col); 2851 min_it (end_col, selection.end.col);
3054 2852
3055 t = ROW(row).t + col; 2853 t = ROW(row).t + col;
3056 2854
3057 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
… …
3065 2863
3066 extra -= (len - 1); 2864 extra -= (len - 1);
3067 2865
3068 if (extra < 0) 2866 if (extra < 0)
3069 { 2867 {
3070 extra += i; 2868 extra += size;
3071 i += i; 2869 size += size;
3072 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2870 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3073 } 2871 }
3074 2872
3075 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2873 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3076 } 2874 }
3077#endif 2875#endif
… …
3089 2887
3090 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
3091 } 2889 }
3092 else 2890 else
3093#endif 2891#endif
3094 if (!ROW(row).is_longer () && row != selection.end.row) 2892 if (!ROW(row).is_longer ()
2893 && (row != selection.end.row || end_col != selection.end.col)
2894 && (row != selection.beg.row || selection.beg.col < ncol))
3095 new_selection_text[ofs++] = C0_LF; 2895 new_selection_text[ofs++] = C0_LF;
3096 } 2896 }
3097
3098 if (end_col != selection.end.col)
3099 new_selection_text[ofs++] = C0_LF;
3100 2897
3101 new_selection_text[ofs] = 0; 2898 new_selection_text[ofs] = 0;
3102 2899
3103 if (ofs == 0) 2900 if (ofs == 0)
3104 { 2901 {
… …
3160/* ------------------------------------------------------------------------- */ 2957/* ------------------------------------------------------------------------- */
3161/* 2958/*
3162 * Mark or select text based upon number of clicks: 1, 2, or 3 2959 * Mark or select text based upon number of clicks: 1, 2, or 3
3163 * EXT: button 1 press 2960 * EXT: button 1 press
3164 */ 2961 */
3165void 2962void ecb_cold
3166rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2963rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3167{ 2964{
3168 clicks = ((clicks - 1) % 3) + 1; 2965 clicks = ((clicks - 1) % 3) + 1;
3169 selection.clicks = clicks; /* save clicks so extend will work */ 2966 selection.clicks = clicks; /* save clicks so extend will work */
3170 2967
… …
3189 2986
3190/* ------------------------------------------------------------------------- */ 2987/* ------------------------------------------------------------------------- */
3191/* 2988/*
3192 * Mark a selection at the specified col/row 2989 * Mark a selection at the specified col/row
3193 */ 2990 */
3194void 2991void ecb_cold
3195rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2992rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3196{ 2993{
3197 want_refresh = 1; 2994 want_refresh = 1;
3198 2995
3199 selection.mark.row = row + view_start; 2996 selection.mark.row = row + view_start;
… …
3222 * Word select: select text for 2 clicks 3019 * Word select: select text for 2 clicks
3223 * We now only find out the boundary in one direction 3020 * We now only find out the boundary in one direction
3224 */ 3021 */
3225 3022
3226/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3023/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3227#define DELIMIT_TEXT(x) \ 3024#define DELIMIT_TEXT(x) \
3228 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3025 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3229#define DELIMIT_REND(x) 1 3026#define DELIMIT_REND(x) 1
3230 3027
3231void 3028void ecb_cold
3232rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3029rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3233{ 3030{
3234 int col, row, dirnadd, tcol, trow, w1, w2; 3031 int col, row, dirnadd, tcol, trow, w1, w2;
3235 row_col_t bound; 3032 row_col_t bound;
3236 text_t *stp; 3033 text_t *stp;
… …
3310 * EXT: button 3 press; button 1 or 3 drag 3107 * EXT: button 3 press; button 1 or 3 drag
3311 * flag == 0 ==> button 1 3108 * flag == 0 ==> button 1
3312 * flag == 1 ==> button 3 press 3109 * flag == 1 ==> button 3 press
3313 * flag == 2 ==> button 3 motion 3110 * flag == 2 ==> button 3 motion
3314 */ 3111 */
3315void 3112void ecb_cold
3316rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3113rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3317{ 3114{
3318 int col = clamp (Pixel2Col (x), 0, ncol); 3115 int col = clamp (Pixel2Col (x), 0, ncol);
3319 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3116 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3320 3117
… …
3346 3143
3347/* ------------------------------------------------------------------------- */ 3144/* ------------------------------------------------------------------------- */
3348/* 3145/*
3349 * Extend the selection to the specified col/row 3146 * Extend the selection to the specified col/row
3350 */ 3147 */
3351void 3148void ecb_cold
3352rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3149rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3353{ 3150{
3354 row_col_t pos; 3151 row_col_t pos;
3355 enum { 3152 enum {
3356 LEFT, RIGHT 3153 LEFT, RIGHT
3357 } closeto = RIGHT; 3154 } closeto = RIGHT;
3358
3359 want_refresh = 1;
3360 3155
3361 switch (selection.op) 3156 switch (selection.op)
3362 { 3157 {
3363 case SELECTION_INIT: 3158 case SELECTION_INIT:
3364 CLEAR_SELECTION (); 3159 CLEAR_SELECTION ();
… …
3544 3339
3545#if !ENABLE_MINIMAL 3340#if !ENABLE_MINIMAL
3546 if (selection.rect && selection.beg.col > selection.end.col) 3341 if (selection.rect && selection.beg.col > selection.end.col)
3547 ::swap (selection.beg.col, selection.end.col); 3342 ::swap (selection.beg.col, selection.end.col);
3548#endif 3343#endif
3344
3345 selection_changed ();
3549} 3346}
3550 3347
3551#if !ENABLE_MINIMAL 3348#if !ENABLE_MINIMAL
3552void 3349void ecb_cold
3553rxvt_term::selection_remove_trailing_spaces () NOTHROW 3350rxvt_term::selection_remove_trailing_spaces () NOTHROW
3554{ 3351{
3555 int32_t end_col, end_row; 3352 int32_t end_col, end_row;
3556 text_t *stp; 3353 text_t *stp;
3557 3354
… …
3595/* ------------------------------------------------------------------------- */ 3392/* ------------------------------------------------------------------------- */
3596/* 3393/*
3597 * Double click on button 3 when already selected 3394 * Double click on button 3 when already selected
3598 * EXT: button 3 double click 3395 * EXT: button 3 double click
3599 */ 3396 */
3600void 3397void ecb_cold
3601rxvt_term::selection_rotate (int x, int y) NOTHROW 3398rxvt_term::selection_rotate (int x, int y) NOTHROW
3602{ 3399{
3603 selection.clicks = selection.clicks % 3 + 1; 3400 selection.clicks = selection.clicks % 3 + 1;
3604 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3401 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3605} 3402}
… …
3607/* ------------------------------------------------------------------------- */ 3404/* ------------------------------------------------------------------------- */
3608/* 3405/*
3609 * Respond to a request for our current selection 3406 * Respond to a request for our current selection
3610 * EXT: SelectionRequest 3407 * EXT: SelectionRequest
3611 */ 3408 */
3612void 3409void ecb_cold
3613rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3410rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3614{ 3411{
3412 Atom property = rq.property == None ? rq.target : rq.property;
3615 XSelectionEvent ev; 3413 XSelectionEvent ev;
3616 3414
3617 ev.type = SelectionNotify; 3415 ev.type = SelectionNotify;
3618 ev.property = None; 3416 ev.property = None;
3619 ev.display = rq.display; 3417 ev.display = rq.display;
… …
3634 *target++ = xa[XA_COMPOUND_TEXT]; 3432 *target++ = xa[XA_COMPOUND_TEXT];
3635#if X_HAVE_UTF8_STRING 3433#if X_HAVE_UTF8_STRING
3636 *target++ = xa[XA_UTF8_STRING]; 3434 *target++ = xa[XA_UTF8_STRING];
3637#endif 3435#endif
3638 3436
3639 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3437 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3640 32, PropModeReplace, 3438 32, PropModeReplace,
3641 (unsigned char *)target_list, target - target_list); 3439 (unsigned char *)target_list, target - target_list);
3642 ev.property = rq.property; 3440 ev.property = property;
3643 } 3441 }
3644#if TODO // TODO 3442#if TODO // TODO
3645 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3646 { 3444 {
3647 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3648 } 3446 }
3649#endif 3447#endif
3650 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3651 { 3449 {
3652 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3653 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3654 ev.property = rq.property; 3452 ev.property = property;
3655 } 3453 }
3656 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) 3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3657 { 3455 {
3658 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3456 XChangeProperty (dpy, rq.requestor, property, rq.target,
3659 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); 3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3660 ev.property = rq.property; 3458 ev.property = property;
3661 } 3459 }
3662 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3663 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3664 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
3665 || rq.target == xa[XA_UTF8_STRING] 3463 || rq.target == xa[XA_UTF8_STRING]
… …
3736 ct.value = (unsigned char *)cl; 3534 ct.value = (unsigned char *)cl;
3737 ct.nitems = selectlen; 3535 ct.nitems = selectlen;
3738 ct.encoding = target; 3536 ct.encoding = target;
3739 } 3537 }
3740 3538
3741 XChangeProperty (dpy, rq.requestor, rq.property, 3539 XChangeProperty (dpy, rq.requestor, property,
3742 ct.encoding, 8, PropModeReplace, 3540 ct.encoding, 8, PropModeReplace,
3743 ct.value, (int)ct.nitems); 3541 ct.value, (int)ct.nitems);
3744 ev.property = rq.property; 3542 ev.property = property;
3745 3543
3746 if (freect) 3544 if (freect)
3747 XFree (ct.value); 3545 XFree (ct.value);
3748 } 3546 }
3749 3547
3750 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3548 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3751} 3549}
3752 3550
3753/* ------------------------------------------------------------------------- */ 3551/* ------------------------------------------------------------------------- */
3754#ifdef USE_XIM 3552#if USE_XIM
3755void 3553void ecb_cold
3756rxvt_term::im_set_position (XPoint &pos) NOTHROW 3554rxvt_term::im_set_position (XPoint &pos) NOTHROW
3757{ 3555{
3758 XWindowAttributes xwa; 3556 XWindowAttributes xwa;
3759 3557
3760 XGetWindowAttributes (dpy, vt, &xwa); 3558 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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