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

Diff Legend

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