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.230 by root, Sun Jan 15 16:47:29 2006 UTC vs.
Revision 1.326 by root, Wed Nov 5 13:04:51 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 83 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
86#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 84#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
87 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 85 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 86
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 88 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 89 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \
97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False)
101
102#define CLEAR_CHARS(x, y, num) \ 90#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 91 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 92 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 93 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 94 (unsigned int)Height2Pixel (1), False)
107
108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \
110 0, Row2Pixel (row), \
111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num))
113 95
114/* ------------------------------------------------------------------------- * 96/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 97 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 98 * ------------------------------------------------------------------------- */
117 99
118/* Fill part/all of a line with blanks. */ 100/* Fill part/all of a line with blanks. */
119void 101void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 102rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 103{
122 if (!l.t) 104 if (!l.t)
123 { 105 {
124 lalloc (l); 106 lalloc (l);
125 col = 0; 107 col = 0;
126 width = ncol; 108 width = ncol;
127 } 109 }
128 110
129 l.touch (); 111 l.touch ();
130 112
131 efs &= ~RS_baseattrMask; 113 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 114 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 115
134 text_t *et = l.t + col; 116 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 117 rend_t *er = l.r + col;
136 118
… …
142} 124}
143 125
144/* ------------------------------------------------------------------------- */ 126/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 127/* Fill a full line with blanks - make sure it is allocated first */
146void 128void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 129rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 130{
149 scr_blank_line (l, 0, ncol, efs); 131 scr_blank_line (l, 0, ncol, efs);
150 132
151 l.l = 0; 133 l.l = 0;
152 l.f = 0; 134 l.f = 0;
135}
136
137// nuke a single wide character at the given column
138void
139rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
140{
141 // find begin
142 while (col > 0 && l.t[col] == NOCHAR)
143 col--;
144
145 rend_t rend = l.r[col] & ~RS_baseattrMask;
146 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
147
148 // found start, nuke
149 do {
150 l.t[col] = ' ';
151 l.r[col] = rend;
152 col++;
153 } while (col < ncol && l.t[col] == NOCHAR);
153} 154}
154 155
155/* ------------------------------------------------------------------------- * 156/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 157 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 158 * ------------------------------------------------------------------------- */
158 159
159void 160void
160rxvt_term::scr_reset () 161rxvt_term::scr_reset ()
161{ 162{
162#if ENABLE_OVERLAY
163 scr_overlay_off ();
164#endif
165
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177 174
178 // we need at least two lines for wrapping to work correctly 175 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 176 while (nrow + saveLines < 2)
180 { 177 {
181 //TODO//FIXME 178 //TODO//FIXME
182 saveLines++; 179 saveLines++;
183 prev_nrow--; 180 prev_nrow--;
184 top_row--; 181 top_row--;
… …
195 if (!row_buf) 192 if (!row_buf)
196 { 193 {
197 /* 194 /*
198 * first time called so just malloc everything: don't rely on realloc 195 * first time called so just malloc everything: don't rely on realloc
199 */ 196 */
200 top_row = 0; /* no saved lines */ 197 top_row = 0;
201 term_start = 0; 198 term_start = 0;
202 199
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 200 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 201 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 202
… …
234 selection.text = NULL; 231 selection.text = NULL;
235 selection.len = 0; 232 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 233 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 234 selection.screen = PRIMARY;
238 selection.clicks = 0; 235 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0;
241 } 236 }
242 else 237 else
243 { 238 {
244 /* 239 /*
245 * add or delete rows as appropriate 240 * add or delete rows as appropriate
… …
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 269 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 270 }
276 271
277 line_t *old_buf = row_buf; 272 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 273 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 274
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 275 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start + top_row , prev_total_rows); 276 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 277 int q = total_rows; // rewrapped row
283 278
284 if (top_row) 279 if (top_row)
285 { 280 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 281 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 282 // to come up with a lean and mean algorithm.
283 // TODO: maybe optimise when width didn't change
288 284
289 row_col_t ocur = screen.cur; 285 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 286 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 287
292 do 288 do
… …
325 qline->l = ncol; 321 qline->l = ncol;
326 qline->is_longer (1); 322 qline->is_longer (1);
327 323
328 int qcol = 0; 324 int qcol = 0;
329 325
326 // see below for cursor adjustment rationale
327 if (p == ocur.row)
328 screen.cur.row = q - (total_rows - nrow);
329
330 // fill a single destination line 330 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 331 while (lofs < llen && qcol < ncol)
332 { 332 {
333 int prow = lofs / prev_ncol; 333 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 334 int pcol = lofs % prev_ncol;
… …
344 344
345 line_t &pline = old_buf [prow]; 345 line_t &pline = old_buf [prow];
346 346
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 348
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 351
355 lofs += len; 352 lofs += len;
356 qcol += len; 353 qcol += len;
… …
363 } 360 }
364 while (p != pend && q > 0); 361 while (p != pend && q > 0);
365 362
366 term_start = total_rows - nrow; 363 term_start = total_rows - nrow;
367 top_row = q - term_start; 364 top_row = q - term_start;
368 365
369 // make sure all terminal lines exist 366 // make sure all terminal lines exist
370 while (top_row > 0) 367 while (top_row > 0)
371 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 368 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 369 }
373 else 370 else
374 { 371 {
375 // if no scrollback exists (yet), wing, instead of wrap 372 // if no scrollback exists (yet), wing, instead of wrap
376 373
377 for (int row = min (nrow, prev_nrow); row--; ) 374 for (int row = min (nrow, prev_nrow); row--; )
378 { 375 {
379 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 376 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
380 line_t &qline = row_buf [row]; 377 line_t &qline = row_buf [row];
381 378
… …
389 } 386 }
390 387
391 term_start = 0; 388 term_start = 0;
392 } 389 }
393 390
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); 391 free (old_buf);
400 delete old_ta; 392 delete old_ta;
401 delete old_ra; 393 delete old_ra;
402 394
403 clamp_it (screen.cur.row, 0, nrow - 1); 395 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 396 clamp_it (screen.cur.col, 0, ncol - 1);
397 }
405 398
406 if (tabs)
407 free (tabs); 399 free (tabs);
408 } 400 tabs = (char *)rxvt_malloc (ncol);
401
402 for (int col = ncol; --col; )
403 tabs [col] = col % TABSIZE == 0;
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));
414
415 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0;
417
418 tt_winch (); 410 tt_winch ();
419 411
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 412 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 413}
422 414
423/* ------------------------------------------------------------------------- */ 415/* ------------------------------------------------------------------------- */
424/* 416/*
425 * Free everything. That way malloc debugging can find leakage. 417 * Free everything. That way malloc debugging can find leakage.
426 */ 418 */
427void 419void
428rxvt_term::scr_release () 420rxvt_term::scr_release () NOTHROW
429{ 421{
422 if (row_buf)
423 {
430 delete talloc; talloc = 0; 424 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 425 delete ralloc; ralloc = 0;
432 426
433 free (row_buf); 427 free (row_buf);
434 free (swap_buf); 428 free (swap_buf);
435 free (drawn_buf); 429 free (drawn_buf);
436 free (tabs);
437
438 row_buf = 0; // signal that we freed all the arrays 430 row_buf = 0; // signal that we freed all the arrays above
439}
440 431
432 free (tabs);
433 tabs = 0;
434 }
435}
436
441/* ------------------------------------------------------------------------- */ 437/* ------------------------------------------------------------------------- */
442/* 438/*
443 * Hard reset 439 * Hard/Soft reset
444 */ 440 */
445void 441void
446rxvt_term::scr_poweron () 442rxvt_term::scr_poweron ()
447{ 443{
448 scr_release (); 444 scr_release ();
449 prev_nrow = prev_ncol = 0; 445 prev_nrow = prev_ncol = 0;
446 rvideo_mode = false;
447 scr_soft_reset ();
450 scr_reset (); 448 scr_reset ();
451 449
452 scr_clear (true); 450 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 451 scr_refresh ();
452}
453
454void
455rxvt_term::scr_soft_reset ()
456{
457 /* only affects modes, nothing drastic such as clearing the screen */
458#if ENABLE_OVERLAY
459 scr_overlay_off ();
460#endif
461
462 if (current_screen != PRIMARY)
463 scr_swap_screen ();
464
465 scr_scroll_region (0, MAX_ROWS - 1);
466 scr_rendition (0, ~RS_None);
467 scr_insert_mode (0);
454} 468}
455 469
456/* ------------------------------------------------------------------------- * 470/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 471 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 472 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 474 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 475 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 476 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 477 */
464void 478void
465rxvt_term::scr_cursor (int mode) 479rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 480{
467 screen_t *s; 481 screen_t *s;
468 482
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 483#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 484 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
504#endif 518#endif
505} 519}
506 520
521void
522rxvt_term::scr_swap_screen ()
523{
524 if (!option (Opt_secondaryScreen))
525 return;
526
527 for (int i = prev_nrow; i--; )
528 ::swap (ROW(i), swap_buf [i]);
529
530 ::swap (screen.cur, swap.cur);
531
532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
534}
535
507/* ------------------------------------------------------------------------- */ 536/* ------------------------------------------------------------------------- */
508/* 537/*
509 * Swap between primary and secondary screens 538 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 539 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 540 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 541 */
513int 542void
514rxvt_term::scr_change_screen (int scrn) 543rxvt_term::scr_change_screen (int scrn)
515{ 544{
545 if (scrn == current_screen)
546 return;
547
516 want_refresh = 1; 548 want_refresh = 1;
517 view_start = 0; 549 view_start = 0;
518 550
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 551 selection_check (2); /* check for boundary cross */
523 552
524 int i = current_screen; current_screen = scrn; scrn = i; 553 int i = current_screen; current_screen = scrn; scrn = i;
525 554
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 555#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 556 if (option (Opt_secondaryScreen))
534 { 557 {
535 num_scr = 0; 558 num_scr = 0;
536 559
537 for (int i = prev_nrow; i--; ) 560 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 561
540 ::swap (screen.charset, swap.charset); 562 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 563 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 564 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 565 swap.flags |= Screen_VisibleCursor;
544 } 566 }
545 else 567 else
546#endif 568#endif
547 if (OPTION (Opt_secondaryScroll)) 569 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 570 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 571}
552 572
553// clear WrapNext indicator, solidifying position on next line 573// clear WrapNext indicator, solidifying position on next line
554void 574void
555rxvt_term::scr_do_wrap () 575rxvt_term::scr_do_wrap () NOTHROW
556{ 576{
557 if (!(screen.flags & Screen_WrapNext)) 577 if (!(screen.flags & Screen_WrapNext))
558 return; 578 return;
559 579
560 screen.flags &= ~Screen_WrapNext; 580 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 590/* ------------------------------------------------------------------------- */
571/* 591/*
572 * Change the colour for following text 592 * Change the colour for following text
573 */ 593 */
574void 594void
575rxvt_term::scr_color (unsigned int color, int fgbg) 595rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 596{
577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 597 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 598 color = fgbg;
579 599
580 if (fgbg == Color_fg) 600 if (fgbg == Color_fg)
… …
586/* ------------------------------------------------------------------------- */ 606/* ------------------------------------------------------------------------- */
587/* 607/*
588 * Change the rendition style for following text 608 * Change the rendition style for following text
589 */ 609 */
590void 610void
591rxvt_term::scr_rendition (int set, int style) 611rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 612{
593 if (set) 613 if (set)
594 rstyle |= style; 614 rstyle |= style;
595 else if (style == ~RS_None) 615 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 616 rstyle = DEFAULT_RSTYLE;
597 else 617 else
598 rstyle &= ~style; 618 rstyle &= ~style;
599 } 619}
600 620
601/* ------------------------------------------------------------------------- */ 621/* ------------------------------------------------------------------------- */
602/* 622/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 623 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 624 * count positive ==> scroll up
605 * count negative ==> scroll down 625 * count negative ==> scroll down
606 */ 626 */
607int 627int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 628rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 629{
610 if (count == 0 || (row1 > row2)) 630 if (count == 0 || (row1 > row2))
611 return 0; 631 return 0;
612 632
613 want_refresh = 1; 633 want_refresh = 1;
614 num_scr += count; 634 num_scr += count;
615 635
616 if (count > 0 636 if (count > 0
617 && row1 == 0 637 && row1 == 0
618 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 638 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
619 { 639 {
620 top_row = max (top_row - count, -saveLines); 640 top_row = max (top_row - count, -saveLines);
621 641
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines 642 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 643 term_start = (term_start + count) % total_rows;
626 644
645 // sever bottommost line
627 { 646 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count); 647 line_t &l = ROW(row2 - count);
648 l.is_longer (0);
630 l.touch (); 649 l.touch ();
631 l.is_longer (0);
632 } 650 }
633 651
634 // erase newly scorlled-in lines 652 // erase newly scrolled-in lines
635 for (int i = count; i; --i ) 653 for (int i = count; i--; )
636 { 654 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i); 655 line_t &l = ROW(nrow - 1 - i);
640 656
657 // optimize if already cleared, can be significant on slow machines
658 // could be rolled into scr_blank_screen_mem
659 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
660 {
641 scr_blank_line (l, 0, l.l, rstyle); 661 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 662 l.l = 0;
644 l.f = 0; 663 l.f = 0;
664 }
665 else
666 scr_blank_screen_mem (l, rstyle);
645 } 667 }
646 668
647 // now copy lines below the scroll region bottom to the 669 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 670 // bottom of the screen again, so they look as if they
649 // hadn't moved. 671 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 675 line_t &l2 = ROW(i);
654 676
655 ::swap (l1, l2); 677 ::swap (l1, l2);
656 l2.touch (); 678 l2.touch ();
657 } 679 }
658 680
659 // move and/or clear selection, if any 681 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 682 if (selection.op && current_screen == selection.screen)
661 { 683 {
662 selection.beg.row -= count; 684 selection.beg.row -= count;
663 selection.end.row -= count; 685 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 693 selection.op = SELECTION_CLEAR;
672 } 694 }
673 } 695 }
674 696
675 // finally move the view window, if desired 697 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 699 && view_start != 0
678 && view_start != -saveLines) 700 && view_start != -saveLines)
679 scr_page (UP, count); 701 scr_page (UP, count);
702
703 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
704 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
680 } 705 }
681 else 706 else
682 { 707 {
683 if (selection.op && current_screen == selection.screen) 708 if (selection.op && current_screen == selection.screen)
684 { 709 {
… …
696 { 721 {
697 /* move selected region too */ 722 /* move selected region too */
698 selection.beg.row -= count; 723 selection.beg.row -= count;
699 selection.end.row -= count; 724 selection.end.row -= count;
700 selection.mark.row -= count; 725 selection.mark.row -= count;
701 726
702 selection_check (0); 727 selection_check (0);
703 } 728 }
704 } 729 }
705 730
706 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
… …
730/* ------------------------------------------------------------------------- */ 755/* ------------------------------------------------------------------------- */
731/* 756/*
732 * Add text given in <str> of length <len> to screen struct 757 * Add text given in <str> of length <len> to screen struct
733 */ 758 */
734void 759void
735rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 760rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
736{ 761{
737 if (len <= 0) /* sanity */ 762 if (len <= 0) /* sanity */
738 return; 763 return;
739 764
740 unsigned char checksel; 765 unsigned char checksel;
… …
746 ZERO_SCROLLBACK (); 771 ZERO_SCROLLBACK ();
747 772
748 if (minlines > 0) 773 if (minlines > 0)
749 { 774 {
750 minlines += screen.cur.row - screen.bscroll; 775 minlines += screen.cur.row - screen.bscroll;
776 min_it (minlines, screen.cur.row - top_row);
751 777
752 if (minlines > 0 778 if (minlines > 0
753 && screen.tscroll == 0 779 && screen.tscroll == 0
754 && screen.bscroll == nrow - 1) 780 && screen.bscroll == nrow - 1)
755 { 781 {
… …
772 798
773 while (str < strend) 799 while (str < strend)
774 { 800 {
775 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 801 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
776 802
777 if (c < 0x20) 803 if (expect_false (c < 0x20))
778 if (c == C0_LF) 804 if (c == C0_LF)
779 { 805 {
780 max_it (line->l, screen.cur.col); 806 max_it (line->l, screen.cur.col);
781 807
782 screen.flags &= ~Screen_WrapNext; 808 screen.flags &= ~Screen_WrapNext;
… …
801 { 827 {
802 scr_tab (1, true); 828 scr_tab (1, true);
803 continue; 829 continue;
804 } 830 }
805 831
832 if (expect_false (
806 if (checksel /* see if we're writing within selection */ 833 checksel /* see if we're writing within selection */
807 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 834 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
808 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 835 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
836 ))
809 { 837 {
810 checksel = 0; 838 checksel = 0;
811 /* 839 /*
812 * If we wrote anywhere in the selected area, kill the selection 840 * If we wrote anywhere in the selected area, kill the selection
813 * XXX: should we kill the mark too? Possibly, but maybe that 841 * XXX: should we kill the mark too? Possibly, but maybe that
814 * should be a similar check. 842 * should be a similar check.
815 */ 843 */
816 CLEAR_SELECTION (); 844 CLEAR_SELECTION ();
817 } 845 }
818 846
819 if (screen.flags & Screen_WrapNext) 847 if (expect_false (screen.flags & Screen_WrapNext))
820 { 848 {
849 scr_do_wrap ();
850
821 max_it (line->l, ncol); 851 line->l = ncol;
822 line->is_longer (1); 852 line->is_longer (1);
823 853
824 scr_do_wrap ();
825
826 row = screen.cur.row; 854 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */ 855 line = &ROW(row); /* _must_ refresh */
828 } 856 }
829 857
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 858 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 859 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
832 c = 0xfffd; 860 c = 0xfffd;
833 861
834 // rely on wcwidth to tell us the character width, at least for non-latin1 862 // rely on wcwidth to tell us the character width, do wcwidth before
835 // do wcwidth before further replacements, as wcwidth might return -1 863 // further replacements, as wcwidth might return -1 for the line
836 // for the line drawing characters below as they might be invalid in the current 864 // drawing characters below as they might be invalid in the current
837 // locale. 865 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c); 866 int width = WCWIDTH (c);
839 867
840 if (charsets [screen.charset] == '0') // DEC SPECIAL 868 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
841 { 869 {
842 // vt100 special graphics and line drawing 870 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100 871 // 5f-7e standard vt100
844 // 40-5e rxvt extension for extra curses acs chars 872 // 40-5e rxvt extension for extra curses acs chars
845 static uint16_t vt100_0[62] = { // 41 .. 7e 873 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
858 c = vt100_0[c - 0x41]; 886 c = vt100_0[c - 0x41];
859 width = 1; // vt100 line drawing characters are always single-width 887 width = 1; // vt100 line drawing characters are always single-width
860 } 888 }
861 } 889 }
862 890
863 if (screen.flags & Screen_Insert) 891 if (expect_false (screen.flags & Screen_Insert))
864 scr_insdel_chars (width, INSERT); 892 scr_insdel_chars (width, INSERT);
865 893
866 if (width != 0) 894 if (width != 0)
867 { 895 {
868#if !UNICODE_3 896#if !UNICODE_3
… …
874 c = 0xfffd; 902 c = 0xfffd;
875# endif 903# endif
876#endif 904#endif
877 905
878 // nuke the character at this position, if required 906 // nuke the character at this position, if required
907 if (expect_false (
879 if (line->t[screen.cur.col] == NOCHAR 908 line->t[screen.cur.col] == NOCHAR
880 || (screen.cur.col < ncol - 1 909 || (screen.cur.col < ncol - 1
881 && line->t[screen.cur.col + 1] == NOCHAR)) 910 && line->t[screen.cur.col + 1] == NOCHAR)
911 ))
912 scr_kill_char (*line, screen.cur.col);
913
914 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
915
916 // if the character doesn't fit into the remaining columns...
917 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
882 { 918 {
883 int col = screen.cur.col; 919 // ... artificially enlargen the previous one
884
885 // find begin
886 while (col > 0 && line->t[col] == NOCHAR)
887 col--;
888
889 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
890
891 // found begin, nuke
892 do {
893 line->t[col] = ' ';
894 line->r[col] = rend;
895 col++;
896 } while (col < ncol && line->t[col] == NOCHAR);
897 }
898
899 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
900
901 // if the character doesn't fit into the remaining columns...
902 if (screen.cur.col > ncol - width && ncol >= width)
903 {
904 // ...output spaces
905 c = ' '; 920 c = NOCHAR;
906 // and try the same character next loop iteration 921 // and try the same character next loop iteration
907 --str; 922 --str;
908 } 923 }
909 924
910 line->touch (); 925 line->touch ();
… …
912 do 927 do
913 { 928 {
914 line->t[screen.cur.col] = c; 929 line->t[screen.cur.col] = c;
915 line->r[screen.cur.col] = rend; 930 line->r[screen.cur.col] = rend;
916 931
917 if (screen.cur.col < ncol - 1) 932 if (expect_true (screen.cur.col < ncol - 1))
918 screen.cur.col++; 933 screen.cur.col++;
919 else 934 else
920 { 935 {
921 line->l = ncol; 936 line->l = ncol;
922 if (screen.flags & Screen_Autowrap) 937 if (screen.flags & Screen_Autowrap)
… …
924 break; 939 break;
925 } 940 }
926 941
927 c = NOCHAR; 942 c = NOCHAR;
928 } 943 }
929 while (--width > 0); 944 while (expect_false (--width > 0));
930 945
931 // pad with spaces when overwriting wide character with smaller one 946 // pad with spaces when overwriting wide character with smaller one
932 if (!width) 947 if (expect_false (!width))
933 { 948 {
934 line->touch (); 949 line->touch ();
935 950
936 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 951 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
937 { 952 {
938 line->t[c] = ' '; 953 line->t[c] = ' ';
939 line->r[c] = rend; 954 line->r[c] = rend;
940 } 955 }
941 } 956 }
942 } 957 }
958#if ENABLE_COMBINING
943 else // width == 0 959 else // width == 0
944 { 960 {
945#if ENABLE_COMBINING 961 if (c != 0xfeff) // ignore BOM
946 // handle combining characters
947 // we just tag the accent on the previous on-screen character.
948 // this is arguably not correct, but also arguably not wrong.
949 // we don't handle double-width characters nicely yet.
950 line_t *linep;
951 text_t *tp;
952 rend_t *rp;
953
954 if (screen.cur.col > 0)
955 { 962 {
963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
970
971 if (screen.cur.col > 0)
972 {
956 linep = line; 973 linep = line;
957 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
958 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
959 } 999 }
960 else if (screen.cur.row > 0
961 && ROW(screen.cur.row - 1).is_longer ())
962 {
963 linep = &ROW(screen.cur.row - 1);
964 tp = line->t + ncol - 1;
965 rp = line->r + ncol - 1;
966 } 1000 }
967 else
968 continue;
969
970 linep->touch ();
971
972 while (*tp == NOCHAR && tp > linep->t)
973 tp--, rp--;
974
975 // first try to find a precomposed character
976 unicode_t n = rxvt_compose (*tp, c);
977 if (n == NOCHAR)
978 n = rxvt_composite.compose (*tp, c);
979
980 *tp = n;
981 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
982#endif 1001#endif
983 }
984 } 1002 }
985 1003
986 max_it (line->l, screen.cur.col); 1004 max_it (line->l, screen.cur.col);
987 1005
988#ifdef DEBUG_STRICT 1006#ifdef DEBUG_STRICT
… …
994/* 1012/*
995 * Process Backspace. Move back the cursor back a position, wrap if have to 1013 * Process Backspace. Move back the cursor back a position, wrap if have to
996 * XTERM_SEQ: CTRL-H 1014 * XTERM_SEQ: CTRL-H
997 */ 1015 */
998void 1016void
999rxvt_term::scr_backspace () 1017rxvt_term::scr_backspace () NOTHROW
1000{ 1018{
1001 want_refresh = 1;
1002
1003 if (screen.cur.col == 0) 1019 if (screen.cur.col == 0)
1004 { 1020 {
1005 if (screen.cur.row > 0) 1021 if (screen.cur.row > 0)
1006 { 1022 {
1007#ifdef TERMCAP_HAS_BW 1023#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = ncol - 1; 1024 screen.cur.col = ncol - 1;
1009 screen.cur.row--; 1025 --screen.cur.row;
1010 return; 1026
1027 want_refresh = 1;
1011#endif 1028#endif
1012 } 1029 }
1013 } 1030 }
1014 else if (!(screen.flags & Screen_WrapNext)) 1031 else
1015 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
1016
1017 screen.flags &= ~Screen_WrapNext;
1018} 1033}
1019 1034
1020/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
1021/* 1036/*
1022 * Process Horizontal Tab 1037 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
1025 */ 1040 */
1026void 1041void
1027rxvt_term::scr_tab (int count, bool ht) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1043{
1029 int i, x; 1044 int i, x;
1030 1045
1031 want_refresh = 1; 1046 want_refresh = 1;
1032 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
… …
1045 x = i; 1060 x = i;
1046 1061
1047 if (!--count) 1062 if (!--count)
1048 break; 1063 break;
1049 } 1064 }
1050 else 1065 else
1051 ht &= l.t[i] == ' ' 1066 ht &= l.t[i] == ' '
1052 && RS_SAME (l.r[i], base_rend); 1067 && RS_SAME (l.r[i], base_rend);
1053 1068
1054 if (count) 1069 if (count)
1055 x = ncol - 1; 1070 x = ncol - 1;
1056 1071
1057 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1058 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1059 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1060 { 1075 {
1061 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1062 1077
1063 l.touch (x); 1078 l.touch (x);
1064 1079
… …
1097 * Process DEC Back Index 1112 * Process DEC Back Index
1098 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1099 * 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
1100 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1101 */ 1116 */
1102#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1103void 1118void
1104rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1105{ 1120{
1106 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108 else 1123 else
1109 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
… …
1114 * Process DEC Forward Index 1129 * Process DEC Forward Index
1115 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1116 * 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
1117 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1118 */ 1133 */
1119#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1120void 1135void
1121rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1122{ 1137{
1123 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125 else 1140 else
1126 { 1141 {
… …
1139/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1140/* 1155/*
1141 * Goto Row/Column 1156 * Goto Row/Column
1142 */ 1157 */
1143void 1158void
1144rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145{ 1160{
1146 want_refresh = 1; 1161 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1148 1163
1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1171 } 1186 }
1172 } 1187 }
1173 else 1188 else
1174 { 1189 {
1175 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1176 { /* relative origin mode */ 1192 /* relative origin mode */
1177 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1178 min_it (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1179 } 1195 }
1180 else 1196 else
1181 screen.cur.row = row; 1197 screen.cur.row = row;
… …
1187/* ------------------------------------------------------------------------- */ 1203/* ------------------------------------------------------------------------- */
1188/* 1204/*
1189 * direction should be UP or DN 1205 * direction should be UP or DN
1190 */ 1206 */
1191void 1207void
1192rxvt_term::scr_index (enum page_dirn direction) 1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193{ 1209{
1194 int dirn; 1210 int dirn;
1195 1211
1196 want_refresh = 1; 1212 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1213 ZERO_SCROLLBACK ();
… …
1214/* 1230/*
1215 * Erase part or whole of a line 1231 * Erase part or whole of a line
1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1219 */ 1236 */
1220void 1237void
1221rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1222{ 1239{
1223 unsigned int col, num; 1240 unsigned int col, num;
1224 1241
1225 want_refresh = 1; 1242 want_refresh = 1;
1226 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
… …
1232 line.touch (); 1249 line.touch ();
1233 line.is_longer (0); 1250 line.is_longer (0);
1234 1251
1235 switch (mode) 1252 switch (mode)
1236 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1237 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1238 col = screen.cur.col; 1261 col = screen.cur.col;
1239 num = ncol - col; 1262 num = ncol - col;
1240 min_it (line.l, col); 1263 min_it (line.l, col);
1264
1241 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1242 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1243 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1244 break; 1268 break;
1269
1245 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1246 col = 0; 1271 col = 0;
1247 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1248 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1249 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1250 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1251 break; 1277 break;
1278
1252 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1253 col = 0; 1280 col = 0;
1254 num = ncol; 1281 num = ncol;
1255 line.l = 0; 1282 line.l = 0;
1256 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
… …
1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273 */ 1300 */
1274void 1301void
1275rxvt_term::scr_erase_screen (int mode) 1302rxvt_term::scr_erase_screen (int mode) NOTHROW
1276{ 1303{
1277 int num; 1304 int num;
1278 int32_t row; 1305 int32_t row;
1279 rend_t ren; 1306 rend_t ren;
1280 XGCValues gcvalue; 1307 XGCValues gcvalue;
… …
1314 if (row >= nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1315 return; 1342 return;
1316 1343
1317 min_it (num, nrow - row); 1344 min_it (num, nrow - row);
1318 1345
1346 // TODO: the code below does not work when view_start != 0
1347 // the workaround is to disable the clear and use a normal refresh
1348 // when view_start != 0. mysterious.
1319 if (rstyle & (RS_RVid | RS_Uline)) 1349 if (rstyle & (RS_RVid | RS_Uline))
1320 ren = (rend_t) ~RS_None; 1350 ren = (rend_t) ~RS_None;
1321 else if (GET_BASEBG (rstyle) == Color_bg) 1351 else if (GET_BASEBG (rstyle) == Color_bg)
1322 { 1352 {
1323 ren = DEFAULT_RSTYLE; 1353 ren = DEFAULT_RSTYLE;
1324 CLEAR_ROWS (row, num); 1354
1355 if (mapped && !view_start)
1356 XClearArea (dpy, vt, 0,
1357 Row2Pixel (row - view_start), (unsigned int)width,
1358 (unsigned int)Height2Pixel (num), False);
1325 } 1359 }
1326 else 1360 else
1327 { 1361 {
1328 ren = rstyle & (RS_fgMask | RS_bgMask); 1362 ren = rstyle & (RS_fgMask | RS_bgMask);
1363
1364 if (mapped && !view_start)
1365 {
1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1366 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1367 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1331 ERASE_ROWS (row, num); 1368 XFillRectangle (dpy, vt, gc,
1369 0, Row2Pixel (row - view_start),
1370 (unsigned int)width,
1371 (unsigned int)Height2Pixel (num));
1332 gcvalue.foreground = pix_colors[Color_fg]; 1372 gcvalue.foreground = pix_colors[Color_fg];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1373 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1374 }
1334 } 1375 }
1335 1376
1336 for (; num--; row++) 1377 for (; num--; row++)
1337 { 1378 {
1338 scr_blank_screen_mem (ROW(row), rstyle); 1379 scr_blank_screen_mem (ROW(row), rstyle);
1380
1381 if (!view_start)
1339 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1382 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1340 } 1383 }
1341} 1384}
1342 1385
1343#if ENABLE_FRILLS 1386#if !ENABLE_MINIMAL
1344void 1387void
1345rxvt_term::scr_erase_savelines () 1388rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1389{
1347 want_refresh = 1; 1390 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1391 ZERO_SCROLLBACK ();
1349 1392
1350 top_row = 0; 1393 top_row = 0;
… …
1355/* 1398/*
1356 * Fill the screen with `E's 1399 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1400 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1401 */
1359void 1402void
1360rxvt_term::scr_E () 1403rxvt_term::scr_E () NOTHROW
1361{ 1404{
1362 rend_t fs; 1405 rend_t fs;
1363 1406
1364 want_refresh = 1; 1407 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1387/* 1430/*
1388 * Insert/Delete <count> lines 1431 * Insert/Delete <count> lines
1389 */ 1432 */
1390void 1433void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1434rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1435{
1393 int end; 1436 int end;
1394 1437
1395 ZERO_SCROLLBACK (); 1438 ZERO_SCROLLBACK ();
1396 1439
… …
1416/* ------------------------------------------------------------------------- */ 1459/* ------------------------------------------------------------------------- */
1417/* 1460/*
1418 * Insert/Delete <count> characters from the current position 1461 * Insert/Delete <count> characters from the current position
1419 */ 1462 */
1420void 1463void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1464rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1465{
1423 int col, row;
1424 rend_t tr;
1425
1426 want_refresh = 1; 1466 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1467 ZERO_SCROLLBACK ();
1428 1468
1429 if (count <= 0) 1469 if (count <= 0)
1430 return; 1470 return;
… …
1432 scr_do_wrap (); 1472 scr_do_wrap ();
1433 1473
1434 selection_check (1); 1474 selection_check (1);
1435 min_it (count, ncol - screen.cur.col); 1475 min_it (count, ncol - screen.cur.col);
1436 1476
1437 row = screen.cur.row; 1477 int row = screen.cur.row;
1438 1478
1439 line_t *line = &ROW(row); 1479 line_t *line = &ROW(row);
1440 1480
1441 line->touch (); 1481 line->touch ();
1442 line->is_longer (0); 1482 line->is_longer (0);
1443 1483
1484 // nuke wide spanning the start
1485 if (line->t[screen.cur.col] == NOCHAR)
1486 scr_kill_char (*line, screen.cur.col);
1487
1444 switch (insdel) 1488 switch (insdel)
1445 { 1489 {
1446 case INSERT: 1490 case INSERT:
1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1491 line->l = min (line->l + count, ncol);
1492
1493 if (line->t[screen.cur.col] == NOCHAR)
1494 scr_kill_char (*line, screen.cur.col);
1495
1496 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1448 { 1497 {
1449 line->t[col] = line->t[col - count]; 1498 line->t[col] = line->t[col - count];
1450 line->r[col] = line->r[col - count]; 1499 line->r[col] = line->r[col - count];
1451 } 1500 }
1452
1453 line->l = min (line->l + count, ncol);
1454 1501
1455 if (selection.op && current_screen == selection.screen 1502 if (selection.op && current_screen == selection.screen
1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1503 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1457 { 1504 {
1458 if (selection.end.row != screen.cur.row 1505 if (selection.end.row != screen.cur.row
1459 || (selection.end.col + count >= ncol)) 1506 || (selection.end.col + count >= ncol))
1460 CLEAR_SELECTION (); 1507 CLEAR_SELECTION ();
1461 else 1508 else
1509 {
1462 { /* shift selection */ 1510 /* shift selection */
1463 selection.beg.col += count; 1511 selection.beg.col += count;
1464 selection.mark.col += count; /* XXX: yes? */ 1512 selection.mark.col += count; /* XXX: yes? */
1465 selection.end.col += count; 1513 selection.end.col += count;
1466 } 1514 }
1467 } 1515 }
… …
1472 case ERASE: 1520 case ERASE:
1473 screen.cur.col += count; /* don't worry if > ncol */ 1521 screen.cur.col += count; /* don't worry if > ncol */
1474 selection_check (1); 1522 selection_check (1);
1475 screen.cur.col -= count; 1523 screen.cur.col -= count;
1476 1524
1477 line->l = max (line->l - count, 0); 1525 // nuke wide char after the end
1526 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1527 scr_kill_char (*line, screen.cur.col + count);
1528
1478 scr_blank_line (*line, screen.cur.col, count, rstyle); 1529 scr_blank_line (*line, screen.cur.col, count, rstyle);
1479 break; 1530 break;
1480 1531
1481 case DELETE: 1532 case DELETE:
1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1533 line->l = max (line->l - count, 0);
1483 1534
1535 // nuke wide char spanning the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1538
1484 for (col = screen.cur.col; (col + count) < ncol; col++) 1539 for (int col = screen.cur.col; (col + count) < ncol; col++)
1485 { 1540 {
1486 line->t[col] = line->t[col + count]; 1541 line->t[col] = line->t[col + count];
1487 line->r[col] = line->r[col + count]; 1542 line->r[col] = line->r[col + count];
1488 } 1543 }
1489 1544
1490 line->l = max (line->l - count, 0);
1491 scr_blank_line (*line, ncol - count, count, tr); 1545 scr_blank_line (*line, ncol - count, count, rstyle);
1492 1546
1493 if (selection.op && current_screen == selection.screen 1547 if (selection.op && current_screen == selection.screen
1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1548 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1495 { 1549 {
1496 if (selection.end.row != screen.cur.row 1550 if (selection.end.row != screen.cur.row
… …
1514/* 1568/*
1515 * Set the scrolling region 1569 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1570 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1571 */
1518void 1572void
1519rxvt_term::scr_scroll_region (int top, int bot) 1573rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1574{
1521 max_it (top, 0); 1575 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1576 min_it (bot, nrow - 1);
1523 1577
1524 if (top > bot) 1578 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1588 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1589 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1590 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1591 */
1538void 1592void
1539rxvt_term::scr_cursor_visible (int mode) 1593rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1594{
1541 want_refresh = 1; 1595 want_refresh = 1;
1542 1596
1543 if (mode) 1597 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1598 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1605 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1606 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1607 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1608 */
1555void 1609void
1556rxvt_term::scr_autowrap (int mode) 1610rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1611{
1558 if (mode) 1612 if (mode)
1559 screen.flags |= Screen_Autowrap; 1613 screen.flags |= Screen_Autowrap;
1560 else 1614 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1615 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1624 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1625 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1626 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1627 */
1574void 1628void
1575rxvt_term::scr_relative_origin (int mode) 1629rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1630{
1577 if (mode) 1631 if (mode)
1578 screen.flags |= Screen_Relative; 1632 screen.flags |= Screen_Relative;
1579 else 1633 else
1580 screen.flags &= ~Screen_Relative; 1634 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1641 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1642 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1643 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1644 */
1591void 1645void
1592rxvt_term::scr_insert_mode (int mode) 1646rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1647{
1594 if (mode) 1648 if (mode)
1595 screen.flags |= Screen_Insert; 1649 screen.flags |= Screen_Insert;
1596 else 1650 else
1597 screen.flags &= ~Screen_Insert; 1651 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1657 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1658 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1659 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1660 */
1607void 1661void
1608rxvt_term::scr_set_tab (int mode) 1662rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1663{
1610 if (mode < 0) 1664 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1665 memset (tabs, 0, ncol);
1612 else if (screen.cur.col < ncol) 1666 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1667 tabs [screen.cur.col] = !!mode;
1614} 1668}
1615 1669
1616/* ------------------------------------------------------------------------- */ 1670/* ------------------------------------------------------------------------- */
… …
1618 * Set reverse/normal video 1672 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1673 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1674 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1675 */
1622void 1676void
1623rxvt_term::scr_rvideo_mode (int mode) 1677rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1678{
1625 XGCValues gcvalue; 1679 rvideo_mode = on;
1626 1680
1681#ifndef NO_BELL
1682 on ^= rvideo_bell;
1683#endif
1684
1627 if (rvideo != mode) 1685 if (rvideo_state != on)
1628 { 1686 {
1629 rvideo = mode; 1687 rvideo_state = on;
1688
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1689 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1690#ifdef HAVE_BG_PIXMAP
1632 if (bgPixmap.pixmap == None) 1691 if (bgPixmap.pixmap == None)
1633#endif 1692#endif
1634#if TRANSPARENT 1693 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1636#endif
1637 XSetWindowBackground (display->display, vt,
1638 pix_colors[Color_bg]);
1639 1694
1695 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1696 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1697 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1698 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1699
1644 scr_clear (); 1700 scr_clear ();
1645 scr_touch (true); 1701 scr_touch (true);
1646 } 1702 }
1647} 1703}
1648 1704
… …
1650/* 1706/*
1651 * Report current cursor position 1707 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1708 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1709 */
1654void 1710void
1655rxvt_term::scr_report_position () 1711rxvt_term::scr_report_position () NOTHROW
1656{ 1712{
1657 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1713 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1658} 1714}
1659 1715
1660/* ------------------------------------------------------------------------- * 1716/* ------------------------------------------------------------------------- *
… …
1663 1719
1664/* 1720/*
1665 * Set font style 1721 * Set font style
1666 */ 1722 */
1667void 1723void
1668rxvt_term::set_font_style () 1724rxvt_term::set_font_style () NOTHROW
1669{ 1725{
1670#if 0 1726#if 0
1671 switch (charsets [screen.charset]) 1727 switch (charsets [screen.charset])
1672 { 1728 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1729 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1751 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1752 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1753 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1754 */
1699void 1755void
1700rxvt_term::scr_charset_choose (int set) 1756rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1757{
1702 screen.charset = set; 1758 screen.charset = set;
1703 set_font_style (); 1759 set_font_style ();
1704} 1760}
1705 1761
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1767 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1768 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1769 * See set_font_style for possible values for <C>
1714 */ 1770 */
1715void 1771void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1772rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1773{
1718 charsets[set] = (unsigned char)ch; 1774 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1775 set_font_style ();
1720} 1776}
1721 1777
… …
1726 1782
1727/* 1783/*
1728 * refresh matching text. 1784 * refresh matching text.
1729 */ 1785 */
1730bool 1786bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1787rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1788{
1733 bool found = false; 1789 bool found = false;
1734 1790
1735 for (int i = 0; i < nrow; i++) 1791 for (int i = 0; i < nrow; i++)
1736 { 1792 {
1737 int col = 0;
1738 rend_t *drp = drawn_buf[i].r; 1793 rend_t *drp = drawn_buf[i].r;
1739 1794
1740 for (; col < ncol; col++, drp++) 1795 for (int col = 0; col < ncol; col++, drp++)
1741 if ((*drp & mask) == value) 1796 if ((*drp & mask) == value)
1742 { 1797 {
1743 found = true; 1798 found = true;
1744 *drp = ~value; 1799 *drp = ~value;
1745 } 1800 }
… …
1756 PART_END, 1811 PART_END,
1757 RC_COUNT 1812 RC_COUNT
1758}; 1813};
1759 1814
1760void 1815void
1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1816rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762{ 1817{
1763 int i; 1818 int i;
1764 row_col_t rc[RC_COUNT]; 1819 row_col_t rc[RC_COUNT];
1765 1820
1766 if (!drawn_buf) /* sanity check */ 1821 if (!drawn_buf) /* sanity check */
… …
1785 for (i = PART_BEG; i < RC_COUNT; i++) 1840 for (i = PART_BEG; i < RC_COUNT; i++)
1786 { 1841 {
1787 min_it (rc[i].col, ncol - 1); 1842 min_it (rc[i].col, ncol - 1);
1788 min_it (rc[i].row, nrow - 1); 1843 min_it (rc[i].row, nrow - 1);
1789 } 1844 }
1790 1845// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1846 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1847 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793 1848
1849 num_scr_allow = 0;
1850
1794 if (refresh) 1851 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1852 scr_refresh ();
1796} 1853}
1797 1854
1798/* ------------------------------------------------------------------------- */ 1855/* ------------------------------------------------------------------------- */
1799/* 1856/*
1800 * Refresh the entire screen 1857 * Refresh the entire screen
1801 */ 1858 */
1802void 1859void
1803rxvt_term::scr_touch (bool refresh) 1860rxvt_term::scr_touch (bool refresh) NOTHROW
1804{ 1861{
1805 scr_expose (0, 0, width, height, refresh); 1862 scr_expose (0, 0, width, height, refresh);
1806} 1863}
1807 1864
1808/* ------------------------------------------------------------------------- */ 1865/* ------------------------------------------------------------------------- */
1809/* 1866/*
1810 * Move the display so that the line represented by scrollbar value Y is at 1867 * Move the display so that the line represented by scrollbar value Y is at
1811 * the top of the screen 1868 * the top of the screen
1812 */ 1869 */
1813void 1870void
1814rxvt_term::scr_move_to (int y, int len) 1871rxvt_term::scr_move_to (int y, int len) NOTHROW
1815{ 1872{
1816 int p = len
1817 ? (top_row - nrow) * (len - y) / len + (nrow - 1) 1873 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1818 : 0;
1819
1820 scr_changeview (p);
1821} 1874}
1822 1875
1823/* ------------------------------------------------------------------------- */ 1876/* ------------------------------------------------------------------------- */
1824/* 1877/*
1825 * Page the screen up/down nlines 1878 * Page the screen up/down nlines
1826 * direction should be UP or DN 1879 * direction should be UP or DN
1827 */ 1880 */
1828bool 1881bool
1829rxvt_term::scr_page (enum page_dirn direction, int nlines) 1882rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830{ 1883{
1831 int new_view_start = 1884 int new_view_start =
1832 direction == UP ? view_start - nlines 1885 direction == UP ? view_start - nlines
1833 : view_start + nlines; 1886 : view_start + nlines;
1834 1887
1835 return scr_changeview (new_view_start); 1888 return scr_changeview (new_view_start);
1836} 1889}
1837 1890
1838bool 1891bool
1839rxvt_term::scr_changeview (int new_view_start) 1892rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1893{
1841 clamp_it (new_view_start, top_row, 0); 1894 clamp_it (new_view_start, top_row, 0);
1842 1895
1843 if (new_view_start == view_start) 1896 if (new_view_start == view_start)
1844 return false; 1897 return false;
1845 1898
1846 num_scr += new_view_start - view_start; 1899 num_scr += new_view_start - view_start;
1847 view_start = new_view_start; 1900 view_start = new_view_start;
1901 want_refresh = 1;
1902
1848 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1903 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1849 want_refresh = 1;
1850 1904
1851 return true; 1905 return true;
1852} 1906}
1853 1907
1854/* ------------------------------------------------------------------------- */ 1908#ifndef NO_BELL
1855void 1909void
1910rxvt_term::bell_cb (ev::timer &w, int revents)
1911{
1912 rvideo_bell = false;
1913 scr_rvideo_mode (rvideo_mode);
1914 refresh_check ();
1915}
1916#endif
1917
1918/* ------------------------------------------------------------------------- */
1919void
1856rxvt_term::scr_bell () 1920rxvt_term::scr_bell () NOTHROW
1857{ 1921{
1858#ifndef NO_BELL 1922#ifndef NO_BELL
1859 1923
1860# ifndef NO_MAPALERT 1924# ifndef NO_MAPALERT
1861# ifdef MAPALERT_OPTION 1925# ifdef MAPALERT_OPTION
1862 if (OPTION (Opt_mapAlert)) 1926 if (option (Opt_mapAlert))
1863# endif 1927# endif
1864 XMapWindow (display->display, parent[0]); 1928 XMapWindow (dpy, parent[0]);
1865# endif 1929# endif
1866 1930
1931# if ENABLE_FRILLS
1932 if (option (Opt_urgentOnBell))
1933 set_urgency (1);
1934# endif
1935
1867 if (OPTION (Opt_visualBell)) 1936 if (option (Opt_visualBell))
1868 { 1937 {
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1938 rvideo_bell = true;
1939 scr_rvideo_mode (rvideo_mode);
1870 display->flush (); 1940 flush ();
1941
1871 rxvt_usleep (VISUAL_BELL_DURATION); 1942 bell_ev.start (VISUAL_BELL_DURATION);
1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1873 } 1943 }
1874 else 1944 else
1875 XBell (display->display, 0); 1945 XBell (dpy, 0);
1876
1877#endif 1946#endif
1878} 1947}
1879 1948
1880/* ------------------------------------------------------------------------- */ 1949/* ------------------------------------------------------------------------- */
1881/* ARGSUSED */ 1950/* ARGSUSED */
1882void 1951void
1883rxvt_term::scr_printscreen (int fullhist) 1952rxvt_term::scr_printscreen (int fullhist) NOTHROW
1884{ 1953{
1885#ifdef PRINTPIPE 1954#ifdef PRINTPIPE
1886 int nrows, row_start; 1955 int nrows, row_start;
1887 FILE *fd; 1956 FILE *fd = popen_printer ();
1888 1957
1889 if ((fd = popen_printer ()) == NULL) 1958 if (!fd)
1890 return; 1959 return;
1891 1960
1892 if (fullhist) 1961 if (fullhist)
1893 { 1962 {
1894 nrows = nrow - top_row; 1963 nrows = nrow - top_row;
… …
1937 * Refresh the screen 2006 * Refresh the screen
1938 * drawn_text/drawn_rend contain the screen information before the update. 2007 * drawn_text/drawn_rend contain the screen information before the update.
1939 * screen.text/screen.rend contain what the screen will change to. 2008 * screen.text/screen.rend contain what the screen will change to.
1940 */ 2009 */
1941void 2010void
1942rxvt_term::scr_refresh (unsigned char refresh_type) 2011rxvt_term::scr_refresh () NOTHROW
1943{ 2012{
1944 unsigned char must_clear, /* use draw_string not draw_image_string */ 2013 unsigned char have_bg,
1945 showcursor; /* show the cursor */ 2014 showcursor; /* show the cursor */
1946 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
1947 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
1948 int i; /* tmp */ 2017 int i; /* tmp */
1949#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
1950 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
1951#endif 2020#endif
1952 rend_t *crp; // cursor rendition pointer 2021 rend_t *crp; // cursor rendition pointer
2022 rend_t ccol1, /* Cursor colour */
2023 ccol2; /* Cursor colour2 */
1953 2024
1954 want_refresh = 0; /* screen is current */ 2025 want_refresh = 0; /* screen is current */
1955 2026
1956 if (refresh_type == NO_REFRESH || !mapped) 2027 if (refresh_type == NO_REFRESH || !mapped)
1957 return; 2028 return;
1958 2029
1959 /* 2030 /*
1960 * A: set up vars 2031 * A: set up vars
1961 */ 2032 */
1962 must_clear = 0;
1963 refresh_count = 0; 2033 refresh_count = 0;
1964 2034
1965#if XPM_BACKGROUND 2035 have_bg = 0;
2036#ifdef HAVE_BG_PIXMAP
1966 must_clear |= bgPixmap.pixmap != None; 2037 have_bg = bgPixmap.pixmap != None;
1967#endif
1968#if TRANSPARENT
1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1970#endif 2038#endif
1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2039 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1972 2040
1973 /* 2041 /*
1974 * B: reverse any characters which are selected 2042 * B: reverse any characters which are selected
… …
1978 /* 2046 /*
1979 * C: set the cursor character (s) 2047 * C: set the cursor character (s)
1980 */ 2048 */
1981 { 2049 {
1982 unsigned char setoldcursor; 2050 unsigned char setoldcursor;
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1985 2051
1986 showcursor = (screen.flags & Screen_VisibleCursor); 2052 showcursor = (screen.flags & Screen_VisibleCursor);
1987#ifdef CURSOR_BLINK 2053#ifdef CURSOR_BLINK
1988 if (hidden_cursor) 2054 if (hidden_cursor)
1989 showcursor = 0; 2055 showcursor = 0;
… …
1996 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2062 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1997 col--; 2063 col--;
1998 2064
1999 crp = &ROW(screen.cur.row).r[col]; 2065 crp = &ROW(screen.cur.row).r[col];
2000 2066
2067#ifndef NO_CURSORCOLOR
2068 cc1 = *crp & (RS_fgMask | RS_bgMask);
2069 if (ISSET_PIXCOLOR (Color_cursor))
2070 ccol1 = Color_cursor;
2071 else
2072#endif
2073#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2074 ccol1 = fgcolor_of (rstyle);
2075#else
2076 ccol1 = Color_fg;
2077#endif
2078
2079#ifndef NO_CURSORCOLOR
2080 if (ISSET_PIXCOLOR (Color_cursor2))
2081 ccol2 = Color_cursor2;
2082 else
2083#endif
2084#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2085 ccol2 = bgcolor_of (rstyle);
2086#else
2087 ccol2 = Color_bg;
2088#endif
2089
2001 if (showcursor && focus) 2090 if (showcursor && focus)
2002 { 2091 {
2003 if (OPTION (Opt_cursorUnderline)) 2092 if (option (Opt_cursorUnderline))
2004 *crp ^= RS_Uline; 2093 *crp ^= RS_Uline;
2005 else 2094 else
2006 { 2095 {
2007 *crp ^= RS_RVid; 2096 *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); 2097 *crp = SET_FGCOLOR (*crp, ccol1);
2028 *crp = SET_BGCOLOR (*crp, ccol2); 2098 *crp = SET_BGCOLOR (*crp, ccol2);
2029#endif
2030 } 2099 }
2031 } 2100 }
2032 } 2101 }
2033 2102
2034 /* make sure no outline cursor is left around */ 2103 /* make sure no outline cursor is left around */
… …
2071#ifndef NO_SLOW_LINK_SUPPORT 2140#ifndef NO_SLOW_LINK_SUPPORT
2072 /* 2141 /*
2073 * D: CopyArea pass - very useful for slower links 2142 * D: CopyArea pass - very useful for slower links
2074 * This has been deliberately kept simple. 2143 * This has been deliberately kept simple.
2075 */ 2144 */
2076 i = num_scr;
2077 if (!display->is_local 2145 if (!display->is_local
2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2146 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2079 && abs (num_scr) < nrow && !must_clear) 2147 && abs (num_scr) < nrow && !have_bg)
2080 { 2148 {
2081 int16_t nits; 2149 int16_t nits;
2150 int i = num_scr;
2082 int j; 2151 int j;
2083 int len, wlen; 2152 int len, wlen;
2153 dLocal (int, num_scr);
2084 2154
2085 j = nrow; 2155 j = nrow;
2086 wlen = len = -1; 2156 wlen = len = -1;
2087 row = i > 0 ? 0 : j - 1; 2157 row = i > 0 ? 0 : j - 1;
2158
2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2159 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2089 { 2160 {
2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2161 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2091 { 2162 {
2092 line_t s = ROW(view_start + row); 2163 line_t s = ROW(view_start + row);
… …
2113 wlen = row; 2184 wlen = row;
2114 continue; 2185 continue;
2115 } 2186 }
2116 } 2187 }
2117 2188
2118 if (len != -1) 2189 if (len >= 0)
2119 { 2190 {
2120 /* also comes here at end if needed because of >= above */ 2191 /* also comes here at end if needed because of >= above */
2121 if (wlen < len) 2192 if (wlen < len)
2122 ::swap (wlen, len); 2193 ::swap (wlen, len);
2123 2194
2195 XGCValues gcv;
2196
2197 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2124 XCopyArea (display->display, vt, vt, 2198 XCopyArea (dpy, vt, vt,
2125 gc, 0, Row2Pixel (len + i), 2199 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)this->width, 2200 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2201 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2202 0, Row2Pixel (len));
2203 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2204
2129 len = -1; 2205 len = -1;
2130 } 2206 }
2131 } 2207 }
2132 } 2208 }
2133#endif 2209#endif
… …
2157 continue; 2233 continue;
2158 2234
2159 // redraw one or more characters 2235 // redraw one or more characters
2160 2236
2161 // seek to the beginning of wide characters 2237 // seek to the beginning of wide characters
2162 while (stp[col] == NOCHAR && col > 0) 2238 while (expect_false (stp[col] == NOCHAR && col > 0))
2163 --col; 2239 --col;
2164 2240
2165 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2241 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2166 text_t *text = stp + col; 2242 text_t *text = stp + col;
2167 int count = 1; 2243 int count = 1;
… …
2189 count++; 2265 count++;
2190 2266
2191 if (stp[col] != dtp[col] 2267 if (stp[col] != dtp[col]
2192 || !RS_SAME (srp[col], drp[col])) 2268 || !RS_SAME (srp[col], drp[col]))
2193 { 2269 {
2194 if (must_clear && (i++ > count / 2)) 2270 if (have_bg && (i++ > count / 2))
2195 break; 2271 break;
2196 2272
2197 dtp[col] = stp[col]; 2273 dtp[col] = stp[col];
2198 drp[col] = rend; 2274 drp[col] = rend;
2199 i = 0; 2275 i = 0;
2200 } 2276 }
2201 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2277 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2202 break; 2278 break;
2203 } 2279 }
2204 2280
2205 col--; /* went one too far. move back */ 2281 col--; /* went one too far. move back */
2206 count -= i; /* dump any matching trailing chars */ 2282 count -= i; /* dump any matching trailing chars */
2207 2283
2208 // sometimes we optimize away the trailing NOCHAR's, add them back 2284 // sometimes we optimize away the trailing NOCHAR's, add them back
2209 while (i && text[count] == NOCHAR) 2285 while (expect_false (i && text[count] == NOCHAR))
2210 count++, i--; 2286 count++, i--;
2211 2287
2212 /* 2288 /*
2213 * Determine the attributes for the string 2289 * Determine the attributes for the string
2214 */ 2290 */
2215 int fore = fgcolor_of (rend); // desired foreground 2291 int fore = fgcolor_of (rend); // desired foreground
2216 int back = bgcolor_of (rend); // desired background 2292 int back = bgcolor_of (rend); // desired background
2217 2293
2218 // only do special processing if any attributes are set, which is unlikely 2294 // 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)) 2295 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2220 { 2296 {
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; 2297 bool invert = rend & RS_RVid;
2234 2298
2235#ifndef NO_BOLD_UNDERLINE_REVERSE 2299#ifndef NO_BOLD_UNDERLINE_REVERSE
2236 if (rend & RS_Bold
2237 && fore == Color_fg) 2300 if (rend & RS_Bold && fore == Color_fg)
2238 { 2301 {
2239 if (ISSET_PIXCOLOR (Color_BD)) 2302 if (ISSET_PIXCOLOR (Color_BD))
2240 fore = Color_BD; 2303 fore = Color_BD;
2241# if !ENABLE_STYLES 2304# if !ENABLE_STYLES
2242 else 2305 else
2243 invert = !invert; 2306 invert = !invert;
2244# endif 2307# endif
2245 } 2308 }
2246 2309
2247 if (rend & RS_Italic 2310 if (rend & RS_Italic && fore == Color_fg)
2248 && fore == Color_fg)
2249 { 2311 {
2250 if (ISSET_PIXCOLOR (Color_IT)) 2312 if (ISSET_PIXCOLOR (Color_IT))
2251 fore = Color_IT; 2313 fore = Color_IT;
2252# if !ENABLE_STYLES 2314# if !ENABLE_STYLES
2253 else 2315 else
2254 invert = !invert; 2316 invert = !invert;
2255# endif 2317# endif
2256 } 2318 }
2257 2319
2258 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2320 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2259 fore = Color_UL; 2321 fore = Color_UL;
2260#endif 2322#endif
2261 2323
2262 if (invert) 2324 if (invert)
2263 { 2325 {
2326#ifdef OPTION_HC
2327 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2328 || !ISSET_PIXCOLOR (Color_HC))
2329#endif
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2264 ::swap (fore, back); 2332 ::swap (fore, back);
2333#ifdef OPTION_HC
2334 else if (ISSET_PIXCOLOR (Color_HC))
2335 back = Color_HC;
2336#endif
2265 2337
2266#ifndef NO_BOLD_UNDERLINE_REVERSE 2338#ifndef NO_BOLD_UNDERLINE_REVERSE
2339# ifndef OPTION_HC
2267 if (ISSET_PIXCOLOR (Color_RV)) 2340 if (ISSET_PIXCOLOR (Color_RV))
2268 back = Color_RV; 2341 back = Color_RV;
2269 2342# endif
2270 if (fore == back) 2343 if (fore == back)
2271 { 2344 {
2272 fore = Color_bg; 2345 fore = Color_bg;
2273 back = Color_fg; 2346 back = Color_fg;
2274 } 2347 }
… …
2276 } 2349 }
2277 2350
2278#ifdef TEXT_BLINK 2351#ifdef TEXT_BLINK
2279 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2352 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2280 { 2353 {
2281 if (!text_blink_ev.active) 2354 if (!text_blink_ev.is_active ())
2282 { 2355 {
2283 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2356 text_blink_ev.again ();
2284 hidden_text = 0; 2357 hidden_text = 0;
2285 } 2358 }
2286 else if (hidden_text) 2359 else if (hidden_text)
2287 fore = back; 2360 fore = back;
2288 } 2361 }
2289#endif 2362#endif
2363
2364#if ENABLE_STYLES
2365 // "careful" (too wide) character handling
2366
2367 // include previous careful character(s) if possible, looks nicer (best effort...)
2368 while (text > stp
2369 && srp[text - stp - 1] & RS_Careful
2370 && RS_SAME (rend, srp[text - stp - 1]))
2371 text--, count++, xpixel -= fwidth;
2372
2373 // force redraw after "careful" characters to avoid pixel droppings
2374 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2375 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2376
2377 // force redraw before "careful" characters to avoid pixel droppings
2378 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2379 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2380#endif
2290 } 2381 }
2291 2382
2292 /* 2383 /*
2293 * Actually do the drawing of the string here 2384 * Actually do the drawing of the string here
2294 */ 2385 */
2295 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2386 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2296 2387
2297 if (back == fore) 2388 if (expect_true (have_bg && back == Color_bg))
2298 font->clear_rect (*drawable, xpixel, ypixel,
2299 fwidth * count, fheight,
2300 back);
2301 else if (back == Color_bg)
2302 { 2389 {
2303 if (must_clear) 2390 // this is very ugly, maybe push it into ->draw?
2304 {
2305 CLEAR_CHARS (xpixel, ypixel, count);
2306 2391
2307 for (i = 0; i < count; i++) /* don't draw empty strings */ 2392 for (i = 0; i < count; i++) /* don't draw empty strings */
2308 if (text[i] != ' ') 2393 if (text[i] != ' ')
2309 { 2394 {
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2395 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2311 break; 2396 goto did_clear;
2312 }
2313 } 2397 }
2314 else 2398
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2399 CLEAR_CHARS (xpixel, ypixel, count);
2400 did_clear: ;
2316 } 2401 }
2317 else 2402 else
2318 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2403 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2319 2404
2320 if (rend & RS_Uline && font->descent > 1 && fore != back) 2405 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2321 { 2406 {
2322#if ENABLE_FRILLS 2407#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline)) 2408 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2409 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2325 else 2410 else
2326#endif 2411#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]); 2412 XSetForeground (dpy, gc, pix_colors[fore]);
2328 2413
2329 XDrawLine (display->display, drawBuffer, gc, 2414 XDrawLine (dpy, vt, gc,
2330 xpixel, ypixel + font->ascent + 1, 2415 xpixel, ypixel + font->ascent + 1,
2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2416 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 } 2417 }
2333 } /* for (col....) */ 2418 } /* for (col....) */
2334 } /* for (row....) */ 2419 } /* for (row....) */
… …
2343 */ 2428 */
2344 if (showcursor) 2429 if (showcursor)
2345 { 2430 {
2346 if (focus) 2431 if (focus)
2347 { 2432 {
2348 if (OPTION (Opt_cursorUnderline)) 2433 if (option (Opt_cursorUnderline))
2349 *crp ^= RS_Uline; 2434 *crp ^= RS_Uline;
2350 else 2435 else
2351 { 2436 {
2352 *crp ^= RS_RVid; 2437 *crp ^= RS_RVid;
2353#ifndef NO_CURSORCOLOR 2438#ifndef NO_CURSORCOLOR
… …
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2452 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++; 2453 cursorwidth++;
2369 2454
2370#ifndef NO_CURSORCOLOR 2455#ifndef NO_CURSORCOLOR
2371 if (ISSET_PIXCOLOR (Color_cursor)) 2456 if (ISSET_PIXCOLOR (Color_cursor))
2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2458 else
2373#endif 2459#endif
2460 XSetForeground (dpy, gc, pix_colors[ccol1]);
2374 2461
2375 XDrawRectangle (display->display, drawBuffer, gc, 2462 XDrawRectangle (dpy, vt, gc,
2376 Col2Pixel (col), 2463 Col2Pixel (col),
2377 Row2Pixel (oldcursor.row), 2464 Row2Pixel (oldcursor.row),
2378 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2465 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2380 } 2467 }
… …
2388 num_scr = 0; 2475 num_scr = 0;
2389 num_scr_allow = 1; 2476 num_scr_allow = 1;
2390} 2477}
2391 2478
2392void 2479void
2393rxvt_term::scr_remap_chars (line_t &l) 2480rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2481{
2395 if (!l.t) 2482 if (!l.t)
2396 return; 2483 return;
2397 2484
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2485 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2487 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2488 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2489}
2403 2490
2404void 2491void
2405rxvt_term::scr_remap_chars () 2492rxvt_term::scr_remap_chars () NOTHROW
2406{ 2493{
2407 for (int i = total_rows; i--; ) 2494 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2495 scr_remap_chars (row_buf [i]);
2409 2496
2410 for (int i = nrow; i--; ) 2497 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2500 scr_remap_chars (swap_buf [i]);
2414 } 2501 }
2415} 2502}
2416 2503
2417void 2504void
2418rxvt_term::scr_recolour () 2505rxvt_term::scr_recolour () NOTHROW
2419{ 2506{
2420 if (1 2507#ifdef HAVE_BG_PIXMAP
2421#if TRANSPARENT 2508 bgPixmap.apply ();
2422 && !am_transparent 2509#else
2423#endif 2510
2424#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap
2426#endif
2427 )
2428 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2511 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2512 XClearWindow (dpy, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2513 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2514
2433 if (scrollBar.win) 2515 if (scrollBar.win)
2434 { 2516 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2517 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2518 scrollBar.state = STATE_IDLE;
2437 scrollbar_show (0); 2519 scrollBar.show (0);
2438 }
2439#endif
2440 } 2520 }
2441 2521
2522#endif
2523
2524 /* bgPixmap.apply () does not do the following : */
2442 scr_clear (); 2525 scr_clear ();
2443 scr_touch (true); 2526 scr_touch (true);
2444 want_refresh = 1; 2527 want_refresh = 1;
2445} 2528}
2446 2529
2447/* ------------------------------------------------------------------------- */ 2530/* ------------------------------------------------------------------------- */
2448void 2531void
2449rxvt_term::scr_clear (bool really) 2532rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2533{
2451 if (!mapped) 2534 if (!mapped)
2452 return; 2535 return;
2453 2536
2454 num_scr_allow = 0; 2537 num_scr_allow = 0;
2455 want_refresh = 1; 2538 want_refresh = 1;
2456 2539
2457 if (really) 2540 if (really)
2458 XClearWindow (display->display, vt); 2541 XClearWindow (dpy, vt);
2459} 2542}
2460 2543
2461void 2544void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2545rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2463{ 2546{
2464 int view_end = view_start + nrow; 2547 int view_end = view_start + nrow;
2465 int row, col; 2548 int row, col;
2466 2549
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2550 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2479 srp[col] ^= rstyle2; 2562 srp[col] ^= rstyle2;
2480 } 2563 }
2481} 2564}
2482 2565
2483void 2566void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2567rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2485{ 2568{
2486 int view_end = view_start + nrow; 2569 int view_end = view_start + nrow;
2487 int row, col; 2570 int row, col;
2488 2571
2489 if (beg_row >= view_start) 2572 if (beg_row >= view_start)
… …
2506 srp[col] ^= rstyle; 2589 srp[col] ^= rstyle;
2507} 2590}
2508 2591
2509/* ------------------------------------------------------------------------- */ 2592/* ------------------------------------------------------------------------- */
2510void 2593void
2511rxvt_term::scr_reverse_selection () 2594rxvt_term::scr_reverse_selection () NOTHROW
2512{ 2595{
2513 if (selection.op 2596 if (selection.op
2514 && current_screen == selection.screen 2597 && current_screen == selection.screen
2515 && selection.end.row >= view_start) 2598 && selection.end.row >= view_start)
2516 { 2599 {
2517#if ENABLE_FRILLS 2600#if !ENABLE_MINIMAL
2518 if (selection.rect) 2601 if (selection.rect)
2519 scr_xor_rect (selection.beg.row, selection.beg.col, 2602 scr_xor_rect (selection.beg.row, selection.beg.col,
2520 selection.end.row, selection.end.col, 2603 selection.end.row, selection.end.col,
2521 RS_RVid, RS_RVid | RS_Uline); 2604 RS_RVid, RS_RVid | RS_Uline);
2522 else 2605 else
… …
2532 * Dump the whole scrollback and screen to the passed filedescriptor. The 2615 * Dump the whole scrollback and screen to the passed filedescriptor. The
2533 * invoking routine must close the fd. 2616 * invoking routine must close the fd.
2534 */ 2617 */
2535#if 0 2618#if 0
2536void 2619void
2537rxvt_term::scr_dump (int fd) 2620rxvt_term::scr_dump (int fd) NOTHROW
2538{ 2621{
2539 int row, wrote; 2622 int row, wrote;
2540 unsigned int width, towrite; 2623 unsigned int width, towrite;
2541 char r1[] = "\n"; 2624 char r1[] = "\n";
2542 2625
2543 for (row = saveLines - nsaved; 2626 for (row = saveLines + top_row;
2544 row < saveLines + nrow - 1; row++) 2627 row < saveLines + nrow - 1; row++)
2545 { 2628 {
2546 width = row_buf[row].l >= 0 ? row_buf[row].l 2629 width = row_buf[row].l >= 0 ? row_buf[row].l
2547 : ncol; 2630 : ncol;
2548 for (towrite = width; towrite; towrite -= wrote) 2631 for (towrite = width; towrite; towrite -= wrote)
… …
2561 2644
2562/* ------------------------------------------------------------------------- * 2645/* ------------------------------------------------------------------------- *
2563 * CHARACTER SELECTION * 2646 * CHARACTER SELECTION *
2564 * ------------------------------------------------------------------------- */ 2647 * ------------------------------------------------------------------------- */
2565void 2648void
2566rxvt_term::selection_check (int check_more) 2649rxvt_term::selection_check (int check_more) NOTHROW
2567{ 2650{
2568 row_col_t pos; 2651 row_col_t pos;
2569 2652
2570 if (!selection.op) 2653 if (!selection.op)
2571 return; 2654 return;
… …
2592/* ------------------------------------------------------------------------- */ 2675/* ------------------------------------------------------------------------- */
2593/* 2676/*
2594 * Paste a selection direct to the command fd 2677 * Paste a selection direct to the command fd
2595 */ 2678 */
2596void 2679void
2597rxvt_term::paste (char *data, unsigned int len) 2680rxvt_term::paste (char *data, unsigned int len) NOTHROW
2598{ 2681{
2599 /* convert normal newline chars into common keyboard Return key sequence */ 2682 /* convert normal newline chars into common keyboard Return key sequence */
2600 for (unsigned int i = 0; i < len; i++) 2683 for (unsigned int i = 0; i < len; i++)
2601 if (data[i] == C0_LF) 2684 if (data[i] == C0_LF)
2602 data[i] = C0_CR; 2685 data[i] = C0_CR;
2603 2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[200~");
2689
2604 tt_write (data, len); 2690 tt_write (data, len);
2691
2692 if (priv_modes & PrivMode_BracketPaste)
2693 tt_printf ("\e[201~");
2605} 2694}
2606 2695
2607/* ------------------------------------------------------------------------- */ 2696/* ------------------------------------------------------------------------- */
2608/* 2697/*
2609 * Respond to a notification that a primary selection has been sent 2698 * Respond to a notification that a primary selection has been sent
2610 * EXT: SelectionNotify 2699 * EXT: SelectionNotify
2611 */ 2700 */
2612void 2701void
2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2702rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2614{ 2703{
2615 if (prop == None) /* check for failed XConvertSelection */ 2704 if (prop == None) /* check for failed XConvertSelection */
2616 { 2705 {
2617 if ((selection_type & Sel_CompoundText)) 2706 if ((selection_type & Sel_CompoundText))
2618 { 2707 {
… …
2638 } 2727 }
2639 2728
2640 unsigned long bytes_after; 2729 unsigned long bytes_after;
2641 XTextProperty ct; 2730 XTextProperty ct;
2642 2731
2643 if (XGetWindowProperty (display->display, win, prop, 2732 if (XGetWindowProperty (dpy, win, prop,
2644 0, PROP_SIZE / 4, 2733 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType, 2734 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format, 2735 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after, 2736 &ct.nitems, &bytes_after,
2648 &ct.value) != Success) 2737 &ct.value) != Success)
… …
2657 if (bytes_after) 2746 if (bytes_after)
2658 { 2747 {
2659 // fetch and append remaining data 2748 // fetch and append remaining data
2660 XTextProperty ct2; 2749 XTextProperty ct2;
2661 2750
2662 if (XGetWindowProperty (display->display, win, prop, 2751 if (XGetWindowProperty (dpy, win, prop,
2663 ct.nitems / 4, (bytes_after + 3) / 4, 2752 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType, 2753 delete_prop, AnyPropertyType,
2665 &ct2.encoding, &ct2.format, 2754 &ct2.encoding, &ct2.format,
2666 &ct2.nitems, &bytes_after, 2755 &ct2.nitems, &bytes_after,
2667 &ct2.value) != Success) 2756 &ct2.value) != Success)
… …
2680 2769
2681 if (ct.encoding == xa[XA_INCR]) 2770 if (ct.encoding == xa[XA_INCR])
2682 { 2771 {
2683 // INCR selection, start handshake 2772 // INCR selection, start handshake
2684 if (!delete_prop) 2773 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop); 2774 XDeleteProperty (dpy, win, prop);
2686 2775
2687 selection_wait = Sel_incr; 2776 selection_wait = Sel_incr;
2688 incr_buf_fill = 0; 2777 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10); 2778 incr_ev.start (10);
2690 2779
2691 goto bailout; 2780 goto bailout;
2692 } 2781 }
2693 2782
2694 if (ct.nitems == 0) 2783 if (ct.nitems == 0)
… …
2703 ct.nitems = incr_buf_fill; 2792 ct.nitems = incr_buf_fill;
2704 incr_buf = 0; 2793 incr_buf = 0;
2705 incr_buf_size = 0; 2794 incr_buf_size = 0;
2706 incr_ev.stop (); 2795 incr_ev.stop ();
2707 } 2796 }
2708 else 2797 else
2709 { 2798 {
2710 if (selection_wait == Sel_normal 2799 if (selection_wait == Sel_normal
2711 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2800 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2712 { 2801 {
2713 /* 2802 /*
… …
2720 goto bailout; 2809 goto bailout;
2721 } 2810 }
2722 } 2811 }
2723 else if (selection_wait == Sel_incr) 2812 else if (selection_wait == Sel_incr)
2724 { 2813 {
2725 incr_ev.start (NOW + 10); 2814 incr_ev.start (10);
2726 2815
2727 while (incr_buf_fill + ct.nitems > incr_buf_size) 2816 while (incr_buf_fill + ct.nitems > incr_buf_size)
2728 { 2817 {
2729 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2818 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2730 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2819 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2737 } 2826 }
2738 2827
2739 char **cl; 2828 char **cl;
2740 int cr; 2829 int cr;
2741 2830
2742#if ENABLE_FRILLS 2831#if !ENABLE_MINIMAL
2743 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2832 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2744 // so recode it manually 2833 // so recode it manually
2745 if (ct.encoding == xa[XA_UTF8_STRING]) 2834 if (ct.encoding == xa[XA_UTF8_STRING])
2746 { 2835 {
2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2836 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2751 paste (s, strlen (s)); 2840 paste (s, strlen (s));
2752 free (s); 2841 free (s);
2753 } 2842 }
2754 else 2843 else
2755#endif 2844#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2845 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2757 && cl) 2846 && cl)
2758 { 2847 {
2759 for (int i = 0; i < cr; i++) 2848 for (int i = 0; i < cr; i++)
2760 paste (cl[i], strlen (cl[i])); 2849 paste (cl[i], strlen (cl[i]));
2761 2850
… …
2770 if (selection_wait == Sel_normal) 2859 if (selection_wait == Sel_normal)
2771 selection_wait = Sel_none; 2860 selection_wait = Sel_none;
2772} 2861}
2773 2862
2774void 2863void
2775rxvt_term::incr_cb (time_watcher &w) 2864rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2776{ 2865{
2777 selection_wait = Sel_none; 2866 selection_wait = Sel_none;
2778 2867
2779 incr_buf_size = 0; 2868 incr_buf_size = 0;
2780 free (incr_buf); 2869 free (incr_buf);
2781 2870
2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2871 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783} 2872}
2784 2873
2785void 2874void
2786rxvt_term::selection_property (Window win, Atom prop) 2875rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2787{ 2876{
2788 if (prop == None || selection_wait != Sel_incr) 2877 if (prop == None || selection_wait != Sel_incr)
2789 return; 2878 return;
2790 2879
2791 selection_paste (win, prop, true); 2880 selection_paste (win, prop, true);
2792} 2881}
2793 2882
2794/* ------------------------------------------------------------------------- */ 2883/* ------------------------------------------------------------------------- */
2795/* 2884/*
2796 * Request the current selection: 2885 * Request the current selection:
2797 * Order: > internal selection if available 2886 * Order: > internal selection if available
2798 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2887 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2799 * > CUT_BUFFER0 2888 * > CUT_BUFFER0
2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2889 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801 * will auto fallback to CUT_BUFFER0 2890 * will auto fallback to CUT_BUFFER0
2802 * EXT: button 2 release 2891 * EXT: button 2 release
2803 */ 2892 */
2804void 2893void
2805rxvt_term::selection_request (Time tm, int x, int y) 2894rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2806{ 2895{
2807 if (x < 0 || x >= width || y < 0 || y >= height) 2896 if (selection.text && selnum == Sel_Primary)
2808 return; /* outside window */ 2897 {
2809
2810 if (selection.text)
2811 { /* internal selection */ 2898 /* internal selection */
2812 char *str = rxvt_wcstombs (selection.text, selection.len); 2899 char *str = rxvt_wcstombs (selection.text, selection.len);
2813 paste (str, strlen (str)); 2900 paste (str, strlen (str));
2814 free (str); 2901 free (str);
2815 return; 2902 return;
2816 } 2903 }
2817 else 2904 else
2818 { 2905 {
2819 int i;
2820
2821 selection_request_time = tm; 2906 selection_request_time = tm;
2822 selection_wait = Sel_normal; 2907 selection_wait = Sel_normal;
2823 2908
2824 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2825 {
2826#if X_HAVE_UTF8_STRING 2909#if X_HAVE_UTF8_STRING
2827 selection_type = Sel_UTF8String; 2910 selection_type = Sel_UTF8String;
2828 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2911 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2829 return; 2912 return;
2830#else 2913#else
2831 selection_type = Sel_CompoundText; 2914 selection_type = Sel_CompoundText;
2832 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2915 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2833 return; 2916 return;
2834#endif 2917#endif
2835 }
2836 } 2918 }
2837 2919
2838 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2920 selection_wait = Sel_none; /* don't loop in selection_paste () */
2839 selection_paste (display->root, XA_CUT_BUFFER0, false); 2921 selection_paste (display->root, XA_CUT_BUFFER0, false);
2840} 2922}
2841 2923
2842int 2924int
2843rxvt_term::selection_request_other (Atom target, int selnum) 2925rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2844{ 2926{
2845 Atom sel; 2927 Atom sel;
2846 2928
2847 selection_type |= selnum; 2929 selection_type |= selnum;
2848 2930
… …
2851 else if (selnum == Sel_Secondary) 2933 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2934 sel = XA_SECONDARY;
2853 else 2935 else
2854 sel = xa[XA_CLIPBOARD]; 2936 sel = xa[XA_CLIPBOARD];
2855 2937
2856 if (XGetSelectionOwner (display->display, sel) != None) 2938 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2939 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2940 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2941 vt, selection_request_time);
2860 return 1; 2942 return 1;
2861 } 2943 }
2862 2944
2863 return 0; 2945 return 0;
… …
2867/* 2949/*
2868 * Clear all selected text 2950 * Clear all selected text
2869 * EXT: SelectionClear 2951 * EXT: SelectionClear
2870 */ 2952 */
2871void 2953void
2872rxvt_term::selection_clear () 2954rxvt_term::selection_clear () NOTHROW
2873{ 2955{
2874 want_refresh = 1; 2956 want_refresh = 1;
2875 free (selection.text); 2957 free (selection.text);
2876 selection.text = NULL; 2958 selection.text = NULL;
2877 selection.len = 0; 2959 selection.len = 0;
… …
2926 3008
2927 int end_col; 3009 int end_col;
2928 3010
2929 for (; row <= selection.end.row; row++, col = 0) 3011 for (; row <= selection.end.row; row++, col = 0)
2930 { 3012 {
2931#if ENABLE_FRILLS 3013#if !ENABLE_MINIMAL
2932 if (selection.rect) 3014 if (selection.rect)
2933 { 3015 {
2934 col = selection.beg.col; 3016 col = selection.beg.col;
2935 end_col = ncol + 1; 3017 end_col = ncol + 1;
2936 } 3018 }
… …
2939 end_col = ROW(row).l; 3021 end_col = ROW(row).l;
2940 3022
2941 col = max (col, 0); 3023 col = max (col, 0);
2942 3024
2943 if (row == selection.end.row 3025 if (row == selection.end.row
2944#if ENABLE_FRILLS 3026#if !ENABLE_MINIMAL
2945 || selection.rect 3027 || selection.rect
2946#endif 3028#endif
2947 ) 3029 )
2948 min_it (end_col, selection.end.col); 3030 min_it (end_col, selection.end.col);
2949 3031
… …
2972#endif 3054#endif
2973 else 3055 else
2974 new_selection_text[ofs++] = *t++; 3056 new_selection_text[ofs++] = *t++;
2975 } 3057 }
2976 3058
2977#if ENABLE_FRILLS 3059#if !ENABLE_MINIMAL
2978 if (selection.rect) 3060 if (selection.rect)
2979 { 3061 {
2980 while (ofs 3062 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3063 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3064 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3012 3094
3013 selection_grab (tm); 3095 selection_grab (tm);
3014} 3096}
3015 3097
3016bool 3098bool
3017rxvt_term::selection_grab (Time tm) 3099rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3100{
3019 selection_time = tm; 3101 selection_time = tm;
3020 3102
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3103 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3104 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3105 {
3024 display->set_selection_owner (this); 3106 display->set_selection_owner (this);
3025 return true; 3107 return true;
3026 } 3108 }
3027 else 3109 else
… …
3031 } 3113 }
3032 3114
3033#if 0 3115#if 0
3034 XTextProperty ct; 3116 XTextProperty ct;
3035 3117
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3118 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3119 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3120 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3121 XFree (ct.value);
3040 } 3122 }
3041#endif 3123#endif
… …
3045/* 3127/*
3046 * Mark or select text based upon number of clicks: 1, 2, or 3 3128 * Mark or select text based upon number of clicks: 1, 2, or 3
3047 * EXT: button 1 press 3129 * EXT: button 1 press
3048 */ 3130 */
3049void 3131void
3050rxvt_term::selection_click (int clicks, int x, int y) 3132rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3051{ 3133{
3052 clicks = ((clicks - 1) % 3) + 1; 3134 clicks = ((clicks - 1) % 3) + 1;
3053 selection.clicks = clicks; /* save clicks so extend will work */ 3135 selection.clicks = clicks; /* save clicks so extend will work */
3054 3136
3055 if (clicks == 2 && !selection.rect 3137 if (clicks == 2 && !selection.rect
… …
3074/* ------------------------------------------------------------------------- */ 3156/* ------------------------------------------------------------------------- */
3075/* 3157/*
3076 * Mark a selection at the specified col/row 3158 * Mark a selection at the specified col/row
3077 */ 3159 */
3078void 3160void
3079rxvt_term::selection_start_colrow (int col, int row) 3161rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3080{ 3162{
3081 want_refresh = 1; 3163 want_refresh = 1;
3082 3164
3083 selection.mark.row = row + view_start; 3165 selection.mark.row = row + view_start;
3084 selection.mark.col = col; 3166 selection.mark.col = col;
… …
3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3169 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3088 3170
3089 while (selection.mark.col > 0 3171 while (selection.mark.col > 0
3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3172 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3091 --selection.mark.col; 3173 --selection.mark.col;
3092 3174
3093 if (selection.op) 3175 if (selection.op)
3176 {
3094 { /* clear the old selection */ 3177 /* clear the old selection */
3095 selection.beg.row = selection.end.row = selection.mark.row; 3178 selection.beg.row = selection.end.row = selection.mark.row;
3096 selection.beg.col = selection.end.col = selection.mark.col; 3179 selection.beg.col = selection.end.col = selection.mark.col;
3097 } 3180 }
3098 3181
3099 selection.op = SELECTION_INIT; 3182 selection.op = SELECTION_INIT;
… …
3110#define DELIMIT_TEXT(x) \ 3193#define DELIMIT_TEXT(x) \
3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3194 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3112#define DELIMIT_REND(x) 1 3195#define DELIMIT_REND(x) 1
3113 3196
3114void 3197void
3115rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3198rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3116{ 3199{
3117 int col, row, dirnadd, tcol, trow, w1, w2; 3200 int col, row, dirnadd, tcol, trow, w1, w2;
3118 row_col_t bound; 3201 row_col_t bound;
3119 text_t *stp; 3202 text_t *stp;
3120 rend_t *srp; 3203 rend_t *srp;
… …
3194 * flag == 0 ==> button 1 3277 * flag == 0 ==> button 1
3195 * flag == 1 ==> button 3 press 3278 * flag == 1 ==> button 3 press
3196 * flag == 2 ==> button 3 motion 3279 * flag == 2 ==> button 3 motion
3197 */ 3280 */
3198void 3281void
3199rxvt_term::selection_extend (int x, int y, int flag) 3282rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3200{ 3283{
3201 int col = clamp (Pixel2Col (x), 0, ncol); 3284 int col = clamp (Pixel2Col (x), 0, ncol);
3202 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3285 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3203 3286
3204 /* 3287 /*
… …
3230/* ------------------------------------------------------------------------- */ 3313/* ------------------------------------------------------------------------- */
3231/* 3314/*
3232 * Extend the selection to the specified col/row 3315 * Extend the selection to the specified col/row
3233 */ 3316 */
3234void 3317void
3235rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3318rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3236{ 3319{
3237 row_col_t pos; 3320 row_col_t pos;
3238 enum { 3321 enum {
3239 LEFT, RIGHT 3322 LEFT, RIGHT
3240 } closeto = RIGHT; 3323 } closeto = RIGHT;
… …
3288 * a point/word/line which is either the start or end of the selection 3371 * 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 3372 * and it was decided by whichever point/word/line was `fixed' at the
3290 * time of the most recent button3 press 3373 * time of the most recent button3 press
3291 */ 3374 */
3292 if (button3 && buttonpress) 3375 if (button3 && buttonpress)
3376 {
3293 { /* button3 press */ 3377 /* button3 press */
3294 /* 3378 /*
3295 * first determine which edge of the selection we are closest to 3379 * first determine which edge of the selection we are closest to
3296 */ 3380 */
3297 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3381 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3298 || (!ROWCOL_IS_AFTER (pos, selection.end) 3382 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3316 selection.mark.row = selection.beg.row; 3400 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3401 selection.mark.col = selection.beg.col;
3318 } 3402 }
3319 } 3403 }
3320 else 3404 else
3405 {
3321 { /* button1 drag or button3 drag */ 3406 /* button1 drag or button3 drag */
3322 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3407 if (ROWCOL_IS_AFTER (selection.mark, pos))
3323 { 3408 {
3324 if (selection.mark.row == selection.end.row 3409 if (selection.mark.row == selection.end.row
3325 && selection.mark.col == selection.end.col 3410 && selection.mark.col == selection.end.col
3326 && clickchange 3411 && clickchange
… …
3343 3428
3344 if (selection.clicks == 1) 3429 if (selection.clicks == 1)
3345 { 3430 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3431 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3432 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3433#if !ENABLE_MINIMAL
3349 && !selection.rect 3434 && !selection.rect
3350#endif 3435#endif
3351 ) 3436 )
3352 selection.beg.col = ncol; 3437 selection.beg.col = ncol;
3353 3438
3354 if ( 3439 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3440 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3441 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3442#if !ENABLE_MINIMAL
3358 && !selection.rect 3443 && !selection.rect
3359#endif 3444#endif
3360 ) 3445 )
3361 selection.end.col = ncol; 3446 selection.end.col = ncol;
3362 } 3447 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3454 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3455 }
3371 else if (selection.clicks == 3) 3456 else if (selection.clicks == 3)
3372 { 3457 {
3373#if ENABLE_FRILLS 3458#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3459 if (option (Opt_tripleclickwords))
3375 { 3460 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3461 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3462
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3463 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3464 {
3380 if (!ROW(end_row).is_longer ()) 3465 if (!ROW(end_row).is_longer ())
3381 { 3466 {
3382 selection.end.row = end_row; 3467 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3468 selection.end.col = ROW(end_row).l;
3469# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3470 selection_remove_trailing_spaces ();
3471# endif
3385 break; 3472 break;
3386 } 3473 }
3387 } 3474 }
3388 } 3475 }
3389 else 3476 else
… …
3405 selection.end.row++; 3492 selection.end.row++;
3406 } 3493 }
3407 } 3494 }
3408 3495
3409 if (button3 && buttonpress) 3496 if (button3 && buttonpress)
3497 {
3410 { /* mark may need to be changed */ 3498 /* mark may need to be changed */
3411 if (closeto == LEFT) 3499 if (closeto == LEFT)
3412 { 3500 {
3413 selection.mark.row = selection.end.row; 3501 selection.mark.row = selection.end.row;
3414 selection.mark.col = selection.end.col - (selection.clicks == 2); 3502 selection.mark.col = selection.end.col - (selection.clicks == 2);
3415 } 3503 }
… …
3418 selection.mark.row = selection.beg.row; 3506 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3507 selection.mark.col = selection.beg.col;
3420 } 3508 }
3421 } 3509 }
3422 3510
3423#if ENABLE_FRILLS 3511#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3512 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3513 ::swap (selection.beg.col, selection.end.col);
3426#endif 3514#endif
3427} 3515}
3428 3516
3429#if ENABLE_FRILLS 3517#if !ENABLE_MINIMAL
3430void 3518void
3431rxvt_term::selection_remove_trailing_spaces () 3519rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3520{
3433 int32_t end_col, end_row; 3521 int32_t end_col, end_row;
3434 text_t *stp; 3522 text_t *stp;
3435 3523
3436 end_col = selection.end.col; 3524 end_col = selection.end.col;
… …
3474/* 3562/*
3475 * Double click on button 3 when already selected 3563 * Double click on button 3 when already selected
3476 * EXT: button 3 double click 3564 * EXT: button 3 double click
3477 */ 3565 */
3478void 3566void
3479rxvt_term::selection_rotate (int x, int y) 3567rxvt_term::selection_rotate (int x, int y) NOTHROW
3480{ 3568{
3481 selection.clicks = selection.clicks % 3 + 1; 3569 selection.clicks = selection.clicks % 3 + 1;
3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3570 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3483} 3571}
3484 3572
… …
3486/* 3574/*
3487 * Respond to a request for our current selection 3575 * Respond to a request for our current selection
3488 * EXT: SelectionRequest 3576 * EXT: SelectionRequest
3489 */ 3577 */
3490void 3578void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3579rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3580{
3493 XSelectionEvent ev; 3581 XSelectionEvent ev;
3494 dDisp;
3495 3582
3496 ev.type = SelectionNotify; 3583 ev.type = SelectionNotify;
3497 ev.property = None; 3584 ev.property = None;
3498 ev.display = rq.display; 3585 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3586 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3600 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3601#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3602 *target++ = xa[XA_UTF8_STRING];
3516#endif 3603#endif
3517 3604
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3605 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3606 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3607 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3608 ev.property = rq.property;
3522 } 3609 }
3523#if TODO // TODO 3610#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3613 /* TODO: Handle MULTIPLE */
3527 } 3614 }
3528#endif 3615#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3616 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3617 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3618 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3619 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3620 ev.property = rq.property;
3534 } 3621 }
3535 else if (rq.target == XA_STRING 3622 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3623 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3647 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3648 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3649 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3650 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3651 style = enc_compound_text;
3565#if ENABLE_FRILLS 3652#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3653 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3654 style = enc_utf8;
3568#endif 3655#endif
3569 else 3656 else
3570 { 3657 {
… …
3581 { 3668 {
3582 cl = L""; 3669 cl = L"";
3583 selectlen = 0; 3670 selectlen = 0;
3584 } 3671 }
3585 3672
3586#if ENABLE_FRILLS 3673#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3674 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3675 // so recode it manually
3589 if (style == enc_utf8) 3676 if (style == enc_utf8)
3590 { 3677 {
3591 freect = 1; 3678 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3681 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3682 ct.nitems = strlen ((char *)ct.value);
3596 } 3683 }
3597 else 3684 else
3598#endif 3685#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3686 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3687 freect = 1;
3601 else 3688 else
3602 { 3689 {
3603 /* if we failed to convert then send it raw */ 3690 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3691 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3692 ct.nitems = selectlen;
3606 ct.encoding = target; 3693 ct.encoding = target;
3607 } 3694 }
3608 3695
3609 XChangeProperty (disp, rq.requestor, rq.property, 3696 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3697 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3698 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3699 ev.property = rq.property;
3613 3700
3614 if (freect) 3701 if (freect)
3615 XFree (ct.value); 3702 XFree (ct.value);
3616 } 3703 }
3617 3704
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3705 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} 3706}
3636 3707
3637/* ------------------------------------------------------------------------- */ 3708/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3709#ifdef USE_XIM
3639void 3710void
3640rxvt_term::im_set_position (XPoint &pos) 3711rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3712{
3642 XWindowAttributes xwa; 3713 XWindowAttributes xwa;
3643 3714
3644 XGetWindowAttributes (display->display, vt, &xwa); 3715 XGetWindowAttributes (dpy, vt, &xwa);
3645 3716
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3717 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3718 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3719}
3649#endif 3720#endif
3650 3721
3651#if ENABLE_OVERLAY 3722#if ENABLE_OVERLAY
3652void 3723void
3653rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3724rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3654{ 3725{
3655 if (nrow < 1 || ncol < 1) 3726 if (nrow < 1 || ncol < 1)
3656 return; 3727 return;
3657 3728
3658 want_refresh = 1; 3729 want_refresh = 1;
… …
3703 *rp = r; 3774 *rp = r;
3704 } 3775 }
3705} 3776}
3706 3777
3707void 3778void
3708rxvt_term::scr_overlay_off () 3779rxvt_term::scr_overlay_off () NOTHROW
3709{ 3780{
3710 if (!ov_text) 3781 if (!ov_text)
3711 return; 3782 return;
3712 3783
3713 want_refresh = 1; 3784 want_refresh = 1;
… …
3721 delete [] ov_text; ov_text = 0; 3792 delete [] ov_text; ov_text = 0;
3722 delete [] ov_rend; ov_rend = 0; 3793 delete [] ov_rend; ov_rend = 0;
3723} 3794}
3724 3795
3725void 3796void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3797rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727{ 3798{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3799 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729 return; 3800 return;
3730 3801
3731 x++, y++; 3802 x++, y++;
… …
3733 ov_text[y][x] = text; 3804 ov_text[y][x] = text;
3734 ov_rend[y][x] = rend; 3805 ov_rend[y][x] = rend;
3735} 3806}
3736 3807
3737void 3808void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s) 3809rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739{ 3810{
3740 while (*s) 3811 while (*s)
3741 scr_overlay_set (x++, y, *s++); 3812 scr_overlay_set (x++, y, *s++);
3742} 3813}
3743 3814
3744void 3815void
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3816rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3817{
3747 while (*s) 3818 while (*s)
3748 { 3819 {
3749 text_t t = *s++; 3820 text_t t = *s++;
3750 int width = wcwidth (t); 3821 int width = WCWIDTH (t);
3751 3822
3752 while (width--) 3823 while (width--)
3753 { 3824 {
3754 scr_overlay_set (x++, y, t); 3825 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3826 t = NOCHAR;
3756 } 3827 }
3757 } 3828 }
3758} 3829}
3759 3830
3760void 3831void
3761rxvt_term::scr_swap_overlay () 3832rxvt_term::scr_swap_overlay () NOTHROW
3762{ 3833{
3763 if (!ov_text) 3834 if (!ov_text)
3764 return; 3835 return;
3765 3836
3766 // swap screen mem with overlay 3837 // swap screen mem with overlay

Diff Legend

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