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.309 by root, Mon Jul 21 16:51:31 2008 UTC

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

Diff Legend

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