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.290 by root, Fri Dec 14 05:52:34 2007 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() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
… …
126 width = ncol; 124 width = ncol;
127 } 125 }
128 126
129 l.touch (); 127 l.touch ();
130 128
131 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 131
134 text_t *et = l.t + col; 132 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 133 rend_t *er = l.r + col;
136 134
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
173 nrow = 24; 172 nrow = 24;
174 173
175 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 175 return;
177 176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
182 saveLines++; 184 saveLines++;
183 prev_nrow--; 185 prev_nrow--;
184 top_row--; 186 top_row--;
… …
195 if (!row_buf) 197 if (!row_buf)
196 { 198 {
197 /* 199 /*
198 * first time called so just malloc everything: don't rely on realloc 200 * first time called so just malloc everything: don't rely on realloc
199 */ 201 */
200 top_row = 0; /* no saved lines */ 202 top_row = 0;
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
239 rvideo_state = rvideo_mode = false;
240 } 241 }
241 else 242 else
242 { 243 {
243 /* 244 /*
244 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 275 }
275 276
276 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 279
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
282 283
283 if (top_row) 284 if (top_row)
284 { 285 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
287 288
288 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 291
… …
327 int qcol = 0; 328 int qcol = 0;
328 329
329 // see below for cursor adjustment rationale 330 // see below for cursor adjustment rationale
330 if (p == ocur.row) 331 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 332 screen.cur.row = q - (total_rows - nrow);
332 333
333 // fill a single destination line 334 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
335 { 336 {
336 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
347 348
348 line_t &pline = old_buf [prow]; 349 line_t &pline = old_buf [prow];
349 350
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 352
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)); 353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 355
360 lofs += len; 356 lofs += len;
361 qcol += len; 357 qcol += len;
… …
368 } 364 }
369 while (p != pend && q > 0); 365 while (p != pend && q > 0);
370 366
371 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
372 top_row = q - term_start; 368 top_row = q - term_start;
373 369
374 // make sure all terminal lines exist 370 // make sure all terminal lines exist
375 while (top_row > 0) 371 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 373 }
378 else 374 else
379 { 375 {
380 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
381 377
382 for (int row = min (nrow, prev_nrow); row--; ) 378 for (int row = min (nrow, prev_nrow); row--; )
383 { 379 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 380 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 381 line_t &qline = row_buf [row];
386 382
… …
401 delete old_ra; 397 delete old_ra;
402 398
403 clamp_it (screen.cur.row, 0, nrow - 1); 399 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 400 clamp_it (screen.cur.col, 0, ncol - 1);
405 401
406 if (tabs)
407 free (tabs); 402 free (tabs);
408 } 403 }
409 404
410 CLEAR_ALL_SELECTION (); 405 CLEAR_ALL_SELECTION ();
411 406
412 prev_nrow = nrow; 407 prev_nrow = nrow;
413 prev_ncol = ncol; 408 prev_ncol = ncol;
414 409
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
416 411
417 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
419 414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417
420 tt_winch (); 418 tt_winch ();
421 419
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 421}
424 422
… …
427 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
428 */ 426 */
429void 427void
430rxvt_term::scr_release () NOTHROW 428rxvt_term::scr_release () NOTHROW
431{ 429{
430 if (row_buf)
431 {
432 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
434 434
435 free (row_buf); 435 free (row_buf);
436 free (swap_buf); 436 free (swap_buf);
437 free (drawn_buf); 437 free (drawn_buf);
438 free (tabs); 438 free (tabs);
439 439
440 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
441 }
441} 442}
442 443
443/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
444/* 445/*
445 * Hard reset 446 * Hard reset
446 */ 447 */
447void 448void
448rxvt_term::scr_poweron () NOTHROW 449rxvt_term::scr_poweron ()
449{ 450{
450 scr_release (); 451 scr_release ();
451 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
452 scr_reset (); 453 scr_reset ();
453 454
… …
504 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
506#endif 507#endif
507} 508}
508 509
510void
511rxvt_term::scr_swap_screen ()
512{
513 if (!option (Opt_secondaryScreen))
514 return;
515
516 for (int i = prev_nrow; i--; )
517 ::swap (ROW(i), swap_buf [i]);
518
519 ::swap (screen.cur, swap.cur);
520
521 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
522 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
523}
524
509/* ------------------------------------------------------------------------- */ 525/* ------------------------------------------------------------------------- */
510/* 526/*
511 * Swap between primary and secondary screens 527 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 528 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 529 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 530 */
515int 531void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 532rxvt_term::scr_change_screen (int scrn)
517{ 533{
534 if (scrn == current_screen)
535 return;
536
518 want_refresh = 1; 537 want_refresh = 1;
519 view_start = 0; 538 view_start = 0;
520 539
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
525 541
526 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
527 543
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 544#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
536 { 546 {
537 num_scr = 0; 547 num_scr = 0;
538 548
539 for (int i = prev_nrow; i--; ) 549 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 550
542 ::swap (screen.charset, swap.charset); 551 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 552 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
546 } 555 }
547 else 556 else
548#endif 557#endif
549 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 560}
554 561
555// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
556void 563void
557rxvt_term::scr_do_wrap () NOTHROW 564rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 596/*
590 * Change the rendition style for following text 597 * Change the rendition style for following text
591 */ 598 */
592void 599void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 600rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 601{
595 if (set) 602 if (set)
596 rstyle |= style; 603 rstyle |= style;
597 else if (style == ~RS_None) 604 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
599 else 606 else
600 rstyle &= ~style; 607 rstyle &= ~style;
601 } 608}
602 609
603/* ------------------------------------------------------------------------- */ 610/* ------------------------------------------------------------------------- */
604/* 611/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 613 * count positive ==> scroll up
… …
615 want_refresh = 1; 622 want_refresh = 1;
616 num_scr += count; 623 num_scr += count;
617 624
618 if (count > 0 625 if (count > 0
619 && row1 == 0 626 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 628 {
622 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
623 630
624 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
632 } 639 }
633 640
634 // erase newly scrolled-in lines 641 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 642 for (int i = count; i--; )
636 { 643 {
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); 644 line_t &l = ROW(nrow - 1 - i);
640 645
646 // optimize if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 {
641 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 651 l.l = 0;
644 l.f = 0; 652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
645 } 656 }
646 657
647 // now copy lines below the scroll region bottom to the 658 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 659 // bottom of the screen again, so they look as if they
649 // hadn't moved. 660 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 664 line_t &l2 = ROW(i);
654 665
655 ::swap (l1, l2); 666 ::swap (l1, l2);
656 l2.touch (); 667 l2.touch ();
657 } 668 }
658 669
659 // move and/or clear selection, if any 670 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
661 { 672 {
662 selection.beg.row -= count; 673 selection.beg.row -= count;
663 selection.end.row -= count; 674 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
672 } 683 }
673 } 684 }
674 685
675 // finally move the view window, if desired 686 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 688 && view_start != 0
678 && view_start != -saveLines) 689 && view_start != -saveLines)
679 scr_page (UP, count); 690 scr_page (UP, count);
680 691
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 710 {
700 /* move selected region too */ 711 /* move selected region too */
701 selection.beg.row -= count; 712 selection.beg.row -= count;
702 selection.end.row -= count; 713 selection.end.row -= count;
703 selection.mark.row -= count; 714 selection.mark.row -= count;
704 715
705 selection_check (0); 716 selection_check (0);
706 } 717 }
707 } 718 }
708 719
709 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
749 ZERO_SCROLLBACK (); 760 ZERO_SCROLLBACK ();
750 761
751 if (minlines > 0) 762 if (minlines > 0)
752 { 763 {
753 minlines += screen.cur.row - screen.bscroll; 764 minlines += screen.cur.row - screen.bscroll;
765 min_it (minlines, screen.cur.row - top_row);
754 766
755 if (minlines > 0 767 if (minlines > 0
756 && screen.tscroll == 0 768 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 769 && screen.bscroll == nrow - 1)
758 { 770 {
… …
820 } 832 }
821 833
822 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
823 { 835 {
824 scr_do_wrap (); 836 scr_do_wrap ();
825 837
826 line->l = ncol; 838 line->l = ncol;
827 line->is_longer (1); 839 line->is_longer (1);
828 840
829 row = screen.cur.row; 841 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
… …
832 844
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835 c = 0xfffd; 847 c = 0xfffd;
836 848
837 // rely on wcwidth to tell us the character width, at least for non-latin1 849 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 850 // 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 851 // drawing characters below as they might be invalid in the current
840 // locale. 852 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
842 854
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
844 { 856 {
845 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
1048 x = i; 1060 x = i;
1049 1061
1050 if (!--count) 1062 if (!--count)
1051 break; 1063 break;
1052 } 1064 }
1053 else 1065 else
1054 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1056 1068
1057 if (count) 1069 if (count)
1058 x = ncol - 1; 1070 x = ncol - 1;
1059 1071
1060 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1063 { 1075 {
1064 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1065 1077
1066 l.touch (x); 1078 l.touch (x);
1067 1079
… …
1100 * Process DEC Back Index 1112 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1104 */ 1116 */
1105#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1106void 1118void
1107rxvt_term::scr_backindex () NOTHROW 1119rxvt_term::scr_backindex () NOTHROW
1108{ 1120{
1109 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1129 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1121 */ 1133 */
1122#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1123void 1135void
1124rxvt_term::scr_forwardindex () NOTHROW 1136rxvt_term::scr_forwardindex () NOTHROW
1125{ 1137{
1126 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1186 }
1175 } 1187 }
1176 else 1188 else
1177 { 1189 {
1178 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1179 { /* relative origin mode */ 1192 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1182 } 1195 }
1183 else 1196 else
1184 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1328 } 1341 }
1329 else 1342 else
1330 { 1343 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1344 ren = rstyle & (RS_fgMask | RS_bgMask);
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1347 ERASE_ROWS (row, num);
1335 gcvalue.foreground = pix_colors[Color_fg]; 1348 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1349 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1337 } 1350 }
1338 1351
1339 for (; num--; row++) 1352 for (; num--; row++)
1340 { 1353 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1354 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1355 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1356 }
1344} 1357}
1345 1358
1346#if ENABLE_FRILLS 1359#if !ENABLE_MINIMAL
1347void 1360void
1348rxvt_term::scr_erase_savelines () NOTHROW 1361rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1362{
1350 want_refresh = 1; 1363 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1364 ZERO_SCROLLBACK ();
… …
1460 { 1473 {
1461 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1475 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1476 CLEAR_SELECTION ();
1464 else 1477 else
1478 {
1465 { /* shift selection */ 1479 /* shift selection */
1466 selection.beg.col += count; 1480 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1481 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1482 selection.end.col += count;
1469 } 1483 }
1470 } 1484 }
… …
1609 */ 1623 */
1610void 1624void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1626{
1613 if (mode < 0) 1627 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
1617} 1631}
1618 1632
1619/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
… …
1634 if (rvideo_state != on) 1648 if (rvideo_state != on)
1635 { 1649 {
1636 rvideo_state = on; 1650 rvideo_state = on;
1637 1651
1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1639#if XPM_BACKGROUND 1653#ifdef HAVE_BG_PIXMAP
1640 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1641#endif 1655#endif
1642#if TRANSPARENT
1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1644#endif
1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1646 1657
1647 XGCValues gcvalue; 1658 XGCValues gcvalue;
1648 gcvalue.foreground = pix_colors[Color_fg]; 1659 gcvalue.foreground = pix_colors[Color_fg];
1649 gcvalue.background = pix_colors[Color_bg]; 1660 gcvalue.background = pix_colors[Color_bg];
1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); 1661 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1651 1662
1652 scr_clear (); 1663 scr_clear ();
1653 scr_touch (true); 1664 scr_touch (true);
1654 } 1665 }
1655} 1666}
… …
1740{ 1751{
1741 bool found = false; 1752 bool found = false;
1742 1753
1743 for (int i = 0; i < nrow; i++) 1754 for (int i = 0; i < nrow; i++)
1744 { 1755 {
1745 int col = 0;
1746 rend_t *drp = drawn_buf[i].r; 1756 rend_t *drp = drawn_buf[i].r;
1747 1757
1748 for (; col < ncol; col++, drp++) 1758 for (int col = 0; col < ncol; col++, drp++)
1749 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1750 { 1760 {
1751 found = true; 1761 found = true;
1752 *drp = ~value; 1762 *drp = ~value;
1753 } 1763 }
… …
1793 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1794 { 1804 {
1795 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1796 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1797 } 1807 }
1798 1808// 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++) 1809 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); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1801 1811
1802 num_scr_allow = 0; 1812 num_scr_allow = 0;
1803 1813
… …
1858 return true; 1868 return true;
1859} 1869}
1860 1870
1861#ifndef NO_BELL 1871#ifndef NO_BELL
1862void 1872void
1863rxvt_term::bell_cb (time_watcher &w) 1873rxvt_term::bell_cb (ev::timer &w, int revents)
1864{ 1874{
1865 rvideo_bell = false; 1875 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode); 1876 scr_rvideo_mode (rvideo_mode);
1867} 1877}
1868#endif 1878#endif
… …
1873{ 1883{
1874#ifndef NO_BELL 1884#ifndef NO_BELL
1875 1885
1876# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1877# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1878 if (OPTION (Opt_mapAlert)) 1888 if (option (Opt_mapAlert))
1879# endif 1889# endif
1880 XMapWindow (display->display, parent[0]); 1890 XMapWindow (dpy, parent[0]);
1881# endif 1891# endif
1882 1892
1893# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell))
1895 {
1896 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints (dpy, parent[0], h);
1900 }
1901 }
1902# endif
1903
1883 if (OPTION (Opt_visualBell)) 1904 if (option (Opt_visualBell))
1884 { 1905 {
1885 rvideo_bell = true; 1906 rvideo_bell = true;
1886 scr_rvideo_mode (rvideo_mode); 1907 scr_rvideo_mode (rvideo_mode);
1887 display->flush (); 1908 flush ();
1888 1909
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION); 1910 bell_ev.start (VISUAL_BELL_DURATION);
1890 } 1911 }
1891 else 1912 else
1892 XBell (display->display, 0); 1913 XBell (dpy, 0);
1893
1894#endif 1914#endif
1895} 1915}
1896 1916
1897/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1898/* ARGSUSED */ 1918/* ARGSUSED */
… …
1956 * screen.text/screen.rend contain what the screen will change to. 1976 * screen.text/screen.rend contain what the screen will change to.
1957 */ 1977 */
1958void 1978void
1959rxvt_term::scr_refresh () NOTHROW 1979rxvt_term::scr_refresh () NOTHROW
1960{ 1980{
1961 unsigned char must_clear, /* use draw_string not draw_image_string */ 1981 unsigned char have_bg,
1962 showcursor; /* show the cursor */ 1982 showcursor; /* show the cursor */
1963 int16_t col, row, /* column/row we're processing */ 1983 int16_t col, row, /* column/row we're processing */
1964 ocrow; /* old cursor row */ 1984 ocrow; /* old cursor row */
1965 int i; /* tmp */ 1985 int i; /* tmp */
1966#ifndef NO_CURSORCOLOR 1986#ifndef NO_CURSORCOLOR
1967 rend_t cc1; /* store colours at cursor position (s) */ 1987 rend_t cc1; /* store colours at cursor position (s) */
1968#endif 1988#endif
1969 rend_t *crp; // cursor rendition pointer 1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */
1970 1992
1971 want_refresh = 0; /* screen is current */ 1993 want_refresh = 0; /* screen is current */
1972 1994
1973 if (refresh_type == NO_REFRESH || !mapped) 1995 if (refresh_type == NO_REFRESH || !mapped)
1974 return; 1996 return;
1975 1997
1976 /* 1998 /*
1977 * A: set up vars 1999 * A: set up vars
1978 */ 2000 */
1979 must_clear = 0; 2001 have_bg = 0;
1980 refresh_count = 0; 2002 refresh_count = 0;
1981 2003
1982#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
1983 must_clear |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
1984#endif
1985#if TRANSPARENT
1986 must_clear |= OPTION (Opt_transparent) && am_transparent;
1987#endif 2006#endif
1988 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1989 2008
1990 /* 2009 /*
1991 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
1995 /* 2014 /*
1996 * C: set the cursor character (s) 2015 * C: set the cursor character (s)
1997 */ 2016 */
1998 { 2017 {
1999 unsigned char setoldcursor; 2018 unsigned char setoldcursor;
2000 rend_t ccol1, /* Cursor colour */
2001 ccol2; /* Cursor colour2 */
2002 2019
2003 showcursor = (screen.flags & Screen_VisibleCursor); 2020 showcursor = (screen.flags & Screen_VisibleCursor);
2004#ifdef CURSOR_BLINK 2021#ifdef CURSOR_BLINK
2005 if (hidden_cursor) 2022 if (hidden_cursor)
2006 showcursor = 0; 2023 showcursor = 0;
… …
2013 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2014 col--; 2031 col--;
2015 2032
2016 crp = &ROW(screen.cur.row).r[col]; 2033 crp = &ROW(screen.cur.row).r[col];
2017 2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046
2047#ifndef NO_CURSORCOLOR
2048 if (ISSET_PIXCOLOR (Color_cursor2))
2049 ccol2 = Color_cursor2;
2050 else
2051#endif
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057
2018 if (showcursor && focus) 2058 if (showcursor && focus)
2019 { 2059 {
2020 if (OPTION (Opt_cursorUnderline)) 2060 if (option (Opt_cursorUnderline))
2021 *crp ^= RS_Uline; 2061 *crp ^= RS_Uline;
2022 else 2062 else
2023 { 2063 {
2024 *crp ^= RS_RVid; 2064 *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); 2065 *crp = SET_FGCOLOR (*crp, ccol1);
2045 *crp = SET_BGCOLOR (*crp, ccol2); 2066 *crp = SET_BGCOLOR (*crp, ccol2);
2046#endif
2047 } 2067 }
2048 } 2068 }
2049 } 2069 }
2050 2070
2051 /* make sure no outline cursor is left around */ 2071 /* make sure no outline cursor is left around */
… …
2090 * D: CopyArea pass - very useful for slower links 2110 * D: CopyArea pass - very useful for slower links
2091 * This has been deliberately kept simple. 2111 * This has been deliberately kept simple.
2092 */ 2112 */
2093 if (!display->is_local 2113 if (!display->is_local
2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2114 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2095 && abs (num_scr) < nrow && !must_clear) 2115 && abs (num_scr) < nrow && !have_bg)
2096 { 2116 {
2097 int16_t nits; 2117 int16_t nits;
2118 int i = num_scr;
2098 int j; 2119 int j;
2099 int len, wlen; 2120 int len, wlen;
2100 dLocal (int, num_scr); 2121 dLocal (int, num_scr);
2101 2122
2102 j = nrow; 2123 j = nrow;
2103 wlen = len = -1; 2124 wlen = len = -1;
2104 row = i > 0 ? 0 : j - 1; 2125 row = i > 0 ? 0 : j - 1;
2126
2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2127 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2106 { 2128 {
2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2129 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2108 { 2130 {
2109 line_t s = ROW(view_start + row); 2131 line_t s = ROW(view_start + row);
… …
2130 wlen = row; 2152 wlen = row;
2131 continue; 2153 continue;
2132 } 2154 }
2133 } 2155 }
2134 2156
2135 if (len != -1) 2157 if (len >= 0)
2136 { 2158 {
2137 /* also comes here at end if needed because of >= above */ 2159 /* also comes here at end if needed because of >= above */
2138 if (wlen < len) 2160 if (wlen < len)
2139 ::swap (wlen, len); 2161 ::swap (wlen, len);
2140 2162
2163 XGCValues gcv;
2164
2165 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2141 XCopyArea (display->display, vt, vt, 2166 XCopyArea (dpy, vt, vt,
2142 gc, 0, Row2Pixel (len + i), 2167 gc, 0, Row2Pixel (len + i),
2143 (unsigned int)this->width, 2168 (unsigned int)this->width,
2144 (unsigned int)Height2Pixel (wlen - len + 1), 2169 (unsigned int)Height2Pixel (wlen - len + 1),
2145 0, Row2Pixel (len)); 2170 0, Row2Pixel (len));
2171 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2172
2146 len = -1; 2173 len = -1;
2147 } 2174 }
2148 } 2175 }
2149 } 2176 }
2150#endif 2177#endif
… …
2206 count++; 2233 count++;
2207 2234
2208 if (stp[col] != dtp[col] 2235 if (stp[col] != dtp[col]
2209 || !RS_SAME (srp[col], drp[col])) 2236 || !RS_SAME (srp[col], drp[col]))
2210 { 2237 {
2211 if (must_clear && (i++ > count / 2)) 2238 if (have_bg && (i++ > count / 2))
2212 break; 2239 break;
2213 2240
2214 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2215 drp[col] = rend; 2242 drp[col] = rend;
2216 i = 0; 2243 i = 0;
2217 } 2244 }
2218 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2245 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2219 break; 2246 break;
2220 } 2247 }
2221 2248
2222 col--; /* went one too far. move back */ 2249 col--; /* went one too far. move back */
2223 count -= i; /* dump any matching trailing chars */ 2250 count -= i; /* dump any matching trailing chars */
… …
2233 int back = bgcolor_of (rend); // desired background 2260 int back = bgcolor_of (rend); // desired background
2234 2261
2235 // only do special processing if any attributes are set, which is unlikely 2262 // 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)) 2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2237 { 2264 {
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; 2265 bool invert = rend & RS_RVid;
2251 2266
2252#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2253 if (rend & RS_Bold
2254 && fore == Color_fg) 2268 if (rend & RS_Bold && fore == Color_fg)
2255 { 2269 {
2256 if (ISSET_PIXCOLOR (Color_BD)) 2270 if (ISSET_PIXCOLOR (Color_BD))
2257 fore = Color_BD; 2271 fore = Color_BD;
2258# if !ENABLE_STYLES 2272# if !ENABLE_STYLES
2259 else 2273 else
2260 invert = !invert; 2274 invert = !invert;
2261# endif 2275# endif
2262 } 2276 }
2263 2277
2264 if (rend & RS_Italic 2278 if (rend & RS_Italic && fore == Color_fg)
2265 && fore == Color_fg)
2266 { 2279 {
2267 if (ISSET_PIXCOLOR (Color_IT)) 2280 if (ISSET_PIXCOLOR (Color_IT))
2268 fore = Color_IT; 2281 fore = Color_IT;
2269# if !ENABLE_STYLES 2282# if !ENABLE_STYLES
2270 else 2283 else
2271 invert = !invert; 2284 invert = !invert;
2272# endif 2285# endif
2273 } 2286 }
2274 2287
2275 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2276 fore = Color_UL; 2289 fore = Color_UL;
2277#endif 2290#endif
2278 2291
2279 if (invert) 2292 if (invert)
2280 { 2293 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2281 ::swap (fore, back); 2300 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2282 2305
2283#ifndef NO_BOLD_UNDERLINE_REVERSE 2306#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2284 if (ISSET_PIXCOLOR (Color_RV)) 2308 if (ISSET_PIXCOLOR (Color_RV))
2285 back = Color_RV; 2309 back = Color_RV;
2286 2310# endif
2287 if (fore == back) 2311 if (fore == back)
2288 { 2312 {
2289 fore = Color_bg; 2313 fore = Color_bg;
2290 back = Color_fg; 2314 back = Color_fg;
2291 } 2315 }
… …
2293 } 2317 }
2294 2318
2295#ifdef TEXT_BLINK 2319#ifdef TEXT_BLINK
2296 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2320 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2297 { 2321 {
2298 if (!text_blink_ev.active) 2322 if (!text_blink_ev.is_active ())
2299 { 2323 {
2300 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2324 text_blink_ev.again ();
2301 hidden_text = 0; 2325 hidden_text = 0;
2302 } 2326 }
2303 else if (hidden_text) 2327 else if (hidden_text)
2304 fore = back; 2328 fore = back;
2305 } 2329 }
2306#endif 2330#endif
2331
2332#if ENABLE_STYLES
2333 // "careful" (too wide) character handling
2334
2335 // include previous careful character(s) if possible, looks nicer (best effort...)
2336 while (text > stp
2337 && srp[text - stp - 1] & RS_Careful
2338 && RS_SAME (rend, srp[text - stp - 1]))
2339 text--, count++, xpixel -= fwidth;
2340
2341 // force redraw after "careful" characters to avoid pixel droppings
2342 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2343 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2344
2345 // force redraw before "careful" characters to avoid pixel droppings
2346 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2347 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2348#endif
2307 } 2349 }
2308 2350
2309 /* 2351 /*
2310 * Actually do the drawing of the string here 2352 * Actually do the drawing of the string here
2311 */ 2353 */
2312 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2313 2355
2314 if (back == fore)
2315 font->clear_rect (*drawable, xpixel, ypixel,
2316 fwidth * count, fheight,
2317 back);
2318 else if (back == Color_bg) 2356 if (have_bg && back == Color_bg)
2319 { 2357 {
2320 if (must_clear) 2358 // this is very ugly, maybe push it into ->draw?
2321 {
2322 CLEAR_CHARS (xpixel, ypixel, count);
2323 2359
2324 for (i = 0; i < count; i++) /* don't draw empty strings */ 2360 for (i = 0; i < count; i++) /* don't draw empty strings */
2325 if (text[i] != ' ') 2361 if (text[i] != ' ')
2326 { 2362 {
2327 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2328 break; 2364 goto did_clear;
2329 }
2330 } 2365 }
2331 else 2366
2332 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2368 did_clear: ;
2333 } 2369 }
2334 else 2370 else
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2336 2372
2337 if (rend & RS_Uline && font->descent > 1 && fore != back) 2373 if (rend & RS_Uline && font->descent > 1 && fore != back)
2338 { 2374 {
2339#if ENABLE_FRILLS 2375#if ENABLE_FRILLS
2340 if (ISSET_PIXCOLOR (Color_underline)) 2376 if (ISSET_PIXCOLOR (Color_underline))
2341 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2377 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2342 else 2378 else
2343#endif 2379#endif
2344 XSetForeground (display->display, gc, pix_colors[fore]); 2380 XSetForeground (dpy, gc, pix_colors[fore]);
2345 2381
2346 XDrawLine (display->display, drawBuffer, gc, 2382 XDrawLine (dpy, drawBuffer, gc,
2347 xpixel, ypixel + font->ascent + 1, 2383 xpixel, ypixel + font->ascent + 1,
2348 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2349 } 2385 }
2350 } /* for (col....) */ 2386 } /* for (col....) */
2351 } /* for (row....) */ 2387 } /* for (row....) */
… …
2360 */ 2396 */
2361 if (showcursor) 2397 if (showcursor)
2362 { 2398 {
2363 if (focus) 2399 if (focus)
2364 { 2400 {
2365 if (OPTION (Opt_cursorUnderline)) 2401 if (option (Opt_cursorUnderline))
2366 *crp ^= RS_Uline; 2402 *crp ^= RS_Uline;
2367 else 2403 else
2368 { 2404 {
2369 *crp ^= RS_RVid; 2405 *crp ^= RS_RVid;
2370#ifndef NO_CURSORCOLOR 2406#ifndef NO_CURSORCOLOR
… …
2384 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2420 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2385 cursorwidth++; 2421 cursorwidth++;
2386 2422
2387#ifndef NO_CURSORCOLOR 2423#ifndef NO_CURSORCOLOR
2388 if (ISSET_PIXCOLOR (Color_cursor)) 2424 if (ISSET_PIXCOLOR (Color_cursor))
2389 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else
2390#endif 2427#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]);
2391 2429
2392 XDrawRectangle (display->display, drawBuffer, gc, 2430 XDrawRectangle (dpy, drawBuffer, gc,
2393 Col2Pixel (col), 2431 Col2Pixel (col),
2394 Row2Pixel (oldcursor.row), 2432 Row2Pixel (oldcursor.row),
2395 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2433 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2396 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2397 } 2435 }
… …
2432} 2470}
2433 2471
2434void 2472void
2435rxvt_term::scr_recolour () NOTHROW 2473rxvt_term::scr_recolour () NOTHROW
2436{ 2474{
2437 if (1 2475#ifdef HAVE_BG_PIXMAP
2438#if TRANSPARENT 2476 bgPixmap.apply ();
2439 && !am_transparent 2477#else
2440#endif 2478
2441#if XPM_BACKGROUND
2442 && !bgPixmap.pixmap
2443#endif
2444 )
2445 {
2446 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2479 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2447 XClearWindow (display->display, parent[0]); 2480 XClearWindow (dpy, parent[0]);
2448 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2481 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2482
2449#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2450 if (scrollBar.win) 2484 if (scrollBar.win)
2451 { 2485 {
2452 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2453 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2454 scrollbar_show (0); 2488 scrollbar_show (0);
2455 } 2489 }
2456#endif 2490# endif
2457 }
2458 2491
2459 scr_clear (); 2492 scr_clear ();
2460 scr_touch (true); 2493 scr_touch (true);
2461 want_refresh = 1; 2494 want_refresh = 1;
2495
2496#endif
2462} 2497}
2463 2498
2464/* ------------------------------------------------------------------------- */ 2499/* ------------------------------------------------------------------------- */
2465void 2500void
2466rxvt_term::scr_clear (bool really) NOTHROW 2501rxvt_term::scr_clear (bool really) NOTHROW
… …
2470 2505
2471 num_scr_allow = 0; 2506 num_scr_allow = 0;
2472 want_refresh = 1; 2507 want_refresh = 1;
2473 2508
2474 if (really) 2509 if (really)
2475 XClearWindow (display->display, vt); 2510 XClearWindow (dpy, vt);
2476} 2511}
2477 2512
2478void 2513void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2514rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{ 2515{
… …
2529{ 2564{
2530 if (selection.op 2565 if (selection.op
2531 && current_screen == selection.screen 2566 && current_screen == selection.screen
2532 && selection.end.row >= view_start) 2567 && selection.end.row >= view_start)
2533 { 2568 {
2534#if ENABLE_FRILLS 2569#if !ENABLE_MINIMAL
2535 if (selection.rect) 2570 if (selection.rect)
2536 scr_xor_rect (selection.beg.row, selection.beg.col, 2571 scr_xor_rect (selection.beg.row, selection.beg.col,
2537 selection.end.row, selection.end.col, 2572 selection.end.row, selection.end.col,
2538 RS_RVid, RS_RVid | RS_Uline); 2573 RS_RVid, RS_RVid | RS_Uline);
2539 else 2574 else
… …
2655 } 2690 }
2656 2691
2657 unsigned long bytes_after; 2692 unsigned long bytes_after;
2658 XTextProperty ct; 2693 XTextProperty ct;
2659 2694
2660 if (XGetWindowProperty (display->display, win, prop, 2695 if (XGetWindowProperty (dpy, win, prop,
2661 0, PROP_SIZE / 4, 2696 0, PROP_SIZE / 4,
2662 delete_prop, AnyPropertyType, 2697 delete_prop, AnyPropertyType,
2663 &ct.encoding, &ct.format, 2698 &ct.encoding, &ct.format,
2664 &ct.nitems, &bytes_after, 2699 &ct.nitems, &bytes_after,
2665 &ct.value) != Success) 2700 &ct.value) != Success)
… …
2674 if (bytes_after) 2709 if (bytes_after)
2675 { 2710 {
2676 // fetch and append remaining data 2711 // fetch and append remaining data
2677 XTextProperty ct2; 2712 XTextProperty ct2;
2678 2713
2679 if (XGetWindowProperty (display->display, win, prop, 2714 if (XGetWindowProperty (dpy, win, prop,
2680 ct.nitems / 4, (bytes_after + 3) / 4, 2715 ct.nitems / 4, (bytes_after + 3) / 4,
2681 delete_prop, AnyPropertyType, 2716 delete_prop, AnyPropertyType,
2682 &ct2.encoding, &ct2.format, 2717 &ct2.encoding, &ct2.format,
2683 &ct2.nitems, &bytes_after, 2718 &ct2.nitems, &bytes_after,
2684 &ct2.value) != Success) 2719 &ct2.value) != Success)
… …
2697 2732
2698 if (ct.encoding == xa[XA_INCR]) 2733 if (ct.encoding == xa[XA_INCR])
2699 { 2734 {
2700 // INCR selection, start handshake 2735 // INCR selection, start handshake
2701 if (!delete_prop) 2736 if (!delete_prop)
2702 XDeleteProperty (display->display, win, prop); 2737 XDeleteProperty (dpy, win, prop);
2703 2738
2704 selection_wait = Sel_incr; 2739 selection_wait = Sel_incr;
2705 incr_buf_fill = 0; 2740 incr_buf_fill = 0;
2706 incr_ev.start (NOW + 10); 2741 incr_ev.start (10);
2707 2742
2708 goto bailout; 2743 goto bailout;
2709 } 2744 }
2710 2745
2711 if (ct.nitems == 0) 2746 if (ct.nitems == 0)
… …
2720 ct.nitems = incr_buf_fill; 2755 ct.nitems = incr_buf_fill;
2721 incr_buf = 0; 2756 incr_buf = 0;
2722 incr_buf_size = 0; 2757 incr_buf_size = 0;
2723 incr_ev.stop (); 2758 incr_ev.stop ();
2724 } 2759 }
2725 else 2760 else
2726 { 2761 {
2727 if (selection_wait == Sel_normal 2762 if (selection_wait == Sel_normal
2728 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2763 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2729 { 2764 {
2730 /* 2765 /*
… …
2737 goto bailout; 2772 goto bailout;
2738 } 2773 }
2739 } 2774 }
2740 else if (selection_wait == Sel_incr) 2775 else if (selection_wait == Sel_incr)
2741 { 2776 {
2742 incr_ev.start (NOW + 10); 2777 incr_ev.start (10);
2743 2778
2744 while (incr_buf_fill + ct.nitems > incr_buf_size) 2779 while (incr_buf_fill + ct.nitems > incr_buf_size)
2745 { 2780 {
2746 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2781 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2747 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2782 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2754 } 2789 }
2755 2790
2756 char **cl; 2791 char **cl;
2757 int cr; 2792 int cr;
2758 2793
2759#if ENABLE_FRILLS 2794#if !ENABLE_MINIMAL
2760 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2795 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2761 // so recode it manually 2796 // so recode it manually
2762 if (ct.encoding == xa[XA_UTF8_STRING]) 2797 if (ct.encoding == xa[XA_UTF8_STRING])
2763 { 2798 {
2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2799 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2768 paste (s, strlen (s)); 2803 paste (s, strlen (s));
2769 free (s); 2804 free (s);
2770 } 2805 }
2771 else 2806 else
2772#endif 2807#endif
2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2808 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2774 && cl) 2809 && cl)
2775 { 2810 {
2776 for (int i = 0; i < cr; i++) 2811 for (int i = 0; i < cr; i++)
2777 paste (cl[i], strlen (cl[i])); 2812 paste (cl[i], strlen (cl[i]));
2778 2813
… …
2787 if (selection_wait == Sel_normal) 2822 if (selection_wait == Sel_normal)
2788 selection_wait = Sel_none; 2823 selection_wait = Sel_none;
2789} 2824}
2790 2825
2791void 2826void
2792rxvt_term::incr_cb (time_watcher &w) NOTHROW 2827rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2793{ 2828{
2794 selection_wait = Sel_none; 2829 selection_wait = Sel_none;
2795 2830
2796 incr_buf_size = 0; 2831 incr_buf_size = 0;
2797 free (incr_buf); 2832 free (incr_buf);
… …
2808 selection_paste (win, prop, true); 2843 selection_paste (win, prop, true);
2809} 2844}
2810 2845
2811/* ------------------------------------------------------------------------- */ 2846/* ------------------------------------------------------------------------- */
2812/* 2847/*
2813 * Request the current selection: 2848 * Request the current selection:
2814 * Order: > internal selection if available 2849 * Order: > internal selection if available
2815 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2850 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2816 * > CUT_BUFFER0 2851 * > CUT_BUFFER0
2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2852 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2818 * will auto fallback to CUT_BUFFER0 2853 * will auto fallback to CUT_BUFFER0
… …
2820 */ 2855 */
2821void 2856void
2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2857rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2823{ 2858{
2824 if (selection.text && selnum == Sel_Primary) 2859 if (selection.text && selnum == Sel_Primary)
2860 {
2825 { /* internal selection */ 2861 /* internal selection */
2826 char *str = rxvt_wcstombs (selection.text, selection.len); 2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2827 paste (str, strlen (str)); 2863 paste (str, strlen (str));
2828 free (str); 2864 free (str);
2829 return; 2865 return;
2830 } 2866 }
… …
2860 else if (selnum == Sel_Secondary) 2896 else if (selnum == Sel_Secondary)
2861 sel = XA_SECONDARY; 2897 sel = XA_SECONDARY;
2862 else 2898 else
2863 sel = xa[XA_CLIPBOARD]; 2899 sel = xa[XA_CLIPBOARD];
2864 2900
2865 if (XGetSelectionOwner (display->display, sel) != None) 2901 if (XGetSelectionOwner (dpy, sel) != None)
2866 { 2902 {
2867 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2868 vt, selection_request_time); 2904 vt, selection_request_time);
2869 return 1; 2905 return 1;
2870 } 2906 }
2871 2907
2872 return 0; 2908 return 0;
… …
2935 2971
2936 int end_col; 2972 int end_col;
2937 2973
2938 for (; row <= selection.end.row; row++, col = 0) 2974 for (; row <= selection.end.row; row++, col = 0)
2939 { 2975 {
2940#if ENABLE_FRILLS 2976#if !ENABLE_MINIMAL
2941 if (selection.rect) 2977 if (selection.rect)
2942 { 2978 {
2943 col = selection.beg.col; 2979 col = selection.beg.col;
2944 end_col = ncol + 1; 2980 end_col = ncol + 1;
2945 } 2981 }
… …
2948 end_col = ROW(row).l; 2984 end_col = ROW(row).l;
2949 2985
2950 col = max (col, 0); 2986 col = max (col, 0);
2951 2987
2952 if (row == selection.end.row 2988 if (row == selection.end.row
2953#if ENABLE_FRILLS 2989#if !ENABLE_MINIMAL
2954 || selection.rect 2990 || selection.rect
2955#endif 2991#endif
2956 ) 2992 )
2957 min_it (end_col, selection.end.col); 2993 min_it (end_col, selection.end.col);
2958 2994
… …
2981#endif 3017#endif
2982 else 3018 else
2983 new_selection_text[ofs++] = *t++; 3019 new_selection_text[ofs++] = *t++;
2984 } 3020 }
2985 3021
2986#if ENABLE_FRILLS 3022#if !ENABLE_MINIMAL
2987 if (selection.rect) 3023 if (selection.rect)
2988 { 3024 {
2989 while (ofs 3025 while (ofs
2990 && new_selection_text[ofs - 1] != C0_LF 3026 && new_selection_text[ofs - 1] != C0_LF
2991 && unicode::is_space (new_selection_text[ofs - 1])) 3027 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3025bool 3061bool
3026rxvt_term::selection_grab (Time tm) NOTHROW 3062rxvt_term::selection_grab (Time tm) NOTHROW
3027{ 3063{
3028 selection_time = tm; 3064 selection_time = tm;
3029 3065
3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3032 { 3068 {
3033 display->set_selection_owner (this); 3069 display->set_selection_owner (this);
3034 return true; 3070 return true;
3035 } 3071 }
3036 else 3072 else
… …
3040 } 3076 }
3041 3077
3042#if 0 3078#if 0
3043 XTextProperty ct; 3079 XTextProperty ct;
3044 3080
3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3081 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3046 { 3082 {
3047 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3048 XFree (ct.value); 3084 XFree (ct.value);
3049 } 3085 }
3050#endif 3086#endif
… …
3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3132 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3097 3133
3098 while (selection.mark.col > 0 3134 while (selection.mark.col > 0
3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3135 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3100 --selection.mark.col; 3136 --selection.mark.col;
3101 3137
3102 if (selection.op) 3138 if (selection.op)
3139 {
3103 { /* clear the old selection */ 3140 /* clear the old selection */
3104 selection.beg.row = selection.end.row = selection.mark.row; 3141 selection.beg.row = selection.end.row = selection.mark.row;
3105 selection.beg.col = selection.end.col = selection.mark.col; 3142 selection.beg.col = selection.end.col = selection.mark.col;
3106 } 3143 }
3107 3144
3108 selection.op = SELECTION_INIT; 3145 selection.op = SELECTION_INIT;
… …
3297 * a point/word/line which is either the start or end of the selection 3334 * 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 3335 * and it was decided by whichever point/word/line was `fixed' at the
3299 * time of the most recent button3 press 3336 * time of the most recent button3 press
3300 */ 3337 */
3301 if (button3 && buttonpress) 3338 if (button3 && buttonpress)
3339 {
3302 { /* button3 press */ 3340 /* button3 press */
3303 /* 3341 /*
3304 * first determine which edge of the selection we are closest to 3342 * first determine which edge of the selection we are closest to
3305 */ 3343 */
3306 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3344 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3307 || (!ROWCOL_IS_AFTER (pos, selection.end) 3345 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3325 selection.mark.row = selection.beg.row; 3363 selection.mark.row = selection.beg.row;
3326 selection.mark.col = selection.beg.col; 3364 selection.mark.col = selection.beg.col;
3327 } 3365 }
3328 } 3366 }
3329 else 3367 else
3368 {
3330 { /* button1 drag or button3 drag */ 3369 /* button1 drag or button3 drag */
3331 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3370 if (ROWCOL_IS_AFTER (selection.mark, pos))
3332 { 3371 {
3333 if (selection.mark.row == selection.end.row 3372 if (selection.mark.row == selection.end.row
3334 && selection.mark.col == selection.end.col 3373 && selection.mark.col == selection.end.col
3335 && clickchange 3374 && clickchange
… …
3352 3391
3353 if (selection.clicks == 1) 3392 if (selection.clicks == 1)
3354 { 3393 {
3355 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3394 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.beg.row).is_longer () 3395 && !ROW(selection.beg.row).is_longer ()
3357#if ENABLE_FRILLS 3396#if !ENABLE_MINIMAL
3358 && !selection.rect 3397 && !selection.rect
3359#endif 3398#endif
3360 ) 3399 )
3361 selection.beg.col = ncol; 3400 selection.beg.col = ncol;
3362 3401
3363 if ( 3402 if (
3364 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3403 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3365 && !ROW(selection.end.row).is_longer () 3404 && !ROW(selection.end.row).is_longer ()
3366#if ENABLE_FRILLS 3405#if !ENABLE_MINIMAL
3367 && !selection.rect 3406 && !selection.rect
3368#endif 3407#endif
3369 ) 3408 )
3370 selection.end.col = ncol; 3409 selection.end.col = ncol;
3371 } 3410 }
… …
3378 selection_delimit_word (DN, &selection.end, &selection.end); 3417 selection_delimit_word (DN, &selection.end, &selection.end);
3379 } 3418 }
3380 else if (selection.clicks == 3) 3419 else if (selection.clicks == 3)
3381 { 3420 {
3382#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3383 if (OPTION (Opt_tripleclickwords)) 3422 if (option (Opt_tripleclickwords))
3384 { 3423 {
3385 selection_delimit_word (UP, &selection.beg, &selection.beg); 3424 selection_delimit_word (UP, &selection.beg, &selection.beg);
3386 3425
3387 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3426 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3388 { 3427 {
3389 if (!ROW(end_row).is_longer ()) 3428 if (!ROW(end_row).is_longer ())
3390 { 3429 {
3391 selection.end.row = end_row; 3430 selection.end.row = end_row;
3392 selection.end.col = ROW(end_row).l; 3431 selection.end.col = ROW(end_row).l;
3432# if !ENABLE_MINIMAL
3393 selection_remove_trailing_spaces (); 3433 selection_remove_trailing_spaces ();
3434# endif
3394 break; 3435 break;
3395 } 3436 }
3396 } 3437 }
3397 } 3438 }
3398 else 3439 else
… …
3414 selection.end.row++; 3455 selection.end.row++;
3415 } 3456 }
3416 } 3457 }
3417 3458
3418 if (button3 && buttonpress) 3459 if (button3 && buttonpress)
3460 {
3419 { /* mark may need to be changed */ 3461 /* mark may need to be changed */
3420 if (closeto == LEFT) 3462 if (closeto == LEFT)
3421 { 3463 {
3422 selection.mark.row = selection.end.row; 3464 selection.mark.row = selection.end.row;
3423 selection.mark.col = selection.end.col - (selection.clicks == 2); 3465 selection.mark.col = selection.end.col - (selection.clicks == 2);
3424 } 3466 }
… …
3427 selection.mark.row = selection.beg.row; 3469 selection.mark.row = selection.beg.row;
3428 selection.mark.col = selection.beg.col; 3470 selection.mark.col = selection.beg.col;
3429 } 3471 }
3430 } 3472 }
3431 3473
3432#if ENABLE_FRILLS 3474#if !ENABLE_MINIMAL
3433 if (selection.rect && selection.beg.col > selection.end.col) 3475 if (selection.rect && selection.beg.col > selection.end.col)
3434 ::swap (selection.beg.col, selection.end.col); 3476 ::swap (selection.beg.col, selection.end.col);
3435#endif 3477#endif
3436} 3478}
3437 3479
3438#if ENABLE_FRILLS 3480#if !ENABLE_MINIMAL
3439void 3481void
3440rxvt_term::selection_remove_trailing_spaces () NOTHROW 3482rxvt_term::selection_remove_trailing_spaces () NOTHROW
3441{ 3483{
3442 int32_t end_col, end_row; 3484 int32_t end_col, end_row;
3443 text_t *stp; 3485 text_t *stp;
… …
3498 */ 3540 */
3499void 3541void
3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3542rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3501{ 3543{
3502 XSelectionEvent ev; 3544 XSelectionEvent ev;
3503 dDisp;
3504 3545
3505 ev.type = SelectionNotify; 3546 ev.type = SelectionNotify;
3506 ev.property = None; 3547 ev.property = None;
3507 ev.display = rq.display; 3548 ev.display = rq.display;
3508 ev.requestor = rq.requestor; 3549 ev.requestor = rq.requestor;
… …
3522 *target++ = xa[XA_COMPOUND_TEXT]; 3563 *target++ = xa[XA_COMPOUND_TEXT];
3523#if X_HAVE_UTF8_STRING 3564#if X_HAVE_UTF8_STRING
3524 *target++ = xa[XA_UTF8_STRING]; 3565 *target++ = xa[XA_UTF8_STRING];
3525#endif 3566#endif
3526 3567
3527 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3568 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3528 32, PropModeReplace, 3569 32, PropModeReplace,
3529 (unsigned char *)target_list, target - target_list); 3570 (unsigned char *)target_list, target - target_list);
3530 ev.property = rq.property; 3571 ev.property = rq.property;
3531 } 3572 }
3532#if TODO // TODO 3573#if TODO // TODO
… …
3535 /* TODO: Handle MULTIPLE */ 3576 /* TODO: Handle MULTIPLE */
3536 } 3577 }
3537#endif 3578#endif
3538 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3539 { 3580 {
3540 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3541 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3582 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3542 ev.property = rq.property; 3583 ev.property = rq.property;
3543 } 3584 }
3544 else if (rq.target == XA_STRING 3585 else if (rq.target == XA_STRING
3545 || rq.target == xa[XA_TEXT] 3586 || rq.target == xa[XA_TEXT]
… …
3569 style = enc_string; 3610 style = enc_string;
3570 else if (target == xa[XA_TEXT]) 3611 else if (target == xa[XA_TEXT])
3571 style = enc_text; 3612 style = enc_text;
3572 else if (target == xa[XA_COMPOUND_TEXT]) 3613 else if (target == xa[XA_COMPOUND_TEXT])
3573 style = enc_compound_text; 3614 style = enc_compound_text;
3574#if ENABLE_FRILLS 3615#if !ENABLE_MINIMAL
3575 else if (target == xa[XA_UTF8_STRING]) 3616 else if (target == xa[XA_UTF8_STRING])
3576 style = enc_utf8; 3617 style = enc_utf8;
3577#endif 3618#endif
3578 else 3619 else
3579 { 3620 {
… …
3590 { 3631 {
3591 cl = L""; 3632 cl = L"";
3592 selectlen = 0; 3633 selectlen = 0;
3593 } 3634 }
3594 3635
3595#if ENABLE_FRILLS 3636#if !ENABLE_MINIMAL
3596 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3637 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3597 // so recode it manually 3638 // so recode it manually
3598 if (style == enc_utf8) 3639 if (style == enc_utf8)
3599 { 3640 {
3600 freect = 1; 3641 freect = 1;
… …
3603 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3644 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3604 ct.nitems = strlen ((char *)ct.value); 3645 ct.nitems = strlen ((char *)ct.value);
3605 } 3646 }
3606 else 3647 else
3607#endif 3648#endif
3608 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3649 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3609 freect = 1; 3650 freect = 1;
3610 else 3651 else
3611 { 3652 {
3612 /* if we failed to convert then send it raw */ 3653 /* if we failed to convert then send it raw */
3613 ct.value = (unsigned char *)cl; 3654 ct.value = (unsigned char *)cl;
3614 ct.nitems = selectlen; 3655 ct.nitems = selectlen;
3615 ct.encoding = target; 3656 ct.encoding = target;
3616 } 3657 }
3617 3658
3618 XChangeProperty (disp, rq.requestor, rq.property, 3659 XChangeProperty (dpy, rq.requestor, rq.property,
3619 ct.encoding, 8, PropModeReplace, 3660 ct.encoding, 8, PropModeReplace,
3620 ct.value, (int)ct.nitems); 3661 ct.value, (int)ct.nitems);
3621 ev.property = rq.property; 3662 ev.property = rq.property;
3622 3663
3623 if (freect) 3664 if (freect)
3624 XFree (ct.value); 3665 XFree (ct.value);
3625 } 3666 }
3626 3667
3627 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3668 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} 3669}
3645 3670
3646/* ------------------------------------------------------------------------- */ 3671/* ------------------------------------------------------------------------- */
3647#ifdef USE_XIM 3672#ifdef USE_XIM
3648void 3673void
3649rxvt_term::im_set_position (XPoint &pos) NOTHROW 3674rxvt_term::im_set_position (XPoint &pos) NOTHROW
3650{ 3675{
3651 XWindowAttributes xwa; 3676 XWindowAttributes xwa;
3652 3677
3653 XGetWindowAttributes (display->display, vt, &xwa); 3678 XGetWindowAttributes (dpy, vt, &xwa);
3654 3679
3655 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3680 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3656 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3681 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3657} 3682}
3658#endif 3683#endif
… …
3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3779rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3755{ 3780{
3756 while (*s) 3781 while (*s)
3757 { 3782 {
3758 text_t t = *s++; 3783 text_t t = *s++;
3759 int width = wcwidth (t); 3784 int width = WCWIDTH (t);
3760 3785
3761 while (width--) 3786 while (width--)
3762 { 3787 {
3763 scr_overlay_set (x++, y, t); 3788 scr_overlay_set (x++, y, t);
3764 t = NOCHAR; 3789 t = NOCHAR;

Diff Legend

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