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.229 by root, Sun Jan 15 06:39:19 2006 UTC vs.
Revision 1.322 by root, Tue Nov 4 23:35:50 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)
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
1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1331 ERASE_ROWS (row, num); 1365 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start),
1367 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num));
1332 gcvalue.foreground = pix_colors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 } 1371 }
1335 1372
1336 for (; num--; row++) 1373 for (; num--; row++)
1337 { 1374 {
1338 scr_blank_screen_mem (ROW(row), rstyle); 1375 scr_blank_screen_mem (ROW(row), rstyle);
1339 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1376 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1340 } 1377 }
1341} 1378}
1342 1379
1343#if ENABLE_FRILLS 1380#if !ENABLE_MINIMAL
1344void 1381void
1345rxvt_term::scr_erase_savelines () 1382rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1383{
1347 want_refresh = 1; 1384 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1385 ZERO_SCROLLBACK ();
1349 1386
1350 top_row = 0; 1387 top_row = 0;
… …
1355/* 1392/*
1356 * Fill the screen with `E's 1393 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1394 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1395 */
1359void 1396void
1360rxvt_term::scr_E () 1397rxvt_term::scr_E () NOTHROW
1361{ 1398{
1362 rend_t fs; 1399 rend_t fs;
1363 1400
1364 want_refresh = 1; 1401 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1402 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1423/* ------------------------------------------------------------------------- */
1387/* 1424/*
1388 * Insert/Delete <count> lines 1425 * Insert/Delete <count> lines
1389 */ 1426 */
1390void 1427void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1428rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1429{
1393 int end; 1430 int end;
1394 1431
1395 ZERO_SCROLLBACK (); 1432 ZERO_SCROLLBACK ();
1396 1433
… …
1416/* ------------------------------------------------------------------------- */ 1453/* ------------------------------------------------------------------------- */
1417/* 1454/*
1418 * Insert/Delete <count> characters from the current position 1455 * Insert/Delete <count> characters from the current position
1419 */ 1456 */
1420void 1457void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1458rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1459{
1423 int col, row;
1424 rend_t tr;
1425
1426 want_refresh = 1; 1460 want_refresh = 1;
1427 ZERO_SCROLLBACK (); 1461 ZERO_SCROLLBACK ();
1428 1462
1429 if (count <= 0) 1463 if (count <= 0)
1430 return; 1464 return;
… …
1432 scr_do_wrap (); 1466 scr_do_wrap ();
1433 1467
1434 selection_check (1); 1468 selection_check (1);
1435 min_it (count, ncol - screen.cur.col); 1469 min_it (count, ncol - screen.cur.col);
1436 1470
1437 row = screen.cur.row; 1471 int row = screen.cur.row;
1438 1472
1439 line_t *line = &ROW(row); 1473 line_t *line = &ROW(row);
1440 1474
1441 line->touch (); 1475 line->touch ();
1442 line->is_longer (0); 1476 line->is_longer (0);
1443 1477
1478 // nuke wide spanning the start
1479 if (line->t[screen.cur.col] == NOCHAR)
1480 scr_kill_char (*line, screen.cur.col);
1481
1444 switch (insdel) 1482 switch (insdel)
1445 { 1483 {
1446 case INSERT: 1484 case INSERT:
1447 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1485 line->l = min (line->l + count, ncol);
1486
1487 if (line->t[screen.cur.col] == NOCHAR)
1488 scr_kill_char (*line, screen.cur.col);
1489
1490 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1448 { 1491 {
1449 line->t[col] = line->t[col - count]; 1492 line->t[col] = line->t[col - count];
1450 line->r[col] = line->r[col - count]; 1493 line->r[col] = line->r[col - count];
1451 } 1494 }
1452
1453 line->l = min (line->l + count, ncol);
1454 1495
1455 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1456 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1457 { 1498 {
1458 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
1459 || (selection.end.col + count >= ncol)) 1500 || (selection.end.col + count >= ncol))
1460 CLEAR_SELECTION (); 1501 CLEAR_SELECTION ();
1461 else 1502 else
1503 {
1462 { /* shift selection */ 1504 /* shift selection */
1463 selection.beg.col += count; 1505 selection.beg.col += count;
1464 selection.mark.col += count; /* XXX: yes? */ 1506 selection.mark.col += count; /* XXX: yes? */
1465 selection.end.col += count; 1507 selection.end.col += count;
1466 } 1508 }
1467 } 1509 }
… …
1472 case ERASE: 1514 case ERASE:
1473 screen.cur.col += count; /* don't worry if > ncol */ 1515 screen.cur.col += count; /* don't worry if > ncol */
1474 selection_check (1); 1516 selection_check (1);
1475 screen.cur.col -= count; 1517 screen.cur.col -= count;
1476 1518
1477 line->l = max (line->l - count, 0); 1519 // nuke wide char after the end
1520 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1521 scr_kill_char (*line, screen.cur.col + count);
1522
1478 scr_blank_line (*line, screen.cur.col, count, rstyle); 1523 scr_blank_line (*line, screen.cur.col, count, rstyle);
1479 break; 1524 break;
1480 1525
1481 case DELETE: 1526 case DELETE:
1482 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1527 line->l = max (line->l - count, 0);
1483 1528
1529 // nuke wide char spanning the end
1530 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1531 scr_kill_char (*line, screen.cur.col + count);
1532
1484 for (col = screen.cur.col; (col + count) < ncol; col++) 1533 for (int col = screen.cur.col; (col + count) < ncol; col++)
1485 { 1534 {
1486 line->t[col] = line->t[col + count]; 1535 line->t[col] = line->t[col + count];
1487 line->r[col] = line->r[col + count]; 1536 line->r[col] = line->r[col + count];
1488 } 1537 }
1489 1538
1490 line->l = max (line->l - count, 0);
1491 scr_blank_line (*line, ncol - count, count, tr); 1539 scr_blank_line (*line, ncol - count, count,
1540 line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask));
1492 1541
1493 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1494 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1495 { 1544 {
1496 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
… …
1514/* 1563/*
1515 * Set the scrolling region 1564 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1566 */
1518void 1567void
1519rxvt_term::scr_scroll_region (int top, int bot) 1568rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1569{
1521 max_it (top, 0); 1570 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1571 min_it (bot, nrow - 1);
1523 1572
1524 if (top > bot) 1573 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1583 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1584 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1585 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1586 */
1538void 1587void
1539rxvt_term::scr_cursor_visible (int mode) 1588rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1589{
1541 want_refresh = 1; 1590 want_refresh = 1;
1542 1591
1543 if (mode) 1592 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1593 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1600 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1601 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1602 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1603 */
1555void 1604void
1556rxvt_term::scr_autowrap (int mode) 1605rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1606{
1558 if (mode) 1607 if (mode)
1559 screen.flags |= Screen_Autowrap; 1608 screen.flags |= Screen_Autowrap;
1560 else 1609 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1610 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1619 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1620 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1621 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1622 */
1574void 1623void
1575rxvt_term::scr_relative_origin (int mode) 1624rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1625{
1577 if (mode) 1626 if (mode)
1578 screen.flags |= Screen_Relative; 1627 screen.flags |= Screen_Relative;
1579 else 1628 else
1580 screen.flags &= ~Screen_Relative; 1629 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1636 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1637 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1638 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1639 */
1591void 1640void
1592rxvt_term::scr_insert_mode (int mode) 1641rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1642{
1594 if (mode) 1643 if (mode)
1595 screen.flags |= Screen_Insert; 1644 screen.flags |= Screen_Insert;
1596 else 1645 else
1597 screen.flags &= ~Screen_Insert; 1646 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1652 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1653 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1654 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1655 */
1607void 1656void
1608rxvt_term::scr_set_tab (int mode) 1657rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1658{
1610 if (mode < 0) 1659 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1660 memset (tabs, 0, ncol);
1612 else if (screen.cur.col < ncol) 1661 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1662 tabs [screen.cur.col] = !!mode;
1614} 1663}
1615 1664
1616/* ------------------------------------------------------------------------- */ 1665/* ------------------------------------------------------------------------- */
… …
1618 * Set reverse/normal video 1667 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1668 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1669 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1670 */
1622void 1671void
1623rxvt_term::scr_rvideo_mode (int mode) 1672rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1673{
1625 XGCValues gcvalue; 1674 rvideo_mode = on;
1626 1675
1676#ifndef NO_BELL
1677 on ^= rvideo_bell;
1678#endif
1679
1627 if (rvideo != mode) 1680 if (rvideo_state != on)
1628 { 1681 {
1629 rvideo = mode; 1682 rvideo_state = on;
1683
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1685#ifdef HAVE_BG_PIXMAP
1632 if (bgPixmap.pixmap == None) 1686 if (bgPixmap.pixmap == None)
1633#endif 1687#endif
1634#if TRANSPARENT 1688 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 1689
1690 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1691 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1692 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1693 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1694
1644 scr_clear (); 1695 scr_clear ();
1645 scr_touch (true); 1696 scr_touch (true);
1646 } 1697 }
1647} 1698}
1648 1699
… …
1650/* 1701/*
1651 * Report current cursor position 1702 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1703 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1704 */
1654void 1705void
1655rxvt_term::scr_report_position () 1706rxvt_term::scr_report_position () NOTHROW
1656{ 1707{
1657 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1708 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1658} 1709}
1659 1710
1660/* ------------------------------------------------------------------------- * 1711/* ------------------------------------------------------------------------- *
… …
1663 1714
1664/* 1715/*
1665 * Set font style 1716 * Set font style
1666 */ 1717 */
1667void 1718void
1668rxvt_term::set_font_style () 1719rxvt_term::set_font_style () NOTHROW
1669{ 1720{
1670#if 0 1721#if 0
1671 switch (charsets [screen.charset]) 1722 switch (charsets [screen.charset])
1672 { 1723 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1724 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1746 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1747 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1748 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1749 */
1699void 1750void
1700rxvt_term::scr_charset_choose (int set) 1751rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1752{
1702 screen.charset = set; 1753 screen.charset = set;
1703 set_font_style (); 1754 set_font_style ();
1704} 1755}
1705 1756
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1762 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1763 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1764 * See set_font_style for possible values for <C>
1714 */ 1765 */
1715void 1766void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1767rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1768{
1718 charsets[set] = (unsigned char)ch; 1769 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1770 set_font_style ();
1720} 1771}
1721 1772
… …
1726 1777
1727/* 1778/*
1728 * refresh matching text. 1779 * refresh matching text.
1729 */ 1780 */
1730bool 1781bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1782rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1783{
1733 bool found = false; 1784 bool found = false;
1734 1785
1735 for (int i = 0; i < nrow; i++) 1786 for (int i = 0; i < nrow; i++)
1736 { 1787 {
1737 int col = 0;
1738 rend_t *drp = drawn_buf[i].r; 1788 rend_t *drp = drawn_buf[i].r;
1739 1789
1740 for (; col < ncol; col++, drp++) 1790 for (int col = 0; col < ncol; col++, drp++)
1741 if ((*drp & mask) == value) 1791 if ((*drp & mask) == value)
1742 { 1792 {
1743 found = true; 1793 found = true;
1744 *drp = ~value; 1794 *drp = ~value;
1745 } 1795 }
… …
1756 PART_END, 1806 PART_END,
1757 RC_COUNT 1807 RC_COUNT
1758}; 1808};
1759 1809
1760void 1810void
1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1811rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762{ 1812{
1763 int i; 1813 int i;
1764 row_col_t rc[RC_COUNT]; 1814 row_col_t rc[RC_COUNT];
1765 1815
1766 if (!drawn_buf) /* sanity check */ 1816 if (!drawn_buf) /* sanity check */
… …
1785 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1786 { 1836 {
1787 min_it (rc[i].col, ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1788 min_it (rc[i].row, nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1789 } 1839 }
1790 1840// 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++) 1841 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); 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793 1843
1844 num_scr_allow = 0;
1845
1794 if (refresh) 1846 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1847 scr_refresh ();
1796} 1848}
1797 1849
1798/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1799/* 1851/*
1800 * Refresh the entire screen 1852 * Refresh the entire screen
1801 */ 1853 */
1802void 1854void
1803rxvt_term::scr_touch (bool refresh) 1855rxvt_term::scr_touch (bool refresh) NOTHROW
1804{ 1856{
1805 scr_expose (0, 0, width, height, refresh); 1857 scr_expose (0, 0, width, height, refresh);
1806} 1858}
1807 1859
1808/* ------------------------------------------------------------------------- */ 1860/* ------------------------------------------------------------------------- */
1809/* 1861/*
1810 * Move the display so that the line represented by scrollbar value Y is at 1862 * Move the display so that the line represented by scrollbar value Y is at
1811 * the top of the screen 1863 * the top of the screen
1812 */ 1864 */
1813void 1865void
1814rxvt_term::scr_move_to (int y, int len) 1866rxvt_term::scr_move_to (int y, int len) NOTHROW
1815{ 1867{
1816 int p = (top_row - nrow) * (len - y) / len + (nrow - 1); 1868 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1817
1818 scr_changeview (p);
1819} 1869}
1820 1870
1821/* ------------------------------------------------------------------------- */ 1871/* ------------------------------------------------------------------------- */
1822/* 1872/*
1823 * Page the screen up/down nlines 1873 * Page the screen up/down nlines
1824 * direction should be UP or DN 1874 * direction should be UP or DN
1825 */ 1875 */
1826bool 1876bool
1827rxvt_term::scr_page (enum page_dirn direction, int nlines) 1877rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1828{ 1878{
1829 int new_view_start = 1879 int new_view_start =
1830 direction == UP ? view_start - nlines 1880 direction == UP ? view_start - nlines
1831 : view_start + nlines; 1881 : view_start + nlines;
1832 1882
1833 return scr_changeview (new_view_start); 1883 return scr_changeview (new_view_start);
1834} 1884}
1835 1885
1836bool 1886bool
1837rxvt_term::scr_changeview (int new_view_start) 1887rxvt_term::scr_changeview (int new_view_start) NOTHROW
1838{ 1888{
1839 clamp_it (new_view_start, top_row, 0); 1889 clamp_it (new_view_start, top_row, 0);
1840 1890
1841 if (new_view_start == view_start) 1891 if (new_view_start == view_start)
1842 return false; 1892 return false;
1843 1893
1844 num_scr += new_view_start - view_start; 1894 num_scr += new_view_start - view_start;
1845 view_start = new_view_start; 1895 view_start = new_view_start;
1896 want_refresh = 1;
1897
1846 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1898 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1847 want_refresh = 1;
1848 1899
1849 return true; 1900 return true;
1850} 1901}
1851 1902
1852/* ------------------------------------------------------------------------- */ 1903#ifndef NO_BELL
1853void 1904void
1905rxvt_term::bell_cb (ev::timer &w, int revents)
1906{
1907 rvideo_bell = false;
1908 scr_rvideo_mode (rvideo_mode);
1909 refresh_check ();
1910}
1911#endif
1912
1913/* ------------------------------------------------------------------------- */
1914void
1854rxvt_term::scr_bell () 1915rxvt_term::scr_bell () NOTHROW
1855{ 1916{
1856#ifndef NO_BELL 1917#ifndef NO_BELL
1857 1918
1858# ifndef NO_MAPALERT 1919# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1920# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1921 if (option (Opt_mapAlert))
1861# endif 1922# endif
1862 XMapWindow (display->display, parent[0]); 1923 XMapWindow (dpy, parent[0]);
1863# endif 1924# endif
1864 1925
1926# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell))
1928 set_urgency (1);
1929# endif
1930
1865 if (OPTION (Opt_visualBell)) 1931 if (option (Opt_visualBell))
1866 { 1932 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1933 rvideo_bell = true;
1934 scr_rvideo_mode (rvideo_mode);
1868 display->flush (); 1935 flush ();
1936
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1937 bell_ev.start (VISUAL_BELL_DURATION);
1870 scr_rvideo_mode (!rvideo); /* refresh also done */
1871 } 1938 }
1872 else 1939 else
1873 XBell (display->display, 0); 1940 XBell (dpy, 0);
1874
1875#endif 1941#endif
1876} 1942}
1877 1943
1878/* ------------------------------------------------------------------------- */ 1944/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1945/* ARGSUSED */
1880void 1946void
1881rxvt_term::scr_printscreen (int fullhist) 1947rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1948{
1883#ifdef PRINTPIPE 1949#ifdef PRINTPIPE
1884 int nrows, row_start; 1950 int nrows, row_start;
1885 FILE *fd; 1951 FILE *fd = popen_printer ();
1886 1952
1887 if ((fd = popen_printer ()) == NULL) 1953 if (!fd)
1888 return; 1954 return;
1889 1955
1890 if (fullhist) 1956 if (fullhist)
1891 { 1957 {
1892 nrows = nrow - top_row; 1958 nrows = nrow - top_row;
… …
1935 * Refresh the screen 2001 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 2002 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 2003 * screen.text/screen.rend contain what the screen will change to.
1938 */ 2004 */
1939void 2005void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 2006rxvt_term::scr_refresh () NOTHROW
1941{ 2007{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 2008 unsigned char have_bg,
1943 showcursor; /* show the cursor */ 2009 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 2010 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 2011 ocrow; /* old cursor row */
1946 int i; /* tmp */ 2012 int i; /* tmp */
1947#ifndef NO_CURSORCOLOR 2013#ifndef NO_CURSORCOLOR
1948 rend_t cc1; /* store colours at cursor position (s) */ 2014 rend_t cc1; /* store colours at cursor position (s) */
1949#endif 2015#endif
1950 rend_t *crp; // cursor rendition pointer 2016 rend_t *crp; // cursor rendition pointer
2017 rend_t ccol1, /* Cursor colour */
2018 ccol2; /* Cursor colour2 */
1951 2019
1952 want_refresh = 0; /* screen is current */ 2020 want_refresh = 0; /* screen is current */
1953 2021
1954 if (refresh_type == NO_REFRESH || !mapped) 2022 if (refresh_type == NO_REFRESH || !mapped)
1955 return; 2023 return;
1956 2024
1957 /* 2025 /*
1958 * A: set up vars 2026 * A: set up vars
1959 */ 2027 */
1960 must_clear = 0;
1961 refresh_count = 0; 2028 refresh_count = 0;
1962 2029
1963#if XPM_BACKGROUND 2030 have_bg = 0;
2031#ifdef HAVE_BG_PIXMAP
1964 must_clear |= bgPixmap.pixmap != None; 2032 have_bg = bgPixmap.pixmap != None;
1965#endif
1966#if TRANSPARENT
1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1968#endif 2033#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 2035
1971 /* 2036 /*
1972 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
… …
1976 /* 2041 /*
1977 * C: set the cursor character (s) 2042 * C: set the cursor character (s)
1978 */ 2043 */
1979 { 2044 {
1980 unsigned char setoldcursor; 2045 unsigned char setoldcursor;
1981 rend_t ccol1, /* Cursor colour */
1982 ccol2; /* Cursor colour2 */
1983 2046
1984 showcursor = (screen.flags & Screen_VisibleCursor); 2047 showcursor = (screen.flags & Screen_VisibleCursor);
1985#ifdef CURSOR_BLINK 2048#ifdef CURSOR_BLINK
1986 if (hidden_cursor) 2049 if (hidden_cursor)
1987 showcursor = 0; 2050 showcursor = 0;
… …
1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2057 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1995 col--; 2058 col--;
1996 2059
1997 crp = &ROW(screen.cur.row).r[col]; 2060 crp = &ROW(screen.cur.row).r[col];
1998 2061
2062#ifndef NO_CURSORCOLOR
2063 cc1 = *crp & (RS_fgMask | RS_bgMask);
2064 if (ISSET_PIXCOLOR (Color_cursor))
2065 ccol1 = Color_cursor;
2066 else
2067#endif
2068#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2069 ccol1 = fgcolor_of (rstyle);
2070#else
2071 ccol1 = Color_fg;
2072#endif
2073
2074#ifndef NO_CURSORCOLOR
2075 if (ISSET_PIXCOLOR (Color_cursor2))
2076 ccol2 = Color_cursor2;
2077 else
2078#endif
2079#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2080 ccol2 = bgcolor_of (rstyle);
2081#else
2082 ccol2 = Color_bg;
2083#endif
2084
1999 if (showcursor && focus) 2085 if (showcursor && focus)
2000 { 2086 {
2001 if (OPTION (Opt_cursorUnderline)) 2087 if (option (Opt_cursorUnderline))
2002 *crp ^= RS_Uline; 2088 *crp ^= RS_Uline;
2003 else 2089 else
2004 { 2090 {
2005 *crp ^= RS_RVid; 2091 *crp ^= RS_RVid;
2006
2007#ifndef NO_CURSORCOLOR
2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2009 if (ISSET_PIXCOLOR (Color_cursor))
2010 ccol1 = Color_cursor;
2011 else
2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2013 ccol1 = fgcolor_of (rstyle);
2014#else
2015 ccol1 = Color_fg;
2016#endif
2017 if (ISSET_PIXCOLOR (Color_cursor2))
2018 ccol2 = Color_cursor2;
2019 else
2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2021 ccol2 = bgcolor_of (rstyle);
2022#else
2023 ccol2 = Color_bg;
2024#endif
2025 *crp = SET_FGCOLOR (*crp, ccol1); 2092 *crp = SET_FGCOLOR (*crp, ccol1);
2026 *crp = SET_BGCOLOR (*crp, ccol2); 2093 *crp = SET_BGCOLOR (*crp, ccol2);
2027#endif
2028 } 2094 }
2029 } 2095 }
2030 } 2096 }
2031 2097
2032 /* make sure no outline cursor is left around */ 2098 /* make sure no outline cursor is left around */
… …
2069#ifndef NO_SLOW_LINK_SUPPORT 2135#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2136 /*
2071 * D: CopyArea pass - very useful for slower links 2137 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2138 * This has been deliberately kept simple.
2073 */ 2139 */
2074 i = num_scr;
2075 if (!display->is_local 2140 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2141 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2142 && abs (num_scr) < nrow && !have_bg)
2078 { 2143 {
2079 int16_t nits; 2144 int16_t nits;
2145 int i = num_scr;
2080 int j; 2146 int j;
2081 int len, wlen; 2147 int len, wlen;
2148 dLocal (int, num_scr);
2082 2149
2083 j = nrow; 2150 j = nrow;
2084 wlen = len = -1; 2151 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2152 row = i > 0 ? 0 : j - 1;
2153
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2154 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2155 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2156 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2157 {
2090 line_t s = ROW(view_start + row); 2158 line_t s = ROW(view_start + row);
… …
2111 wlen = row; 2179 wlen = row;
2112 continue; 2180 continue;
2113 } 2181 }
2114 } 2182 }
2115 2183
2116 if (len != -1) 2184 if (len >= 0)
2117 { 2185 {
2118 /* also comes here at end if needed because of >= above */ 2186 /* also comes here at end if needed because of >= above */
2119 if (wlen < len) 2187 if (wlen < len)
2120 ::swap (wlen, len); 2188 ::swap (wlen, len);
2121 2189
2190 XGCValues gcv;
2191
2192 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2122 XCopyArea (display->display, vt, vt, 2193 XCopyArea (dpy, vt, vt,
2123 gc, 0, Row2Pixel (len + i), 2194 gc, 0, Row2Pixel (len + i),
2124 (unsigned int)this->width, 2195 (unsigned int)this->width,
2125 (unsigned int)Height2Pixel (wlen - len + 1), 2196 (unsigned int)Height2Pixel (wlen - len + 1),
2126 0, Row2Pixel (len)); 2197 0, Row2Pixel (len));
2198 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2199
2127 len = -1; 2200 len = -1;
2128 } 2201 }
2129 } 2202 }
2130 } 2203 }
2131#endif 2204#endif
… …
2155 continue; 2228 continue;
2156 2229
2157 // redraw one or more characters 2230 // redraw one or more characters
2158 2231
2159 // seek to the beginning of wide characters 2232 // seek to the beginning of wide characters
2160 while (stp[col] == NOCHAR && col > 0) 2233 while (expect_false (stp[col] == NOCHAR && col > 0))
2161 --col; 2234 --col;
2162 2235
2163 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2236 rend_t rend = srp[col]; /* screen rendition (target rendtion) */
2164 text_t *text = stp + col; 2237 text_t *text = stp + col;
2165 int count = 1; 2238 int count = 1;
… …
2187 count++; 2260 count++;
2188 2261
2189 if (stp[col] != dtp[col] 2262 if (stp[col] != dtp[col]
2190 || !RS_SAME (srp[col], drp[col])) 2263 || !RS_SAME (srp[col], drp[col]))
2191 { 2264 {
2192 if (must_clear && (i++ > count / 2)) 2265 if (have_bg && (i++ > count / 2))
2193 break; 2266 break;
2194 2267
2195 dtp[col] = stp[col]; 2268 dtp[col] = stp[col];
2196 drp[col] = rend; 2269 drp[col] = rend;
2197 i = 0; 2270 i = 0;
2198 } 2271 }
2199 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2272 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2200 break; 2273 break;
2201 } 2274 }
2202 2275
2203 col--; /* went one too far. move back */ 2276 col--; /* went one too far. move back */
2204 count -= i; /* dump any matching trailing chars */ 2277 count -= i; /* dump any matching trailing chars */
2205 2278
2206 // sometimes we optimize away the trailing NOCHAR's, add them back 2279 // sometimes we optimize away the trailing NOCHAR's, add them back
2207 while (i && text[count] == NOCHAR) 2280 while (expect_false (i && text[count] == NOCHAR))
2208 count++, i--; 2281 count++, i--;
2209 2282
2210 /* 2283 /*
2211 * Determine the attributes for the string 2284 * Determine the attributes for the string
2212 */ 2285 */
2213 int fore = fgcolor_of (rend); // desired foreground 2286 int fore = fgcolor_of (rend); // desired foreground
2214 int back = bgcolor_of (rend); // desired background 2287 int back = bgcolor_of (rend); // desired background
2215 2288
2216 // only do special processing if any attributes are set, which is unlikely 2289 // only do special processing if any attributes are set, which is unlikely
2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2290 if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)))
2218 { 2291 {
2219#if ENABLE_STYLES
2220 // force redraw after "careful" characters to avoid pixel droppings
2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2222 drp[col + 1] = ~srp[col + 1];
2223
2224 // include previous careful character(s) if possible, looks nicer (best effort...)
2225 while (text > stp
2226 && srp[text - stp - 1] & RS_Careful
2227 && RS_SAME (rend, srp[text - stp - 1]))
2228 text--, count++, xpixel -= fwidth;
2229#endif
2230
2231 bool invert = rend & RS_RVid; 2292 bool invert = rend & RS_RVid;
2232 2293
2233#ifndef NO_BOLD_UNDERLINE_REVERSE 2294#ifndef NO_BOLD_UNDERLINE_REVERSE
2234 if (rend & RS_Bold
2235 && fore == Color_fg) 2295 if (rend & RS_Bold && fore == Color_fg)
2236 { 2296 {
2237 if (ISSET_PIXCOLOR (Color_BD)) 2297 if (ISSET_PIXCOLOR (Color_BD))
2238 fore = Color_BD; 2298 fore = Color_BD;
2239# if !ENABLE_STYLES 2299# if !ENABLE_STYLES
2240 else 2300 else
2241 invert = !invert; 2301 invert = !invert;
2242# endif 2302# endif
2243 } 2303 }
2244 2304
2245 if (rend & RS_Italic 2305 if (rend & RS_Italic && fore == Color_fg)
2246 && fore == Color_fg)
2247 { 2306 {
2248 if (ISSET_PIXCOLOR (Color_IT)) 2307 if (ISSET_PIXCOLOR (Color_IT))
2249 fore = Color_IT; 2308 fore = Color_IT;
2250# if !ENABLE_STYLES 2309# if !ENABLE_STYLES
2251 else 2310 else
2252 invert = !invert; 2311 invert = !invert;
2253# endif 2312# endif
2254 } 2313 }
2255 2314
2256 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2315 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2257 fore = Color_UL; 2316 fore = Color_UL;
2258#endif 2317#endif
2259 2318
2260 if (invert) 2319 if (invert)
2261 { 2320 {
2321#ifdef OPTION_HC
2322 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2323 || !ISSET_PIXCOLOR (Color_HC))
2324#endif
2325 /* invert the column if no highlightColor is set or it is the
2326 * current cursor column */
2262 ::swap (fore, back); 2327 ::swap (fore, back);
2328#ifdef OPTION_HC
2329 else if (ISSET_PIXCOLOR (Color_HC))
2330 back = Color_HC;
2331#endif
2263 2332
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2333#ifndef NO_BOLD_UNDERLINE_REVERSE
2334# ifndef OPTION_HC
2265 if (ISSET_PIXCOLOR (Color_RV)) 2335 if (ISSET_PIXCOLOR (Color_RV))
2266 back = Color_RV; 2336 back = Color_RV;
2267 2337# endif
2268 if (fore == back) 2338 if (fore == back)
2269 { 2339 {
2270 fore = Color_bg; 2340 fore = Color_bg;
2271 back = Color_fg; 2341 back = Color_fg;
2272 } 2342 }
… …
2274 } 2344 }
2275 2345
2276#ifdef TEXT_BLINK 2346#ifdef TEXT_BLINK
2277 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2347 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2278 { 2348 {
2279 if (!text_blink_ev.active) 2349 if (!text_blink_ev.is_active ())
2280 { 2350 {
2281 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2351 text_blink_ev.again ();
2282 hidden_text = 0; 2352 hidden_text = 0;
2283 } 2353 }
2284 else if (hidden_text) 2354 else if (hidden_text)
2285 fore = back; 2355 fore = back;
2286 } 2356 }
2287#endif 2357#endif
2358
2359#if ENABLE_STYLES
2360 // "careful" (too wide) character handling
2361
2362 // include previous careful character(s) if possible, looks nicer (best effort...)
2363 while (text > stp
2364 && srp[text - stp - 1] & RS_Careful
2365 && RS_SAME (rend, srp[text - stp - 1]))
2366 text--, count++, xpixel -= fwidth;
2367
2368 // force redraw after "careful" characters to avoid pixel droppings
2369 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2370 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2371
2372 // force redraw before "careful" characters to avoid pixel droppings
2373 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2374 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2375#endif
2288 } 2376 }
2289 2377
2290 /* 2378 /*
2291 * Actually do the drawing of the string here 2379 * Actually do the drawing of the string here
2292 */ 2380 */
2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2381 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2294 2382
2295 if (back == fore) 2383 if (expect_true (have_bg && back == Color_bg))
2296 font->clear_rect (*drawable, xpixel, ypixel,
2297 fwidth * count, fheight,
2298 back);
2299 else if (back == Color_bg)
2300 { 2384 {
2301 if (must_clear) 2385 // this is very ugly, maybe push it into ->draw?
2302 {
2303 CLEAR_CHARS (xpixel, ypixel, count);
2304 2386
2305 for (i = 0; i < count; i++) /* don't draw empty strings */ 2387 for (i = 0; i < count; i++) /* don't draw empty strings */
2306 if (text[i] != ' ') 2388 if (text[i] != ' ')
2307 { 2389 {
2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2390 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2309 break; 2391 goto did_clear;
2310 }
2311 } 2392 }
2312 else 2393
2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2394 CLEAR_CHARS (xpixel, ypixel, count);
2395 did_clear: ;
2314 } 2396 }
2315 else 2397 else
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2317 2399
2318 if (rend & RS_Uline && font->descent > 1 && fore != back) 2400 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2319 { 2401 {
2320#if ENABLE_FRILLS 2402#if ENABLE_FRILLS
2321 if (ISSET_PIXCOLOR (Color_underline)) 2403 if (ISSET_PIXCOLOR (Color_underline))
2322 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2404 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2323 else 2405 else
2324#endif 2406#endif
2325 XSetForeground (display->display, gc, pix_colors[fore]); 2407 XSetForeground (dpy, gc, pix_colors[fore]);
2326 2408
2327 XDrawLine (display->display, drawBuffer, gc, 2409 XDrawLine (dpy, vt, gc,
2328 xpixel, ypixel + font->ascent + 1, 2410 xpixel, ypixel + font->ascent + 1,
2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2411 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 } 2412 }
2331 } /* for (col....) */ 2413 } /* for (col....) */
2332 } /* for (row....) */ 2414 } /* for (row....) */
… …
2341 */ 2423 */
2342 if (showcursor) 2424 if (showcursor)
2343 { 2425 {
2344 if (focus) 2426 if (focus)
2345 { 2427 {
2346 if (OPTION (Opt_cursorUnderline)) 2428 if (option (Opt_cursorUnderline))
2347 *crp ^= RS_Uline; 2429 *crp ^= RS_Uline;
2348 else 2430 else
2349 { 2431 {
2350 *crp ^= RS_RVid; 2432 *crp ^= RS_RVid;
2351#ifndef NO_CURSORCOLOR 2433#ifndef NO_CURSORCOLOR
… …
2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2447 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366 cursorwidth++; 2448 cursorwidth++;
2367 2449
2368#ifndef NO_CURSORCOLOR 2450#ifndef NO_CURSORCOLOR
2369 if (ISSET_PIXCOLOR (Color_cursor)) 2451 if (ISSET_PIXCOLOR (Color_cursor))
2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2452 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2453 else
2371#endif 2454#endif
2455 XSetForeground (dpy, gc, pix_colors[ccol1]);
2372 2456
2373 XDrawRectangle (display->display, drawBuffer, gc, 2457 XDrawRectangle (dpy, vt, gc,
2374 Col2Pixel (col), 2458 Col2Pixel (col),
2375 Row2Pixel (oldcursor.row), 2459 Row2Pixel (oldcursor.row),
2376 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2460 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2461 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2378 } 2462 }
… …
2386 num_scr = 0; 2470 num_scr = 0;
2387 num_scr_allow = 1; 2471 num_scr_allow = 1;
2388} 2472}
2389 2473
2390void 2474void
2391rxvt_term::scr_remap_chars (line_t &l) 2475rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392{ 2476{
2393 if (!l.t) 2477 if (!l.t)
2394 return; 2478 return;
2395 2479
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2480 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2398 for (int i = ncol; i--; ) 2482 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2483 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400} 2484}
2401 2485
2402void 2486void
2403rxvt_term::scr_remap_chars () 2487rxvt_term::scr_remap_chars () NOTHROW
2404{ 2488{
2405 for (int i = total_rows; i--; ) 2489 for (int i = total_rows; i--; )
2406 scr_remap_chars (row_buf [i]); 2490 scr_remap_chars (row_buf [i]);
2407 2491
2408 for (int i = nrow; i--; ) 2492 for (int i = nrow; i--; )
… …
2411 scr_remap_chars (swap_buf [i]); 2495 scr_remap_chars (swap_buf [i]);
2412 } 2496 }
2413} 2497}
2414 2498
2415void 2499void
2416rxvt_term::scr_recolour () 2500rxvt_term::scr_recolour () NOTHROW
2417{ 2501{
2418 if (1 2502#ifdef HAVE_BG_PIXMAP
2419#if TRANSPARENT 2503 bgPixmap.apply ();
2420 && !am_transparent 2504#else
2421#endif 2505
2422#if XPM_BACKGROUND
2423 && !bgPixmap.pixmap
2424#endif
2425 )
2426 {
2427 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2506 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2428 XClearWindow (display->display, parent[0]); 2507 XClearWindow (dpy, parent[0]);
2429 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2508 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2430#if HAVE_SCROLLBARS 2509
2431 if (scrollBar.win) 2510 if (scrollBar.win)
2432 { 2511 {
2433 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2512 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2434 scrollBar.setIdle (); 2513 scrollBar.state = STATE_IDLE;
2435 scrollbar_show (0); 2514 scrollBar.show (0);
2436 }
2437#endif
2438 } 2515 }
2439 2516
2517#endif
2518
2519 /* bgPixmap.apply () does not do the following : */
2440 scr_clear (); 2520 scr_clear ();
2441 scr_touch (true); 2521 scr_touch (true);
2442 want_refresh = 1; 2522 want_refresh = 1;
2443} 2523}
2444 2524
2445/* ------------------------------------------------------------------------- */ 2525/* ------------------------------------------------------------------------- */
2446void 2526void
2447rxvt_term::scr_clear (bool really) 2527rxvt_term::scr_clear (bool really) NOTHROW
2448{ 2528{
2449 if (!mapped) 2529 if (!mapped)
2450 return; 2530 return;
2451 2531
2452 num_scr_allow = 0; 2532 num_scr_allow = 0;
2453 want_refresh = 1; 2533 want_refresh = 1;
2454 2534
2455 if (really) 2535 if (really)
2456 XClearWindow (display->display, vt); 2536 XClearWindow (dpy, vt);
2457} 2537}
2458 2538
2459void 2539void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2540rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461{ 2541{
2462 int view_end = view_start + nrow; 2542 int view_end = view_start + nrow;
2463 int row, col; 2543 int row, col;
2464 2544
2465 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2545 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2477 srp[col] ^= rstyle2; 2557 srp[col] ^= rstyle2;
2478 } 2558 }
2479} 2559}
2480 2560
2481void 2561void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2562rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483{ 2563{
2484 int view_end = view_start + nrow; 2564 int view_end = view_start + nrow;
2485 int row, col; 2565 int row, col;
2486 2566
2487 if (beg_row >= view_start) 2567 if (beg_row >= view_start)
… …
2504 srp[col] ^= rstyle; 2584 srp[col] ^= rstyle;
2505} 2585}
2506 2586
2507/* ------------------------------------------------------------------------- */ 2587/* ------------------------------------------------------------------------- */
2508void 2588void
2509rxvt_term::scr_reverse_selection () 2589rxvt_term::scr_reverse_selection () NOTHROW
2510{ 2590{
2511 if (selection.op 2591 if (selection.op
2512 && current_screen == selection.screen 2592 && current_screen == selection.screen
2513 && selection.end.row >= view_start) 2593 && selection.end.row >= view_start)
2514 { 2594 {
2515#if ENABLE_FRILLS 2595#if !ENABLE_MINIMAL
2516 if (selection.rect) 2596 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2597 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2598 selection.end.row, selection.end.col,
2519 RS_RVid, RS_RVid | RS_Uline); 2599 RS_RVid, RS_RVid | RS_Uline);
2520 else 2600 else
… …
2530 * Dump the whole scrollback and screen to the passed filedescriptor. The 2610 * Dump the whole scrollback and screen to the passed filedescriptor. The
2531 * invoking routine must close the fd. 2611 * invoking routine must close the fd.
2532 */ 2612 */
2533#if 0 2613#if 0
2534void 2614void
2535rxvt_term::scr_dump (int fd) 2615rxvt_term::scr_dump (int fd) NOTHROW
2536{ 2616{
2537 int row, wrote; 2617 int row, wrote;
2538 unsigned int width, towrite; 2618 unsigned int width, towrite;
2539 char r1[] = "\n"; 2619 char r1[] = "\n";
2540 2620
2541 for (row = saveLines - nsaved; 2621 for (row = saveLines + top_row;
2542 row < saveLines + nrow - 1; row++) 2622 row < saveLines + nrow - 1; row++)
2543 { 2623 {
2544 width = row_buf[row].l >= 0 ? row_buf[row].l 2624 width = row_buf[row].l >= 0 ? row_buf[row].l
2545 : ncol; 2625 : ncol;
2546 for (towrite = width; towrite; towrite -= wrote) 2626 for (towrite = width; towrite; towrite -= wrote)
… …
2559 2639
2560/* ------------------------------------------------------------------------- * 2640/* ------------------------------------------------------------------------- *
2561 * CHARACTER SELECTION * 2641 * CHARACTER SELECTION *
2562 * ------------------------------------------------------------------------- */ 2642 * ------------------------------------------------------------------------- */
2563void 2643void
2564rxvt_term::selection_check (int check_more) 2644rxvt_term::selection_check (int check_more) NOTHROW
2565{ 2645{
2566 row_col_t pos; 2646 row_col_t pos;
2567 2647
2568 if (!selection.op) 2648 if (!selection.op)
2569 return; 2649 return;
… …
2590/* ------------------------------------------------------------------------- */ 2670/* ------------------------------------------------------------------------- */
2591/* 2671/*
2592 * Paste a selection direct to the command fd 2672 * Paste a selection direct to the command fd
2593 */ 2673 */
2594void 2674void
2595rxvt_term::paste (char *data, unsigned int len) 2675rxvt_term::paste (char *data, unsigned int len) NOTHROW
2596{ 2676{
2597 /* convert normal newline chars into common keyboard Return key sequence */ 2677 /* convert normal newline chars into common keyboard Return key sequence */
2598 for (unsigned int i = 0; i < len; i++) 2678 for (unsigned int i = 0; i < len; i++)
2599 if (data[i] == C0_LF) 2679 if (data[i] == C0_LF)
2600 data[i] = C0_CR; 2680 data[i] = C0_CR;
2601 2681
2682 if (priv_modes & PrivMode_BracketPaste)
2683 tt_printf ("\e[200~");
2684
2602 tt_write (data, len); 2685 tt_write (data, len);
2686
2687 if (priv_modes & PrivMode_BracketPaste)
2688 tt_printf ("\e[201~");
2603} 2689}
2604 2690
2605/* ------------------------------------------------------------------------- */ 2691/* ------------------------------------------------------------------------- */
2606/* 2692/*
2607 * Respond to a notification that a primary selection has been sent 2693 * Respond to a notification that a primary selection has been sent
2608 * EXT: SelectionNotify 2694 * EXT: SelectionNotify
2609 */ 2695 */
2610void 2696void
2611rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2697rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2612{ 2698{
2613 if (prop == None) /* check for failed XConvertSelection */ 2699 if (prop == None) /* check for failed XConvertSelection */
2614 { 2700 {
2615 if ((selection_type & Sel_CompoundText)) 2701 if ((selection_type & Sel_CompoundText))
2616 { 2702 {
… …
2636 } 2722 }
2637 2723
2638 unsigned long bytes_after; 2724 unsigned long bytes_after;
2639 XTextProperty ct; 2725 XTextProperty ct;
2640 2726
2641 if (XGetWindowProperty (display->display, win, prop, 2727 if (XGetWindowProperty (dpy, win, prop,
2642 0, PROP_SIZE / 4, 2728 0, PROP_SIZE / 4,
2643 delete_prop, AnyPropertyType, 2729 delete_prop, AnyPropertyType,
2644 &ct.encoding, &ct.format, 2730 &ct.encoding, &ct.format,
2645 &ct.nitems, &bytes_after, 2731 &ct.nitems, &bytes_after,
2646 &ct.value) != Success) 2732 &ct.value) != Success)
… …
2655 if (bytes_after) 2741 if (bytes_after)
2656 { 2742 {
2657 // fetch and append remaining data 2743 // fetch and append remaining data
2658 XTextProperty ct2; 2744 XTextProperty ct2;
2659 2745
2660 if (XGetWindowProperty (display->display, win, prop, 2746 if (XGetWindowProperty (dpy, win, prop,
2661 ct.nitems / 4, (bytes_after + 3) / 4, 2747 ct.nitems / 4, (bytes_after + 3) / 4,
2662 delete_prop, AnyPropertyType, 2748 delete_prop, AnyPropertyType,
2663 &ct2.encoding, &ct2.format, 2749 &ct2.encoding, &ct2.format,
2664 &ct2.nitems, &bytes_after, 2750 &ct2.nitems, &bytes_after,
2665 &ct2.value) != Success) 2751 &ct2.value) != Success)
… …
2678 2764
2679 if (ct.encoding == xa[XA_INCR]) 2765 if (ct.encoding == xa[XA_INCR])
2680 { 2766 {
2681 // INCR selection, start handshake 2767 // INCR selection, start handshake
2682 if (!delete_prop) 2768 if (!delete_prop)
2683 XDeleteProperty (display->display, win, prop); 2769 XDeleteProperty (dpy, win, prop);
2684 2770
2685 selection_wait = Sel_incr; 2771 selection_wait = Sel_incr;
2686 incr_buf_fill = 0; 2772 incr_buf_fill = 0;
2687 incr_ev.start (NOW + 10); 2773 incr_ev.start (10);
2688 2774
2689 goto bailout; 2775 goto bailout;
2690 } 2776 }
2691 2777
2692 if (ct.nitems == 0) 2778 if (ct.nitems == 0)
… …
2701 ct.nitems = incr_buf_fill; 2787 ct.nitems = incr_buf_fill;
2702 incr_buf = 0; 2788 incr_buf = 0;
2703 incr_buf_size = 0; 2789 incr_buf_size = 0;
2704 incr_ev.stop (); 2790 incr_ev.stop ();
2705 } 2791 }
2706 else 2792 else
2707 { 2793 {
2708 if (selection_wait == Sel_normal 2794 if (selection_wait == Sel_normal
2709 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2795 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2710 { 2796 {
2711 /* 2797 /*
… …
2718 goto bailout; 2804 goto bailout;
2719 } 2805 }
2720 } 2806 }
2721 else if (selection_wait == Sel_incr) 2807 else if (selection_wait == Sel_incr)
2722 { 2808 {
2723 incr_ev.start (NOW + 10); 2809 incr_ev.start (10);
2724 2810
2725 while (incr_buf_fill + ct.nitems > incr_buf_size) 2811 while (incr_buf_fill + ct.nitems > incr_buf_size)
2726 { 2812 {
2727 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2813 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2728 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2814 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2735 } 2821 }
2736 2822
2737 char **cl; 2823 char **cl;
2738 int cr; 2824 int cr;
2739 2825
2740#if ENABLE_FRILLS 2826#if !ENABLE_MINIMAL
2741 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2827 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2742 // so recode it manually 2828 // so recode it manually
2743 if (ct.encoding == xa[XA_UTF8_STRING]) 2829 if (ct.encoding == xa[XA_UTF8_STRING])
2744 { 2830 {
2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2831 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2749 paste (s, strlen (s)); 2835 paste (s, strlen (s));
2750 free (s); 2836 free (s);
2751 } 2837 }
2752 else 2838 else
2753#endif 2839#endif
2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2840 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2755 && cl) 2841 && cl)
2756 { 2842 {
2757 for (int i = 0; i < cr; i++) 2843 for (int i = 0; i < cr; i++)
2758 paste (cl[i], strlen (cl[i])); 2844 paste (cl[i], strlen (cl[i]));
2759 2845
… …
2768 if (selection_wait == Sel_normal) 2854 if (selection_wait == Sel_normal)
2769 selection_wait = Sel_none; 2855 selection_wait = Sel_none;
2770} 2856}
2771 2857
2772void 2858void
2773rxvt_term::incr_cb (time_watcher &w) 2859rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2774{ 2860{
2775 selection_wait = Sel_none; 2861 selection_wait = Sel_none;
2776 2862
2777 incr_buf_size = 0; 2863 incr_buf_size = 0;
2778 free (incr_buf); 2864 free (incr_buf);
2779 2865
2780 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2866 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2781} 2867}
2782 2868
2783void 2869void
2784rxvt_term::selection_property (Window win, Atom prop) 2870rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2785{ 2871{
2786 if (prop == None || selection_wait != Sel_incr) 2872 if (prop == None || selection_wait != Sel_incr)
2787 return; 2873 return;
2788 2874
2789 selection_paste (win, prop, true); 2875 selection_paste (win, prop, true);
2790} 2876}
2791 2877
2792/* ------------------------------------------------------------------------- */ 2878/* ------------------------------------------------------------------------- */
2793/* 2879/*
2794 * Request the current selection: 2880 * Request the current selection:
2795 * Order: > internal selection if available 2881 * Order: > internal selection if available
2796 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2882 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2797 * > CUT_BUFFER0 2883 * > CUT_BUFFER0
2798 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2884 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2799 * will auto fallback to CUT_BUFFER0 2885 * will auto fallback to CUT_BUFFER0
2800 * EXT: button 2 release 2886 * EXT: button 2 release
2801 */ 2887 */
2802void 2888void
2803rxvt_term::selection_request (Time tm, int x, int y) 2889rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804{ 2890{
2805 if (x < 0 || x >= width || y < 0 || y >= height) 2891 if (selection.text && selnum == Sel_Primary)
2806 return; /* outside window */ 2892 {
2807
2808 if (selection.text)
2809 { /* internal selection */ 2893 /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2894 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2895 paste (str, strlen (str));
2812 free (str); 2896 free (str);
2813 return; 2897 return;
2814 } 2898 }
2815 else 2899 else
2816 { 2900 {
2817 int i;
2818
2819 selection_request_time = tm; 2901 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2902 selection_wait = Sel_normal;
2821 2903
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2904#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2905 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2906 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2907 return;
2828#else 2908#else
2829 selection_type = Sel_CompoundText; 2909 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2910 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2911 return;
2832#endif 2912#endif
2833 }
2834 } 2913 }
2835 2914
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2915 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2916 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2917}
2839 2918
2840int 2919int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2920rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2921{
2843 Atom sel; 2922 Atom sel;
2844 2923
2845 selection_type |= selnum; 2924 selection_type |= selnum;
2846 2925
… …
2849 else if (selnum == Sel_Secondary) 2928 else if (selnum == Sel_Secondary)
2850 sel = XA_SECONDARY; 2929 sel = XA_SECONDARY;
2851 else 2930 else
2852 sel = xa[XA_CLIPBOARD]; 2931 sel = xa[XA_CLIPBOARD];
2853 2932
2854 if (XGetSelectionOwner (display->display, sel) != None) 2933 if (XGetSelectionOwner (dpy, sel) != None)
2855 { 2934 {
2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2935 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2857 vt, selection_request_time); 2936 vt, selection_request_time);
2858 return 1; 2937 return 1;
2859 } 2938 }
2860 2939
2861 return 0; 2940 return 0;
… …
2865/* 2944/*
2866 * Clear all selected text 2945 * Clear all selected text
2867 * EXT: SelectionClear 2946 * EXT: SelectionClear
2868 */ 2947 */
2869void 2948void
2870rxvt_term::selection_clear () 2949rxvt_term::selection_clear () NOTHROW
2871{ 2950{
2872 want_refresh = 1; 2951 want_refresh = 1;
2873 free (selection.text); 2952 free (selection.text);
2874 selection.text = NULL; 2953 selection.text = NULL;
2875 selection.len = 0; 2954 selection.len = 0;
… …
2924 3003
2925 int end_col; 3004 int end_col;
2926 3005
2927 for (; row <= selection.end.row; row++, col = 0) 3006 for (; row <= selection.end.row; row++, col = 0)
2928 { 3007 {
2929#if ENABLE_FRILLS 3008#if !ENABLE_MINIMAL
2930 if (selection.rect) 3009 if (selection.rect)
2931 { 3010 {
2932 col = selection.beg.col; 3011 col = selection.beg.col;
2933 end_col = ncol + 1; 3012 end_col = ncol + 1;
2934 } 3013 }
… …
2937 end_col = ROW(row).l; 3016 end_col = ROW(row).l;
2938 3017
2939 col = max (col, 0); 3018 col = max (col, 0);
2940 3019
2941 if (row == selection.end.row 3020 if (row == selection.end.row
2942#if ENABLE_FRILLS 3021#if !ENABLE_MINIMAL
2943 || selection.rect 3022 || selection.rect
2944#endif 3023#endif
2945 ) 3024 )
2946 min_it (end_col, selection.end.col); 3025 min_it (end_col, selection.end.col);
2947 3026
… …
2970#endif 3049#endif
2971 else 3050 else
2972 new_selection_text[ofs++] = *t++; 3051 new_selection_text[ofs++] = *t++;
2973 } 3052 }
2974 3053
2975#if ENABLE_FRILLS 3054#if !ENABLE_MINIMAL
2976 if (selection.rect) 3055 if (selection.rect)
2977 { 3056 {
2978 while (ofs 3057 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF 3058 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1])) 3059 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3010 3089
3011 selection_grab (tm); 3090 selection_grab (tm);
3012} 3091}
3013 3092
3014bool 3093bool
3015rxvt_term::selection_grab (Time tm) 3094rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3095{
3017 selection_time = tm; 3096 selection_time = tm;
3018 3097
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3098 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3099 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3021 { 3100 {
3022 display->set_selection_owner (this); 3101 display->set_selection_owner (this);
3023 return true; 3102 return true;
3024 } 3103 }
3025 else 3104 else
… …
3029 } 3108 }
3030 3109
3031#if 0 3110#if 0
3032 XTextProperty ct; 3111 XTextProperty ct;
3033 3112
3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3113 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3035 { 3114 {
3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3115 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3037 XFree (ct.value); 3116 XFree (ct.value);
3038 } 3117 }
3039#endif 3118#endif
… …
3043/* 3122/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 3123 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 3124 * EXT: button 1 press
3046 */ 3125 */
3047void 3126void
3048rxvt_term::selection_click (int clicks, int x, int y) 3127rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 3128{
3050 clicks = ((clicks - 1) % 3) + 1; 3129 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 3130 selection.clicks = clicks; /* save clicks so extend will work */
3052 3131
3053 if (clicks == 2 && !selection.rect 3132 if (clicks == 2 && !selection.rect
… …
3072/* ------------------------------------------------------------------------- */ 3151/* ------------------------------------------------------------------------- */
3073/* 3152/*
3074 * Mark a selection at the specified col/row 3153 * Mark a selection at the specified col/row
3075 */ 3154 */
3076void 3155void
3077rxvt_term::selection_start_colrow (int col, int row) 3156rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078{ 3157{
3079 want_refresh = 1; 3158 want_refresh = 1;
3080 3159
3081 selection.mark.row = row + view_start; 3160 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 3161 selection.mark.col = col;
… …
3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3164 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3086 3165
3087 while (selection.mark.col > 0 3166 while (selection.mark.col > 0
3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3167 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3168 --selection.mark.col;
3090 3169
3091 if (selection.op) 3170 if (selection.op)
3171 {
3092 { /* clear the old selection */ 3172 /* clear the old selection */
3093 selection.beg.row = selection.end.row = selection.mark.row; 3173 selection.beg.row = selection.end.row = selection.mark.row;
3094 selection.beg.col = selection.end.col = selection.mark.col; 3174 selection.beg.col = selection.end.col = selection.mark.col;
3095 } 3175 }
3096 3176
3097 selection.op = SELECTION_INIT; 3177 selection.op = SELECTION_INIT;
… …
3108#define DELIMIT_TEXT(x) \ 3188#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3189 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3190#define DELIMIT_REND(x) 1
3111 3191
3112void 3192void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3193rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3194{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3195 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3196 row_col_t bound;
3117 text_t *stp; 3197 text_t *stp;
3118 rend_t *srp; 3198 rend_t *srp;
… …
3192 * flag == 0 ==> button 1 3272 * flag == 0 ==> button 1
3193 * flag == 1 ==> button 3 press 3273 * flag == 1 ==> button 3 press
3194 * flag == 2 ==> button 3 motion 3274 * flag == 2 ==> button 3 motion
3195 */ 3275 */
3196void 3276void
3197rxvt_term::selection_extend (int x, int y, int flag) 3277rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198{ 3278{
3199 int col = clamp (Pixel2Col (x), 0, ncol); 3279 int col = clamp (Pixel2Col (x), 0, ncol);
3200 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3280 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201 3281
3202 /* 3282 /*
… …
3228/* ------------------------------------------------------------------------- */ 3308/* ------------------------------------------------------------------------- */
3229/* 3309/*
3230 * Extend the selection to the specified col/row 3310 * Extend the selection to the specified col/row
3231 */ 3311 */
3232void 3312void
3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3313rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234{ 3314{
3235 row_col_t pos; 3315 row_col_t pos;
3236 enum { 3316 enum {
3237 LEFT, RIGHT 3317 LEFT, RIGHT
3238 } closeto = RIGHT; 3318 } closeto = RIGHT;
… …
3286 * a point/word/line which is either the start or end of the selection 3366 * a point/word/line which is either the start or end of the selection
3287 * and it was decided by whichever point/word/line was `fixed' at the 3367 * and it was decided by whichever point/word/line was `fixed' at the
3288 * time of the most recent button3 press 3368 * time of the most recent button3 press
3289 */ 3369 */
3290 if (button3 && buttonpress) 3370 if (button3 && buttonpress)
3371 {
3291 { /* button3 press */ 3372 /* button3 press */
3292 /* 3373 /*
3293 * first determine which edge of the selection we are closest to 3374 * first determine which edge of the selection we are closest to
3294 */ 3375 */
3295 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3376 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3296 || (!ROWCOL_IS_AFTER (pos, selection.end) 3377 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3314 selection.mark.row = selection.beg.row; 3395 selection.mark.row = selection.beg.row;
3315 selection.mark.col = selection.beg.col; 3396 selection.mark.col = selection.beg.col;
3316 } 3397 }
3317 } 3398 }
3318 else 3399 else
3400 {
3319 { /* button1 drag or button3 drag */ 3401 /* button1 drag or button3 drag */
3320 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3402 if (ROWCOL_IS_AFTER (selection.mark, pos))
3321 { 3403 {
3322 if (selection.mark.row == selection.end.row 3404 if (selection.mark.row == selection.end.row
3323 && selection.mark.col == selection.end.col 3405 && selection.mark.col == selection.end.col
3324 && clickchange 3406 && clickchange
… …
3341 3423
3342 if (selection.clicks == 1) 3424 if (selection.clicks == 1)
3343 { 3425 {
3344 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3426 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3345 && !ROW(selection.beg.row).is_longer () 3427 && !ROW(selection.beg.row).is_longer ()
3346#if ENABLE_FRILLS 3428#if !ENABLE_MINIMAL
3347 && !selection.rect 3429 && !selection.rect
3348#endif 3430#endif
3349 ) 3431 )
3350 selection.beg.col = ncol; 3432 selection.beg.col = ncol;
3351 3433
3352 if ( 3434 if (
3353 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3435 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3354 && !ROW(selection.end.row).is_longer () 3436 && !ROW(selection.end.row).is_longer ()
3355#if ENABLE_FRILLS 3437#if !ENABLE_MINIMAL
3356 && !selection.rect 3438 && !selection.rect
3357#endif 3439#endif
3358 ) 3440 )
3359 selection.end.col = ncol; 3441 selection.end.col = ncol;
3360 } 3442 }
… …
3367 selection_delimit_word (DN, &selection.end, &selection.end); 3449 selection_delimit_word (DN, &selection.end, &selection.end);
3368 } 3450 }
3369 else if (selection.clicks == 3) 3451 else if (selection.clicks == 3)
3370 { 3452 {
3371#if ENABLE_FRILLS 3453#if ENABLE_FRILLS
3372 if (OPTION (Opt_tripleclickwords)) 3454 if (option (Opt_tripleclickwords))
3373 { 3455 {
3374 selection_delimit_word (UP, &selection.beg, &selection.beg); 3456 selection_delimit_word (UP, &selection.beg, &selection.beg);
3375 3457
3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3458 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3377 { 3459 {
3378 if (!ROW(end_row).is_longer ()) 3460 if (!ROW(end_row).is_longer ())
3379 { 3461 {
3380 selection.end.row = end_row; 3462 selection.end.row = end_row;
3381 selection.end.col = ROW(end_row).l; 3463 selection.end.col = ROW(end_row).l;
3464# if !ENABLE_MINIMAL
3382 selection_remove_trailing_spaces (); 3465 selection_remove_trailing_spaces ();
3466# endif
3383 break; 3467 break;
3384 } 3468 }
3385 } 3469 }
3386 } 3470 }
3387 else 3471 else
… …
3403 selection.end.row++; 3487 selection.end.row++;
3404 } 3488 }
3405 } 3489 }
3406 3490
3407 if (button3 && buttonpress) 3491 if (button3 && buttonpress)
3492 {
3408 { /* mark may need to be changed */ 3493 /* mark may need to be changed */
3409 if (closeto == LEFT) 3494 if (closeto == LEFT)
3410 { 3495 {
3411 selection.mark.row = selection.end.row; 3496 selection.mark.row = selection.end.row;
3412 selection.mark.col = selection.end.col - (selection.clicks == 2); 3497 selection.mark.col = selection.end.col - (selection.clicks == 2);
3413 } 3498 }
… …
3416 selection.mark.row = selection.beg.row; 3501 selection.mark.row = selection.beg.row;
3417 selection.mark.col = selection.beg.col; 3502 selection.mark.col = selection.beg.col;
3418 } 3503 }
3419 } 3504 }
3420 3505
3421#if ENABLE_FRILLS 3506#if !ENABLE_MINIMAL
3422 if (selection.rect && selection.beg.col > selection.end.col) 3507 if (selection.rect && selection.beg.col > selection.end.col)
3423 ::swap (selection.beg.col, selection.end.col); 3508 ::swap (selection.beg.col, selection.end.col);
3424#endif 3509#endif
3425} 3510}
3426 3511
3427#if ENABLE_FRILLS 3512#if !ENABLE_MINIMAL
3428void 3513void
3429rxvt_term::selection_remove_trailing_spaces () 3514rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430{ 3515{
3431 int32_t end_col, end_row; 3516 int32_t end_col, end_row;
3432 text_t *stp; 3517 text_t *stp;
3433 3518
3434 end_col = selection.end.col; 3519 end_col = selection.end.col;
… …
3472/* 3557/*
3473 * Double click on button 3 when already selected 3558 * Double click on button 3 when already selected
3474 * EXT: button 3 double click 3559 * EXT: button 3 double click
3475 */ 3560 */
3476void 3561void
3477rxvt_term::selection_rotate (int x, int y) 3562rxvt_term::selection_rotate (int x, int y) NOTHROW
3478{ 3563{
3479 selection.clicks = selection.clicks % 3 + 1; 3564 selection.clicks = selection.clicks % 3 + 1;
3480 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3565 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481} 3566}
3482 3567
… …
3484/* 3569/*
3485 * Respond to a request for our current selection 3570 * Respond to a request for our current selection
3486 * EXT: SelectionRequest 3571 * EXT: SelectionRequest
3487 */ 3572 */
3488void 3573void
3489rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3574rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490{ 3575{
3491 XSelectionEvent ev; 3576 XSelectionEvent ev;
3492 dDisp;
3493 3577
3494 ev.type = SelectionNotify; 3578 ev.type = SelectionNotify;
3495 ev.property = None; 3579 ev.property = None;
3496 ev.display = rq.display; 3580 ev.display = rq.display;
3497 ev.requestor = rq.requestor; 3581 ev.requestor = rq.requestor;
… …
3511 *target++ = xa[XA_COMPOUND_TEXT]; 3595 *target++ = xa[XA_COMPOUND_TEXT];
3512#if X_HAVE_UTF8_STRING 3596#if X_HAVE_UTF8_STRING
3513 *target++ = xa[XA_UTF8_STRING]; 3597 *target++ = xa[XA_UTF8_STRING];
3514#endif 3598#endif
3515 3599
3516 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3600 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3517 32, PropModeReplace, 3601 32, PropModeReplace,
3518 (unsigned char *)target_list, target - target_list); 3602 (unsigned char *)target_list, target - target_list);
3519 ev.property = rq.property; 3603 ev.property = rq.property;
3520 } 3604 }
3521#if TODO // TODO 3605#if TODO // TODO
… …
3524 /* TODO: Handle MULTIPLE */ 3608 /* TODO: Handle MULTIPLE */
3525 } 3609 }
3526#endif 3610#endif
3527 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3611 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3528 { 3612 {
3529 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3613 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3530 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3614 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3531 ev.property = rq.property; 3615 ev.property = rq.property;
3532 } 3616 }
3533 else if (rq.target == XA_STRING 3617 else if (rq.target == XA_STRING
3534 || rq.target == xa[XA_TEXT] 3618 || rq.target == xa[XA_TEXT]
… …
3558 style = enc_string; 3642 style = enc_string;
3559 else if (target == xa[XA_TEXT]) 3643 else if (target == xa[XA_TEXT])
3560 style = enc_text; 3644 style = enc_text;
3561 else if (target == xa[XA_COMPOUND_TEXT]) 3645 else if (target == xa[XA_COMPOUND_TEXT])
3562 style = enc_compound_text; 3646 style = enc_compound_text;
3563#if ENABLE_FRILLS 3647#if !ENABLE_MINIMAL
3564 else if (target == xa[XA_UTF8_STRING]) 3648 else if (target == xa[XA_UTF8_STRING])
3565 style = enc_utf8; 3649 style = enc_utf8;
3566#endif 3650#endif
3567 else 3651 else
3568 { 3652 {
… …
3579 { 3663 {
3580 cl = L""; 3664 cl = L"";
3581 selectlen = 0; 3665 selectlen = 0;
3582 } 3666 }
3583 3667
3584#if ENABLE_FRILLS 3668#if !ENABLE_MINIMAL
3585 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3669 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3586 // so recode it manually 3670 // so recode it manually
3587 if (style == enc_utf8) 3671 if (style == enc_utf8)
3588 { 3672 {
3589 freect = 1; 3673 freect = 1;
… …
3592 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3676 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3593 ct.nitems = strlen ((char *)ct.value); 3677 ct.nitems = strlen ((char *)ct.value);
3594 } 3678 }
3595 else 3679 else
3596#endif 3680#endif
3597 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3681 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3598 freect = 1; 3682 freect = 1;
3599 else 3683 else
3600 { 3684 {
3601 /* if we failed to convert then send it raw */ 3685 /* if we failed to convert then send it raw */
3602 ct.value = (unsigned char *)cl; 3686 ct.value = (unsigned char *)cl;
3603 ct.nitems = selectlen; 3687 ct.nitems = selectlen;
3604 ct.encoding = target; 3688 ct.encoding = target;
3605 } 3689 }
3606 3690
3607 XChangeProperty (disp, rq.requestor, rq.property, 3691 XChangeProperty (dpy, rq.requestor, rq.property,
3608 ct.encoding, 8, PropModeReplace, 3692 ct.encoding, 8, PropModeReplace,
3609 ct.value, (int)ct.nitems); 3693 ct.value, (int)ct.nitems);
3610 ev.property = rq.property; 3694 ev.property = rq.property;
3611 3695
3612 if (freect) 3696 if (freect)
3613 XFree (ct.value); 3697 XFree (ct.value);
3614 } 3698 }
3615 3699
3616 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3700 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3617}
3618
3619/* ------------------------------------------------------------------------- *
3620 * MOUSE ROUTINES *
3621 * ------------------------------------------------------------------------- */
3622
3623/*
3624 * return col/row values corresponding to x/y pixel values
3625 */
3626void
3627rxvt_term::pixel_position (int *x, int *y)
3628{
3629 *x = Pixel2Col (*x);
3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3631 *y = Pixel2Row (*y);
3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3633} 3701}
3634 3702
3635/* ------------------------------------------------------------------------- */ 3703/* ------------------------------------------------------------------------- */
3636#ifdef USE_XIM 3704#ifdef USE_XIM
3637void 3705void
3638rxvt_term::im_set_position (XPoint &pos) 3706rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639{ 3707{
3640 XWindowAttributes xwa; 3708 XWindowAttributes xwa;
3641 3709
3642 XGetWindowAttributes (display->display, vt, &xwa); 3710 XGetWindowAttributes (dpy, vt, &xwa);
3643 3711
3644 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3712 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3645 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3713 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3646} 3714}
3647#endif 3715#endif
3648 3716
3649#if ENABLE_OVERLAY 3717#if ENABLE_OVERLAY
3650void 3718void
3651rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3719rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652{ 3720{
3653 if (nrow < 1 || ncol < 1) 3721 if (nrow < 1 || ncol < 1)
3654 return; 3722 return;
3655 3723
3656 want_refresh = 1; 3724 want_refresh = 1;
… …
3701 *rp = r; 3769 *rp = r;
3702 } 3770 }
3703} 3771}
3704 3772
3705void 3773void
3706rxvt_term::scr_overlay_off () 3774rxvt_term::scr_overlay_off () NOTHROW
3707{ 3775{
3708 if (!ov_text) 3776 if (!ov_text)
3709 return; 3777 return;
3710 3778
3711 want_refresh = 1; 3779 want_refresh = 1;
… …
3719 delete [] ov_text; ov_text = 0; 3787 delete [] ov_text; ov_text = 0;
3720 delete [] ov_rend; ov_rend = 0; 3788 delete [] ov_rend; ov_rend = 0;
3721} 3789}
3722 3790
3723void 3791void
3724rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3792rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725{ 3793{
3726 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3794 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3727 return; 3795 return;
3728 3796
3729 x++, y++; 3797 x++, y++;
… …
3731 ov_text[y][x] = text; 3799 ov_text[y][x] = text;
3732 ov_rend[y][x] = rend; 3800 ov_rend[y][x] = rend;
3733} 3801}
3734 3802
3735void 3803void
3736rxvt_term::scr_overlay_set (int x, int y, const char *s) 3804rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737{ 3805{
3738 while (*s) 3806 while (*s)
3739 scr_overlay_set (x++, y, *s++); 3807 scr_overlay_set (x++, y, *s++);
3740} 3808}
3741 3809
3742void 3810void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3811rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744{ 3812{
3745 while (*s) 3813 while (*s)
3746 { 3814 {
3747 text_t t = *s++; 3815 text_t t = *s++;
3748 int width = wcwidth (t); 3816 int width = WCWIDTH (t);
3749 3817
3750 while (width--) 3818 while (width--)
3751 { 3819 {
3752 scr_overlay_set (x++, y, t); 3820 scr_overlay_set (x++, y, t);
3753 t = NOCHAR; 3821 t = NOCHAR;
3754 } 3822 }
3755 } 3823 }
3756} 3824}
3757 3825
3758void 3826void
3759rxvt_term::scr_swap_overlay () 3827rxvt_term::scr_swap_overlay () NOTHROW
3760{ 3828{
3761 if (!ov_text) 3829 if (!ov_text)
3762 return; 3830 return;
3763 3831
3764 // swap screen mem with overlay 3832 // swap screen mem with overlay

Diff Legend

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