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.236 by root, Wed Jan 18 09:40:53 2006 UTC vs.
Revision 1.289 by root, Fri Dec 14 05:25:26 2007 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 113 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 114 * ------------------------------------------------------------------------- */
117 115
118/* Fill part/all of a line with blanks. */ 116/* Fill part/all of a line with blanks. */
119void 117void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const 118rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 119{
122 if (!l.t) 120 if (!l.t)
123 { 121 {
124 lalloc (l); 122 lalloc (l);
125 col = 0; 123 col = 0;
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
… …
142} 140}
143 141
144/* ------------------------------------------------------------------------- */ 142/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 143/* Fill a full line with blanks - make sure it is allocated first */
146void 144void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const 145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 146{
149 scr_blank_line (l, 0, ncol, efs); 147 scr_blank_line (l, 0, ncol, efs);
150 148
151 l.l = 0; 149 l.l = 0;
152 l.f = 0; 150 l.f = 0;
… …
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 CLEAR_ALL_SELECTION ();
240 rvideo = 0;
241 } 241 }
242 else 242 else
243 { 243 {
244 /* 244 /*
245 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
274 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);
275 } 275 }
276 276
277 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
278 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));
279 279
280 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
281 int pend = MOD (term_start + top_row , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
283 283
284 if (top_row) 284 if (top_row)
285 { 285 {
286 // 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
287 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 288
289 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 291
… …
325 qline->l = ncol; 325 qline->l = ncol;
326 qline->is_longer (1); 326 qline->is_longer (1);
327 327
328 int qcol = 0; 328 int qcol = 0;
329 329
330 // see below for cursor adjustment rationale
331 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow);
333
330 // fill a single destination line 334 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
332 { 336 {
333 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
344 348
345 line_t &pline = old_buf [prow]; 349 line_t &pline = old_buf [prow];
346 350
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 352
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 355
355 lofs += len; 356 lofs += len;
356 qcol += len; 357 qcol += len;
… …
363 } 364 }
364 while (p != pend && q > 0); 365 while (p != pend && q > 0);
365 366
366 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
367 top_row = q - term_start; 368 top_row = q - term_start;
368 369
369 // make sure all terminal lines exist 370 // make sure all terminal lines exist
370 while (top_row > 0) 371 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 373 }
373 else 374 else
374 { 375 {
375 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
376 377
377 for (int row = min (nrow, prev_nrow); row--; ) 378 for (int row = min (nrow, prev_nrow); row--; )
378 { 379 {
379 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)];
380 line_t &qline = row_buf [row]; 381 line_t &qline = row_buf [row];
381 382
… …
389 } 390 }
390 391
391 term_start = 0; 392 term_start = 0;
392 } 393 }
393 394
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 395 free (old_buf);
400 delete old_ta; 396 delete old_ta;
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 }
404
405 CLEAR_ALL_SELECTION ();
409 406
410 prev_nrow = nrow; 407 prev_nrow = nrow;
411 prev_ncol = ncol; 408 prev_ncol = ncol;
412 409
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol);
414 411
415 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
417 414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417
418 tt_winch (); 418 tt_winch ();
419 419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 421}
422 422
423/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
424/* 424/*
425 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
426 */ 426 */
427void 427void
428rxvt_term::scr_release () 428rxvt_term::scr_release () NOTHROW
429{ 429{
430 if (row_buf)
431 {
430 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
432 434
433 free (row_buf); 435 free (row_buf);
434 free (swap_buf); 436 free (swap_buf);
435 free (drawn_buf); 437 free (drawn_buf);
436 free (tabs); 438 free (tabs);
437 439
438 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
441 }
439} 442}
440 443
441/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
442/* 445/*
443 * Hard reset 446 * Hard reset
… …
460 * Save and Restore cursor 463 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 464 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 465 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 466 */
464void 467void
465rxvt_term::scr_cursor (int mode) 468rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 469{
467 screen_t *s; 470 screen_t *s;
468 471
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 472#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 473 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
504#endif 507#endif
505} 508}
506 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
507/* ------------------------------------------------------------------------- */ 525/* ------------------------------------------------------------------------- */
508/* 526/*
509 * Swap between primary and secondary screens 527 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 528 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 529 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 530 */
513int 531void
514rxvt_term::scr_change_screen (int scrn) 532rxvt_term::scr_change_screen (int scrn)
515{ 533{
534 if (scrn == current_screen)
535 return;
536
516 want_refresh = 1; 537 want_refresh = 1;
517 view_start = 0; 538 view_start = 0;
518 539
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
523 541
524 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
525 543
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531
532#if NSCREENS 544#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
534 { 546 {
535 num_scr = 0; 547 num_scr = 0;
536 548
537 for (int i = prev_nrow; i--; ) 549 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 550
540 ::swap (screen.charset, swap.charset); 551 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 552 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
544 } 555 }
545 else 556 else
546#endif 557#endif
547 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 560}
552 561
553// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
554void 563void
555rxvt_term::scr_do_wrap () 564rxvt_term::scr_do_wrap () NOTHROW
556{ 565{
557 if (!(screen.flags & Screen_WrapNext)) 566 if (!(screen.flags & Screen_WrapNext))
558 return; 567 return;
559 568
560 screen.flags &= ~Screen_WrapNext; 569 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 579/* ------------------------------------------------------------------------- */
571/* 580/*
572 * Change the colour for following text 581 * Change the colour for following text
573 */ 582 */
574void 583void
575rxvt_term::scr_color (unsigned int color, int fgbg) 584rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 585{
577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 586 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 587 color = fgbg;
579 588
580 if (fgbg == Color_fg) 589 if (fgbg == Color_fg)
… …
586/* ------------------------------------------------------------------------- */ 595/* ------------------------------------------------------------------------- */
587/* 596/*
588 * Change the rendition style for following text 597 * Change the rendition style for following text
589 */ 598 */
590void 599void
591rxvt_term::scr_rendition (int set, int style) 600rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 601{
593 if (set) 602 if (set)
594 rstyle |= style; 603 rstyle |= style;
595 else if (style == ~RS_None) 604 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
597 else 606 else
598 rstyle &= ~style; 607 rstyle &= ~style;
599 } 608}
600 609
601/* ------------------------------------------------------------------------- */ 610/* ------------------------------------------------------------------------- */
602/* 611/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 613 * count positive ==> scroll up
605 * count negative ==> scroll down 614 * count negative ==> scroll down
606 */ 615 */
607int 616int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 617rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 618{
610 if (count == 0 || (row1 > row2)) 619 if (count == 0 || (row1 > row2))
611 return 0; 620 return 0;
612 621
613 want_refresh = 1; 622 want_refresh = 1;
614 num_scr += count; 623 num_scr += count;
615 624
616 if (count > 0 625 if (count > 0
617 && row1 == 0 626 && row1 == 0
618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
619 { 628 {
620 top_row = max (top_row - count, -saveLines); 629 top_row = max (top_row - count, -saveLines);
621 630
622 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
623 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
… …
630 } 639 }
631 640
632 // erase newly scrolled-in lines 641 // erase newly scrolled-in lines
633 for (int i = count; i--; ) 642 for (int i = count; i--; )
634 { 643 {
635 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines
637 line_t &l = ROW(row2 - i); 644 line_t &l = ROW(nrow - 1 - i);
638 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 {
639 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
640
641 l.l = 0; 651 l.l = 0;
642 l.f = 0; 652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
643 } 656 }
644 657
645 // now copy lines below the scroll region bottom to the 658 // now copy lines below the scroll region bottom to the
646 // bottom of the screen again, so they look as if they 659 // bottom of the screen again, so they look as if they
647 // hadn't moved. 660 // hadn't moved.
… …
651 line_t &l2 = ROW(i); 664 line_t &l2 = ROW(i);
652 665
653 ::swap (l1, l2); 666 ::swap (l1, l2);
654 l2.touch (); 667 l2.touch ();
655 } 668 }
656 669
657 // move and/or clear selection, if any 670 // move and/or clear selection, if any
658 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
659 { 672 {
660 selection.beg.row -= count; 673 selection.beg.row -= count;
661 selection.end.row -= count; 674 selection.end.row -= count;
… …
669 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
670 } 683 }
671 } 684 }
672 685
673 // finally move the view window, if desired 686 // finally move the view window, if desired
674 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
675 && view_start != 0 688 && view_start != 0
676 && view_start != -saveLines) 689 && view_start != -saveLines)
677 scr_page (UP, count); 690 scr_page (UP, count);
678 691
679 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
697 { 710 {
698 /* move selected region too */ 711 /* move selected region too */
699 selection.beg.row -= count; 712 selection.beg.row -= count;
700 selection.end.row -= count; 713 selection.end.row -= count;
701 selection.mark.row -= count; 714 selection.mark.row -= count;
702 715
703 selection_check (0); 716 selection_check (0);
704 } 717 }
705 } 718 }
706 719
707 // use a simple and robust scrolling algorithm, this 720 // use a simple and robust scrolling algorithm, this
… …
731/* ------------------------------------------------------------------------- */ 744/* ------------------------------------------------------------------------- */
732/* 745/*
733 * Add text given in <str> of length <len> to screen struct 746 * Add text given in <str> of length <len> to screen struct
734 */ 747 */
735void 748void
736rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
737{ 750{
738 if (len <= 0) /* sanity */ 751 if (len <= 0) /* sanity */
739 return; 752 return;
740 753
741 unsigned char checksel; 754 unsigned char checksel;
… …
747 ZERO_SCROLLBACK (); 760 ZERO_SCROLLBACK ();
748 761
749 if (minlines > 0) 762 if (minlines > 0)
750 { 763 {
751 minlines += screen.cur.row - screen.bscroll; 764 minlines += screen.cur.row - screen.bscroll;
765 min_it (minlines, screen.cur.row - top_row);
752 766
753 if (minlines > 0 767 if (minlines > 0
754 && screen.tscroll == 0 768 && screen.tscroll == 0
755 && screen.bscroll == nrow - 1) 769 && screen.bscroll == nrow - 1)
756 { 770 {
… …
818 } 832 }
819 833
820 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
821 { 835 {
822 scr_do_wrap (); 836 scr_do_wrap ();
823 837
824 line->l = ncol; 838 line->l = ncol;
825 line->is_longer (1); 839 line->is_longer (1);
826 840
827 row = screen.cur.row; 841 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
… …
830 844
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
833 c = 0xfffd; 847 c = 0xfffd;
834 848
835 // 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
836 // do wcwidth before further replacements, as wcwidth might return -1 850 // further replacements, as wcwidth might return -1 for the line
837 // 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
838 // locale. 852 // locale.
839 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
840 854
841 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
842 { 856 {
843 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
995/* 1009/*
996 * Process Backspace. Move back the cursor back a position, wrap if have to 1010 * Process Backspace. Move back the cursor back a position, wrap if have to
997 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
998 */ 1012 */
999void 1013void
1000rxvt_term::scr_backspace () 1014rxvt_term::scr_backspace () NOTHROW
1001{ 1015{
1002 want_refresh = 1; 1016 want_refresh = 1;
1003 1017
1004 if (screen.cur.col == 0) 1018 if (screen.cur.col == 0)
1005 { 1019 {
… …
1023 * Process Horizontal Tab 1037 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
1026 */ 1040 */
1027void 1041void
1028rxvt_term::scr_tab (int count, bool ht) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
1029{ 1043{
1030 int i, x; 1044 int i, x;
1031 1045
1032 want_refresh = 1; 1046 want_refresh = 1;
1033 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
… …
1046 x = i; 1060 x = i;
1047 1061
1048 if (!--count) 1062 if (!--count)
1049 break; 1063 break;
1050 } 1064 }
1051 else 1065 else
1052 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1053 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1054 1068
1055 if (count) 1069 if (count)
1056 x = ncol - 1; 1070 x = ncol - 1;
1057 1071
1058 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1059 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1060 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1061 { 1075 {
1062 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1063 1077
1064 l.touch (x); 1078 l.touch (x);
1065 1079
… …
1098 * Process DEC Back Index 1112 * Process DEC Back Index
1099 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1100 * 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
1101 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1102 */ 1116 */
1103#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1104void 1118void
1105rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1106{ 1120{
1107 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1108 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1109 else 1123 else
1110 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
… …
1115 * Process DEC Forward Index 1129 * Process DEC Forward Index
1116 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1117 * 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
1118 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1119 */ 1133 */
1120#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1121void 1135void
1122rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1123{ 1137{
1124 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1126 else 1140 else
1127 { 1141 {
… …
1140/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1141/* 1155/*
1142 * Goto Row/Column 1156 * Goto Row/Column
1143 */ 1157 */
1144void 1158void
1145rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1146{ 1160{
1147 want_refresh = 1; 1161 want_refresh = 1;
1148 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1149 1163
1150 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1172 } 1186 }
1173 } 1187 }
1174 else 1188 else
1175 { 1189 {
1176 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1177 { /* relative origin mode */ 1192 /* relative origin mode */
1178 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1179 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1180 } 1195 }
1181 else 1196 else
1182 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1188/* ------------------------------------------------------------------------- */ 1203/* ------------------------------------------------------------------------- */
1189/* 1204/*
1190 * direction should be UP or DN 1205 * direction should be UP or DN
1191 */ 1206 */
1192void 1207void
1193rxvt_term::scr_index (enum page_dirn direction) 1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1194{ 1209{
1195 int dirn; 1210 int dirn;
1196 1211
1197 want_refresh = 1; 1212 want_refresh = 1;
1198 ZERO_SCROLLBACK (); 1213 ZERO_SCROLLBACK ();
… …
1217 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1218 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1219 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1220 */ 1235 */
1221void 1236void
1222rxvt_term::scr_erase_line (int mode) 1237rxvt_term::scr_erase_line (int mode) NOTHROW
1223{ 1238{
1224 unsigned int col, num; 1239 unsigned int col, num;
1225 1240
1226 want_refresh = 1; 1241 want_refresh = 1;
1227 ZERO_SCROLLBACK (); 1242 ZERO_SCROLLBACK ();
… …
1271 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1286 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1272 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1287 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1273 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1288 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1274 */ 1289 */
1275void 1290void
1276rxvt_term::scr_erase_screen (int mode) 1291rxvt_term::scr_erase_screen (int mode) NOTHROW
1277{ 1292{
1278 int num; 1293 int num;
1279 int32_t row; 1294 int32_t row;
1280 rend_t ren; 1295 rend_t ren;
1281 XGCValues gcvalue; 1296 XGCValues gcvalue;
… …
1326 } 1341 }
1327 else 1342 else
1328 { 1343 {
1329 ren = rstyle & (RS_fgMask | RS_bgMask); 1344 ren = rstyle & (RS_fgMask | RS_bgMask);
1330 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1345 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1331 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1332 ERASE_ROWS (row, num); 1347 ERASE_ROWS (row, num);
1333 gcvalue.foreground = pix_colors[Color_fg]; 1348 gcvalue.foreground = pix_colors[Color_fg];
1334 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1349 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1335 } 1350 }
1336 1351
1337 for (; num--; row++) 1352 for (; num--; row++)
1338 { 1353 {
1339 scr_blank_screen_mem (ROW(row), rstyle); 1354 scr_blank_screen_mem (ROW(row), rstyle);
1340 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1355 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1341 } 1356 }
1342} 1357}
1343 1358
1344#if ENABLE_FRILLS 1359#if !ENABLE_MINIMAL
1345void 1360void
1346rxvt_term::scr_erase_savelines () 1361rxvt_term::scr_erase_savelines () NOTHROW
1347{ 1362{
1348 want_refresh = 1; 1363 want_refresh = 1;
1349 ZERO_SCROLLBACK (); 1364 ZERO_SCROLLBACK ();
1350 1365
1351 top_row = 0; 1366 top_row = 0;
… …
1356/* 1371/*
1357 * Fill the screen with `E's 1372 * Fill the screen with `E's
1358 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1373 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1359 */ 1374 */
1360void 1375void
1361rxvt_term::scr_E () 1376rxvt_term::scr_E () NOTHROW
1362{ 1377{
1363 rend_t fs; 1378 rend_t fs;
1364 1379
1365 want_refresh = 1; 1380 want_refresh = 1;
1366 ZERO_SCROLLBACK (); 1381 ZERO_SCROLLBACK ();
… …
1387/* ------------------------------------------------------------------------- */ 1402/* ------------------------------------------------------------------------- */
1388/* 1403/*
1389 * Insert/Delete <count> lines 1404 * Insert/Delete <count> lines
1390 */ 1405 */
1391void 1406void
1392rxvt_term::scr_insdel_lines (int count, int insdel) 1407rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1393{ 1408{
1394 int end; 1409 int end;
1395 1410
1396 ZERO_SCROLLBACK (); 1411 ZERO_SCROLLBACK ();
1397 1412
… …
1417/* ------------------------------------------------------------------------- */ 1432/* ------------------------------------------------------------------------- */
1418/* 1433/*
1419 * Insert/Delete <count> characters from the current position 1434 * Insert/Delete <count> characters from the current position
1420 */ 1435 */
1421void 1436void
1422rxvt_term::scr_insdel_chars (int count, int insdel) 1437rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1423{ 1438{
1424 int col, row; 1439 int col, row;
1425 rend_t tr; 1440 rend_t tr;
1426 1441
1427 want_refresh = 1; 1442 want_refresh = 1;
… …
1458 { 1473 {
1459 if (selection.end.row != screen.cur.row 1474 if (selection.end.row != screen.cur.row
1460 || (selection.end.col + count >= ncol)) 1475 || (selection.end.col + count >= ncol))
1461 CLEAR_SELECTION (); 1476 CLEAR_SELECTION ();
1462 else 1477 else
1478 {
1463 { /* shift selection */ 1479 /* shift selection */
1464 selection.beg.col += count; 1480 selection.beg.col += count;
1465 selection.mark.col += count; /* XXX: yes? */ 1481 selection.mark.col += count; /* XXX: yes? */
1466 selection.end.col += count; 1482 selection.end.col += count;
1467 } 1483 }
1468 } 1484 }
… …
1515/* 1531/*
1516 * Set the scrolling region 1532 * Set the scrolling region
1517 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1518 */ 1534 */
1519void 1535void
1520rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1521{ 1537{
1522 max_it (top, 0); 1538 max_it (top, 0);
1523 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1524 1540
1525 if (top > bot) 1541 if (top > bot)
… …
1535 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1536 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1537 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1538 */ 1554 */
1539void 1555void
1540rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1541{ 1557{
1542 want_refresh = 1; 1558 want_refresh = 1;
1543 1559
1544 if (mode) 1560 if (mode)
1545 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1552 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1553 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1554 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1555 */ 1571 */
1556void 1572void
1557rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1558{ 1574{
1559 if (mode) 1575 if (mode)
1560 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1561 else 1577 else
1562 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1571 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1572 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1573 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1574 */ 1590 */
1575void 1591void
1576rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1577{ 1593{
1578 if (mode) 1594 if (mode)
1579 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1580 else 1596 else
1581 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1588 * Set insert/replace mode 1604 * Set insert/replace mode
1589 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1590 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1591 */ 1607 */
1592void 1608void
1593rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1594{ 1610{
1595 if (mode) 1611 if (mode)
1596 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1597 else 1613 else
1598 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1604 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1605 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1606 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1607 */ 1623 */
1608void 1624void
1609rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1610{ 1626{
1611 if (mode < 0) 1627 if (mode < 0)
1612 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol);
1613 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1614 tabs [screen.cur.col] = !!mode; 1630 tabs [screen.cur.col] = !!mode;
1615} 1631}
1616 1632
1617/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
… …
1619 * Set reverse/normal video 1635 * Set reverse/normal video
1620 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1621 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1622 */ 1638 */
1623void 1639void
1624rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1625{ 1641{
1626 XGCValues gcvalue; 1642 rvideo_mode = on;
1627 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1628 if (rvideo != mode) 1648 if (rvideo_state != on)
1629 { 1649 {
1630 rvideo = mode; 1650 rvideo_state = on;
1651
1631 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1632#if XPM_BACKGROUND 1653#ifdef HAVE_BG_PIXMAP
1633 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1634#endif 1655#endif
1635#if TRANSPARENT 1656 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1636 if (! OPTION (Opt_transparent) || am_transparent == 0)
1637#endif
1638 XSetWindowBackground (display->display, vt,
1639 pix_colors[Color_bg]);
1640 1657
1658 XGCValues gcvalue;
1641 gcvalue.foreground = pix_colors[Color_fg]; 1659 gcvalue.foreground = pix_colors[Color_fg];
1642 gcvalue.background = pix_colors[Color_bg]; 1660 gcvalue.background = pix_colors[Color_bg];
1643 XChangeGC (display->display, gc, GCBackground | GCForeground, 1661 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1644 &gcvalue); 1662
1645 scr_clear (); 1663 scr_clear ();
1646 scr_touch (true); 1664 scr_touch (true);
1647 } 1665 }
1648} 1666}
1649 1667
… …
1651/* 1669/*
1652 * Report current cursor position 1670 * Report current cursor position
1653 * XTERM_SEQ: Report position: ESC [ 6 n 1671 * XTERM_SEQ: Report position: ESC [ 6 n
1654 */ 1672 */
1655void 1673void
1656rxvt_term::scr_report_position () 1674rxvt_term::scr_report_position () NOTHROW
1657{ 1675{
1658 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1676 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1659} 1677}
1660 1678
1661/* ------------------------------------------------------------------------- * 1679/* ------------------------------------------------------------------------- *
… …
1664 1682
1665/* 1683/*
1666 * Set font style 1684 * Set font style
1667 */ 1685 */
1668void 1686void
1669rxvt_term::set_font_style () 1687rxvt_term::set_font_style () NOTHROW
1670{ 1688{
1671#if 0 1689#if 0
1672 switch (charsets [screen.charset]) 1690 switch (charsets [screen.charset])
1673 { 1691 {
1674 case '0': /* DEC Special Character & Line Drawing Set */ 1692 case '0': /* DEC Special Character & Line Drawing Set */
… …
1696 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1714 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1697 * XTERM_SEQ: Invoke G2 character set: ESC N 1715 * XTERM_SEQ: Invoke G2 character set: ESC N
1698 * XTERM_SEQ: Invoke G3 character set: ESC O 1716 * XTERM_SEQ: Invoke G3 character set: ESC O
1699 */ 1717 */
1700void 1718void
1701rxvt_term::scr_charset_choose (int set) 1719rxvt_term::scr_charset_choose (int set) NOTHROW
1702{ 1720{
1703 screen.charset = set; 1721 screen.charset = set;
1704 set_font_style (); 1722 set_font_style ();
1705} 1723}
1706 1724
… …
1712 * XTERM_SEQ: Set G2 character set: ESC * <C> 1730 * XTERM_SEQ: Set G2 character set: ESC * <C>
1713 * XTERM_SEQ: Set G3 character set: ESC + <C> 1731 * XTERM_SEQ: Set G3 character set: ESC + <C>
1714 * See set_font_style for possible values for <C> 1732 * See set_font_style for possible values for <C>
1715 */ 1733 */
1716void 1734void
1717rxvt_term::scr_charset_set (int set, unsigned int ch) 1735rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1718{ 1736{
1719 charsets[set] = (unsigned char)ch; 1737 charsets[set] = (unsigned char)ch;
1720 set_font_style (); 1738 set_font_style ();
1721} 1739}
1722 1740
… …
1727 1745
1728/* 1746/*
1729 * refresh matching text. 1747 * refresh matching text.
1730 */ 1748 */
1731bool 1749bool
1732rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1750rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1733{ 1751{
1734 bool found = false; 1752 bool found = false;
1735 1753
1736 for (int i = 0; i < nrow; i++) 1754 for (int i = 0; i < nrow; i++)
1737 { 1755 {
1738 int col = 0;
1739 rend_t *drp = drawn_buf[i].r; 1756 rend_t *drp = drawn_buf[i].r;
1740 1757
1741 for (; col < ncol; col++, drp++) 1758 for (int col = 0; col < ncol; col++, drp++)
1742 if ((*drp & mask) == value) 1759 if ((*drp & mask) == value)
1743 { 1760 {
1744 found = true; 1761 found = true;
1745 *drp = ~value; 1762 *drp = ~value;
1746 } 1763 }
… …
1757 PART_END, 1774 PART_END,
1758 RC_COUNT 1775 RC_COUNT
1759}; 1776};
1760 1777
1761void 1778void
1762rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1763{ 1780{
1764 int i; 1781 int i;
1765 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1766 1783
1767 if (!drawn_buf) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
… …
1786 for (i = PART_BEG; i < RC_COUNT; i++) 1803 for (i = PART_BEG; i < RC_COUNT; i++)
1787 { 1804 {
1788 min_it (rc[i].col, ncol - 1); 1805 min_it (rc[i].col, ncol - 1);
1789 min_it (rc[i].row, nrow - 1); 1806 min_it (rc[i].row, nrow - 1);
1790 } 1807 }
1791 1808// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1792 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++)
1793 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);
1794 1811
1795 num_scr_allow = 0; 1812 num_scr_allow = 0;
1796 1813
… …
1801/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1802/* 1819/*
1803 * Refresh the entire screen 1820 * Refresh the entire screen
1804 */ 1821 */
1805void 1822void
1806rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1807{ 1824{
1808 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1809} 1826}
1810 1827
1811/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1812/* 1829/*
1813 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1814 * the top of the screen 1831 * the top of the screen
1815 */ 1832 */
1816void 1833void
1817rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1818{ 1835{
1819 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1820} 1837}
1821 1838
1822/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1823/* 1840/*
1824 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1825 * direction should be UP or DN 1842 * direction should be UP or DN
1826 */ 1843 */
1827bool 1844bool
1828rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1829{ 1846{
1830 int new_view_start = 1847 int new_view_start =
1831 direction == UP ? view_start - nlines 1848 direction == UP ? view_start - nlines
1832 : view_start + nlines; 1849 : view_start + nlines;
1833 1850
1834 return scr_changeview (new_view_start); 1851 return scr_changeview (new_view_start);
1835} 1852}
1836 1853
1837bool 1854bool
1838rxvt_term::scr_changeview (int new_view_start) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1839{ 1856{
1840 clamp_it (new_view_start, top_row, 0); 1857 clamp_it (new_view_start, top_row, 0);
1841 1858
1842 if (new_view_start == view_start) 1859 if (new_view_start == view_start)
1843 return false; 1860 return false;
… …
1849 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));
1850 1867
1851 return true; 1868 return true;
1852} 1869}
1853 1870
1854/* ------------------------------------------------------------------------- */ 1871#ifndef NO_BELL
1855void 1872void
1873rxvt_term::bell_cb (ev::timer &w, int revents)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1856rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1857{ 1883{
1858#ifndef NO_BELL 1884#ifndef NO_BELL
1859 1885
1860# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1861# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1862 if (OPTION (Opt_mapAlert)) 1888 if (option (Opt_mapAlert))
1863# endif 1889# endif
1864 XMapWindow (display->display, parent[0]); 1890 XMapWindow (dpy, parent[0]);
1865# endif 1891# endif
1866 1892
1867 if (OPTION (Opt_visualBell)) 1893# if ENABLE_FRILLS
1894 if (option (Opt_urgentOnBell))
1895 {
1896 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints (dpy, parent[0], h);
1900 }
1868 { 1901 }
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1902# endif
1903
1904 if (option (Opt_visualBell))
1905 {
1906 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode);
1870 display->flush (); 1908 display->flush ();
1909
1871 rxvt_usleep (VISUAL_BELL_DURATION); 1910 bell_ev.start (VISUAL_BELL_DURATION);
1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1873 } 1911 }
1874 else 1912 else
1875 XBell (display->display, 0); 1913 XBell (dpy, 0);
1876
1877#endif 1914#endif
1878} 1915}
1879 1916
1880/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1881/* ARGSUSED */ 1918/* ARGSUSED */
1882void 1919void
1883rxvt_term::scr_printscreen (int fullhist) 1920rxvt_term::scr_printscreen (int fullhist) NOTHROW
1884{ 1921{
1885#ifdef PRINTPIPE 1922#ifdef PRINTPIPE
1886 int nrows, row_start; 1923 int nrows, row_start;
1887 FILE *fd; 1924 FILE *fd;
1888 1925
… …
1937 * Refresh the screen 1974 * Refresh the screen
1938 * drawn_text/drawn_rend contain the screen information before the update. 1975 * drawn_text/drawn_rend contain the screen information before the update.
1939 * screen.text/screen.rend contain what the screen will change to. 1976 * screen.text/screen.rend contain what the screen will change to.
1940 */ 1977 */
1941void 1978void
1942rxvt_term::scr_refresh () 1979rxvt_term::scr_refresh () NOTHROW
1943{ 1980{
1944 unsigned char must_clear, /* use draw_string not draw_image_string */ 1981 unsigned char have_bg,
1945 showcursor; /* show the cursor */ 1982 showcursor; /* show the cursor */
1946 int16_t col, row, /* column/row we're processing */ 1983 int16_t col, row, /* column/row we're processing */
1947 ocrow; /* old cursor row */ 1984 ocrow; /* old cursor row */
1948 int i; /* tmp */ 1985 int i; /* tmp */
1949#ifndef NO_CURSORCOLOR 1986#ifndef NO_CURSORCOLOR
1950 rend_t cc1; /* store colours at cursor position (s) */ 1987 rend_t cc1; /* store colours at cursor position (s) */
1951#endif 1988#endif
1952 rend_t *crp; // cursor rendition pointer 1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */
1953 1992
1954 want_refresh = 0; /* screen is current */ 1993 want_refresh = 0; /* screen is current */
1955 1994
1956 if (refresh_type == NO_REFRESH || !mapped) 1995 if (refresh_type == NO_REFRESH || !mapped)
1957 return; 1996 return;
1958 1997
1959 /* 1998 /*
1960 * A: set up vars 1999 * A: set up vars
1961 */ 2000 */
1962 must_clear = 0; 2001 have_bg = 0;
1963 refresh_count = 0; 2002 refresh_count = 0;
1964 2003
1965#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
1966 must_clear |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
1967#endif
1968#if TRANSPARENT
1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1970#endif 2006#endif
1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1972 2008
1973 /* 2009 /*
1974 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
1978 /* 2014 /*
1979 * C: set the cursor character (s) 2015 * C: set the cursor character (s)
1980 */ 2016 */
1981 { 2017 {
1982 unsigned char setoldcursor; 2018 unsigned char setoldcursor;
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1985 2019
1986 showcursor = (screen.flags & Screen_VisibleCursor); 2020 showcursor = (screen.flags & Screen_VisibleCursor);
1987#ifdef CURSOR_BLINK 2021#ifdef CURSOR_BLINK
1988 if (hidden_cursor) 2022 if (hidden_cursor)
1989 showcursor = 0; 2023 showcursor = 0;
… …
1996 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1997 col--; 2031 col--;
1998 2032
1999 crp = &ROW(screen.cur.row).r[col]; 2033 crp = &ROW(screen.cur.row).r[col];
2000 2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046
2047#ifndef NO_CURSORCOLOR
2048 if (ISSET_PIXCOLOR (Color_cursor2))
2049 ccol2 = Color_cursor2;
2050 else
2051#endif
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057
2001 if (showcursor && focus) 2058 if (showcursor && focus)
2002 { 2059 {
2003 if (OPTION (Opt_cursorUnderline)) 2060 if (option (Opt_cursorUnderline))
2004 *crp ^= RS_Uline; 2061 *crp ^= RS_Uline;
2005 else 2062 else
2006 { 2063 {
2007 *crp ^= RS_RVid; 2064 *crp ^= RS_RVid;
2008
2009#ifndef NO_CURSORCOLOR
2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
2011 if (ISSET_PIXCOLOR (Color_cursor))
2012 ccol1 = Color_cursor;
2013 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol1 = fgcolor_of (rstyle);
2016#else
2017 ccol1 = Color_fg;
2018#endif
2019 if (ISSET_PIXCOLOR (Color_cursor2))
2020 ccol2 = Color_cursor2;
2021 else
2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2023 ccol2 = bgcolor_of (rstyle);
2024#else
2025 ccol2 = Color_bg;
2026#endif
2027 *crp = SET_FGCOLOR (*crp, ccol1); 2065 *crp = SET_FGCOLOR (*crp, ccol1);
2028 *crp = SET_BGCOLOR (*crp, ccol2); 2066 *crp = SET_BGCOLOR (*crp, ccol2);
2029#endif
2030 } 2067 }
2031 } 2068 }
2032 } 2069 }
2033 2070
2034 /* make sure no outline cursor is left around */ 2071 /* make sure no outline cursor is left around */
… …
2073 * D: CopyArea pass - very useful for slower links 2110 * D: CopyArea pass - very useful for slower links
2074 * This has been deliberately kept simple. 2111 * This has been deliberately kept simple.
2075 */ 2112 */
2076 if (!display->is_local 2113 if (!display->is_local
2077 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2114 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2078 && abs (num_scr) < nrow && !must_clear) 2115 && abs (num_scr) < nrow && !have_bg)
2079 { 2116 {
2080 int16_t nits; 2117 int16_t nits;
2118 int i = num_scr;
2081 int j; 2119 int j;
2082 int len, wlen; 2120 int len, wlen;
2083 dLocal (int, num_scr); 2121 dLocal (int, num_scr);
2084 2122
2085 j = nrow; 2123 j = nrow;
2086 wlen = len = -1; 2124 wlen = len = -1;
2087 row = i > 0 ? 0 : j - 1; 2125 row = i > 0 ? 0 : j - 1;
2126
2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2127 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2089 { 2128 {
2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2129 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2091 { 2130 {
2092 line_t s = ROW(view_start + row); 2131 line_t s = ROW(view_start + row);
… …
2113 wlen = row; 2152 wlen = row;
2114 continue; 2153 continue;
2115 } 2154 }
2116 } 2155 }
2117 2156
2118 if (len != -1) 2157 if (len >= 0)
2119 { 2158 {
2120 /* also comes here at end if needed because of >= above */ 2159 /* also comes here at end if needed because of >= above */
2121 if (wlen < len) 2160 if (wlen < len)
2122 ::swap (wlen, len); 2161 ::swap (wlen, len);
2123 2162
2163 XGCValues gcv;
2164
2165 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2124 XCopyArea (display->display, vt, vt, 2166 XCopyArea (dpy, vt, vt,
2125 gc, 0, Row2Pixel (len + i), 2167 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)this->width, 2168 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2169 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2170 0, Row2Pixel (len));
2171 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2172
2129 len = -1; 2173 len = -1;
2130 } 2174 }
2131 } 2175 }
2132 } 2176 }
2133#endif 2177#endif
… …
2189 count++; 2233 count++;
2190 2234
2191 if (stp[col] != dtp[col] 2235 if (stp[col] != dtp[col]
2192 || !RS_SAME (srp[col], drp[col])) 2236 || !RS_SAME (srp[col], drp[col]))
2193 { 2237 {
2194 if (must_clear && (i++ > count / 2)) 2238 if (have_bg && (i++ > count / 2))
2195 break; 2239 break;
2196 2240
2197 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2198 drp[col] = rend; 2242 drp[col] = rend;
2199 i = 0; 2243 i = 0;
2200 } 2244 }
2201 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2245 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2202 break; 2246 break;
2203 } 2247 }
2204 2248
2205 col--; /* went one too far. move back */ 2249 col--; /* went one too far. move back */
2206 count -= i; /* dump any matching trailing chars */ 2250 count -= i; /* dump any matching trailing chars */
… …
2216 int back = bgcolor_of (rend); // desired background 2260 int back = bgcolor_of (rend); // desired background
2217 2261
2218 // only do special processing if any attributes are set, which is unlikely 2262 // only do special processing if any attributes are set, which is unlikely
2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2220 { 2264 {
2221#if ENABLE_STYLES
2222 // force redraw after "careful" characters to avoid pixel droppings
2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224 drp[col + 1] = ~srp[col + 1];
2225
2226 // include previous careful character(s) if possible, looks nicer (best effort...)
2227 while (text > stp
2228 && srp[text - stp - 1] & RS_Careful
2229 && RS_SAME (rend, srp[text - stp - 1]))
2230 text--, count++, xpixel -= fwidth;
2231#endif
2232
2233 bool invert = rend & RS_RVid; 2265 bool invert = rend & RS_RVid;
2234 2266
2235#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2236 if (rend & RS_Bold 2268 if (rend & RS_Bold
2237 && fore == Color_fg) 2269 && fore == Color_fg)
… …
2253 else 2285 else
2254 invert = !invert; 2286 invert = !invert;
2255# endif 2287# endif
2256 } 2288 }
2257 2289
2258 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2259 fore = Color_UL; 2291 fore = Color_UL;
2260#endif 2292#endif
2261 2293
2262 if (invert) 2294 if (invert)
2263 { 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 */
2264 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2265 2307
2266#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2267 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2268 back = Color_RV; 2311 back = Color_RV;
2269 2312# endif
2270 if (fore == back) 2313 if (fore == back)
2271 { 2314 {
2272 fore = Color_bg; 2315 fore = Color_bg;
2273 back = Color_fg; 2316 back = Color_fg;
2274 } 2317 }
… …
2276 } 2319 }
2277 2320
2278#ifdef TEXT_BLINK 2321#ifdef TEXT_BLINK
2279 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2322 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2280 { 2323 {
2281 if (!text_blink_ev.active) 2324 if (!text_blink_ev.is_active ())
2282 { 2325 {
2283 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2326 text_blink_ev.again ();
2284 hidden_text = 0; 2327 hidden_text = 0;
2285 } 2328 }
2286 else if (hidden_text) 2329 else if (hidden_text)
2287 fore = back; 2330 fore = back;
2288 } 2331 }
2289#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
2290 } 2351 }
2291 2352
2292 /* 2353 /*
2293 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2294 */ 2355 */
2295 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2296 2357
2297 if (back == fore)
2298 font->clear_rect (*drawable, xpixel, ypixel,
2299 fwidth * count, fheight,
2300 back);
2301 else if (back == Color_bg) 2358 if (have_bg && back == Color_bg)
2302 { 2359 {
2303 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2304 {
2305 CLEAR_CHARS (xpixel, ypixel, count);
2306 2361
2307 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2308 if (text[i] != ' ') 2363 if (text[i] != ' ')
2309 { 2364 {
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2311 break; 2366 goto did_clear;
2312 }
2313 } 2367 }
2314 else 2368
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2316 } 2371 }
2317 else 2372 else
2318 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2319 2374
2320 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (rend & RS_Uline && font->descent > 1 && fore != back)
2321 { 2376 {
2322#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2325 else 2380 else
2326#endif 2381#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2328 2383
2329 XDrawLine (display->display, drawBuffer, gc, 2384 XDrawLine (dpy, drawBuffer, gc,
2330 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 } 2387 }
2333 } /* for (col....) */ 2388 } /* for (col....) */
2334 } /* for (row....) */ 2389 } /* for (row....) */
… …
2343 */ 2398 */
2344 if (showcursor) 2399 if (showcursor)
2345 { 2400 {
2346 if (focus) 2401 if (focus)
2347 { 2402 {
2348 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2349 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2350 else 2405 else
2351 { 2406 {
2352 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2353#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++; 2423 cursorwidth++;
2369 2424
2370#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2371 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2373#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2374 2431
2375 XDrawRectangle (display->display, drawBuffer, gc, 2432 XDrawRectangle (dpy, drawBuffer, gc,
2376 Col2Pixel (col), 2433 Col2Pixel (col),
2377 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2378 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2380 } 2437 }
… …
2388 num_scr = 0; 2445 num_scr = 0;
2389 num_scr_allow = 1; 2446 num_scr_allow = 1;
2390} 2447}
2391 2448
2392void 2449void
2393rxvt_term::scr_remap_chars (line_t &l) 2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2451{
2395 if (!l.t) 2452 if (!l.t)
2396 return; 2453 return;
2397 2454
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2457 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2459}
2403 2460
2404void 2461void
2405rxvt_term::scr_remap_chars () 2462rxvt_term::scr_remap_chars () NOTHROW
2406{ 2463{
2407 for (int i = total_rows; i--; ) 2464 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2465 scr_remap_chars (row_buf [i]);
2409 2466
2410 for (int i = nrow; i--; ) 2467 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2470 scr_remap_chars (swap_buf [i]);
2414 } 2471 }
2415} 2472}
2416 2473
2417void 2474void
2418rxvt_term::scr_recolour () 2475rxvt_term::scr_recolour () NOTHROW
2419{ 2476{
2420 if (1 2477#ifdef HAVE_BG_PIXMAP
2421#if TRANSPARENT 2478 bgPixmap.apply ();
2422 && !am_transparent 2479#else
2423#endif
2424#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap
2426#endif
2427 )
2428 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2433 if (scrollBar.win) 2484 if (scrollBar.win)
2434 { 2485 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2437 scrollbar_show (0); 2488 scrollbar_show (0);
2438 } 2489 }
2439#endif 2490# endif
2440 }
2441
2442 scr_clear (); 2491 scr_clear ();
2443 scr_touch (true); 2492 scr_touch (true);
2444 want_refresh = 1; 2493 want_refresh = 1;
2445} 2494#endif
2446 2495
2496}
2497
2447/* ------------------------------------------------------------------------- */ 2498/* ------------------------------------------------------------------------- */
2448void 2499void
2449rxvt_term::scr_clear (bool really) 2500rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2501{
2451 if (!mapped) 2502 if (!mapped)
2452 return; 2503 return;
2453 2504
2454 num_scr_allow = 0; 2505 num_scr_allow = 0;
2455 want_refresh = 1; 2506 want_refresh = 1;
2456 2507
2457 if (really) 2508 if (really)
2458 XClearWindow (display->display, vt); 2509 XClearWindow (dpy, vt);
2459} 2510}
2460 2511
2461void 2512void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2513rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2463{ 2514{
2464 int view_end = view_start + nrow; 2515 int view_end = view_start + nrow;
2465 int row, col; 2516 int row, col;
2466 2517
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2518 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2479 srp[col] ^= rstyle2; 2530 srp[col] ^= rstyle2;
2480 } 2531 }
2481} 2532}
2482 2533
2483void 2534void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2535rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2485{ 2536{
2486 int view_end = view_start + nrow; 2537 int view_end = view_start + nrow;
2487 int row, col; 2538 int row, col;
2488 2539
2489 if (beg_row >= view_start) 2540 if (beg_row >= view_start)
… …
2506 srp[col] ^= rstyle; 2557 srp[col] ^= rstyle;
2507} 2558}
2508 2559
2509/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2510void 2561void
2511rxvt_term::scr_reverse_selection () 2562rxvt_term::scr_reverse_selection () NOTHROW
2512{ 2563{
2513 if (selection.op 2564 if (selection.op
2514 && current_screen == selection.screen 2565 && current_screen == selection.screen
2515 && selection.end.row >= view_start) 2566 && selection.end.row >= view_start)
2516 { 2567 {
2517#if ENABLE_FRILLS 2568#if !ENABLE_MINIMAL
2518 if (selection.rect) 2569 if (selection.rect)
2519 scr_xor_rect (selection.beg.row, selection.beg.col, 2570 scr_xor_rect (selection.beg.row, selection.beg.col,
2520 selection.end.row, selection.end.col, 2571 selection.end.row, selection.end.col,
2521 RS_RVid, RS_RVid | RS_Uline); 2572 RS_RVid, RS_RVid | RS_Uline);
2522 else 2573 else
… …
2532 * Dump the whole scrollback and screen to the passed filedescriptor. The 2583 * Dump the whole scrollback and screen to the passed filedescriptor. The
2533 * invoking routine must close the fd. 2584 * invoking routine must close the fd.
2534 */ 2585 */
2535#if 0 2586#if 0
2536void 2587void
2537rxvt_term::scr_dump (int fd) 2588rxvt_term::scr_dump (int fd) NOTHROW
2538{ 2589{
2539 int row, wrote; 2590 int row, wrote;
2540 unsigned int width, towrite; 2591 unsigned int width, towrite;
2541 char r1[] = "\n"; 2592 char r1[] = "\n";
2542 2593
… …
2561 2612
2562/* ------------------------------------------------------------------------- * 2613/* ------------------------------------------------------------------------- *
2563 * CHARACTER SELECTION * 2614 * CHARACTER SELECTION *
2564 * ------------------------------------------------------------------------- */ 2615 * ------------------------------------------------------------------------- */
2565void 2616void
2566rxvt_term::selection_check (int check_more) 2617rxvt_term::selection_check (int check_more) NOTHROW
2567{ 2618{
2568 row_col_t pos; 2619 row_col_t pos;
2569 2620
2570 if (!selection.op) 2621 if (!selection.op)
2571 return; 2622 return;
… …
2592/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2593/* 2644/*
2594 * Paste a selection direct to the command fd 2645 * Paste a selection direct to the command fd
2595 */ 2646 */
2596void 2647void
2597rxvt_term::paste (char *data, unsigned int len) 2648rxvt_term::paste (char *data, unsigned int len) NOTHROW
2598{ 2649{
2599 /* convert normal newline chars into common keyboard Return key sequence */ 2650 /* convert normal newline chars into common keyboard Return key sequence */
2600 for (unsigned int i = 0; i < len; i++) 2651 for (unsigned int i = 0; i < len; i++)
2601 if (data[i] == C0_LF) 2652 if (data[i] == C0_LF)
2602 data[i] = C0_CR; 2653 data[i] = C0_CR;
… …
2608/* 2659/*
2609 * Respond to a notification that a primary selection has been sent 2660 * Respond to a notification that a primary selection has been sent
2610 * EXT: SelectionNotify 2661 * EXT: SelectionNotify
2611 */ 2662 */
2612void 2663void
2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2664rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2614{ 2665{
2615 if (prop == None) /* check for failed XConvertSelection */ 2666 if (prop == None) /* check for failed XConvertSelection */
2616 { 2667 {
2617 if ((selection_type & Sel_CompoundText)) 2668 if ((selection_type & Sel_CompoundText))
2618 { 2669 {
… …
2638 } 2689 }
2639 2690
2640 unsigned long bytes_after; 2691 unsigned long bytes_after;
2641 XTextProperty ct; 2692 XTextProperty ct;
2642 2693
2643 if (XGetWindowProperty (display->display, win, prop, 2694 if (XGetWindowProperty (dpy, win, prop,
2644 0, PROP_SIZE / 4, 2695 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType, 2696 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format, 2697 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after, 2698 &ct.nitems, &bytes_after,
2648 &ct.value) != Success) 2699 &ct.value) != Success)
… …
2657 if (bytes_after) 2708 if (bytes_after)
2658 { 2709 {
2659 // fetch and append remaining data 2710 // fetch and append remaining data
2660 XTextProperty ct2; 2711 XTextProperty ct2;
2661 2712
2662 if (XGetWindowProperty (display->display, win, prop, 2713 if (XGetWindowProperty (dpy, win, prop,
2663 ct.nitems / 4, (bytes_after + 3) / 4, 2714 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType, 2715 delete_prop, AnyPropertyType,
2665 &ct2.encoding, &ct2.format, 2716 &ct2.encoding, &ct2.format,
2666 &ct2.nitems, &bytes_after, 2717 &ct2.nitems, &bytes_after,
2667 &ct2.value) != Success) 2718 &ct2.value) != Success)
… …
2680 2731
2681 if (ct.encoding == xa[XA_INCR]) 2732 if (ct.encoding == xa[XA_INCR])
2682 { 2733 {
2683 // INCR selection, start handshake 2734 // INCR selection, start handshake
2684 if (!delete_prop) 2735 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop); 2736 XDeleteProperty (dpy, win, prop);
2686 2737
2687 selection_wait = Sel_incr; 2738 selection_wait = Sel_incr;
2688 incr_buf_fill = 0; 2739 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10); 2740 incr_ev.start (10);
2690 2741
2691 goto bailout; 2742 goto bailout;
2692 } 2743 }
2693 2744
2694 if (ct.nitems == 0) 2745 if (ct.nitems == 0)
… …
2703 ct.nitems = incr_buf_fill; 2754 ct.nitems = incr_buf_fill;
2704 incr_buf = 0; 2755 incr_buf = 0;
2705 incr_buf_size = 0; 2756 incr_buf_size = 0;
2706 incr_ev.stop (); 2757 incr_ev.stop ();
2707 } 2758 }
2708 else 2759 else
2709 { 2760 {
2710 if (selection_wait == Sel_normal 2761 if (selection_wait == Sel_normal
2711 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2762 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2712 { 2763 {
2713 /* 2764 /*
… …
2720 goto bailout; 2771 goto bailout;
2721 } 2772 }
2722 } 2773 }
2723 else if (selection_wait == Sel_incr) 2774 else if (selection_wait == Sel_incr)
2724 { 2775 {
2725 incr_ev.start (NOW + 10); 2776 incr_ev.start (10);
2726 2777
2727 while (incr_buf_fill + ct.nitems > incr_buf_size) 2778 while (incr_buf_fill + ct.nitems > incr_buf_size)
2728 { 2779 {
2729 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2780 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2730 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2781 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2737 } 2788 }
2738 2789
2739 char **cl; 2790 char **cl;
2740 int cr; 2791 int cr;
2741 2792
2742#if ENABLE_FRILLS 2793#if !ENABLE_MINIMAL
2743 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2794 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2744 // so recode it manually 2795 // so recode it manually
2745 if (ct.encoding == xa[XA_UTF8_STRING]) 2796 if (ct.encoding == xa[XA_UTF8_STRING])
2746 { 2797 {
2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2798 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2751 paste (s, strlen (s)); 2802 paste (s, strlen (s));
2752 free (s); 2803 free (s);
2753 } 2804 }
2754 else 2805 else
2755#endif 2806#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2807 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2757 && cl) 2808 && cl)
2758 { 2809 {
2759 for (int i = 0; i < cr; i++) 2810 for (int i = 0; i < cr; i++)
2760 paste (cl[i], strlen (cl[i])); 2811 paste (cl[i], strlen (cl[i]));
2761 2812
… …
2770 if (selection_wait == Sel_normal) 2821 if (selection_wait == Sel_normal)
2771 selection_wait = Sel_none; 2822 selection_wait = Sel_none;
2772} 2823}
2773 2824
2774void 2825void
2775rxvt_term::incr_cb (time_watcher &w) 2826rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2776{ 2827{
2777 selection_wait = Sel_none; 2828 selection_wait = Sel_none;
2778 2829
2779 incr_buf_size = 0; 2830 incr_buf_size = 0;
2780 free (incr_buf); 2831 free (incr_buf);
2781 2832
2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2833 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783} 2834}
2784 2835
2785void 2836void
2786rxvt_term::selection_property (Window win, Atom prop) 2837rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2787{ 2838{
2788 if (prop == None || selection_wait != Sel_incr) 2839 if (prop == None || selection_wait != Sel_incr)
2789 return; 2840 return;
2790 2841
2791 selection_paste (win, prop, true); 2842 selection_paste (win, prop, true);
2792} 2843}
2793 2844
2794/* ------------------------------------------------------------------------- */ 2845/* ------------------------------------------------------------------------- */
2795/* 2846/*
2796 * Request the current selection: 2847 * Request the current selection:
2797 * Order: > internal selection if available 2848 * Order: > internal selection if available
2798 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2849 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2799 * > CUT_BUFFER0 2850 * > CUT_BUFFER0
2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801 * will auto fallback to CUT_BUFFER0 2852 * will auto fallback to CUT_BUFFER0
2802 * EXT: button 2 release 2853 * EXT: button 2 release
2803 */ 2854 */
2804void 2855void
2805rxvt_term::selection_request (Time tm, int x, int y) 2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2806{ 2857{
2807 if (x < 0 || x >= width || y < 0 || y >= height) 2858 if (selection.text && selnum == Sel_Primary)
2808 return; /* outside window */ 2859 {
2809
2810 if (selection.text)
2811 { /* internal selection */ 2860 /* internal selection */
2812 char *str = rxvt_wcstombs (selection.text, selection.len); 2861 char *str = rxvt_wcstombs (selection.text, selection.len);
2813 paste (str, strlen (str)); 2862 paste (str, strlen (str));
2814 free (str); 2863 free (str);
2815 return; 2864 return;
2816 } 2865 }
2817 else 2866 else
2818 { 2867 {
2819 int i;
2820
2821 selection_request_time = tm; 2868 selection_request_time = tm;
2822 selection_wait = Sel_normal; 2869 selection_wait = Sel_normal;
2823 2870
2824 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2825 {
2826#if X_HAVE_UTF8_STRING 2871#if X_HAVE_UTF8_STRING
2827 selection_type = Sel_UTF8String; 2872 selection_type = Sel_UTF8String;
2828 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2873 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2829 return; 2874 return;
2830#else 2875#else
2831 selection_type = Sel_CompoundText; 2876 selection_type = Sel_CompoundText;
2832 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2877 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2833 return; 2878 return;
2834#endif 2879#endif
2835 }
2836 } 2880 }
2837 2881
2838 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2882 selection_wait = Sel_none; /* don't loop in selection_paste () */
2839 selection_paste (display->root, XA_CUT_BUFFER0, false); 2883 selection_paste (display->root, XA_CUT_BUFFER0, false);
2840} 2884}
2841 2885
2842int 2886int
2843rxvt_term::selection_request_other (Atom target, int selnum) 2887rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2844{ 2888{
2845 Atom sel; 2889 Atom sel;
2846 2890
2847 selection_type |= selnum; 2891 selection_type |= selnum;
2848 2892
… …
2851 else if (selnum == Sel_Secondary) 2895 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2896 sel = XA_SECONDARY;
2853 else 2897 else
2854 sel = xa[XA_CLIPBOARD]; 2898 sel = xa[XA_CLIPBOARD];
2855 2899
2856 if (XGetSelectionOwner (display->display, sel) != None) 2900 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2901 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2902 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2903 vt, selection_request_time);
2860 return 1; 2904 return 1;
2861 } 2905 }
2862 2906
2863 return 0; 2907 return 0;
… …
2867/* 2911/*
2868 * Clear all selected text 2912 * Clear all selected text
2869 * EXT: SelectionClear 2913 * EXT: SelectionClear
2870 */ 2914 */
2871void 2915void
2872rxvt_term::selection_clear () 2916rxvt_term::selection_clear () NOTHROW
2873{ 2917{
2874 want_refresh = 1; 2918 want_refresh = 1;
2875 free (selection.text); 2919 free (selection.text);
2876 selection.text = NULL; 2920 selection.text = NULL;
2877 selection.len = 0; 2921 selection.len = 0;
… …
2926 2970
2927 int end_col; 2971 int end_col;
2928 2972
2929 for (; row <= selection.end.row; row++, col = 0) 2973 for (; row <= selection.end.row; row++, col = 0)
2930 { 2974 {
2931#if ENABLE_FRILLS 2975#if !ENABLE_MINIMAL
2932 if (selection.rect) 2976 if (selection.rect)
2933 { 2977 {
2934 col = selection.beg.col; 2978 col = selection.beg.col;
2935 end_col = ncol + 1; 2979 end_col = ncol + 1;
2936 } 2980 }
… …
2939 end_col = ROW(row).l; 2983 end_col = ROW(row).l;
2940 2984
2941 col = max (col, 0); 2985 col = max (col, 0);
2942 2986
2943 if (row == selection.end.row 2987 if (row == selection.end.row
2944#if ENABLE_FRILLS 2988#if !ENABLE_MINIMAL
2945 || selection.rect 2989 || selection.rect
2946#endif 2990#endif
2947 ) 2991 )
2948 min_it (end_col, selection.end.col); 2992 min_it (end_col, selection.end.col);
2949 2993
… …
2972#endif 3016#endif
2973 else 3017 else
2974 new_selection_text[ofs++] = *t++; 3018 new_selection_text[ofs++] = *t++;
2975 } 3019 }
2976 3020
2977#if ENABLE_FRILLS 3021#if !ENABLE_MINIMAL
2978 if (selection.rect) 3022 if (selection.rect)
2979 { 3023 {
2980 while (ofs 3024 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3025 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3026 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3012 3056
3013 selection_grab (tm); 3057 selection_grab (tm);
3014} 3058}
3015 3059
3016bool 3060bool
3017rxvt_term::selection_grab (Time tm) 3061rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3062{
3019 selection_time = tm; 3063 selection_time = tm;
3020 3064
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3065 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3066 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3067 {
3024 display->set_selection_owner (this); 3068 display->set_selection_owner (this);
3025 return true; 3069 return true;
3026 } 3070 }
3027 else 3071 else
… …
3031 } 3075 }
3032 3076
3033#if 0 3077#if 0
3034 XTextProperty ct; 3078 XTextProperty ct;
3035 3079
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3080 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3081 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3082 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3083 XFree (ct.value);
3040 } 3084 }
3041#endif 3085#endif
… …
3045/* 3089/*
3046 * Mark or select text based upon number of clicks: 1, 2, or 3 3090 * Mark or select text based upon number of clicks: 1, 2, or 3
3047 * EXT: button 1 press 3091 * EXT: button 1 press
3048 */ 3092 */
3049void 3093void
3050rxvt_term::selection_click (int clicks, int x, int y) 3094rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3051{ 3095{
3052 clicks = ((clicks - 1) % 3) + 1; 3096 clicks = ((clicks - 1) % 3) + 1;
3053 selection.clicks = clicks; /* save clicks so extend will work */ 3097 selection.clicks = clicks; /* save clicks so extend will work */
3054 3098
3055 if (clicks == 2 && !selection.rect 3099 if (clicks == 2 && !selection.rect
… …
3074/* ------------------------------------------------------------------------- */ 3118/* ------------------------------------------------------------------------- */
3075/* 3119/*
3076 * Mark a selection at the specified col/row 3120 * Mark a selection at the specified col/row
3077 */ 3121 */
3078void 3122void
3079rxvt_term::selection_start_colrow (int col, int row) 3123rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3080{ 3124{
3081 want_refresh = 1; 3125 want_refresh = 1;
3082 3126
3083 selection.mark.row = row + view_start; 3127 selection.mark.row = row + view_start;
3084 selection.mark.col = col; 3128 selection.mark.col = col;
… …
3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3131 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3088 3132
3089 while (selection.mark.col > 0 3133 while (selection.mark.col > 0
3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3134 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3091 --selection.mark.col; 3135 --selection.mark.col;
3092 3136
3093 if (selection.op) 3137 if (selection.op)
3138 {
3094 { /* clear the old selection */ 3139 /* clear the old selection */
3095 selection.beg.row = selection.end.row = selection.mark.row; 3140 selection.beg.row = selection.end.row = selection.mark.row;
3096 selection.beg.col = selection.end.col = selection.mark.col; 3141 selection.beg.col = selection.end.col = selection.mark.col;
3097 } 3142 }
3098 3143
3099 selection.op = SELECTION_INIT; 3144 selection.op = SELECTION_INIT;
… …
3110#define DELIMIT_TEXT(x) \ 3155#define DELIMIT_TEXT(x) \
3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3156 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3112#define DELIMIT_REND(x) 1 3157#define DELIMIT_REND(x) 1
3113 3158
3114void 3159void
3115rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3160rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3116{ 3161{
3117 int col, row, dirnadd, tcol, trow, w1, w2; 3162 int col, row, dirnadd, tcol, trow, w1, w2;
3118 row_col_t bound; 3163 row_col_t bound;
3119 text_t *stp; 3164 text_t *stp;
3120 rend_t *srp; 3165 rend_t *srp;
… …
3194 * flag == 0 ==> button 1 3239 * flag == 0 ==> button 1
3195 * flag == 1 ==> button 3 press 3240 * flag == 1 ==> button 3 press
3196 * flag == 2 ==> button 3 motion 3241 * flag == 2 ==> button 3 motion
3197 */ 3242 */
3198void 3243void
3199rxvt_term::selection_extend (int x, int y, int flag) 3244rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3200{ 3245{
3201 int col = clamp (Pixel2Col (x), 0, ncol); 3246 int col = clamp (Pixel2Col (x), 0, ncol);
3202 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3247 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3203 3248
3204 /* 3249 /*
… …
3230/* ------------------------------------------------------------------------- */ 3275/* ------------------------------------------------------------------------- */
3231/* 3276/*
3232 * Extend the selection to the specified col/row 3277 * Extend the selection to the specified col/row
3233 */ 3278 */
3234void 3279void
3235rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3280rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3236{ 3281{
3237 row_col_t pos; 3282 row_col_t pos;
3238 enum { 3283 enum {
3239 LEFT, RIGHT 3284 LEFT, RIGHT
3240 } closeto = RIGHT; 3285 } closeto = RIGHT;
… …
3288 * a point/word/line which is either the start or end of the selection 3333 * 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 3334 * and it was decided by whichever point/word/line was `fixed' at the
3290 * time of the most recent button3 press 3335 * time of the most recent button3 press
3291 */ 3336 */
3292 if (button3 && buttonpress) 3337 if (button3 && buttonpress)
3338 {
3293 { /* button3 press */ 3339 /* button3 press */
3294 /* 3340 /*
3295 * first determine which edge of the selection we are closest to 3341 * first determine which edge of the selection we are closest to
3296 */ 3342 */
3297 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3343 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3298 || (!ROWCOL_IS_AFTER (pos, selection.end) 3344 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3316 selection.mark.row = selection.beg.row; 3362 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3363 selection.mark.col = selection.beg.col;
3318 } 3364 }
3319 } 3365 }
3320 else 3366 else
3367 {
3321 { /* button1 drag or button3 drag */ 3368 /* button1 drag or button3 drag */
3322 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3369 if (ROWCOL_IS_AFTER (selection.mark, pos))
3323 { 3370 {
3324 if (selection.mark.row == selection.end.row 3371 if (selection.mark.row == selection.end.row
3325 && selection.mark.col == selection.end.col 3372 && selection.mark.col == selection.end.col
3326 && clickchange 3373 && clickchange
… …
3343 3390
3344 if (selection.clicks == 1) 3391 if (selection.clicks == 1)
3345 { 3392 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3393 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3394 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3395#if !ENABLE_MINIMAL
3349 && !selection.rect 3396 && !selection.rect
3350#endif 3397#endif
3351 ) 3398 )
3352 selection.beg.col = ncol; 3399 selection.beg.col = ncol;
3353 3400
3354 if ( 3401 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3402 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3403 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3404#if !ENABLE_MINIMAL
3358 && !selection.rect 3405 && !selection.rect
3359#endif 3406#endif
3360 ) 3407 )
3361 selection.end.col = ncol; 3408 selection.end.col = ncol;
3362 } 3409 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3416 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3417 }
3371 else if (selection.clicks == 3) 3418 else if (selection.clicks == 3)
3372 { 3419 {
3373#if ENABLE_FRILLS 3420#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3421 if (option (Opt_tripleclickwords))
3375 { 3422 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3423 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3424
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3425 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3426 {
3380 if (!ROW(end_row).is_longer ()) 3427 if (!ROW(end_row).is_longer ())
3381 { 3428 {
3382 selection.end.row = end_row; 3429 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3430 selection.end.col = ROW(end_row).l;
3431# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3432 selection_remove_trailing_spaces ();
3433# endif
3385 break; 3434 break;
3386 } 3435 }
3387 } 3436 }
3388 } 3437 }
3389 else 3438 else
… …
3405 selection.end.row++; 3454 selection.end.row++;
3406 } 3455 }
3407 } 3456 }
3408 3457
3409 if (button3 && buttonpress) 3458 if (button3 && buttonpress)
3459 {
3410 { /* mark may need to be changed */ 3460 /* mark may need to be changed */
3411 if (closeto == LEFT) 3461 if (closeto == LEFT)
3412 { 3462 {
3413 selection.mark.row = selection.end.row; 3463 selection.mark.row = selection.end.row;
3414 selection.mark.col = selection.end.col - (selection.clicks == 2); 3464 selection.mark.col = selection.end.col - (selection.clicks == 2);
3415 } 3465 }
… …
3418 selection.mark.row = selection.beg.row; 3468 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3469 selection.mark.col = selection.beg.col;
3420 } 3470 }
3421 } 3471 }
3422 3472
3423#if ENABLE_FRILLS 3473#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3474 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3475 ::swap (selection.beg.col, selection.end.col);
3426#endif 3476#endif
3427} 3477}
3428 3478
3429#if ENABLE_FRILLS 3479#if !ENABLE_MINIMAL
3430void 3480void
3431rxvt_term::selection_remove_trailing_spaces () 3481rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3482{
3433 int32_t end_col, end_row; 3483 int32_t end_col, end_row;
3434 text_t *stp; 3484 text_t *stp;
3435 3485
3436 end_col = selection.end.col; 3486 end_col = selection.end.col;
… …
3474/* 3524/*
3475 * Double click on button 3 when already selected 3525 * Double click on button 3 when already selected
3476 * EXT: button 3 double click 3526 * EXT: button 3 double click
3477 */ 3527 */
3478void 3528void
3479rxvt_term::selection_rotate (int x, int y) 3529rxvt_term::selection_rotate (int x, int y) NOTHROW
3480{ 3530{
3481 selection.clicks = selection.clicks % 3 + 1; 3531 selection.clicks = selection.clicks % 3 + 1;
3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3532 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3483} 3533}
3484 3534
… …
3486/* 3536/*
3487 * Respond to a request for our current selection 3537 * Respond to a request for our current selection
3488 * EXT: SelectionRequest 3538 * EXT: SelectionRequest
3489 */ 3539 */
3490void 3540void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3541rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3542{
3493 XSelectionEvent ev; 3543 XSelectionEvent ev;
3494 dDisp;
3495 3544
3496 ev.type = SelectionNotify; 3545 ev.type = SelectionNotify;
3497 ev.property = None; 3546 ev.property = None;
3498 ev.display = rq.display; 3547 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3548 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3562 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3563#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3564 *target++ = xa[XA_UTF8_STRING];
3516#endif 3565#endif
3517 3566
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3567 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3568 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3569 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3570 ev.property = rq.property;
3522 } 3571 }
3523#if TODO // TODO 3572#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3575 /* TODO: Handle MULTIPLE */
3527 } 3576 }
3528#endif 3577#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3578 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3579 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3580 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3581 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3582 ev.property = rq.property;
3534 } 3583 }
3535 else if (rq.target == XA_STRING 3584 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3585 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3609 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3610 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3611 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3612 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3613 style = enc_compound_text;
3565#if ENABLE_FRILLS 3614#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3615 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3616 style = enc_utf8;
3568#endif 3617#endif
3569 else 3618 else
3570 { 3619 {
… …
3581 { 3630 {
3582 cl = L""; 3631 cl = L"";
3583 selectlen = 0; 3632 selectlen = 0;
3584 } 3633 }
3585 3634
3586#if ENABLE_FRILLS 3635#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3636 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3637 // so recode it manually
3589 if (style == enc_utf8) 3638 if (style == enc_utf8)
3590 { 3639 {
3591 freect = 1; 3640 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3643 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3644 ct.nitems = strlen ((char *)ct.value);
3596 } 3645 }
3597 else 3646 else
3598#endif 3647#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3648 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3649 freect = 1;
3601 else 3650 else
3602 { 3651 {
3603 /* if we failed to convert then send it raw */ 3652 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3653 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3654 ct.nitems = selectlen;
3606 ct.encoding = target; 3655 ct.encoding = target;
3607 } 3656 }
3608 3657
3609 XChangeProperty (disp, rq.requestor, rq.property, 3658 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3659 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3660 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3661 ev.property = rq.property;
3613 3662
3614 if (freect) 3663 if (freect)
3615 XFree (ct.value); 3664 XFree (ct.value);
3616 } 3665 }
3617 3666
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3667 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)
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} 3668}
3636 3669
3637/* ------------------------------------------------------------------------- */ 3670/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3671#ifdef USE_XIM
3639void 3672void
3640rxvt_term::im_set_position (XPoint &pos) 3673rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3674{
3642 XWindowAttributes xwa; 3675 XWindowAttributes xwa;
3643 3676
3644 XGetWindowAttributes (display->display, vt, &xwa); 3677 XGetWindowAttributes (dpy, vt, &xwa);
3645 3678
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3679 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3680 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3681}
3649#endif 3682#endif
3650 3683
3651#if ENABLE_OVERLAY 3684#if ENABLE_OVERLAY
3652void 3685void
3653rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3686rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3654{ 3687{
3655 if (nrow < 1 || ncol < 1) 3688 if (nrow < 1 || ncol < 1)
3656 return; 3689 return;
3657 3690
3658 want_refresh = 1; 3691 want_refresh = 1;
… …
3703 *rp = r; 3736 *rp = r;
3704 } 3737 }
3705} 3738}
3706 3739
3707void 3740void
3708rxvt_term::scr_overlay_off () 3741rxvt_term::scr_overlay_off () NOTHROW
3709{ 3742{
3710 if (!ov_text) 3743 if (!ov_text)
3711 return; 3744 return;
3712 3745
3713 want_refresh = 1; 3746 want_refresh = 1;
… …
3721 delete [] ov_text; ov_text = 0; 3754 delete [] ov_text; ov_text = 0;
3722 delete [] ov_rend; ov_rend = 0; 3755 delete [] ov_rend; ov_rend = 0;
3723} 3756}
3724 3757
3725void 3758void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3759rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727{ 3760{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3761 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729 return; 3762 return;
3730 3763
3731 x++, y++; 3764 x++, y++;
… …
3733 ov_text[y][x] = text; 3766 ov_text[y][x] = text;
3734 ov_rend[y][x] = rend; 3767 ov_rend[y][x] = rend;
3735} 3768}
3736 3769
3737void 3770void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s) 3771rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739{ 3772{
3740 while (*s) 3773 while (*s)
3741 scr_overlay_set (x++, y, *s++); 3774 scr_overlay_set (x++, y, *s++);
3742} 3775}
3743 3776
3744void 3777void
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3778rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3779{
3747 while (*s) 3780 while (*s)
3748 { 3781 {
3749 text_t t = *s++; 3782 text_t t = *s++;
3750 int width = wcwidth (t); 3783 int width = WCWIDTH (t);
3751 3784
3752 while (width--) 3785 while (width--)
3753 { 3786 {
3754 scr_overlay_set (x++, y, t); 3787 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3788 t = NOCHAR;
3756 } 3789 }
3757 } 3790 }
3758} 3791}
3759 3792
3760void 3793void
3761rxvt_term::scr_swap_overlay () 3794rxvt_term::scr_swap_overlay () NOTHROW
3762{ 3795{
3763 if (!ov_text) 3796 if (!ov_text)
3764 return; 3797 return;
3765 3798
3766 // swap screen mem with overlay 3799 // swap screen mem with overlay

Diff Legend

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