ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.244 by root, Fri Jan 20 10:27:08 2006 UTC vs.
Revision 1.295 by root, Wed Jan 9 01:01:31 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() \
… …
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 = 0;
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
… …
1003{ 1015{
1004 want_refresh = 1; 1016 want_refresh = 1;
1005 1017
1006 if (screen.cur.col == 0) 1018 if (screen.cur.col == 0)
1007 { 1019 {
1020 screen.flags &= ~Screen_WrapNext;
1021
1008 if (screen.cur.row > 0) 1022 if (screen.cur.row > 0)
1009 { 1023 {
1010#ifdef TERMCAP_HAS_BW 1024#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1025 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1026 screen.cur.row--;
1013 return; 1027 return;
1014#endif 1028#endif
1015 } 1029 }
1016 } 1030 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1031 else
1018 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1033}
1022 1034
1023/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1024/* 1036/*
1025 * Process Horizontal Tab 1037 * Process Horizontal Tab
… …
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/* ------------------------------------------------------------------------- */
… …
1621 * Set reverse/normal video 1635 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1638 */
1625void 1639void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1641{
1628 XGCValues gcvalue; 1642 rvideo_mode = on;
1629 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1630 if (rvideo != mode) 1648 if (rvideo_state != on)
1631 { 1649 {
1632 rvideo = mode; 1650 rvideo_state = on;
1651
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1653#ifdef HAVE_BG_PIXMAP
1635 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1636#endif 1655#endif
1637#if TRANSPARENT 1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1638 if (! OPTION (Opt_transparent) || am_transparent == 0)
1639#endif
1640 XSetWindowBackground (display->display, vt,
1641 pix_colors[Color_bg]);
1642 1657
1658 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1659 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1660 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1661 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1662
1647 scr_clear (); 1663 scr_clear ();
1648 scr_touch (true); 1664 scr_touch (true);
1649 } 1665 }
1650} 1666}
1651 1667
… …
1735{ 1751{
1736 bool found = false; 1752 bool found = false;
1737 1753
1738 for (int i = 0; i < nrow; i++) 1754 for (int i = 0; i < nrow; i++)
1739 { 1755 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1756 rend_t *drp = drawn_buf[i].r;
1742 1757
1743 for (; col < ncol; col++, drp++) 1758 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1745 { 1760 {
1746 found = true; 1761 found = true;
1747 *drp = ~value; 1762 *drp = ~value;
1748 } 1763 }
… …
1788 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1789 { 1804 {
1790 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1791 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1792 } 1807 }
1793 1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1794 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1795 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1796 1811
1797 num_scr_allow = 0; 1812 num_scr_allow = 0;
1798 1813
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1867
1853 return true; 1868 return true;
1854} 1869}
1855 1870
1871#ifndef NO_BELL
1872void
1873rxvt_term::bell_cb (ev::timer &w, int revents)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877 refresh_check ();
1878}
1879#endif
1880
1856/* ------------------------------------------------------------------------- */ 1881/* ------------------------------------------------------------------------- */
1857void 1882void
1858rxvt_term::scr_bell () NOTHROW 1883rxvt_term::scr_bell () NOTHROW
1859{ 1884{
1860#ifndef NO_BELL 1885#ifndef NO_BELL
1861 1886
1862# ifndef NO_MAPALERT 1887# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1888# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1889 if (option (Opt_mapAlert))
1865# endif 1890# endif
1866 XMapWindow (display->display, parent[0]); 1891 XMapWindow (dpy, parent[0]);
1867# endif 1892# endif
1868 1893
1869 if (OPTION (Opt_visualBell)) 1894# if ENABLE_FRILLS
1895 if (option (Opt_urgentOnBell))
1896 {
1897 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1898 {
1899 h->flags |= XUrgencyHint;
1900 XSetWMHints (dpy, parent[0], h);
1901 }
1870 { 1902 }
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1903# endif
1904
1905 if (option (Opt_visualBell))
1906 {
1907 rvideo_bell = true;
1908 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1909 flush ();
1910
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1911 bell_ev.start (VISUAL_BELL_DURATION);
1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1875 } 1912 }
1876 else 1913 else
1877 XBell (display->display, 0); 1914 XBell (dpy, 0);
1878
1879#endif 1915#endif
1880} 1916}
1881 1917
1882/* ------------------------------------------------------------------------- */ 1918/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1919/* ARGSUSED */
… …
1941 * screen.text/screen.rend contain what the screen will change to. 1977 * screen.text/screen.rend contain what the screen will change to.
1942 */ 1978 */
1943void 1979void
1944rxvt_term::scr_refresh () NOTHROW 1980rxvt_term::scr_refresh () NOTHROW
1945{ 1981{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */ 1982 unsigned char have_bg,
1947 showcursor; /* show the cursor */ 1983 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 1984 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 1985 ocrow; /* old cursor row */
1950 int i; /* tmp */ 1986 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 1987#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1988 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1989#endif
1954 rend_t *crp; // cursor rendition pointer 1990 rend_t *crp; // cursor rendition pointer
1991 rend_t ccol1, /* Cursor colour */
1992 ccol2; /* Cursor colour2 */
1955 1993
1956 want_refresh = 0; /* screen is current */ 1994 want_refresh = 0; /* screen is current */
1957 1995
1958 if (refresh_type == NO_REFRESH || !mapped) 1996 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 1997 return;
1960 1998
1961 /* 1999 /*
1962 * A: set up vars 2000 * A: set up vars
1963 */ 2001 */
1964 must_clear = 0; 2002 have_bg = 0;
1965 refresh_count = 0; 2003 refresh_count = 0;
1966 2004
1967#if XPM_BACKGROUND 2005#ifdef HAVE_BG_PIXMAP
1968 must_clear |= bgPixmap.pixmap != None; 2006 have_bg |= bgPixmap.pixmap != None;
1969#endif
1970#if TRANSPARENT
1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1972#endif 2007#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2008 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2009
1975 /* 2010 /*
1976 * B: reverse any characters which are selected 2011 * B: reverse any characters which are selected
… …
1980 /* 2015 /*
1981 * C: set the cursor character (s) 2016 * C: set the cursor character (s)
1982 */ 2017 */
1983 { 2018 {
1984 unsigned char setoldcursor; 2019 unsigned char setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2020
1988 showcursor = (screen.flags & Screen_VisibleCursor); 2021 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2022#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2023 if (hidden_cursor)
1991 showcursor = 0; 2024 showcursor = 0;
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2031 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2032 col--;
2000 2033
2001 crp = &ROW(screen.cur.row).r[col]; 2034 crp = &ROW(screen.cur.row).r[col];
2002 2035
2036#ifndef NO_CURSORCOLOR
2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
2038 if (ISSET_PIXCOLOR (Color_cursor))
2039 ccol1 = Color_cursor;
2040 else
2041#endif
2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2043 ccol1 = fgcolor_of (rstyle);
2044#else
2045 ccol1 = Color_fg;
2046#endif
2047
2048#ifndef NO_CURSORCOLOR
2049 if (ISSET_PIXCOLOR (Color_cursor2))
2050 ccol2 = Color_cursor2;
2051 else
2052#endif
2053#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2054 ccol2 = bgcolor_of (rstyle);
2055#else
2056 ccol2 = Color_bg;
2057#endif
2058
2003 if (showcursor && focus) 2059 if (showcursor && focus)
2004 { 2060 {
2005 if (OPTION (Opt_cursorUnderline)) 2061 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2062 *crp ^= RS_Uline;
2007 else 2063 else
2008 { 2064 {
2009 *crp ^= RS_RVid; 2065 *crp ^= RS_RVid;
2010
2011#ifndef NO_CURSORCOLOR
2012 cc1 = *crp & (RS_fgMask | RS_bgMask);
2013 if (ISSET_PIXCOLOR (Color_cursor))
2014 ccol1 = Color_cursor;
2015 else
2016#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2017 ccol1 = fgcolor_of (rstyle);
2018#else
2019 ccol1 = Color_fg;
2020#endif
2021 if (ISSET_PIXCOLOR (Color_cursor2))
2022 ccol2 = Color_cursor2;
2023 else
2024#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2025 ccol2 = bgcolor_of (rstyle);
2026#else
2027 ccol2 = Color_bg;
2028#endif
2029 *crp = SET_FGCOLOR (*crp, ccol1); 2066 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2067 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2068 }
2033 } 2069 }
2034 } 2070 }
2035 2071
2036 /* make sure no outline cursor is left around */ 2072 /* make sure no outline cursor is left around */
… …
2075 * D: CopyArea pass - very useful for slower links 2111 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2112 * This has been deliberately kept simple.
2077 */ 2113 */
2078 if (!display->is_local 2114 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2115 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2116 && abs (num_scr) < nrow && !have_bg)
2081 { 2117 {
2082 int16_t nits; 2118 int16_t nits;
2119 int i = num_scr;
2083 int j; 2120 int j;
2084 int len, wlen; 2121 int len, wlen;
2085 dLocal (int, num_scr); 2122 dLocal (int, num_scr);
2086 2123
2087 j = nrow; 2124 j = nrow;
2088 wlen = len = -1; 2125 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2126 row = i > 0 ? 0 : j - 1;
2127
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2128 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2129 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2130 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2131 {
2094 line_t s = ROW(view_start + row); 2132 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2153 wlen = row;
2116 continue; 2154 continue;
2117 } 2155 }
2118 } 2156 }
2119 2157
2120 if (len != -1) 2158 if (len >= 0)
2121 { 2159 {
2122 /* also comes here at end if needed because of >= above */ 2160 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2161 if (wlen < len)
2124 ::swap (wlen, len); 2162 ::swap (wlen, len);
2125 2163
2164 XGCValues gcv;
2165
2166 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2167 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2168 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2169 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2170 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2171 0, Row2Pixel (len));
2172 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2173
2131 len = -1; 2174 len = -1;
2132 } 2175 }
2133 } 2176 }
2134 } 2177 }
2135#endif 2178#endif
… …
2191 count++; 2234 count++;
2192 2235
2193 if (stp[col] != dtp[col] 2236 if (stp[col] != dtp[col]
2194 || !RS_SAME (srp[col], drp[col])) 2237 || !RS_SAME (srp[col], drp[col]))
2195 { 2238 {
2196 if (must_clear && (i++ > count / 2)) 2239 if (have_bg && (i++ > count / 2))
2197 break; 2240 break;
2198 2241
2199 dtp[col] = stp[col]; 2242 dtp[col] = stp[col];
2200 drp[col] = rend; 2243 drp[col] = rend;
2201 i = 0; 2244 i = 0;
2202 } 2245 }
2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2246 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2204 break; 2247 break;
2205 } 2248 }
2206 2249
2207 col--; /* went one too far. move back */ 2250 col--; /* went one too far. move back */
2208 count -= i; /* dump any matching trailing chars */ 2251 count -= i; /* dump any matching trailing chars */
… …
2218 int back = bgcolor_of (rend); // desired background 2261 int back = bgcolor_of (rend); // desired background
2219 2262
2220 // only do special processing if any attributes are set, which is unlikely 2263 // only do special processing if any attributes are set, which is unlikely
2221 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2264 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2222 { 2265 {
2223#if ENABLE_STYLES
2224 // force redraw after "careful" characters to avoid pixel droppings
2225 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2226 drp[col + 1] = ~srp[col + 1];
2227
2228 // include previous careful character(s) if possible, looks nicer (best effort...)
2229 while (text > stp
2230 && srp[text - stp - 1] & RS_Careful
2231 && RS_SAME (rend, srp[text - stp - 1]))
2232 text--, count++, xpixel -= fwidth;
2233#endif
2234
2235 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2236 2267
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
2238 if (rend & RS_Bold
2239 && fore == Color_fg) 2269 if (rend & RS_Bold && fore == Color_fg)
2240 { 2270 {
2241 if (ISSET_PIXCOLOR (Color_BD)) 2271 if (ISSET_PIXCOLOR (Color_BD))
2242 fore = Color_BD; 2272 fore = Color_BD;
2243# if !ENABLE_STYLES 2273# if !ENABLE_STYLES
2244 else 2274 else
2245 invert = !invert; 2275 invert = !invert;
2246# endif 2276# endif
2247 } 2277 }
2248 2278
2249 if (rend & RS_Italic 2279 if (rend & RS_Italic && fore == Color_fg)
2250 && fore == Color_fg)
2251 { 2280 {
2252 if (ISSET_PIXCOLOR (Color_IT)) 2281 if (ISSET_PIXCOLOR (Color_IT))
2253 fore = Color_IT; 2282 fore = Color_IT;
2254# if !ENABLE_STYLES 2283# if !ENABLE_STYLES
2255 else 2284 else
2256 invert = !invert; 2285 invert = !invert;
2257# endif 2286# endif
2258 } 2287 }
2259 2288
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2289 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL; 2290 fore = Color_UL;
2262#endif 2291#endif
2263 2292
2264 if (invert) 2293 if (invert)
2265 { 2294 {
2295#ifdef OPTION_HC
2296 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2297 || !ISSET_PIXCOLOR (Color_HC))
2298#endif
2299 /* invert the column if no highlightColor is set or it is the
2300 * current cursor column */
2266 ::swap (fore, back); 2301 ::swap (fore, back);
2302#ifdef OPTION_HC
2303 else if (ISSET_PIXCOLOR (Color_HC))
2304 back = Color_HC;
2305#endif
2267 2306
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2307#ifndef NO_BOLD_UNDERLINE_REVERSE
2308# ifndef OPTION_HC
2269 if (ISSET_PIXCOLOR (Color_RV)) 2309 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV; 2310 back = Color_RV;
2271 2311# endif
2272 if (fore == back) 2312 if (fore == back)
2273 { 2313 {
2274 fore = Color_bg; 2314 fore = Color_bg;
2275 back = Color_fg; 2315 back = Color_fg;
2276 } 2316 }
… …
2278 } 2318 }
2279 2319
2280#ifdef TEXT_BLINK 2320#ifdef TEXT_BLINK
2281 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2321 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2282 { 2322 {
2283 if (!text_blink_ev.active) 2323 if (!text_blink_ev.is_active ())
2284 { 2324 {
2285 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2325 text_blink_ev.again ();
2286 hidden_text = 0; 2326 hidden_text = 0;
2287 } 2327 }
2288 else if (hidden_text) 2328 else if (hidden_text)
2289 fore = back; 2329 fore = back;
2290 } 2330 }
2291#endif 2331#endif
2332
2333#if ENABLE_STYLES
2334 // "careful" (too wide) character handling
2335
2336 // include previous careful character(s) if possible, looks nicer (best effort...)
2337 while (text > stp
2338 && srp[text - stp - 1] & RS_Careful
2339 && RS_SAME (rend, srp[text - stp - 1]))
2340 text--, count++, xpixel -= fwidth;
2341
2342 // force redraw after "careful" characters to avoid pixel droppings
2343 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2344 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2345
2346 // force redraw before "careful" characters to avoid pixel droppings
2347 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2348 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2349#endif
2292 } 2350 }
2293 2351
2294 /* 2352 /*
2295 * Actually do the drawing of the string here 2353 * Actually do the drawing of the string here
2296 */ 2354 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2355 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2356
2299 if (back == fore)
2300 font->clear_rect (*drawable, xpixel, ypixel,
2301 fwidth * count, fheight,
2302 back);
2303 else if (back == Color_bg) 2357 if (have_bg && back == Color_bg)
2304 { 2358 {
2305 if (must_clear) 2359 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2360
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2361 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2362 if (text[i] != ' ')
2311 { 2363 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2364 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2365 goto did_clear;
2314 }
2315 } 2366 }
2316 else 2367
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2368 CLEAR_CHARS (xpixel, ypixel, count);
2369 did_clear: ;
2318 } 2370 }
2319 else 2371 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2372 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2373
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2374 if (rend & RS_Uline && font->descent > 1 && fore != back)
2323 { 2375 {
2324#if ENABLE_FRILLS 2376#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2377 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2378 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2379 else
2328#endif 2380#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2381 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2382
2331 XDrawLine (display->display, drawBuffer, gc, 2383 XDrawLine (dpy, drawBuffer, gc,
2332 xpixel, ypixel + font->ascent + 1, 2384 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2385 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2386 }
2335 } /* for (col....) */ 2387 } /* for (col....) */
2336 } /* for (row....) */ 2388 } /* for (row....) */
… …
2345 */ 2397 */
2346 if (showcursor) 2398 if (showcursor)
2347 { 2399 {
2348 if (focus) 2400 if (focus)
2349 { 2401 {
2350 if (OPTION (Opt_cursorUnderline)) 2402 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2403 *crp ^= RS_Uline;
2352 else 2404 else
2353 { 2405 {
2354 *crp ^= RS_RVid; 2406 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2407#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2421 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2422 cursorwidth++;
2371 2423
2372#ifndef NO_CURSORCOLOR 2424#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2425 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2426 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2427 else
2375#endif 2428#endif
2429 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2430
2377 XDrawRectangle (display->display, drawBuffer, gc, 2431 XDrawRectangle (dpy, drawBuffer, gc,
2378 Col2Pixel (col), 2432 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2433 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2434 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2435 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2436 }
… …
2417} 2471}
2418 2472
2419void 2473void
2420rxvt_term::scr_recolour () NOTHROW 2474rxvt_term::scr_recolour () NOTHROW
2421{ 2475{
2422 if (1 2476#ifdef HAVE_BG_PIXMAP
2423#if TRANSPARENT 2477 bgPixmap.apply ();
2424 && !am_transparent 2478#else
2425#endif 2479
2426#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap
2428#endif
2429 )
2430 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2483
2434#if HAVE_SCROLLBARS 2484# if HAVE_SCROLLBARS
2435 if (scrollBar.win) 2485 if (scrollBar.win)
2436 { 2486 {
2437 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2487 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2438 scrollBar.setIdle (); 2488 scrollBar.setIdle ();
2439 scrollbar_show (0); 2489 scrollbar_show (0);
2440 } 2490 }
2441#endif 2491# endif
2442 }
2443 2492
2444 scr_clear (); 2493 scr_clear ();
2445 scr_touch (true); 2494 scr_touch (true);
2446 want_refresh = 1; 2495 want_refresh = 1;
2496
2497#endif
2447} 2498}
2448 2499
2449/* ------------------------------------------------------------------------- */ 2500/* ------------------------------------------------------------------------- */
2450void 2501void
2451rxvt_term::scr_clear (bool really) NOTHROW 2502rxvt_term::scr_clear (bool really) NOTHROW
… …
2455 2506
2456 num_scr_allow = 0; 2507 num_scr_allow = 0;
2457 want_refresh = 1; 2508 want_refresh = 1;
2458 2509
2459 if (really) 2510 if (really)
2460 XClearWindow (display->display, vt); 2511 XClearWindow (dpy, vt);
2461} 2512}
2462 2513
2463void 2514void
2464rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW 2515rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2465{ 2516{
… …
2514{ 2565{
2515 if (selection.op 2566 if (selection.op
2516 && current_screen == selection.screen 2567 && current_screen == selection.screen
2517 && selection.end.row >= view_start) 2568 && selection.end.row >= view_start)
2518 { 2569 {
2519#if ENABLE_FRILLS 2570#if !ENABLE_MINIMAL
2520 if (selection.rect) 2571 if (selection.rect)
2521 scr_xor_rect (selection.beg.row, selection.beg.col, 2572 scr_xor_rect (selection.beg.row, selection.beg.col,
2522 selection.end.row, selection.end.col, 2573 selection.end.row, selection.end.col,
2523 RS_RVid, RS_RVid | RS_Uline); 2574 RS_RVid, RS_RVid | RS_Uline);
2524 else 2575 else
… …
2640 } 2691 }
2641 2692
2642 unsigned long bytes_after; 2693 unsigned long bytes_after;
2643 XTextProperty ct; 2694 XTextProperty ct;
2644 2695
2645 if (XGetWindowProperty (display->display, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2646 0, PROP_SIZE / 4, 2697 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2699 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2700 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2701 &ct.value) != Success)
… …
2659 if (bytes_after) 2710 if (bytes_after)
2660 { 2711 {
2661 // fetch and append remaining data 2712 // fetch and append remaining data
2662 XTextProperty ct2; 2713 XTextProperty ct2;
2663 2714
2664 if (XGetWindowProperty (display->display, win, prop, 2715 if (XGetWindowProperty (dpy, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2716 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2717 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2718 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2719 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2720 &ct2.value) != Success)
… …
2682 2733
2683 if (ct.encoding == xa[XA_INCR]) 2734 if (ct.encoding == xa[XA_INCR])
2684 { 2735 {
2685 // INCR selection, start handshake 2736 // INCR selection, start handshake
2686 if (!delete_prop) 2737 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2688 2739
2689 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2742 incr_ev.start (10);
2692 2743
2693 goto bailout; 2744 goto bailout;
2694 } 2745 }
2695 2746
2696 if (ct.nitems == 0) 2747 if (ct.nitems == 0)
… …
2705 ct.nitems = incr_buf_fill; 2756 ct.nitems = incr_buf_fill;
2706 incr_buf = 0; 2757 incr_buf = 0;
2707 incr_buf_size = 0; 2758 incr_buf_size = 0;
2708 incr_ev.stop (); 2759 incr_ev.stop ();
2709 } 2760 }
2710 else 2761 else
2711 { 2762 {
2712 if (selection_wait == Sel_normal 2763 if (selection_wait == Sel_normal
2713 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2714 { 2765 {
2715 /* 2766 /*
… …
2722 goto bailout; 2773 goto bailout;
2723 } 2774 }
2724 } 2775 }
2725 else if (selection_wait == Sel_incr) 2776 else if (selection_wait == Sel_incr)
2726 { 2777 {
2727 incr_ev.start (NOW + 10); 2778 incr_ev.start (10);
2728 2779
2729 while (incr_buf_fill + ct.nitems > incr_buf_size) 2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2730 { 2781 {
2731 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2732 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2739 } 2790 }
2740 2791
2741 char **cl; 2792 char **cl;
2742 int cr; 2793 int cr;
2743 2794
2744#if ENABLE_FRILLS 2795#if !ENABLE_MINIMAL
2745 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2746 // so recode it manually 2797 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING]) 2798 if (ct.encoding == xa[XA_UTF8_STRING])
2748 { 2799 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2753 paste (s, strlen (s)); 2804 paste (s, strlen (s));
2754 free (s); 2805 free (s);
2755 } 2806 }
2756 else 2807 else
2757#endif 2808#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2759 && cl) 2810 && cl)
2760 { 2811 {
2761 for (int i = 0; i < cr; i++) 2812 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2813 paste (cl[i], strlen (cl[i]));
2763 2814
… …
2772 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2774} 2825}
2775 2826
2776void 2827void
2777rxvt_term::incr_cb (time_watcher &w) NOTHROW 2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2778{ 2829{
2779 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2780 2831
2781 incr_buf_size = 0; 2832 incr_buf_size = 0;
2782 free (incr_buf); 2833 free (incr_buf);
… …
2793 selection_paste (win, prop, true); 2844 selection_paste (win, prop, true);
2794} 2845}
2795 2846
2796/* ------------------------------------------------------------------------- */ 2847/* ------------------------------------------------------------------------- */
2797/* 2848/*
2798 * Request the current selection: 2849 * Request the current selection:
2799 * Order: > internal selection if available 2850 * Order: > internal selection if available
2800 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2801 * > CUT_BUFFER0 2852 * > CUT_BUFFER0
2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2803 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
2804 * EXT: button 2 release 2855 * EXT: button 2 release
2805 */ 2856 */
2806void 2857void
2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2859{
2809/* After making a selection with selection_make this function will always 2860 if (selection.text && selnum == Sel_Primary)
2810 * return the internal selection, which is not correct IMO, now much more since 2861 {
2811 * I added the selnum parameter.
2812 */
2813#if 0
2814 if (selection.text)
2815 { /* internal selection */ 2862 /* internal selection */
2816 char *str = rxvt_wcstombs (selection.text, selection.len); 2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2817 paste (str, strlen (str)); 2864 paste (str, strlen (str));
2818 free (str); 2865 free (str);
2819 return; 2866 return;
2820 } 2867 }
2821 else 2868 else
2822#endif
2823 { 2869 {
2824 selection_request_time = tm; 2870 selection_request_time = tm;
2825 selection_wait = Sel_normal; 2871 selection_wait = Sel_normal;
2826 2872
2827#if X_HAVE_UTF8_STRING 2873#if X_HAVE_UTF8_STRING
… …
2851 else if (selnum == Sel_Secondary) 2897 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2898 sel = XA_SECONDARY;
2853 else 2899 else
2854 sel = xa[XA_CLIPBOARD]; 2900 sel = xa[XA_CLIPBOARD];
2855 2901
2856 if (XGetSelectionOwner (display->display, sel) != None) 2902 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2903 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2904 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2905 vt, selection_request_time);
2860 return 1; 2906 return 1;
2861 } 2907 }
2862 2908
2863 return 0; 2909 return 0;
… …
2926 2972
2927 int end_col; 2973 int end_col;
2928 2974
2929 for (; row <= selection.end.row; row++, col = 0) 2975 for (; row <= selection.end.row; row++, col = 0)
2930 { 2976 {
2931#if ENABLE_FRILLS 2977#if !ENABLE_MINIMAL
2932 if (selection.rect) 2978 if (selection.rect)
2933 { 2979 {
2934 col = selection.beg.col; 2980 col = selection.beg.col;
2935 end_col = ncol + 1; 2981 end_col = ncol + 1;
2936 } 2982 }
… …
2939 end_col = ROW(row).l; 2985 end_col = ROW(row).l;
2940 2986
2941 col = max (col, 0); 2987 col = max (col, 0);
2942 2988
2943 if (row == selection.end.row 2989 if (row == selection.end.row
2944#if ENABLE_FRILLS 2990#if !ENABLE_MINIMAL
2945 || selection.rect 2991 || selection.rect
2946#endif 2992#endif
2947 ) 2993 )
2948 min_it (end_col, selection.end.col); 2994 min_it (end_col, selection.end.col);
2949 2995
… …
2972#endif 3018#endif
2973 else 3019 else
2974 new_selection_text[ofs++] = *t++; 3020 new_selection_text[ofs++] = *t++;
2975 } 3021 }
2976 3022
2977#if ENABLE_FRILLS 3023#if !ENABLE_MINIMAL
2978 if (selection.rect) 3024 if (selection.rect)
2979 { 3025 {
2980 while (ofs 3026 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3027 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3028 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3016bool 3062bool
3017rxvt_term::selection_grab (Time tm) NOTHROW 3063rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3064{
3019 selection_time = tm; 3065 selection_time = tm;
3020 3066
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3067 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3068 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3069 {
3024 display->set_selection_owner (this); 3070 display->set_selection_owner (this);
3025 return true; 3071 return true;
3026 } 3072 }
3027 else 3073 else
… …
3031 } 3077 }
3032 3078
3033#if 0 3079#if 0
3034 XTextProperty ct; 3080 XTextProperty ct;
3035 3081
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3082 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3083 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3084 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3085 XFree (ct.value);
3040 } 3086 }
3041#endif 3087#endif
… …
3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3133 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3088 3134
3089 while (selection.mark.col > 0 3135 while (selection.mark.col > 0
3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3136 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3091 --selection.mark.col; 3137 --selection.mark.col;
3092 3138
3093 if (selection.op) 3139 if (selection.op)
3140 {
3094 { /* clear the old selection */ 3141 /* clear the old selection */
3095 selection.beg.row = selection.end.row = selection.mark.row; 3142 selection.beg.row = selection.end.row = selection.mark.row;
3096 selection.beg.col = selection.end.col = selection.mark.col; 3143 selection.beg.col = selection.end.col = selection.mark.col;
3097 } 3144 }
3098 3145
3099 selection.op = SELECTION_INIT; 3146 selection.op = SELECTION_INIT;
… …
3288 * a point/word/line which is either the start or end of the selection 3335 * a point/word/line which is either the start or end of the selection
3289 * and it was decided by whichever point/word/line was `fixed' at the 3336 * and it was decided by whichever point/word/line was `fixed' at the
3290 * time of the most recent button3 press 3337 * time of the most recent button3 press
3291 */ 3338 */
3292 if (button3 && buttonpress) 3339 if (button3 && buttonpress)
3340 {
3293 { /* button3 press */ 3341 /* button3 press */
3294 /* 3342 /*
3295 * first determine which edge of the selection we are closest to 3343 * first determine which edge of the selection we are closest to
3296 */ 3344 */
3297 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3345 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3298 || (!ROWCOL_IS_AFTER (pos, selection.end) 3346 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3316 selection.mark.row = selection.beg.row; 3364 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3365 selection.mark.col = selection.beg.col;
3318 } 3366 }
3319 } 3367 }
3320 else 3368 else
3369 {
3321 { /* button1 drag or button3 drag */ 3370 /* button1 drag or button3 drag */
3322 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3371 if (ROWCOL_IS_AFTER (selection.mark, pos))
3323 { 3372 {
3324 if (selection.mark.row == selection.end.row 3373 if (selection.mark.row == selection.end.row
3325 && selection.mark.col == selection.end.col 3374 && selection.mark.col == selection.end.col
3326 && clickchange 3375 && clickchange
… …
3343 3392
3344 if (selection.clicks == 1) 3393 if (selection.clicks == 1)
3345 { 3394 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3395 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3396 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3397#if !ENABLE_MINIMAL
3349 && !selection.rect 3398 && !selection.rect
3350#endif 3399#endif
3351 ) 3400 )
3352 selection.beg.col = ncol; 3401 selection.beg.col = ncol;
3353 3402
3354 if ( 3403 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3404 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3405 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3406#if !ENABLE_MINIMAL
3358 && !selection.rect 3407 && !selection.rect
3359#endif 3408#endif
3360 ) 3409 )
3361 selection.end.col = ncol; 3410 selection.end.col = ncol;
3362 } 3411 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3418 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3419 }
3371 else if (selection.clicks == 3) 3420 else if (selection.clicks == 3)
3372 { 3421 {
3373#if ENABLE_FRILLS 3422#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3423 if (option (Opt_tripleclickwords))
3375 { 3424 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3425 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3426
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3427 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3428 {
3380 if (!ROW(end_row).is_longer ()) 3429 if (!ROW(end_row).is_longer ())
3381 { 3430 {
3382 selection.end.row = end_row; 3431 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3432 selection.end.col = ROW(end_row).l;
3433# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3434 selection_remove_trailing_spaces ();
3435# endif
3385 break; 3436 break;
3386 } 3437 }
3387 } 3438 }
3388 } 3439 }
3389 else 3440 else
… …
3405 selection.end.row++; 3456 selection.end.row++;
3406 } 3457 }
3407 } 3458 }
3408 3459
3409 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3461 {
3410 { /* mark may need to be changed */ 3462 /* mark may need to be changed */
3411 if (closeto == LEFT) 3463 if (closeto == LEFT)
3412 { 3464 {
3413 selection.mark.row = selection.end.row; 3465 selection.mark.row = selection.end.row;
3414 selection.mark.col = selection.end.col - (selection.clicks == 2); 3466 selection.mark.col = selection.end.col - (selection.clicks == 2);
3415 } 3467 }
… …
3418 selection.mark.row = selection.beg.row; 3470 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3471 selection.mark.col = selection.beg.col;
3420 } 3472 }
3421 } 3473 }
3422 3474
3423#if ENABLE_FRILLS 3475#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3476 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3477 ::swap (selection.beg.col, selection.end.col);
3426#endif 3478#endif
3427} 3479}
3428 3480
3429#if ENABLE_FRILLS 3481#if !ENABLE_MINIMAL
3430void 3482void
3431rxvt_term::selection_remove_trailing_spaces () NOTHROW 3483rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3484{
3433 int32_t end_col, end_row; 3485 int32_t end_col, end_row;
3434 text_t *stp; 3486 text_t *stp;
… …
3489 */ 3541 */
3490void 3542void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3543rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3544{
3493 XSelectionEvent ev; 3545 XSelectionEvent ev;
3494 dDisp;
3495 3546
3496 ev.type = SelectionNotify; 3547 ev.type = SelectionNotify;
3497 ev.property = None; 3548 ev.property = None;
3498 ev.display = rq.display; 3549 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3550 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3564 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3565#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3566 *target++ = xa[XA_UTF8_STRING];
3516#endif 3567#endif
3517 3568
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3569 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3570 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3571 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3572 ev.property = rq.property;
3522 } 3573 }
3523#if TODO // TODO 3574#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3577 /* TODO: Handle MULTIPLE */
3527 } 3578 }
3528#endif 3579#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3580 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3581 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3582 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3583 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3584 ev.property = rq.property;
3534 } 3585 }
3535 else if (rq.target == XA_STRING 3586 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3587 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3611 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3612 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3613 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3614 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3615 style = enc_compound_text;
3565#if ENABLE_FRILLS 3616#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3617 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3618 style = enc_utf8;
3568#endif 3619#endif
3569 else 3620 else
3570 { 3621 {
… …
3581 { 3632 {
3582 cl = L""; 3633 cl = L"";
3583 selectlen = 0; 3634 selectlen = 0;
3584 } 3635 }
3585 3636
3586#if ENABLE_FRILLS 3637#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3638 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3639 // so recode it manually
3589 if (style == enc_utf8) 3640 if (style == enc_utf8)
3590 { 3641 {
3591 freect = 1; 3642 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3645 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3646 ct.nitems = strlen ((char *)ct.value);
3596 } 3647 }
3597 else 3648 else
3598#endif 3649#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3650 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3651 freect = 1;
3601 else 3652 else
3602 { 3653 {
3603 /* if we failed to convert then send it raw */ 3654 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3655 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3656 ct.nitems = selectlen;
3606 ct.encoding = target; 3657 ct.encoding = target;
3607 } 3658 }
3608 3659
3609 XChangeProperty (disp, rq.requestor, rq.property, 3660 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3661 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3662 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3663 ev.property = rq.property;
3613 3664
3614 if (freect) 3665 if (freect)
3615 XFree (ct.value); 3666 XFree (ct.value);
3616 } 3667 }
3617 3668
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3669 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3619}
3620
3621/* ------------------------------------------------------------------------- *
3622 * MOUSE ROUTINES *
3623 * ------------------------------------------------------------------------- */
3624
3625/*
3626 * return col/row values corresponding to x/y pixel values
3627 */
3628void
3629rxvt_term::pixel_position (int *x, int *y) NOTHROW
3630{
3631 *x = Pixel2Col (*x);
3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633 *y = Pixel2Row (*y);
3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635} 3670}
3636 3671
3637/* ------------------------------------------------------------------------- */ 3672/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3673#ifdef USE_XIM
3639void 3674void
3640rxvt_term::im_set_position (XPoint &pos) NOTHROW 3675rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3676{
3642 XWindowAttributes xwa; 3677 XWindowAttributes xwa;
3643 3678
3644 XGetWindowAttributes (display->display, vt, &xwa); 3679 XGetWindowAttributes (dpy, vt, &xwa);
3645 3680
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3681 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3682 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3683}
3649#endif 3684#endif
… …
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3780rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3781{
3747 while (*s) 3782 while (*s)
3748 { 3783 {
3749 text_t t = *s++; 3784 text_t t = *s++;
3750 int width = wcwidth (t); 3785 int width = WCWIDTH (t);
3751 3786
3752 while (width--) 3787 while (width--)
3753 { 3788 {
3754 scr_overlay_set (x++, y, t); 3789 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3790 t = NOCHAR;

Diff Legend

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