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.236 by root, Wed Jan 18 09:40:53 2006 UTC vs.
Revision 1.313 by root, Tue Nov 4 14:25:10 2008 UTC

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

Diff Legend

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