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.240 by root, Thu Jan 19 17:21:20 2006 UTC vs.
Revision 1.323 by root, Tue Nov 4 23:53:29 2008 UTC

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

Diff Legend

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