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.327 by root, Wed Nov 5 14:43:54 2008 UTC vs.
Revision 1.426 by sf-exg, Tue Oct 2 10:29:12 2012 UTC

1/*---------------------------------------------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <inttypes.h> 31#include <inttypes.h>
32 32
33#include "salloc.C" // HACK, should be a seperate compile! 33static inline void
34
35static inline void fill_text (text_t *start, text_t value, int len) 34fill_text (text_t *start, text_t value, int len)
36{ 35{
37 while (len--) 36 while (len--)
38 *start++ = value; 37 *start++ = value;
39} 38}
40 39
41/* ------------------------------------------------------------------------- */ 40/* ------------------------------------------------------------------------- */
42#define PROP_SIZE 256*1024
43#define PASTE_SIZE 32768
44#define TABSIZE 8 /* default tab size */ 41#define TABSIZE 8 /* default tab size */
45 42
46/* ------------------------------------------------------------------------- * 43/* ------------------------------------------------------------------------- *
47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 44 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
48 * ------------------------------------------------------------------------- */ 45 * ------------------------------------------------------------------------- */
… …
99 96
100/* Fill part/all of a line with blanks. */ 97/* Fill part/all of a line with blanks. */
101void 98void
102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW 99rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
103{ 100{
104 if (!l.t) 101 if (!l.valid ())
105 { 102 {
106 lalloc (l); 103 l.alloc ();
107 col = 0; 104 col = 0;
108 width = ncol; 105 width = ncol;
109 } 106 }
110 107
111 l.touch (); 108 l.touch ();
… …
142 while (col > 0 && l.t[col] == NOCHAR) 139 while (col > 0 && l.t[col] == NOCHAR)
143 col--; 140 col--;
144 141
145 rend_t rend = l.r[col] & ~RS_baseattrMask; 142 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); 143 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
144
145 l.touch ();
147 146
148 // found start, nuke 147 // found start, nuke
149 do { 148 do {
150 l.t[col] = ' '; 149 l.t[col] = ' ';
151 l.r[col] = rend; 150 l.r[col] = rend;
… …
156/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
157 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
158 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
159 158
160void 159void
160rxvt_term::scr_alloc () NOTHROW
161{
162 int tsize = sizeof (text_t) * ncol;
163 int rsize = sizeof (rend_t) * ncol;
164
165 // we assume that rend_t size is a sufficient alignment
166 // factor for text_t and line_t values, and we only
167 // need to adjust tsize.
168 tsize = (tsize + sizeof (rend_t) - 1);
169 tsize -= tsize % sizeof (rend_t);
170
171 int all_rows = total_rows + nrow + nrow;
172
173 chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows;
174 chunk = chunk_alloc (chunk_size, 0);
175
176 char *base = (char *)chunk + sizeof (line_t) * all_rows;
177
178 for (int row = 0; row < all_rows; ++row)
179 {
180 line_t &l = ((line_t *)chunk) [row];
181
182 l.t = (text_t *)base; base += tsize;
183 l.r = (rend_t *)base; base += rsize;
184 l.l = -1;
185 l.f = 0;
186 }
187
188 drawn_buf = (line_t *)chunk;
189 swap_buf = drawn_buf + nrow;
190 row_buf = swap_buf + nrow;
191}
192
193void ecb_cold
161rxvt_term::scr_reset () 194rxvt_term::scr_reset ()
162{ 195{
196#if ENABLE_OVERLAY
197 scr_overlay_off ();
198#endif
199
163 view_start = 0; 200 view_start = 0;
164 num_scr = 0; 201 num_scr = 0;
165 202
166 if (ncol == 0) 203 if (ncol == 0)
167 ncol = 80; 204 ncol = 80;
… …
187 total_rows = nrow + saveLines; 224 total_rows = nrow + saveLines;
188 225
189 screen.tscroll = 0; 226 screen.tscroll = 0;
190 screen.bscroll = nrow - 1; 227 screen.bscroll = nrow - 1;
191 228
229 void *prev_chunk = chunk;
230 size_t prev_chunk_size = chunk_size;
231 line_t *prev_drawn_buf = drawn_buf;
232 line_t *prev_swap_buf = swap_buf;
233 line_t *prev_row_buf = row_buf;
234
235 int common_col = min (prev_ncol, ncol);
236
237 scr_alloc ();
238
192 if (!row_buf) 239 if (!prev_row_buf)
193 { 240 {
194 /* 241 /*
195 * first time called so just malloc everything: don't rely on realloc 242 * first time called (or after scr_release) so just malloc everything: don't rely on realloc
196 */ 243 */
197 top_row = 0; 244 top_row = 0;
198 term_start = 0; 245 term_start = 0;
199
200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
202
203 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206
207 for (int row = nrow; row--; )
208 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
211 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
212 }
213 246
214 memset (charsets, 'B', sizeof (charsets)); 247 memset (charsets, 'B', sizeof (charsets));
215 rstyle = DEFAULT_RSTYLE; 248 rstyle = DEFAULT_RSTYLE;
216 screen.flags = Screen_DefaultFlags; 249 screen.flags = Screen_DefaultFlags;
217 screen.cur.row = screen.cur.col = 0; 250 screen.cur.row = screen.cur.col = 0;
… …
231 selection.text = NULL; 264 selection.text = NULL;
232 selection.len = 0; 265 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 266 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 267 selection.screen = PRIMARY;
235 selection.clicks = 0; 268 selection.clicks = 0;
269 selection.clip_text = NULL;
270 selection.clip_len = 0;
236 } 271 }
237 else 272 else
238 { 273 {
239 /* 274 /*
240 * add or delete rows as appropriate 275 * add or delete rows as appropriate
241 */ 276 */
242 277
243 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
244 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
245
246#if 0
247 if (nrow < prev_nrow)
248 {
249 for (int row = nrow; row < prev_nrow; row++)
250 {
251 lfree (swap_buf [row]);
252 lfree (drawn_buf[row]);
253 }
254 }
255#endif
256
257 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
258 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
259
260 for (int row = min (nrow, prev_nrow); row--; ) 278 for (int row = min (nrow, prev_nrow); row--; )
261 { 279 {
262 lresize (drawn_buf[row]); 280 scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
263 lresize (swap_buf [row]); 281 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
264 }
265 282
266 for (int row = prev_nrow; row < nrow; row++) 283 memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col);
284 memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col);
285 memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col);
286 memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col);
267 { 287 }
268 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
270 }
271
272 line_t *old_buf = row_buf;
273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
274 288
275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 289 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
276 int pend = MOD (term_start + top_row , prev_total_rows); 290 int pend = MOD (term_start + top_row , prev_total_rows);
277 int q = total_rows; // rewrapped row 291 int q = total_rows; // rewrapped row
278 292
… …
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 300 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 301
288 do 302 do
289 { 303 {
290 p = MOD (p - 1, prev_total_rows); 304 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 305 assert (prev_row_buf [MOD (p, prev_total_rows)].t);
293#endif
294 int plines = 1; 306 int plines = 1;
295 int llen = old_buf [MOD (p, prev_total_rows)].l; 307 int llen = prev_row_buf [MOD (p, prev_total_rows)].l;
296 308
297 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 309 while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ())
298 { 310 {
299 p = MOD (p - 1, prev_total_rows); 311 p = MOD (p - 1, prev_total_rows);
300 312
301 plines++; 313 plines++;
302 llen += prev_ncol; 314 llen += prev_ncol;
… …
315 327
316 // re-assemble the full line by destination lines 328 // re-assemble the full line by destination lines
317 for (int qrow = q; qlines--; qrow++) 329 for (int qrow = q; qlines--; qrow++)
318 { 330 {
319 qline = row_buf + qrow; 331 qline = row_buf + qrow;
320 lalloc (*qline); 332 qline->alloc (); // redundant with next line
321 qline->l = ncol; 333 qline->l = ncol;
322 qline->is_longer (1); 334 qline->is_longer (1);
323 335
324 int qcol = 0; 336 int qcol = 0;
325 337
… …
340 // this seems to upset applications/shells/readline 352 // this seems to upset applications/shells/readline
341 // least. 353 // least.
342 if (prow == ocur.row) 354 if (prow == ocur.row)
343 screen.cur.row = q - (total_rows - nrow); 355 screen.cur.row = q - (total_rows - nrow);
344 356
345 line_t &pline = old_buf [prow]; 357 line_t &pline = prev_row_buf [prow];
346 358
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 359 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 360
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 361 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 362 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
… …
371 { 383 {
372 // if no scrollback exists (yet), wing, instead of wrap 384 // if no scrollback exists (yet), wing, instead of wrap
373 385
374 for (int row = min (nrow, prev_nrow); row--; ) 386 for (int row = min (nrow, prev_nrow); row--; )
375 { 387 {
376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 388 line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)];
377 line_t &qline = row_buf [row]; 389 line_t &dst = row_buf [row];
378 390
379 qline = pline; 391 scr_blank_screen_mem (dst, DEFAULT_RSTYLE);
380 lresize (qline); 392
393 memcpy (dst.t, src.t, sizeof (text_t) * common_col);
394 memcpy (dst.r, src.r, sizeof (rend_t) * common_col);
381 } 395 }
382 396
383 for (int row = prev_nrow; row < nrow; row++) 397 for (int row = prev_nrow; row < nrow; row++)
384 {
385 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); 398 scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
386 }
387 399
388 term_start = 0; 400 term_start = 0;
389 } 401 }
390
391 free (old_buf);
392 delete old_ta;
393 delete old_ra;
394 402
395 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
396 clamp_it (screen.cur.col, 0, ncol - 1); 404 clamp_it (screen.cur.col, 0, ncol - 1);
397 } 405 }
398 406
407 for (int row = nrow; row--; )
408 {
409 if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
410 if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
411 if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE);
412 }
413
414 chunk_free (prev_chunk, prev_chunk_size);
415
399 free (tabs); 416 free (tabs);
400 tabs = (char *)rxvt_malloc (ncol); 417 tabs = (char *)rxvt_malloc (ncol);
401 418
402 for (int col = ncol; --col; ) 419 for (int col = ncol; col--; )
403 tabs [col] = col % TABSIZE == 0; 420 tabs [col] = col % TABSIZE == 0;
404 421
405 CLEAR_ALL_SELECTION (); 422 CLEAR_ALL_SELECTION ();
406 423
407 prev_nrow = nrow; 424 prev_nrow = nrow;
… …
410 tt_winch (); 427 tt_winch ();
411 428
412 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 429 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
413} 430}
414 431
415/* ------------------------------------------------------------------------- */ 432void ecb_cold
416/*
417 * Free everything. That way malloc debugging can find leakage.
418 */
419void
420rxvt_term::scr_release () NOTHROW 433rxvt_term::scr_release () NOTHROW
421{ 434{
422 if (row_buf) 435 chunk_free (chunk, chunk_size);
423 { 436 chunk = 0;
424 delete talloc; talloc = 0; 437 row_buf = 0;
425 delete ralloc; ralloc = 0;
426 438
427 free (row_buf);
428 free (swap_buf);
429 free (drawn_buf);
430 row_buf = 0; // signal that we freed all the arrays above
431
432 free (tabs); 439 free (tabs);
433 tabs = 0; 440 tabs = 0;
434 }
435} 441}
436 442
437/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
438/* 444/*
439 * Hard/Soft reset 445 * Hard/Soft reset
440 */ 446 */
441void 447void ecb_cold
442rxvt_term::scr_poweron () 448rxvt_term::scr_poweron ()
443{ 449{
444 scr_release (); 450 scr_release ();
451
445 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false; 453 rvideo_mode = false;
447 scr_soft_reset (); 454 scr_soft_reset ();
448 scr_reset (); 455 scr_reset ();
449 456
450 scr_clear (true); 457 scr_clear (true);
451 scr_refresh (); 458 scr_refresh ();
452} 459}
453 460
454void 461void ecb_cold
455rxvt_term::scr_soft_reset () 462rxvt_term::scr_soft_reset () NOTHROW
456{ 463{
457 /* only affects modes, nothing drastic such as clearing the screen */ 464 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY 465#if ENABLE_OVERLAY
459 scr_overlay_off (); 466 scr_overlay_off ();
460#endif 467#endif
… …
510 } 517 }
511 518
512 /* boundary check in case screen size changed between SAVE and RESTORE */ 519 /* boundary check in case screen size changed between SAVE and RESTORE */
513 min_it (s->cur.row, nrow - 1); 520 min_it (s->cur.row, nrow - 1);
514 min_it (s->cur.col, ncol - 1); 521 min_it (s->cur.col, ncol - 1);
515#ifdef DEBUG_STRICT
516 assert (s->cur.row >= 0); 522 assert (s->cur.row >= 0);
517 assert (s->cur.col >= 0); 523 assert (s->cur.col >= 0);
518#endif
519} 524}
520 525
521void 526void
522rxvt_term::scr_swap_screen () 527rxvt_term::scr_swap_screen () NOTHROW
523{ 528{
524 if (!option (Opt_secondaryScreen)) 529 if (!option (Opt_secondaryScreen))
525 return; 530 return;
526 531
527 for (int i = prev_nrow; i--; ) 532 for (int i = prev_nrow; i--; )
… …
546 return; 551 return;
547 552
548 want_refresh = 1; 553 want_refresh = 1;
549 view_start = 0; 554 view_start = 0;
550 555
551 selection_check (2); /* check for boundary cross */ 556 /* check for boundary cross */
557 row_col_t pos;
558 pos.row = pos.col = 0;
559 if (ROWCOL_IS_BEFORE (selection.beg, pos)
560 && ROWCOL_IS_AFTER (selection.end, pos))
561 CLEAR_SELECTION ();
552 562
553 int i = current_screen; current_screen = scrn; scrn = i; 563 current_screen = scrn;
554 564
555#if NSCREENS 565#if NSCREENS
556 if (option (Opt_secondaryScreen)) 566 if (option (Opt_secondaryScreen))
557 { 567 {
558 num_scr = 0; 568 num_scr = 0;
… …
622/* 632/*
623 * Scroll text between <row1> and <row2> inclusive, by <count> lines 633 * Scroll text between <row1> and <row2> inclusive, by <count> lines
624 * count positive ==> scroll up 634 * count positive ==> scroll up
625 * count negative ==> scroll down 635 * count negative ==> scroll down
626 */ 636 */
627int 637int ecb_hot
628rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW 638rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
629{ 639{
630 if (count == 0 || (row1 > row2)) 640 if (count == 0 || (row1 > row2))
631 return 0; 641 return 0;
632 642
… …
635 645
636 if (count > 0 646 if (count > 0
637 && row1 == 0 647 && row1 == 0
638 && (current_screen == PRIMARY || option (Opt_secondaryScroll))) 648 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
639 { 649 {
650 min_it (count, total_rows - (nrow - (row2 + 1)));
651
640 top_row = max (top_row - count, -saveLines); 652 top_row = max (top_row - count, -saveLines);
641
642 // scroll everything up 'count' lines
643 term_start = (term_start + count) % total_rows;
644 653
645 // sever bottommost line 654 // sever bottommost line
646 { 655 {
647 line_t &l = ROW(row2 - count); 656 line_t &l = ROW(row2);
648 l.is_longer (0); 657 l.is_longer (0);
649 l.touch (); 658 l.touch ();
650 } 659 }
651 660
661 // scroll everything up 'count' lines
662 term_start = (term_start + count) % total_rows;
663
664 // now copy lines below the scroll region bottom to the
665 // bottom of the screen again, so they look as if they
666 // hadn't moved.
667 for (int i = nrow; --i > row2; )
668 {
669 line_t &l1 = ROW(i - count);
670 line_t &l2 = ROW(i);
671
672 ::swap (l1, l2);
673 l2.touch ();
674 }
675
652 // erase newly scrolled-in lines 676 // erase newly scrolled-in lines
653 for (int i = count; i--; ) 677 for (int i = count; i--; )
654 { 678 {
655 line_t &l = ROW(nrow - 1 - i); 679 line_t &l = ROW(row2 - i);
656 680
657 // optimize if already cleared, can be significant on slow machines 681 // optimise if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem 682 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) 683 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 { 684 {
661 scr_blank_line (l, 0, l.l, rstyle); 685 scr_blank_line (l, 0, l.l, rstyle);
662 l.l = 0; 686 l.l = 0;
… …
664 } 688 }
665 else 689 else
666 scr_blank_screen_mem (l, rstyle); 690 scr_blank_screen_mem (l, rstyle);
667 } 691 }
668 692
669 // now copy lines below the scroll region bottom to the
670 // bottom of the screen again, so they look as if they
671 // hadn't moved.
672 for (int i = nrow; --i > row2; )
673 {
674 line_t &l1 = ROW(i - count);
675 line_t &l2 = ROW(i);
676
677 ::swap (l1, l2);
678 l2.touch ();
679 }
680
681 // move and/or clear selection, if any 693 // move and/or clear selection, if any
682 if (selection.op && current_screen == selection.screen) 694 if (selection.op && current_screen == selection.screen
695 && selection.beg.row <= row2)
683 { 696 {
684 selection.beg.row -= count; 697 selection.beg.row -= count;
685 selection.end.row -= count; 698 selection.end.row -= count;
686 selection.mark.row -= count; 699 selection.mark.row -= count;
687 700
688 if (selection.beg.row < top_row 701 selection_check (0);
689 || selection.end.row < top_row
690 || selection.mark.row < top_row)
691 {
692 CLEAR_ALL_SELECTION ();
693 selection.op = SELECTION_CLEAR;
694 }
695 } 702 }
696 703
697 // finally move the view window, if desired 704 // finally move the view window, if desired
698 if (option (Opt_scrollWithBuffer) 705 if (option (Opt_scrollWithBuffer)
699 && view_start != 0 706 && view_start != 0
… …
729 } 736 }
730 737
731 // use a simple and robust scrolling algorithm, this 738 // use a simple and robust scrolling algorithm, this
732 // part of scr_scroll_text is not time-critical. 739 // part of scr_scroll_text is not time-critical.
733 740
741 // sever line above scroll region
742 if (row1)
743 {
744 line_t &l = ROW(row1 - 1);
745 l.is_longer (0);
746 l.touch ();
747 }
748
734 int rows = row2 - row1 + 1; 749 int rows = row2 - row1 + 1;
735 750
736 min_it (count, rows); 751 min_it (count, rows);
737 752
738 line_t *temp_buf = row_buf + total_rows; 753 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
739 754
740 for (int row = 0; row < rows; row++) 755 for (int row = 0; row < rows; row++)
741 { 756 {
742 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 757 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
743 758
… …
745 scr_blank_screen_mem (temp_buf [row], rstyle); 760 scr_blank_screen_mem (temp_buf [row], rstyle);
746 } 761 }
747 762
748 for (int row = 0; row < rows; row++) 763 for (int row = 0; row < rows; row++)
749 ROW(row1 + row) = temp_buf [row]; 764 ROW(row1 + row) = temp_buf [row];
765
766 // sever bottommost line
767 {
768 line_t &l = ROW(row2);
769 l.is_longer (0);
770 l.touch ();
771 }
750 } 772 }
751 773
752 return count; 774 return count;
753} 775}
754 776
755/* ------------------------------------------------------------------------- */ 777/* ------------------------------------------------------------------------- */
756/* 778/*
757 * Add text given in <str> of length <len> to screen struct 779 * Add text given in <str> of length <len> to screen struct
758 */ 780 */
759void 781void ecb_hot
760rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW 782rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
761{ 783{
762 if (len <= 0) /* sanity */ 784 if (len <= 0) /* sanity */
763 return; 785 return;
764 786
765 unsigned char checksel; 787 bool checksel;
766 unicode_t c; 788 unicode_t c;
767 int ncol = this->ncol; 789 int ncol = this->ncol;
768 const wchar_t *strend = str + len; 790 const wchar_t *strend = str + len;
769 791
770 want_refresh = 1; 792 want_refresh = 1;
… …
783 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 805 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
784 screen.cur.row -= minlines; 806 screen.cur.row -= minlines;
785 } 807 }
786 } 808 }
787 809
788#ifdef DEBUG_STRICT
789 assert (screen.cur.col < ncol); 810 assert (screen.cur.col < ncol);
790 assert (screen.cur.row < nrow 811 assert (screen.cur.row < nrow
791 && screen.cur.row >= top_row); 812 && screen.cur.row >= top_row);
792#endif
793 int row = screen.cur.row; 813 int row = screen.cur.row;
794 814
795 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 815 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
796 816
797 line_t *line = &ROW(row); 817 line_t *line = &ROW(row);
798 818
799 while (str < strend) 819 while (str < strend)
800 { 820 {
801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 821 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
802 822
803 if (expect_false (c < 0x20)) 823 if (ecb_unlikely (c < 0x20))
804 if (c == C0_LF) 824 if (c == C0_LF)
805 { 825 {
806 max_it (line->l, screen.cur.col); 826 max_it (line->l, screen.cur.col);
807 827
808 screen.flags &= ~Screen_WrapNext; 828 screen.flags &= ~Screen_WrapNext;
… …
827 { 847 {
828 scr_tab (1, true); 848 scr_tab (1, true);
829 continue; 849 continue;
830 } 850 }
831 851
832 if (expect_false ( 852 if (ecb_unlikely (
833 checksel /* see if we're writing within selection */ 853 checksel /* see if we're writing within selection */
834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 854 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
835 && ROWCOL_IS_BEFORE (screen.cur, selection.end) 855 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 )) 856 ))
837 { 857 {
… …
842 * should be a similar check. 862 * should be a similar check.
843 */ 863 */
844 CLEAR_SELECTION (); 864 CLEAR_SELECTION ();
845 } 865 }
846 866
847 if (expect_false (screen.flags & Screen_WrapNext)) 867 if (ecb_unlikely (screen.flags & Screen_WrapNext))
848 { 868 {
849 scr_do_wrap (); 869 scr_do_wrap ();
850 870
851 line->l = ncol; 871 line->l = ncol;
852 line->is_longer (1); 872 line->is_longer (1);
… …
854 row = screen.cur.row; 874 row = screen.cur.row;
855 line = &ROW(row); /* _must_ refresh */ 875 line = &ROW(row); /* _must_ refresh */
856 } 876 }
857 877
858 // some utf-8 decoders "decode" surrogate characters: let's fix this. 878 // some utf-8 decoders "decode" surrogate characters: let's fix this.
859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) 879 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
860 c = 0xfffd; 880 c = 0xfffd;
861 881
862 // rely on wcwidth to tell us the character width, do wcwidth before 882 // rely on wcwidth to tell us the character width, do wcwidth before
863 // further replacements, as wcwidth might return -1 for the line 883 // further replacements, as wcwidth might return -1 for the line
864 // drawing characters below as they might be invalid in the current 884 // drawing characters below as they might be invalid in the current
865 // locale. 885 // locale.
866 int width = WCWIDTH (c); 886 int width = WCWIDTH (c);
867 887
868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL 888 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
869 { 889 {
870 // vt100 special graphics and line drawing 890 // vt100 special graphics and line drawing
871 // 5f-7e standard vt100 891 // 5f-7e standard vt100
872 // 40-5e rxvt extension for extra curses acs chars 892 // 40-5e rxvt extension for extra curses acs chars
873 static uint16_t vt100_0[62] = { // 41 .. 7e 893 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
886 c = vt100_0[c - 0x41]; 906 c = vt100_0[c - 0x41];
887 width = 1; // vt100 line drawing characters are always single-width 907 width = 1; // vt100 line drawing characters are always single-width
888 } 908 }
889 } 909 }
890 910
891 if (expect_false (screen.flags & Screen_Insert)) 911 if (ecb_unlikely (screen.flags & Screen_Insert))
892 scr_insdel_chars (width, INSERT); 912 scr_insdel_chars (width, INSERT);
893 913
894 if (width != 0) 914 if (width != 0)
895 { 915 {
896#if !UNICODE_3 916#if !UNICODE_3
… …
901# else 921# else
902 c = 0xfffd; 922 c = 0xfffd;
903# endif 923# endif
904#endif 924#endif
905 925
926 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
927
928 // if the character doesn't fit into the remaining columns...
929 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
930 {
931 if (screen.flags & Screen_Autowrap)
932 {
933 // ... artificially enlargen the previous one
934 c = NOCHAR;
935 // and try the same character next loop iteration
936 --str;
937 }
938 else
939 screen.cur.col = ncol - width;
940 }
941
906 // nuke the character at this position, if required 942 // nuke the character at this position, if required
907 if (expect_false ( 943 // due to wonderful coincidences everywhere else in this loop
944 // we never have to check for overwriting a wide char itself,
945 // only its tail.
908 line->t[screen.cur.col] == NOCHAR 946 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
909 || (screen.cur.col < ncol - 1
910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col); 947 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
918 {
919 // ... artificially enlargen the previous one
920 c = NOCHAR;
921 // and try the same character next loop iteration
922 --str;
923 }
924 948
925 line->touch (); 949 line->touch ();
926 950
927 do 951 do
928 { 952 {
929 line->t[screen.cur.col] = c; 953 line->t[screen.cur.col] = c;
930 line->r[screen.cur.col] = rend; 954 line->r[screen.cur.col] = rend;
931 955
932 if (expect_true (screen.cur.col < ncol - 1)) 956 if (ecb_likely (screen.cur.col < ncol - 1))
933 screen.cur.col++; 957 screen.cur.col++;
934 else 958 else
935 { 959 {
936 line->l = ncol; 960 line->l = ncol;
937 if (screen.flags & Screen_Autowrap) 961 if (screen.flags & Screen_Autowrap)
938 screen.flags |= Screen_WrapNext; 962 screen.flags |= Screen_WrapNext;
939 break; 963
964 goto end_of_line;
940 } 965 }
941 966
942 c = NOCHAR; 967 c = NOCHAR;
943 } 968 }
944 while (expect_false (--width > 0)); 969 while (ecb_unlikely (--width > 0));
945 970
946 // pad with spaces when overwriting wide character with smaller one 971 // pad with spaces when overwriting wide character with smaller one
947 if (expect_false (!width)) 972 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
948 { 973 {
949 line->touch ();
950
951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
952 {
953 line->t[c] = ' '; 974 line->t[c] = ' ';
954 line->r[c] = rend; 975 line->r[c] = rend;
955 }
956 } 976 }
977
978end_of_line:
979 ;
957 } 980 }
958#if ENABLE_COMBINING 981#if ENABLE_COMBINING
959 else // width == 0 982 else // width == 0
960 { 983 {
961 if (c != 0xfeff) // ignore BOM 984 if (c != 0xfeff) // ignore BOM
… …
1001#endif 1024#endif
1002 } 1025 }
1003 1026
1004 max_it (line->l, screen.cur.col); 1027 max_it (line->l, screen.cur.col);
1005 1028
1006#ifdef DEBUG_STRICT
1007 assert (screen.cur.row >= 0); 1029 assert (screen.cur.row >= 0);
1008#endif
1009} 1030}
1010 1031
1011/* ------------------------------------------------------------------------- */ 1032/* ------------------------------------------------------------------------- */
1012/* 1033/*
1013 * Process Backspace. Move back the cursor back a position, wrap if have to 1034 * Process Backspace. Move back the cursor back a position, wrap if have to
… …
1026 1047
1027 want_refresh = 1; 1048 want_refresh = 1;
1028#endif 1049#endif
1029 } 1050 }
1030 } 1051 }
1052 else if (screen.flags & Screen_WrapNext)
1053 screen.flags &= ~Screen_WrapNext;
1031 else 1054 else
1032 scr_gotorc (0, -1, RELATIVE); 1055 scr_gotorc (0, -1, RELATIVE);
1033} 1056}
1034 1057
1035/* ------------------------------------------------------------------------- */ 1058/* ------------------------------------------------------------------------- */
… …
1113 * XTERM_SEQ: ESC 6 1136 * XTERM_SEQ: ESC 6
1114 * Move cursor left in row. If we're at the left boundary, shift everything 1137 * Move cursor left in row. If we're at the left boundary, shift everything
1115 * in that row right. Clear left column. 1138 * in that row right. Clear left column.
1116 */ 1139 */
1117#if !ENABLE_MINIMAL 1140#if !ENABLE_MINIMAL
1118void 1141void ecb_cold
1119rxvt_term::scr_backindex () NOTHROW 1142rxvt_term::scr_backindex () NOTHROW
1120{ 1143{
1121 if (screen.cur.col > 0) 1144 if (screen.cur.col > 0)
1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1145 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1123 else 1146 else
… …
1130 * XTERM_SEQ: ESC 9 1153 * XTERM_SEQ: ESC 9
1131 * Move cursor right in row. If we're at the right boundary, shift everything 1154 * Move cursor right in row. If we're at the right boundary, shift everything
1132 * in that row left. Clear right column. 1155 * in that row left. Clear right column.
1133 */ 1156 */
1134#if !ENABLE_MINIMAL 1157#if !ENABLE_MINIMAL
1135void 1158void ecb_cold
1136rxvt_term::scr_forwardindex () NOTHROW 1159rxvt_term::scr_forwardindex () NOTHROW
1137{ 1160{
1138 if (screen.cur.col < ncol - 1) 1161 if (screen.cur.col < ncol - 1)
1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1162 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1140 else 1163 else
… …
1291 scr_blank_line (line, col, num, rstyle); 1314 scr_blank_line (line, col, num, rstyle);
1292} 1315}
1293 1316
1294/* ------------------------------------------------------------------------- */ 1317/* ------------------------------------------------------------------------- */
1295/* 1318/*
1296 * Erase part of whole of the screen 1319 * Erase part or whole of the screen
1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1320 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1321 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1322 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1300 */ 1323 */
1301void 1324void
… …
1310 ZERO_SCROLLBACK (); 1333 ZERO_SCROLLBACK ();
1311 1334
1312 switch (mode) 1335 switch (mode)
1313 { 1336 {
1314 case 0: /* erase to end of screen */ 1337 case 0: /* erase to end of screen */
1315 selection_check (1);
1316 scr_erase_line (0); 1338 scr_erase_line (0);
1317 row = screen.cur.row + 1; /* possible OOB */ 1339 row = screen.cur.row + 1; /* possible OOB */
1318 num = nrow - row; 1340 num = nrow - row;
1319 break; 1341 break;
1320 case 1: /* erase to beginning of screen */ 1342 case 1: /* erase to beginning of screen */
1321 selection_check (3);
1322 scr_erase_line (1); 1343 scr_erase_line (1);
1323 row = 0; 1344 row = 0;
1324 num = screen.cur.row; 1345 num = screen.cur.row;
1325 break; 1346 break;
1326 case 2: /* erase whole screen */ 1347 case 2: /* erase whole screen */
1327 selection_check (3);
1328 row = 0; 1348 row = 0;
1329 num = nrow; 1349 num = nrow;
1330 break; 1350 break;
1331 default: 1351 default:
1332 return; 1352 return;
… …
1341 if (row >= nrow) /* Out Of Bounds */ 1361 if (row >= nrow) /* Out Of Bounds */
1342 return; 1362 return;
1343 1363
1344 min_it (num, nrow - row); 1364 min_it (num, nrow - row);
1345 1365
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1349 if (rstyle & (RS_RVid | RS_Uline)) 1366 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1350 ren = (rend_t) ~RS_None; 1367 ren = (rend_t) ~RS_None;
1351 else if (GET_BASEBG (rstyle) == Color_bg) 1368 else if (GET_BASEBG (rstyle) == Color_bg)
1352 { 1369 {
1353 ren = DEFAULT_RSTYLE; 1370 ren = DEFAULT_RSTYLE;
1354 1371
1355 if (mapped && !view_start) 1372 if (mapped)
1356 XClearArea (dpy, vt, 0, 1373 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width, 1374 Row2Pixel (row - view_start), (unsigned int)vt_width,
1358 (unsigned int)Height2Pixel (num), False); 1375 (unsigned int)Height2Pixel (num), False);
1359 } 1376 }
1360 else 1377 else
1361 { 1378 {
1362 ren = rstyle & (RS_fgMask | RS_bgMask); 1379 ren = rstyle & (RS_fgMask | RS_bgMask);
1363 1380
1364 if (mapped && !view_start) 1381 if (mapped)
1365 { 1382 {
1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1383 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1367 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1384 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1368 XFillRectangle (dpy, vt, gc, 1385 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start), 1386 0, Row2Pixel (row - view_start),
1370 (unsigned int)width, 1387 (unsigned int)vt_width,
1371 (unsigned int)Height2Pixel (num)); 1388 (unsigned int)Height2Pixel (num));
1372 gcvalue.foreground = pix_colors[Color_fg]; 1389 gcvalue.foreground = pix_colors[Color_fg];
1373 XChangeGC (dpy, gc, GCForeground, &gcvalue); 1390 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 } 1391 }
1375 } 1392 }
1376 1393
1377 for (; num--; row++) 1394 for (; num--; row++)
1378 { 1395 {
1379 scr_blank_screen_mem (ROW(row), rstyle); 1396 scr_blank_screen_mem (ROW(row), rstyle);
1380 1397
1381 if (!view_start) 1398 if (row - view_start < nrow)
1382 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1399 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1383 } 1400 }
1384} 1401}
1385 1402
1386#if !ENABLE_MINIMAL 1403#if !ENABLE_MINIMAL
1387void 1404void
… …
1397/* ------------------------------------------------------------------------- */ 1414/* ------------------------------------------------------------------------- */
1398/* 1415/*
1399 * Fill the screen with `E's 1416 * Fill the screen with `E's
1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1417 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1401 */ 1418 */
1402void 1419void ecb_cold
1403rxvt_term::scr_E () NOTHROW 1420rxvt_term::scr_E () NOTHROW
1404{ 1421{
1405 rend_t fs; 1422 rend_t fs;
1406 1423
1407 want_refresh = 1; 1424 want_refresh = 1;
1408 ZERO_SCROLLBACK (); 1425 ZERO_SCROLLBACK ();
1409 1426
1410 num_scr_allow = 0; 1427 num_scr_allow = 0;
1411 selection_check (3); 1428
1429 row_col_t pos;
1430 pos.row = pos.col = 0;
1431 if (ROWCOL_IS_AFTER (selection.end, pos))
1432 CLEAR_SELECTION ();
1412 1433
1413 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); 1434 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1414 for (int row = nrow; row--; ) 1435 for (int row = nrow; row--; )
1415 { 1436 {
1416 line_t &line = ROW(row); 1437 line_t &line = ROW(row);
… …
1567/* ------------------------------------------------------------------------- */ 1588/* ------------------------------------------------------------------------- */
1568/* 1589/*
1569 * Set the scrolling region 1590 * Set the scrolling region
1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1591 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1571 */ 1592 */
1572void 1593void ecb_cold
1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW 1594rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1574{ 1595{
1575 max_it (top, 0); 1596 max_it (top, 0);
1576 min_it (bot, nrow - 1); 1597 min_it (bot, nrow - 1);
1577 1598
… …
1587/* 1608/*
1588 * Make the cursor visible/invisible 1609 * Make the cursor visible/invisible
1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1610 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1611 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1591 */ 1612 */
1592void 1613void ecb_cold
1593rxvt_term::scr_cursor_visible (int mode) NOTHROW 1614rxvt_term::scr_cursor_visible (int mode) NOTHROW
1594{ 1615{
1595 want_refresh = 1; 1616 want_refresh = 1;
1596 1617
1597 if (mode) 1618 if (mode)
… …
1604/* 1625/*
1605 * Set/unset automatic wrapping 1626 * Set/unset automatic wrapping
1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1627 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1628 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1608 */ 1629 */
1609void 1630void ecb_cold
1610rxvt_term::scr_autowrap (int mode) NOTHROW 1631rxvt_term::scr_autowrap (int mode) NOTHROW
1611{ 1632{
1612 if (mode) 1633 if (mode)
1613 screen.flags |= Screen_Autowrap; 1634 screen.flags |= Screen_Autowrap;
1614 else 1635 else
… …
1623 * Relative mode: line numbers are relative to top margin of scrolling region 1644 * Relative mode: line numbers are relative to top margin of scrolling region
1624 * and the cursor cannot be moved outside. 1645 * and the cursor cannot be moved outside.
1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1646 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1647 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1627 */ 1648 */
1628void 1649void ecb_cold
1629rxvt_term::scr_relative_origin (int mode) NOTHROW 1650rxvt_term::scr_relative_origin (int mode) NOTHROW
1630{ 1651{
1631 if (mode) 1652 if (mode)
1632 screen.flags |= Screen_Relative; 1653 screen.flags |= Screen_Relative;
1633 else 1654 else
… …
1640/* 1661/*
1641 * Set insert/replace mode 1662 * Set insert/replace mode
1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1663 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1664 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1644 */ 1665 */
1645void 1666void ecb_cold
1646rxvt_term::scr_insert_mode (int mode) NOTHROW 1667rxvt_term::scr_insert_mode (int mode) NOTHROW
1647{ 1668{
1648 if (mode) 1669 if (mode)
1649 screen.flags |= Screen_Insert; 1670 screen.flags |= Screen_Insert;
1650 else 1671 else
… …
1656 * Set/Unset tabs 1677 * Set/Unset tabs
1657 * XTERM_SEQ: Set tab at current column : ESC H 1678 * XTERM_SEQ: Set tab at current column : ESC H
1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1679 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1680 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1660 */ 1681 */
1661void 1682void ecb_cold
1662rxvt_term::scr_set_tab (int mode) NOTHROW 1683rxvt_term::scr_set_tab (int mode) NOTHROW
1663{ 1684{
1664 if (mode < 0) 1685 if (mode < 0)
1665 memset (tabs, 0, ncol); 1686 memset (tabs, 0, ncol);
1666 else if (screen.cur.col < ncol) 1687 else if (screen.cur.col < ncol)
… …
1686 { 1707 {
1687 rvideo_state = on; 1708 rvideo_state = on;
1688 1709
1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1710 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1690#ifdef HAVE_BG_PIXMAP 1711#ifdef HAVE_BG_PIXMAP
1691 if (bgPixmap.pixmap == None) 1712 if (bg_img == 0)
1692#endif 1713#endif
1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 1714 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1694 1715
1695 XGCValues gcvalue; 1716 XGCValues gcvalue;
1696 gcvalue.foreground = pix_colors[Color_fg]; 1717 gcvalue.foreground = pix_colors[Color_fg];
… …
1705/* ------------------------------------------------------------------------- */ 1726/* ------------------------------------------------------------------------- */
1706/* 1727/*
1707 * Report current cursor position 1728 * Report current cursor position
1708 * XTERM_SEQ: Report position: ESC [ 6 n 1729 * XTERM_SEQ: Report position: ESC [ 6 n
1709 */ 1730 */
1710void 1731void ecb_cold
1711rxvt_term::scr_report_position () NOTHROW 1732rxvt_term::scr_report_position () NOTHROW
1712{ 1733{
1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1734 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1714} 1735}
1715 1736
… …
1718 * ------------------------------------------------------------------------- */ 1739 * ------------------------------------------------------------------------- */
1719 1740
1720/* 1741/*
1721 * Set font style 1742 * Set font style
1722 */ 1743 */
1723void 1744void ecb_cold
1724rxvt_term::set_font_style () NOTHROW 1745rxvt_term::set_font_style () NOTHROW
1725{ 1746{
1726#if 0 1747#if 0
1727 switch (charsets [screen.charset]) 1748 switch (charsets [screen.charset])
1728 { 1749 {
… …
1750 * XTERM_SEQ: Invoke G0 character set: CTRL-O 1771 * XTERM_SEQ: Invoke G0 character set: CTRL-O
1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1772 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1752 * XTERM_SEQ: Invoke G2 character set: ESC N 1773 * XTERM_SEQ: Invoke G2 character set: ESC N
1753 * XTERM_SEQ: Invoke G3 character set: ESC O 1774 * XTERM_SEQ: Invoke G3 character set: ESC O
1754 */ 1775 */
1755void 1776void ecb_cold
1756rxvt_term::scr_charset_choose (int set) NOTHROW 1777rxvt_term::scr_charset_choose (int set) NOTHROW
1757{ 1778{
1758 screen.charset = set; 1779 screen.charset = set;
1759 set_font_style (); 1780 set_font_style ();
1760} 1781}
… …
1781 * ------------------------------------------------------------------------- */ 1802 * ------------------------------------------------------------------------- */
1782 1803
1783/* 1804/*
1784 * refresh matching text. 1805 * refresh matching text.
1785 */ 1806 */
1786bool 1807bool ecb_cold
1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW 1808rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1788{ 1809{
1789 bool found = false; 1810 bool found = false;
1790 1811
1791 for (int i = 0; i < nrow; i++) 1812 for (int i = 0; i < nrow; i++)
… …
1810 PART_BEG = 0, 1831 PART_BEG = 0,
1811 PART_END, 1832 PART_END,
1812 RC_COUNT 1833 RC_COUNT
1813}; 1834};
1814 1835
1815void 1836void ecb_hot
1816rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW 1837rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1817{ 1838{
1818 int i; 1839 int i;
1819 row_col_t rc[RC_COUNT]; 1840 row_col_t rc[RC_COUNT];
1820 1841
… …
1840 for (i = PART_BEG; i < RC_COUNT; i++) 1861 for (i = PART_BEG; i < RC_COUNT; i++)
1841 { 1862 {
1842 min_it (rc[i].col, ncol - 1); 1863 min_it (rc[i].col, ncol - 1);
1843 min_it (rc[i].row, nrow - 1); 1864 min_it (rc[i].row, nrow - 1);
1844 } 1865 }
1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize 1866
1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1867 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1868 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1848 1869
1849 num_scr_allow = 0; 1870 num_scr_allow = 0;
1850 1871
… …
1857 * Refresh the entire screen 1878 * Refresh the entire screen
1858 */ 1879 */
1859void 1880void
1860rxvt_term::scr_touch (bool refresh) NOTHROW 1881rxvt_term::scr_touch (bool refresh) NOTHROW
1861{ 1882{
1862 scr_expose (0, 0, width, height, refresh); 1883 scr_expose (0, 0, vt_width, vt_height, refresh);
1863} 1884}
1864 1885
1865/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
1866/* 1887/*
1867 * Move the display so that the line represented by scrollbar value Y is at 1888 * Move the display so that the line represented by scrollbar value Y is at
… …
1923 1944
1924# ifndef NO_MAPALERT 1945# ifndef NO_MAPALERT
1925# ifdef MAPALERT_OPTION 1946# ifdef MAPALERT_OPTION
1926 if (option (Opt_mapAlert)) 1947 if (option (Opt_mapAlert))
1927# endif 1948# endif
1928 XMapWindow (dpy, parent[0]); 1949 XMapWindow (dpy, parent);
1929# endif 1950# endif
1930 1951
1931# if ENABLE_FRILLS 1952# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell)) 1953 if (option (Opt_urgentOnBell))
1933 set_urgency (1); 1954 set_urgency (1);
… …
1941 1962
1942 bell_ev.start (VISUAL_BELL_DURATION); 1963 bell_ev.start (VISUAL_BELL_DURATION);
1943 } 1964 }
1944 else 1965 else
1945 XBell (dpy, 0); 1966 XBell (dpy, 0);
1967 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1946#endif 1968#endif
1947} 1969}
1948 1970
1949/* ------------------------------------------------------------------------- */ 1971/* ------------------------------------------------------------------------- */
1950/* ARGSUSED */ 1972void ecb_cold
1951void
1952rxvt_term::scr_printscreen (int fullhist) NOTHROW 1973rxvt_term::scr_printscreen (int fullhist) NOTHROW
1953{ 1974{
1954#ifdef PRINTPIPE 1975#ifdef PRINTPIPE
1955 int nrows, row_start; 1976 int nrows, row_start;
1956 FILE *fd = popen_printer (); 1977 FILE *fd = popen_printer ();
… …
1969 row_start = view_start; 1990 row_start = view_start;
1970 } 1991 }
1971 1992
1972 wctomb (0, 0); 1993 wctomb (0, 0);
1973 1994
1974 for (int r1 = 0; r1 < nrows; r1++) 1995 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1975 { 1996 {
1976 text_t *tp = ROW(r1).t; 1997 text_t *tp = ROW(r1).t;
1977 int len = ROW(r1).l; 1998 int len = ROW(r1).l;
1978 1999
1979 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 2000 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
2005/* 2026/*
2006 * Refresh the screen 2027 * Refresh the screen
2007 * drawn_text/drawn_rend contain the screen information before the update. 2028 * drawn_text/drawn_rend contain the screen information before the update.
2008 * screen.text/screen.rend contain what the screen will change to. 2029 * screen.text/screen.rend contain what the screen will change to.
2009 */ 2030 */
2010void 2031void ecb_hot
2011rxvt_term::scr_refresh () NOTHROW 2032rxvt_term::scr_refresh () NOTHROW
2012{ 2033{
2013 int16_t col, row, /* column/row we're processing */ 2034 int16_t col, row, /* column/row we're processing */
2014 ocrow; /* old cursor row */ 2035 ocrow; /* old cursor row */
2015 int i; /* tmp */ 2036 int i; /* tmp */
… …
2029 * A: set up vars 2050 * A: set up vars
2030 */ 2051 */
2031 refresh_count = 0; 2052 refresh_count = 0;
2032 2053
2033 unsigned int old_screen_flags = screen.flags; 2054 unsigned int old_screen_flags = screen.flags;
2034 char have_bg = 0; 2055 bool have_bg = 0;
2035#ifdef HAVE_BG_PIXMAP 2056#ifdef HAVE_BG_PIXMAP
2036 have_bg = bgPixmap.pixmap != None; 2057 have_bg = bg_img != 0;
2037#endif 2058#endif
2038 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2059 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
2039 2060
2040 /* 2061 /*
2041 * B: reverse any characters which are selected 2062 * B: reverse any characters which are selected
… …
2045 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2066 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2046#if ENABLE_OVERLAY 2067#if ENABLE_OVERLAY
2047 scr_swap_overlay (); 2068 scr_swap_overlay ();
2048#endif 2069#endif
2049 2070
2050 char showcursor = screen.flags & Screen_VisibleCursor; 2071 bool showcursor = screen.flags & Screen_VisibleCursor;
2051 2072
2052 /* 2073 /*
2053 * C: set the cursor character (s) 2074 * C: set the cursor character (s)
2054 */ 2075 */
2055 { 2076 {
2056 unsigned char setoldcursor; 2077 bool setoldcursor;
2057 2078
2058#ifdef CURSOR_BLINK 2079#ifdef CURSOR_BLINK
2059 if (hidden_cursor) 2080 if (hidden_cursor)
2060 showcursor = 0; 2081 showcursor = 0;
2061#endif 2082#endif
… …
2090 ccol2 = bgcolor_of (rstyle); 2111 ccol2 = bgcolor_of (rstyle);
2091#else 2112#else
2092 ccol2 = Color_bg; 2113 ccol2 = Color_bg;
2093#endif 2114#endif
2094 2115
2095 if (showcursor && focus) 2116 if (focus)
2096 { 2117 {
2097 if (option (Opt_cursorUnderline)) 2118 if (option (Opt_cursorUnderline))
2098 *crp ^= RS_Uline; 2119 *crp ^= RS_Uline;
2099 else 2120 else
2100 { 2121 {
… …
2148 { 2169 {
2149 int16_t nits; 2170 int16_t nits;
2150 int i = num_scr; 2171 int i = num_scr;
2151 int j; 2172 int j;
2152 int len, wlen; 2173 int len, wlen;
2153 dLocal (int, num_scr);
2154 2174
2155 j = nrow; 2175 j = nrow;
2156 wlen = len = -1; 2176 wlen = len = -1;
2157 row = i > 0 ? 0 : j - 1; 2177 row = i > 0 ? 0 : j - 1;
2158 2178
… …
2233 continue; 2253 continue;
2234 2254
2235 // redraw one or more characters 2255 // redraw one or more characters
2236 2256
2237 // seek to the beginning of wide characters 2257 // seek to the beginning of wide characters
2238 while (expect_false (stp[col] == NOCHAR && col > 0)) 2258 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2239 --col; 2259 --col;
2240 2260
2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2261 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2242 text_t *text = stp + col; 2262 text_t *text = stp + col;
2243 int count = 1; 2263 int count = 1;
2244 2264
2245 dtp[col] = stp[col]; 2265 dtp[col] = stp[col];
2246 drp[col] = rend; 2266 drp[col] = rend;
… …
2250 for (i = 0; ++col < ncol; ) 2270 for (i = 0; ++col < ncol; )
2251 { 2271 {
2252 if (stp[col] == NOCHAR) 2272 if (stp[col] == NOCHAR)
2253 { 2273 {
2254 dtp[col] = stp[col]; 2274 dtp[col] = stp[col];
2255 drp[col] = rend; 2275 drp[col] = srp[col];
2276
2256 count++; 2277 count++;
2257 i++; 2278 i++;
2258 2279
2259 continue; 2280 continue;
2260 } 2281 }
… …
2280 2301
2281 col--; /* went one too far. move back */ 2302 col--; /* went one too far. move back */
2282 count -= i; /* dump any matching trailing chars */ 2303 count -= i; /* dump any matching trailing chars */
2283 2304
2284 // sometimes we optimize away the trailing NOCHAR's, add them back 2305 // sometimes we optimize away the trailing NOCHAR's, add them back
2285 while (expect_false (i && text[count] == NOCHAR)) 2306 while (ecb_unlikely (i && text[count] == NOCHAR))
2286 count++, i--; 2307 count++, i--;
2287 2308
2288 /* 2309 /*
2289 * Determine the attributes for the string 2310 * Determine the attributes for the string
2290 */ 2311 */
2291 int fore = fgcolor_of (rend); // desired foreground 2312 int fore = fgcolor_of (rend); // desired foreground
2292 int back = bgcolor_of (rend); // desired background 2313 int back = bgcolor_of (rend); // desired background
2293 2314
2294 // only do special processing if any attributes are set, which is unlikely 2315 // only do special processing if any attributes are set, which is unlikely
2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) 2316 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2296 { 2317 {
2297 bool invert = rend & RS_RVid; 2318 bool invert = rend & RS_RVid;
2298 2319
2299#ifndef NO_BOLD_UNDERLINE_REVERSE 2320#ifndef NO_BOLD_UNDERLINE_REVERSE
2300 if (rend & RS_Bold && fore == Color_fg) 2321 if (rend & RS_Bold && fore == Color_fg)
… …
2319 2340
2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) 2341 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2321 fore = Color_UL; 2342 fore = Color_UL;
2322#endif 2343#endif
2323 2344
2345#ifdef OPTION_HC
2346 if (rend & RS_Sel)
2347 {
2348 /* invert the column if no highlightColor is set or it is the
2349 * current cursor column */
2350 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2351 && ISSET_PIXCOLOR (Color_HC))
2352 {
2353 if (ISSET_PIXCOLOR (Color_HTC))
2354 fore = Color_HTC;
2355 // if invert is 0 reverse video is set so we use bg color as fg color
2356 else if (!invert)
2357 fore = back;
2358
2359 back = Color_HC;
2360 invert = 0;
2361 }
2362 }
2363#endif
2364
2324 if (invert) 2365 if (invert)
2325 { 2366 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 ::swap (fore, back); 2367 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2337 2368
2338#ifndef NO_BOLD_UNDERLINE_REVERSE 2369#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2340 if (ISSET_PIXCOLOR (Color_RV))
2341 back = Color_RV;
2342# endif
2343 if (fore == back) 2370 if (fore == back)
2344 { 2371 {
2345 fore = Color_bg; 2372 fore = Color_bg;
2346 back = Color_fg; 2373 back = Color_fg;
2347 } 2374 }
… …
2383 /* 2410 /*
2384 * Actually do the drawing of the string here 2411 * Actually do the drawing of the string here
2385 */ 2412 */
2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2413 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2387 2414
2388 if (expect_true (have_bg && back == Color_bg)) 2415 if (ecb_likely (have_bg && back == Color_bg))
2389 { 2416 {
2390 // this is very ugly, maybe push it into ->draw? 2417 // this is very ugly, maybe push it into ->draw?
2391 2418
2392 for (i = 0; i < count; i++) /* don't draw empty strings */ 2419 for (i = 0; i < count; i++) /* don't draw empty strings */
2393 if (text[i] != ' ') 2420 if (text[i] != ' ')
… …
2400 did_clear: ; 2427 did_clear: ;
2401 } 2428 }
2402 else 2429 else
2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2430 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2404 2431
2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) 2432 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2406 { 2433 {
2407#if ENABLE_FRILLS 2434#if ENABLE_FRILLS
2408 if (ISSET_PIXCOLOR (Color_underline)) 2435 if (ISSET_PIXCOLOR (Color_underline))
2409 XSetForeground (dpy, gc, pix_colors[Color_underline]); 2436 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2410 else 2437 else
… …
2456 2483
2457 XDrawRectangle (dpy, vt, gc, 2484 XDrawRectangle (dpy, vt, gc,
2458 Col2Pixel (col), 2485 Col2Pixel (col),
2459 Row2Pixel (oldcursor.row), 2486 Row2Pixel (oldcursor.row),
2460 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2487 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2461 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2488 (unsigned int) (Height2Pixel (1) - 1));
2462 } 2489 }
2463 } 2490 }
2464 2491
2465 /* 2492 /*
2466 * H: cleanup selection 2493 * H: cleanup selection
… …
2475 screen.flags = old_screen_flags; 2502 screen.flags = old_screen_flags;
2476 num_scr = 0; 2503 num_scr = 0;
2477 num_scr_allow = 1; 2504 num_scr_allow = 1;
2478} 2505}
2479 2506
2480void 2507void ecb_cold
2481rxvt_term::scr_remap_chars (line_t &l) NOTHROW 2508rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2482{ 2509{
2483 if (!l.t) 2510 if (!l.valid ())
2484 return; 2511 return;
2485 2512
2486 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2513 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2487 2514
2488 for (int i = ncol; i--; ) 2515 for (int i = ncol; i--; )
2489 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2516 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2490} 2517}
2491 2518
2492void 2519void ecb_cold
2493rxvt_term::scr_remap_chars () NOTHROW 2520rxvt_term::scr_remap_chars () NOTHROW
2494{ 2521{
2495 for (int i = total_rows; i--; ) 2522 for (int i = total_rows; i--; )
2496 scr_remap_chars (row_buf [i]); 2523 scr_remap_chars (row_buf [i]);
2497 2524
… …
2500 scr_remap_chars (drawn_buf [i]); 2527 scr_remap_chars (drawn_buf [i]);
2501 scr_remap_chars (swap_buf [i]); 2528 scr_remap_chars (swap_buf [i]);
2502 } 2529 }
2503} 2530}
2504 2531
2505void 2532void ecb_cold
2506rxvt_term::scr_recolour () NOTHROW 2533rxvt_term::scr_recolour (bool refresh) NOTHROW
2507{ 2534{
2535 bool transparent = false;
2536
2508#ifdef HAVE_BG_PIXMAP 2537#ifdef HAVE_BG_PIXMAP
2509 bgPixmap.apply (); 2538 if (bg_img != 0)
2510#else 2539 {
2540# if ENABLE_TRANSPARENCY
2541 if (bg_flags & BG_IS_TRANSPARENT)
2542 {
2543 XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm);
2544 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2511 2545
2546 transparent = true;
2547 }
2548 else
2549# endif
2550 {
2551 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2552 XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm);
2553 }
2554 }
2555 else
2556#endif
2557 {
2512 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); 2558 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2513 XClearWindow (dpy, parent[0]);
2514 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); 2559 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2560 }
2561
2562 XClearWindow (dpy, parent);
2515 2563
2516 if (scrollBar.win) 2564 if (scrollBar.win)
2517 { 2565 {
2566 if (transparent)
2567 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2568 else
2518 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); 2569 XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]);
2519 scrollBar.state = STATE_IDLE; 2570 scrollBar.state = SB_STATE_IDLE;
2520 scrollBar.show (0); 2571 scrollBar.show (0);
2521 } 2572 }
2522 2573
2523#endif 2574 if (refresh)
2524 2575 {
2525 /* bgPixmap.apply () does not do the following : */
2526 scr_clear (); 2576 scr_clear ();
2527 scr_touch (true); 2577 scr_touch (true);
2578 }
2528 want_refresh = 1; 2579 want_refresh = 1;
2529} 2580}
2530 2581
2531/* ------------------------------------------------------------------------- */ 2582/* ------------------------------------------------------------------------- */
2532void 2583void
… …
2589 for (rend_t *srp = ROW(row).r; col < end_col; col++) 2640 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2590 srp[col] ^= rstyle; 2641 srp[col] ^= rstyle;
2591} 2642}
2592 2643
2593/* ------------------------------------------------------------------------- */ 2644/* ------------------------------------------------------------------------- */
2594void 2645void ecb_hot
2595rxvt_term::scr_reverse_selection () NOTHROW 2646rxvt_term::scr_reverse_selection () NOTHROW
2596{ 2647{
2597 if (selection.op 2648 if (selection.op
2598 && current_screen == selection.screen 2649 && current_screen == selection.screen
2599 && selection.end.row >= view_start) 2650 && selection.end.row >= view_start)
2600 { 2651 {
2601#if !ENABLE_MINIMAL 2652#if !ENABLE_MINIMAL
2602 if (selection.rect) 2653 if (selection.rect)
2603 scr_xor_rect (selection.beg.row, selection.beg.col, 2654 scr_xor_rect (selection.beg.row, selection.beg.col,
2604 selection.end.row, selection.end.col, 2655 selection.end.row, selection.end.col,
2605 RS_RVid, RS_RVid | RS_Uline); 2656 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2606 else 2657 else
2607#endif 2658#endif
2608 scr_xor_span (selection.beg.row, selection.beg.col, 2659 scr_xor_span (selection.beg.row, selection.beg.col,
2609 selection.end.row, selection.end.col, 2660 selection.end.row, selection.end.col,
2610 RS_RVid); 2661 RS_Sel | RS_RVid);
2611 } 2662 }
2612} 2663}
2613 2664
2614/* ------------------------------------------------------------------------- */ 2665/* ------------------------------------------------------------------------- */
2615/* 2666/*
… …
2618 */ 2669 */
2619#if 0 2670#if 0
2620void 2671void
2621rxvt_term::scr_dump (int fd) NOTHROW 2672rxvt_term::scr_dump (int fd) NOTHROW
2622{ 2673{
2623 int row, wrote; 2674 // if this method is needed, it can be implemented by factoring the
2624 unsigned int width, towrite; 2675 // relevant code in scr_printscreen
2625 char r1[] = "\n";
2626
2627 for (row = saveLines + top_row;
2628 row < saveLines + nrow - 1; row++)
2629 {
2630 width = row_buf[row].l >= 0 ? row_buf[row].l
2631 : ncol;
2632 for (towrite = width; towrite; towrite -= wrote)
2633 {
2634 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2635 towrite);
2636 if (wrote < 0)
2637 return; /* XXX: death, no report */
2638 }
2639 if (row_buf[row].l >= 0)
2640 if (write (fd, r1, 1) <= 0)
2641 return; /* XXX: death, no report */
2642 }
2643} 2676}
2644#endif 2677#endif
2645 2678
2646/* ------------------------------------------------------------------------- * 2679/* ------------------------------------------------------------------------- *
2647 * CHARACTER SELECTION * 2680 * CHARACTER SELECTION *
2648 * ------------------------------------------------------------------------- */ 2681 * ------------------------------------------------------------------------- */
2649void 2682void
2650rxvt_term::selection_check (int check_more) NOTHROW 2683rxvt_term::selection_check (int check_more) NOTHROW
2651{ 2684{
2652 row_col_t pos;
2653
2654 if (!selection.op) 2685 if (!selection.op)
2655 return; 2686 return;
2656 2687
2657 pos.row = pos.col = 0;
2658 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2688 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2659 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2689 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2660 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2690 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2661 || (check_more == 1 2691 || (check_more == 1
2662 && current_screen == selection.screen 2692 && current_screen == selection.screen
2663 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2693 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2664 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2694 && ROWCOL_IS_BEFORE (screen.cur, selection.end)))
2665 || (check_more == 2
2666 && ROWCOL_IS_BEFORE (selection.beg, pos)
2667 && ROWCOL_IS_AFTER (selection.end, pos))
2668 || (check_more == 3
2669 && ROWCOL_IS_AFTER (selection.end, pos))
2670 || (check_more == 4 /* screen width change */
2671 && (selection.beg.row != selection.end.row
2672 || selection.end.col > ncol)))
2673 CLEAR_SELECTION (); 2695 CLEAR_ALL_SELECTION ();
2674} 2696}
2675 2697
2676/* ------------------------------------------------------------------------- */ 2698/* ------------------------------------------------------------------------- */
2677/* 2699/*
2678 * Paste a selection direct to the command fd 2700 * Paste a selection direct to the command fd
2679 */ 2701 */
2680void 2702void
2681rxvt_term::paste (char *data, unsigned int len) NOTHROW 2703rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2682{ 2704{
2683 /* convert normal newline chars into common keyboard Return key sequence */ 2705 /* convert normal newline chars into common keyboard Return key sequence */
2684 for (unsigned int i = 0; i < len; i++) 2706 for (unsigned int i = 0; i < len; i++)
2685 if (data[i] == C0_LF) 2707 if (data[i] == C0_LF)
2686 data[i] = C0_CR; 2708 data[i] = C0_CR;
2687 2709
2688 if (priv_modes & PrivMode_BracketPaste) 2710 if (priv_modes & PrivMode_BracketPaste)
2689 tt_printf ("\e[200~"); 2711 tt_printf ("\x1b[200~");
2690 2712
2691 tt_write (data, len); 2713 tt_write (data, len);
2692 2714
2693 if (priv_modes & PrivMode_BracketPaste) 2715 if (priv_modes & PrivMode_BracketPaste)
2694 tt_printf ("\e[201~"); 2716 tt_printf ("\x1b[201~");
2695} 2717}
2696 2718
2697/* ------------------------------------------------------------------------- */
2698/*
2699 * Respond to a notification that a primary selection has been sent
2700 * EXT: SelectionNotify
2701 */
2702void 2719void
2703rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW 2720rxvt_term::paste (char *data, unsigned int len) NOTHROW
2704{ 2721{
2705 if (prop == None) /* check for failed XConvertSelection */ 2722 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2706 {
2707 if ((selection_type & Sel_CompoundText))
2708 {
2709 int selnum = selection_type & Sel_whereMask;
2710
2711 selection_type = 0;
2712 if (selnum != Sel_direct)
2713 selection_request_other (XA_STRING, selnum);
2714 }
2715
2716 if ((selection_type & Sel_UTF8String))
2717 {
2718 int selnum = selection_type & Sel_whereMask;
2719
2720 selection_type = Sel_CompoundText;
2721 if (selnum != Sel_direct)
2722 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2723 else
2724 selection_type = 0;
2725 }
2726
2727 return;
2728 }
2729
2730 unsigned long bytes_after;
2731 XTextProperty ct;
2732
2733 if (XGetWindowProperty (dpy, win, prop,
2734 0, PROP_SIZE / 4,
2735 delete_prop, AnyPropertyType,
2736 &ct.encoding, &ct.format,
2737 &ct.nitems, &bytes_after,
2738 &ct.value) != Success)
2739 {
2740 ct.value = 0;
2741 goto bailout;
2742 }
2743
2744 if (ct.encoding == None)
2745 goto bailout;
2746
2747 if (bytes_after)
2748 {
2749 // fetch and append remaining data
2750 XTextProperty ct2;
2751
2752 if (XGetWindowProperty (dpy, win, prop,
2753 ct.nitems / 4, (bytes_after + 3) / 4,
2754 delete_prop, AnyPropertyType,
2755 &ct2.encoding, &ct2.format,
2756 &ct2.nitems, &bytes_after,
2757 &ct2.value) != Success)
2758 goto bailout;
2759
2760 // realloc should be compatible to XFree, here, and elsewhere, too
2761 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2762 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2763 ct.nitems += ct2.nitems;
2764
2765 XFree (ct2.value);
2766 }
2767
2768 if (ct.value == 0)
2769 goto bailout;
2770
2771 if (ct.encoding == xa[XA_INCR])
2772 {
2773 // INCR selection, start handshake
2774 if (!delete_prop)
2775 XDeleteProperty (dpy, win, prop);
2776
2777 selection_wait = Sel_incr;
2778 incr_buf_fill = 0;
2779 incr_ev.start (10);
2780
2781 goto bailout;
2782 }
2783
2784 if (ct.nitems == 0)
2785 {
2786 if (selection_wait == Sel_incr)
2787 {
2788 XFree (ct.value);
2789
2790 // finally complete, now paste the whole thing
2791 selection_wait = Sel_normal;
2792 ct.value = (unsigned char *)incr_buf;
2793 ct.nitems = incr_buf_fill;
2794 incr_buf = 0;
2795 incr_buf_size = 0;
2796 incr_ev.stop ();
2797 }
2798 else
2799 {
2800 if (selection_wait == Sel_normal
2801 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2802 {
2803 /*
2804 * pass through again trying CUT_BUFFER0 if we've come from
2805 * XConvertSelection () but nothing was presented
2806 */
2807 selection_paste (display->root, XA_CUT_BUFFER0, False);
2808 }
2809
2810 goto bailout;
2811 }
2812 }
2813 else if (selection_wait == Sel_incr)
2814 {
2815 incr_ev.start (10);
2816
2817 while (incr_buf_fill + ct.nitems > incr_buf_size)
2818 {
2819 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2820 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2821 }
2822
2823 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2824 incr_buf_fill += ct.nitems;
2825
2826 goto bailout;
2827 }
2828
2829 char **cl;
2830 int cr;
2831
2832#if !ENABLE_MINIMAL
2833 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2834 // so recode it manually
2835 if (ct.encoding == xa[XA_UTF8_STRING])
2836 {
2837 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2838 char *s = rxvt_wcstombs (w);
2839 free (w);
2840 // TODO: strlen == only the first element will be converted. well...
2841 paste (s, strlen (s));
2842 free (s);
2843 }
2844 else
2845#endif
2846 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2847 && cl)
2848 {
2849 for (int i = 0; i < cr; i++)
2850 paste (cl[i], strlen (cl[i]));
2851
2852 XFreeStringList (cl);
2853 }
2854 else
2855 paste ((char *)ct.value, ct.nitems); // paste raw
2856
2857bailout:
2858 XFree (ct.value);
2859
2860 if (selection_wait == Sel_normal)
2861 selection_wait = Sel_none;
2862}
2863
2864void
2865rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2866{
2867 selection_wait = Sel_none;
2868
2869 incr_buf_size = 0;
2870 free (incr_buf);
2871
2872 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2873}
2874
2875void
2876rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2877{
2878 if (prop == None || selection_wait != Sel_incr)
2879 return; 2723 return;
2880 2724
2881 selection_paste (win, prop, true); 2725 tt_paste (data, len);
2882} 2726}
2883 2727
2884/* ------------------------------------------------------------------------- */ 2728/* ------------------------------------------------------------------------- */
2885/* 2729/*
2886 * Request the current selection: 2730 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2887 * Order: > internal selection if available 2731 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2888 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2732 * as fallback
2889 * > CUT_BUFFER0
2890 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2891 * will auto fallback to CUT_BUFFER0
2892 * EXT: button 2 release 2733 * EXT: button 2 release
2893 */ 2734 */
2894void 2735void
2895rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2736rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2896{ 2737{
2897 if (selection.text && selnum == Sel_Primary) 2738 if (!selection_req)
2898 {
2899 /* internal selection */
2900 char *str = rxvt_wcstombs (selection.text, selection.len);
2901 paste (str, strlen (str));
2902 free (str);
2903 return;
2904 } 2739 {
2905 else 2740 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2741 selection_req->run ();
2906 { 2742 }
2907 selection_request_time = tm;
2908 selection_wait = Sel_normal;
2909
2910#if X_HAVE_UTF8_STRING
2911 selection_type = Sel_UTF8String;
2912 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2913 return;
2914#else
2915 selection_type = Sel_CompoundText;
2916 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2917 return;
2918#endif
2919 }
2920
2921 selection_wait = Sel_none; /* don't loop in selection_paste () */
2922 selection_paste (display->root, XA_CUT_BUFFER0, false);
2923}
2924
2925int
2926rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2927{
2928 Atom sel;
2929
2930 selection_type |= selnum;
2931
2932 if (selnum == Sel_Primary)
2933 sel = XA_PRIMARY;
2934 else if (selnum == Sel_Secondary)
2935 sel = XA_SECONDARY;
2936 else
2937 sel = xa[XA_CLIPBOARD];
2938
2939 if (XGetSelectionOwner (dpy, sel) != None)
2940 {
2941 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2942 vt, selection_request_time);
2943 return 1;
2944 }
2945
2946 return 0;
2947} 2743}
2948 2744
2949/* ------------------------------------------------------------------------- */ 2745/* ------------------------------------------------------------------------- */
2950/* 2746/*
2951 * Clear all selected text 2747 * Clear all selected text
2952 * EXT: SelectionClear 2748 * EXT: SelectionClear
2953 */ 2749 */
2954void 2750void
2955rxvt_term::selection_clear () NOTHROW 2751rxvt_term::selection_clear (bool clipboard) NOTHROW
2956{ 2752{
2753 if (!clipboard)
2754 {
2957 want_refresh = 1; 2755 want_refresh = 1;
2958 free (selection.text); 2756 free (selection.text);
2959 selection.text = NULL; 2757 selection.text = NULL;
2960 selection.len = 0; 2758 selection.len = 0;
2961 CLEAR_SELECTION (); 2759 CLEAR_SELECTION ();
2962 2760
2963 if (display->selection_owner == this) 2761 if (display->selection_owner == this)
2964 display->selection_owner = 0; 2762 display->selection_owner = 0;
2763 }
2764 else
2765 {
2766 free (selection.clip_text);
2767 selection.clip_text = NULL;
2768 selection.clip_len = 0;
2769
2770 if (display->clipboard_owner == this)
2771 display->clipboard_owner = 0;
2772 }
2965} 2773}
2966 2774
2967/* ------------------------------------------------------------------------- */ 2775/* ------------------------------------------------------------------------- */
2968/* 2776/*
2969 * Copy a selection into the cut buffer 2777 * Copy a selection into the cut buffer
2970 * EXT: button 1 or 3 release 2778 * EXT: button 1 or 3 release
2971 */ 2779 */
2972void 2780void
2973rxvt_term::selection_make (Time tm) 2781rxvt_term::selection_make (Time tm)
2974{ 2782{
2975 int i; 2783 int size;
2976 wchar_t *new_selection_text; 2784 wchar_t *new_selection_text;
2977 text_t *t; 2785 text_t *t;
2978 2786
2979 switch (selection.op) 2787 switch (selection.op)
2980 { 2788 {
… …
2996 return; /* nothing selected, go away */ 2804 return; /* nothing selected, go away */
2997 2805
2998 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2806 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2999 return; 2807 return;
3000 2808
3001 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2809 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
3002 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2810 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
3003 2811
3004 int ofs = 0; 2812 int ofs = 0;
3005 int extra = 0; 2813 int extra = 0;
3006 2814
3007 int col = selection.beg.col; 2815 int col = selection.beg.col;
… …
3013 { 2821 {
3014#if !ENABLE_MINIMAL 2822#if !ENABLE_MINIMAL
3015 if (selection.rect) 2823 if (selection.rect)
3016 { 2824 {
3017 col = selection.beg.col; 2825 col = selection.beg.col;
3018 end_col = ncol + 1; 2826 end_col = selection.end.col;
3019 } 2827 }
3020 else 2828 else
3021#endif 2829#endif
3022 end_col = ROW(row).l; 2830 end_col = ROW(row).l;
3023 2831
3024 col = max (col, 0); 2832 col = max (col, 0);
3025 2833
3026 if (row == selection.end.row 2834 if (row == selection.end.row)
3027#if !ENABLE_MINIMAL
3028 || selection.rect
3029#endif
3030 )
3031 min_it (end_col, selection.end.col); 2835 min_it (end_col, selection.end.col);
3032 2836
3033 t = ROW(row).t + col; 2837 t = ROW(row).t + col;
3034 2838
3035 for (; col < end_col; col++) 2839 for (; col < end_col; col++)
… …
3043 2847
3044 extra -= (len - 1); 2848 extra -= (len - 1);
3045 2849
3046 if (extra < 0) 2850 if (extra < 0)
3047 { 2851 {
3048 extra += i; 2852 extra += size;
3049 i += i; 2853 size += size;
3050 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2854 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
3051 } 2855 }
3052 2856
3053 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2857 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
3054 } 2858 }
3055#endif 2859#endif
… …
3067 2871
3068 new_selection_text[ofs++] = C0_LF; 2872 new_selection_text[ofs++] = C0_LF;
3069 } 2873 }
3070 else 2874 else
3071#endif 2875#endif
3072 if (!ROW(row).is_longer () && row != selection.end.row) 2876 if (!ROW(row).is_longer ()
2877 && (row != selection.end.row || end_col != selection.end.col)
2878 && (row != selection.beg.row || selection.beg.col < ncol))
3073 new_selection_text[ofs++] = C0_LF; 2879 new_selection_text[ofs++] = C0_LF;
3074 } 2880 }
3075
3076 if (end_col != selection.end.col)
3077 new_selection_text[ofs++] = C0_LF;
3078 2881
3079 new_selection_text[ofs] = 0; 2882 new_selection_text[ofs] = 0;
3080 2883
3081 if (ofs == 0) 2884 if (ofs == 0)
3082 { 2885 {
… …
3095 2898
3096 selection_grab (tm); 2899 selection_grab (tm);
3097} 2900}
3098 2901
3099bool 2902bool
3100rxvt_term::selection_grab (Time tm) NOTHROW 2903rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3101{ 2904{
2905 Atom sel;
2906
2907 if (!clipboard)
2908 {
3102 selection_time = tm; 2909 selection_time = tm;
2910 sel = XA_PRIMARY;
2911 }
2912 else
2913 {
2914 clipboard_time = tm;
2915 sel = xa[XA_CLIPBOARD];
2916 }
3103 2917
3104 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); 2918 XSetSelectionOwner (dpy, sel, vt, tm);
3105 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) 2919 if (XGetSelectionOwner (dpy, sel) == vt)
3106 { 2920 {
3107 display->set_selection_owner (this); 2921 display->set_selection_owner (this, clipboard);
3108 return true; 2922 return true;
3109 } 2923 }
3110 else 2924 else
3111 { 2925 {
3112 selection_clear (); 2926 selection_clear (clipboard);
3113 return false; 2927 return false;
3114 } 2928 }
3115 2929
3116#if 0 2930#if 0
3117 XTextProperty ct; 2931 XTextProperty ct;
… …
3127/* ------------------------------------------------------------------------- */ 2941/* ------------------------------------------------------------------------- */
3128/* 2942/*
3129 * Mark or select text based upon number of clicks: 1, 2, or 3 2943 * Mark or select text based upon number of clicks: 1, 2, or 3
3130 * EXT: button 1 press 2944 * EXT: button 1 press
3131 */ 2945 */
3132void 2946void ecb_cold
3133rxvt_term::selection_click (int clicks, int x, int y) NOTHROW 2947rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3134{ 2948{
3135 clicks = ((clicks - 1) % 3) + 1; 2949 clicks = ((clicks - 1) % 3) + 1;
3136 selection.clicks = clicks; /* save clicks so extend will work */ 2950 selection.clicks = clicks; /* save clicks so extend will work */
3137 2951
… …
3156 2970
3157/* ------------------------------------------------------------------------- */ 2971/* ------------------------------------------------------------------------- */
3158/* 2972/*
3159 * Mark a selection at the specified col/row 2973 * Mark a selection at the specified col/row
3160 */ 2974 */
3161void 2975void ecb_cold
3162rxvt_term::selection_start_colrow (int col, int row) NOTHROW 2976rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3163{ 2977{
3164 want_refresh = 1; 2978 want_refresh = 1;
3165 2979
3166 selection.mark.row = row + view_start; 2980 selection.mark.row = row + view_start;
… …
3193/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3007/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
3194#define DELIMIT_TEXT(x) \ 3008#define DELIMIT_TEXT(x) \
3195 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3009 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3196#define DELIMIT_REND(x) 1 3010#define DELIMIT_REND(x) 1
3197 3011
3198void 3012void ecb_cold
3199rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW 3013rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3200{ 3014{
3201 int col, row, dirnadd, tcol, trow, w1, w2; 3015 int col, row, dirnadd, tcol, trow, w1, w2;
3202 row_col_t bound; 3016 row_col_t bound;
3203 text_t *stp; 3017 text_t *stp;
… …
3277 * EXT: button 3 press; button 1 or 3 drag 3091 * EXT: button 3 press; button 1 or 3 drag
3278 * flag == 0 ==> button 1 3092 * flag == 0 ==> button 1
3279 * flag == 1 ==> button 3 press 3093 * flag == 1 ==> button 3 press
3280 * flag == 2 ==> button 3 motion 3094 * flag == 2 ==> button 3 motion
3281 */ 3095 */
3282void 3096void ecb_cold
3283rxvt_term::selection_extend (int x, int y, int flag) NOTHROW 3097rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3284{ 3098{
3285 int col = clamp (Pixel2Col (x), 0, ncol); 3099 int col = clamp (Pixel2Col (x), 0, ncol);
3286 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3100 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3287 3101
… …
3313 3127
3314/* ------------------------------------------------------------------------- */ 3128/* ------------------------------------------------------------------------- */
3315/* 3129/*
3316 * Extend the selection to the specified col/row 3130 * Extend the selection to the specified col/row
3317 */ 3131 */
3318void 3132void ecb_cold
3319rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW 3133rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3320{ 3134{
3321 row_col_t pos; 3135 row_col_t pos;
3322 enum { 3136 enum {
3323 LEFT, RIGHT 3137 LEFT, RIGHT
… …
3514 ::swap (selection.beg.col, selection.end.col); 3328 ::swap (selection.beg.col, selection.end.col);
3515#endif 3329#endif
3516} 3330}
3517 3331
3518#if !ENABLE_MINIMAL 3332#if !ENABLE_MINIMAL
3519void 3333void ecb_cold
3520rxvt_term::selection_remove_trailing_spaces () NOTHROW 3334rxvt_term::selection_remove_trailing_spaces () NOTHROW
3521{ 3335{
3522 int32_t end_col, end_row; 3336 int32_t end_col, end_row;
3523 text_t *stp; 3337 text_t *stp;
3524 3338
… …
3562/* ------------------------------------------------------------------------- */ 3376/* ------------------------------------------------------------------------- */
3563/* 3377/*
3564 * Double click on button 3 when already selected 3378 * Double click on button 3 when already selected
3565 * EXT: button 3 double click 3379 * EXT: button 3 double click
3566 */ 3380 */
3567void 3381void ecb_cold
3568rxvt_term::selection_rotate (int x, int y) NOTHROW 3382rxvt_term::selection_rotate (int x, int y) NOTHROW
3569{ 3383{
3570 selection.clicks = selection.clicks % 3 + 1; 3384 selection.clicks = selection.clicks % 3 + 1;
3571 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3385 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3572} 3386}
… …
3574/* ------------------------------------------------------------------------- */ 3388/* ------------------------------------------------------------------------- */
3575/* 3389/*
3576 * Respond to a request for our current selection 3390 * Respond to a request for our current selection
3577 * EXT: SelectionRequest 3391 * EXT: SelectionRequest
3578 */ 3392 */
3579void 3393void ecb_cold
3580rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3394rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3581{ 3395{
3396 Atom property = rq.property == None ? rq.target : rq.property;
3582 XSelectionEvent ev; 3397 XSelectionEvent ev;
3583 3398
3584 ev.type = SelectionNotify; 3399 ev.type = SelectionNotify;
3585 ev.property = None; 3400 ev.property = None;
3586 ev.display = rq.display; 3401 ev.display = rq.display;
… …
3601 *target++ = xa[XA_COMPOUND_TEXT]; 3416 *target++ = xa[XA_COMPOUND_TEXT];
3602#if X_HAVE_UTF8_STRING 3417#if X_HAVE_UTF8_STRING
3603 *target++ = xa[XA_UTF8_STRING]; 3418 *target++ = xa[XA_UTF8_STRING];
3604#endif 3419#endif
3605 3420
3606 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, 3421 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3607 32, PropModeReplace, 3422 32, PropModeReplace,
3608 (unsigned char *)target_list, target - target_list); 3423 (unsigned char *)target_list, target - target_list);
3609 ev.property = rq.property; 3424 ev.property = property;
3610 } 3425 }
3611#if TODO // TODO 3426#if TODO // TODO
3612 else if (rq.target == xa[XA_MULTIPLE]) 3427 else if (rq.target == xa[XA_MULTIPLE])
3613 { 3428 {
3614 /* TODO: Handle MULTIPLE */ 3429 /* TODO: Handle MULTIPLE */
3615 } 3430 }
3616#endif 3431#endif
3617 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3432 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3618 { 3433 {
3619 XChangeProperty (dpy, rq.requestor, rq.property, rq.target, 3434 XChangeProperty (dpy, rq.requestor, property, rq.target,
3620 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3435 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3621 ev.property = rq.property; 3436 ev.property = property;
3437 }
3438 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3439 {
3440 XChangeProperty (dpy, rq.requestor, property, rq.target,
3441 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3442 ev.property = property;
3622 } 3443 }
3623 else if (rq.target == XA_STRING 3444 else if (rq.target == XA_STRING
3624 || rq.target == xa[XA_TEXT] 3445 || rq.target == xa[XA_TEXT]
3625 || rq.target == xa[XA_COMPOUND_TEXT] 3446 || rq.target == xa[XA_COMPOUND_TEXT]
3626 || rq.target == xa[XA_UTF8_STRING] 3447 || rq.target == xa[XA_UTF8_STRING]
… …
3658 { 3479 {
3659 target = xa[XA_COMPOUND_TEXT]; 3480 target = xa[XA_COMPOUND_TEXT];
3660 style = enc_compound_text; 3481 style = enc_compound_text;
3661 } 3482 }
3662 3483
3663 if (selection.text) 3484 if (rq.selection == XA_PRIMARY && selection.text)
3664 { 3485 {
3665 cl = selection.text; 3486 cl = selection.text;
3666 selectlen = selection.len; 3487 selectlen = selection.len;
3488 }
3489 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3490 {
3491 cl = selection.clip_text;
3492 selectlen = selection.clip_len;
3667 } 3493 }
3668 else 3494 else
3669 { 3495 {
3670 cl = L""; 3496 cl = L"";
3671 selectlen = 0; 3497 selectlen = 0;
… …
3692 ct.value = (unsigned char *)cl; 3518 ct.value = (unsigned char *)cl;
3693 ct.nitems = selectlen; 3519 ct.nitems = selectlen;
3694 ct.encoding = target; 3520 ct.encoding = target;
3695 } 3521 }
3696 3522
3697 XChangeProperty (dpy, rq.requestor, rq.property, 3523 XChangeProperty (dpy, rq.requestor, property,
3698 ct.encoding, 8, PropModeReplace, 3524 ct.encoding, 8, PropModeReplace,
3699 ct.value, (int)ct.nitems); 3525 ct.value, (int)ct.nitems);
3700 ev.property = rq.property; 3526 ev.property = property;
3701 3527
3702 if (freect) 3528 if (freect)
3703 XFree (ct.value); 3529 XFree (ct.value);
3704 } 3530 }
3705 3531
3706 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); 3532 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3707} 3533}
3708 3534
3709/* ------------------------------------------------------------------------- */ 3535/* ------------------------------------------------------------------------- */
3710#ifdef USE_XIM 3536#if USE_XIM
3711void 3537void ecb_cold
3712rxvt_term::im_set_position (XPoint &pos) NOTHROW 3538rxvt_term::im_set_position (XPoint &pos) NOTHROW
3713{ 3539{
3714 XWindowAttributes xwa; 3540 XWindowAttributes xwa;
3715 3541
3716 XGetWindowAttributes (dpy, vt, &xwa); 3542 XGetWindowAttributes (dpy, vt, &xwa);

Diff Legend

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