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.246 by root, Sat Jan 21 14:25:05 2006 UTC vs.
Revision 1.382 by sf-exg, Tue Apr 26 16:19:45 2011 UTC

1/*--------------------------------*-C-*--------------------------------------* 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-2006 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.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
47 44
48/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 48#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 50 view_start = 0
54#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 85
89/* 86/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 88 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 90 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 94
114/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
117 98
… …
126 width = ncol; 107 width = ncol;
127 } 108 }
128 109
129 l.touch (); 110 l.touch ();
130 111
131 efs &= ~RS_baseattrMask; 112 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 113 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 114
134 text_t *et = l.t + col; 115 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 116 rend_t *er = l.r + col;
136 117
… …
148{ 129{
149 scr_blank_line (l, 0, ncol, efs); 130 scr_blank_line (l, 0, ncol, efs);
150 131
151 l.l = 0; 132 l.l = 0;
152 l.f = 0; 133 l.f = 0;
134}
135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
153} 155}
154 156
155/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
… …
174 176
175 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 178 return;
177 179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
182 saveLines++; 184 saveLines++;
183 prev_nrow--; 185 prev_nrow--;
184 top_row--; 186 top_row--;
… …
195 if (!row_buf) 197 if (!row_buf)
196 { 198 {
197 /* 199 /*
198 * first time called so just malloc everything: don't rely on realloc 200 * first time called so just malloc everything: don't rely on realloc
199 */ 201 */
200 top_row = 0; /* no saved lines */ 202 top_row = 0;
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
239 rvideo_state = rvideo_mode = false; 241 selection.clip_text = NULL;
242 selection.clip_len = 0;
240 } 243 }
241 else 244 else
242 { 245 {
243 /* 246 /*
244 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 277 }
275 278
276 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 281
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
282 285
283 if (top_row) 286 if (top_row)
284 { 287 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
287 291
288 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 294
291 do 295 do
292 { 296 {
293 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
294#ifdef DEBUG_STRICT
295 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
296#endif
297 int plines = 1; 299 int plines = 1;
298 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
299 301
300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
301 { 303 {
… …
327 int qcol = 0; 329 int qcol = 0;
328 330
329 // see below for cursor adjustment rationale 331 // see below for cursor adjustment rationale
330 if (p == ocur.row) 332 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 333 screen.cur.row = q - (total_rows - nrow);
332 334
333 // fill a single destination line 335 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 336 while (lofs < llen && qcol < ncol)
335 { 337 {
336 int prow = lofs / prev_ncol; 338 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 339 int pcol = lofs % prev_ncol;
… …
347 349
348 line_t &pline = old_buf [prow]; 350 line_t &pline = old_buf [prow];
349 351
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 353
352#if DEBUG_STRICT
353 assert (len);
354 assert (pline.t);
355#endif
356
357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 356
360 lofs += len; 357 lofs += len;
361 qcol += len; 358 qcol += len;
… …
368 } 365 }
369 while (p != pend && q > 0); 366 while (p != pend && q > 0);
370 367
371 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
372 top_row = q - term_start; 369 top_row = q - term_start;
373 370
374 // make sure all terminal lines exist 371 // make sure all terminal lines exist
375 while (top_row > 0) 372 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 374 }
378 else 375 else
379 { 376 {
380 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
381 378
382 for (int row = min (nrow, prev_nrow); row--; ) 379 for (int row = min (nrow, prev_nrow); row--; )
383 { 380 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 382 line_t &qline = row_buf [row];
386 383
… …
400 delete old_ta; 397 delete old_ta;
401 delete old_ra; 398 delete old_ra;
402 399
403 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
405 403
406 if (tabs)
407 free (tabs); 404 free (tabs);
408 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
409 409
410 CLEAR_ALL_SELECTION (); 410 CLEAR_ALL_SELECTION ();
411 411
412 prev_nrow = nrow; 412 prev_nrow = nrow;
413 prev_ncol = ncol; 413 prev_ncol = ncol;
414 414
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416
417 for (int col = ncol; col--; )
418 tabs [col] = col % TABSIZE == 0;
419
420 tt_winch (); 415 tt_winch ();
421 416
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 418}
424 419
… …
427 * Free everything. That way malloc debugging can find leakage. 422 * Free everything. That way malloc debugging can find leakage.
428 */ 423 */
429void 424void
430rxvt_term::scr_release () NOTHROW 425rxvt_term::scr_release () NOTHROW
431{ 426{
427 if (row_buf)
428 {
432 delete talloc; talloc = 0; 429 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
434 431
435 free (row_buf); 432 free (row_buf);
436 free (swap_buf); 433 free (swap_buf);
437 free (drawn_buf); 434 free (drawn_buf);
438 free (tabs);
439
440 row_buf = 0; // signal that we freed all the arrays 435 row_buf = 0; // signal that we freed all the arrays above
441}
442 436
437 free (tabs);
438 tabs = 0;
439 }
440}
441
443/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
444/* 443/*
445 * Hard reset 444 * Hard/Soft reset
446 */ 445 */
447void 446void
448rxvt_term::scr_poweron () NOTHROW 447rxvt_term::scr_poweron ()
449{ 448{
450 scr_release (); 449 scr_release ();
451 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
452 scr_reset (); 453 scr_reset ();
453 454
454 scr_clear (true); 455 scr_clear (true);
455 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
456} 473}
457 474
458/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
498 } 515 }
499 516
500 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
501 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
502 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
503#ifdef DEBUG_STRICT
504 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
506#endif 522}
523
524void
525rxvt_term::scr_swap_screen ()
526{
527 if (!option (Opt_secondaryScreen))
528 return;
529
530 for (int i = prev_nrow; i--; )
531 ::swap (ROW(i), swap_buf [i]);
532
533 ::swap (screen.cur, swap.cur);
534
535 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
536 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
507} 537}
508 538
509/* ------------------------------------------------------------------------- */ 539/* ------------------------------------------------------------------------- */
510/* 540/*
511 * Swap between primary and secondary screens 541 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 542 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 543 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 544 */
515int 545void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 546rxvt_term::scr_change_screen (int scrn)
517{ 547{
548 if (scrn == current_screen)
549 return;
550
518 want_refresh = 1; 551 want_refresh = 1;
519 view_start = 0; 552 view_start = 0;
520 553
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
525 555
526 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
527
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533 557
534#if NSCREENS 558#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
536 { 560 {
537 num_scr = 0; 561 num_scr = 0;
538 562
539 for (int i = prev_nrow; i--; ) 563 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 564
542 ::swap (screen.charset, swap.charset); 565 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 566 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
546 } 569 }
547 else 570 else
548#endif 571#endif
549 if (OPTION (Opt_secondaryScroll)) 572 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 574}
554 575
555// clear WrapNext indicator, solidifying position on next line 576// clear WrapNext indicator, solidifying position on next line
556void 577void
557rxvt_term::scr_do_wrap () NOTHROW 578rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 610/*
590 * Change the rendition style for following text 611 * Change the rendition style for following text
591 */ 612 */
592void 613void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 614rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 615{
595 if (set) 616 if (set)
596 rstyle |= style; 617 rstyle |= style;
597 else if (style == ~RS_None) 618 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
599 else 620 else
600 rstyle &= ~style; 621 rstyle &= ~style;
601 } 622}
602 623
603/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
604/* 625/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 627 * count positive ==> scroll up
… …
615 want_refresh = 1; 636 want_refresh = 1;
616 num_scr += count; 637 num_scr += count;
617 638
618 if (count > 0 639 if (count > 0
619 && row1 == 0 640 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 642 {
622 top_row = max (top_row - count, -saveLines); 643 top_row = max (top_row - count, -saveLines);
623 644
624 // scroll everything up 'count' lines 645 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 646 term_start = (term_start + count) % total_rows;
… …
632 } 653 }
633 654
634 // erase newly scrolled-in lines 655 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 656 for (int i = count; i--; )
636 { 657 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i); 658 line_t &l = ROW(nrow - 1 - i);
640 659
660 // optimize if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 {
641 scr_blank_line (l, 0, l.l, rstyle); 664 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 665 l.l = 0;
644 l.f = 0; 666 l.f = 0;
667 }
668 else
669 scr_blank_screen_mem (l, rstyle);
645 } 670 }
646 671
647 // now copy lines below the scroll region bottom to the 672 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 673 // bottom of the screen again, so they look as if they
649 // hadn't moved. 674 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 678 line_t &l2 = ROW(i);
654 679
655 ::swap (l1, l2); 680 ::swap (l1, l2);
656 l2.touch (); 681 l2.touch ();
657 } 682 }
658 683
659 // move and/or clear selection, if any 684 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 685 if (selection.op && current_screen == selection.screen)
661 { 686 {
662 selection.beg.row -= count; 687 selection.beg.row -= count;
663 selection.end.row -= count; 688 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 696 selection.op = SELECTION_CLEAR;
672 } 697 }
673 } 698 }
674 699
675 // finally move the view window, if desired 700 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 701 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 702 && view_start != 0
678 && view_start != -saveLines) 703 && view_start != -saveLines)
679 scr_page (UP, count); 704 scr_page (UP, count);
680 705
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 706 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 724 {
700 /* move selected region too */ 725 /* move selected region too */
701 selection.beg.row -= count; 726 selection.beg.row -= count;
702 selection.end.row -= count; 727 selection.end.row -= count;
703 selection.mark.row -= count; 728 selection.mark.row -= count;
704 729
705 selection_check (0); 730 selection_check (0);
706 } 731 }
707 } 732 }
708 733
709 // use a simple and robust scrolling algorithm, this 734 // use a simple and robust scrolling algorithm, this
… …
749 ZERO_SCROLLBACK (); 774 ZERO_SCROLLBACK ();
750 775
751 if (minlines > 0) 776 if (minlines > 0)
752 { 777 {
753 minlines += screen.cur.row - screen.bscroll; 778 minlines += screen.cur.row - screen.bscroll;
779 min_it (minlines, screen.cur.row - top_row);
754 780
755 if (minlines > 0 781 if (minlines > 0
756 && screen.tscroll == 0 782 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 783 && screen.bscroll == nrow - 1)
758 { 784 {
… …
760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
761 screen.cur.row -= minlines; 787 screen.cur.row -= minlines;
762 } 788 }
763 } 789 }
764 790
765#ifdef DEBUG_STRICT
766 assert (screen.cur.col < ncol); 791 assert (screen.cur.col < ncol);
767 assert (screen.cur.row < nrow 792 assert (screen.cur.row < nrow
768 && screen.cur.row >= top_row); 793 && screen.cur.row >= top_row);
769#endif
770 int row = screen.cur.row; 794 int row = screen.cur.row;
771 795
772 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 796 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
773 797
774 line_t *line = &ROW(row); 798 line_t *line = &ROW(row);
775 799
776 while (str < strend) 800 while (str < strend)
777 { 801 {
778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
779 803
780 if (c < 0x20) 804 if (expect_false (c < 0x20))
781 if (c == C0_LF) 805 if (c == C0_LF)
782 { 806 {
783 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
784 808
785 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
804 { 828 {
805 scr_tab (1, true); 829 scr_tab (1, true);
806 continue; 830 continue;
807 } 831 }
808 832
833 if (expect_false (
809 if (checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
810 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
811 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 ))
812 { 838 {
813 checksel = 0; 839 checksel = 0;
814 /* 840 /*
815 * If we wrote anywhere in the selected area, kill the selection 841 * If we wrote anywhere in the selected area, kill the selection
816 * XXX: should we kill the mark too? Possibly, but maybe that 842 * XXX: should we kill the mark too? Possibly, but maybe that
817 * should be a similar check. 843 * should be a similar check.
818 */ 844 */
819 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
820 } 846 }
821 847
822 if (screen.flags & Screen_WrapNext) 848 if (expect_false (screen.flags & Screen_WrapNext))
823 { 849 {
824 scr_do_wrap (); 850 scr_do_wrap ();
825 851
826 line->l = ncol; 852 line->l = ncol;
827 line->is_longer (1); 853 line->is_longer (1);
828 854
829 row = screen.cur.row; 855 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
831 } 857 }
832 858
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
835 c = 0xfffd; 861 c = 0xfffd;
836 862
837 // rely on wcwidth to tell us the character width, at least for non-latin1 863 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 864 // further replacements, as wcwidth might return -1 for the line
839 // for the line drawing characters below as they might be invalid in the current 865 // drawing characters below as they might be invalid in the current
840 // locale. 866 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 867 int width = WCWIDTH (c);
842 868
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
844 { 870 {
845 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 872 // 5f-7e standard vt100
847 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
848 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
861 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
862 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
863 } 889 }
864 } 890 }
865 891
866 if (screen.flags & Screen_Insert) 892 if (expect_false (screen.flags & Screen_Insert))
867 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
868 894
869 if (width != 0) 895 if (width != 0)
870 { 896 {
871#if !UNICODE_3 897#if !UNICODE_3
… …
876# else 902# else
877 c = 0xfffd; 903 c = 0xfffd;
878# endif 904# endif
879#endif 905#endif
880 906
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908
909 // if the character doesn't fit into the remaining columns...
910 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
911 {
912 if (screen.flags & Screen_Autowrap)
913 {
914 // ... artificially enlargen the previous one
915 c = NOCHAR;
916 // and try the same character next loop iteration
917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
921 }
922
881 // nuke the character at this position, if required 923 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
882 if (line->t[screen.cur.col] == NOCHAR 927 if (expect_false (line->t[screen.cur.col] == NOCHAR))
883 || (screen.cur.col < ncol - 1 928 scr_kill_char (*line, screen.cur.col);
884 && line->t[screen.cur.col + 1] == NOCHAR))
885 {
886 int col = screen.cur.col;
887
888 // find begin
889 while (col > 0 && line->t[col] == NOCHAR)
890 col--;
891
892 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
893
894 // found begin, nuke
895 do {
896 line->t[col] = ' ';
897 line->r[col] = rend;
898 col++;
899 } while (col < ncol && line->t[col] == NOCHAR);
900 }
901
902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
903
904 // if the character doesn't fit into the remaining columns...
905 if (screen.cur.col > ncol - width && ncol >= width)
906 {
907 // ...output spaces
908 c = ' ';
909 // and try the same character next loop iteration
910 --str;
911 }
912 929
913 line->touch (); 930 line->touch ();
914 931
915 do 932 do
916 { 933 {
917 line->t[screen.cur.col] = c; 934 line->t[screen.cur.col] = c;
918 line->r[screen.cur.col] = rend; 935 line->r[screen.cur.col] = rend;
919 936
920 if (screen.cur.col < ncol - 1) 937 if (expect_true (screen.cur.col < ncol - 1))
921 screen.cur.col++; 938 screen.cur.col++;
922 else 939 else
923 { 940 {
924 line->l = ncol; 941 line->l = ncol;
925 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
926 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
927 break; 944
945 goto end_of_line;
928 } 946 }
929 947
930 c = NOCHAR; 948 c = NOCHAR;
931 } 949 }
932 while (--width > 0); 950 while (expect_false (--width > 0));
933 951
934 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
935 if (!width) 953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
936 { 954 {
937 line->touch (); 955 line->t[c] = ' ';
956 line->r[c] = rend;
957 }
938 958
939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 959end_of_line:
960 ;
961 }
962#if ENABLE_COMBINING
963 else // width == 0
964 {
965 if (c != 0xfeff) // ignore BOM
966 {
967 // handle combining characters
968 // we just tag the accent on the previous on-screen character.
969 // this is arguably not correct, but also arguably not wrong.
970 // we don't handle double-width characters nicely yet.
971 line_t *linep;
972 text_t *tp;
973 rend_t *rp;
974
975 if (screen.cur.col > 0)
940 { 976 {
941 line->t[c] = ' ';
942 line->r[c] = rend; 977 linep = line;
978 tp = line->t + screen.cur.col - 1;
979 rp = line->r + screen.cur.col - 1;
943 } 980 }
981 else if (screen.cur.row > 0
982 && ROW(screen.cur.row - 1).is_longer ())
983 {
984 linep = &ROW(screen.cur.row - 1);
985 tp = line->t + ncol - 1;
986 rp = line->r + ncol - 1;
987 }
988 else
989 continue;
990
991 linep->touch ();
992
993 while (*tp == NOCHAR && tp > linep->t)
994 tp--, rp--;
995
996 // first try to find a precomposed character
997 unicode_t n = rxvt_compose (*tp, c);
998 if (n == NOCHAR)
999 n = rxvt_composite.compose (*tp, c);
1000
1001 *tp = n;
1002 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
944 } 1003 }
945 } 1004 }
946 else // width == 0
947 {
948#if ENABLE_COMBINING
949 // handle combining characters
950 // we just tag the accent on the previous on-screen character.
951 // this is arguably not correct, but also arguably not wrong.
952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
954 text_t *tp;
955 rend_t *rp;
956
957 if (screen.cur.col > 0)
958 {
959 linep = line;
960 tp = line->t + screen.cur.col - 1;
961 rp = line->r + screen.cur.col - 1;
962 }
963 else if (screen.cur.row > 0
964 && ROW(screen.cur.row - 1).is_longer ())
965 {
966 linep = &ROW(screen.cur.row - 1);
967 tp = line->t + ncol - 1;
968 rp = line->r + ncol - 1;
969 }
970 else
971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
977
978 // first try to find a precomposed character
979 unicode_t n = rxvt_compose (*tp, c);
980 if (n == NOCHAR)
981 n = rxvt_composite.compose (*tp, c);
982
983 *tp = n;
984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
985#endif 1005#endif
986 }
987 } 1006 }
988 1007
989 max_it (line->l, screen.cur.col); 1008 max_it (line->l, screen.cur.col);
990 1009
991#ifdef DEBUG_STRICT
992 assert (screen.cur.row >= 0); 1010 assert (screen.cur.row >= 0);
993#endif
994} 1011}
995 1012
996/* ------------------------------------------------------------------------- */ 1013/* ------------------------------------------------------------------------- */
997/* 1014/*
998 * Process Backspace. Move back the cursor back a position, wrap if have to 1015 * Process Backspace. Move back the cursor back a position, wrap if have to
999 * XTERM_SEQ: CTRL-H 1016 * XTERM_SEQ: CTRL-H
1000 */ 1017 */
1001void 1018void
1002rxvt_term::scr_backspace () NOTHROW 1019rxvt_term::scr_backspace () NOTHROW
1003{ 1020{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1021 if (screen.cur.col == 0)
1007 { 1022 {
1008 if (screen.cur.row > 0) 1023 if (screen.cur.row > 0)
1009 { 1024 {
1010#ifdef TERMCAP_HAS_BW 1025#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1026 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1027 --screen.cur.row;
1013 return; 1028
1029 want_refresh = 1;
1014#endif 1030#endif
1015 } 1031 }
1016 } 1032 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1035 else
1018 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1037}
1022 1038
1023/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
1024/* 1040/*
1025 * Process Horizontal Tab 1041 * Process Horizontal Tab
… …
1048 x = i; 1064 x = i;
1049 1065
1050 if (!--count) 1066 if (!--count)
1051 break; 1067 break;
1052 } 1068 }
1053 else 1069 else
1054 ht &= l.t[i] == ' ' 1070 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1071 && RS_SAME (l.r[i], base_rend);
1056 1072
1057 if (count) 1073 if (count)
1058 x = ncol - 1; 1074 x = ncol - 1;
1059 1075
1060 // store horizontal tab commands as characters inside the text 1076 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1077 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1078 if (ht && option (Opt_pastableTabs))
1063 { 1079 {
1064 base_rend = SET_FONT (base_rend, 0); 1080 base_rend = SET_FONT (base_rend, 0);
1065 1081
1066 l.touch (x); 1082 l.touch (x);
1067 1083
… …
1100 * Process DEC Back Index 1116 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1117 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1118 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1119 * in that row right. Clear left column.
1104 */ 1120 */
1105#if ENABLE_FRILLS 1121#if !ENABLE_MINIMAL
1106void 1122void
1107rxvt_term::scr_backindex () NOTHROW 1123rxvt_term::scr_backindex () NOTHROW
1108{ 1124{
1109 if (screen.cur.col > 0) 1125 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1133 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1134 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1135 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1136 * in that row left. Clear right column.
1121 */ 1137 */
1122#if ENABLE_FRILLS 1138#if !ENABLE_MINIMAL
1123void 1139void
1124rxvt_term::scr_forwardindex () NOTHROW 1140rxvt_term::scr_forwardindex () NOTHROW
1125{ 1141{
1126 if (screen.cur.col < ncol - 1) 1142 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1190 }
1175 } 1191 }
1176 else 1192 else
1177 { 1193 {
1178 if (screen.flags & Screen_Relative) 1194 if (screen.flags & Screen_Relative)
1195 {
1179 { /* relative origin mode */ 1196 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1197 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1198 min_it (screen.cur.row, screen.bscroll);
1182 } 1199 }
1183 else 1200 else
1184 screen.cur.row = row; 1201 screen.cur.row = row;
… …
1217/* 1234/*
1218 * Erase part or whole of a line 1235 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1236 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1237 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1238 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1239 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1240 */
1223void 1241void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1242rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1243{
1226 unsigned int col, num; 1244 unsigned int col, num;
… …
1235 line.touch (); 1253 line.touch ();
1236 line.is_longer (0); 1254 line.is_longer (0);
1237 1255
1238 switch (mode) 1256 switch (mode)
1239 { 1257 {
1258 case 3:
1259 if (screen.flags & Screen_WrapNext)
1260 return;
1261
1262 /* fall through */
1263
1240 case 0: /* erase to end of line */ 1264 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1265 col = screen.cur.col;
1242 num = ncol - col; 1266 num = ncol - col;
1243 min_it (line.l, col); 1267 min_it (line.l, col);
1268
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1247 break; 1272 break;
1273
1248 case 1: /* erase to beginning of line */ 1274 case 1: /* erase to beginning of line */
1249 col = 0; 1275 col = 0;
1250 num = screen.cur.col + 1; 1276 num = screen.cur.col + 1;
1277
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1278 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1279 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1280 CLEAR_SELECTION ();
1254 break; 1281 break;
1282
1255 case 2: /* erase whole line */ 1283 case 2: /* erase whole line */
1256 col = 0; 1284 col = 0;
1257 num = ncol; 1285 num = ncol;
1258 line.l = 0; 1286 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1287 if (selection.beg.row <= screen.cur.row
… …
1317 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1318 return; 1346 return;
1319 1347
1320 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1321 1349
1322 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1323 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1324 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1325 { 1353 {
1326 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1327 CLEAR_ROWS (row, num); 1355
1356 if (mapped)
1357 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False);
1328 } 1360 }
1329 else 1361 else
1330 { 1362 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1364
1365 if (mapped)
1366 {
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1369 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start),
1371 (unsigned int)width,
1372 (unsigned int)Height2Pixel (num));
1335 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1337 } 1376 }
1338 1377
1339 for (; num--; row++) 1378 for (; num--; row++)
1340 { 1379 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1343 } 1384 }
1344} 1385}
1345 1386
1346#if ENABLE_FRILLS 1387#if !ENABLE_MINIMAL
1347void 1388void
1348rxvt_term::scr_erase_savelines () NOTHROW 1389rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1390{
1350 want_refresh = 1; 1391 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1392 ZERO_SCROLLBACK ();
… …
1421 * Insert/Delete <count> characters from the current position 1462 * Insert/Delete <count> characters from the current position
1422 */ 1463 */
1423void 1464void
1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW 1465rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1425{ 1466{
1426 int col, row;
1427 rend_t tr;
1428
1429 want_refresh = 1; 1467 want_refresh = 1;
1430 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1431 1469
1432 if (count <= 0) 1470 if (count <= 0)
1433 return; 1471 return;
… …
1435 scr_do_wrap (); 1473 scr_do_wrap ();
1436 1474
1437 selection_check (1); 1475 selection_check (1);
1438 min_it (count, ncol - screen.cur.col); 1476 min_it (count, ncol - screen.cur.col);
1439 1477
1440 row = screen.cur.row; 1478 int row = screen.cur.row;
1441 1479
1442 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1443 1481
1444 line->touch (); 1482 line->touch ();
1445 line->is_longer (0); 1483 line->is_longer (0);
1446 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1447 switch (insdel) 1489 switch (insdel)
1448 { 1490 {
1449 case INSERT: 1491 case INSERT:
1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1492 line->l = min (line->l + count, ncol);
1493
1494 if (line->t[screen.cur.col] == NOCHAR)
1495 scr_kill_char (*line, screen.cur.col);
1496
1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1451 { 1498 {
1452 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1453 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
1454 } 1501 }
1455
1456 line->l = min (line->l + count, ncol);
1457 1502
1458 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1505 {
1461 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1507 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1508 CLEAR_SELECTION ();
1464 else 1509 else
1510 {
1465 { /* shift selection */ 1511 /* shift selection */
1466 selection.beg.col += count; 1512 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1513 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1514 selection.end.col += count;
1469 } 1515 }
1470 } 1516 }
… …
1475 case ERASE: 1521 case ERASE:
1476 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1477 selection_check (1); 1523 selection_check (1);
1478 screen.cur.col -= count; 1524 screen.cur.col -= count;
1479 1525
1480 line->l = max (line->l - count, 0); 1526 // nuke wide char after the end
1527 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1528 scr_kill_char (*line, screen.cur.col + count);
1529
1481 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1482 break; 1531 break;
1483 1532
1484 case DELETE: 1533 case DELETE:
1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 line->l = max (line->l - count, 0);
1486 1535
1536 // nuke wide char spanning the end
1537 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1538 scr_kill_char (*line, screen.cur.col + count);
1539
1487 for (col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1488 { 1541 {
1489 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1490 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1491 } 1544 }
1492 1545
1493 line->l = max (line->l - count, 0);
1494 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1495 1547
1496 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1498 { 1550 {
1499 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1609 */ 1661 */
1610void 1662void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1663rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1664{
1613 if (mode < 0) 1665 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1666 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1667 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1668 tabs [screen.cur.col] = !!mode;
1617} 1669}
1618 1670
1619/* ------------------------------------------------------------------------- */ 1671/* ------------------------------------------------------------------------- */
… …
1634 if (rvideo_state != on) 1686 if (rvideo_state != on)
1635 { 1687 {
1636 rvideo_state = on; 1688 rvideo_state = on;
1637 1689
1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1639#if XPM_BACKGROUND 1691#ifdef HAVE_BG_PIXMAP
1640 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1641#endif 1693#endif
1642#if TRANSPARENT
1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1644#endif
1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1694 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1646 1695
1647 XGCValues gcvalue; 1696 XGCValues gcvalue;
1648 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1649 gcvalue.background = pix_colors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1699 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1651 1700
1652 scr_clear (); 1701 scr_clear ();
1653 scr_touch (true); 1702 scr_touch (true);
1654 } 1703 }
1655} 1704}
… …
1740{ 1789{
1741 bool found = false; 1790 bool found = false;
1742 1791
1743 for (int i = 0; i < nrow; i++) 1792 for (int i = 0; i < nrow; i++)
1744 { 1793 {
1745 int col = 0;
1746 rend_t *drp = drawn_buf[i].r; 1794 rend_t *drp = drawn_buf[i].r;
1747 1795
1748 for (; col < ncol; col++, drp++) 1796 for (int col = 0; col < ncol; col++, drp++)
1749 if ((*drp & mask) == value) 1797 if ((*drp & mask) == value)
1750 { 1798 {
1751 found = true; 1799 found = true;
1752 *drp = ~value; 1800 *drp = ~value;
1753 } 1801 }
… …
1858 return true; 1906 return true;
1859} 1907}
1860 1908
1861#ifndef NO_BELL 1909#ifndef NO_BELL
1862void 1910void
1863rxvt_term::bell_cb (time_watcher &w) 1911rxvt_term::bell_cb (ev::timer &w, int revents)
1864{ 1912{
1865 rvideo_bell = false; 1913 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode); 1914 scr_rvideo_mode (rvideo_mode);
1915 refresh_check ();
1867} 1916}
1868#endif 1917#endif
1869 1918
1870/* ------------------------------------------------------------------------- */ 1919/* ------------------------------------------------------------------------- */
1871void 1920void
… …
1873{ 1922{
1874#ifndef NO_BELL 1923#ifndef NO_BELL
1875 1924
1876# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1878 if (OPTION (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1879# endif 1928# endif
1880 XMapWindow (display->display, parent[0]); 1929 XMapWindow (dpy, parent);
1881# endif 1930# endif
1882 1931
1932# if ENABLE_FRILLS
1933 if (option (Opt_urgentOnBell))
1934 set_urgency (1);
1935# endif
1936
1883 if (OPTION (Opt_visualBell)) 1937 if (option (Opt_visualBell))
1884 { 1938 {
1885 rvideo_bell = true; 1939 rvideo_bell = true;
1886 scr_rvideo_mode (rvideo_mode); 1940 scr_rvideo_mode (rvideo_mode);
1887 display->flush (); 1941 flush ();
1888 1942
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1890 } 1944 }
1891 else 1945 else
1892 XBell (display->display, 0); 1946 XBell (dpy, 0);
1893 1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1894#endif 1948#endif
1895} 1949}
1896 1950
1897/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1898/* ARGSUSED */ 1952/* ARGSUSED */
1899void 1953void
1900rxvt_term::scr_printscreen (int fullhist) NOTHROW 1954rxvt_term::scr_printscreen (int fullhist) NOTHROW
1901{ 1955{
1902#ifdef PRINTPIPE 1956#ifdef PRINTPIPE
1903 int nrows, row_start; 1957 int nrows, row_start;
1904 FILE *fd; 1958 FILE *fd = popen_printer ();
1905 1959
1906 if ((fd = popen_printer ()) == NULL) 1960 if (!fd)
1907 return; 1961 return;
1908 1962
1909 if (fullhist) 1963 if (fullhist)
1910 { 1964 {
1911 nrows = nrow - top_row; 1965 nrows = nrow - top_row;
… …
1917 row_start = view_start; 1971 row_start = view_start;
1918 } 1972 }
1919 1973
1920 wctomb (0, 0); 1974 wctomb (0, 0);
1921 1975
1922 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1923 { 1977 {
1924 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1925 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1926 1980
1927 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1956 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
1957 */ 2011 */
1958void 2012void
1959rxvt_term::scr_refresh () NOTHROW 2013rxvt_term::scr_refresh () NOTHROW
1960{ 2014{
1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1962 showcursor; /* show the cursor */
1963 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
1964 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
1965 int i; /* tmp */ 2017 int i; /* tmp */
1966#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 2020#endif
1969 rend_t *crp; // cursor rendition pointer 2021 rend_t *crp; // cursor rendition pointer
2022 rend_t ccol1, /* Cursor colour */
2023 ccol2; /* Cursor colour2 */
1970 2024
1971 want_refresh = 0; /* screen is current */ 2025 want_refresh = 0; /* screen is current */
1972 2026
1973 if (refresh_type == NO_REFRESH || !mapped) 2027 if (refresh_type == NO_REFRESH || !mapped)
1974 return; 2028 return;
1975 2029
1976 /* 2030 /*
1977 * A: set up vars 2031 * A: set up vars
1978 */ 2032 */
1979 must_clear = 0;
1980 refresh_count = 0; 2033 refresh_count = 0;
1981 2034
1982#if XPM_BACKGROUND 2035 unsigned int old_screen_flags = screen.flags;
1983 must_clear |= bgPixmap.pixmap != None; 2036 char have_bg = 0;
1984#endif 2037#ifdef HAVE_BG_PIXMAP
1985#if TRANSPARENT 2038 have_bg = bg_pixmap != None;
1986 must_clear |= OPTION (Opt_transparent) && am_transparent;
1987#endif 2039#endif
1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1989 2041
1990 /* 2042 /*
1991 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
1992 */ 2044 */
1993 scr_reverse_selection (); 2045 scr_reverse_selection ();
2046
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY
2049 scr_swap_overlay ();
2050#endif
2051
2052 char showcursor = screen.flags & Screen_VisibleCursor;
1994 2053
1995 /* 2054 /*
1996 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
1997 */ 2056 */
1998 { 2057 {
1999 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
2002 2059
2003 showcursor = (screen.flags & Screen_VisibleCursor);
2004#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
2005 if (hidden_cursor) 2061 if (hidden_cursor)
2006 showcursor = 0; 2062 showcursor = 0;
2007#endif 2063#endif
2008 2064
… …
2013 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2069 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2014 col--; 2070 col--;
2015 2071
2016 crp = &ROW(screen.cur.row).r[col]; 2072 crp = &ROW(screen.cur.row).r[col];
2017 2073
2018 if (showcursor && focus) 2074#ifndef NO_CURSORCOLOR
2075 cc1 = *crp & (RS_fgMask | RS_bgMask);
2076 if (ISSET_PIXCOLOR (Color_cursor))
2077 ccol1 = Color_cursor;
2078 else
2079#endif
2080#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2081 ccol1 = fgcolor_of (rstyle);
2082#else
2083 ccol1 = Color_fg;
2084#endif
2085
2086#ifndef NO_CURSORCOLOR
2087 if (ISSET_PIXCOLOR (Color_cursor2))
2088 ccol2 = Color_cursor2;
2089 else
2090#endif
2091#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2092 ccol2 = bgcolor_of (rstyle);
2093#else
2094 ccol2 = Color_bg;
2095#endif
2096
2097 if (focus)
2019 { 2098 {
2020 if (OPTION (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2021 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2022 else 2101 else
2023 { 2102 {
2024 *crp ^= RS_RVid; 2103 *crp ^= RS_RVid;
2025
2026#ifndef NO_CURSORCOLOR
2027 cc1 = *crp & (RS_fgMask | RS_bgMask);
2028 if (ISSET_PIXCOLOR (Color_cursor))
2029 ccol1 = Color_cursor;
2030 else
2031#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2032 ccol1 = fgcolor_of (rstyle);
2033#else
2034 ccol1 = Color_fg;
2035#endif
2036 if (ISSET_PIXCOLOR (Color_cursor2))
2037 ccol2 = Color_cursor2;
2038 else
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol2 = bgcolor_of (rstyle);
2041#else
2042 ccol2 = Color_bg;
2043#endif
2044 *crp = SET_FGCOLOR (*crp, ccol1); 2104 *crp = SET_FGCOLOR (*crp, ccol1);
2045 *crp = SET_BGCOLOR (*crp, ccol2); 2105 *crp = SET_BGCOLOR (*crp, ccol2);
2046#endif
2047 } 2106 }
2048 } 2107 }
2049 } 2108 }
2050 2109
2051 /* make sure no outline cursor is left around */ 2110 /* make sure no outline cursor is left around */
… …
2078 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2079 } 2138 }
2080 } 2139 }
2081 } 2140 }
2082 2141
2083 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2084#if ENABLE_OVERLAY
2085 scr_swap_overlay ();
2086#endif
2087
2088#ifndef NO_SLOW_LINK_SUPPORT 2142#ifndef NO_SLOW_LINK_SUPPORT
2089 /* 2143 /*
2090 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2091 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2092 */ 2146 */
2093 if (!display->is_local 2147 if (!display->is_local
2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2148 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2095 && abs (num_scr) < nrow && !must_clear) 2149 && abs (num_scr) < nrow && !have_bg)
2096 { 2150 {
2097 int16_t nits; 2151 int16_t nits;
2152 int i = num_scr;
2098 int j; 2153 int j;
2099 int len, wlen; 2154 int len, wlen;
2100 dLocal (int, num_scr); 2155 dLocal (int, num_scr);
2101 2156
2102 j = nrow; 2157 j = nrow;
2103 wlen = len = -1; 2158 wlen = len = -1;
2104 row = i > 0 ? 0 : j - 1; 2159 row = i > 0 ? 0 : j - 1;
2160
2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2161 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2106 { 2162 {
2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2163 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2108 { 2164 {
2109 line_t s = ROW(view_start + row); 2165 line_t s = ROW(view_start + row);
… …
2130 wlen = row; 2186 wlen = row;
2131 continue; 2187 continue;
2132 } 2188 }
2133 } 2189 }
2134 2190
2135 if (len != -1) 2191 if (len >= 0)
2136 { 2192 {
2137 /* also comes here at end if needed because of >= above */ 2193 /* also comes here at end if needed because of >= above */
2138 if (wlen < len) 2194 if (wlen < len)
2139 ::swap (wlen, len); 2195 ::swap (wlen, len);
2140 2196
2197 XGCValues gcv;
2198
2199 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2141 XCopyArea (display->display, vt, vt, 2200 XCopyArea (dpy, vt, vt,
2142 gc, 0, Row2Pixel (len + i), 2201 gc, 0, Row2Pixel (len + i),
2143 (unsigned int)this->width, 2202 (unsigned int)this->width,
2144 (unsigned int)Height2Pixel (wlen - len + 1), 2203 (unsigned int)Height2Pixel (wlen - len + 1),
2145 0, Row2Pixel (len)); 2204 0, Row2Pixel (len));
2205 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2206
2146 len = -1; 2207 len = -1;
2147 } 2208 }
2148 } 2209 }
2149 } 2210 }
2150#endif 2211#endif
… …
2174 continue; 2235 continue;
2175 2236
2176 // redraw one or more characters 2237 // redraw one or more characters
2177 2238
2178 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2179 while (stp[col] == NOCHAR && col > 0) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2180 --col; 2241 --col;
2181 2242
2182 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2183 text_t *text = stp + col; 2244 text_t *text = stp + col;
2184 int count = 1; 2245 int count = 1;
2185 2246
2186 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2187 drp[col] = rend; 2248 drp[col] = rend;
… …
2191 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2192 { 2253 {
2193 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2194 { 2255 {
2195 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2196 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2197 count++; 2259 count++;
2198 i++; 2260 i++;
2199 2261
2200 continue; 2262 continue;
2201 } 2263 }
… …
2206 count++; 2268 count++;
2207 2269
2208 if (stp[col] != dtp[col] 2270 if (stp[col] != dtp[col]
2209 || !RS_SAME (srp[col], drp[col])) 2271 || !RS_SAME (srp[col], drp[col]))
2210 { 2272 {
2211 if (must_clear && (i++ > count / 2)) 2273 if (have_bg && (i++ > count / 2))
2212 break; 2274 break;
2213 2275
2214 dtp[col] = stp[col]; 2276 dtp[col] = stp[col];
2215 drp[col] = rend; 2277 drp[col] = rend;
2216 i = 0; 2278 i = 0;
2217 } 2279 }
2218 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2280 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2219 break; 2281 break;
2220 } 2282 }
2221 2283
2222 col--; /* went one too far. move back */ 2284 col--; /* went one too far. move back */
2223 count -= i; /* dump any matching trailing chars */ 2285 count -= i; /* dump any matching trailing chars */
2224 2286
2225 // sometimes we optimize away the trailing NOCHAR's, add them back 2287 // sometimes we optimize away the trailing NOCHAR's, add them back
2226 while (i && text[count] == NOCHAR) 2288 while (expect_false (i && text[count] == NOCHAR))
2227 count++, i--; 2289 count++, i--;
2228 2290
2229 /* 2291 /*
2230 * Determine the attributes for the string 2292 * Determine the attributes for the string
2231 */ 2293 */
2232 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2233 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2234 2296
2235 // only do special processing if any attributes are set, which is unlikely 2297 // only do special processing if any attributes are set, which is unlikely
2236 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2237 { 2299 {
2238#if ENABLE_STYLES
2239 // force redraw after "careful" characters to avoid pixel droppings
2240 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2241 drp[col + 1] = ~srp[col + 1];
2242
2243 // include previous careful character(s) if possible, looks nicer (best effort...)
2244 while (text > stp
2245 && srp[text - stp - 1] & RS_Careful
2246 && RS_SAME (rend, srp[text - stp - 1]))
2247 text--, count++, xpixel -= fwidth;
2248#endif
2249
2250 bool invert = rend & RS_RVid; 2300 bool invert = rend & RS_RVid;
2251 2301
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2253 if (rend & RS_Bold
2254 && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
2255 { 2304 {
2256 if (ISSET_PIXCOLOR (Color_BD)) 2305 if (ISSET_PIXCOLOR (Color_BD))
2257 fore = Color_BD; 2306 fore = Color_BD;
2258# if !ENABLE_STYLES 2307# if !ENABLE_STYLES
2259 else 2308 else
2260 invert = !invert; 2309 invert = !invert;
2261# endif 2310# endif
2262 } 2311 }
2263 2312
2264 if (rend & RS_Italic 2313 if (rend & RS_Italic && fore == Color_fg)
2265 && fore == Color_fg)
2266 { 2314 {
2267 if (ISSET_PIXCOLOR (Color_IT)) 2315 if (ISSET_PIXCOLOR (Color_IT))
2268 fore = Color_IT; 2316 fore = Color_IT;
2269# if !ENABLE_STYLES 2317# if !ENABLE_STYLES
2270 else 2318 else
2271 invert = !invert; 2319 invert = !invert;
2272# endif 2320# endif
2273 } 2321 }
2274 2322
2275 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2276 fore = Color_UL; 2324 fore = Color_UL;
2325#endif
2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2277#endif 2345#endif
2278 2346
2279 if (invert) 2347 if (invert)
2280 { 2348 {
2281 ::swap (fore, back); 2349 ::swap (fore, back);
2282 2350
2283#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2284 if (ISSET_PIXCOLOR (Color_RV))
2285 back = Color_RV;
2286
2287 if (fore == back) 2352 if (fore == back)
2288 { 2353 {
2289 fore = Color_bg; 2354 fore = Color_bg;
2290 back = Color_fg; 2355 back = Color_fg;
2291 } 2356 }
… …
2293 } 2358 }
2294 2359
2295#ifdef TEXT_BLINK 2360#ifdef TEXT_BLINK
2296 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2361 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2297 { 2362 {
2298 if (!text_blink_ev.active) 2363 if (!text_blink_ev.is_active ())
2299 { 2364 {
2300 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2365 text_blink_ev.again ();
2301 hidden_text = 0; 2366 hidden_text = 0;
2302 } 2367 }
2303 else if (hidden_text) 2368 else if (hidden_text)
2304 fore = back; 2369 fore = back;
2305 } 2370 }
2306#endif 2371#endif
2372
2373#if ENABLE_STYLES
2374 // "careful" (too wide) character handling
2375
2376 // include previous careful character(s) if possible, looks nicer (best effort...)
2377 while (text > stp
2378 && srp[text - stp - 1] & RS_Careful
2379 && RS_SAME (rend, srp[text - stp - 1]))
2380 text--, count++, xpixel -= fwidth;
2381
2382 // force redraw after "careful" characters to avoid pixel droppings
2383 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2384 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2385
2386 // force redraw before "careful" characters to avoid pixel droppings
2387 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2388 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2389#endif
2307 } 2390 }
2308 2391
2309 /* 2392 /*
2310 * Actually do the drawing of the string here 2393 * Actually do the drawing of the string here
2311 */ 2394 */
2312 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2313 2396
2314 if (back == fore) 2397 if (expect_true (have_bg && back == Color_bg))
2315 font->clear_rect (*drawable, xpixel, ypixel,
2316 fwidth * count, fheight,
2317 back);
2318 else if (back == Color_bg)
2319 { 2398 {
2320 if (must_clear) 2399 // this is very ugly, maybe push it into ->draw?
2321 {
2322 CLEAR_CHARS (xpixel, ypixel, count);
2323 2400
2324 for (i = 0; i < count; i++) /* don't draw empty strings */ 2401 for (i = 0; i < count; i++) /* don't draw empty strings */
2325 if (text[i] != ' ') 2402 if (text[i] != ' ')
2326 { 2403 {
2327 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2328 break; 2405 goto did_clear;
2329 }
2330 } 2406 }
2331 else 2407
2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2408 CLEAR_CHARS (xpixel, ypixel, count);
2409 did_clear: ;
2333 } 2410 }
2334 else 2411 else
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2336 2413
2337 if (rend & RS_Uline && font->descent > 1 && fore != back) 2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2338 { 2415 {
2339#if ENABLE_FRILLS 2416#if ENABLE_FRILLS
2340 if (ISSET_PIXCOLOR (Color_underline)) 2417 if (ISSET_PIXCOLOR (Color_underline))
2341 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2418 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2342 else 2419 else
2343#endif 2420#endif
2344 XSetForeground (display->display, gc, pix_colors[fore]); 2421 XSetForeground (dpy, gc, pix_colors[fore]);
2345 2422
2346 XDrawLine (display->display, drawBuffer, gc, 2423 XDrawLine (dpy, vt, gc,
2347 xpixel, ypixel + font->ascent + 1, 2424 xpixel, ypixel + font->ascent + 1,
2348 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2349 } 2426 }
2350 } /* for (col....) */ 2427 } /* for (col....) */
2351 } /* for (row....) */ 2428 } /* for (row....) */
2352 2429
2353#if ENABLE_OVERLAY
2354 scr_swap_overlay ();
2355#endif
2356 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2357
2358 /* 2430 /*
2359 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2360 */ 2432 */
2361 if (showcursor) 2433 if (showcursor)
2362 { 2434 {
2363 if (focus) 2435 if (focus)
2364 { 2436 {
2365 if (OPTION (Opt_cursorUnderline)) 2437 if (option (Opt_cursorUnderline))
2366 *crp ^= RS_Uline; 2438 *crp ^= RS_Uline;
2367 else 2439 else
2368 { 2440 {
2369 *crp ^= RS_RVid; 2441 *crp ^= RS_RVid;
2370#ifndef NO_CURSORCOLOR 2442#ifndef NO_CURSORCOLOR
… …
2384 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2456 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2457 cursorwidth++;
2386 2458
2387#ifndef NO_CURSORCOLOR 2459#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2460 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2461 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2462 else
2390#endif 2463#endif
2464 XSetForeground (dpy, gc, pix_colors[ccol1]);
2391 2465
2392 XDrawRectangle (display->display, drawBuffer, gc, 2466 XDrawRectangle (dpy, vt, gc,
2393 Col2Pixel (col), 2467 Col2Pixel (col),
2394 Row2Pixel (oldcursor.row), 2468 Row2Pixel (oldcursor.row),
2395 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2469 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2396 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2397 } 2471 }
2398 } 2472 }
2399 2473
2400 /* 2474 /*
2401 * H: cleanup selection 2475 * H: cleanup selection
2402 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2403 scr_reverse_selection (); 2482 scr_reverse_selection ();
2404 2483
2484 screen.flags = old_screen_flags;
2405 num_scr = 0; 2485 num_scr = 0;
2406 num_scr_allow = 1; 2486 num_scr_allow = 1;
2407} 2487}
2408 2488
2409void 2489void
… …
2430 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2431 } 2511 }
2432} 2512}
2433 2513
2434void 2514void
2435rxvt_term::scr_recolour () NOTHROW 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2436{ 2516{
2437 if (1 2517 bool transparent = false;
2438#if TRANSPARENT 2518
2439 && !am_transparent 2519#ifdef HAVE_BG_PIXMAP
2520 if (bg_pixmap != None)
2521 {
2522# ifdef ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT)
2524 {
2525 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2527
2528 transparent = true;
2529 }
2530 else
2440#endif 2531# endif
2441#if XPM_BACKGROUND
2442 && !bgPixmap.pixmap
2443#endif
2444 ) 2532 {
2533 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2535 }
2445 { 2536 }
2537 else
2538#endif
2539 {
2446 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2447 XClearWindow (display->display, parent[0]);
2448 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2449#if HAVE_SCROLLBARS 2542 }
2543
2544 XClearWindow (dpy, parent);
2545
2450 if (scrollBar.win) 2546 if (scrollBar.win)
2451 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2452 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2453 scrollBar.setIdle (); 2552 scrollBar.state = STATE_IDLE;
2454 scrollbar_show (0); 2553 scrollBar.show (0);
2455 } 2554 }
2456#endif 2555
2556 if (refresh)
2457 } 2557 {
2458
2459 scr_clear (); 2558 scr_clear ();
2460 scr_touch (true); 2559 scr_touch (true);
2560 }
2461 want_refresh = 1; 2561 want_refresh = 1;
2462} 2562}
2463 2563
2464/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2465void 2565void
… …
2470 2570
2471 num_scr_allow = 0; 2571 num_scr_allow = 0;
2472 want_refresh = 1; 2572 want_refresh = 1;
2473 2573
2474 if (really) 2574 if (really)
2475 XClearWindow (display->display, vt); 2575 XClearWindow (dpy, vt);
2476} 2576}
2477 2577
2478void 2578void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2579rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{ 2580{
… …
2529{ 2629{
2530 if (selection.op 2630 if (selection.op
2531 && current_screen == selection.screen 2631 && current_screen == selection.screen
2532 && selection.end.row >= view_start) 2632 && selection.end.row >= view_start)
2533 { 2633 {
2534#if ENABLE_FRILLS 2634#if !ENABLE_MINIMAL
2535 if (selection.rect) 2635 if (selection.rect)
2536 scr_xor_rect (selection.beg.row, selection.beg.col, 2636 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 selection.end.row, selection.end.col, 2637 selection.end.row, selection.end.col,
2538 RS_RVid, RS_RVid | RS_Uline); 2638 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2539 else 2639 else
2540#endif 2640#endif
2541 scr_xor_span (selection.beg.row, selection.beg.col, 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2542 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2543 RS_RVid); 2643 RS_Sel | RS_RVid);
2544 } 2644 }
2545} 2645}
2546 2646
2547/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2548/* 2648/*
… …
2553void 2653void
2554rxvt_term::scr_dump (int fd) NOTHROW 2654rxvt_term::scr_dump (int fd) NOTHROW
2555{ 2655{
2556 int row, wrote; 2656 int row, wrote;
2557 unsigned int width, towrite; 2657 unsigned int width, towrite;
2558 char r1[] = "\n"; 2658 const char r1[] = "\n";
2559 2659
2560 for (row = saveLines - nsaved; 2660 for (row = saveLines + top_row;
2561 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2562 { 2662 {
2563 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
2564 : ncol; 2664 : ncol;
2565 for (towrite = width; towrite; towrite -= wrote) 2665 for (towrite = width; towrite; towrite -= wrote)
… …
2609/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2610/* 2710/*
2611 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2612 */ 2712 */
2613void 2713void
2614rxvt_term::paste (char *data, unsigned int len) NOTHROW 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2615{ 2715{
2616 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2617 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2618 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2619 data[i] = C0_CR; 2719 data[i] = C0_CR;
2620 2720
2721 if (priv_modes & PrivMode_BracketPaste)
2722 tt_printf ("\e[200~");
2723
2621 tt_write (data, len); 2724 tt_write (data, len);
2622}
2623 2725
2624/* ------------------------------------------------------------------------- */ 2726 if (priv_modes & PrivMode_BracketPaste)
2625/* 2727 tt_printf ("\e[201~");
2626 * Respond to a notification that a primary selection has been sent
2627 * EXT: SelectionNotify
2628 */
2629void
2630rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2631{
2632 if (prop == None) /* check for failed XConvertSelection */
2633 {
2634 if ((selection_type & Sel_CompoundText))
2635 {
2636 int selnum = selection_type & Sel_whereMask;
2637
2638 selection_type = 0;
2639 if (selnum != Sel_direct)
2640 selection_request_other (XA_STRING, selnum);
2641 }
2642
2643 if ((selection_type & Sel_UTF8String))
2644 {
2645 int selnum = selection_type & Sel_whereMask;
2646
2647 selection_type = Sel_CompoundText;
2648 if (selnum != Sel_direct)
2649 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2650 else
2651 selection_type = 0;
2652 }
2653
2654 return;
2655 }
2656
2657 unsigned long bytes_after;
2658 XTextProperty ct;
2659
2660 if (XGetWindowProperty (display->display, win, prop,
2661 0, PROP_SIZE / 4,
2662 delete_prop, AnyPropertyType,
2663 &ct.encoding, &ct.format,
2664 &ct.nitems, &bytes_after,
2665 &ct.value) != Success)
2666 {
2667 ct.value = 0;
2668 goto bailout;
2669 }
2670
2671 if (ct.encoding == None)
2672 goto bailout;
2673
2674 if (bytes_after)
2675 {
2676 // fetch and append remaining data
2677 XTextProperty ct2;
2678
2679 if (XGetWindowProperty (display->display, win, prop,
2680 ct.nitems / 4, (bytes_after + 3) / 4,
2681 delete_prop, AnyPropertyType,
2682 &ct2.encoding, &ct2.format,
2683 &ct2.nitems, &bytes_after,
2684 &ct2.value) != Success)
2685 goto bailout;
2686
2687 // realloc should be compatible to XFree, here, and elsewhere, too
2688 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2689 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2690 ct.nitems += ct2.nitems;
2691
2692 XFree (ct2.value);
2693 }
2694
2695 if (ct.value == 0)
2696 goto bailout;
2697
2698 if (ct.encoding == xa[XA_INCR])
2699 {
2700 // INCR selection, start handshake
2701 if (!delete_prop)
2702 XDeleteProperty (display->display, win, prop);
2703
2704 selection_wait = Sel_incr;
2705 incr_buf_fill = 0;
2706 incr_ev.start (NOW + 10);
2707
2708 goto bailout;
2709 }
2710
2711 if (ct.nitems == 0)
2712 {
2713 if (selection_wait == Sel_incr)
2714 {
2715 XFree (ct.value);
2716
2717 // finally complete, now paste the whole thing
2718 selection_wait = Sel_normal;
2719 ct.value = (unsigned char *)incr_buf;
2720 ct.nitems = incr_buf_fill;
2721 incr_buf = 0;
2722 incr_buf_size = 0;
2723 incr_ev.stop ();
2724 }
2725 else
2726 {
2727 if (selection_wait == Sel_normal
2728 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2729 {
2730 /*
2731 * pass through again trying CUT_BUFFER0 if we've come from
2732 * XConvertSelection () but nothing was presented
2733 */
2734 selection_paste (display->root, XA_CUT_BUFFER0, False);
2735 }
2736
2737 goto bailout;
2738 }
2739 }
2740 else if (selection_wait == Sel_incr)
2741 {
2742 incr_ev.start (NOW + 10);
2743
2744 while (incr_buf_fill + ct.nitems > incr_buf_size)
2745 {
2746 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2747 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2748 }
2749
2750 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2751 incr_buf_fill += ct.nitems;
2752
2753 goto bailout;
2754 }
2755
2756 char **cl;
2757 int cr;
2758
2759#if ENABLE_FRILLS
2760 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2761 // so recode it manually
2762 if (ct.encoding == xa[XA_UTF8_STRING])
2763 {
2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2765 char *s = rxvt_wcstombs (w);
2766 free (w);
2767 // TODO: strlen == only the first element will be converted. well...
2768 paste (s, strlen (s));
2769 free (s);
2770 }
2771 else
2772#endif
2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2774 && cl)
2775 {
2776 for (int i = 0; i < cr; i++)
2777 paste (cl[i], strlen (cl[i]));
2778
2779 XFreeStringList (cl);
2780 }
2781 else
2782 paste ((char *)ct.value, ct.nitems); // paste raw
2783
2784bailout:
2785 XFree (ct.value);
2786
2787 if (selection_wait == Sel_normal)
2788 selection_wait = Sel_none;
2789} 2728}
2790 2729
2791void 2730void
2792rxvt_term::incr_cb (time_watcher &w) NOTHROW 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2793{ 2732{
2794 selection_wait = Sel_none; 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2795
2796 incr_buf_size = 0;
2797 free (incr_buf);
2798
2799 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2800}
2801
2802void
2803rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2804{
2805 if (prop == None || selection_wait != Sel_incr)
2806 return; 2734 return;
2807 2735
2808 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2809} 2737}
2810 2738
2811/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2812/* 2740/*
2813 * Request the current selection: 2741 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2814 * Order: > internal selection if available 2742 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2815 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2743 * as fallback
2816 * > CUT_BUFFER0
2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2818 * will auto fallback to CUT_BUFFER0
2819 * EXT: button 2 release 2744 * EXT: button 2 release
2820 */ 2745 */
2821void 2746void
2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2747rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2823{ 2748{
2824 if (selection.text && selnum == Sel_Primary) 2749 if (!selection_req)
2825 { /* internal selection */
2826 char *str = rxvt_wcstombs (selection.text, selection.len);
2827 paste (str, strlen (str));
2828 free (str);
2829 return;
2830 } 2750 {
2831 else 2751 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2752 selection_req->run ();
2832 { 2753 }
2833 selection_request_time = tm;
2834 selection_wait = Sel_normal;
2835
2836#if X_HAVE_UTF8_STRING
2837 selection_type = Sel_UTF8String;
2838 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2839 return;
2840#else
2841 selection_type = Sel_CompoundText;
2842 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2843 return;
2844#endif
2845 }
2846
2847 selection_wait = Sel_none; /* don't loop in selection_paste () */
2848 selection_paste (display->root, XA_CUT_BUFFER0, false);
2849}
2850
2851int
2852rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2853{
2854 Atom sel;
2855
2856 selection_type |= selnum;
2857
2858 if (selnum == Sel_Primary)
2859 sel = XA_PRIMARY;
2860 else if (selnum == Sel_Secondary)
2861 sel = XA_SECONDARY;
2862 else
2863 sel = xa[XA_CLIPBOARD];
2864
2865 if (XGetSelectionOwner (display->display, sel) != None)
2866 {
2867 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2868 vt, selection_request_time);
2869 return 1;
2870 }
2871
2872 return 0;
2873} 2754}
2874 2755
2875/* ------------------------------------------------------------------------- */ 2756/* ------------------------------------------------------------------------- */
2876/* 2757/*
2877 * Clear all selected text 2758 * Clear all selected text
2878 * EXT: SelectionClear 2759 * EXT: SelectionClear
2879 */ 2760 */
2880void 2761void
2881rxvt_term::selection_clear () NOTHROW 2762rxvt_term::selection_clear (bool clipboard) NOTHROW
2882{ 2763{
2764 if (!clipboard)
2765 {
2883 want_refresh = 1; 2766 want_refresh = 1;
2884 free (selection.text); 2767 free (selection.text);
2885 selection.text = NULL; 2768 selection.text = NULL;
2886 selection.len = 0; 2769 selection.len = 0;
2887 CLEAR_SELECTION (); 2770 CLEAR_SELECTION ();
2888 2771
2889 if (display->selection_owner == this) 2772 if (display->selection_owner == this)
2890 display->selection_owner = 0; 2773 display->selection_owner = 0;
2774 }
2775 else
2776 {
2777 free (selection.clip_text);
2778 selection.clip_text = NULL;
2779 selection.clip_len = 0;
2780
2781 if (display->clipboard_owner == this)
2782 display->clipboard_owner = 0;
2783 }
2891} 2784}
2892 2785
2893/* ------------------------------------------------------------------------- */ 2786/* ------------------------------------------------------------------------- */
2894/* 2787/*
2895 * Copy a selection into the cut buffer 2788 * Copy a selection into the cut buffer
2896 * EXT: button 1 or 3 release 2789 * EXT: button 1 or 3 release
2897 */ 2790 */
2898void 2791void
2899rxvt_term::selection_make (Time tm) 2792rxvt_term::selection_make (Time tm)
2900{ 2793{
2901 int i; 2794 int size;
2902 wchar_t *new_selection_text; 2795 wchar_t *new_selection_text;
2903 text_t *t; 2796 text_t *t;
2904 2797
2905 switch (selection.op) 2798 switch (selection.op)
2906 { 2799 {
… …
2922 return; /* nothing selected, go away */ 2815 return; /* nothing selected, go away */
2923 2816
2924 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2817 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2925 return; 2818 return;
2926 2819
2927 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2820 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2928 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2821 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2929 2822
2930 int ofs = 0; 2823 int ofs = 0;
2931 int extra = 0; 2824 int extra = 0;
2932 2825
2933 int col = selection.beg.col; 2826 int col = selection.beg.col;
… …
2935 2828
2936 int end_col; 2829 int end_col;
2937 2830
2938 for (; row <= selection.end.row; row++, col = 0) 2831 for (; row <= selection.end.row; row++, col = 0)
2939 { 2832 {
2940#if ENABLE_FRILLS 2833#if !ENABLE_MINIMAL
2941 if (selection.rect) 2834 if (selection.rect)
2942 { 2835 {
2943 col = selection.beg.col; 2836 col = selection.beg.col;
2944 end_col = ncol + 1; 2837 end_col = selection.end.col;
2945 } 2838 }
2946 else 2839 else
2947#endif 2840#endif
2948 end_col = ROW(row).l; 2841 end_col = ROW(row).l;
2949 2842
2950 col = max (col, 0); 2843 col = max (col, 0);
2951 2844
2952 if (row == selection.end.row 2845 if (row == selection.end.row)
2953#if ENABLE_FRILLS
2954 || selection.rect
2955#endif
2956 )
2957 min_it (end_col, selection.end.col); 2846 min_it (end_col, selection.end.col);
2958 2847
2959 t = ROW(row).t + col; 2848 t = ROW(row).t + col;
2960 2849
2961 for (; col < end_col; col++) 2850 for (; col < end_col; col++)
… …
2969 2858
2970 extra -= (len - 1); 2859 extra -= (len - 1);
2971 2860
2972 if (extra < 0) 2861 if (extra < 0)
2973 { 2862 {
2974 extra += i; 2863 extra += size;
2975 i += i; 2864 size += size;
2976 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2865 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2977 } 2866 }
2978 2867
2979 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2868 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2980 } 2869 }
2981#endif 2870#endif
2982 else 2871 else
2983 new_selection_text[ofs++] = *t++; 2872 new_selection_text[ofs++] = *t++;
2984 } 2873 }
2985 2874
2986#if ENABLE_FRILLS 2875#if !ENABLE_MINIMAL
2987 if (selection.rect) 2876 if (selection.rect)
2988 { 2877 {
2989 while (ofs 2878 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF 2879 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1])) 2880 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2993 2882
2994 new_selection_text[ofs++] = C0_LF; 2883 new_selection_text[ofs++] = C0_LF;
2995 } 2884 }
2996 else 2885 else
2997#endif 2886#endif
2998 if (!ROW(row).is_longer () && row != selection.end.row) 2887 if (!ROW(row).is_longer ()
2888 && (row != selection.end.row || end_col != selection.end.col)
2889 && (row != selection.beg.row || selection.beg.col < ncol))
2999 new_selection_text[ofs++] = C0_LF; 2890 new_selection_text[ofs++] = C0_LF;
3000 } 2891 }
3001
3002 if (end_col != selection.end.col)
3003 new_selection_text[ofs++] = C0_LF;
3004 2892
3005 new_selection_text[ofs] = 0; 2893 new_selection_text[ofs] = 0;
3006 2894
3007 if (ofs == 0) 2895 if (ofs == 0)
3008 { 2896 {
… …
3021 2909
3022 selection_grab (tm); 2910 selection_grab (tm);
3023} 2911}
3024 2912
3025bool 2913bool
3026rxvt_term::selection_grab (Time tm) NOTHROW 2914rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3027{ 2915{
2916 Atom sel;
2917
2918 if (!clipboard)
2919 {
3028 selection_time = tm; 2920 selection_time = tm;
3029 2921 sel = XA_PRIMARY;
3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3032 { 2922 }
2923 else
2924 {
2925 clipboard_time = tm;
2926 sel = xa[XA_CLIPBOARD];
2927 }
2928
2929 XSetSelectionOwner (dpy, sel, vt, tm);
2930 if (XGetSelectionOwner (dpy, sel) == vt)
2931 {
3033 display->set_selection_owner (this); 2932 display->set_selection_owner (this, clipboard);
3034 return true; 2933 return true;
3035 } 2934 }
3036 else 2935 else
3037 { 2936 {
3038 selection_clear (); 2937 selection_clear (clipboard);
3039 return false; 2938 return false;
3040 } 2939 }
3041 2940
3042#if 0 2941#if 0
3043 XTextProperty ct; 2942 XTextProperty ct;
3044 2943
3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2944 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3046 { 2945 {
3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2946 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3048 XFree (ct.value); 2947 XFree (ct.value);
3049 } 2948 }
3050#endif 2949#endif
… …
3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2995 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3097 2996
3098 while (selection.mark.col > 0 2997 while (selection.mark.col > 0
3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 2998 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3100 --selection.mark.col; 2999 --selection.mark.col;
3101 3000
3102 if (selection.op) 3001 if (selection.op)
3002 {
3103 { /* clear the old selection */ 3003 /* clear the old selection */
3104 selection.beg.row = selection.end.row = selection.mark.row; 3004 selection.beg.row = selection.end.row = selection.mark.row;
3105 selection.beg.col = selection.end.col = selection.mark.col; 3005 selection.beg.col = selection.end.col = selection.mark.col;
3106 } 3006 }
3107 3007
3108 selection.op = SELECTION_INIT; 3008 selection.op = SELECTION_INIT;
… …
3297 * a point/word/line which is either the start or end of the selection 3197 * a point/word/line which is either the start or end of the selection
3298 * and it was decided by whichever point/word/line was `fixed' at the 3198 * and it was decided by whichever point/word/line was `fixed' at the
3299 * time of the most recent button3 press 3199 * time of the most recent button3 press
3300 */ 3200 */
3301 if (button3 && buttonpress) 3201 if (button3 && buttonpress)
3202 {
3302 { /* button3 press */ 3203 /* button3 press */
3303 /* 3204 /*
3304 * first determine which edge of the selection we are closest to 3205 * first determine which edge of the selection we are closest to
3305 */ 3206 */
3306 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3207 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3307 || (!ROWCOL_IS_AFTER (pos, selection.end) 3208 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3325 selection.mark.row = selection.beg.row; 3226 selection.mark.row = selection.beg.row;
3326 selection.mark.col = selection.beg.col; 3227 selection.mark.col = selection.beg.col;
3327 } 3228 }
3328 } 3229 }
3329 else 3230 else
3231 {
3330 { /* button1 drag or button3 drag */ 3232 /* button1 drag or button3 drag */
3331 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3233 if (ROWCOL_IS_AFTER (selection.mark, pos))
3332 { 3234 {
3333 if (selection.mark.row == selection.end.row 3235 if (selection.mark.row == selection.end.row
3334 && selection.mark.col == selection.end.col 3236 && selection.mark.col == selection.end.col
3335 && clickchange 3237 && clickchange
… …
3352 3254
3353 if (selection.clicks == 1) 3255 if (selection.clicks == 1)
3354 { 3256 {
3355 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3257 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.beg.row).is_longer () 3258 && !ROW(selection.beg.row).is_longer ()
3357#if ENABLE_FRILLS 3259#if !ENABLE_MINIMAL
3358 && !selection.rect 3260 && !selection.rect
3359#endif 3261#endif
3360 ) 3262 )
3361 selection.beg.col = ncol; 3263 selection.beg.col = ncol;
3362 3264
3363 if ( 3265 if (
3364 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3266 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.end.row).is_longer () 3267 && !ROW(selection.end.row).is_longer ()
3366#if ENABLE_FRILLS 3268#if !ENABLE_MINIMAL
3367 && !selection.rect 3269 && !selection.rect
3368#endif 3270#endif
3369 ) 3271 )
3370 selection.end.col = ncol; 3272 selection.end.col = ncol;
3371 } 3273 }
… …
3378 selection_delimit_word (DN, &selection.end, &selection.end); 3280 selection_delimit_word (DN, &selection.end, &selection.end);
3379 } 3281 }
3380 else if (selection.clicks == 3) 3282 else if (selection.clicks == 3)
3381 { 3283 {
3382#if ENABLE_FRILLS 3284#if ENABLE_FRILLS
3383 if (OPTION (Opt_tripleclickwords)) 3285 if (option (Opt_tripleclickwords))
3384 { 3286 {
3385 selection_delimit_word (UP, &selection.beg, &selection.beg); 3287 selection_delimit_word (UP, &selection.beg, &selection.beg);
3386 3288
3387 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3289 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3388 { 3290 {
3389 if (!ROW(end_row).is_longer ()) 3291 if (!ROW(end_row).is_longer ())
3390 { 3292 {
3391 selection.end.row = end_row; 3293 selection.end.row = end_row;
3392 selection.end.col = ROW(end_row).l; 3294 selection.end.col = ROW(end_row).l;
3295# if !ENABLE_MINIMAL
3393 selection_remove_trailing_spaces (); 3296 selection_remove_trailing_spaces ();
3297# endif
3394 break; 3298 break;
3395 } 3299 }
3396 } 3300 }
3397 } 3301 }
3398 else 3302 else
… …
3414 selection.end.row++; 3318 selection.end.row++;
3415 } 3319 }
3416 } 3320 }
3417 3321
3418 if (button3 && buttonpress) 3322 if (button3 && buttonpress)
3323 {
3419 { /* mark may need to be changed */ 3324 /* mark may need to be changed */
3420 if (closeto == LEFT) 3325 if (closeto == LEFT)
3421 { 3326 {
3422 selection.mark.row = selection.end.row; 3327 selection.mark.row = selection.end.row;
3423 selection.mark.col = selection.end.col - (selection.clicks == 2); 3328 selection.mark.col = selection.end.col - (selection.clicks == 2);
3424 } 3329 }
… …
3427 selection.mark.row = selection.beg.row; 3332 selection.mark.row = selection.beg.row;
3428 selection.mark.col = selection.beg.col; 3333 selection.mark.col = selection.beg.col;
3429 } 3334 }
3430 } 3335 }
3431 3336
3432#if ENABLE_FRILLS 3337#if !ENABLE_MINIMAL
3433 if (selection.rect && selection.beg.col > selection.end.col) 3338 if (selection.rect && selection.beg.col > selection.end.col)
3434 ::swap (selection.beg.col, selection.end.col); 3339 ::swap (selection.beg.col, selection.end.col);
3435#endif 3340#endif
3436} 3341}
3437 3342
3438#if ENABLE_FRILLS 3343#if !ENABLE_MINIMAL
3439void 3344void
3440rxvt_term::selection_remove_trailing_spaces () NOTHROW 3345rxvt_term::selection_remove_trailing_spaces () NOTHROW
3441{ 3346{
3442 int32_t end_col, end_row; 3347 int32_t end_col, end_row;
3443 text_t *stp; 3348 text_t *stp;
… …
3497 * EXT: SelectionRequest 3402 * EXT: SelectionRequest
3498 */ 3403 */
3499void 3404void
3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3405rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3501{ 3406{
3407 Atom property = rq.property == None ? rq.target : rq.property;
3502 XSelectionEvent ev; 3408 XSelectionEvent ev;
3503 dDisp;
3504 3409
3505 ev.type = SelectionNotify; 3410 ev.type = SelectionNotify;
3506 ev.property = None; 3411 ev.property = None;
3507 ev.display = rq.display; 3412 ev.display = rq.display;
3508 ev.requestor = rq.requestor; 3413 ev.requestor = rq.requestor;
… …
3522 *target++ = xa[XA_COMPOUND_TEXT]; 3427 *target++ = xa[XA_COMPOUND_TEXT];
3523#if X_HAVE_UTF8_STRING 3428#if X_HAVE_UTF8_STRING
3524 *target++ = xa[XA_UTF8_STRING]; 3429 *target++ = xa[XA_UTF8_STRING];
3525#endif 3430#endif
3526 3431
3527 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3432 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3528 32, PropModeReplace, 3433 32, PropModeReplace,
3529 (unsigned char *)target_list, target - target_list); 3434 (unsigned char *)target_list, target - target_list);
3530 ev.property = rq.property; 3435 ev.property = property;
3531 } 3436 }
3532#if TODO // TODO 3437#if TODO // TODO
3533 else if (rq.target == xa[XA_MULTIPLE]) 3438 else if (rq.target == xa[XA_MULTIPLE])
3534 { 3439 {
3535 /* TODO: Handle MULTIPLE */ 3440 /* TODO: Handle MULTIPLE */
3536 } 3441 }
3537#endif 3442#endif
3538 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3443 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3539 { 3444 {
3540 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3445 XChangeProperty (dpy, rq.requestor, property, rq.target,
3541 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3446 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3542 ev.property = rq.property; 3447 ev.property = property;
3448 }
3449 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3450 {
3451 XChangeProperty (dpy, rq.requestor, property, rq.target,
3452 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3453 ev.property = property;
3543 } 3454 }
3544 else if (rq.target == XA_STRING 3455 else if (rq.target == XA_STRING
3545 || rq.target == xa[XA_TEXT] 3456 || rq.target == xa[XA_TEXT]
3546 || rq.target == xa[XA_COMPOUND_TEXT] 3457 || rq.target == xa[XA_COMPOUND_TEXT]
3547 || rq.target == xa[XA_UTF8_STRING] 3458 || rq.target == xa[XA_UTF8_STRING]
… …
3569 style = enc_string; 3480 style = enc_string;
3570 else if (target == xa[XA_TEXT]) 3481 else if (target == xa[XA_TEXT])
3571 style = enc_text; 3482 style = enc_text;
3572 else if (target == xa[XA_COMPOUND_TEXT]) 3483 else if (target == xa[XA_COMPOUND_TEXT])
3573 style = enc_compound_text; 3484 style = enc_compound_text;
3574#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3575 else if (target == xa[XA_UTF8_STRING]) 3486 else if (target == xa[XA_UTF8_STRING])
3576 style = enc_utf8; 3487 style = enc_utf8;
3577#endif 3488#endif
3578 else 3489 else
3579 { 3490 {
3580 target = xa[XA_COMPOUND_TEXT]; 3491 target = xa[XA_COMPOUND_TEXT];
3581 style = enc_compound_text; 3492 style = enc_compound_text;
3582 } 3493 }
3583 3494
3584 if (selection.text) 3495 if (rq.selection == XA_PRIMARY && selection.text)
3585 { 3496 {
3586 cl = selection.text; 3497 cl = selection.text;
3587 selectlen = selection.len; 3498 selectlen = selection.len;
3588 } 3499 }
3500 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3501 {
3502 cl = selection.clip_text;
3503 selectlen = selection.clip_len;
3504 }
3589 else 3505 else
3590 { 3506 {
3591 cl = L""; 3507 cl = L"";
3592 selectlen = 0; 3508 selectlen = 0;
3593 } 3509 }
3594 3510
3595#if ENABLE_FRILLS 3511#if !ENABLE_MINIMAL
3596 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3512 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3597 // so recode it manually 3513 // so recode it manually
3598 if (style == enc_utf8) 3514 if (style == enc_utf8)
3599 { 3515 {
3600 freect = 1; 3516 freect = 1;
… …
3603 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3519 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3604 ct.nitems = strlen ((char *)ct.value); 3520 ct.nitems = strlen ((char *)ct.value);
3605 } 3521 }
3606 else 3522 else
3607#endif 3523#endif
3608 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3524 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3609 freect = 1; 3525 freect = 1;
3610 else 3526 else
3611 { 3527 {
3612 /* if we failed to convert then send it raw */ 3528 /* if we failed to convert then send it raw */
3613 ct.value = (unsigned char *)cl; 3529 ct.value = (unsigned char *)cl;
3614 ct.nitems = selectlen; 3530 ct.nitems = selectlen;
3615 ct.encoding = target; 3531 ct.encoding = target;
3616 } 3532 }
3617 3533
3618 XChangeProperty (disp, rq.requestor, rq.property, 3534 XChangeProperty (dpy, rq.requestor, property,
3619 ct.encoding, 8, PropModeReplace, 3535 ct.encoding, 8, PropModeReplace,
3620 ct.value, (int)ct.nitems); 3536 ct.value, (int)ct.nitems);
3621 ev.property = rq.property; 3537 ev.property = property;
3622 3538
3623 if (freect) 3539 if (freect)
3624 XFree (ct.value); 3540 XFree (ct.value);
3625 } 3541 }
3626 3542
3627 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3543 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3628}
3629
3630/* ------------------------------------------------------------------------- *
3631 * MOUSE ROUTINES *
3632 * ------------------------------------------------------------------------- */
3633
3634/*
3635 * return col/row values corresponding to x/y pixel values
3636 */
3637void
3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3639{
3640 *x = Pixel2Col (*x);
3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3642 *y = Pixel2Row (*y);
3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3644} 3544}
3645 3545
3646/* ------------------------------------------------------------------------- */ 3546/* ------------------------------------------------------------------------- */
3647#ifdef USE_XIM 3547#ifdef USE_XIM
3648void 3548void
3649rxvt_term::im_set_position (XPoint &pos) NOTHROW 3549rxvt_term::im_set_position (XPoint &pos) NOTHROW
3650{ 3550{
3651 XWindowAttributes xwa; 3551 XWindowAttributes xwa;
3652 3552
3653 XGetWindowAttributes (display->display, vt, &xwa); 3553 XGetWindowAttributes (dpy, vt, &xwa);
3654 3554
3655 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3555 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3656 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3556 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3657} 3557}
3658#endif 3558#endif
… …
3676 h += 2; min_it (h, nrow); 3576 h += 2; min_it (h, nrow);
3677 3577
3678 x -= 1; clamp_it (x, 0, ncol - w); 3578 x -= 1; clamp_it (x, 0, ncol - w);
3679 y -= 1; clamp_it (y, 0, nrow - h); 3579 y -= 1; clamp_it (y, 0, nrow - h);
3680 3580
3681 ov_x = x; ov_y = y; 3581 ov.x = x; ov.y = y;
3682 ov_w = w; ov_h = h; 3582 ov.w = w; ov.h = h;
3683 3583
3684 ov_text = new text_t *[h]; 3584 ov.text = new text_t *[h];
3685 ov_rend = new rend_t *[h]; 3585 ov.rend = new rend_t *[h];
3686 3586
3687 for (y = 0; y < h; y++) 3587 for (y = 0; y < h; y++)
3688 { 3588 {
3689 text_t *tp = ov_text[y] = new text_t[w]; 3589 text_t *tp = ov.text[y] = new text_t[w];
3690 rend_t *rp = ov_rend[y] = new rend_t[w]; 3590 rend_t *rp = ov.rend[y] = new rend_t[w];
3691 3591
3692 text_t t0, t1, t2; 3592 text_t t0, t1, t2;
3693 rend_t r = OVERLAY_RSTYLE; 3593 rend_t r = OVERLAY_RSTYLE;
3694 3594
3695 if (y == 0) 3595 if (y == 0)
… …
3714} 3614}
3715 3615
3716void 3616void
3717rxvt_term::scr_overlay_off () NOTHROW 3617rxvt_term::scr_overlay_off () NOTHROW
3718{ 3618{
3719 if (!ov_text) 3619 if (!ov.text)
3720 return; 3620 return;
3721 3621
3722 want_refresh = 1; 3622 want_refresh = 1;
3723 3623
3724 for (int y = 0; y < ov_h; y++) 3624 for (int y = 0; y < ov.h; y++)
3725 { 3625 {
3726 delete [] ov_text[y]; 3626 delete [] ov.text[y];
3727 delete [] ov_rend[y]; 3627 delete [] ov.rend[y];
3728 } 3628 }
3729 3629
3730 delete [] ov_text; ov_text = 0; 3630 delete [] ov.text; ov.text = 0;
3731 delete [] ov_rend; ov_rend = 0; 3631 delete [] ov.rend; ov.rend = 0;
3732} 3632}
3733 3633
3734void 3634void
3735rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW 3635rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3736{ 3636{
3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3637 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3738 return; 3638 return;
3739 3639
3740 x++, y++; 3640 x++, y++;
3741 3641
3742 ov_text[y][x] = text; 3642 ov.text[y][x] = text;
3743 ov_rend[y][x] = rend; 3643 ov.rend[y][x] = rend;
3744} 3644}
3745 3645
3746void 3646void
3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW 3647rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3748{ 3648{
… …
3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3654rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3755{ 3655{
3756 while (*s) 3656 while (*s)
3757 { 3657 {
3758 text_t t = *s++; 3658 text_t t = *s++;
3759 int width = wcwidth (t); 3659 int width = WCWIDTH (t);
3760 3660
3761 while (width--) 3661 while (width--)
3762 { 3662 {
3763 scr_overlay_set (x++, y, t); 3663 scr_overlay_set (x++, y, t);
3764 t = NOCHAR; 3664 t = NOCHAR;
… …
3767} 3667}
3768 3668
3769void 3669void
3770rxvt_term::scr_swap_overlay () NOTHROW 3670rxvt_term::scr_swap_overlay () NOTHROW
3771{ 3671{
3772 if (!ov_text) 3672 if (!ov.text)
3773 return; 3673 return;
3774 3674
3675 // hide cursor if it is within the overlay area
3676 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3677 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3678 screen.flags &= ~Screen_VisibleCursor;
3679
3775 // swap screen mem with overlay 3680 // swap screen mem with overlay
3776 for (int y = ov_h; y--; ) 3681 for (int y = ov.h; y--; )
3777 { 3682 {
3778 text_t *t1 = ov_text[y]; 3683 text_t *t1 = ov.text[y];
3779 rend_t *r1 = ov_rend[y]; 3684 rend_t *r1 = ov.rend[y];
3780 3685
3781 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3686 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3782 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3687 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3783 3688
3784 for (int x = ov_w; x--; ) 3689 for (int x = ov.w; x--; )
3785 { 3690 {
3786 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3691 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3787 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3692 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3788 } 3693 }
3789 } 3694 }

Diff Legend

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