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

Diff Legend

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