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.307 by root, Fri Jun 27 00:44:32 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() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
… …
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
161{ 143{
162#if ENABLE_OVERLAY 144#if ENABLE_OVERLAY
163 scr_overlay_off (); 145 scr_overlay_off ();
164#endif 146#endif
165 147
148 rvideo_mode = false;
166 view_start = 0; 149 view_start = 0;
167 num_scr = 0; 150 num_scr = 0;
168 151
169 if (ncol == 0) 152 if (ncol == 0)
170 ncol = 80; 153 ncol = 80;
… …
173 nrow = 24; 156 nrow = 24;
174 157
175 if (ncol == prev_ncol && nrow == prev_nrow) 158 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 159 return;
177 160
161 if (current_screen != PRIMARY)
162 scr_swap_screen ();
163
178 // we need at least two lines for wrapping to work correctly 164 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 165 while (nrow + saveLines < 2)
180 { 166 {
181 //TODO//FIXME 167 //TODO//FIXME
182 saveLines++; 168 saveLines++;
183 prev_nrow--; 169 prev_nrow--;
184 top_row--; 170 top_row--;
… …
195 if (!row_buf) 181 if (!row_buf)
196 { 182 {
197 /* 183 /*
198 * first time called so just malloc everything: don't rely on realloc 184 * first time called so just malloc everything: don't rely on realloc
199 */ 185 */
200 top_row = 0; /* no saved lines */ 186 top_row = 0;
201 term_start = 0; 187 term_start = 0;
202 188
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 189 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 190 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 191
… …
234 selection.text = NULL; 220 selection.text = NULL;
235 selection.len = 0; 221 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 222 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 223 selection.screen = PRIMARY;
238 selection.clicks = 0; 224 selection.clicks = 0;
239 rvideo = 0;
240 } 225 }
241 else 226 else
242 { 227 {
243 /* 228 /*
244 * add or delete rows as appropriate 229 * add or delete rows as appropriate
… …
273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 258 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
274 } 259 }
275 260
276 line_t *old_buf = row_buf; 261 line_t *old_buf = row_buf;
277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 262 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 263
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 264 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start + top_row , prev_total_rows); 265 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 266 int q = total_rows; // rewrapped row
282 267
283 if (top_row) 268 if (top_row)
284 { 269 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 270 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 271 // to come up with a lean and mean algorithm.
287 272
288 row_col_t ocur = screen.cur; 273 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 274 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 275
… …
327 int qcol = 0; 312 int qcol = 0;
328 313
329 // see below for cursor adjustment rationale 314 // see below for cursor adjustment rationale
330 if (p == ocur.row) 315 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow); 316 screen.cur.row = q - (total_rows - nrow);
332 317
333 // fill a single destination line 318 // fill a single destination line
334 while (lofs < llen && qcol < ncol) 319 while (lofs < llen && qcol < ncol)
335 { 320 {
336 int prow = lofs / prev_ncol; 321 int prow = lofs / prev_ncol;
337 int pcol = lofs % prev_ncol; 322 int pcol = lofs % prev_ncol;
… …
347 332
348 line_t &pline = old_buf [prow]; 333 line_t &pline = old_buf [prow];
349 334
350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 335 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
351 336
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)); 337 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 338 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
359 339
360 lofs += len; 340 lofs += len;
361 qcol += len; 341 qcol += len;
… …
368 } 348 }
369 while (p != pend && q > 0); 349 while (p != pend && q > 0);
370 350
371 term_start = total_rows - nrow; 351 term_start = total_rows - nrow;
372 top_row = q - term_start; 352 top_row = q - term_start;
373 353
374 // make sure all terminal lines exist 354 // make sure all terminal lines exist
375 while (top_row > 0) 355 while (top_row > 0)
376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 356 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
377 } 357 }
378 else 358 else
379 { 359 {
380 // if no scrollback exists (yet), wing, instead of wrap 360 // if no scrollback exists (yet), wing, instead of wrap
381 361
382 for (int row = min (nrow, prev_nrow); row--; ) 362 for (int row = min (nrow, prev_nrow); row--; )
383 { 363 {
384 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 364 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
385 line_t &qline = row_buf [row]; 365 line_t &qline = row_buf [row];
386 366
… …
401 delete old_ra; 381 delete old_ra;
402 382
403 clamp_it (screen.cur.row, 0, nrow - 1); 383 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 384 clamp_it (screen.cur.col, 0, ncol - 1);
405 385
406 if (tabs)
407 free (tabs); 386 free (tabs);
408 } 387 }
409 388
410 CLEAR_ALL_SELECTION (); 389 CLEAR_ALL_SELECTION ();
411 390
412 prev_nrow = nrow; 391 prev_nrow = nrow;
413 prev_ncol = ncol; 392 prev_ncol = ncol;
414 393
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 394 tabs = (char *)rxvt_malloc (ncol);
416 395
417 for (int col = ncol; col--; ) 396 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 397 tabs [col] = col % TABSIZE == 0;
419 398
399 if (current_screen != PRIMARY)
400 scr_swap_screen ();
401
420 tt_winch (); 402 tt_winch ();
421 403
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 404 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 405}
424 406
… …
427 * Free everything. That way malloc debugging can find leakage. 409 * Free everything. That way malloc debugging can find leakage.
428 */ 410 */
429void 411void
430rxvt_term::scr_release () NOTHROW 412rxvt_term::scr_release () NOTHROW
431{ 413{
414 if (row_buf)
415 {
432 delete talloc; talloc = 0; 416 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 417 delete ralloc; ralloc = 0;
434 418
435 free (row_buf); 419 free (row_buf);
436 free (swap_buf); 420 free (swap_buf);
437 free (drawn_buf); 421 free (drawn_buf);
438 free (tabs); 422 free (tabs);
439 423
440 row_buf = 0; // signal that we freed all the arrays 424 row_buf = 0; // signal that we freed all the arrays
425 }
441} 426}
442 427
443/* ------------------------------------------------------------------------- */ 428/* ------------------------------------------------------------------------- */
444/* 429/*
445 * Hard reset 430 * Hard reset
446 */ 431 */
447void 432void
448rxvt_term::scr_poweron () NOTHROW 433rxvt_term::scr_poweron ()
449{ 434{
450 scr_release (); 435 scr_release ();
451 prev_nrow = prev_ncol = 0; 436 prev_nrow = prev_ncol = 0;
452 scr_reset (); 437 scr_reset ();
453 438
… …
504 assert (s->cur.row >= 0); 489 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 490 assert (s->cur.col >= 0);
506#endif 491#endif
507} 492}
508 493
494void
495rxvt_term::scr_swap_screen ()
496{
497 if (!option (Opt_secondaryScreen))
498 return;
499
500 for (int i = prev_nrow; i--; )
501 ::swap (ROW(i), swap_buf [i]);
502
503 ::swap (screen.cur, swap.cur);
504
505 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
506 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
507}
508
509/* ------------------------------------------------------------------------- */ 509/* ------------------------------------------------------------------------- */
510/* 510/*
511 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 514 */
515int 515void
516rxvt_term::scr_change_screen (int scrn) NOTHROW 516rxvt_term::scr_change_screen (int scrn)
517{ 517{
518 if (scrn == current_screen)
519 return;
520
518 want_refresh = 1; 521 want_refresh = 1;
519 view_start = 0; 522 view_start = 0;
520 523
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 524 selection_check (2); /* check for boundary cross */
525 525
526 int i = current_screen; current_screen = scrn; scrn = i; 526 int i = current_screen; current_screen = scrn; scrn = i;
527 527
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533
534#if NSCREENS 528#if NSCREENS
535 if (OPTION (Opt_secondaryScreen)) 529 if (option (Opt_secondaryScreen))
536 { 530 {
537 num_scr = 0; 531 num_scr = 0;
538 532
539 for (int i = prev_nrow; i--; ) 533 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 534
542 ::swap (screen.charset, swap.charset); 535 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 536 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 537 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 538 swap.flags |= Screen_VisibleCursor;
546 } 539 }
547 else 540 else
548#endif 541#endif
549 if (OPTION (Opt_secondaryScroll)) 542 if (option (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 543 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 544}
554 545
555// clear WrapNext indicator, solidifying position on next line 546// clear WrapNext indicator, solidifying position on next line
556void 547void
557rxvt_term::scr_do_wrap () NOTHROW 548rxvt_term::scr_do_wrap () NOTHROW
… …
589/* 580/*
590 * Change the rendition style for following text 581 * Change the rendition style for following text
591 */ 582 */
592void 583void
593rxvt_term::scr_rendition (int set, int style) NOTHROW 584rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 585{
595 if (set) 586 if (set)
596 rstyle |= style; 587 rstyle |= style;
597 else if (style == ~RS_None) 588 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 589 rstyle = DEFAULT_RSTYLE;
599 else 590 else
600 rstyle &= ~style; 591 rstyle &= ~style;
601 } 592}
602 593
603/* ------------------------------------------------------------------------- */ 594/* ------------------------------------------------------------------------- */
604/* 595/*
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 596 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 597 * count positive ==> scroll up
… …
615 want_refresh = 1; 606 want_refresh = 1;
616 num_scr += count; 607 num_scr += count;
617 608
618 if (count > 0 609 if (count > 0
619 && row1 == 0 610 && row1 == 0
620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 611 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
621 { 612 {
622 top_row = max (top_row - count, -saveLines); 613 top_row = max (top_row - count, -saveLines);
623 614
624 // scroll everything up 'count' lines 615 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 616 term_start = (term_start + count) % total_rows;
… …
632 } 623 }
633 624
634 // erase newly scrolled-in lines 625 // erase newly scrolled-in lines
635 for (int i = count; i--; ) 626 for (int i = count; i--; )
636 { 627 {
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); 628 line_t &l = ROW(nrow - 1 - i);
640 629
630 // optimize if already cleared, can be significant on slow machines
631 // could be rolled into scr_blank_screen_mem
632 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
633 {
641 scr_blank_line (l, 0, l.l, rstyle); 634 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 635 l.l = 0;
644 l.f = 0; 636 l.f = 0;
637 }
638 else
639 scr_blank_screen_mem (l, rstyle);
645 } 640 }
646 641
647 // now copy lines below the scroll region bottom to the 642 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 643 // bottom of the screen again, so they look as if they
649 // hadn't moved. 644 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 648 line_t &l2 = ROW(i);
654 649
655 ::swap (l1, l2); 650 ::swap (l1, l2);
656 l2.touch (); 651 l2.touch ();
657 } 652 }
658 653
659 // move and/or clear selection, if any 654 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 655 if (selection.op && current_screen == selection.screen)
661 { 656 {
662 selection.beg.row -= count; 657 selection.beg.row -= count;
663 selection.end.row -= count; 658 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 666 selection.op = SELECTION_CLEAR;
672 } 667 }
673 } 668 }
674 669
675 // finally move the view window, if desired 670 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 671 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 672 && view_start != 0
678 && view_start != -saveLines) 673 && view_start != -saveLines)
679 scr_page (UP, count); 674 scr_page (UP, count);
680 675
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 676 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
699 { 694 {
700 /* move selected region too */ 695 /* move selected region too */
701 selection.beg.row -= count; 696 selection.beg.row -= count;
702 selection.end.row -= count; 697 selection.end.row -= count;
703 selection.mark.row -= count; 698 selection.mark.row -= count;
704 699
705 selection_check (0); 700 selection_check (0);
706 } 701 }
707 } 702 }
708 703
709 // use a simple and robust scrolling algorithm, this 704 // use a simple and robust scrolling algorithm, this
… …
749 ZERO_SCROLLBACK (); 744 ZERO_SCROLLBACK ();
750 745
751 if (minlines > 0) 746 if (minlines > 0)
752 { 747 {
753 minlines += screen.cur.row - screen.bscroll; 748 minlines += screen.cur.row - screen.bscroll;
749 min_it (minlines, screen.cur.row - top_row);
754 750
755 if (minlines > 0 751 if (minlines > 0
756 && screen.tscroll == 0 752 && screen.tscroll == 0
757 && screen.bscroll == nrow - 1) 753 && screen.bscroll == nrow - 1)
758 { 754 {
… …
820 } 816 }
821 817
822 if (screen.flags & Screen_WrapNext) 818 if (screen.flags & Screen_WrapNext)
823 { 819 {
824 scr_do_wrap (); 820 scr_do_wrap ();
825 821
826 line->l = ncol; 822 line->l = ncol;
827 line->is_longer (1); 823 line->is_longer (1);
828 824
829 row = screen.cur.row; 825 row = screen.cur.row;
830 line = &ROW(row); /* _must_ refresh */ 826 line = &ROW(row); /* _must_ refresh */
… …
832 828
833 // some utf-8 decoders "decode" surrogate characters: let's fix this. 829 // some utf-8 decoders "decode" surrogate characters: let's fix this.
834 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 830 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
835 c = 0xfffd; 831 c = 0xfffd;
836 832
837 // rely on wcwidth to tell us the character width, at least for non-latin1 833 // rely on wcwidth to tell us the character width, do wcwidth before
838 // do wcwidth before further replacements, as wcwidth might return -1 834 // 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 835 // drawing characters below as they might be invalid in the current
840 // locale. 836 // locale.
841 int width = c < 0x100 ? 1 : wcwidth (c); 837 int width = WCWIDTH (c);
842 838
843 if (charsets [screen.charset] == '0') // DEC SPECIAL 839 if (charsets [screen.charset] == '0') // DEC SPECIAL
844 { 840 {
845 // vt100 special graphics and line drawing 841 // vt100 special graphics and line drawing
846 // 5f-7e standard vt100 842 // 5f-7e standard vt100
… …
999 * XTERM_SEQ: CTRL-H 995 * XTERM_SEQ: CTRL-H
1000 */ 996 */
1001void 997void
1002rxvt_term::scr_backspace () NOTHROW 998rxvt_term::scr_backspace () NOTHROW
1003{ 999{
1004 want_refresh = 1;
1005
1006 if (screen.cur.col == 0) 1000 if (screen.cur.col == 0)
1007 { 1001 {
1008 if (screen.cur.row > 0) 1002 if (screen.cur.row > 0)
1009 { 1003 {
1010#ifdef TERMCAP_HAS_BW 1004#ifdef TERMCAP_HAS_BW
1011 screen.cur.col = ncol - 1; 1005 screen.cur.col = ncol - 1;
1012 screen.cur.row--; 1006 --screen.cur.row;
1013 return; 1007
1008 want_refresh = 1;
1014#endif 1009#endif
1015 } 1010 }
1016 } 1011 }
1017 else if (!(screen.flags & Screen_WrapNext)) 1012 else
1018 scr_gotorc (0, -1, RELATIVE); 1013 scr_gotorc (0, -1, RELATIVE);
1019
1020 screen.flags &= ~Screen_WrapNext;
1021} 1014}
1022 1015
1023/* ------------------------------------------------------------------------- */ 1016/* ------------------------------------------------------------------------- */
1024/* 1017/*
1025 * Process Horizontal Tab 1018 * Process Horizontal Tab
… …
1048 x = i; 1041 x = i;
1049 1042
1050 if (!--count) 1043 if (!--count)
1051 break; 1044 break;
1052 } 1045 }
1053 else 1046 else
1054 ht &= l.t[i] == ' ' 1047 ht &= l.t[i] == ' '
1055 && RS_SAME (l.r[i], base_rend); 1048 && RS_SAME (l.r[i], base_rend);
1056 1049
1057 if (count) 1050 if (count)
1058 x = ncol - 1; 1051 x = ncol - 1;
1059 1052
1060 // store horizontal tab commands as characters inside the text 1053 // store horizontal tab commands as characters inside the text
1061 // buffer so they can be selected and pasted. 1054 // buffer so they can be selected and pasted.
1062 if (ht && OPTION (Opt_pastableTabs)) 1055 if (ht && option (Opt_pastableTabs))
1063 { 1056 {
1064 base_rend = SET_FONT (base_rend, 0); 1057 base_rend = SET_FONT (base_rend, 0);
1065 1058
1066 l.touch (x); 1059 l.touch (x);
1067 1060
… …
1100 * Process DEC Back Index 1093 * Process DEC Back Index
1101 * XTERM_SEQ: ESC 6 1094 * XTERM_SEQ: ESC 6
1102 * Move cursor left in row. If we're at the left boundary, shift everything 1095 * Move cursor left in row. If we're at the left boundary, shift everything
1103 * in that row right. Clear left column. 1096 * in that row right. Clear left column.
1104 */ 1097 */
1105#if ENABLE_FRILLS 1098#if !ENABLE_MINIMAL
1106void 1099void
1107rxvt_term::scr_backindex () NOTHROW 1100rxvt_term::scr_backindex () NOTHROW
1108{ 1101{
1109 if (screen.cur.col > 0) 1102 if (screen.cur.col > 0)
1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1103 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
… …
1117 * Process DEC Forward Index 1110 * Process DEC Forward Index
1118 * XTERM_SEQ: ESC 9 1111 * XTERM_SEQ: ESC 9
1119 * Move cursor right in row. If we're at the right boundary, shift everything 1112 * Move cursor right in row. If we're at the right boundary, shift everything
1120 * in that row left. Clear right column. 1113 * in that row left. Clear right column.
1121 */ 1114 */
1122#if ENABLE_FRILLS 1115#if !ENABLE_MINIMAL
1123void 1116void
1124rxvt_term::scr_forwardindex () NOTHROW 1117rxvt_term::scr_forwardindex () NOTHROW
1125{ 1118{
1126 if (screen.cur.col < ncol - 1) 1119 if (screen.cur.col < ncol - 1)
1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
… …
1174 } 1167 }
1175 } 1168 }
1176 else 1169 else
1177 { 1170 {
1178 if (screen.flags & Screen_Relative) 1171 if (screen.flags & Screen_Relative)
1172 {
1179 { /* relative origin mode */ 1173 /* relative origin mode */
1180 screen.cur.row = row + screen.tscroll; 1174 screen.cur.row = row + screen.tscroll;
1181 min_it (screen.cur.row, screen.bscroll); 1175 min_it (screen.cur.row, screen.bscroll);
1182 } 1176 }
1183 else 1177 else
1184 screen.cur.row = row; 1178 screen.cur.row = row;
… …
1217/* 1211/*
1218 * Erase part or whole of a line 1212 * Erase part or whole of a line
1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1213 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1214 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1215 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1216 * extension: clear to right unless wrapped: ESC [ 3 K
1222 */ 1217 */
1223void 1218void
1224rxvt_term::scr_erase_line (int mode) NOTHROW 1219rxvt_term::scr_erase_line (int mode) NOTHROW
1225{ 1220{
1226 unsigned int col, num; 1221 unsigned int col, num;
… …
1235 line.touch (); 1230 line.touch ();
1236 line.is_longer (0); 1231 line.is_longer (0);
1237 1232
1238 switch (mode) 1233 switch (mode)
1239 { 1234 {
1235 case 3:
1236 if (screen.flags & Screen_WrapNext)
1237 return;
1238
1239 /* fall through */
1240
1240 case 0: /* erase to end of line */ 1241 case 0: /* erase to end of line */
1241 col = screen.cur.col; 1242 col = screen.cur.col;
1242 num = ncol - col; 1243 num = ncol - col;
1243 min_it (line.l, col); 1244 min_it (line.l, col);
1245
1244 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1246 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1245 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1247 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1246 CLEAR_SELECTION (); 1248 CLEAR_SELECTION ();
1247 break; 1249 break;
1250
1248 case 1: /* erase to beginning of line */ 1251 case 1: /* erase to beginning of line */
1249 col = 0; 1252 col = 0;
1250 num = screen.cur.col + 1; 1253 num = screen.cur.col + 1;
1254
1251 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1255 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1252 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1256 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1253 CLEAR_SELECTION (); 1257 CLEAR_SELECTION ();
1254 break; 1258 break;
1259
1255 case 2: /* erase whole line */ 1260 case 2: /* erase whole line */
1256 col = 0; 1261 col = 0;
1257 num = ncol; 1262 num = ncol;
1258 line.l = 0; 1263 line.l = 0;
1259 if (selection.beg.row <= screen.cur.row 1264 if (selection.beg.row <= screen.cur.row
… …
1317 if (row >= nrow) /* Out Of Bounds */ 1322 if (row >= nrow) /* Out Of Bounds */
1318 return; 1323 return;
1319 1324
1320 min_it (num, nrow - row); 1325 min_it (num, nrow - row);
1321 1326
1327 /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */
1322 if (rstyle & (RS_RVid | RS_Uline)) 1328 if (rstyle & (RS_RVid | RS_Uline))
1323 ren = (rend_t) ~RS_None; 1329 ren = (rend_t) ~RS_None;
1324 else if (GET_BASEBG (rstyle) == Color_bg) 1330 else if (GET_BASEBG (rstyle) == Color_bg)
1325 { 1331 {
1326 ren = DEFAULT_RSTYLE; 1332 ren = DEFAULT_RSTYLE;
1327 CLEAR_ROWS (row, num); 1333
1334 if (mapped)
1335 XClearArea (dpy, vt, 0,
1336 Row2Pixel (row), (unsigned int)width,
1337 (unsigned int)Height2Pixel (num), False);
1328 } 1338 }
1329 else 1339 else
1330 { 1340 {
1331 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1342
1332 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1343 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1344 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 ERASE_ROWS (row, num); 1345 XFillRectangle (dpy, vt, gc,
1346 0, Row2Pixel (row),
1347 (unsigned int)width,
1348 (unsigned int)Height2Pixel (num));
1335 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1336 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1337 } 1351 }
1338 1352
1339 for (; num--; row++) 1353 for (; num--; row++)
1340 { 1354 {
1341 scr_blank_screen_mem (ROW(row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1342 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1343 } 1357 }
1344} 1358}
1345 1359
1346#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1347void 1361void
1348rxvt_term::scr_erase_savelines () NOTHROW 1362rxvt_term::scr_erase_savelines () NOTHROW
1349{ 1363{
1350 want_refresh = 1; 1364 want_refresh = 1;
1351 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
… …
1460 { 1474 {
1461 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
1462 || (selection.end.col + count >= ncol)) 1476 || (selection.end.col + count >= ncol))
1463 CLEAR_SELECTION (); 1477 CLEAR_SELECTION ();
1464 else 1478 else
1479 {
1465 { /* shift selection */ 1480 /* shift selection */
1466 selection.beg.col += count; 1481 selection.beg.col += count;
1467 selection.mark.col += count; /* XXX: yes? */ 1482 selection.mark.col += count; /* XXX: yes? */
1468 selection.end.col += count; 1483 selection.end.col += count;
1469 } 1484 }
1470 } 1485 }
… …
1609 */ 1624 */
1610void 1625void
1611rxvt_term::scr_set_tab (int mode) NOTHROW 1626rxvt_term::scr_set_tab (int mode) NOTHROW
1612{ 1627{
1613 if (mode < 0) 1628 if (mode < 0)
1614 memset (tabs, 0, ncol * sizeof (char)); 1629 memset (tabs, 0, ncol);
1615 else if (screen.cur.col < ncol) 1630 else if (screen.cur.col < ncol)
1616 tabs [screen.cur.col] = !!mode; 1631 tabs [screen.cur.col] = !!mode;
1617} 1632}
1618 1633
1619/* ------------------------------------------------------------------------- */ 1634/* ------------------------------------------------------------------------- */
… …
1621 * Set reverse/normal video 1636 * Set reverse/normal video
1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1637 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1638 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1624 */ 1639 */
1625void 1640void
1626rxvt_term::scr_rvideo_mode (int mode) NOTHROW 1641rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1627{ 1642{
1628 XGCValues gcvalue; 1643 rvideo_mode = on;
1629 1644
1645#ifndef NO_BELL
1646 on ^= rvideo_bell;
1647#endif
1648
1630 if (rvideo != mode) 1649 if (rvideo_state != on)
1631 { 1650 {
1632 rvideo = mode; 1651 rvideo_state = on;
1652
1633 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1653 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1634#if XPM_BACKGROUND 1654#ifdef HAVE_BG_PIXMAP
1635 if (bgPixmap.pixmap == None) 1655 if (bgPixmap.pixmap == None)
1636#endif 1656#endif
1637#if TRANSPARENT 1657 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 1658
1659 XGCValues gcvalue;
1643 gcvalue.foreground = pix_colors[Color_fg]; 1660 gcvalue.foreground = pix_colors[Color_fg];
1644 gcvalue.background = pix_colors[Color_bg]; 1661 gcvalue.background = pix_colors[Color_bg];
1645 XChangeGC (display->display, gc, GCBackground | GCForeground, 1662 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1646 &gcvalue); 1663
1647 scr_clear (); 1664 scr_clear ();
1648 scr_touch (true); 1665 scr_touch (true);
1649 } 1666 }
1650} 1667}
1651 1668
… …
1735{ 1752{
1736 bool found = false; 1753 bool found = false;
1737 1754
1738 for (int i = 0; i < nrow; i++) 1755 for (int i = 0; i < nrow; i++)
1739 { 1756 {
1740 int col = 0;
1741 rend_t *drp = drawn_buf[i].r; 1757 rend_t *drp = drawn_buf[i].r;
1742 1758
1743 for (; col < ncol; col++, drp++) 1759 for (int col = 0; col < ncol; col++, drp++)
1744 if ((*drp & mask) == value) 1760 if ((*drp & mask) == value)
1745 { 1761 {
1746 found = true; 1762 found = true;
1747 *drp = ~value; 1763 *drp = ~value;
1748 } 1764 }
… …
1788 for (i = PART_BEG; i < RC_COUNT; i++) 1804 for (i = PART_BEG; i < RC_COUNT; i++)
1789 { 1805 {
1790 min_it (rc[i].col, ncol - 1); 1806 min_it (rc[i].col, ncol - 1);
1791 min_it (rc[i].row, nrow - 1); 1807 min_it (rc[i].row, nrow - 1);
1792 } 1808 }
1793 1809// 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++) 1810 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); 1811 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1796 1812
1797 num_scr_allow = 0; 1813 num_scr_allow = 0;
1798 1814
… …
1851 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1867 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1852 1868
1853 return true; 1869 return true;
1854} 1870}
1855 1871
1872#ifndef NO_BELL
1873void
1874rxvt_term::bell_cb (ev::timer &w, int revents)
1875{
1876 rvideo_bell = false;
1877 scr_rvideo_mode (rvideo_mode);
1878 refresh_check ();
1879}
1880#endif
1881
1856/* ------------------------------------------------------------------------- */ 1882/* ------------------------------------------------------------------------- */
1857void 1883void
1858rxvt_term::scr_bell () NOTHROW 1884rxvt_term::scr_bell () NOTHROW
1859{ 1885{
1860#ifndef NO_BELL 1886#ifndef NO_BELL
1861 1887
1862# ifndef NO_MAPALERT 1888# ifndef NO_MAPALERT
1863# ifdef MAPALERT_OPTION 1889# ifdef MAPALERT_OPTION
1864 if (OPTION (Opt_mapAlert)) 1890 if (option (Opt_mapAlert))
1865# endif 1891# endif
1866 XMapWindow (display->display, parent[0]); 1892 XMapWindow (dpy, parent[0]);
1867# endif 1893# endif
1868 1894
1869 if (OPTION (Opt_visualBell)) 1895# if ENABLE_FRILLS
1896 if (option (Opt_urgentOnBell))
1897 {
1898 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1899 {
1900 h->flags |= XUrgencyHint;
1901 XSetWMHints (dpy, parent[0], h);
1902 }
1870 { 1903 }
1871 scr_rvideo_mode (!rvideo); /* refresh also done */ 1904# endif
1905
1906 if (option (Opt_visualBell))
1907 {
1908 rvideo_bell = true;
1909 scr_rvideo_mode (rvideo_mode);
1872 display->flush (); 1910 flush ();
1911
1873 rxvt_usleep (VISUAL_BELL_DURATION); 1912 bell_ev.start (VISUAL_BELL_DURATION);
1874 scr_rvideo_mode (!rvideo); /* refresh also done */
1875 } 1913 }
1876 else 1914 else
1877 XBell (display->display, 0); 1915 XBell (dpy, 0);
1878
1879#endif 1916#endif
1880} 1917}
1881 1918
1882/* ------------------------------------------------------------------------- */ 1919/* ------------------------------------------------------------------------- */
1883/* ARGSUSED */ 1920/* ARGSUSED */
… …
1941 * screen.text/screen.rend contain what the screen will change to. 1978 * screen.text/screen.rend contain what the screen will change to.
1942 */ 1979 */
1943void 1980void
1944rxvt_term::scr_refresh () NOTHROW 1981rxvt_term::scr_refresh () NOTHROW
1945{ 1982{
1946 unsigned char must_clear, /* use draw_string not draw_image_string */ 1983 unsigned char have_bg,
1947 showcursor; /* show the cursor */ 1984 showcursor; /* show the cursor */
1948 int16_t col, row, /* column/row we're processing */ 1985 int16_t col, row, /* column/row we're processing */
1949 ocrow; /* old cursor row */ 1986 ocrow; /* old cursor row */
1950 int i; /* tmp */ 1987 int i; /* tmp */
1951#ifndef NO_CURSORCOLOR 1988#ifndef NO_CURSORCOLOR
1952 rend_t cc1; /* store colours at cursor position (s) */ 1989 rend_t cc1; /* store colours at cursor position (s) */
1953#endif 1990#endif
1954 rend_t *crp; // cursor rendition pointer 1991 rend_t *crp; // cursor rendition pointer
1992 rend_t ccol1, /* Cursor colour */
1993 ccol2; /* Cursor colour2 */
1955 1994
1956 want_refresh = 0; /* screen is current */ 1995 want_refresh = 0; /* screen is current */
1957 1996
1958 if (refresh_type == NO_REFRESH || !mapped) 1997 if (refresh_type == NO_REFRESH || !mapped)
1959 return; 1998 return;
1960 1999
1961 /* 2000 /*
1962 * A: set up vars 2001 * A: set up vars
1963 */ 2002 */
1964 must_clear = 0;
1965 refresh_count = 0; 2003 refresh_count = 0;
1966 2004
1967#if XPM_BACKGROUND 2005 have_bg = 0;
2006#ifdef HAVE_BG_PIXMAP
1968 must_clear |= bgPixmap.pixmap != None; 2007 have_bg = bgPixmap.pixmap != None;
1969#endif
1970#if TRANSPARENT
1971 must_clear |= OPTION (Opt_transparent) && am_transparent;
1972#endif 2008#endif
1973 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2009 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1974 2010
1975 /* 2011 /*
1976 * B: reverse any characters which are selected 2012 * B: reverse any characters which are selected
… …
1980 /* 2016 /*
1981 * C: set the cursor character (s) 2017 * C: set the cursor character (s)
1982 */ 2018 */
1983 { 2019 {
1984 unsigned char setoldcursor; 2020 unsigned char setoldcursor;
1985 rend_t ccol1, /* Cursor colour */
1986 ccol2; /* Cursor colour2 */
1987 2021
1988 showcursor = (screen.flags & Screen_VisibleCursor); 2022 showcursor = (screen.flags & Screen_VisibleCursor);
1989#ifdef CURSOR_BLINK 2023#ifdef CURSOR_BLINK
1990 if (hidden_cursor) 2024 if (hidden_cursor)
1991 showcursor = 0; 2025 showcursor = 0;
… …
1998 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2032 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1999 col--; 2033 col--;
2000 2034
2001 crp = &ROW(screen.cur.row).r[col]; 2035 crp = &ROW(screen.cur.row).r[col];
2002 2036
2037#ifndef NO_CURSORCOLOR
2038 cc1 = *crp & (RS_fgMask | RS_bgMask);
2039 if (ISSET_PIXCOLOR (Color_cursor))
2040 ccol1 = Color_cursor;
2041 else
2042#endif
2043#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2044 ccol1 = fgcolor_of (rstyle);
2045#else
2046 ccol1 = Color_fg;
2047#endif
2048
2049#ifndef NO_CURSORCOLOR
2050 if (ISSET_PIXCOLOR (Color_cursor2))
2051 ccol2 = Color_cursor2;
2052 else
2053#endif
2054#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2055 ccol2 = bgcolor_of (rstyle);
2056#else
2057 ccol2 = Color_bg;
2058#endif
2059
2003 if (showcursor && focus) 2060 if (showcursor && focus)
2004 { 2061 {
2005 if (OPTION (Opt_cursorUnderline)) 2062 if (option (Opt_cursorUnderline))
2006 *crp ^= RS_Uline; 2063 *crp ^= RS_Uline;
2007 else 2064 else
2008 { 2065 {
2009 *crp ^= RS_RVid; 2066 *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); 2067 *crp = SET_FGCOLOR (*crp, ccol1);
2030 *crp = SET_BGCOLOR (*crp, ccol2); 2068 *crp = SET_BGCOLOR (*crp, ccol2);
2031#endif
2032 } 2069 }
2033 } 2070 }
2034 } 2071 }
2035 2072
2036 /* make sure no outline cursor is left around */ 2073 /* make sure no outline cursor is left around */
… …
2075 * D: CopyArea pass - very useful for slower links 2112 * D: CopyArea pass - very useful for slower links
2076 * This has been deliberately kept simple. 2113 * This has been deliberately kept simple.
2077 */ 2114 */
2078 if (!display->is_local 2115 if (!display->is_local
2079 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2116 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2080 && abs (num_scr) < nrow && !must_clear) 2117 && abs (num_scr) < nrow && !have_bg)
2081 { 2118 {
2082 int16_t nits; 2119 int16_t nits;
2120 int i = num_scr;
2083 int j; 2121 int j;
2084 int len, wlen; 2122 int len, wlen;
2085 dLocal (int, num_scr); 2123 dLocal (int, num_scr);
2086 2124
2087 j = nrow; 2125 j = nrow;
2088 wlen = len = -1; 2126 wlen = len = -1;
2089 row = i > 0 ? 0 : j - 1; 2127 row = i > 0 ? 0 : j - 1;
2128
2090 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2129 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2091 { 2130 {
2092 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2131 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2093 { 2132 {
2094 line_t s = ROW(view_start + row); 2133 line_t s = ROW(view_start + row);
… …
2115 wlen = row; 2154 wlen = row;
2116 continue; 2155 continue;
2117 } 2156 }
2118 } 2157 }
2119 2158
2120 if (len != -1) 2159 if (len >= 0)
2121 { 2160 {
2122 /* also comes here at end if needed because of >= above */ 2161 /* also comes here at end if needed because of >= above */
2123 if (wlen < len) 2162 if (wlen < len)
2124 ::swap (wlen, len); 2163 ::swap (wlen, len);
2125 2164
2165 XGCValues gcv;
2166
2167 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2126 XCopyArea (display->display, vt, vt, 2168 XCopyArea (dpy, vt, vt,
2127 gc, 0, Row2Pixel (len + i), 2169 gc, 0, Row2Pixel (len + i),
2128 (unsigned int)this->width, 2170 (unsigned int)this->width,
2129 (unsigned int)Height2Pixel (wlen - len + 1), 2171 (unsigned int)Height2Pixel (wlen - len + 1),
2130 0, Row2Pixel (len)); 2172 0, Row2Pixel (len));
2173 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2174
2131 len = -1; 2175 len = -1;
2132 } 2176 }
2133 } 2177 }
2134 } 2178 }
2135#endif 2179#endif
… …
2191 count++; 2235 count++;
2192 2236
2193 if (stp[col] != dtp[col] 2237 if (stp[col] != dtp[col]
2194 || !RS_SAME (srp[col], drp[col])) 2238 || !RS_SAME (srp[col], drp[col]))
2195 { 2239 {
2196 if (must_clear && (i++ > count / 2)) 2240 if (have_bg && (i++ > count / 2))
2197 break; 2241 break;
2198 2242
2199 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2200 drp[col] = rend; 2244 drp[col] = rend;
2201 i = 0; 2245 i = 0;
2202 } 2246 }
2203 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2247 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2204 break; 2248 break;
2205 } 2249 }
2206 2250
2207 col--; /* went one too far. move back */ 2251 col--; /* went one too far. move back */
2208 count -= i; /* dump any matching trailing chars */ 2252 count -= i; /* dump any matching trailing chars */
… …
2218 int back = bgcolor_of (rend); // desired background 2262 int back = bgcolor_of (rend); // desired background
2219 2263
2220 // only do special processing if any attributes are set, which is unlikely 2264 // 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)) 2265 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2222 { 2266 {
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; 2267 bool invert = rend & RS_RVid;
2236 2268
2237#ifndef NO_BOLD_UNDERLINE_REVERSE 2269#ifndef NO_BOLD_UNDERLINE_REVERSE
2238 if (rend & RS_Bold
2239 && fore == Color_fg) 2270 if (rend & RS_Bold && fore == Color_fg)
2240 { 2271 {
2241 if (ISSET_PIXCOLOR (Color_BD)) 2272 if (ISSET_PIXCOLOR (Color_BD))
2242 fore = Color_BD; 2273 fore = Color_BD;
2243# if !ENABLE_STYLES 2274# if !ENABLE_STYLES
2244 else 2275 else
2245 invert = !invert; 2276 invert = !invert;
2246# endif 2277# endif
2247 } 2278 }
2248 2279
2249 if (rend & RS_Italic 2280 if (rend & RS_Italic && fore == Color_fg)
2250 && fore == Color_fg)
2251 { 2281 {
2252 if (ISSET_PIXCOLOR (Color_IT)) 2282 if (ISSET_PIXCOLOR (Color_IT))
2253 fore = Color_IT; 2283 fore = Color_IT;
2254# if !ENABLE_STYLES 2284# if !ENABLE_STYLES
2255 else 2285 else
2256 invert = !invert; 2286 invert = !invert;
2257# endif 2287# endif
2258 } 2288 }
2259 2289
2260 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2261 fore = Color_UL; 2291 fore = Color_UL;
2262#endif 2292#endif
2263 2293
2264 if (invert) 2294 if (invert)
2265 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2266 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2267 2307
2268#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2269 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2270 back = Color_RV; 2311 back = Color_RV;
2271 2312# endif
2272 if (fore == back) 2313 if (fore == back)
2273 { 2314 {
2274 fore = Color_bg; 2315 fore = Color_bg;
2275 back = Color_fg; 2316 back = Color_fg;
2276 } 2317 }
… …
2278 } 2319 }
2279 2320
2280#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2281 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2282 { 2323 {
2283 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2284 { 2325 {
2285 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2286 hidden_text = 0; 2327 hidden_text = 0;
2287 } 2328 }
2288 else if (hidden_text) 2329 else if (hidden_text)
2289 fore = back; 2330 fore = back;
2290 } 2331 }
2291#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2292 } 2351 }
2293 2352
2294 /* 2353 /*
2295 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2296 */ 2355 */
2297 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2298 2357
2299 if (back == fore)
2300 font->clear_rect (*drawable, xpixel, ypixel,
2301 fwidth * count, fheight,
2302 back);
2303 else if (back == Color_bg) 2358 if (have_bg && back == Color_bg)
2304 { 2359 {
2305 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2306 {
2307 CLEAR_CHARS (xpixel, ypixel, count);
2308 2361
2309 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2310 if (text[i] != ' ') 2363 if (text[i] != ' ')
2311 { 2364 {
2312 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2313 break; 2366 goto did_clear;
2314 }
2315 } 2367 }
2316 else 2368
2317 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2318 } 2371 }
2319 else 2372 else
2320 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2321 2374
2322 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (rend & RS_Uline && font->descent > 1 && fore != back)
2323 { 2376 {
2324#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2325 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2326 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2327 else 2380 else
2328#endif 2381#endif
2329 XSetForeground (display->display, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2330 2383
2331 XDrawLine (display->display, drawBuffer, gc, 2384 XDrawLine (dpy, vt, gc,
2332 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2333 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2334 } 2387 }
2335 } /* for (col....) */ 2388 } /* for (col....) */
2336 } /* for (row....) */ 2389 } /* for (row....) */
… …
2345 */ 2398 */
2346 if (showcursor) 2399 if (showcursor)
2347 { 2400 {
2348 if (focus) 2401 if (focus)
2349 { 2402 {
2350 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2351 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2352 else 2405 else
2353 { 2406 {
2354 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2355#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2369 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2370 cursorwidth++; 2423 cursorwidth++;
2371 2424
2372#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2373 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2374 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2375#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2376 2431
2377 XDrawRectangle (display->display, drawBuffer, gc, 2432 XDrawRectangle (dpy, vt, gc,
2378 Col2Pixel (col), 2433 Col2Pixel (col),
2379 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2380 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2381 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2382 } 2437 }
… …
2417} 2472}
2418 2473
2419void 2474void
2420rxvt_term::scr_recolour () NOTHROW 2475rxvt_term::scr_recolour () NOTHROW
2421{ 2476{
2422 if (1 2477#ifdef HAVE_BG_PIXMAP
2423#if TRANSPARENT 2478 bgPixmap.apply ();
2424 && !am_transparent 2479#else
2425#endif 2480
2426#if XPM_BACKGROUND
2427 && !bgPixmap.pixmap
2428#endif
2429 )
2430 {
2431 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2432 XClearWindow (display->display, parent[0]); 2482 XClearWindow (dpy, parent[0]);
2433 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2483 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2434#if HAVE_SCROLLBARS 2484
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.state = STATE_IDLE;
2439 scrollbar_show (0); 2489 scrollBar.show (0);
2440 }
2441#endif
2442 } 2490 }
2443 2491
2492#endif
2493
2494 /* bgPixmap.apply () does not do the following : */
2444 scr_clear (); 2495 scr_clear ();
2445 scr_touch (true); 2496 scr_touch (true);
2446 want_refresh = 1; 2497 want_refresh = 1;
2447} 2498}
2448 2499
… …
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
… …
2540{ 2591{
2541 int row, wrote; 2592 int row, wrote;
2542 unsigned int width, towrite; 2593 unsigned int width, towrite;
2543 char r1[] = "\n"; 2594 char r1[] = "\n";
2544 2595
2545 for (row = saveLines - nsaved; 2596 for (row = saveLines + top_row;
2546 row < saveLines + nrow - 1; row++) 2597 row < saveLines + nrow - 1; row++)
2547 { 2598 {
2548 width = row_buf[row].l >= 0 ? row_buf[row].l 2599 width = row_buf[row].l >= 0 ? row_buf[row].l
2549 : ncol; 2600 : ncol;
2550 for (towrite = width; towrite; towrite -= wrote) 2601 for (towrite = width; towrite; towrite -= wrote)
… …
2601 /* convert normal newline chars into common keyboard Return key sequence */ 2652 /* convert normal newline chars into common keyboard Return key sequence */
2602 for (unsigned int i = 0; i < len; i++) 2653 for (unsigned int i = 0; i < len; i++)
2603 if (data[i] == C0_LF) 2654 if (data[i] == C0_LF)
2604 data[i] = C0_CR; 2655 data[i] = C0_CR;
2605 2656
2657 if (priv_modes & PrivMode_BracketPaste)
2658 tt_printf ("\e[200~");
2659
2606 tt_write (data, len); 2660 tt_write (data, len);
2661
2662 if (priv_modes & PrivMode_BracketPaste)
2663 tt_printf ("\e[201~");
2607} 2664}
2608 2665
2609/* ------------------------------------------------------------------------- */ 2666/* ------------------------------------------------------------------------- */
2610/* 2667/*
2611 * Respond to a notification that a primary selection has been sent 2668 * Respond to a notification that a primary selection has been sent
… …
2640 } 2697 }
2641 2698
2642 unsigned long bytes_after; 2699 unsigned long bytes_after;
2643 XTextProperty ct; 2700 XTextProperty ct;
2644 2701
2645 if (XGetWindowProperty (display->display, win, prop, 2702 if (XGetWindowProperty (dpy, win, prop,
2646 0, PROP_SIZE / 4, 2703 0, PROP_SIZE / 4,
2647 delete_prop, AnyPropertyType, 2704 delete_prop, AnyPropertyType,
2648 &ct.encoding, &ct.format, 2705 &ct.encoding, &ct.format,
2649 &ct.nitems, &bytes_after, 2706 &ct.nitems, &bytes_after,
2650 &ct.value) != Success) 2707 &ct.value) != Success)
… …
2659 if (bytes_after) 2716 if (bytes_after)
2660 { 2717 {
2661 // fetch and append remaining data 2718 // fetch and append remaining data
2662 XTextProperty ct2; 2719 XTextProperty ct2;
2663 2720
2664 if (XGetWindowProperty (display->display, win, prop, 2721 if (XGetWindowProperty (dpy, win, prop,
2665 ct.nitems / 4, (bytes_after + 3) / 4, 2722 ct.nitems / 4, (bytes_after + 3) / 4,
2666 delete_prop, AnyPropertyType, 2723 delete_prop, AnyPropertyType,
2667 &ct2.encoding, &ct2.format, 2724 &ct2.encoding, &ct2.format,
2668 &ct2.nitems, &bytes_after, 2725 &ct2.nitems, &bytes_after,
2669 &ct2.value) != Success) 2726 &ct2.value) != Success)
… …
2682 2739
2683 if (ct.encoding == xa[XA_INCR]) 2740 if (ct.encoding == xa[XA_INCR])
2684 { 2741 {
2685 // INCR selection, start handshake 2742 // INCR selection, start handshake
2686 if (!delete_prop) 2743 if (!delete_prop)
2687 XDeleteProperty (display->display, win, prop); 2744 XDeleteProperty (dpy, win, prop);
2688 2745
2689 selection_wait = Sel_incr; 2746 selection_wait = Sel_incr;
2690 incr_buf_fill = 0; 2747 incr_buf_fill = 0;
2691 incr_ev.start (NOW + 10); 2748 incr_ev.start (10);
2692 2749
2693 goto bailout; 2750 goto bailout;
2694 } 2751 }
2695 2752
2696 if (ct.nitems == 0) 2753 if (ct.nitems == 0)
… …
2705 ct.nitems = incr_buf_fill; 2762 ct.nitems = incr_buf_fill;
2706 incr_buf = 0; 2763 incr_buf = 0;
2707 incr_buf_size = 0; 2764 incr_buf_size = 0;
2708 incr_ev.stop (); 2765 incr_ev.stop ();
2709 } 2766 }
2710 else 2767 else
2711 { 2768 {
2712 if (selection_wait == Sel_normal 2769 if (selection_wait == Sel_normal
2713 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2770 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2714 { 2771 {
2715 /* 2772 /*
… …
2722 goto bailout; 2779 goto bailout;
2723 } 2780 }
2724 } 2781 }
2725 else if (selection_wait == Sel_incr) 2782 else if (selection_wait == Sel_incr)
2726 { 2783 {
2727 incr_ev.start (NOW + 10); 2784 incr_ev.start (10);
2728 2785
2729 while (incr_buf_fill + ct.nitems > incr_buf_size) 2786 while (incr_buf_fill + ct.nitems > incr_buf_size)
2730 { 2787 {
2731 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2788 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2732 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2789 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2739 } 2796 }
2740 2797
2741 char **cl; 2798 char **cl;
2742 int cr; 2799 int cr;
2743 2800
2744#if ENABLE_FRILLS 2801#if !ENABLE_MINIMAL
2745 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2802 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2746 // so recode it manually 2803 // so recode it manually
2747 if (ct.encoding == xa[XA_UTF8_STRING]) 2804 if (ct.encoding == xa[XA_UTF8_STRING])
2748 { 2805 {
2749 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2806 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2753 paste (s, strlen (s)); 2810 paste (s, strlen (s));
2754 free (s); 2811 free (s);
2755 } 2812 }
2756 else 2813 else
2757#endif 2814#endif
2758 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2815 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2759 && cl) 2816 && cl)
2760 { 2817 {
2761 for (int i = 0; i < cr; i++) 2818 for (int i = 0; i < cr; i++)
2762 paste (cl[i], strlen (cl[i])); 2819 paste (cl[i], strlen (cl[i]));
2763 2820
… …
2772 if (selection_wait == Sel_normal) 2829 if (selection_wait == Sel_normal)
2773 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2774} 2831}
2775 2832
2776void 2833void
2777rxvt_term::incr_cb (time_watcher &w) NOTHROW 2834rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2778{ 2835{
2779 selection_wait = Sel_none; 2836 selection_wait = Sel_none;
2780 2837
2781 incr_buf_size = 0; 2838 incr_buf_size = 0;
2782 free (incr_buf); 2839 free (incr_buf);
… …
2793 selection_paste (win, prop, true); 2850 selection_paste (win, prop, true);
2794} 2851}
2795 2852
2796/* ------------------------------------------------------------------------- */ 2853/* ------------------------------------------------------------------------- */
2797/* 2854/*
2798 * Request the current selection: 2855 * Request the current selection:
2799 * Order: > internal selection if available 2856 * Order: > internal selection if available
2800 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2857 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2801 * > CUT_BUFFER0 2858 * > CUT_BUFFER0
2802 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2859 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2803 * will auto fallback to CUT_BUFFER0 2860 * will auto fallback to CUT_BUFFER0
2804 * EXT: button 2 release 2861 * EXT: button 2 release
2805 */ 2862 */
2806void 2863void
2807rxvt_term::selection_request (Time tm, int selnum) NOTHROW 2864rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2808{ 2865{
2809/* After making a selection with selection_make this function will always 2866 if (selection.text && selnum == Sel_Primary)
2810 * return the internal selection, which is not correct IMO, now much more since 2867 {
2811 * I added the selnum parameter.
2812 */
2813#if 0
2814 if (selection.text)
2815 { /* internal selection */ 2868 /* internal selection */
2816 char *str = rxvt_wcstombs (selection.text, selection.len); 2869 char *str = rxvt_wcstombs (selection.text, selection.len);
2817 paste (str, strlen (str)); 2870 paste (str, strlen (str));
2818 free (str); 2871 free (str);
2819 return; 2872 return;
2820 } 2873 }
2821 else 2874 else
2822#endif
2823 { 2875 {
2824 selection_request_time = tm; 2876 selection_request_time = tm;
2825 selection_wait = Sel_normal; 2877 selection_wait = Sel_normal;
2826 2878
2827#if X_HAVE_UTF8_STRING 2879#if X_HAVE_UTF8_STRING
… …
2851 else if (selnum == Sel_Secondary) 2903 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2904 sel = XA_SECONDARY;
2853 else 2905 else
2854 sel = xa[XA_CLIPBOARD]; 2906 sel = xa[XA_CLIPBOARD];
2855 2907
2856 if (XGetSelectionOwner (display->display, sel) != None) 2908 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2909 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2910 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2911 vt, selection_request_time);
2860 return 1; 2912 return 1;
2861 } 2913 }
2862 2914
2863 return 0; 2915 return 0;
… …
2926 2978
2927 int end_col; 2979 int end_col;
2928 2980
2929 for (; row <= selection.end.row; row++, col = 0) 2981 for (; row <= selection.end.row; row++, col = 0)
2930 { 2982 {
2931#if ENABLE_FRILLS 2983#if !ENABLE_MINIMAL
2932 if (selection.rect) 2984 if (selection.rect)
2933 { 2985 {
2934 col = selection.beg.col; 2986 col = selection.beg.col;
2935 end_col = ncol + 1; 2987 end_col = ncol + 1;
2936 } 2988 }
… …
2939 end_col = ROW(row).l; 2991 end_col = ROW(row).l;
2940 2992
2941 col = max (col, 0); 2993 col = max (col, 0);
2942 2994
2943 if (row == selection.end.row 2995 if (row == selection.end.row
2944#if ENABLE_FRILLS 2996#if !ENABLE_MINIMAL
2945 || selection.rect 2997 || selection.rect
2946#endif 2998#endif
2947 ) 2999 )
2948 min_it (end_col, selection.end.col); 3000 min_it (end_col, selection.end.col);
2949 3001
… …
2972#endif 3024#endif
2973 else 3025 else
2974 new_selection_text[ofs++] = *t++; 3026 new_selection_text[ofs++] = *t++;
2975 } 3027 }
2976 3028
2977#if ENABLE_FRILLS 3029#if !ENABLE_MINIMAL
2978 if (selection.rect) 3030 if (selection.rect)
2979 { 3031 {
2980 while (ofs 3032 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3033 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3034 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3016bool 3068bool
3017rxvt_term::selection_grab (Time tm) NOTHROW 3069rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3070{
3019 selection_time = tm; 3071 selection_time = tm;
3020 3072
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3073 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3074 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3075 {
3024 display->set_selection_owner (this); 3076 display->set_selection_owner (this);
3025 return true; 3077 return true;
3026 } 3078 }
3027 else 3079 else
… …
3031 } 3083 }
3032 3084
3033#if 0 3085#if 0
3034 XTextProperty ct; 3086 XTextProperty ct;
3035 3087
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3088 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3089 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3090 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3091 XFree (ct.value);
3040 } 3092 }
3041#endif 3093#endif
… …
3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3139 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3088 3140
3089 while (selection.mark.col > 0 3141 while (selection.mark.col > 0
3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3142 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3091 --selection.mark.col; 3143 --selection.mark.col;
3092 3144
3093 if (selection.op) 3145 if (selection.op)
3146 {
3094 { /* clear the old selection */ 3147 /* clear the old selection */
3095 selection.beg.row = selection.end.row = selection.mark.row; 3148 selection.beg.row = selection.end.row = selection.mark.row;
3096 selection.beg.col = selection.end.col = selection.mark.col; 3149 selection.beg.col = selection.end.col = selection.mark.col;
3097 } 3150 }
3098 3151
3099 selection.op = SELECTION_INIT; 3152 selection.op = SELECTION_INIT;
… …
3288 * a point/word/line which is either the start or end of the selection 3341 * 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 3342 * and it was decided by whichever point/word/line was `fixed' at the
3290 * time of the most recent button3 press 3343 * time of the most recent button3 press
3291 */ 3344 */
3292 if (button3 && buttonpress) 3345 if (button3 && buttonpress)
3346 {
3293 { /* button3 press */ 3347 /* button3 press */
3294 /* 3348 /*
3295 * first determine which edge of the selection we are closest to 3349 * first determine which edge of the selection we are closest to
3296 */ 3350 */
3297 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3351 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3298 || (!ROWCOL_IS_AFTER (pos, selection.end) 3352 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3316 selection.mark.row = selection.beg.row; 3370 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3371 selection.mark.col = selection.beg.col;
3318 } 3372 }
3319 } 3373 }
3320 else 3374 else
3375 {
3321 { /* button1 drag or button3 drag */ 3376 /* button1 drag or button3 drag */
3322 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3377 if (ROWCOL_IS_AFTER (selection.mark, pos))
3323 { 3378 {
3324 if (selection.mark.row == selection.end.row 3379 if (selection.mark.row == selection.end.row
3325 && selection.mark.col == selection.end.col 3380 && selection.mark.col == selection.end.col
3326 && clickchange 3381 && clickchange
… …
3343 3398
3344 if (selection.clicks == 1) 3399 if (selection.clicks == 1)
3345 { 3400 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3401 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3402 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3403#if !ENABLE_MINIMAL
3349 && !selection.rect 3404 && !selection.rect
3350#endif 3405#endif
3351 ) 3406 )
3352 selection.beg.col = ncol; 3407 selection.beg.col = ncol;
3353 3408
3354 if ( 3409 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3410 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3411 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3412#if !ENABLE_MINIMAL
3358 && !selection.rect 3413 && !selection.rect
3359#endif 3414#endif
3360 ) 3415 )
3361 selection.end.col = ncol; 3416 selection.end.col = ncol;
3362 } 3417 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3424 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3425 }
3371 else if (selection.clicks == 3) 3426 else if (selection.clicks == 3)
3372 { 3427 {
3373#if ENABLE_FRILLS 3428#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3429 if (option (Opt_tripleclickwords))
3375 { 3430 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3431 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3432
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3433 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3434 {
3380 if (!ROW(end_row).is_longer ()) 3435 if (!ROW(end_row).is_longer ())
3381 { 3436 {
3382 selection.end.row = end_row; 3437 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3438 selection.end.col = ROW(end_row).l;
3439# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3440 selection_remove_trailing_spaces ();
3441# endif
3385 break; 3442 break;
3386 } 3443 }
3387 } 3444 }
3388 } 3445 }
3389 else 3446 else
… …
3405 selection.end.row++; 3462 selection.end.row++;
3406 } 3463 }
3407 } 3464 }
3408 3465
3409 if (button3 && buttonpress) 3466 if (button3 && buttonpress)
3467 {
3410 { /* mark may need to be changed */ 3468 /* mark may need to be changed */
3411 if (closeto == LEFT) 3469 if (closeto == LEFT)
3412 { 3470 {
3413 selection.mark.row = selection.end.row; 3471 selection.mark.row = selection.end.row;
3414 selection.mark.col = selection.end.col - (selection.clicks == 2); 3472 selection.mark.col = selection.end.col - (selection.clicks == 2);
3415 } 3473 }
… …
3418 selection.mark.row = selection.beg.row; 3476 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3477 selection.mark.col = selection.beg.col;
3420 } 3478 }
3421 } 3479 }
3422 3480
3423#if ENABLE_FRILLS 3481#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3482 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3483 ::swap (selection.beg.col, selection.end.col);
3426#endif 3484#endif
3427} 3485}
3428 3486
3429#if ENABLE_FRILLS 3487#if !ENABLE_MINIMAL
3430void 3488void
3431rxvt_term::selection_remove_trailing_spaces () NOTHROW 3489rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3490{
3433 int32_t end_col, end_row; 3491 int32_t end_col, end_row;
3434 text_t *stp; 3492 text_t *stp;
… …
3489 */ 3547 */
3490void 3548void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW 3549rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3550{
3493 XSelectionEvent ev; 3551 XSelectionEvent ev;
3494 dDisp;
3495 3552
3496 ev.type = SelectionNotify; 3553 ev.type = SelectionNotify;
3497 ev.property = None; 3554 ev.property = None;
3498 ev.display = rq.display; 3555 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3556 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3570 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3571#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3572 *target++ = xa[XA_UTF8_STRING];
3516#endif 3573#endif
3517 3574
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3575 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3576 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3577 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3578 ev.property = rq.property;
3522 } 3579 }
3523#if TODO // TODO 3580#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3583 /* TODO: Handle MULTIPLE */
3527 } 3584 }
3528#endif 3585#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3586 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3587 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3588 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3589 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3590 ev.property = rq.property;
3534 } 3591 }
3535 else if (rq.target == XA_STRING 3592 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3593 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3617 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3618 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3619 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3620 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3621 style = enc_compound_text;
3565#if ENABLE_FRILLS 3622#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3623 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3624 style = enc_utf8;
3568#endif 3625#endif
3569 else 3626 else
3570 { 3627 {
… …
3581 { 3638 {
3582 cl = L""; 3639 cl = L"";
3583 selectlen = 0; 3640 selectlen = 0;
3584 } 3641 }
3585 3642
3586#if ENABLE_FRILLS 3643#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3644 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3645 // so recode it manually
3589 if (style == enc_utf8) 3646 if (style == enc_utf8)
3590 { 3647 {
3591 freect = 1; 3648 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3651 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3652 ct.nitems = strlen ((char *)ct.value);
3596 } 3653 }
3597 else 3654 else
3598#endif 3655#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3656 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3657 freect = 1;
3601 else 3658 else
3602 { 3659 {
3603 /* if we failed to convert then send it raw */ 3660 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3661 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3662 ct.nitems = selectlen;
3606 ct.encoding = target; 3663 ct.encoding = target;
3607 } 3664 }
3608 3665
3609 XChangeProperty (disp, rq.requestor, rq.property, 3666 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3667 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3668 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3669 ev.property = rq.property;
3613 3670
3614 if (freect) 3671 if (freect)
3615 XFree (ct.value); 3672 XFree (ct.value);
3616 } 3673 }
3617 3674
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3675 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} 3676}
3636 3677
3637/* ------------------------------------------------------------------------- */ 3678/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3679#ifdef USE_XIM
3639void 3680void
3640rxvt_term::im_set_position (XPoint &pos) NOTHROW 3681rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3682{
3642 XWindowAttributes xwa; 3683 XWindowAttributes xwa;
3643 3684
3644 XGetWindowAttributes (display->display, vt, &xwa); 3685 XGetWindowAttributes (dpy, vt, &xwa);
3645 3686
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3687 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3688 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3689}
3649#endif 3690#endif
… …
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW 3786rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3787{
3747 while (*s) 3788 while (*s)
3748 { 3789 {
3749 text_t t = *s++; 3790 text_t t = *s++;
3750 int width = wcwidth (t); 3791 int width = WCWIDTH (t);
3751 3792
3752 while (width--) 3793 while (width--)
3753 { 3794 {
3754 scr_overlay_set (x++, y, t); 3795 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3796 t = NOCHAR;

Diff Legend

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