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

Diff Legend

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