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.306 by root, Sun Jun 15 10:15:39 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_state = rvideo_mode = false;
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;
… …
1217/* 1225/*
1218 * Erase part or whole of a line 1226 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1231 */
1223void 1232void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1234{
1226 unsigned int col, num; 1235 unsigned int col, num;
… …
1235 line.touch (); 1244 line.touch ();
1236 line.is_longer (0); 1245 line.is_longer (0);
1237 1246
1238 switch (mode) 1247 switch (mode)
1239 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1240 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1256 col = screen.cur.col;
1242 num = ncol - col; 1257 num = ncol - col;
1243 min_it (line.l, col); 1258 min_it (line.l, col);
1259
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1247 break; 1263 break;
1264
1248 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1249 col = 0; 1266 col = 0;
1250 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1254 break; 1272 break;
1273
1255 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1256 col = 0; 1275 col = 0;
1257 num = ncol; 1276 num = ncol;
1258 line.l = 0; 1277 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
… …
1328 } 1347 }
1329 else 1348 else
1330 { 1349 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1350 ren = rstyle & (RS_fgMask | RS_bgMask);
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1351 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1352 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1353 ERASE_ROWS (row, num);
1335 gcvalue.foreground = pix_colors[Color_fg]; 1354 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1355 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1337 } 1356 }
1338 1357
1339 for (; num--; row++) 1358 for (; num--; row++)
1340 { 1359 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1360 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1361 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1362 }
1344} 1363}
1345 1364
1346#if ENABLE_FRILLS 1365#if !ENABLE_MINIMAL
1347void 1366void
1348rxvt_term::scr_erase_savelines () NOTHROW 1367rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1368{
1350 want_refresh = 1; 1369 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1370 ZERO_SCROLLBACK ();
… …
1460 { 1479 {
1461 if (selection.end.row != screen.cur.row 1480 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1481 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1482 CLEAR_SELECTION ();
1464 else 1483 else
1484 {
1465 { /* shift selection */ 1485 /* shift selection */
1466 selection.beg.col += count; 1486 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1487 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1488 selection.end.col += count;
1469 } 1489 }
1470 } 1490 }
… …
1609 */ 1629 */
1610void 1630void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1631rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1632{
1613 if (mode < 0) 1633 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1634 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1635 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1636 tabs [screen.cur.col] = !!mode;
1617} 1637}
1618 1638
1619/* ------------------------------------------------------------------------- */ 1639/* ------------------------------------------------------------------------- */
… …
1634 if (rvideo_state != on) 1654 if (rvideo_state != on)
1635 { 1655 {
1636 rvideo_state = on; 1656 rvideo_state = on;
1637 1657
1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1658 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1639#if XPM_BACKGROUND 1659#ifdef HAVE_BG_PIXMAP
1640 if (bgPixmap.pixmap == None) 1660 if (bgPixmap.pixmap == None)
1641#endif 1661#endif
1642#if TRANSPARENT
1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1644#endif
1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1662 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1646 1663
1647 XGCValues gcvalue; 1664 XGCValues gcvalue;
1648 gcvalue.foreground = pix_colors[Color_fg]; 1665 gcvalue.foreground = pix_colors[Color_fg];
1649 gcvalue.background = pix_colors[Color_bg]; 1666 gcvalue.background = pix_colors[Color_bg];
1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1667 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1651 1668
1652 scr_clear (); 1669 scr_clear ();
1653 scr_touch (true); 1670 scr_touch (true);
1654 } 1671 }
1655} 1672}
… …
1740{ 1757{
1741 bool found = false; 1758 bool found = false;
1742 1759
1743 for (int i = 0; i < nrow; i++) 1760 for (int i = 0; i < nrow; i++)
1744 { 1761 {
1745 int col = 0;
1746 rend_t *drp = drawn_buf[i].r; 1762 rend_t *drp = drawn_buf[i].r;
1747 1763
1748 for (; col < ncol; col++, drp++) 1764 for (int col = 0; col < ncol; col++, drp++)
1749 if ((*drp & mask) == value) 1765 if ((*drp & mask) == value)
1750 { 1766 {
1751 found = true; 1767 found = true;
1752 *drp = ~value; 1768 *drp = ~value;
1753 } 1769 }
… …
1793 for (i = PART_BEG; i < RC_COUNT; i++) 1809 for (i = PART_BEG; i < RC_COUNT; i++)
1794 { 1810 {
1795 min_it (rc[i].col, ncol - 1); 1811 min_it (rc[i].col, ncol - 1);
1796 min_it (rc[i].row, nrow - 1); 1812 min_it (rc[i].row, nrow - 1);
1797 } 1813 }
1798 1814// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1799 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1815 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1800 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1816 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1801 1817
1802 num_scr_allow = 0; 1818 num_scr_allow = 0;
1803 1819
… …
1858 return true; 1874 return true;
1859} 1875}
1860 1876
1861#ifndef NO_BELL 1877#ifndef NO_BELL
1862void 1878void
1863rxvt_term::bell_cb (time_watcher &w) 1879rxvt_term::bell_cb (ev::timer &w, int revents)
1864{ 1880{
1865 rvideo_bell = false; 1881 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode); 1882 scr_rvideo_mode (rvideo_mode);
1883 refresh_check ();
1867} 1884}
1868#endif 1885#endif
1869 1886
1870/* ------------------------------------------------------------------------- */ 1887/* ------------------------------------------------------------------------- */
1871void 1888void
… …
1873{ 1890{
1874#ifndef NO_BELL 1891#ifndef NO_BELL
1875 1892
1876# ifndef NO_MAPALERT 1893# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1894# ifdef MAPALERT_OPTION
1878 if (OPTION (Opt_mapAlert)) 1895 if (option (Opt_mapAlert))
1879# endif 1896# endif
1880 XMapWindow (display->display, parent[0]); 1897 XMapWindow (dpy, parent[0]);
1881# endif 1898# endif
1882 1899
1900# if ENABLE_FRILLS
1901 if (option (Opt_urgentOnBell))
1902 {
1903 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1904 {
1905 h->flags |= XUrgencyHint;
1906 XSetWMHints (dpy, parent[0], h);
1907 }
1908 }
1909# endif
1910
1883 if (OPTION (Opt_visualBell)) 1911 if (option (Opt_visualBell))
1884 { 1912 {
1885 rvideo_bell = true; 1913 rvideo_bell = true;
1886 scr_rvideo_mode (rvideo_mode); 1914 scr_rvideo_mode (rvideo_mode);
1887 display->flush (); 1915 flush ();
1888 1916
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1917 bell_ev.start (VISUAL_BELL_DURATION);
1890 } 1918 }
1891 else 1919 else
1892 XBell (display->display, 0); 1920 XBell (dpy, 0);
1893
1894#endif 1921#endif
1895} 1922}
1896 1923
1897/* ------------------------------------------------------------------------- */ 1924/* ------------------------------------------------------------------------- */
1898/* ARGSUSED */ 1925/* ARGSUSED */
… …
1956 * screen.text/screen.rend contain what the screen will change to. 1983 * screen.text/screen.rend contain what the screen will change to.
1957 */ 1984 */
1958void 1985void
1959rxvt_term::scr_refresh () NOTHROW 1986rxvt_term::scr_refresh () NOTHROW
1960{ 1987{
1961 unsigned char must_clear, /* use draw_string not draw_image_string */ 1988 unsigned char have_bg,
1962 showcursor; /* show the cursor */ 1989 showcursor; /* show the cursor */
1963 int16_t col, row, /* column/row we're processing */ 1990 int16_t col, row, /* column/row we're processing */
1964 ocrow; /* old cursor row */ 1991 ocrow; /* old cursor row */
1965 int i; /* tmp */ 1992 int i; /* tmp */
1966#ifndef NO_CURSORCOLOR 1993#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 1994 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 1995#endif
1969 rend_t *crp; // cursor rendition pointer 1996 rend_t *crp; // cursor rendition pointer
1997 rend_t ccol1, /* Cursor colour */
1998 ccol2; /* Cursor colour2 */
1970 1999
1971 want_refresh = 0; /* screen is current */ 2000 want_refresh = 0; /* screen is current */
1972 2001
1973 if (refresh_type == NO_REFRESH || !mapped) 2002 if (refresh_type == NO_REFRESH || !mapped)
1974 return; 2003 return;
1975 2004
1976 /* 2005 /*
1977 * A: set up vars 2006 * A: set up vars
1978 */ 2007 */
1979 must_clear = 0;
1980 refresh_count = 0; 2008 refresh_count = 0;
1981 2009
1982#if XPM_BACKGROUND 2010 have_bg = 0;
2011#ifdef HAVE_BG_PIXMAP
1983 must_clear |= bgPixmap.pixmap != None; 2012 have_bg = bgPixmap.pixmap != None;
1984#endif
1985#if TRANSPARENT
1986 must_clear |= OPTION (Opt_transparent) && am_transparent;
1987#endif 2013#endif
1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2014 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1989 2015
1990 /* 2016 /*
1991 * B: reverse any characters which are selected 2017 * B: reverse any characters which are selected
… …
1995 /* 2021 /*
1996 * C: set the cursor character (s) 2022 * C: set the cursor character (s)
1997 */ 2023 */
1998 { 2024 {
1999 unsigned char setoldcursor; 2025 unsigned char setoldcursor;
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
2002 2026
2003 showcursor = (screen.flags & Screen_VisibleCursor); 2027 showcursor = (screen.flags & Screen_VisibleCursor);
2004#ifdef CURSOR_BLINK 2028#ifdef CURSOR_BLINK
2005 if (hidden_cursor) 2029 if (hidden_cursor)
2006 showcursor = 0; 2030 showcursor = 0;
… …
2013 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2037 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2014 col--; 2038 col--;
2015 2039
2016 crp = &ROW(screen.cur.row).r[col]; 2040 crp = &ROW(screen.cur.row).r[col];
2017 2041
2042#ifndef NO_CURSORCOLOR
2043 cc1 = *crp & (RS_fgMask | RS_bgMask);
2044 if (ISSET_PIXCOLOR (Color_cursor))
2045 ccol1 = Color_cursor;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol1 = fgcolor_of (rstyle);
2050#else
2051 ccol1 = Color_fg;
2052#endif
2053
2054#ifndef NO_CURSORCOLOR
2055 if (ISSET_PIXCOLOR (Color_cursor2))
2056 ccol2 = Color_cursor2;
2057 else
2058#endif
2059#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2060 ccol2 = bgcolor_of (rstyle);
2061#else
2062 ccol2 = Color_bg;
2063#endif
2064
2018 if (showcursor && focus) 2065 if (showcursor && focus)
2019 { 2066 {
2020 if (OPTION (Opt_cursorUnderline)) 2067 if (option (Opt_cursorUnderline))
2021 *crp ^= RS_Uline; 2068 *crp ^= RS_Uline;
2022 else 2069 else
2023 { 2070 {
2024 *crp ^= RS_RVid; 2071 *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); 2072 *crp = SET_FGCOLOR (*crp, ccol1);
2045 *crp = SET_BGCOLOR (*crp, ccol2); 2073 *crp = SET_BGCOLOR (*crp, ccol2);
2046#endif
2047 } 2074 }
2048 } 2075 }
2049 } 2076 }
2050 2077
2051 /* make sure no outline cursor is left around */ 2078 /* make sure no outline cursor is left around */
… …
2090 * D: CopyArea pass - very useful for slower links 2117 * D: CopyArea pass - very useful for slower links
2091 * This has been deliberately kept simple. 2118 * This has been deliberately kept simple.
2092 */ 2119 */
2093 if (!display->is_local 2120 if (!display->is_local
2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2121 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2095 && abs (num_scr) < nrow && !must_clear) 2122 && abs (num_scr) < nrow && !have_bg)
2096 { 2123 {
2097 int16_t nits; 2124 int16_t nits;
2125 int i = num_scr;
2098 int j; 2126 int j;
2099 int len, wlen; 2127 int len, wlen;
2100 dLocal (int, num_scr); 2128 dLocal (int, num_scr);
2101 2129
2102 j = nrow; 2130 j = nrow;
2103 wlen = len = -1; 2131 wlen = len = -1;
2104 row = i > 0 ? 0 : j - 1; 2132 row = i > 0 ? 0 : j - 1;
2133
2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2134 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2106 { 2135 {
2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2136 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2108 { 2137 {
2109 line_t s = ROW(view_start + row); 2138 line_t s = ROW(view_start + row);
… …
2130 wlen = row; 2159 wlen = row;
2131 continue; 2160 continue;
2132 } 2161 }
2133 } 2162 }
2134 2163
2135 if (len != -1) 2164 if (len >= 0)
2136 { 2165 {
2137 /* also comes here at end if needed because of >= above */ 2166 /* also comes here at end if needed because of >= above */
2138 if (wlen < len) 2167 if (wlen < len)
2139 ::swap (wlen, len); 2168 ::swap (wlen, len);
2140 2169
2170 XGCValues gcv;
2171
2172 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2141 XCopyArea (display->display, vt, vt, 2173 XCopyArea (dpy, vt, vt,
2142 gc, 0, Row2Pixel (len + i), 2174 gc, 0, Row2Pixel (len + i),
2143 (unsigned int)this->width, 2175 (unsigned int)this->width,
2144 (unsigned int)Height2Pixel (wlen - len + 1), 2176 (unsigned int)Height2Pixel (wlen - len + 1),
2145 0, Row2Pixel (len)); 2177 0, Row2Pixel (len));
2178 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2179
2146 len = -1; 2180 len = -1;
2147 } 2181 }
2148 } 2182 }
2149 } 2183 }
2150#endif 2184#endif
… …
2206 count++; 2240 count++;
2207 2241
2208 if (stp[col] != dtp[col] 2242 if (stp[col] != dtp[col]
2209 || !RS_SAME (srp[col], drp[col])) 2243 || !RS_SAME (srp[col], drp[col]))
2210 { 2244 {
2211 if (must_clear && (i++ > count / 2)) 2245 if (have_bg && (i++ > count / 2))
2212 break; 2246 break;
2213 2247
2214 dtp[col] = stp[col]; 2248 dtp[col] = stp[col];
2215 drp[col] = rend; 2249 drp[col] = rend;
2216 i = 0; 2250 i = 0;
2217 } 2251 }
2218 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2252 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2219 break; 2253 break;
2220 } 2254 }
2221 2255
2222 col--; /* went one too far. move back */ 2256 col--; /* went one too far. move back */
2223 count -= i; /* dump any matching trailing chars */ 2257 count -= i; /* dump any matching trailing chars */
… …
2233 int back = bgcolor_of (rend); // desired background 2267 int back = bgcolor_of (rend); // desired background
2234 2268
2235 // only do special processing if any attributes are set, which is unlikely 2269 // 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)) 2270 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2237 { 2271 {
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; 2272 bool invert = rend & RS_RVid;
2251 2273
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2274#ifndef NO_BOLD_UNDERLINE_REVERSE
2253 if (rend & RS_Bold
2254 && fore == Color_fg) 2275 if (rend & RS_Bold && fore == Color_fg)
2255 { 2276 {
2256 if (ISSET_PIXCOLOR (Color_BD)) 2277 if (ISSET_PIXCOLOR (Color_BD))
2257 fore = Color_BD; 2278 fore = Color_BD;
2258# if !ENABLE_STYLES 2279# if !ENABLE_STYLES
2259 else 2280 else
2260 invert = !invert; 2281 invert = !invert;
2261# endif 2282# endif
2262 } 2283 }
2263 2284
2264 if (rend & RS_Italic 2285 if (rend & RS_Italic && fore == Color_fg)
2265 && fore == Color_fg)
2266 { 2286 {
2267 if (ISSET_PIXCOLOR (Color_IT)) 2287 if (ISSET_PIXCOLOR (Color_IT))
2268 fore = Color_IT; 2288 fore = Color_IT;
2269# if !ENABLE_STYLES 2289# if !ENABLE_STYLES
2270 else 2290 else
2271 invert = !invert; 2291 invert = !invert;
2272# endif 2292# endif
2273 } 2293 }
2274 2294
2275 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2295 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2276 fore = Color_UL; 2296 fore = Color_UL;
2277#endif 2297#endif
2278 2298
2279 if (invert) 2299 if (invert)
2280 { 2300 {
2301#ifdef OPTION_HC
2302 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2303 || !ISSET_PIXCOLOR (Color_HC))
2304#endif
2305 /* invert the column if no highlightColor is set or it is the
2306 * current cursor column */
2281 ::swap (fore, back); 2307 ::swap (fore, back);
2308#ifdef OPTION_HC
2309 else if (ISSET_PIXCOLOR (Color_HC))
2310 back = Color_HC;
2311#endif
2282 2312
2283#ifndef NO_BOLD_UNDERLINE_REVERSE 2313#ifndef NO_BOLD_UNDERLINE_REVERSE
2314# ifndef OPTION_HC
2284 if (ISSET_PIXCOLOR (Color_RV)) 2315 if (ISSET_PIXCOLOR (Color_RV))
2285 back = Color_RV; 2316 back = Color_RV;
2286 2317# endif
2287 if (fore == back) 2318 if (fore == back)
2288 { 2319 {
2289 fore = Color_bg; 2320 fore = Color_bg;
2290 back = Color_fg; 2321 back = Color_fg;
2291 } 2322 }
… …
2293 } 2324 }
2294 2325
2295#ifdef TEXT_BLINK 2326#ifdef TEXT_BLINK
2296 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2327 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2297 { 2328 {
2298 if (!text_blink_ev.active) 2329 if (!text_blink_ev.is_active ())
2299 { 2330 {
2300 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2331 text_blink_ev.again ();
2301 hidden_text = 0; 2332 hidden_text = 0;
2302 } 2333 }
2303 else if (hidden_text) 2334 else if (hidden_text)
2304 fore = back; 2335 fore = back;
2305 } 2336 }
2306#endif 2337#endif
2338
2339#if ENABLE_STYLES
2340 // "careful" (too wide) character handling
2341
2342 // include previous careful character(s) if possible, looks nicer (best effort...)
2343 while (text > stp
2344 && srp[text - stp - 1] & RS_Careful
2345 && RS_SAME (rend, srp[text - stp - 1]))
2346 text--, count++, xpixel -= fwidth;
2347
2348 // force redraw after "careful" characters to avoid pixel droppings
2349 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2350 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2351
2352 // force redraw before "careful" characters to avoid pixel droppings
2353 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2354 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2355#endif
2307 } 2356 }
2308 2357
2309 /* 2358 /*
2310 * Actually do the drawing of the string here 2359 * Actually do the drawing of the string here
2311 */ 2360 */
2312 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2361 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2313 2362
2314 if (back == fore)
2315 font->clear_rect (*drawable, xpixel, ypixel,
2316 fwidth * count, fheight,
2317 back);
2318 else if (back == Color_bg) 2363 if (have_bg && back == Color_bg)
2319 { 2364 {
2320 if (must_clear) 2365 // this is very ugly, maybe push it into ->draw?
2321 {
2322 CLEAR_CHARS (xpixel, ypixel, count);
2323 2366
2324 for (i = 0; i < count; i++) /* don't draw empty strings */ 2367 for (i = 0; i < count; i++) /* don't draw empty strings */
2325 if (text[i] != ' ') 2368 if (text[i] != ' ')
2326 { 2369 {
2327 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2370 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2328 break; 2371 goto did_clear;
2329 }
2330 } 2372 }
2331 else 2373
2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2374 CLEAR_CHARS (xpixel, ypixel, count);
2375 did_clear: ;
2333 } 2376 }
2334 else 2377 else
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2378 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2336 2379
2337 if (rend & RS_Uline && font->descent > 1 && fore != back) 2380 if (rend & RS_Uline && font->descent > 1 && fore != back)
2338 { 2381 {
2339#if ENABLE_FRILLS 2382#if ENABLE_FRILLS
2340 if (ISSET_PIXCOLOR (Color_underline)) 2383 if (ISSET_PIXCOLOR (Color_underline))
2341 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2384 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2342 else 2385 else
2343#endif 2386#endif
2344 XSetForeground (display->display, gc, pix_colors[fore]); 2387 XSetForeground (dpy, gc, pix_colors[fore]);
2345 2388
2346 XDrawLine (display->display, drawBuffer, gc, 2389 XDrawLine (dpy, vt, gc,
2347 xpixel, ypixel + font->ascent + 1, 2390 xpixel, ypixel + font->ascent + 1,
2348 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2391 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2349 } 2392 }
2350 } /* for (col....) */ 2393 } /* for (col....) */
2351 } /* for (row....) */ 2394 } /* for (row....) */
… …
2360 */ 2403 */
2361 if (showcursor) 2404 if (showcursor)
2362 { 2405 {
2363 if (focus) 2406 if (focus)
2364 { 2407 {
2365 if (OPTION (Opt_cursorUnderline)) 2408 if (option (Opt_cursorUnderline))
2366 *crp ^= RS_Uline; 2409 *crp ^= RS_Uline;
2367 else 2410 else
2368 { 2411 {
2369 *crp ^= RS_RVid; 2412 *crp ^= RS_RVid;
2370#ifndef NO_CURSORCOLOR 2413#ifndef NO_CURSORCOLOR
… …
2384 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2427 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2428 cursorwidth++;
2386 2429
2387#ifndef NO_CURSORCOLOR 2430#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2431 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2432 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2433 else
2390#endif 2434#endif
2435 XSetForeground (dpy, gc, pix_colors[ccol1]);
2391 2436
2392 XDrawRectangle (display->display, drawBuffer, gc, 2437 XDrawRectangle (dpy, vt, gc,
2393 Col2Pixel (col), 2438 Col2Pixel (col),
2394 Row2Pixel (oldcursor.row), 2439 Row2Pixel (oldcursor.row),
2395 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2440 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2396 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2441 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2397 } 2442 }
… …
2432} 2477}
2433 2478
2434void 2479void
2435rxvt_term::scr_recolour () NOTHROW 2480rxvt_term::scr_recolour () NOTHROW
2436{ 2481{
2437 if (1 2482#ifdef HAVE_BG_PIXMAP
2438#if TRANSPARENT 2483 bgPixmap.apply ();
2439 && !am_transparent 2484#else
2440#endif 2485
2441#if XPM_BACKGROUND
2442 && !bgPixmap.pixmap
2443#endif
2444 )
2445 {
2446 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2447 XClearWindow (display->display, parent[0]); 2487 XClearWindow (dpy, parent[0]);
2448 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2488 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2449#if HAVE_SCROLLBARS 2489
2450 if (scrollBar.win) 2490 if (scrollBar.win)
2451 { 2491 {
2452 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2492 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2453 scrollBar.setIdle (); 2493 scrollBar.state = STATE_IDLE;
2454 scrollbar_show (0); 2494 scrollBar.show (0);
2455 }
2456#endif
2457 } 2495 }
2458 2496
2497#endif
2498
2499 /* bgPixmap.apply () does not do the following : */
2459 scr_clear (); 2500 scr_clear ();
2460 scr_touch (true); 2501 scr_touch (true);
2461 want_refresh = 1; 2502 want_refresh = 1;
2462} 2503}
2463 2504
… …
2470 2511
2471 num_scr_allow = 0; 2512 num_scr_allow = 0;
2472 want_refresh = 1; 2513 want_refresh = 1;
2473 2514
2474 if (really) 2515 if (really)
2475 XClearWindow (display->display, vt); 2516 XClearWindow (dpy, vt);
2476} 2517}
2477 2518
2478void 2519void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2520rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{ 2521{
… …
2529{ 2570{
2530 if (selection.op 2571 if (selection.op
2531 && current_screen == selection.screen 2572 && current_screen == selection.screen
2532 && selection.end.row >= view_start) 2573 && selection.end.row >= view_start)
2533 { 2574 {
2534#if ENABLE_FRILLS 2575#if !ENABLE_MINIMAL
2535 if (selection.rect) 2576 if (selection.rect)
2536 scr_xor_rect (selection.beg.row, selection.beg.col, 2577 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 selection.end.row, selection.end.col, 2578 selection.end.row, selection.end.col,
2538 RS_RVid, RS_RVid | RS_Uline); 2579 RS_RVid, RS_RVid | RS_Uline);
2539 else 2580 else
… …
2555{ 2596{
2556 int row, wrote; 2597 int row, wrote;
2557 unsigned int width, towrite; 2598 unsigned int width, towrite;
2558 char r1[] = "\n"; 2599 char r1[] = "\n";
2559 2600
2560 for (row = saveLines - nsaved; 2601 for (row = saveLines + top_row;
2561 row < saveLines + nrow - 1; row++) 2602 row < saveLines + nrow - 1; row++)
2562 { 2603 {
2563 width = row_buf[row].l >= 0 ? row_buf[row].l 2604 width = row_buf[row].l >= 0 ? row_buf[row].l
2564 : ncol; 2605 : ncol;
2565 for (towrite = width; towrite; towrite -= wrote) 2606 for (towrite = width; towrite; towrite -= wrote)
… …
2616 /* convert normal newline chars into common keyboard Return key sequence */ 2657 /* convert normal newline chars into common keyboard Return key sequence */
2617 for (unsigned int i = 0; i < len; i++) 2658 for (unsigned int i = 0; i < len; i++)
2618 if (data[i] == C0_LF) 2659 if (data[i] == C0_LF)
2619 data[i] = C0_CR; 2660 data[i] = C0_CR;
2620 2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[200~");
2664
2621 tt_write (data, len); 2665 tt_write (data, len);
2666
2667 if (priv_modes & PrivMode_BracketPaste)
2668 tt_printf ("\e[201~");
2622} 2669}
2623 2670
2624/* ------------------------------------------------------------------------- */ 2671/* ------------------------------------------------------------------------- */
2625/* 2672/*
2626 * Respond to a notification that a primary selection has been sent 2673 * Respond to a notification that a primary selection has been sent
… …
2655 } 2702 }
2656 2703
2657 unsigned long bytes_after; 2704 unsigned long bytes_after;
2658 XTextProperty ct; 2705 XTextProperty ct;
2659 2706
2660 if (XGetWindowProperty (display->display, win, prop, 2707 if (XGetWindowProperty (dpy, win, prop,
2661 0, PROP_SIZE / 4, 2708 0, PROP_SIZE / 4,
2662 delete_prop, AnyPropertyType, 2709 delete_prop, AnyPropertyType,
2663 &ct.encoding, &ct.format, 2710 &ct.encoding, &ct.format,
2664 &ct.nitems, &bytes_after, 2711 &ct.nitems, &bytes_after,
2665 &ct.value) != Success) 2712 &ct.value) != Success)
… …
2674 if (bytes_after) 2721 if (bytes_after)
2675 { 2722 {
2676 // fetch and append remaining data 2723 // fetch and append remaining data
2677 XTextProperty ct2; 2724 XTextProperty ct2;
2678 2725
2679 if (XGetWindowProperty (display->display, win, prop, 2726 if (XGetWindowProperty (dpy, win, prop,
2680 ct.nitems / 4, (bytes_after + 3) / 4, 2727 ct.nitems / 4, (bytes_after + 3) / 4,
2681 delete_prop, AnyPropertyType, 2728 delete_prop, AnyPropertyType,
2682 &ct2.encoding, &ct2.format, 2729 &ct2.encoding, &ct2.format,
2683 &ct2.nitems, &bytes_after, 2730 &ct2.nitems, &bytes_after,
2684 &ct2.value) != Success) 2731 &ct2.value) != Success)
… …
2697 2744
2698 if (ct.encoding == xa[XA_INCR]) 2745 if (ct.encoding == xa[XA_INCR])
2699 { 2746 {
2700 // INCR selection, start handshake 2747 // INCR selection, start handshake
2701 if (!delete_prop) 2748 if (!delete_prop)
2702 XDeleteProperty (display->display, win, prop); 2749 XDeleteProperty (dpy, win, prop);
2703 2750
2704 selection_wait = Sel_incr; 2751 selection_wait = Sel_incr;
2705 incr_buf_fill = 0; 2752 incr_buf_fill = 0;
2706 incr_ev.start (NOW + 10); 2753 incr_ev.start (10);
2707 2754
2708 goto bailout; 2755 goto bailout;
2709 } 2756 }
2710 2757
2711 if (ct.nitems == 0) 2758 if (ct.nitems == 0)
… …
2720 ct.nitems = incr_buf_fill; 2767 ct.nitems = incr_buf_fill;
2721 incr_buf = 0; 2768 incr_buf = 0;
2722 incr_buf_size = 0; 2769 incr_buf_size = 0;
2723 incr_ev.stop (); 2770 incr_ev.stop ();
2724 } 2771 }
2725 else 2772 else
2726 { 2773 {
2727 if (selection_wait == Sel_normal 2774 if (selection_wait == Sel_normal
2728 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2775 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2729 { 2776 {
2730 /* 2777 /*
… …
2737 goto bailout; 2784 goto bailout;
2738 } 2785 }
2739 } 2786 }
2740 else if (selection_wait == Sel_incr) 2787 else if (selection_wait == Sel_incr)
2741 { 2788 {
2742 incr_ev.start (NOW + 10); 2789 incr_ev.start (10);
2743 2790
2744 while (incr_buf_fill + ct.nitems > incr_buf_size) 2791 while (incr_buf_fill + ct.nitems > incr_buf_size)
2745 { 2792 {
2746 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2793 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2747 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2794 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2754 } 2801 }
2755 2802
2756 char **cl; 2803 char **cl;
2757 int cr; 2804 int cr;
2758 2805
2759#if ENABLE_FRILLS 2806#if !ENABLE_MINIMAL
2760 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2807 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2761 // so recode it manually 2808 // so recode it manually
2762 if (ct.encoding == xa[XA_UTF8_STRING]) 2809 if (ct.encoding == xa[XA_UTF8_STRING])
2763 { 2810 {
2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2811 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2768 paste (s, strlen (s)); 2815 paste (s, strlen (s));
2769 free (s); 2816 free (s);
2770 } 2817 }
2771 else 2818 else
2772#endif 2819#endif
2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2820 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2774 && cl) 2821 && cl)
2775 { 2822 {
2776 for (int i = 0; i < cr; i++) 2823 for (int i = 0; i < cr; i++)
2777 paste (cl[i], strlen (cl[i])); 2824 paste (cl[i], strlen (cl[i]));
2778 2825
… …
2787 if (selection_wait == Sel_normal) 2834 if (selection_wait == Sel_normal)
2788 selection_wait = Sel_none; 2835 selection_wait = Sel_none;
2789} 2836}
2790 2837
2791void 2838void
2792rxvt_term::incr_cb (time_watcher &w) NOTHROW 2839rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2793{ 2840{
2794 selection_wait = Sel_none; 2841 selection_wait = Sel_none;
2795 2842
2796 incr_buf_size = 0; 2843 incr_buf_size = 0;
2797 free (incr_buf); 2844 free (incr_buf);
… …
2808 selection_paste (win, prop, true); 2855 selection_paste (win, prop, true);
2809} 2856}
2810 2857
2811/* ------------------------------------------------------------------------- */ 2858/* ------------------------------------------------------------------------- */
2812/* 2859/*
2813 * Request the current selection: 2860 * Request the current selection:
2814 * Order: > internal selection if available 2861 * Order: > internal selection if available
2815 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2862 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2816 * > CUT_BUFFER0 2863 * > CUT_BUFFER0
2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2864 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2818 * will auto fallback to CUT_BUFFER0 2865 * will auto fallback to CUT_BUFFER0
… …
2820 */ 2867 */
2821void 2868void
2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2869rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2823{ 2870{
2824 if (selection.text && selnum == Sel_Primary) 2871 if (selection.text && selnum == Sel_Primary)
2872 {
2825 { /* internal selection */ 2873 /* internal selection */
2826 char *str = rxvt_wcstombs (selection.text, selection.len); 2874 char *str = rxvt_wcstombs (selection.text, selection.len);
2827 paste (str, strlen (str)); 2875 paste (str, strlen (str));
2828 free (str); 2876 free (str);
2829 return; 2877 return;
2830 } 2878 }
… …
2860 else if (selnum == Sel_Secondary) 2908 else if (selnum == Sel_Secondary)
2861 sel = XA_SECONDARY; 2909 sel = XA_SECONDARY;
2862 else 2910 else
2863 sel = xa[XA_CLIPBOARD]; 2911 sel = xa[XA_CLIPBOARD];
2864 2912
2865 if (XGetSelectionOwner (display->display, sel) != None) 2913 if (XGetSelectionOwner (dpy, sel) != None)
2866 { 2914 {
2867 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2915 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2868 vt, selection_request_time); 2916 vt, selection_request_time);
2869 return 1; 2917 return 1;
2870 } 2918 }
2871 2919
2872 return 0; 2920 return 0;
… …
2935 2983
2936 int end_col; 2984 int end_col;
2937 2985
2938 for (; row <= selection.end.row; row++, col = 0) 2986 for (; row <= selection.end.row; row++, col = 0)
2939 { 2987 {
2940#if ENABLE_FRILLS 2988#if !ENABLE_MINIMAL
2941 if (selection.rect) 2989 if (selection.rect)
2942 { 2990 {
2943 col = selection.beg.col; 2991 col = selection.beg.col;
2944 end_col = ncol + 1; 2992 end_col = ncol + 1;
2945 } 2993 }
… …
2948 end_col = ROW(row).l; 2996 end_col = ROW(row).l;
2949 2997
2950 col = max (col, 0); 2998 col = max (col, 0);
2951 2999
2952 if (row == selection.end.row 3000 if (row == selection.end.row
2953#if ENABLE_FRILLS 3001#if !ENABLE_MINIMAL
2954 || selection.rect 3002 || selection.rect
2955#endif 3003#endif
2956 ) 3004 )
2957 min_it (end_col, selection.end.col); 3005 min_it (end_col, selection.end.col);
2958 3006
… …
2981#endif 3029#endif
2982 else 3030 else
2983 new_selection_text[ofs++] = *t++; 3031 new_selection_text[ofs++] = *t++;
2984 } 3032 }
2985 3033
2986#if ENABLE_FRILLS 3034#if !ENABLE_MINIMAL
2987 if (selection.rect) 3035 if (selection.rect)
2988 { 3036 {
2989 while (ofs 3037 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF 3038 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1])) 3039 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3025bool 3073bool
3026rxvt_term::selection_grab (Time tm) NOTHROW 3074rxvt_term::selection_grab (Time tm) NOTHROW
3027{ 3075{
3028 selection_time = tm; 3076 selection_time = tm;
3029 3077
3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3078 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3079 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3032 { 3080 {
3033 display->set_selection_owner (this); 3081 display->set_selection_owner (this);
3034 return true; 3082 return true;
3035 } 3083 }
3036 else 3084 else
… …
3040 } 3088 }
3041 3089
3042#if 0 3090#if 0
3043 XTextProperty ct; 3091 XTextProperty ct;
3044 3092
3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3093 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3046 { 3094 {
3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3095 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3048 XFree (ct.value); 3096 XFree (ct.value);
3049 } 3097 }
3050#endif 3098#endif
… …
3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3144 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3097 3145
3098 while (selection.mark.col > 0 3146 while (selection.mark.col > 0
3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3147 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3100 --selection.mark.col; 3148 --selection.mark.col;
3101 3149
3102 if (selection.op) 3150 if (selection.op)
3151 {
3103 { /* clear the old selection */ 3152 /* clear the old selection */
3104 selection.beg.row = selection.end.row = selection.mark.row; 3153 selection.beg.row = selection.end.row = selection.mark.row;
3105 selection.beg.col = selection.end.col = selection.mark.col; 3154 selection.beg.col = selection.end.col = selection.mark.col;
3106 } 3155 }
3107 3156
3108 selection.op = SELECTION_INIT; 3157 selection.op = SELECTION_INIT;
… …
3297 * a point/word/line which is either the start or end of the selection 3346 * 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 3347 * and it was decided by whichever point/word/line was `fixed' at the
3299 * time of the most recent button3 press 3348 * time of the most recent button3 press
3300 */ 3349 */
3301 if (button3 && buttonpress) 3350 if (button3 && buttonpress)
3351 {
3302 { /* button3 press */ 3352 /* button3 press */
3303 /* 3353 /*
3304 * first determine which edge of the selection we are closest to 3354 * first determine which edge of the selection we are closest to
3305 */ 3355 */
3306 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3356 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3307 || (!ROWCOL_IS_AFTER (pos, selection.end) 3357 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3325 selection.mark.row = selection.beg.row; 3375 selection.mark.row = selection.beg.row;
3326 selection.mark.col = selection.beg.col; 3376 selection.mark.col = selection.beg.col;
3327 } 3377 }
3328 } 3378 }
3329 else 3379 else
3380 {
3330 { /* button1 drag or button3 drag */ 3381 /* button1 drag or button3 drag */
3331 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3382 if (ROWCOL_IS_AFTER (selection.mark, pos))
3332 { 3383 {
3333 if (selection.mark.row == selection.end.row 3384 if (selection.mark.row == selection.end.row
3334 && selection.mark.col == selection.end.col 3385 && selection.mark.col == selection.end.col
3335 && clickchange 3386 && clickchange
… …
3352 3403
3353 if (selection.clicks == 1) 3404 if (selection.clicks == 1)
3354 { 3405 {
3355 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3406 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.beg.row).is_longer () 3407 && !ROW(selection.beg.row).is_longer ()
3357#if ENABLE_FRILLS 3408#if !ENABLE_MINIMAL
3358 && !selection.rect 3409 && !selection.rect
3359#endif 3410#endif
3360 ) 3411 )
3361 selection.beg.col = ncol; 3412 selection.beg.col = ncol;
3362 3413
3363 if ( 3414 if (
3364 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3415 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.end.row).is_longer () 3416 && !ROW(selection.end.row).is_longer ()
3366#if ENABLE_FRILLS 3417#if !ENABLE_MINIMAL
3367 && !selection.rect 3418 && !selection.rect
3368#endif 3419#endif
3369 ) 3420 )
3370 selection.end.col = ncol; 3421 selection.end.col = ncol;
3371 } 3422 }
… …
3378 selection_delimit_word (DN, &selection.end, &selection.end); 3429 selection_delimit_word (DN, &selection.end, &selection.end);
3379 } 3430 }
3380 else if (selection.clicks == 3) 3431 else if (selection.clicks == 3)
3381 { 3432 {
3382#if ENABLE_FRILLS 3433#if ENABLE_FRILLS
3383 if (OPTION (Opt_tripleclickwords)) 3434 if (option (Opt_tripleclickwords))
3384 { 3435 {
3385 selection_delimit_word (UP, &selection.beg, &selection.beg); 3436 selection_delimit_word (UP, &selection.beg, &selection.beg);
3386 3437
3387 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3438 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3388 { 3439 {
3389 if (!ROW(end_row).is_longer ()) 3440 if (!ROW(end_row).is_longer ())
3390 { 3441 {
3391 selection.end.row = end_row; 3442 selection.end.row = end_row;
3392 selection.end.col = ROW(end_row).l; 3443 selection.end.col = ROW(end_row).l;
3444# if !ENABLE_MINIMAL
3393 selection_remove_trailing_spaces (); 3445 selection_remove_trailing_spaces ();
3446# endif
3394 break; 3447 break;
3395 } 3448 }
3396 } 3449 }
3397 } 3450 }
3398 else 3451 else
… …
3414 selection.end.row++; 3467 selection.end.row++;
3415 } 3468 }
3416 } 3469 }
3417 3470
3418 if (button3 && buttonpress) 3471 if (button3 && buttonpress)
3472 {
3419 { /* mark may need to be changed */ 3473 /* mark may need to be changed */
3420 if (closeto == LEFT) 3474 if (closeto == LEFT)
3421 { 3475 {
3422 selection.mark.row = selection.end.row; 3476 selection.mark.row = selection.end.row;
3423 selection.mark.col = selection.end.col - (selection.clicks == 2); 3477 selection.mark.col = selection.end.col - (selection.clicks == 2);
3424 } 3478 }
… …
3427 selection.mark.row = selection.beg.row; 3481 selection.mark.row = selection.beg.row;
3428 selection.mark.col = selection.beg.col; 3482 selection.mark.col = selection.beg.col;
3429 } 3483 }
3430 } 3484 }
3431 3485
3432#if ENABLE_FRILLS 3486#if !ENABLE_MINIMAL
3433 if (selection.rect && selection.beg.col > selection.end.col) 3487 if (selection.rect && selection.beg.col > selection.end.col)
3434 ::swap (selection.beg.col, selection.end.col); 3488 ::swap (selection.beg.col, selection.end.col);
3435#endif 3489#endif
3436} 3490}
3437 3491
3438#if ENABLE_FRILLS 3492#if !ENABLE_MINIMAL
3439void 3493void
3440rxvt_term::selection_remove_trailing_spaces () NOTHROW 3494rxvt_term::selection_remove_trailing_spaces () NOTHROW
3441{ 3495{
3442 int32_t end_col, end_row; 3496 int32_t end_col, end_row;
3443 text_t *stp; 3497 text_t *stp;
… …
3498 */ 3552 */
3499void 3553void
3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3554rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3501{ 3555{
3502 XSelectionEvent ev; 3556 XSelectionEvent ev;
3503 dDisp;
3504 3557
3505 ev.type = SelectionNotify; 3558 ev.type = SelectionNotify;
3506 ev.property = None; 3559 ev.property = None;
3507 ev.display = rq.display; 3560 ev.display = rq.display;
3508 ev.requestor = rq.requestor; 3561 ev.requestor = rq.requestor;
… …
3522 *target++ = xa[XA_COMPOUND_TEXT]; 3575 *target++ = xa[XA_COMPOUND_TEXT];
3523#if X_HAVE_UTF8_STRING 3576#if X_HAVE_UTF8_STRING
3524 *target++ = xa[XA_UTF8_STRING]; 3577 *target++ = xa[XA_UTF8_STRING];
3525#endif 3578#endif
3526 3579
3527 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3580 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3528 32, PropModeReplace, 3581 32, PropModeReplace,
3529 (unsigned char *)target_list, target - target_list); 3582 (unsigned char *)target_list, target - target_list);
3530 ev.property = rq.property; 3583 ev.property = rq.property;
3531 } 3584 }
3532#if TODO // TODO 3585#if TODO // TODO
… …
3535 /* TODO: Handle MULTIPLE */ 3588 /* TODO: Handle MULTIPLE */
3536 } 3589 }
3537#endif 3590#endif
3538 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3591 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3539 { 3592 {
3540 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3593 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3541 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3594 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3542 ev.property = rq.property; 3595 ev.property = rq.property;
3543 } 3596 }
3544 else if (rq.target == XA_STRING 3597 else if (rq.target == XA_STRING
3545 || rq.target == xa[XA_TEXT] 3598 || rq.target == xa[XA_TEXT]
… …
3569 style = enc_string; 3622 style = enc_string;
3570 else if (target == xa[XA_TEXT]) 3623 else if (target == xa[XA_TEXT])
3571 style = enc_text; 3624 style = enc_text;
3572 else if (target == xa[XA_COMPOUND_TEXT]) 3625 else if (target == xa[XA_COMPOUND_TEXT])
3573 style = enc_compound_text; 3626 style = enc_compound_text;
3574#if ENABLE_FRILLS 3627#if !ENABLE_MINIMAL
3575 else if (target == xa[XA_UTF8_STRING]) 3628 else if (target == xa[XA_UTF8_STRING])
3576 style = enc_utf8; 3629 style = enc_utf8;
3577#endif 3630#endif
3578 else 3631 else
3579 { 3632 {
… …
3590 { 3643 {
3591 cl = L""; 3644 cl = L"";
3592 selectlen = 0; 3645 selectlen = 0;
3593 } 3646 }
3594 3647
3595#if ENABLE_FRILLS 3648#if !ENABLE_MINIMAL
3596 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3649 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3597 // so recode it manually 3650 // so recode it manually
3598 if (style == enc_utf8) 3651 if (style == enc_utf8)
3599 { 3652 {
3600 freect = 1; 3653 freect = 1;
… …
3603 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3656 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3604 ct.nitems = strlen ((char *)ct.value); 3657 ct.nitems = strlen ((char *)ct.value);
3605 } 3658 }
3606 else 3659 else
3607#endif 3660#endif
3608 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3661 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3609 freect = 1; 3662 freect = 1;
3610 else 3663 else
3611 { 3664 {
3612 /* if we failed to convert then send it raw */ 3665 /* if we failed to convert then send it raw */
3613 ct.value = (unsigned char *)cl; 3666 ct.value = (unsigned char *)cl;
3614 ct.nitems = selectlen; 3667 ct.nitems = selectlen;
3615 ct.encoding = target; 3668 ct.encoding = target;
3616 } 3669 }
3617 3670
3618 XChangeProperty (disp, rq.requestor, rq.property, 3671 XChangeProperty (dpy, rq.requestor, rq.property,
3619 ct.encoding, 8, PropModeReplace, 3672 ct.encoding, 8, PropModeReplace,
3620 ct.value, (int)ct.nitems); 3673 ct.value, (int)ct.nitems);
3621 ev.property = rq.property; 3674 ev.property = rq.property;
3622 3675
3623 if (freect) 3676 if (freect)
3624 XFree (ct.value); 3677 XFree (ct.value);
3625 } 3678 }
3626 3679
3627 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3680 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} 3681}
3645 3682
3646/* ------------------------------------------------------------------------- */ 3683/* ------------------------------------------------------------------------- */
3647#ifdef USE_XIM 3684#ifdef USE_XIM
3648void 3685void
3649rxvt_term::im_set_position (XPoint &pos) NOTHROW 3686rxvt_term::im_set_position (XPoint &pos) NOTHROW
3650{ 3687{
3651 XWindowAttributes xwa; 3688 XWindowAttributes xwa;
3652 3689
3653 XGetWindowAttributes (display->display, vt, &xwa); 3690 XGetWindowAttributes (dpy, vt, &xwa);
3654 3691
3655 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3692 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3656 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3693 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3657} 3694}
3658#endif 3695#endif
… …
3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3791rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3755{ 3792{
3756 while (*s) 3793 while (*s)
3757 { 3794 {
3758 text_t t = *s++; 3795 text_t t = *s++;
3759 int width = wcwidth (t); 3796 int width = WCWIDTH (t);
3760 3797
3761 while (width--) 3798 while (width--)
3762 { 3799 {
3763 scr_overlay_set (x++, y, t); 3800 scr_overlay_set (x++, y, t);
3764 t = NOCHAR; 3801 t = NOCHAR;

Diff Legend

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