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.244 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.299 by root, Wed Jan 23 06:49:30 2008 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 <pcg@goof.com>
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 seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row> 88 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * 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 90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 91 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \ 92#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 93 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 94 XClearArea (dpy, vt, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 95 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 96 (unsigned int)Height2Pixel (num), False)
101 97
102#define CLEAR_CHARS(x, y, num) \ 98#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 99 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 100 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 101 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 102 (unsigned int)Height2Pixel (1), False)
107 103
108#define ERASE_ROWS(row, num) \ 104#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 105 XFillRectangle (dpy, vt, gc, \
110 0, Row2Pixel (row), \ 106 0, Row2Pixel (row), \
111 (unsigned int)width, \ 107 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 108 (unsigned int)Height2Pixel (num))
113 109
114/* ------------------------------------------------------------------------- * 110/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 111 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 112 * ------------------------------------------------------------------------- */
… …
126 width = ncol; 122 width = ncol;
127 } 123 }
128 124
129 l.touch (); 125 l.touch ();
130 126
131 efs &= ~RS_baseattrMask; 127 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 128 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 129
134 text_t *et = l.t + col; 130 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 131 rend_t *er = l.r + col;
136 132
… …
161{ 157{
162#if ENABLE_OVERLAY 158#if ENABLE_OVERLAY
163 scr_overlay_off (); 159 scr_overlay_off ();
164#endif 160#endif
165 161
162 rvideo_mode = false;
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
173 nrow = 24; 170 nrow = 24;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177 174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177
178 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
180 { 180 {
181 //TODO//FIXME 181 //TODO//FIXME
182 saveLines++; 182 saveLines++;
183 prev_nrow--; 183 prev_nrow--;
184 top_row--; 184 top_row--;
… …
195 if (!row_buf) 195 if (!row_buf)
196 { 196 {
197 /* 197 /*
198 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
199 */ 199 */
200 top_row = 0; /* no saved lines */ 200 top_row = 0;
201 term_start = 0; 201 term_start = 0;
202 202
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 205
… …
234 selection.text = NULL; 234 selection.text = NULL;
235 selection.len = 0; 235 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
238 selection.clicks = 0; 238 selection.clicks = 0;
239 rvideo = 0;
240 } 239 }
241 else 240 else
242 { 241 {
243 /* 242 /*
244 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 273 }
275 274
276 line_t *old_buf = row_buf; 275 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 277
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 279 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 280 int q = total_rows; // rewrapped row
282 281
283 if (top_row) 282 if (top_row)
284 { 283 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
287 286
288 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 289
… …
327 int qcol = 0; 326 int qcol = 0;
328 327
329 // see below for cursor adjustment rationale 328 // see below for cursor adjustment rationale
330 if (p == ocur.row) 329 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 330 screen.cur.row = q - (total_rows - nrow);
332 331
333 // fill a single destination line 332 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
335 { 334 {
336 int prow = lofs / prev_ncol; 335 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
… …
347 346
348 line_t &pline = old_buf [prow]; 347 line_t &pline = old_buf [prow];
349 348
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 350
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)); 351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 353
360 lofs += len; 354 lofs += len;
361 qcol += len; 355 qcol += len;
… …
368 } 362 }
369 while (p != pend && q > 0); 363 while (p != pend && q > 0);
370 364
371 term_start = total_rows - nrow; 365 term_start = total_rows - nrow;
372 top_row = q - term_start; 366 top_row = q - term_start;
373 367
374 // make sure all terminal lines exist 368 // make sure all terminal lines exist
375 while (top_row > 0) 369 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 370 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 371 }
378 else 372 else
379 { 373 {
380 // if no scrollback exists (yet), wing, instead of wrap 374 // if no scrollback exists (yet), wing, instead of wrap
381 375
382 for (int row = min (nrow, prev_nrow); row--; ) 376 for (int row = min (nrow, prev_nrow); row--; )
383 { 377 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 379 line_t &qline = row_buf [row];
386 380
… …
401 delete old_ra; 395 delete old_ra;
402 396
403 clamp_it (screen.cur.row, 0, nrow - 1); 397 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 398 clamp_it (screen.cur.col, 0, ncol - 1);
405 399
406 if (tabs)
407 free (tabs); 400 free (tabs);
408 } 401 }
409 402
410 CLEAR_ALL_SELECTION (); 403 CLEAR_ALL_SELECTION ();
411 404
412 prev_nrow = nrow; 405 prev_nrow = nrow;
413 prev_ncol = ncol; 406 prev_ncol = ncol;
414 407
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 408 tabs = (char *)rxvt_malloc (ncol);
416 409
417 for (int col = ncol; col--; ) 410 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 411 tabs [col] = col % TABSIZE == 0;
419 412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415
420 tt_winch (); 416 tt_winch ();
421 417
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 418 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 419}
424 420
… …
427 * Free everything. That way malloc debugging can find leakage. 423 * Free everything. That way malloc debugging can find leakage.
428 */ 424 */
429void 425void
430rxvt_term::scr_release () NOTHROW 426rxvt_term::scr_release () NOTHROW
431{ 427{
428 if (row_buf)
429 {
432 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
434 432
435 free (row_buf); 433 free (row_buf);
436 free (swap_buf); 434 free (swap_buf);
437 free (drawn_buf); 435 free (drawn_buf);
438 free (tabs); 436 free (tabs);
439 437
440 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
439 }
441} 440}
442 441
443/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
444/* 443/*
445 * Hard reset 444 * Hard 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;
452 scr_reset (); 451 scr_reset ();
453 452
… …
504 assert (s->cur.row >= 0); 503 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 504 assert (s->cur.col >= 0);
506#endif 505#endif
507} 506}
508 507
508void
509rxvt_term::scr_swap_screen ()
510{
511 if (!option (Opt_secondaryScreen))
512 return;
513
514 for (int i = prev_nrow; i--; )
515 ::swap (ROW(i), swap_buf [i]);
516
517 ::swap (screen.cur, swap.cur);
518
519 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
520 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
521}
522
509/* ------------------------------------------------------------------------- */ 523/* ------------------------------------------------------------------------- */
510/* 524/*
511 * Swap between primary and secondary screens 525 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 526 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 527 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 528 */
515int 529void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 530rxvt_term::scr_change_screen (int scrn)
517{ 531{
532 if (scrn == current_screen)
533 return;
534
518 want_refresh = 1; 535 want_refresh = 1;
519 view_start = 0; 536 view_start = 0;
520 537
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 538 selection_check (2); /* check for boundary cross */
525 539
526 int i = current_screen; current_screen = scrn; scrn = i; 540 int i = current_screen; current_screen = scrn; scrn = i;
527 541
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
534#if NSCREENS 542#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 543 if (option (Opt_secondaryScreen))
536 { 544 {
537 num_scr = 0; 545 num_scr = 0;
538 546
539 for (int i = prev_nrow; i--; ) 547 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 548
542 ::swap (screen.charset, swap.charset); 549 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 550 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 551 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 552 swap.flags |= Screen_VisibleCursor;
546 } 553 }
547 else 554 else
548#endif 555#endif
549 if (OPTION (Opt_secondaryScroll)) 556 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 557 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 558}
554 559
555// clear WrapNext indicator, solidifying position on next line 560// clear WrapNext indicator, solidifying position on next line
556void 561void
557rxvt_term::scr_do_wrap () NOTHROW 562rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 594/*
590 * Change the rendition style for following text 595 * Change the rendition style for following text
591 */ 596 */
592void 597void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 598rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 599{
595 if (set) 600 if (set)
596 rstyle |= style; 601 rstyle |= style;
597 else if (style == ~RS_None) 602 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 603 rstyle = DEFAULT_RSTYLE;
599 else 604 else
600 rstyle &= ~style; 605 rstyle &= ~style;
601 } 606}
602 607
603/* ------------------------------------------------------------------------- */ 608/* ------------------------------------------------------------------------- */
604/* 609/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 610 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 611 * count positive ==> scroll up
… …
615 want_refresh = 1; 620 want_refresh = 1;
616 num_scr += count; 621 num_scr += count;
617 622
618 if (count > 0 623 if (count > 0
619 && row1 == 0 624 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 625 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 626 {
622 top_row = max (top_row - count, -saveLines); 627 top_row = max (top_row - count, -saveLines);
623 628
624 // scroll everything up 'count' lines 629 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
… …
632 } 637 }
633 638
634 // erase newly scrolled-in lines 639 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 640 for (int i = count; i--; )
636 { 641 {
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); 642 line_t &l = ROW(nrow - 1 - i);
640 643
644 // optimize if already cleared, can be significant on slow machines
645 // could be rolled into scr_blank_screen_mem
646 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
647 {
641 scr_blank_line (l, 0, l.l, rstyle); 648 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 649 l.l = 0;
644 l.f = 0; 650 l.f = 0;
651 }
652 else
653 scr_blank_screen_mem (l, rstyle);
645 } 654 }
646 655
647 // now copy lines below the scroll region bottom to the 656 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 657 // bottom of the screen again, so they look as if they
649 // hadn't moved. 658 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 662 line_t &l2 = ROW(i);
654 663
655 ::swap (l1, l2); 664 ::swap (l1, l2);
656 l2.touch (); 665 l2.touch ();
657 } 666 }
658 667
659 // move and/or clear selection, if any 668 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
661 { 670 {
662 selection.beg.row -= count; 671 selection.beg.row -= count;
663 selection.end.row -= count; 672 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
672 } 681 }
673 } 682 }
674 683
675 // finally move the view window, if desired 684 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 685 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 686 && view_start != 0
678 && view_start != -saveLines) 687 && view_start != -saveLines)
679 scr_page (UP, count); 688 scr_page (UP, count);
680 689
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 708 {
700 /* move selected region too */ 709 /* move selected region too */
701 selection.beg.row -= count; 710 selection.beg.row -= count;
702 selection.end.row -= count; 711 selection.end.row -= count;
703 selection.mark.row -= count; 712 selection.mark.row -= count;
704 713
705 selection_check (0); 714 selection_check (0);
706 } 715 }
707 } 716 }
708 717
709 // use a simple and robust scrolling algorithm, this 718 // use a simple and robust scrolling algorithm, this
… …
749 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
750 759
751 if (minlines > 0) 760 if (minlines > 0)
752 { 761 {
753 minlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
754 764
755 if (minlines > 0 765 if (minlines > 0
756 && screen.tscroll == 0 766 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 767 && screen.bscroll == nrow - 1)
758 { 768 {
… …
820 } 830 }
821 831
822 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
823 { 833 {
824 scr_do_wrap (); 834 scr_do_wrap ();
825 835
826 line->l = ncol; 836 line->l = ncol;
827 line->is_longer (1); 837 line->is_longer (1);
828 838
829 row = screen.cur.row; 839 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
… …
832 842
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835 c = 0xfffd; 845 c = 0xfffd;
836 846
837 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 848 // 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 849 // drawing characters below as they might be invalid in the current
840 // locale. 850 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
842 852
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
844 { 854 {
845 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 856 // 5f-7e standard vt100
… …
999 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
1000 */ 1010 */
1001void 1011void
1002rxvt_term::scr_backspace () NOTHROW 1012rxvt_term::scr_backspace () NOTHROW
1003{ 1013{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1007 { 1015 {
1008 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1009 { 1017 {
1010#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1020 --screen.cur.row;
1013 return; 1021
1022 want_refresh = 1;
1014#endif 1023#endif
1015 } 1024 }
1016 } 1025 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1018 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1028}
1022 1029
1023/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1024/* 1031/*
1025 * Process Horizontal Tab 1032 * Process Horizontal Tab
… …
1048 x = i; 1055 x = i;
1049 1056
1050 if (!--count) 1057 if (!--count)
1051 break; 1058 break;
1052 } 1059 }
1053 else 1060 else
1054 ht &= l.t[i] == ' ' 1061 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1056 1063
1057 if (count) 1064 if (count)
1058 x = ncol - 1; 1065 x = ncol - 1;
1059 1066
1060 // store horizontal tab commands as characters inside the text 1067 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1068 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1069 if (ht && option (Opt_pastableTabs))
1063 { 1070 {
1064 base_rend = SET_FONT (base_rend, 0); 1071 base_rend = SET_FONT (base_rend, 0);
1065 1072
1066 l.touch (x); 1073 l.touch (x);
1067 1074
… …
1100 * Process DEC Back Index 1107 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1108 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1109 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1110 * in that row right. Clear left column.
1104 */ 1111 */
1105#if ENABLE_FRILLS 1112#if !ENABLE_MINIMAL
1106void 1113void
1107rxvt_term::scr_backindex () NOTHROW 1114rxvt_term::scr_backindex () NOTHROW
1108{ 1115{
1109 if (screen.cur.col > 0) 1116 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1124 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1125 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1126 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1127 * in that row left. Clear right column.
1121 */ 1128 */
1122#if ENABLE_FRILLS 1129#if !ENABLE_MINIMAL
1123void 1130void
1124rxvt_term::scr_forwardindex () NOTHROW 1131rxvt_term::scr_forwardindex () NOTHROW
1125{ 1132{
1126 if (screen.cur.col < ncol - 1) 1133 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1181 }
1175 } 1182 }
1176 else 1183 else
1177 { 1184 {
1178 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1179 { /* relative origin mode */ 1187 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1182 } 1190 }
1183 else 1191 else
1184 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1328 } 1336 }
1329 else 1337 else
1330 { 1338 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1339 ren = rstyle & (RS_fgMask | RS_bgMask);
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1341 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1342 ERASE_ROWS (row, num);
1335 gcvalue.foreground = pix_colors[Color_fg]; 1343 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1344 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1337 } 1345 }
1338 1346
1339 for (; num--; row++) 1347 for (; num--; row++)
1340 { 1348 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1349 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1350 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1351 }
1344} 1352}
1345 1353
1346#if ENABLE_FRILLS 1354#if !ENABLE_MINIMAL
1347void 1355void
1348rxvt_term::scr_erase_savelines () NOTHROW 1356rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1357{
1350 want_refresh = 1; 1358 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1359 ZERO_SCROLLBACK ();
… …
1460 { 1468 {
1461 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1470 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1471 CLEAR_SELECTION ();
1464 else 1472 else
1473 {
1465 { /* shift selection */ 1474 /* shift selection */
1466 selection.beg.col += count; 1475 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1476 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1477 selection.end.col += count;
1469 } 1478 }
1470 } 1479 }
… …
1609 */ 1618 */
1610void 1619void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1621{
1613 if (mode < 0) 1622 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1625 tabs [screen.cur.col] = !!mode;
1617} 1626}
1618 1627
1619/* ------------------------------------------------------------------------- */ 1628/* ------------------------------------------------------------------------- */
… …
1621 * Set reverse/normal video 1630 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1631 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1632 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1633 */
1625void 1634void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1635rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1636{
1628 XGCValues gcvalue; 1637 rvideo_mode = on;
1629 1638
1639#ifndef NO_BELL
1640 on ^= rvideo_bell;
1641#endif
1642
1630 if (rvideo != mode) 1643 if (rvideo_state != on)
1631 { 1644 {
1632 rvideo = mode; 1645 rvideo_state = on;
1646
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1648#ifdef HAVE_BG_PIXMAP
1635 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1636#endif 1650#endif
1637#if TRANSPARENT 1651 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1639#endif
1640 XSetWindowBackground (display->display, vt,
1641 pix_colors[Color_bg]);
1642 1652
1653 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1654 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1655 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1656 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1657
1647 scr_clear (); 1658 scr_clear ();
1648 scr_touch (true); 1659 scr_touch (true);
1649 } 1660 }
1650} 1661}
1651 1662
… …
1735{ 1746{
1736 bool found = false; 1747 bool found = false;
1737 1748
1738 for (int i = 0; i < nrow; i++) 1749 for (int i = 0; i < nrow; i++)
1739 { 1750 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1751 rend_t *drp = drawn_buf[i].r;
1742 1752
1743 for (; col < ncol; col++, drp++) 1753 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1754 if ((*drp & mask) == value)
1745 { 1755 {
1746 found = true; 1756 found = true;
1747 *drp = ~value; 1757 *drp = ~value;
1748 } 1758 }
… …
1788 for (i = PART_BEG; i < RC_COUNT; i++) 1798 for (i = PART_BEG; i < RC_COUNT; i++)
1789 { 1799 {
1790 min_it (rc[i].col, ncol - 1); 1800 min_it (rc[i].col, ncol - 1);
1791 min_it (rc[i].row, nrow - 1); 1801 min_it (rc[i].row, nrow - 1);
1792 } 1802 }
1793 1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1804 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1805 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1796 1806
1797 num_scr_allow = 0; 1807 num_scr_allow = 0;
1798 1808
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1861 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1862
1853 return true; 1863 return true;
1854} 1864}
1855 1865
1866#ifndef NO_BELL
1867void
1868rxvt_term::bell_cb (ev::timer &w, int revents)
1869{
1870 rvideo_bell = false;
1871 scr_rvideo_mode (rvideo_mode);
1872 refresh_check ();
1873}
1874#endif
1875
1856/* ------------------------------------------------------------------------- */ 1876/* ------------------------------------------------------------------------- */
1857void 1877void
1858rxvt_term::scr_bell () NOTHROW 1878rxvt_term::scr_bell () NOTHROW
1859{ 1879{
1860#ifndef NO_BELL 1880#ifndef NO_BELL
1861 1881
1862# ifndef NO_MAPALERT 1882# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1883# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1884 if (option (Opt_mapAlert))
1865# endif 1885# endif
1866 XMapWindow (display->display, parent[0]); 1886 XMapWindow (dpy, parent[0]);
1867# endif 1887# endif
1868 1888
1869 if (OPTION (Opt_visualBell)) 1889# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell))
1891 {
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1870 { 1897 }
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898# endif
1899
1900 if (option (Opt_visualBell))
1901 {
1902 rvideo_bell = true;
1903 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1904 flush ();
1905
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1906 bell_ev.start (VISUAL_BELL_DURATION);
1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1875 } 1907 }
1876 else 1908 else
1877 XBell (display->display, 0); 1909 XBell (dpy, 0);
1878
1879#endif 1910#endif
1880} 1911}
1881 1912
1882/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1914/* ARGSUSED */
… …
1941 * screen.text/screen.rend contain what the screen will change to. 1972 * screen.text/screen.rend contain what the screen will change to.
1942 */ 1973 */
1943void 1974void
1944rxvt_term::scr_refresh () NOTHROW 1975rxvt_term::scr_refresh () NOTHROW
1945{ 1976{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */ 1977 unsigned char have_bg,
1947 showcursor; /* show the cursor */ 1978 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 1979 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 1980 ocrow; /* old cursor row */
1950 int i; /* tmp */ 1981 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 1982#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1983 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1984#endif
1954 rend_t *crp; // cursor rendition pointer 1985 rend_t *crp; // cursor rendition pointer
1986 rend_t ccol1, /* Cursor colour */
1987 ccol2; /* Cursor colour2 */
1955 1988
1956 want_refresh = 0; /* screen is current */ 1989 want_refresh = 0; /* screen is current */
1957 1990
1958 if (refresh_type == NO_REFRESH || !mapped) 1991 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 1992 return;
1960 1993
1961 /* 1994 /*
1962 * A: set up vars 1995 * A: set up vars
1963 */ 1996 */
1964 must_clear = 0; 1997 have_bg = 0;
1965 refresh_count = 0; 1998 refresh_count = 0;
1966 1999
1967#if XPM_BACKGROUND 2000#ifdef HAVE_BG_PIXMAP
1968 must_clear |= bgPixmap.pixmap != None; 2001 have_bg |= bgPixmap.pixmap != None;
1969#endif
1970#if TRANSPARENT
1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1972#endif 2002#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2004
1975 /* 2005 /*
1976 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
1980 /* 2010 /*
1981 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
1982 */ 2012 */
1983 { 2013 {
1984 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2015
1988 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2018 if (hidden_cursor)
1991 showcursor = 0; 2019 showcursor = 0;
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2027 col--;
2000 2028
2001 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
2002 2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053
2003 if (showcursor && focus) 2054 if (showcursor && focus)
2004 { 2055 {
2005 if (OPTION (Opt_cursorUnderline)) 2056 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2007 else 2058 else
2008 { 2059 {
2009 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
2010
2011#ifndef NO_CURSORCOLOR
2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
2013 if (ISSET_PIXCOLOR (Color_cursor))
2014 ccol1 = Color_cursor;
2015 else
2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2017 ccol1 = fgcolor_of (rstyle);
2018#else
2019 ccol1 = Color_fg;
2020#endif
2021 if (ISSET_PIXCOLOR (Color_cursor2))
2022 ccol2 = Color_cursor2;
2023 else
2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2025 ccol2 = bgcolor_of (rstyle);
2026#else
2027 ccol2 = Color_bg;
2028#endif
2029 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2063 }
2033 } 2064 }
2034 } 2065 }
2035 2066
2036 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
… …
2075 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2077 */ 2108 */
2078 if (!display->is_local 2109 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2081 { 2112 {
2082 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2083 int j; 2115 int j;
2084 int len, wlen; 2116 int len, wlen;
2085 dLocal (int, num_scr); 2117 dLocal (int, num_scr);
2086 2118
2087 j = nrow; 2119 j = nrow;
2088 wlen = len = -1; 2120 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2124 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2126 {
2094 line_t s = ROW(view_start + row); 2127 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2148 wlen = row;
2116 continue; 2149 continue;
2117 } 2150 }
2118 } 2151 }
2119 2152
2120 if (len != -1) 2153 if (len >= 0)
2121 { 2154 {
2122 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2156 if (wlen < len)
2124 ::swap (wlen, len); 2157 ::swap (wlen, len);
2125 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2164 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2131 len = -1; 2169 len = -1;
2132 } 2170 }
2133 } 2171 }
2134 } 2172 }
2135#endif 2173#endif
… …
2191 count++; 2229 count++;
2192 2230
2193 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2194 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2195 { 2233 {
2196 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2197 break; 2235 break;
2198 2236
2199 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2200 drp[col] = rend; 2238 drp[col] = rend;
2201 i = 0; 2239 i = 0;
2202 } 2240 }
2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2204 break; 2242 break;
2205 } 2243 }
2206 2244
2207 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2208 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2218 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2219 2257
2220 // only do special processing if any attributes are set, which is unlikely 2258 // only do special processing if any attributes are set, which is unlikely
2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2222 { 2260 {
2223#if ENABLE_STYLES
2224 // force redraw after "careful" characters to avoid pixel droppings
2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2226 drp[col + 1] = ~srp[col + 1];
2227
2228 // include previous careful character(s) if possible, looks nicer (best effort...)
2229 while (text > stp
2230 && srp[text - stp - 1] & RS_Careful
2231 && RS_SAME (rend, srp[text - stp - 1]))
2232 text--, count++, xpixel -= fwidth;
2233#endif
2234
2235 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2236 2262
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2238 if (rend & RS_Bold
2239 && fore == Color_fg) 2264 if (rend & RS_Bold && fore == Color_fg)
2240 { 2265 {
2241 if (ISSET_PIXCOLOR (Color_BD)) 2266 if (ISSET_PIXCOLOR (Color_BD))
2242 fore = Color_BD; 2267 fore = Color_BD;
2243# if !ENABLE_STYLES 2268# if !ENABLE_STYLES
2244 else 2269 else
2245 invert = !invert; 2270 invert = !invert;
2246# endif 2271# endif
2247 } 2272 }
2248 2273
2249 if (rend & RS_Italic 2274 if (rend & RS_Italic && fore == Color_fg)
2250 && fore == Color_fg)
2251 { 2275 {
2252 if (ISSET_PIXCOLOR (Color_IT)) 2276 if (ISSET_PIXCOLOR (Color_IT))
2253 fore = Color_IT; 2277 fore = Color_IT;
2254# if !ENABLE_STYLES 2278# if !ENABLE_STYLES
2255 else 2279 else
2256 invert = !invert; 2280 invert = !invert;
2257# endif 2281# endif
2258 } 2282 }
2259 2283
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL; 2285 fore = Color_UL;
2262#endif 2286#endif
2263 2287
2264 if (invert) 2288 if (invert)
2265 { 2289 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2266 ::swap (fore, back); 2296 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2267 2301
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2269 if (ISSET_PIXCOLOR (Color_RV)) 2304 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV; 2305 back = Color_RV;
2271 2306# endif
2272 if (fore == back) 2307 if (fore == back)
2273 { 2308 {
2274 fore = Color_bg; 2309 fore = Color_bg;
2275 back = Color_fg; 2310 back = Color_fg;
2276 } 2311 }
… …
2278 } 2313 }
2279 2314
2280#ifdef TEXT_BLINK 2315#ifdef TEXT_BLINK
2281 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2282 { 2317 {
2283 if (!text_blink_ev.active) 2318 if (!text_blink_ev.is_active ())
2284 { 2319 {
2285 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2320 text_blink_ev.again ();
2286 hidden_text = 0; 2321 hidden_text = 0;
2287 } 2322 }
2288 else if (hidden_text) 2323 else if (hidden_text)
2289 fore = back; 2324 fore = back;
2290 } 2325 }
2291#endif 2326#endif
2327
2328#if ENABLE_STYLES
2329 // "careful" (too wide) character handling
2330
2331 // include previous careful character(s) if possible, looks nicer (best effort...)
2332 while (text > stp
2333 && srp[text - stp - 1] & RS_Careful
2334 && RS_SAME (rend, srp[text - stp - 1]))
2335 text--, count++, xpixel -= fwidth;
2336
2337 // force redraw after "careful" characters to avoid pixel droppings
2338 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2339 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2340
2341 // force redraw before "careful" characters to avoid pixel droppings
2342 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2343 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2344#endif
2292 } 2345 }
2293 2346
2294 /* 2347 /*
2295 * Actually do the drawing of the string here 2348 * Actually do the drawing of the string here
2296 */ 2349 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2351
2299 if (back == fore)
2300 font->clear_rect (*drawable, xpixel, ypixel,
2301 fwidth * count, fheight,
2302 back);
2303 else if (back == Color_bg) 2352 if (have_bg && back == Color_bg)
2304 { 2353 {
2305 if (must_clear) 2354 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2355
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2356 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2357 if (text[i] != ' ')
2311 { 2358 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2359 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2360 goto did_clear;
2314 }
2315 } 2361 }
2316 else 2362
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2363 CLEAR_CHARS (xpixel, ypixel, count);
2364 did_clear: ;
2318 } 2365 }
2319 else 2366 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2368
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2369 if (rend & RS_Uline && font->descent > 1 && fore != back)
2323 { 2370 {
2324#if ENABLE_FRILLS 2371#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2372 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2373 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2374 else
2328#endif 2375#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2376 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2377
2331 XDrawLine (display->display, drawBuffer, gc, 2378 XDrawLine (dpy, vt, gc,
2332 xpixel, ypixel + font->ascent + 1, 2379 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2381 }
2335 } /* for (col....) */ 2382 } /* for (col....) */
2336 } /* for (row....) */ 2383 } /* for (row....) */
… …
2345 */ 2392 */
2346 if (showcursor) 2393 if (showcursor)
2347 { 2394 {
2348 if (focus) 2395 if (focus)
2349 { 2396 {
2350 if (OPTION (Opt_cursorUnderline)) 2397 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2398 *crp ^= RS_Uline;
2352 else 2399 else
2353 { 2400 {
2354 *crp ^= RS_RVid; 2401 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2402#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2416 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2417 cursorwidth++;
2371 2418
2372#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2420 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2421 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2422 else
2375#endif 2423#endif
2424 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2425
2377 XDrawRectangle (display->display, drawBuffer, gc, 2426 XDrawRectangle (dpy, vt, gc,
2378 Col2Pixel (col), 2427 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2428 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2429 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2430 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2431 }
… …
2417} 2466}
2418 2467
2419void 2468void
2420rxvt_term::scr_recolour () NOTHROW 2469rxvt_term::scr_recolour () NOTHROW
2421{ 2470{
2422 if (1 2471#ifdef HAVE_BG_PIXMAP
2423#if TRANSPARENT 2472 bgPixmap.apply ();
2424 && !am_transparent 2473#else
2425#endif 2474
2426#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap
2428#endif
2429 )
2430 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2476 XClearWindow (dpy, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2478
2434#if HAVE_SCROLLBARS 2479# if HAVE_SCROLLBARS
2435 if (scrollBar.win) 2480 if (scrollBar.win)
2436 { 2481 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2482 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2483 scrollBar.setIdle ();
2439 scrollbar_show (0); 2484 scrollbar_show (0);
2440 } 2485 }
2441#endif 2486# endif
2442 }
2443 2487
2444 scr_clear (); 2488 scr_clear ();
2445 scr_touch (true); 2489 scr_touch (true);
2446 want_refresh = 1; 2490 want_refresh = 1;
2491
2492#endif
2447} 2493}
2448 2494
2449/* ------------------------------------------------------------------------- */ 2495/* ------------------------------------------------------------------------- */
2450void 2496void
2451rxvt_term::scr_clear (bool really) NOTHROW 2497rxvt_term::scr_clear (bool really) NOTHROW
… …
2455 2501
2456 num_scr_allow = 0; 2502 num_scr_allow = 0;
2457 want_refresh = 1; 2503 want_refresh = 1;
2458 2504
2459 if (really) 2505 if (really)
2460 XClearWindow (display->display, vt); 2506 XClearWindow (dpy, vt);
2461} 2507}
2462 2508
2463void 2509void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2510rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2511{
… …
2514{ 2560{
2515 if (selection.op 2561 if (selection.op
2516 && current_screen == selection.screen 2562 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2563 && selection.end.row >= view_start)
2518 { 2564 {
2519#if ENABLE_FRILLS 2565#if !ENABLE_MINIMAL
2520 if (selection.rect) 2566 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col, 2567 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col, 2568 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline); 2569 RS_RVid, RS_RVid | RS_Uline);
2524 else 2570 else
… …
2601 /* convert normal newline chars into common keyboard Return key sequence */ 2647 /* convert normal newline chars into common keyboard Return key sequence */
2602 for (unsigned int i = 0; i < len; i++) 2648 for (unsigned int i = 0; i < len; i++)
2603 if (data[i] == C0_LF) 2649 if (data[i] == C0_LF)
2604 data[i] = C0_CR; 2650 data[i] = C0_CR;
2605 2651
2652 if (priv_modes & PrivMode_BracketPaste)
2653 tt_printf ("\e[200~");
2654
2606 tt_write (data, len); 2655 tt_write (data, len);
2656
2657 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[201~");
2607} 2659}
2608 2660
2609/* ------------------------------------------------------------------------- */ 2661/* ------------------------------------------------------------------------- */
2610/* 2662/*
2611 * Respond to a notification that a primary selection has been sent 2663 * Respond to a notification that a primary selection has been sent
… …
2640 } 2692 }
2641 2693
2642 unsigned long bytes_after; 2694 unsigned long bytes_after;
2643 XTextProperty ct; 2695 XTextProperty ct;
2644 2696
2645 if (XGetWindowProperty (display->display, win, prop, 2697 if (XGetWindowProperty (dpy, win, prop,
2646 0, PROP_SIZE / 4, 2698 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2699 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2700 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2701 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2702 &ct.value) != Success)
… …
2659 if (bytes_after) 2711 if (bytes_after)
2660 { 2712 {
2661 // fetch and append remaining data 2713 // fetch and append remaining data
2662 XTextProperty ct2; 2714 XTextProperty ct2;
2663 2715
2664 if (XGetWindowProperty (display->display, win, prop, 2716 if (XGetWindowProperty (dpy, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2717 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2718 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2719 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2720 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2721 &ct2.value) != Success)
… …
2682 2734
2683 if (ct.encoding == xa[XA_INCR]) 2735 if (ct.encoding == xa[XA_INCR])
2684 { 2736 {
2685 // INCR selection, start handshake 2737 // INCR selection, start handshake
2686 if (!delete_prop) 2738 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2739 XDeleteProperty (dpy, win, prop);
2688 2740
2689 selection_wait = Sel_incr; 2741 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2742 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2743 incr_ev.start (10);
2692 2744
2693 goto bailout; 2745 goto bailout;
2694 } 2746 }
2695 2747
2696 if (ct.nitems == 0) 2748 if (ct.nitems == 0)
… …
2705 ct.nitems = incr_buf_fill; 2757 ct.nitems = incr_buf_fill;
2706 incr_buf = 0; 2758 incr_buf = 0;
2707 incr_buf_size = 0; 2759 incr_buf_size = 0;
2708 incr_ev.stop (); 2760 incr_ev.stop ();
2709 } 2761 }
2710 else 2762 else
2711 { 2763 {
2712 if (selection_wait == Sel_normal 2764 if (selection_wait == Sel_normal
2713 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2765 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2714 { 2766 {
2715 /* 2767 /*
… …
2722 goto bailout; 2774 goto bailout;
2723 } 2775 }
2724 } 2776 }
2725 else if (selection_wait == Sel_incr) 2777 else if (selection_wait == Sel_incr)
2726 { 2778 {
2727 incr_ev.start (NOW + 10); 2779 incr_ev.start (10);
2728 2780
2729 while (incr_buf_fill + ct.nitems > incr_buf_size) 2781 while (incr_buf_fill + ct.nitems > incr_buf_size)
2730 { 2782 {
2731 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2783 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2732 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2784 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2739 } 2791 }
2740 2792
2741 char **cl; 2793 char **cl;
2742 int cr; 2794 int cr;
2743 2795
2744#if ENABLE_FRILLS 2796#if !ENABLE_MINIMAL
2745 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2797 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2746 // so recode it manually 2798 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING]) 2799 if (ct.encoding == xa[XA_UTF8_STRING])
2748 { 2800 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2801 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2753 paste (s, strlen (s)); 2805 paste (s, strlen (s));
2754 free (s); 2806 free (s);
2755 } 2807 }
2756 else 2808 else
2757#endif 2809#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2810 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2759 && cl) 2811 && cl)
2760 { 2812 {
2761 for (int i = 0; i < cr; i++) 2813 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2814 paste (cl[i], strlen (cl[i]));
2763 2815
… …
2772 if (selection_wait == Sel_normal) 2824 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none; 2825 selection_wait = Sel_none;
2774} 2826}
2775 2827
2776void 2828void
2777rxvt_term::incr_cb (time_watcher &w) NOTHROW 2829rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2778{ 2830{
2779 selection_wait = Sel_none; 2831 selection_wait = Sel_none;
2780 2832
2781 incr_buf_size = 0; 2833 incr_buf_size = 0;
2782 free (incr_buf); 2834 free (incr_buf);
… …
2793 selection_paste (win, prop, true); 2845 selection_paste (win, prop, true);
2794} 2846}
2795 2847
2796/* ------------------------------------------------------------------------- */ 2848/* ------------------------------------------------------------------------- */
2797/* 2849/*
2798 * Request the current selection: 2850 * Request the current selection:
2799 * Order: > internal selection if available 2851 * Order: > internal selection if available
2800 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2852 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2801 * > CUT_BUFFER0 2853 * > CUT_BUFFER0
2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2854 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2803 * will auto fallback to CUT_BUFFER0 2855 * will auto fallback to CUT_BUFFER0
2804 * EXT: button 2 release 2856 * EXT: button 2 release
2805 */ 2857 */
2806void 2858void
2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2859rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2860{
2809/* After making a selection with selection_make this function will always 2861 if (selection.text && selnum == Sel_Primary)
2810 * return the internal selection, which is not correct IMO, now much more since 2862 {
2811 * I added the selnum parameter.
2812 */
2813#if 0
2814 if (selection.text)
2815 { /* internal selection */ 2863 /* internal selection */
2816 char *str = rxvt_wcstombs (selection.text, selection.len); 2864 char *str = rxvt_wcstombs (selection.text, selection.len);
2817 paste (str, strlen (str)); 2865 paste (str, strlen (str));
2818 free (str); 2866 free (str);
2819 return; 2867 return;
2820 } 2868 }
2821 else 2869 else
2822#endif
2823 { 2870 {
2824 selection_request_time = tm; 2871 selection_request_time = tm;
2825 selection_wait = Sel_normal; 2872 selection_wait = Sel_normal;
2826 2873
2827#if X_HAVE_UTF8_STRING 2874#if X_HAVE_UTF8_STRING
… …
2851 else if (selnum == Sel_Secondary) 2898 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2899 sel = XA_SECONDARY;
2853 else 2900 else
2854 sel = xa[XA_CLIPBOARD]; 2901 sel = xa[XA_CLIPBOARD];
2855 2902
2856 if (XGetSelectionOwner (display->display, sel) != None) 2903 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2904 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2905 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2906 vt, selection_request_time);
2860 return 1; 2907 return 1;
2861 } 2908 }
2862 2909
2863 return 0; 2910 return 0;
… …
2926 2973
2927 int end_col; 2974 int end_col;
2928 2975
2929 for (; row <= selection.end.row; row++, col = 0) 2976 for (; row <= selection.end.row; row++, col = 0)
2930 { 2977 {
2931#if ENABLE_FRILLS 2978#if !ENABLE_MINIMAL
2932 if (selection.rect) 2979 if (selection.rect)
2933 { 2980 {
2934 col = selection.beg.col; 2981 col = selection.beg.col;
2935 end_col = ncol + 1; 2982 end_col = ncol + 1;
2936 } 2983 }
… …
2939 end_col = ROW(row).l; 2986 end_col = ROW(row).l;
2940 2987
2941 col = max (col, 0); 2988 col = max (col, 0);
2942 2989
2943 if (row == selection.end.row 2990 if (row == selection.end.row
2944#if ENABLE_FRILLS 2991#if !ENABLE_MINIMAL
2945 || selection.rect 2992 || selection.rect
2946#endif 2993#endif
2947 ) 2994 )
2948 min_it (end_col, selection.end.col); 2995 min_it (end_col, selection.end.col);
2949 2996
… …
2972#endif 3019#endif
2973 else 3020 else
2974 new_selection_text[ofs++] = *t++; 3021 new_selection_text[ofs++] = *t++;
2975 } 3022 }
2976 3023
2977#if ENABLE_FRILLS 3024#if !ENABLE_MINIMAL
2978 if (selection.rect) 3025 if (selection.rect)
2979 { 3026 {
2980 while (ofs 3027 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3028 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3029 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3016bool 3063bool
3017rxvt_term::selection_grab (Time tm) NOTHROW 3064rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3065{
3019 selection_time = tm; 3066 selection_time = tm;
3020 3067
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3068 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3069 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3070 {
3024 display->set_selection_owner (this); 3071 display->set_selection_owner (this);
3025 return true; 3072 return true;
3026 } 3073 }
3027 else 3074 else
… …
3031 } 3078 }
3032 3079
3033#if 0 3080#if 0
3034 XTextProperty ct; 3081 XTextProperty ct;
3035 3082
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3083 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3084 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3085 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3086 XFree (ct.value);
3040 } 3087 }
3041#endif 3088#endif
… …
3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3134 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3088 3135
3089 while (selection.mark.col > 0 3136 while (selection.mark.col > 0
3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3137 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3091 --selection.mark.col; 3138 --selection.mark.col;
3092 3139
3093 if (selection.op) 3140 if (selection.op)
3141 {
3094 { /* clear the old selection */ 3142 /* clear the old selection */
3095 selection.beg.row = selection.end.row = selection.mark.row; 3143 selection.beg.row = selection.end.row = selection.mark.row;
3096 selection.beg.col = selection.end.col = selection.mark.col; 3144 selection.beg.col = selection.end.col = selection.mark.col;
3097 } 3145 }
3098 3146
3099 selection.op = SELECTION_INIT; 3147 selection.op = SELECTION_INIT;
… …
3288 * a point/word/line which is either the start or end of the selection 3336 * a point/word/line which is either the start or end of the selection
3289 * and it was decided by whichever point/word/line was `fixed' at the 3337 * and it was decided by whichever point/word/line was `fixed' at the
3290 * time of the most recent button3 press 3338 * time of the most recent button3 press
3291 */ 3339 */
3292 if (button3 && buttonpress) 3340 if (button3 && buttonpress)
3341 {
3293 { /* button3 press */ 3342 /* button3 press */
3294 /* 3343 /*
3295 * first determine which edge of the selection we are closest to 3344 * first determine which edge of the selection we are closest to
3296 */ 3345 */
3297 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3346 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3298 || (!ROWCOL_IS_AFTER (pos, selection.end) 3347 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3316 selection.mark.row = selection.beg.row; 3365 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3366 selection.mark.col = selection.beg.col;
3318 } 3367 }
3319 } 3368 }
3320 else 3369 else
3370 {
3321 { /* button1 drag or button3 drag */ 3371 /* button1 drag or button3 drag */
3322 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3372 if (ROWCOL_IS_AFTER (selection.mark, pos))
3323 { 3373 {
3324 if (selection.mark.row == selection.end.row 3374 if (selection.mark.row == selection.end.row
3325 && selection.mark.col == selection.end.col 3375 && selection.mark.col == selection.end.col
3326 && clickchange 3376 && clickchange
… …
3343 3393
3344 if (selection.clicks == 1) 3394 if (selection.clicks == 1)
3345 { 3395 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3396 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3397 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3398#if !ENABLE_MINIMAL
3349 && !selection.rect 3399 && !selection.rect
3350#endif 3400#endif
3351 ) 3401 )
3352 selection.beg.col = ncol; 3402 selection.beg.col = ncol;
3353 3403
3354 if ( 3404 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3405 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3406 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3407#if !ENABLE_MINIMAL
3358 && !selection.rect 3408 && !selection.rect
3359#endif 3409#endif
3360 ) 3410 )
3361 selection.end.col = ncol; 3411 selection.end.col = ncol;
3362 } 3412 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3419 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3420 }
3371 else if (selection.clicks == 3) 3421 else if (selection.clicks == 3)
3372 { 3422 {
3373#if ENABLE_FRILLS 3423#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3424 if (option (Opt_tripleclickwords))
3375 { 3425 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3426 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3427
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3428 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3429 {
3380 if (!ROW(end_row).is_longer ()) 3430 if (!ROW(end_row).is_longer ())
3381 { 3431 {
3382 selection.end.row = end_row; 3432 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3433 selection.end.col = ROW(end_row).l;
3434# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3435 selection_remove_trailing_spaces ();
3436# endif
3385 break; 3437 break;
3386 } 3438 }
3387 } 3439 }
3388 } 3440 }
3389 else 3441 else
… …
3405 selection.end.row++; 3457 selection.end.row++;
3406 } 3458 }
3407 } 3459 }
3408 3460
3409 if (button3 && buttonpress) 3461 if (button3 && buttonpress)
3462 {
3410 { /* mark may need to be changed */ 3463 /* mark may need to be changed */
3411 if (closeto == LEFT) 3464 if (closeto == LEFT)
3412 { 3465 {
3413 selection.mark.row = selection.end.row; 3466 selection.mark.row = selection.end.row;
3414 selection.mark.col = selection.end.col - (selection.clicks == 2); 3467 selection.mark.col = selection.end.col - (selection.clicks == 2);
3415 } 3468 }
… …
3418 selection.mark.row = selection.beg.row; 3471 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3472 selection.mark.col = selection.beg.col;
3420 } 3473 }
3421 } 3474 }
3422 3475
3423#if ENABLE_FRILLS 3476#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3477 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3478 ::swap (selection.beg.col, selection.end.col);
3426#endif 3479#endif
3427} 3480}
3428 3481
3429#if ENABLE_FRILLS 3482#if !ENABLE_MINIMAL
3430void 3483void
3431rxvt_term::selection_remove_trailing_spaces () NOTHROW 3484rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3485{
3433 int32_t end_col, end_row; 3486 int32_t end_col, end_row;
3434 text_t *stp; 3487 text_t *stp;
… …
3489 */ 3542 */
3490void 3543void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3544rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3545{
3493 XSelectionEvent ev; 3546 XSelectionEvent ev;
3494 dDisp;
3495 3547
3496 ev.type = SelectionNotify; 3548 ev.type = SelectionNotify;
3497 ev.property = None; 3549 ev.property = None;
3498 ev.display = rq.display; 3550 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3551 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3565 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3566#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3567 *target++ = xa[XA_UTF8_STRING];
3516#endif 3568#endif
3517 3569
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3570 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3571 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3572 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3573 ev.property = rq.property;
3522 } 3574 }
3523#if TODO // TODO 3575#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3578 /* TODO: Handle MULTIPLE */
3527 } 3579 }
3528#endif 3580#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3581 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3582 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3583 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3584 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3585 ev.property = rq.property;
3534 } 3586 }
3535 else if (rq.target == XA_STRING 3587 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3588 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3612 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3613 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3614 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3615 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3616 style = enc_compound_text;
3565#if ENABLE_FRILLS 3617#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3618 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3619 style = enc_utf8;
3568#endif 3620#endif
3569 else 3621 else
3570 { 3622 {
… …
3581 { 3633 {
3582 cl = L""; 3634 cl = L"";
3583 selectlen = 0; 3635 selectlen = 0;
3584 } 3636 }
3585 3637
3586#if ENABLE_FRILLS 3638#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3639 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3640 // so recode it manually
3589 if (style == enc_utf8) 3641 if (style == enc_utf8)
3590 { 3642 {
3591 freect = 1; 3643 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3646 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3647 ct.nitems = strlen ((char *)ct.value);
3596 } 3648 }
3597 else 3649 else
3598#endif 3650#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3651 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3652 freect = 1;
3601 else 3653 else
3602 { 3654 {
3603 /* if we failed to convert then send it raw */ 3655 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3656 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3657 ct.nitems = selectlen;
3606 ct.encoding = target; 3658 ct.encoding = target;
3607 } 3659 }
3608 3660
3609 XChangeProperty (disp, rq.requestor, rq.property, 3661 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3662 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3663 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3664 ev.property = rq.property;
3613 3665
3614 if (freect) 3666 if (freect)
3615 XFree (ct.value); 3667 XFree (ct.value);
3616 } 3668 }
3617 3669
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3670 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3619}
3620
3621/* ------------------------------------------------------------------------- *
3622 * MOUSE ROUTINES *
3623 * ------------------------------------------------------------------------- */
3624
3625/*
3626 * return col/row values corresponding to x/y pixel values
3627 */
3628void
3629rxvt_term::pixel_position (int *x, int *y) NOTHROW
3630{
3631 *x = Pixel2Col (*x);
3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633 *y = Pixel2Row (*y);
3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635} 3671}
3636 3672
3637/* ------------------------------------------------------------------------- */ 3673/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3674#ifdef USE_XIM
3639void 3675void
3640rxvt_term::im_set_position (XPoint &pos) NOTHROW 3676rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3677{
3642 XWindowAttributes xwa; 3678 XWindowAttributes xwa;
3643 3679
3644 XGetWindowAttributes (display->display, vt, &xwa); 3680 XGetWindowAttributes (dpy, vt, &xwa);
3645 3681
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3682 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3683 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3684}
3649#endif 3685#endif
… …
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3781rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3782{
3747 while (*s) 3783 while (*s)
3748 { 3784 {
3749 text_t t = *s++; 3785 text_t t = *s++;
3750 int width = wcwidth (t); 3786 int width = WCWIDTH (t);
3751 3787
3752 while (width--) 3788 while (width--)
3753 { 3789 {
3754 scr_overlay_set (x++, y, t); 3790 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3791 t = NOCHAR;

Diff Legend

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