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.226 by root, Thu Jan 12 09:55:44 2006 UTC vs.
Revision 1.276 by ayin, Sun Aug 26 17:56:19 2007 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-2006 Marc Lehmann <pcg@goof.com>
… …
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() \
… …
93 */ 91 */
94#define drawBuffer vt 92#define drawBuffer vt
95 93
96#define CLEAR_ROWS(row, num) \ 94#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 95 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 96 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 97 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 98 (unsigned int)Height2Pixel (num), False)
101 99
102#define CLEAR_CHARS(x, y, num) \ 100#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 101 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 102 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 103 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 104 (unsigned int)Height2Pixel (1), False)
107 105
108#define ERASE_ROWS(row, num) \ 106#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 107 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 108 0, Row2Pixel (row), \
111 (unsigned int)width, \ 109 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 110 (unsigned int)Height2Pixel (num))
113 111
114/* ------------------------------------------------------------------------- * 112/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 113 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 114 * ------------------------------------------------------------------------- */
117 115
118/* Fill part/all of a line with blanks. */ 116/* Fill part/all of a line with blanks. */
119void 117void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 118rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 119{
122 if (!l.t) 120 if (!l.t)
123 { 121 {
124 lalloc (l); 122 lalloc (l);
125 col = 0; 123 col = 0;
126 width = ncol; 124 width = ncol;
127 } 125 }
128 126
129 l.touch (); 127 l.touch ();
130 128
131 efs &= ~RS_baseattrMask; 129 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 131
134 text_t *et = l.t + col; 132 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 133 rend_t *er = l.r + col;
136 134
… …
142} 140}
143 141
144/* ------------------------------------------------------------------------- */ 142/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 143/* Fill a full line with blanks - make sure it is allocated first */
146void 144void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 146{
149 scr_blank_line (l, 0, ncol, efs); 147 scr_blank_line (l, 0, ncol, efs);
150 148
151 l.l = 0; 149 l.l = 0;
152 l.f = 0; 150 l.f = 0;
… …
161{ 159{
162#if ENABLE_OVERLAY 160#if ENABLE_OVERLAY
163 scr_overlay_off (); 161 scr_overlay_off ();
164#endif 162#endif
165 163
164 rvideo_mode = false;
166 view_start = 0; 165 view_start = 0;
167 num_scr = 0; 166 num_scr = 0;
168 167
169 if (ncol == 0) 168 if (ncol == 0)
170 ncol = 80; 169 ncol = 80;
… …
173 nrow = 24; 172 nrow = 24;
174 173
175 if (ncol == prev_ncol && nrow == prev_nrow) 174 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 175 return;
177 176
177 if (current_screen != PRIMARY)
178 scr_swap_screen ();
179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
182 saveLines++; 184 saveLines++;
183 prev_nrow--; 185 prev_nrow--;
184 nsaved++; 186 top_row--;
185 } 187 }
186 188
187 want_refresh = 1; 189 want_refresh = 1;
188 190
189 int prev_total_rows = prev_nrow + saveLines; 191 int prev_total_rows = prev_nrow + saveLines;
… …
195 if (!row_buf) 197 if (!row_buf)
196 { 198 {
197 /* 199 /*
198 * first time called so just malloc everything: don't rely on realloc 200 * first time called so just malloc everything: don't rely on realloc
199 */ 201 */
200 nsaved = 0; /* no saved lines */ 202 top_row = 0;
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
239 CLEAR_ALL_SELECTION ();
240 rvideo = 0;
241 } 241 }
242 else 242 else
243 { 243 {
244 /* 244 /*
245 * add or delete rows as appropriate 245 * add or delete rows as appropriate
… …
276 276
277 line_t *old_buf = row_buf; 277 line_t *old_buf = row_buf;
278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 278 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
279 279
280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 280 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
281 int pend = MOD (term_start - nsaved , prev_total_rows); 281 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 282 int q = total_rows; // rewrapped row
283 283
284 if (nsaved) 284 if (top_row)
285 { 285 {
286 // re-wrap lines, this is rather ugly, possibly because I am too dumb 286 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
287 // to come up with a lean and mean algorithm. 287 // to come up with a lean and mean algorithm.
288 288
289 row_col_t ocur = screen.cur; 289 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 290 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 291
… …
325 qline->l = ncol; 325 qline->l = ncol;
326 qline->is_longer (1); 326 qline->is_longer (1);
327 327
328 int qcol = 0; 328 int qcol = 0;
329 329
330 // see below for cursor adjustment rationale
331 if (p == ocur.row)
332 screen.cur.row = q - (total_rows - nrow);
333
330 // fill a single destination line 334 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 335 while (lofs < llen && qcol < ncol)
332 { 336 {
333 int prow = lofs / prev_ncol; 337 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 338 int pcol = lofs % prev_ncol;
… …
344 348
345 line_t &pline = old_buf [prow]; 349 line_t &pline = old_buf [prow];
346 350
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 351 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 352
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 353 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 354 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 355
355 lofs += len; 356 lofs += len;
356 qcol += len; 357 qcol += len;
… …
362 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 363 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
363 } 364 }
364 while (p != pend && q > 0); 365 while (p != pend && q > 0);
365 366
366 term_start = total_rows - nrow; 367 term_start = total_rows - nrow;
367 nsaved = term_start - q; 368 top_row = q - term_start;
368 369
369 // make sure all terminal lines exist 370 // make sure all terminal lines exist
370 while (nsaved < 0) 371 while (top_row > 0)
371 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 372 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
372 } 373 }
373 else 374 else
374 { 375 {
375 // if no scrollback exists (yet), wing, instead of wrap 376 // if no scrollback exists (yet), wing, instead of wrap
376 377
… …
389 } 390 }
390 391
391 term_start = 0; 392 term_start = 0;
392 } 393 }
393 394
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = -nsaved; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 395 free (old_buf);
400 delete old_ta; 396 delete old_ta;
401 delete old_ra; 397 delete old_ra;
402 398
403 clamp_it (screen.cur.row, 0, nrow - 1); 399 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 400 clamp_it (screen.cur.col, 0, ncol - 1);
405 401
406 if (tabs)
407 free (tabs); 402 free (tabs);
408 } 403 }
404
405 CLEAR_ALL_SELECTION ();
409 406
410 prev_nrow = nrow; 407 prev_nrow = nrow;
411 prev_ncol = ncol; 408 prev_ncol = ncol;
412 409
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 410 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414 411
415 for (int col = ncol; col--; ) 412 for (int col = ncol; --col; )
416 tabs [col] = col % TABSIZE == 0; 413 tabs [col] = col % TABSIZE == 0;
417 414
415 if (current_screen != PRIMARY)
416 scr_swap_screen ();
417
418 tt_winch (); 418 tt_winch ();
419 419
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 420 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 421}
422 422
423/* ------------------------------------------------------------------------- */ 423/* ------------------------------------------------------------------------- */
424/* 424/*
425 * Free everything. That way malloc debugging can find leakage. 425 * Free everything. That way malloc debugging can find leakage.
426 */ 426 */
427void 427void
428rxvt_term::scr_release () 428rxvt_term::scr_release () NOTHROW
429{ 429{
430 if (row_buf)
431 {
430 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
432 434
433 free (row_buf); 435 free (row_buf);
434 free (swap_buf); 436 free (swap_buf);
435 free (drawn_buf); 437 free (drawn_buf);
436 free (tabs); 438 free (tabs);
437 439
438 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
441 }
439} 442}
440 443
441/* ------------------------------------------------------------------------- */ 444/* ------------------------------------------------------------------------- */
442/* 445/*
443 * Hard reset 446 * Hard reset
… …
448 scr_release (); 451 scr_release ();
449 prev_nrow = prev_ncol = 0; 452 prev_nrow = prev_ncol = 0;
450 scr_reset (); 453 scr_reset ();
451 454
452 scr_clear (true); 455 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 456 scr_refresh ();
454} 457}
455 458
456/* ------------------------------------------------------------------------- * 459/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 460 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 461 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 463 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 464 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 465 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 466 */
464void 467void
465rxvt_term::scr_cursor (int mode) 468rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 469{
467 screen_t *s; 470 screen_t *s;
468 471
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 472#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 473 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 505 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 506 assert (s->cur.col >= 0);
504#endif 507#endif
505} 508}
506 509
510void
511rxvt_term::scr_swap_screen ()
512{
513 if (!option (Opt_secondaryScreen))
514 return;
515
516 for (int i = prev_nrow; i--; )
517 ::swap (ROW(i), swap_buf [i]);
518
519 ::swap (screen.cur, swap.cur);
520
521 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
522 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
523}
524
507/* ------------------------------------------------------------------------- */ 525/* ------------------------------------------------------------------------- */
508/* 526/*
509 * Swap between primary and secondary screens 527 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 528 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 529 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 530 */
513int 531void
514rxvt_term::scr_change_screen (int scrn) 532rxvt_term::scr_change_screen (int scrn)
515{ 533{
534 if (scrn == current_screen)
535 return;
536
516 want_refresh = 1; 537 want_refresh = 1;
517 view_start = 0; 538 view_start = 0;
518 539
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 540 selection_check (2); /* check for boundary cross */
523 541
524 int i = current_screen; current_screen = scrn; scrn = i; 542 int i = current_screen; current_screen = scrn; scrn = i;
525 543
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531
532#if NSCREENS 544#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 545 if (option (Opt_secondaryScreen))
534 { 546 {
535 num_scr = 0; 547 num_scr = 0;
536 548
537 for (int i = prev_nrow; i--; ) 549 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 550
540 ::swap (screen.charset, swap.charset); 551 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 552 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 553 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 554 swap.flags |= Screen_VisibleCursor;
544 } 555 }
545 else 556 else
546#endif 557#endif
547 if (OPTION (Opt_secondaryScroll)) 558 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 559 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 560}
552 561
553// clear WrapNext indicator, solidifying position on next line 562// clear WrapNext indicator, solidifying position on next line
554void 563void
555rxvt_term::scr_do_wrap () 564rxvt_term::scr_do_wrap () NOTHROW
556{ 565{
557 if (!(screen.flags & Screen_WrapNext)) 566 if (!(screen.flags & Screen_WrapNext))
558 return; 567 return;
559 568
560 screen.flags &= ~Screen_WrapNext; 569 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 579/* ------------------------------------------------------------------------- */
571/* 580/*
572 * Change the colour for following text 581 * Change the colour for following text
573 */ 582 */
574void 583void
575rxvt_term::scr_color (unsigned int color, int fgbg) 584rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 585{
577 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 586 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 587 color = fgbg;
579 588
580 if (fgbg == Color_fg) 589 if (fgbg == Color_fg)
… …
586/* ------------------------------------------------------------------------- */ 595/* ------------------------------------------------------------------------- */
587/* 596/*
588 * Change the rendition style for following text 597 * Change the rendition style for following text
589 */ 598 */
590void 599void
591rxvt_term::scr_rendition (int set, int style) 600rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 601 {
593 if (set) 602 if (set)
594 rstyle |= style; 603 rstyle |= style;
595 else if (style == ~RS_None) 604 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 605 rstyle = DEFAULT_RSTYLE;
… …
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 612 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 613 * count positive ==> scroll up
605 * count negative ==> scroll down 614 * count negative ==> scroll down
606 */ 615 */
607int 616int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 617rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 618{
610 if (count == 0 || (row1 > row2)) 619 if (count == 0 || (row1 > row2))
611 return 0; 620 return 0;
612 621
613 want_refresh = 1; 622 want_refresh = 1;
614 num_scr += count; 623 num_scr += count;
615 624
616 if (count > 0 625 if (count > 0
617 && row1 == 0 626 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
628 {
629 top_row = max (top_row - count, -saveLines);
630
631 // scroll everything up 'count' lines
632 term_start = (term_start + count) % total_rows;
633
634 // sever bottommost line
620 { 635 {
621 nsaved = min (nsaved + count, saveLines); 636 line_t &l = ROW(row2 - count);
637 l.is_longer (0);
638 l.touch ();
639 }
622 640
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 641 // erase newly scrolled-in lines
642 for (int i = count; i--; )
643 {
644 line_t &l = ROW(nrow - 1 - i);
645
646 // optimize if already cleared, can be significant on slow machines
647 // could be rolled into scr_blank_screen_mem
648 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
649 {
650 scr_blank_line (l, 0, l.l, rstyle);
651 l.l = 0;
652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
656 }
657
658 // now copy lines below the scroll region bottom to the
659 // bottom of the screen again, so they look as if they
660 // hadn't moved.
661 for (int i = nrow; --i > row2; )
662 {
663 line_t &l1 = ROW(i - count);
664 line_t &l2 = ROW(i);
665
666 ::swap (l1, l2);
667 l2.touch ();
668 }
624 669
625 term_start = (term_start + count) % total_rows; 670 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 671 if (selection.op && current_screen == selection.screen)
628 { 672 {
629 selection.beg.row -= count; 673 selection.beg.row -= count;
630 selection.end.row -= count; 674 selection.end.row -= count;
631 selection.mark.row -= count; 675 selection.mark.row -= count;
632 676
633 if (selection.beg.row < -nsaved 677 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 678 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 679 || selection.mark.row < top_row)
636 { 680 {
637 CLEAR_ALL_SELECTION (); 681 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
639 } 683 }
640 } 684 }
641 685
642 for (int i = count; i--; ) 686 // finally move the view window, if desired
643 {
644 // basically thi is a slightly optimized scr_blank_screen_mem
645 // it is worth the effort on slower machines
646 line_t &l = ROW(row2 - i);
647
648 scr_blank_line (l, 0, l.l, rstyle);
649
650 l.l = 0;
651 l.f = 0;
652 }
653
654 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
655 && view_start != 0 688 && view_start != 0
656 && view_start != saveLines) 689 && view_start != -saveLines)
657 scr_page (UP, count); 690 scr_page (UP, count);
691
692 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
693 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
658 } 694 }
659 else 695 else
660 { 696 {
661 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen)
662 { 698 {
… …
708/* ------------------------------------------------------------------------- */ 744/* ------------------------------------------------------------------------- */
709/* 745/*
710 * Add text given in <str> of length <len> to screen struct 746 * Add text given in <str> of length <len> to screen struct
711 */ 747 */
712void 748void
713rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 749rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
714{ 750{
715 if (len <= 0) /* sanity */ 751 if (len <= 0) /* sanity */
716 return; 752 return;
717 753
718 unsigned char checksel; 754 unsigned char checksel;
… …
724 ZERO_SCROLLBACK (); 760 ZERO_SCROLLBACK ();
725 761
726 if (minlines > 0) 762 if (minlines > 0)
727 { 763 {
728 minlines += screen.cur.row - screen.bscroll; 764 minlines += screen.cur.row - screen.bscroll;
765 min_it (minlines, screen.cur.row - top_row);
729 766
730 if (minlines > 0 767 if (minlines > 0
731 && screen.tscroll == 0 768 && screen.tscroll == 0
732 && screen.bscroll == nrow - 1) 769 && screen.bscroll == nrow - 1)
733 { 770 {
… …
738 } 775 }
739 776
740#ifdef DEBUG_STRICT 777#ifdef DEBUG_STRICT
741 assert (screen.cur.col < ncol); 778 assert (screen.cur.col < ncol);
742 assert (screen.cur.row < nrow 779 assert (screen.cur.row < nrow
743 && screen.cur.row >= -nsaved); 780 && screen.cur.row >= top_row);
744#endif 781#endif
745 int row = screen.cur.row; 782 int row = screen.cur.row;
746 783
747 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 784 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
748 785
… …
794 CLEAR_SELECTION (); 831 CLEAR_SELECTION ();
795 } 832 }
796 833
797 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
798 { 835 {
799 max_it (line->l, ncol);
800 line->is_longer (1);
801
802 scr_do_wrap (); 836 scr_do_wrap ();
803 837
838 line->l = ncol;
839 line->is_longer (1);
840
804 row = screen.cur.row; 841 row = screen.cur.row;
805 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
806 } 843 }
807 844
808 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
809 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
810 c = 0xfffd; 847 c = 0xfffd;
811 848
812 // rely on wcwidth to tell us the character width, at least for non-latin1 849 // rely on wcwidth to tell us the character width, do wcwidth before
813 // do wcwidth before further replacements, as wcwidth might return -1 850 // further replacements, as wcwidth might return -1 for the line
814 // for the line drawing characters below as they might be invalid in the current 851 // drawing characters below as they might be invalid in the current
815 // locale. 852 // locale.
816 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
817 854
818 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
819 { 856 {
820 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
821 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
972/* 1009/*
973 * Process Backspace. Move back the cursor back a position, wrap if have to 1010 * Process Backspace. Move back the cursor back a position, wrap if have to
974 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
975 */ 1012 */
976void 1013void
977rxvt_term::scr_backspace () 1014rxvt_term::scr_backspace () NOTHROW
978{ 1015{
979 want_refresh = 1; 1016 want_refresh = 1;
980 1017
981 if (screen.cur.col == 0) 1018 if (screen.cur.col == 0)
982 { 1019 {
… …
1000 * Process Horizontal Tab 1037 * Process Horizontal Tab
1001 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
1002 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
1003 */ 1040 */
1004void 1041void
1005rxvt_term::scr_tab (int count, bool ht) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
1006{ 1043{
1007 int i, x; 1044 int i, x;
1008 1045
1009 want_refresh = 1; 1046 want_refresh = 1;
1010 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
… …
1032 if (count) 1069 if (count)
1033 x = ncol - 1; 1070 x = ncol - 1;
1034 1071
1035 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1036 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1037 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1038 { 1075 {
1039 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1040 1077
1041 l.touch (x); 1078 l.touch (x);
1042 1079
… …
1075 * Process DEC Back Index 1112 * Process DEC Back Index
1076 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1077 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1078 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1079 */ 1116 */
1080#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1081void 1118void
1082rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1083{ 1120{
1084 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1085 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1086 else 1123 else
1087 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
… …
1092 * Process DEC Forward Index 1129 * Process DEC Forward Index
1093 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1094 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1095 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1096 */ 1133 */
1097#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1098void 1135void
1099rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1100{ 1137{
1101 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1102 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1103 else 1140 else
1104 { 1141 {
… …
1117/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1118/* 1155/*
1119 * Goto Row/Column 1156 * Goto Row/Column
1120 */ 1157 */
1121void 1158void
1122rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1123{ 1160{
1124 want_refresh = 1; 1161 want_refresh = 1;
1125 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1126 1163
1127 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1165/* ------------------------------------------------------------------------- */ 1202/* ------------------------------------------------------------------------- */
1166/* 1203/*
1167 * direction should be UP or DN 1204 * direction should be UP or DN
1168 */ 1205 */
1169void 1206void
1170rxvt_term::scr_index (enum page_dirn direction) 1207rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1171{ 1208{
1172 int dirn; 1209 int dirn;
1173 1210
1174 want_refresh = 1; 1211 want_refresh = 1;
1175 ZERO_SCROLLBACK (); 1212 ZERO_SCROLLBACK ();
… …
1194 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1195 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1196 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1197 */ 1234 */
1198void 1235void
1199rxvt_term::scr_erase_line (int mode) 1236rxvt_term::scr_erase_line (int mode) NOTHROW
1200{ 1237{
1201 unsigned int col, num; 1238 unsigned int col, num;
1202 1239
1203 want_refresh = 1; 1240 want_refresh = 1;
1204 ZERO_SCROLLBACK (); 1241 ZERO_SCROLLBACK ();
… …
1248 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1249 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1250 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1251 */ 1288 */
1252void 1289void
1253rxvt_term::scr_erase_screen (int mode) 1290rxvt_term::scr_erase_screen (int mode) NOTHROW
1254{ 1291{
1255 int num; 1292 int num;
1256 int32_t row; 1293 int32_t row;
1257 rend_t ren; 1294 rend_t ren;
1258 XGCValues gcvalue; 1295 XGCValues gcvalue;
… …
1303 } 1340 }
1304 else 1341 else
1305 { 1342 {
1306 ren = rstyle & (RS_fgMask | RS_bgMask); 1343 ren = rstyle & (RS_fgMask | RS_bgMask);
1307 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1308 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1346 ERASE_ROWS (row, num);
1310 gcvalue.foreground = pix_colors[Color_fg]; 1347 gcvalue.foreground = pix_colors[Color_fg];
1311 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1348 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1312 } 1349 }
1313 1350
1314 for (; num--; row++) 1351 for (; num--; row++)
1315 { 1352 {
1316 scr_blank_screen_mem (ROW(row), rstyle); 1353 scr_blank_screen_mem (ROW(row), rstyle);
1317 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1354 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1318 } 1355 }
1319} 1356}
1320 1357
1321#if ENABLE_FRILLS 1358#if !ENABLE_MINIMAL
1322void 1359void
1323rxvt_term::scr_erase_savelines () 1360rxvt_term::scr_erase_savelines () NOTHROW
1324{ 1361{
1325 want_refresh = 1; 1362 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
1327 1364
1328 nsaved = 0; 1365 top_row = 0;
1329} 1366}
1330#endif 1367#endif
1331 1368
1332/* ------------------------------------------------------------------------- */ 1369/* ------------------------------------------------------------------------- */
1333/* 1370/*
1334 * Fill the screen with `E's 1371 * Fill the screen with `E's
1335 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1372 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1336 */ 1373 */
1337void 1374void
1338rxvt_term::scr_E () 1375rxvt_term::scr_E () NOTHROW
1339{ 1376{
1340 rend_t fs; 1377 rend_t fs;
1341 1378
1342 want_refresh = 1; 1379 want_refresh = 1;
1343 ZERO_SCROLLBACK (); 1380 ZERO_SCROLLBACK ();
… …
1364/* ------------------------------------------------------------------------- */ 1401/* ------------------------------------------------------------------------- */
1365/* 1402/*
1366 * Insert/Delete <count> lines 1403 * Insert/Delete <count> lines
1367 */ 1404 */
1368void 1405void
1369rxvt_term::scr_insdel_lines (int count, int insdel) 1406rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1370{ 1407{
1371 int end; 1408 int end;
1372 1409
1373 ZERO_SCROLLBACK (); 1410 ZERO_SCROLLBACK ();
1374 1411
… …
1394/* ------------------------------------------------------------------------- */ 1431/* ------------------------------------------------------------------------- */
1395/* 1432/*
1396 * Insert/Delete <count> characters from the current position 1433 * Insert/Delete <count> characters from the current position
1397 */ 1434 */
1398void 1435void
1399rxvt_term::scr_insdel_chars (int count, int insdel) 1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1400{ 1437{
1401 int col, row; 1438 int col, row;
1402 rend_t tr; 1439 rend_t tr;
1403 1440
1404 want_refresh = 1; 1441 want_refresh = 1;
… …
1492/* 1529/*
1493 * Set the scrolling region 1530 * Set the scrolling region
1494 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1531 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1495 */ 1532 */
1496void 1533void
1497rxvt_term::scr_scroll_region (int top, int bot) 1534rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1498{ 1535{
1499 max_it (top, 0); 1536 max_it (top, 0);
1500 min_it (bot, nrow - 1); 1537 min_it (bot, nrow - 1);
1501 1538
1502 if (top > bot) 1539 if (top > bot)
… …
1512 * Make the cursor visible/invisible 1549 * Make the cursor visible/invisible
1513 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1550 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1514 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1551 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1515 */ 1552 */
1516void 1553void
1517rxvt_term::scr_cursor_visible (int mode) 1554rxvt_term::scr_cursor_visible (int mode) NOTHROW
1518{ 1555{
1519 want_refresh = 1; 1556 want_refresh = 1;
1520 1557
1521 if (mode) 1558 if (mode)
1522 screen.flags |= Screen_VisibleCursor; 1559 screen.flags |= Screen_VisibleCursor;
… …
1529 * Set/unset automatic wrapping 1566 * Set/unset automatic wrapping
1530 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1567 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1531 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1568 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1532 */ 1569 */
1533void 1570void
1534rxvt_term::scr_autowrap (int mode) 1571rxvt_term::scr_autowrap (int mode) NOTHROW
1535{ 1572{
1536 if (mode) 1573 if (mode)
1537 screen.flags |= Screen_Autowrap; 1574 screen.flags |= Screen_Autowrap;
1538 else 1575 else
1539 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1576 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1548 * and the cursor cannot be moved outside. 1585 * and the cursor cannot be moved outside.
1549 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1586 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1550 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1587 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1551 */ 1588 */
1552void 1589void
1553rxvt_term::scr_relative_origin (int mode) 1590rxvt_term::scr_relative_origin (int mode) NOTHROW
1554{ 1591{
1555 if (mode) 1592 if (mode)
1556 screen.flags |= Screen_Relative; 1593 screen.flags |= Screen_Relative;
1557 else 1594 else
1558 screen.flags &= ~Screen_Relative; 1595 screen.flags &= ~Screen_Relative;
… …
1565 * Set insert/replace mode 1602 * Set insert/replace mode
1566 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1603 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1567 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1604 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1568 */ 1605 */
1569void 1606void
1570rxvt_term::scr_insert_mode (int mode) 1607rxvt_term::scr_insert_mode (int mode) NOTHROW
1571{ 1608{
1572 if (mode) 1609 if (mode)
1573 screen.flags |= Screen_Insert; 1610 screen.flags |= Screen_Insert;
1574 else 1611 else
1575 screen.flags &= ~Screen_Insert; 1612 screen.flags &= ~Screen_Insert;
… …
1581 * XTERM_SEQ: Set tab at current column : ESC H 1618 * XTERM_SEQ: Set tab at current column : ESC H
1582 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1619 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1583 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1620 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1584 */ 1621 */
1585void 1622void
1586rxvt_term::scr_set_tab (int mode) 1623rxvt_term::scr_set_tab (int mode) NOTHROW
1587{ 1624{
1588 if (mode < 0) 1625 if (mode < 0)
1589 memset (tabs, 0, ncol * sizeof (char)); 1626 memset (tabs, 0, ncol * sizeof (char));
1590 else if (screen.cur.col < ncol) 1627 else if (screen.cur.col < ncol)
1591 tabs [screen.cur.col] = !!mode; 1628 tabs [screen.cur.col] = !!mode;
… …
1596 * Set reverse/normal video 1633 * Set reverse/normal video
1597 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1634 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1598 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1635 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1599 */ 1636 */
1600void 1637void
1601rxvt_term::scr_rvideo_mode (int mode) 1638rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1602{ 1639{
1603 XGCValues gcvalue; 1640 rvideo_mode = on;
1604 1641
1642#ifndef NO_BELL
1643 on ^= rvideo_bell;
1644#endif
1645
1605 if (rvideo != mode) 1646 if (rvideo_state != on)
1606 { 1647 {
1607 rvideo = mode; 1648 rvideo_state = on;
1649
1608 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1609#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1610 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1611#endif 1653#endif
1612#if TRANSPARENT 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1613 if (! OPTION (Opt_transparent) || am_transparent == 0)
1614#endif
1615 XSetWindowBackground (display->display, vt,
1616 pix_colors[Color_bg]);
1617 1655
1656 XGCValues gcvalue;
1618 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1619 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1620 XChangeGC (display->display, gc, GCBackground | GCForeground, 1659 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1621 &gcvalue); 1660
1622 scr_clear (); 1661 scr_clear ();
1623 scr_touch (true); 1662 scr_touch (true);
1624 } 1663 }
1625} 1664}
1626 1665
… …
1628/* 1667/*
1629 * Report current cursor position 1668 * Report current cursor position
1630 * XTERM_SEQ: Report position: ESC [ 6 n 1669 * XTERM_SEQ: Report position: ESC [ 6 n
1631 */ 1670 */
1632void 1671void
1633rxvt_term::scr_report_position () 1672rxvt_term::scr_report_position () NOTHROW
1634{ 1673{
1635 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1636} 1675}
1637 1676
1638/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
… …
1641 1680
1642/* 1681/*
1643 * Set font style 1682 * Set font style
1644 */ 1683 */
1645void 1684void
1646rxvt_term::set_font_style () 1685rxvt_term::set_font_style () NOTHROW
1647{ 1686{
1648#if 0 1687#if 0
1649 switch (charsets [screen.charset]) 1688 switch (charsets [screen.charset])
1650 { 1689 {
1651 case '0': /* DEC Special Character & Line Drawing Set */ 1690 case '0': /* DEC Special Character & Line Drawing Set */
… …
1673 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1712 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1674 * XTERM_SEQ: Invoke G2 character set: ESC N 1713 * XTERM_SEQ: Invoke G2 character set: ESC N
1675 * XTERM_SEQ: Invoke G3 character set: ESC O 1714 * XTERM_SEQ: Invoke G3 character set: ESC O
1676 */ 1715 */
1677void 1716void
1678rxvt_term::scr_charset_choose (int set) 1717rxvt_term::scr_charset_choose (int set) NOTHROW
1679{ 1718{
1680 screen.charset = set; 1719 screen.charset = set;
1681 set_font_style (); 1720 set_font_style ();
1682} 1721}
1683 1722
… …
1689 * XTERM_SEQ: Set G2 character set: ESC * <C> 1728 * XTERM_SEQ: Set G2 character set: ESC * <C>
1690 * XTERM_SEQ: Set G3 character set: ESC + <C> 1729 * XTERM_SEQ: Set G3 character set: ESC + <C>
1691 * See set_font_style for possible values for <C> 1730 * See set_font_style for possible values for <C>
1692 */ 1731 */
1693void 1732void
1694rxvt_term::scr_charset_set (int set, unsigned int ch) 1733rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1695{ 1734{
1696 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1697 set_font_style (); 1736 set_font_style ();
1698} 1737}
1699 1738
… …
1704 1743
1705/* 1744/*
1706 * refresh matching text. 1745 * refresh matching text.
1707 */ 1746 */
1708bool 1747bool
1709rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1748rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1710{ 1749{
1711 bool found = false; 1750 bool found = false;
1712 1751
1713 for (int i = 0; i < nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1714 { 1753 {
1715 int col = 0;
1716 rend_t *drp = drawn_buf[i].r; 1754 rend_t *drp = drawn_buf[i].r;
1717 1755
1718 for (; col < ncol; col++, drp++) 1756 for (int col = 0; col < ncol; col++, drp++)
1719 if ((*drp & mask) == value) 1757 if ((*drp & mask) == value)
1720 { 1758 {
1721 found = true; 1759 found = true;
1722 *drp = ~value; 1760 *drp = ~value;
1723 } 1761 }
… …
1734 PART_END, 1772 PART_END,
1735 RC_COUNT 1773 RC_COUNT
1736}; 1774};
1737 1775
1738void 1776void
1739rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1777rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1740{ 1778{
1741 int i; 1779 int i;
1742 row_col_t rc[RC_COUNT]; 1780 row_col_t rc[RC_COUNT];
1743 1781
1744 if (!drawn_buf) /* sanity check */ 1782 if (!drawn_buf) /* sanity check */
… …
1763 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1764 { 1802 {
1765 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1766 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1767 } 1805 }
1768 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1769 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1807 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1770 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1808 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1771 1809
1810 num_scr_allow = 0;
1811
1772 if (refresh) 1812 if (refresh)
1773 scr_refresh (SLOW_REFRESH); 1813 scr_refresh ();
1774} 1814}
1775 1815
1776/* ------------------------------------------------------------------------- */ 1816/* ------------------------------------------------------------------------- */
1777/* 1817/*
1778 * Refresh the entire screen 1818 * Refresh the entire screen
1779 */ 1819 */
1780void 1820void
1781rxvt_term::scr_touch (bool refresh) 1821rxvt_term::scr_touch (bool refresh) NOTHROW
1782{ 1822{
1783 scr_expose (0, 0, width, height, refresh); 1823 scr_expose (0, 0, width, height, refresh);
1784} 1824}
1785 1825
1786/* ------------------------------------------------------------------------- */ 1826/* ------------------------------------------------------------------------- */
1787/* 1827/*
1788 * Move the display so that the line represented by scrollbar value Y is at 1828 * Move the display so that the line represented by scrollbar value Y is at
1789 * the top of the screen 1829 * the top of the screen
1790 */ 1830 */
1791int 1831void
1792rxvt_term::scr_move_to (int y, int len) 1832rxvt_term::scr_move_to (int y, int len) NOTHROW
1793{ 1833{
1794 long p = 0; 1834 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1795 unsigned int oldviewstart;
1796
1797 oldviewstart = view_start;
1798
1799 if (y < len)
1800 {
1801 p = (nrow + nsaved) * (len - y) / len;
1802 p -= (long) (nrow - 1);
1803 p = max (p, 0);
1804 }
1805
1806 view_start = (unsigned int)min (p, nsaved);
1807
1808 return scr_changeview (oldviewstart);
1809} 1835}
1810 1836
1811/* ------------------------------------------------------------------------- */ 1837/* ------------------------------------------------------------------------- */
1812/* 1838/*
1813 * Page the screen up/down nlines 1839 * Page the screen up/down nlines
1814 * direction should be UP or DN 1840 * direction should be UP or DN
1815 */ 1841 */
1816int 1842bool
1817rxvt_term::scr_page (enum page_dirn direction, int nlines) 1843rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1818{ 1844{
1819 int n; 1845 int new_view_start =
1820 unsigned int oldviewstart;
1821
1822 oldviewstart = view_start;
1823
1824 if (direction == UP)
1825 {
1826 n = view_start + nlines;
1827 view_start = min (n, nsaved);
1828 }
1829 else
1830 {
1831 n = view_start - nlines; 1846 direction == UP ? view_start - nlines
1832 view_start = max (n, 0); 1847 : view_start + nlines;
1833 }
1834 1848
1835 return scr_changeview (oldviewstart); 1849 return scr_changeview (new_view_start);
1836} 1850}
1837 1851
1838int 1852bool
1839rxvt_term::scr_changeview (unsigned int oldviewstart) 1853rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1854{
1855 clamp_it (new_view_start, top_row, 0);
1856
1841 if (view_start != oldviewstart) 1857 if (new_view_start == view_start)
1842 { 1858 return false;
1859
1860 num_scr += new_view_start - view_start;
1861 view_start = new_view_start;
1862 want_refresh = 1;
1863
1843 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1864 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1844 1865
1845 want_refresh = 1; 1866 return true;
1846 num_scr -= (view_start - oldviewstart);
1847 }
1848
1849 return (int)view_start - (int)oldviewstart;
1850} 1867}
1851 1868
1852/* ------------------------------------------------------------------------- */ 1869#ifndef NO_BELL
1853void 1870void
1871rxvt_term::bell_cb (time_watcher &w)
1872{
1873 rvideo_bell = false;
1874 scr_rvideo_mode (rvideo_mode);
1875}
1876#endif
1877
1878/* ------------------------------------------------------------------------- */
1879void
1854rxvt_term::scr_bell () 1880rxvt_term::scr_bell () NOTHROW
1855{ 1881{
1856#ifndef NO_BELL 1882#ifndef NO_BELL
1857 1883
1858# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1860 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1861# endif 1887# endif
1862 XMapWindow (display->display, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1863# endif 1889# endif
1890# if ENABLE_FRILLS
1891 if (option (Opt_urgentOnBell))
1892 {
1893 XWMHints *h;
1864 1894
1865 if (OPTION (Opt_visualBell)) 1895 h = XGetWMHints(dpy, parent[0]);
1896 if (h != NULL)
1897 {
1898 h->flags |= XUrgencyHint;
1899 XSetWMHints(dpy, parent[0], h);
1900 }
1866 { 1901 }
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1902# endif
1903
1904 if (option (Opt_visualBell))
1905 {
1906 rvideo_bell = true;
1907 scr_rvideo_mode (rvideo_mode);
1868 display->flush (); 1908 display->flush ();
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1909
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1910 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1871 } 1911 }
1872 else 1912 else
1873 XBell (display->display, 0); 1913 XBell (dpy, 0);
1874
1875#endif 1914#endif
1876} 1915}
1877 1916
1878/* ------------------------------------------------------------------------- */ 1917/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1918/* ARGSUSED */
1880void 1919void
1881rxvt_term::scr_printscreen (int fullhist) 1920rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1921{
1883#ifdef PRINTPIPE 1922#ifdef PRINTPIPE
1884 int nrows, row_start; 1923 int nrows, row_start;
1885 FILE *fd; 1924 FILE *fd;
1886 1925
1887 if ((fd = popen_printer ()) == NULL) 1926 if ((fd = popen_printer ()) == NULL)
1888 return; 1927 return;
1889 1928
1890 if (fullhist) 1929 if (fullhist)
1891 { 1930 {
1892 nrows = nrow + nsaved; 1931 nrows = nrow - top_row;
1893 row_start = -nsaved; 1932 row_start = top_row;
1894 } 1933 }
1895 else 1934 else
1896 { 1935 {
1897 nrows = nrow; 1936 nrows = nrow;
1898 row_start = -view_start; 1937 row_start = view_start;
1899 } 1938 }
1900 1939
1901 wctomb (0, 0); 1940 wctomb (0, 0);
1902 1941
1903 for (int r1 = 0; r1 < nrows; r1++) 1942 for (int r1 = 0; r1 < nrows; r1++)
… …
1935 * Refresh the screen 1974 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 1975 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 1976 * screen.text/screen.rend contain what the screen will change to.
1938 */ 1977 */
1939void 1978void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1979rxvt_term::scr_refresh () NOTHROW
1941{ 1980{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 1981 unsigned char have_bg,
1943 showcursor; /* show the cursor */ 1982 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 1983 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 1984 ocrow; /* old cursor row */
1946 int i; /* tmp */ 1985 int i; /* tmp */
1947#ifndef NO_CURSORCOLOR 1986#ifndef NO_CURSORCOLOR
1948 rend_t cc1; /* store colours at cursor position (s) */ 1987 rend_t cc1; /* store colours at cursor position (s) */
1949#endif 1988#endif
1950 rend_t *crp; // cursor rendition pointer 1989 rend_t *crp; // cursor rendition pointer
1990 rend_t ccol1, /* Cursor colour */
1991 ccol2; /* Cursor colour2 */
1951 1992
1952 want_refresh = 0; /* screen is current */ 1993 want_refresh = 0; /* screen is current */
1953 1994
1954 if (refresh_type == NO_REFRESH || !mapped) 1995 if (refresh_type == NO_REFRESH || !mapped)
1955 return; 1996 return;
1956 1997
1957 /* 1998 /*
1958 * A: set up vars 1999 * A: set up vars
1959 */ 2000 */
1960 must_clear = 0; 2001 have_bg = 0;
1961 refresh_count = 0; 2002 refresh_count = 0;
1962 2003
1963#if XPM_BACKGROUND 2004#ifdef HAVE_BG_PIXMAP
1964 must_clear |= bgPixmap.pixmap != None; 2005 have_bg |= bgPixmap.pixmap != None;
1965#endif
1966#if TRANSPARENT
1967 must_clear |= OPTION (Opt_transparent) && am_transparent;
1968#endif 2006#endif
1969 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2007 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1970 2008
1971 /* 2009 /*
1972 * B: reverse any characters which are selected 2010 * B: reverse any characters which are selected
… …
1976 /* 2014 /*
1977 * C: set the cursor character (s) 2015 * C: set the cursor character (s)
1978 */ 2016 */
1979 { 2017 {
1980 unsigned char setoldcursor; 2018 unsigned char setoldcursor;
1981 rend_t ccol1, /* Cursor colour */
1982 ccol2; /* Cursor colour2 */
1983 2019
1984 showcursor = (screen.flags & Screen_VisibleCursor); 2020 showcursor = (screen.flags & Screen_VisibleCursor);
1985#ifdef CURSOR_BLINK 2021#ifdef CURSOR_BLINK
1986 if (hidden_cursor) 2022 if (hidden_cursor)
1987 showcursor = 0; 2023 showcursor = 0;
… …
1994 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2030 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1995 col--; 2031 col--;
1996 2032
1997 crp = &ROW(screen.cur.row).r[col]; 2033 crp = &ROW(screen.cur.row).r[col];
1998 2034
2035#ifndef NO_CURSORCOLOR
2036 cc1 = *crp & (RS_fgMask | RS_bgMask);
2037 if (ISSET_PIXCOLOR (Color_cursor))
2038 ccol1 = Color_cursor;
2039 else
2040#endif
2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2042 ccol1 = fgcolor_of (rstyle);
2043#else
2044 ccol1 = Color_fg;
2045#endif
2046
2047#ifndef NO_CURSORCOLOR
2048 if (ISSET_PIXCOLOR (Color_cursor2))
2049 ccol2 = Color_cursor2;
2050 else
2051#endif
2052#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2053 ccol2 = bgcolor_of (rstyle);
2054#else
2055 ccol2 = Color_bg;
2056#endif
2057
1999 if (showcursor && focus) 2058 if (showcursor && focus)
2000 { 2059 {
2001 if (OPTION (Opt_cursorUnderline)) 2060 if (option (Opt_cursorUnderline))
2002 *crp ^= RS_Uline; 2061 *crp ^= RS_Uline;
2003 else 2062 else
2004 { 2063 {
2005 *crp ^= RS_RVid; 2064 *crp ^= RS_RVid;
2006
2007#ifndef NO_CURSORCOLOR
2008 cc1 = *crp & (RS_fgMask | RS_bgMask);
2009 if (ISSET_PIXCOLOR (Color_cursor))
2010 ccol1 = Color_cursor;
2011 else
2012#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2013 ccol1 = fgcolor_of (rstyle);
2014#else
2015 ccol1 = Color_fg;
2016#endif
2017 if (ISSET_PIXCOLOR (Color_cursor2))
2018 ccol2 = Color_cursor2;
2019 else
2020#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2021 ccol2 = bgcolor_of (rstyle);
2022#else
2023 ccol2 = Color_bg;
2024#endif
2025 *crp = SET_FGCOLOR (*crp, ccol1); 2065 *crp = SET_FGCOLOR (*crp, ccol1);
2026 *crp = SET_BGCOLOR (*crp, ccol2); 2066 *crp = SET_BGCOLOR (*crp, ccol2);
2027#endif
2028 } 2067 }
2029 } 2068 }
2030 } 2069 }
2031 2070
2032 /* make sure no outline cursor is left around */ 2071 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2072 setoldcursor = 0;
2034 if (ocrow != -1) 2073 if (ocrow != -1)
2035 { 2074 {
2036 if (screen.cur.row + view_start != ocrow 2075 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2076 || screen.cur.col != oldcursor.col)
2038 { 2077 {
2039 if (ocrow < nrow 2078 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2079 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2080 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2049 else if (!focus) 2088 else if (!focus)
2050 setoldcursor = 1; 2089 setoldcursor = 1;
2051 2090
2052 if (setoldcursor) 2091 if (setoldcursor)
2053 { 2092 {
2054 if (screen.cur.row + view_start >= nrow) 2093 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2094 oldcursor.row = -1;
2056 else 2095 else
2057 { 2096 {
2058 oldcursor.row = screen.cur.row + view_start; 2097 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2098 oldcursor.col = screen.cur.col;
2060 } 2099 }
2061 } 2100 }
2062 } 2101 }
2063 2102
… …
2069#ifndef NO_SLOW_LINK_SUPPORT 2108#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2109 /*
2071 * D: CopyArea pass - very useful for slower links 2110 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2111 * This has been deliberately kept simple.
2073 */ 2112 */
2074 i = num_scr;
2075 if (!display->is_local 2113 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2114 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2115 && abs (num_scr) < nrow && !have_bg)
2078 { 2116 {
2079 int16_t nits; 2117 int16_t nits;
2118 int i = num_scr;
2080 int j; 2119 int j;
2081 int len, wlen; 2120 int len, wlen;
2121 dLocal (int, num_scr);
2082 2122
2083 j = nrow; 2123 j = nrow;
2084 wlen = len = -1; 2124 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2125 row = i > 0 ? 0 : j - 1;
2126
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2127 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2128 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2129 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2130 {
2090 line_t s = ROW(row - view_start); 2131 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2132 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2133 line_t d2 = drawn_buf[row + i];
2093 2134
2094 for (nits = 0, col = ncol; col--; ) 2135 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2136 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2111 wlen = row; 2152 wlen = row;
2112 continue; 2153 continue;
2113 } 2154 }
2114 } 2155 }
2115 2156
2116 if (len != -1) 2157 if (len >= 0)
2117 { 2158 {
2118 /* also comes here at end if needed because of >= above */ 2159 /* also comes here at end if needed because of >= above */
2119 if (wlen < len) 2160 if (wlen < len)
2120 ::swap (wlen, len); 2161 ::swap (wlen, len);
2121 2162
2163 XGCValues gcv;
2164
2165 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2122 XCopyArea (display->display, vt, vt, 2166 XCopyArea (dpy, vt, vt,
2123 gc, 0, Row2Pixel (len + i), 2167 gc, 0, Row2Pixel (len + i),
2124 (unsigned int)this->width, 2168 (unsigned int)this->width,
2125 (unsigned int)Height2Pixel (wlen - len + 1), 2169 (unsigned int)Height2Pixel (wlen - len + 1),
2126 0, Row2Pixel (len)); 2170 0, Row2Pixel (len));
2171 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2172
2127 len = -1; 2173 len = -1;
2128 } 2174 }
2129 } 2175 }
2130 } 2176 }
2131#endif 2177#endif
… …
2133 /* 2179 /*
2134 * E: main pass across every character 2180 * E: main pass across every character
2135 */ 2181 */
2136 for (row = 0; row < nrow; row++) 2182 for (row = 0; row < nrow; row++)
2137 { 2183 {
2138 text_t *stp = ROW(row - view_start).t; 2184 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2185 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2186 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2187 rend_t *drp = drawn_buf[row].r;
2142 2188
2143 /* 2189 /*
2144 * E2: OK, now the real pass 2190 * E2: OK, now the real pass
… …
2187 count++; 2233 count++;
2188 2234
2189 if (stp[col] != dtp[col] 2235 if (stp[col] != dtp[col]
2190 || !RS_SAME (srp[col], drp[col])) 2236 || !RS_SAME (srp[col], drp[col]))
2191 { 2237 {
2192 if (must_clear && (i++ > count / 2)) 2238 if (have_bg && (i++ > count / 2))
2193 break; 2239 break;
2194 2240
2195 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2196 drp[col] = rend; 2242 drp[col] = rend;
2197 i = 0; 2243 i = 0;
2198 } 2244 }
2199 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2245 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2200 break; 2246 break;
2201 } 2247 }
2202 2248
2203 col--; /* went one too far. move back */ 2249 col--; /* went one too far. move back */
2204 count -= i; /* dump any matching trailing chars */ 2250 count -= i; /* dump any matching trailing chars */
… …
2214 int back = bgcolor_of (rend); // desired background 2260 int back = bgcolor_of (rend); // desired background
2215 2261
2216 // only do special processing if any attributes are set, which is unlikely 2262 // only do special processing if any attributes are set, which is unlikely
2217 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2263 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2218 { 2264 {
2219#if ENABLE_STYLES
2220 // force redraw after "careful" characters to avoid pixel droppings
2221 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2222 drp[col + 1] = ~srp[col + 1];
2223
2224 // include previous careful character(s) if possible, looks nicer (best effort...)
2225 while (text > stp
2226 && srp[text - stp - 1] & RS_Careful
2227 && RS_SAME (rend, srp[text - stp - 1]))
2228 text--, count++, xpixel -= fwidth;
2229#endif
2230
2231 bool invert = rend & RS_RVid; 2265 bool invert = rend & RS_RVid;
2232 2266
2233#ifndef NO_BOLD_UNDERLINE_REVERSE 2267#ifndef NO_BOLD_UNDERLINE_REVERSE
2234 if (rend & RS_Bold 2268 if (rend & RS_Bold
2235 && fore == Color_fg) 2269 && fore == Color_fg)
… …
2251 else 2285 else
2252 invert = !invert; 2286 invert = !invert;
2253# endif 2287# endif
2254 } 2288 }
2255 2289
2256 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2290 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2257 fore = Color_UL; 2291 fore = Color_UL;
2258#endif 2292#endif
2259 2293
2260 if (invert) 2294 if (invert)
2261 { 2295 {
2296#ifdef OPTION_HC
2297 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2298 || !ISSET_PIXCOLOR (Color_HC))
2299#endif
2300 /* invert the column if no highlightColor is set or it is the
2301 * current cursor column */
2262 ::swap (fore, back); 2302 ::swap (fore, back);
2303#ifdef OPTION_HC
2304 else if (ISSET_PIXCOLOR (Color_HC))
2305 back = Color_HC;
2306#endif
2263 2307
2264#ifndef NO_BOLD_UNDERLINE_REVERSE 2308#ifndef NO_BOLD_UNDERLINE_REVERSE
2309# ifndef OPTION_HC
2265 if (ISSET_PIXCOLOR (Color_RV)) 2310 if (ISSET_PIXCOLOR (Color_RV))
2266 back = Color_RV; 2311 back = Color_RV;
2267 2312# endif
2268 if (fore == back) 2313 if (fore == back)
2269 { 2314 {
2270 fore = Color_bg; 2315 fore = Color_bg;
2271 back = Color_fg; 2316 back = Color_fg;
2272 } 2317 }
… …
2283 } 2328 }
2284 else if (hidden_text) 2329 else if (hidden_text)
2285 fore = back; 2330 fore = back;
2286 } 2331 }
2287#endif 2332#endif
2333
2334#if ENABLE_STYLES
2335 // "careful" (too wide) character handling
2336
2337 // include previous careful character(s) if possible, looks nicer (best effort...)
2338 while (text > stp
2339 && srp[text - stp - 1] & RS_Careful
2340 && RS_SAME (rend, srp[text - stp - 1]))
2341 text--, count++, xpixel -= fwidth;
2342
2343 // force redraw after "careful" characters to avoid pixel droppings
2344 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2345 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2346
2347 // force redraw before "careful" characters to avoid pixel droppings
2348 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2349 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2350#endif
2288 } 2351 }
2289 2352
2290 /* 2353 /*
2291 * Actually do the drawing of the string here 2354 * Actually do the drawing of the string here
2292 */ 2355 */
2293 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2356 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2294 2357
2295 if (back == fore)
2296 font->clear_rect (*drawable, xpixel, ypixel,
2297 fwidth * count, fheight,
2298 back);
2299 else if (back == Color_bg) 2358 if (have_bg && back == Color_bg)
2300 { 2359 {
2301 if (must_clear) 2360 // this is very ugly, maybe push it into ->draw?
2302 {
2303 CLEAR_CHARS (xpixel, ypixel, count);
2304 2361
2305 for (i = 0; i < count; i++) /* don't draw empty strings */ 2362 for (i = 0; i < count; i++) /* don't draw empty strings */
2306 if (text[i] != ' ') 2363 if (text[i] != ' ')
2307 { 2364 {
2308 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2365 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2309 break; 2366 goto did_clear;
2310 }
2311 } 2367 }
2312 else 2368
2313 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2369 CLEAR_CHARS (xpixel, ypixel, count);
2370 did_clear: ;
2314 } 2371 }
2315 else 2372 else
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2373 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2317 2374
2318 if (rend & RS_Uline && font->descent > 1 && fore != back) 2375 if (rend & RS_Uline && font->descent > 1 && fore != back)
2319 { 2376 {
2320#if ENABLE_FRILLS 2377#if ENABLE_FRILLS
2321 if (ISSET_PIXCOLOR (Color_underline)) 2378 if (ISSET_PIXCOLOR (Color_underline))
2322 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2379 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2323 else 2380 else
2324#endif 2381#endif
2325 XSetForeground (display->display, gc, pix_colors[fore]); 2382 XSetForeground (dpy, gc, pix_colors[fore]);
2326 2383
2327 XDrawLine (display->display, drawBuffer, gc, 2384 XDrawLine (dpy, drawBuffer, gc,
2328 xpixel, ypixel + font->ascent + 1, 2385 xpixel, ypixel + font->ascent + 1,
2329 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2386 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2330 } 2387 }
2331 } /* for (col....) */ 2388 } /* for (col....) */
2332 } /* for (row....) */ 2389 } /* for (row....) */
… …
2341 */ 2398 */
2342 if (showcursor) 2399 if (showcursor)
2343 { 2400 {
2344 if (focus) 2401 if (focus)
2345 { 2402 {
2346 if (OPTION (Opt_cursorUnderline)) 2403 if (option (Opt_cursorUnderline))
2347 *crp ^= RS_Uline; 2404 *crp ^= RS_Uline;
2348 else 2405 else
2349 { 2406 {
2350 *crp ^= RS_RVid; 2407 *crp ^= RS_RVid;
2351#ifndef NO_CURSORCOLOR 2408#ifndef NO_CURSORCOLOR
… …
2365 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2422 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2366 cursorwidth++; 2423 cursorwidth++;
2367 2424
2368#ifndef NO_CURSORCOLOR 2425#ifndef NO_CURSORCOLOR
2369 if (ISSET_PIXCOLOR (Color_cursor)) 2426 if (ISSET_PIXCOLOR (Color_cursor))
2370 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2427 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2428 else
2371#endif 2429#endif
2430 XSetForeground (dpy, gc, pix_colors[ccol1]);
2372 2431
2373 XDrawRectangle (display->display, drawBuffer, gc, 2432 XDrawRectangle (dpy, drawBuffer, gc,
2374 Col2Pixel (col), 2433 Col2Pixel (col),
2375 Row2Pixel (oldcursor.row), 2434 Row2Pixel (oldcursor.row),
2376 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2435 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2377 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2436 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2378 } 2437 }
… …
2386 num_scr = 0; 2445 num_scr = 0;
2387 num_scr_allow = 1; 2446 num_scr_allow = 1;
2388} 2447}
2389 2448
2390void 2449void
2391rxvt_term::scr_remap_chars (line_t &l) 2450rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392{ 2451{
2393 if (!l.t) 2452 if (!l.t)
2394 return; 2453 return;
2395 2454
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2455 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2398 for (int i = ncol; i--; ) 2457 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2458 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400} 2459}
2401 2460
2402void 2461void
2403rxvt_term::scr_remap_chars () 2462rxvt_term::scr_remap_chars () NOTHROW
2404{ 2463{
2405 for (int i = total_rows; i--; ) 2464 for (int i = total_rows; i--; )
2406 scr_remap_chars (row_buf [i]); 2465 scr_remap_chars (row_buf [i]);
2407 2466
2408 for (int i = nrow; i--; ) 2467 for (int i = nrow; i--; )
… …
2411 scr_remap_chars (swap_buf [i]); 2470 scr_remap_chars (swap_buf [i]);
2412 } 2471 }
2413} 2472}
2414 2473
2415void 2474void
2416rxvt_term::scr_recolour () 2475rxvt_term::scr_recolour () NOTHROW
2417{ 2476{
2418 if (1 2477#ifdef HAVE_BG_PIXMAP
2419#if TRANSPARENT 2478 bgPixmap.apply ();
2420 && !am_transparent 2479#else
2421#endif
2422#if XPM_BACKGROUND
2423 && !bgPixmap.pixmap
2424#endif
2425 )
2426 {
2427 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2480 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2428 XClearWindow (display->display, parent[0]); 2481 XClearWindow (dpy, parent[0]);
2429 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2482 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2430#if HAVE_SCROLLBARS 2483# if HAVE_SCROLLBARS
2431 if (scrollBar.win) 2484 if (scrollBar.win)
2432 { 2485 {
2433 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2486 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2434 scrollBar.setIdle (); 2487 scrollBar.setIdle ();
2435 scrollbar_show (0); 2488 scrollbar_show (0);
2436 } 2489 }
2437#endif 2490# endif
2438 } 2491#endif
2439 2492
2440 scr_clear (); 2493 scr_clear ();
2441 scr_touch (true); 2494 scr_touch (true);
2442 want_refresh = 1; 2495 want_refresh = 1;
2443} 2496}
2444 2497
2445/* ------------------------------------------------------------------------- */ 2498/* ------------------------------------------------------------------------- */
2446void 2499void
2447rxvt_term::scr_clear (bool really) 2500rxvt_term::scr_clear (bool really) NOTHROW
2448{ 2501{
2449 if (!mapped) 2502 if (!mapped)
2450 return; 2503 return;
2451 2504
2452 num_scr_allow = 0; 2505 num_scr_allow = 0;
2453 want_refresh = 1; 2506 want_refresh = 1;
2454 2507
2455 if (really) 2508 if (really)
2456 XClearWindow (display->display, vt); 2509 XClearWindow (dpy, vt);
2457} 2510}
2458 2511
2459void 2512void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2513rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461{ 2514{
2462 int view_end = -view_start + nrow; 2515 int view_end = view_start + nrow;
2463 int row, col; 2516 int row, col;
2464 2517
2465 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2518 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2466 { 2519 {
2467 text_t *stp = ROW(row).t; 2520 text_t *stp = ROW(row).t;
2468 rend_t *srp = ROW(row).r; 2521 rend_t *srp = ROW(row).r;
2469 2522
2470 for (col = beg_col; col < end_col; col++) 2523 for (col = beg_col; col < end_col; col++)
… …
2477 srp[col] ^= rstyle2; 2530 srp[col] ^= rstyle2;
2478 } 2531 }
2479} 2532}
2480 2533
2481void 2534void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2535rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483{ 2536{
2484 int view_end = -view_start + nrow; 2537 int view_end = view_start + nrow;
2485 int row, col; 2538 int row, col;
2486 2539
2487 if (beg_row >= -view_start) 2540 if (beg_row >= view_start)
2488 { 2541 {
2489 col = beg_col; 2542 col = beg_col;
2490 row = beg_row; 2543 row = beg_row;
2491 } 2544 }
2492 else 2545 else
2493 { 2546 {
2494 col = 0; 2547 col = 0;
2495 row = -view_start; 2548 row = view_start;
2496 } 2549 }
2497 2550
2498 for (; row < min (end_row, view_end); row++, col = 0) 2551 for (; row < min (end_row, view_end); row++, col = 0)
2499 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2552 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2500 srp[col] ^= rstyle; 2553 srp[col] ^= rstyle;
… …
2504 srp[col] ^= rstyle; 2557 srp[col] ^= rstyle;
2505} 2558}
2506 2559
2507/* ------------------------------------------------------------------------- */ 2560/* ------------------------------------------------------------------------- */
2508void 2561void
2509rxvt_term::scr_reverse_selection () 2562rxvt_term::scr_reverse_selection () NOTHROW
2510{ 2563{
2511 if (selection.op 2564 if (selection.op
2512 && current_screen == selection.screen 2565 && current_screen == selection.screen
2513 && selection.end.row >= -view_start) 2566 && selection.end.row >= view_start)
2514 { 2567 {
2515#if ENABLE_FRILLS 2568#if !ENABLE_MINIMAL
2516 if (selection.rect) 2569 if (selection.rect)
2517 scr_xor_rect (selection.beg.row, selection.beg.col, 2570 scr_xor_rect (selection.beg.row, selection.beg.col,
2518 selection.end.row, selection.end.col, 2571 selection.end.row, selection.end.col,
2519 RS_RVid, RS_RVid | RS_Uline); 2572 RS_RVid, RS_RVid | RS_Uline);
2520 else 2573 else
… …
2530 * Dump the whole scrollback and screen to the passed filedescriptor. The 2583 * Dump the whole scrollback and screen to the passed filedescriptor. The
2531 * invoking routine must close the fd. 2584 * invoking routine must close the fd.
2532 */ 2585 */
2533#if 0 2586#if 0
2534void 2587void
2535rxvt_term::scr_dump (int fd) 2588rxvt_term::scr_dump (int fd) NOTHROW
2536{ 2589{
2537 int row, wrote; 2590 int row, wrote;
2538 unsigned int width, towrite; 2591 unsigned int width, towrite;
2539 char r1[] = "\n"; 2592 char r1[] = "\n";
2540 2593
… …
2559 2612
2560/* ------------------------------------------------------------------------- * 2613/* ------------------------------------------------------------------------- *
2561 * CHARACTER SELECTION * 2614 * CHARACTER SELECTION *
2562 * ------------------------------------------------------------------------- */ 2615 * ------------------------------------------------------------------------- */
2563void 2616void
2564rxvt_term::selection_check (int check_more) 2617rxvt_term::selection_check (int check_more) NOTHROW
2565{ 2618{
2566 row_col_t pos; 2619 row_col_t pos;
2567 2620
2568 if (!selection.op) 2621 if (!selection.op)
2569 return; 2622 return;
2570 2623
2571 pos.row = pos.col = 0; 2624 pos.row = pos.col = 0;
2572 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2625 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2573 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2626 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2574 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2627 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2575 || (check_more == 1 2628 || (check_more == 1
2576 && current_screen == selection.screen 2629 && current_screen == selection.screen
2577 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2630 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2578 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2631 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2579 || (check_more == 2 2632 || (check_more == 2
… …
2590/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2591/* 2644/*
2592 * Paste a selection direct to the command fd 2645 * Paste a selection direct to the command fd
2593 */ 2646 */
2594void 2647void
2595rxvt_term::paste (char *data, unsigned int len) 2648rxvt_term::paste (char *data, unsigned int len) NOTHROW
2596{ 2649{
2597 /* convert normal newline chars into common keyboard Return key sequence */ 2650 /* convert normal newline chars into common keyboard Return key sequence */
2598 for (unsigned int i = 0; i < len; i++) 2651 for (unsigned int i = 0; i < len; i++)
2599 if (data[i] == C0_LF) 2652 if (data[i] == C0_LF)
2600 data[i] = C0_CR; 2653 data[i] = C0_CR;
… …
2606/* 2659/*
2607 * Respond to a notification that a primary selection has been sent 2660 * Respond to a notification that a primary selection has been sent
2608 * EXT: SelectionNotify 2661 * EXT: SelectionNotify
2609 */ 2662 */
2610void 2663void
2611rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2664rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2612{ 2665{
2613 if (prop == None) /* check for failed XConvertSelection */ 2666 if (prop == None) /* check for failed XConvertSelection */
2614 { 2667 {
2615 if ((selection_type & Sel_CompoundText)) 2668 if ((selection_type & Sel_CompoundText))
2616 { 2669 {
… …
2636 } 2689 }
2637 2690
2638 unsigned long bytes_after; 2691 unsigned long bytes_after;
2639 XTextProperty ct; 2692 XTextProperty ct;
2640 2693
2641 if (XGetWindowProperty (display->display, win, prop, 2694 if (XGetWindowProperty (dpy, win, prop,
2642 0, PROP_SIZE / 4, 2695 0, PROP_SIZE / 4,
2643 delete_prop, AnyPropertyType, 2696 delete_prop, AnyPropertyType,
2644 &ct.encoding, &ct.format, 2697 &ct.encoding, &ct.format,
2645 &ct.nitems, &bytes_after, 2698 &ct.nitems, &bytes_after,
2646 &ct.value) != Success) 2699 &ct.value) != Success)
… …
2655 if (bytes_after) 2708 if (bytes_after)
2656 { 2709 {
2657 // fetch and append remaining data 2710 // fetch and append remaining data
2658 XTextProperty ct2; 2711 XTextProperty ct2;
2659 2712
2660 if (XGetWindowProperty (display->display, win, prop, 2713 if (XGetWindowProperty (dpy, win, prop,
2661 ct.nitems / 4, (bytes_after + 3) / 4, 2714 ct.nitems / 4, (bytes_after + 3) / 4,
2662 delete_prop, AnyPropertyType, 2715 delete_prop, AnyPropertyType,
2663 &ct2.encoding, &ct2.format, 2716 &ct2.encoding, &ct2.format,
2664 &ct2.nitems, &bytes_after, 2717 &ct2.nitems, &bytes_after,
2665 &ct2.value) != Success) 2718 &ct2.value) != Success)
… …
2678 2731
2679 if (ct.encoding == xa[XA_INCR]) 2732 if (ct.encoding == xa[XA_INCR])
2680 { 2733 {
2681 // INCR selection, start handshake 2734 // INCR selection, start handshake
2682 if (!delete_prop) 2735 if (!delete_prop)
2683 XDeleteProperty (display->display, win, prop); 2736 XDeleteProperty (dpy, win, prop);
2684 2737
2685 selection_wait = Sel_incr; 2738 selection_wait = Sel_incr;
2686 incr_buf_fill = 0; 2739 incr_buf_fill = 0;
2687 incr_ev.start (NOW + 10); 2740 incr_ev.start (NOW + 10);
2688 2741
… …
2735 } 2788 }
2736 2789
2737 char **cl; 2790 char **cl;
2738 int cr; 2791 int cr;
2739 2792
2740#if ENABLE_FRILLS 2793#if !ENABLE_MINIMAL
2741 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2794 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2742 // so recode it manually 2795 // so recode it manually
2743 if (ct.encoding == xa[XA_UTF8_STRING]) 2796 if (ct.encoding == xa[XA_UTF8_STRING])
2744 { 2797 {
2745 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2798 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2749 paste (s, strlen (s)); 2802 paste (s, strlen (s));
2750 free (s); 2803 free (s);
2751 } 2804 }
2752 else 2805 else
2753#endif 2806#endif
2754 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2807 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2755 && cl) 2808 && cl)
2756 { 2809 {
2757 for (int i = 0; i < cr; i++) 2810 for (int i = 0; i < cr; i++)
2758 paste (cl[i], strlen (cl[i])); 2811 paste (cl[i], strlen (cl[i]));
2759 2812
… …
2768 if (selection_wait == Sel_normal) 2821 if (selection_wait == Sel_normal)
2769 selection_wait = Sel_none; 2822 selection_wait = Sel_none;
2770} 2823}
2771 2824
2772void 2825void
2773rxvt_term::incr_cb (time_watcher &w) 2826rxvt_term::incr_cb (time_watcher &w) NOTHROW
2774{ 2827{
2775 selection_wait = Sel_none; 2828 selection_wait = Sel_none;
2776 2829
2777 incr_buf_size = 0; 2830 incr_buf_size = 0;
2778 free (incr_buf); 2831 free (incr_buf);
2779 2832
2780 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2833 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2781} 2834}
2782 2835
2783void 2836void
2784rxvt_term::selection_property (Window win, Atom prop) 2837rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2785{ 2838{
2786 if (prop == None || selection_wait != Sel_incr) 2839 if (prop == None || selection_wait != Sel_incr)
2787 return; 2840 return;
2788 2841
2789 selection_paste (win, prop, true); 2842 selection_paste (win, prop, true);
… …
2798 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2851 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2799 * will auto fallback to CUT_BUFFER0 2852 * will auto fallback to CUT_BUFFER0
2800 * EXT: button 2 release 2853 * EXT: button 2 release
2801 */ 2854 */
2802void 2855void
2803rxvt_term::selection_request (Time tm, int x, int y) 2856rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804{ 2857{
2805 if (x < 0 || x >= width || y < 0 || y >= height) 2858 if (selection.text && selnum == Sel_Primary)
2806 return; /* outside window */
2807
2808 if (selection.text)
2809 { /* internal selection */ 2859 { /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2860 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2861 paste (str, strlen (str));
2812 free (str); 2862 free (str);
2813 return; 2863 return;
2814 } 2864 }
2815 else 2865 else
2816 { 2866 {
2817 int i;
2818
2819 selection_request_time = tm; 2867 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2868 selection_wait = Sel_normal;
2821 2869
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2870#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2871 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2872 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2873 return;
2828#else 2874#else
2829 selection_type = Sel_CompoundText; 2875 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2876 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2877 return;
2832#endif 2878#endif
2833 }
2834 } 2879 }
2835 2880
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2881 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2882 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2883}
2839 2884
2840int 2885int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2886rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2887{
2843 Atom sel; 2888 Atom sel;
2844 2889
2845 selection_type |= selnum; 2890 selection_type |= selnum;
2846 2891
… …
2849 else if (selnum == Sel_Secondary) 2894 else if (selnum == Sel_Secondary)
2850 sel = XA_SECONDARY; 2895 sel = XA_SECONDARY;
2851 else 2896 else
2852 sel = xa[XA_CLIPBOARD]; 2897 sel = xa[XA_CLIPBOARD];
2853 2898
2854 if (XGetSelectionOwner (display->display, sel) != None) 2899 if (XGetSelectionOwner (dpy, sel) != None)
2855 { 2900 {
2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2901 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2857 vt, selection_request_time); 2902 vt, selection_request_time);
2858 return 1; 2903 return 1;
2859 } 2904 }
2860 2905
2861 return 0; 2906 return 0;
… …
2865/* 2910/*
2866 * Clear all selected text 2911 * Clear all selected text
2867 * EXT: SelectionClear 2912 * EXT: SelectionClear
2868 */ 2913 */
2869void 2914void
2870rxvt_term::selection_clear () 2915rxvt_term::selection_clear () NOTHROW
2871{ 2916{
2872 want_refresh = 1; 2917 want_refresh = 1;
2873 free (selection.text); 2918 free (selection.text);
2874 selection.text = NULL; 2919 selection.text = NULL;
2875 selection.len = 0; 2920 selection.len = 0;
… …
2924 2969
2925 int end_col; 2970 int end_col;
2926 2971
2927 for (; row <= selection.end.row; row++, col = 0) 2972 for (; row <= selection.end.row; row++, col = 0)
2928 { 2973 {
2929#if ENABLE_FRILLS 2974#if !ENABLE_MINIMAL
2930 if (selection.rect) 2975 if (selection.rect)
2931 { 2976 {
2932 col = selection.beg.col; 2977 col = selection.beg.col;
2933 end_col = ncol + 1; 2978 end_col = ncol + 1;
2934 } 2979 }
… …
2937 end_col = ROW(row).l; 2982 end_col = ROW(row).l;
2938 2983
2939 col = max (col, 0); 2984 col = max (col, 0);
2940 2985
2941 if (row == selection.end.row 2986 if (row == selection.end.row
2942#if ENABLE_FRILLS 2987#if !ENABLE_MINIMAL
2943 || selection.rect 2988 || selection.rect
2944#endif 2989#endif
2945 ) 2990 )
2946 min_it (end_col, selection.end.col); 2991 min_it (end_col, selection.end.col);
2947 2992
… …
2970#endif 3015#endif
2971 else 3016 else
2972 new_selection_text[ofs++] = *t++; 3017 new_selection_text[ofs++] = *t++;
2973 } 3018 }
2974 3019
2975#if ENABLE_FRILLS 3020#if !ENABLE_MINIMAL
2976 if (selection.rect) 3021 if (selection.rect)
2977 { 3022 {
2978 while (ofs 3023 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF 3024 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1])) 3025 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3010 3055
3011 selection_grab (tm); 3056 selection_grab (tm);
3012} 3057}
3013 3058
3014bool 3059bool
3015rxvt_term::selection_grab (Time tm) 3060rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3061{
3017 selection_time = tm; 3062 selection_time = tm;
3018 3063
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3064 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3065 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3021 { 3066 {
3022 display->set_selection_owner (this); 3067 display->set_selection_owner (this);
3023 return true; 3068 return true;
3024 } 3069 }
3025 else 3070 else
… …
3029 } 3074 }
3030 3075
3031#if 0 3076#if 0
3032 XTextProperty ct; 3077 XTextProperty ct;
3033 3078
3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3079 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3035 { 3080 {
3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3081 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3037 XFree (ct.value); 3082 XFree (ct.value);
3038 } 3083 }
3039#endif 3084#endif
… …
3043/* 3088/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 3089 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 3090 * EXT: button 1 press
3046 */ 3091 */
3047void 3092void
3048rxvt_term::selection_click (int clicks, int x, int y) 3093rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 3094{
3050 clicks = ((clicks - 1) % 3) + 1; 3095 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 3096 selection.clicks = clicks; /* save clicks so extend will work */
3052 3097
3053 if (clicks == 2 && !selection.rect 3098 if (clicks == 2 && !selection.rect
… …
3061 3106
3062 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3107 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3063 3108
3064 if (clicks == 2 || clicks == 3) 3109 if (clicks == 2 || clicks == 3)
3065 selection_extend_colrow (selection.mark.col, 3110 selection_extend_colrow (selection.mark.col,
3066 selection.mark.row + view_start, 3111 selection.mark.row - view_start,
3067 0, /* button 3 */ 3112 0, /* button 3 */
3068 1, /* button press */ 3113 1, /* button press */
3069 0); /* click change */ 3114 0); /* click change */
3070} 3115}
3071 3116
3072/* ------------------------------------------------------------------------- */ 3117/* ------------------------------------------------------------------------- */
3073/* 3118/*
3074 * Mark a selection at the specified col/row 3119 * Mark a selection at the specified col/row
3075 */ 3120 */
3076void 3121void
3077rxvt_term::selection_start_colrow (int col, int row) 3122rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078{ 3123{
3079 want_refresh = 1; 3124 want_refresh = 1;
3080 3125
3081 selection.mark.row = row - view_start; 3126 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 3127 selection.mark.col = col;
3083 3128
3084 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3129 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3130 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3086 3131
3087 while (selection.mark.col > 0 3132 while (selection.mark.col > 0
3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3133 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3134 --selection.mark.col;
… …
3108#define DELIMIT_TEXT(x) \ 3153#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3154 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3155#define DELIMIT_REND(x) 1
3111 3156
3112void 3157void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3158rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3159{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3160 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3161 row_col_t bound;
3117 text_t *stp; 3162 text_t *stp;
3118 rend_t *srp; 3163 rend_t *srp;
3119 3164
3120 if (dirn == UP) 3165 if (dirn == UP)
3121 { 3166 {
3122 bound.row = - nsaved - 1; 3167 bound.row = top_row - 1;
3123 bound.col = 0; 3168 bound.col = 0;
3124 dirnadd = -1; 3169 dirnadd = -1;
3125 } 3170 }
3126 else 3171 else
3127 { 3172 {
… …
3192 * flag == 0 ==> button 1 3237 * flag == 0 ==> button 1
3193 * flag == 1 ==> button 3 press 3238 * flag == 1 ==> button 3 press
3194 * flag == 2 ==> button 3 motion 3239 * flag == 2 ==> button 3 motion
3195 */ 3240 */
3196void 3241void
3197rxvt_term::selection_extend (int x, int y, int flag) 3242rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198{ 3243{
3199 int col = clamp (Pixel2Col (x), 0, ncol); 3244 int col = clamp (Pixel2Col (x), 0, ncol);
3200 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3245 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201 3246
3202 /* 3247 /*
… …
3205 * select nothing. Otherwise, if we're to the right of the mark, you have to 3250 * select nothing. Otherwise, if we're to the right of the mark, you have to
3206 * be _past_ a character for it to be selected. 3251 * be _past_ a character for it to be selected.
3207 */ 3252 */
3208 if (((selection.clicks % 3) == 1) && !flag 3253 if (((selection.clicks % 3) == 1) && !flag
3209 && (col == selection.mark.col 3254 && (col == selection.mark.col
3210 && (row == selection.mark.row + view_start))) 3255 && (row == selection.mark.row - view_start)))
3211 { 3256 {
3212 /* select nothing */ 3257 /* select nothing */
3213 selection.beg.row = selection.end.row = 0; 3258 selection.beg.row = selection.end.row = 0;
3214 selection.beg.col = selection.end.col = 0; 3259 selection.beg.col = selection.end.col = 0;
3215 selection.clicks = 4; 3260 selection.clicks = 4;
… …
3228/* ------------------------------------------------------------------------- */ 3273/* ------------------------------------------------------------------------- */
3229/* 3274/*
3230 * Extend the selection to the specified col/row 3275 * Extend the selection to the specified col/row
3231 */ 3276 */
3232void 3277void
3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3278rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234{ 3279{
3235 row_col_t pos; 3280 row_col_t pos;
3236 enum { 3281 enum {
3237 LEFT, RIGHT 3282 LEFT, RIGHT
3238 } closeto = RIGHT; 3283 } closeto = RIGHT;
… …
3270 selection.beg.col = selection.end.col = selection.mark.col; 3315 selection.beg.col = selection.end.col = selection.mark.col;
3271 selection.beg.row = selection.end.row = selection.mark.row; 3316 selection.beg.row = selection.end.row = selection.mark.row;
3272 } 3317 }
3273 3318
3274 pos.col = col; 3319 pos.col = col;
3275 pos.row = row - view_start; 3320 pos.row = view_start + row;
3276 3321
3277 /* 3322 /*
3278 * This is mainly xterm style selection with a couple of differences, mainly 3323 * This is mainly xterm style selection with a couple of differences, mainly
3279 * in the way button3 drag extension works. 3324 * in the way button3 drag extension works.
3280 * We're either doing: button1 drag; button3 press; or button3 drag 3325 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3341 3386
3342 if (selection.clicks == 1) 3387 if (selection.clicks == 1)
3343 { 3388 {
3344 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3389 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3345 && !ROW(selection.beg.row).is_longer () 3390 && !ROW(selection.beg.row).is_longer ()
3346#if ENABLE_FRILLS 3391#if !ENABLE_MINIMAL
3347 && !selection.rect 3392 && !selection.rect
3348#endif 3393#endif
3349 ) 3394 )
3350 selection.beg.col = ncol; 3395 selection.beg.col = ncol;
3351 3396
3352 if ( 3397 if (
3353 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3398 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3354 && !ROW(selection.end.row).is_longer () 3399 && !ROW(selection.end.row).is_longer ()
3355#if ENABLE_FRILLS 3400#if !ENABLE_MINIMAL
3356 && !selection.rect 3401 && !selection.rect
3357#endif 3402#endif
3358 ) 3403 )
3359 selection.end.col = ncol; 3404 selection.end.col = ncol;
3360 } 3405 }
… …
3367 selection_delimit_word (DN, &selection.end, &selection.end); 3412 selection_delimit_word (DN, &selection.end, &selection.end);
3368 } 3413 }
3369 else if (selection.clicks == 3) 3414 else if (selection.clicks == 3)
3370 { 3415 {
3371#if ENABLE_FRILLS 3416#if ENABLE_FRILLS
3372 if (OPTION (Opt_tripleclickwords)) 3417 if (option (Opt_tripleclickwords))
3373 { 3418 {
3374 selection_delimit_word (UP, &selection.beg, &selection.beg); 3419 selection_delimit_word (UP, &selection.beg, &selection.beg);
3375 3420
3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3421 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3377 { 3422 {
3378 if (!ROW(end_row).is_longer ()) 3423 if (!ROW(end_row).is_longer ())
3379 { 3424 {
3380 selection.end.row = end_row; 3425 selection.end.row = end_row;
3381 selection.end.col = ROW(end_row).l; 3426 selection.end.col = ROW(end_row).l;
3427# if !ENABLE_MINIMAL
3382 selection_remove_trailing_spaces (); 3428 selection_remove_trailing_spaces ();
3429# endif
3383 break; 3430 break;
3384 } 3431 }
3385 } 3432 }
3386 } 3433 }
3387 else 3434 else
… …
3416 selection.mark.row = selection.beg.row; 3463 selection.mark.row = selection.beg.row;
3417 selection.mark.col = selection.beg.col; 3464 selection.mark.col = selection.beg.col;
3418 } 3465 }
3419 } 3466 }
3420 3467
3421#if ENABLE_FRILLS 3468#if !ENABLE_MINIMAL
3422 if (selection.rect && selection.beg.col > selection.end.col) 3469 if (selection.rect && selection.beg.col > selection.end.col)
3423 ::swap (selection.beg.col, selection.end.col); 3470 ::swap (selection.beg.col, selection.end.col);
3424#endif 3471#endif
3425} 3472}
3426 3473
3427#if ENABLE_FRILLS 3474#if !ENABLE_MINIMAL
3428void 3475void
3429rxvt_term::selection_remove_trailing_spaces () 3476rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430{ 3477{
3431 int32_t end_col, end_row; 3478 int32_t end_col, end_row;
3432 text_t *stp; 3479 text_t *stp;
3433 3480
3434 end_col = selection.end.col; 3481 end_col = selection.end.col;
… …
3472/* 3519/*
3473 * Double click on button 3 when already selected 3520 * Double click on button 3 when already selected
3474 * EXT: button 3 double click 3521 * EXT: button 3 double click
3475 */ 3522 */
3476void 3523void
3477rxvt_term::selection_rotate (int x, int y) 3524rxvt_term::selection_rotate (int x, int y) NOTHROW
3478{ 3525{
3479 selection.clicks = selection.clicks % 3 + 1; 3526 selection.clicks = selection.clicks % 3 + 1;
3480 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3527 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481} 3528}
3482 3529
… …
3484/* 3531/*
3485 * Respond to a request for our current selection 3532 * Respond to a request for our current selection
3486 * EXT: SelectionRequest 3533 * EXT: SelectionRequest
3487 */ 3534 */
3488void 3535void
3489rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3536rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490{ 3537{
3491 XSelectionEvent ev; 3538 XSelectionEvent ev;
3492 dDisp;
3493 3539
3494 ev.type = SelectionNotify; 3540 ev.type = SelectionNotify;
3495 ev.property = None; 3541 ev.property = None;
3496 ev.display = rq.display; 3542 ev.display = rq.display;
3497 ev.requestor = rq.requestor; 3543 ev.requestor = rq.requestor;
… …
3511 *target++ = xa[XA_COMPOUND_TEXT]; 3557 *target++ = xa[XA_COMPOUND_TEXT];
3512#if X_HAVE_UTF8_STRING 3558#if X_HAVE_UTF8_STRING
3513 *target++ = xa[XA_UTF8_STRING]; 3559 *target++ = xa[XA_UTF8_STRING];
3514#endif 3560#endif
3515 3561
3516 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3562 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3517 32, PropModeReplace, 3563 32, PropModeReplace,
3518 (unsigned char *)target_list, target - target_list); 3564 (unsigned char *)target_list, target - target_list);
3519 ev.property = rq.property; 3565 ev.property = rq.property;
3520 } 3566 }
3521#if TODO // TODO 3567#if TODO // TODO
… …
3524 /* TODO: Handle MULTIPLE */ 3570 /* TODO: Handle MULTIPLE */
3525 } 3571 }
3526#endif 3572#endif
3527 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3573 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3528 { 3574 {
3529 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3575 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3530 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3576 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3531 ev.property = rq.property; 3577 ev.property = rq.property;
3532 } 3578 }
3533 else if (rq.target == XA_STRING 3579 else if (rq.target == XA_STRING
3534 || rq.target == xa[XA_TEXT] 3580 || rq.target == xa[XA_TEXT]
… …
3558 style = enc_string; 3604 style = enc_string;
3559 else if (target == xa[XA_TEXT]) 3605 else if (target == xa[XA_TEXT])
3560 style = enc_text; 3606 style = enc_text;
3561 else if (target == xa[XA_COMPOUND_TEXT]) 3607 else if (target == xa[XA_COMPOUND_TEXT])
3562 style = enc_compound_text; 3608 style = enc_compound_text;
3563#if ENABLE_FRILLS 3609#if !ENABLE_MINIMAL
3564 else if (target == xa[XA_UTF8_STRING]) 3610 else if (target == xa[XA_UTF8_STRING])
3565 style = enc_utf8; 3611 style = enc_utf8;
3566#endif 3612#endif
3567 else 3613 else
3568 { 3614 {
… …
3579 { 3625 {
3580 cl = L""; 3626 cl = L"";
3581 selectlen = 0; 3627 selectlen = 0;
3582 } 3628 }
3583 3629
3584#if ENABLE_FRILLS 3630#if !ENABLE_MINIMAL
3585 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3631 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3586 // so recode it manually 3632 // so recode it manually
3587 if (style == enc_utf8) 3633 if (style == enc_utf8)
3588 { 3634 {
3589 freect = 1; 3635 freect = 1;
… …
3592 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3638 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3593 ct.nitems = strlen ((char *)ct.value); 3639 ct.nitems = strlen ((char *)ct.value);
3594 } 3640 }
3595 else 3641 else
3596#endif 3642#endif
3597 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3643 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3598 freect = 1; 3644 freect = 1;
3599 else 3645 else
3600 { 3646 {
3601 /* if we failed to convert then send it raw */ 3647 /* if we failed to convert then send it raw */
3602 ct.value = (unsigned char *)cl; 3648 ct.value = (unsigned char *)cl;
3603 ct.nitems = selectlen; 3649 ct.nitems = selectlen;
3604 ct.encoding = target; 3650 ct.encoding = target;
3605 } 3651 }
3606 3652
3607 XChangeProperty (disp, rq.requestor, rq.property, 3653 XChangeProperty (dpy, rq.requestor, rq.property,
3608 ct.encoding, 8, PropModeReplace, 3654 ct.encoding, 8, PropModeReplace,
3609 ct.value, (int)ct.nitems); 3655 ct.value, (int)ct.nitems);
3610 ev.property = rq.property; 3656 ev.property = rq.property;
3611 3657
3612 if (freect) 3658 if (freect)
3613 XFree (ct.value); 3659 XFree (ct.value);
3614 } 3660 }
3615 3661
3616 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3662 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3617} 3663}
3618 3664
3619/* ------------------------------------------------------------------------- * 3665/* ------------------------------------------------------------------------- *
3620 * MOUSE ROUTINES * 3666 * MOUSE ROUTINES *
3621 * ------------------------------------------------------------------------- */ 3667 * ------------------------------------------------------------------------- */
3622 3668
3623/* 3669/*
3624 * return col/row values corresponding to x/y pixel values 3670 * return col/row values corresponding to x/y pixel values
3625 */ 3671 */
3626void 3672void
3627rxvt_term::pixel_position (int *x, int *y) 3673rxvt_term::pixel_position (int *x, int *y) NOTHROW
3628{ 3674{
3629 *x = Pixel2Col (*x); 3675 *x = Pixel2Col (*x);
3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3676 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3631 *y = Pixel2Row (*y); 3677 *y = Pixel2Row (*y);
3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3678 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3633} 3679}
3634 3680
3635/* ------------------------------------------------------------------------- */ 3681/* ------------------------------------------------------------------------- */
3636#ifdef USE_XIM 3682#ifdef USE_XIM
3637void 3683void
3638rxvt_term::im_set_position (XPoint &pos) 3684rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639{ 3685{
3640 XWindowAttributes xwa; 3686 XWindowAttributes xwa;
3641 3687
3642 XGetWindowAttributes (display->display, vt, &xwa); 3688 XGetWindowAttributes (dpy, vt, &xwa);
3643 3689
3644 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3690 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3645 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3691 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3646} 3692}
3647#endif 3693#endif
3648 3694
3649#if ENABLE_OVERLAY 3695#if ENABLE_OVERLAY
3650void 3696void
3651rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3697rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652{ 3698{
3653 if (nrow < 1 || ncol < 1) 3699 if (nrow < 1 || ncol < 1)
3654 return; 3700 return;
3655 3701
3656 want_refresh = 1; 3702 want_refresh = 1;
… …
3701 *rp = r; 3747 *rp = r;
3702 } 3748 }
3703} 3749}
3704 3750
3705void 3751void
3706rxvt_term::scr_overlay_off () 3752rxvt_term::scr_overlay_off () NOTHROW
3707{ 3753{
3708 if (!ov_text) 3754 if (!ov_text)
3709 return; 3755 return;
3710 3756
3711 want_refresh = 1; 3757 want_refresh = 1;
… …
3719 delete [] ov_text; ov_text = 0; 3765 delete [] ov_text; ov_text = 0;
3720 delete [] ov_rend; ov_rend = 0; 3766 delete [] ov_rend; ov_rend = 0;
3721} 3767}
3722 3768
3723void 3769void
3724rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3770rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725{ 3771{
3726 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3772 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3727 return; 3773 return;
3728 3774
3729 x++, y++; 3775 x++, y++;
… …
3731 ov_text[y][x] = text; 3777 ov_text[y][x] = text;
3732 ov_rend[y][x] = rend; 3778 ov_rend[y][x] = rend;
3733} 3779}
3734 3780
3735void 3781void
3736rxvt_term::scr_overlay_set (int x, int y, const char *s) 3782rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737{ 3783{
3738 while (*s) 3784 while (*s)
3739 scr_overlay_set (x++, y, *s++); 3785 scr_overlay_set (x++, y, *s++);
3740} 3786}
3741 3787
3742void 3788void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3789rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744{ 3790{
3745 while (*s) 3791 while (*s)
3746 { 3792 {
3747 text_t t = *s++; 3793 text_t t = *s++;
3748 int width = wcwidth (t); 3794 int width = WCWIDTH (t);
3749 3795
3750 while (width--) 3796 while (width--)
3751 { 3797 {
3752 scr_overlay_set (x++, y, t); 3798 scr_overlay_set (x++, y, t);
3753 t = NOCHAR; 3799 t = NOCHAR;
3754 } 3800 }
3755 } 3801 }
3756} 3802}
3757 3803
3758void 3804void
3759rxvt_term::scr_swap_overlay () 3805rxvt_term::scr_swap_overlay () NOTHROW
3760{ 3806{
3761 if (!ov_text) 3807 if (!ov_text)
3762 return; 3808 return;
3763 3809
3764 // swap screen mem with overlay 3810 // swap screen mem with overlay
3765 for (int y = ov_h; y--; ) 3811 for (int y = ov_h; y--; )
3766 { 3812 {
3767 text_t *t1 = ov_text[y]; 3813 text_t *t1 = ov_text[y];
3768 rend_t *r1 = ov_rend[y]; 3814 rend_t *r1 = ov_rend[y];
3769 3815
3770 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3816 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3771 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3817 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3772 3818
3773 for (int x = ov_w; x--; ) 3819 for (int x = ov_w; x--; )
3774 { 3820 {
3775 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3821 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3822 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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