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

Diff Legend

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