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.227 by root, Sun Jan 15 05:14:12 2006 UTC vs.
Revision 1.280 by ayin, Mon Oct 15 14:56:06 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);
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 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 627 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
619 { 628 {
620 nsaved = min (nsaved + count, saveLines); 629 top_row = max (top_row - count, -saveLines);
621 630
622 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END));
623
624 // scroll everything up 'count' lines 631 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 632 term_start = (term_start + count) % total_rows;
626 633
634 // sever bottommost line
627 { 635 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count); 636 line_t &l = ROW(row2 - count);
637 l.is_longer (0);
630 l.touch (); 638 l.touch ();
631 l.is_longer (0);
632 } 639 }
633 640
634 // erase newly scorlled-in lines 641 // erase newly scrolled-in lines
635 for (int i = count; i; --i ) 642 for (int i = count; i--; )
636 { 643 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i); 644 line_t &l = ROW(nrow - 1 - i);
640 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 {
641 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 651 l.l = 0;
644 l.f = 0; 652 l.f = 0;
653 }
654 else
655 scr_blank_screen_mem (l, rstyle);
645 } 656 }
646 657
647 // now copy lines below the scroll region bottom to the 658 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 659 // bottom of the screen again, so they look as if they
649 // hadn't moved. 660 // hadn't moved.
… …
661 { 672 {
662 selection.beg.row -= count; 673 selection.beg.row -= count;
663 selection.end.row -= count; 674 selection.end.row -= count;
664 selection.mark.row -= count; 675 selection.mark.row -= count;
665 676
666 if (selection.beg.row < -nsaved 677 if (selection.beg.row < top_row
667 || selection.end.row < -nsaved 678 || selection.end.row < top_row
668 || selection.mark.row < -nsaved) 679 || selection.mark.row < top_row)
669 { 680 {
670 CLEAR_ALL_SELECTION (); 681 CLEAR_ALL_SELECTION ();
671 selection.op = SELECTION_CLEAR; 682 selection.op = SELECTION_CLEAR;
672 } 683 }
673 } 684 }
674 685
675 // finally move the view window, if desired 686 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 687 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 688 && view_start != 0
678 && view_start != saveLines) 689 && view_start != -saveLines)
679 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));
680 } 694 }
681 else 695 else
682 { 696 {
683 if (selection.op && current_screen == selection.screen) 697 if (selection.op && current_screen == selection.screen)
684 { 698 {
… …
730/* ------------------------------------------------------------------------- */ 744/* ------------------------------------------------------------------------- */
731/* 745/*
732 * Add text given in <str> of length <len> to screen struct 746 * Add text given in <str> of length <len> to screen struct
733 */ 747 */
734void 748void
735rxvt_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
736{ 750{
737 if (len <= 0) /* sanity */ 751 if (len <= 0) /* sanity */
738 return; 752 return;
739 753
740 unsigned char checksel; 754 unsigned char checksel;
… …
746 ZERO_SCROLLBACK (); 760 ZERO_SCROLLBACK ();
747 761
748 if (minlines > 0) 762 if (minlines > 0)
749 { 763 {
750 minlines += screen.cur.row - screen.bscroll; 764 minlines += screen.cur.row - screen.bscroll;
765 min_it (minlines, screen.cur.row - top_row);
751 766
752 if (minlines > 0 767 if (minlines > 0
753 && screen.tscroll == 0 768 && screen.tscroll == 0
754 && screen.bscroll == nrow - 1) 769 && screen.bscroll == nrow - 1)
755 { 770 {
… …
760 } 775 }
761 776
762#ifdef DEBUG_STRICT 777#ifdef DEBUG_STRICT
763 assert (screen.cur.col < ncol); 778 assert (screen.cur.col < ncol);
764 assert (screen.cur.row < nrow 779 assert (screen.cur.row < nrow
765 && screen.cur.row >= -nsaved); 780 && screen.cur.row >= top_row);
766#endif 781#endif
767 int row = screen.cur.row; 782 int row = screen.cur.row;
768 783
769 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 784 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
770 785
… …
816 CLEAR_SELECTION (); 831 CLEAR_SELECTION ();
817 } 832 }
818 833
819 if (screen.flags & Screen_WrapNext) 834 if (screen.flags & Screen_WrapNext)
820 { 835 {
821 max_it (line->l, ncol);
822 line->is_longer (1);
823
824 scr_do_wrap (); 836 scr_do_wrap ();
825 837
838 line->l = ncol;
839 line->is_longer (1);
840
826 row = screen.cur.row; 841 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */ 842 line = &ROW(row); /* _must_ refresh */
828 } 843 }
829 844
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 845 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 846 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
832 c = 0xfffd; 847 c = 0xfffd;
833 848
834 // 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
835 // do wcwidth before further replacements, as wcwidth might return -1 850 // further replacements, as wcwidth might return -1 for the line
836 // 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
837 // locale. 852 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c); 853 int width = WCWIDTH (c);
839 854
840 if (charsets [screen.charset] == '0') // DEC SPECIAL 855 if (charsets [screen.charset] == '0') // DEC SPECIAL
841 { 856 {
842 // vt100 special graphics and line drawing 857 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100 858 // 5f-7e standard vt100
… …
994/* 1009/*
995 * 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
996 * XTERM_SEQ: CTRL-H 1011 * XTERM_SEQ: CTRL-H
997 */ 1012 */
998void 1013void
999rxvt_term::scr_backspace () 1014rxvt_term::scr_backspace () NOTHROW
1000{ 1015{
1001 want_refresh = 1; 1016 want_refresh = 1;
1002 1017
1003 if (screen.cur.col == 0) 1018 if (screen.cur.col == 0)
1004 { 1019 {
… …
1022 * Process Horizontal Tab 1037 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
1025 */ 1040 */
1026void 1041void
1027rxvt_term::scr_tab (int count, bool ht) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1043{
1029 int i, x; 1044 int i, x;
1030 1045
1031 want_refresh = 1; 1046 want_refresh = 1;
1032 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
… …
1054 if (count) 1069 if (count)
1055 x = ncol - 1; 1070 x = ncol - 1;
1056 1071
1057 // store horizontal tab commands as characters inside the text 1072 // store horizontal tab commands as characters inside the text
1058 // buffer so they can be selected and pasted. 1073 // buffer so they can be selected and pasted.
1059 if (ht && OPTION (Opt_pastableTabs)) 1074 if (ht && option (Opt_pastableTabs))
1060 { 1075 {
1061 base_rend = SET_FONT (base_rend, 0); 1076 base_rend = SET_FONT (base_rend, 0);
1062 1077
1063 l.touch (x); 1078 l.touch (x);
1064 1079
… …
1097 * Process DEC Back Index 1112 * Process DEC Back Index
1098 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1099 * 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
1100 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1101 */ 1116 */
1102#if ENABLE_FRILLS 1117#if !ENABLE_MINIMAL
1103void 1118void
1104rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1105{ 1120{
1106 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108 else 1123 else
1109 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
… …
1114 * Process DEC Forward Index 1129 * Process DEC Forward Index
1115 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1116 * 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
1117 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1118 */ 1133 */
1119#if ENABLE_FRILLS 1134#if !ENABLE_MINIMAL
1120void 1135void
1121rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1122{ 1137{
1123 if (screen.cur.col < ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125 else 1140 else
1126 { 1141 {
… …
1139/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1140/* 1155/*
1141 * Goto Row/Column 1156 * Goto Row/Column
1142 */ 1157 */
1143void 1158void
1144rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145{ 1160{
1146 want_refresh = 1; 1161 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1148 1163
1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1187/* ------------------------------------------------------------------------- */ 1202/* ------------------------------------------------------------------------- */
1188/* 1203/*
1189 * direction should be UP or DN 1204 * direction should be UP or DN
1190 */ 1205 */
1191void 1206void
1192rxvt_term::scr_index (enum page_dirn direction) 1207rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193{ 1208{
1194 int dirn; 1209 int dirn;
1195 1210
1196 want_refresh = 1; 1211 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1212 ZERO_SCROLLBACK ();
… …
1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1231 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1232 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1233 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1219 */ 1234 */
1220void 1235void
1221rxvt_term::scr_erase_line (int mode) 1236rxvt_term::scr_erase_line (int mode) NOTHROW
1222{ 1237{
1223 unsigned int col, num; 1238 unsigned int col, num;
1224 1239
1225 want_refresh = 1; 1240 want_refresh = 1;
1226 ZERO_SCROLLBACK (); 1241 ZERO_SCROLLBACK ();
… …
1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1285 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1286 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1287 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273 */ 1288 */
1274void 1289void
1275rxvt_term::scr_erase_screen (int mode) 1290rxvt_term::scr_erase_screen (int mode) NOTHROW
1276{ 1291{
1277 int num; 1292 int num;
1278 int32_t row; 1293 int32_t row;
1279 rend_t ren; 1294 rend_t ren;
1280 XGCValues gcvalue; 1295 XGCValues gcvalue;
… …
1325 } 1340 }
1326 else 1341 else
1327 { 1342 {
1328 ren = rstyle & (RS_fgMask | RS_bgMask); 1343 ren = rstyle & (RS_fgMask | RS_bgMask);
1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1344 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1345 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1331 ERASE_ROWS (row, num); 1346 ERASE_ROWS (row, num);
1332 gcvalue.foreground = pix_colors[Color_fg]; 1347 gcvalue.foreground = pix_colors[Color_fg];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1348 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 } 1349 }
1335 1350
1336 for (; num--; row++) 1351 for (; num--; row++)
1337 { 1352 {
1338 scr_blank_screen_mem (ROW(row), rstyle); 1353 scr_blank_screen_mem (ROW(row), rstyle);
1339 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1354 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1340 } 1355 }
1341} 1356}
1342 1357
1343#if ENABLE_FRILLS 1358#if !ENABLE_MINIMAL
1344void 1359void
1345rxvt_term::scr_erase_savelines () 1360rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1361{
1347 want_refresh = 1; 1362 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1363 ZERO_SCROLLBACK ();
1349 1364
1350 nsaved = 0; 1365 top_row = 0;
1351} 1366}
1352#endif 1367#endif
1353 1368
1354/* ------------------------------------------------------------------------- */ 1369/* ------------------------------------------------------------------------- */
1355/* 1370/*
1356 * Fill the screen with `E's 1371 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1372 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1373 */
1359void 1374void
1360rxvt_term::scr_E () 1375rxvt_term::scr_E () NOTHROW
1361{ 1376{
1362 rend_t fs; 1377 rend_t fs;
1363 1378
1364 want_refresh = 1; 1379 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1380 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1401/* ------------------------------------------------------------------------- */
1387/* 1402/*
1388 * Insert/Delete <count> lines 1403 * Insert/Delete <count> lines
1389 */ 1404 */
1390void 1405void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1406rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1407{
1393 int end; 1408 int end;
1394 1409
1395 ZERO_SCROLLBACK (); 1410 ZERO_SCROLLBACK ();
1396 1411
… …
1416/* ------------------------------------------------------------------------- */ 1431/* ------------------------------------------------------------------------- */
1417/* 1432/*
1418 * Insert/Delete <count> characters from the current position 1433 * Insert/Delete <count> characters from the current position
1419 */ 1434 */
1420void 1435void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1436rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1437{
1423 int col, row; 1438 int col, row;
1424 rend_t tr; 1439 rend_t tr;
1425 1440
1426 want_refresh = 1; 1441 want_refresh = 1;
… …
1514/* 1529/*
1515 * Set the scrolling region 1530 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1531 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1532 */
1518void 1533void
1519rxvt_term::scr_scroll_region (int top, int bot) 1534rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1535{
1521 max_it (top, 0); 1536 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1537 min_it (bot, nrow - 1);
1523 1538
1524 if (top > bot) 1539 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1549 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1550 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1551 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1552 */
1538void 1553void
1539rxvt_term::scr_cursor_visible (int mode) 1554rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1555{
1541 want_refresh = 1; 1556 want_refresh = 1;
1542 1557
1543 if (mode) 1558 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1559 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1566 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1567 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1568 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1569 */
1555void 1570void
1556rxvt_term::scr_autowrap (int mode) 1571rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1572{
1558 if (mode) 1573 if (mode)
1559 screen.flags |= Screen_Autowrap; 1574 screen.flags |= Screen_Autowrap;
1560 else 1575 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1576 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1585 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1586 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1587 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1588 */
1574void 1589void
1575rxvt_term::scr_relative_origin (int mode) 1590rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1591{
1577 if (mode) 1592 if (mode)
1578 screen.flags |= Screen_Relative; 1593 screen.flags |= Screen_Relative;
1579 else 1594 else
1580 screen.flags &= ~Screen_Relative; 1595 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1602 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1603 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1604 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1605 */
1591void 1606void
1592rxvt_term::scr_insert_mode (int mode) 1607rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1608{
1594 if (mode) 1609 if (mode)
1595 screen.flags |= Screen_Insert; 1610 screen.flags |= Screen_Insert;
1596 else 1611 else
1597 screen.flags &= ~Screen_Insert; 1612 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1618 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1619 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1620 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1621 */
1607void 1622void
1608rxvt_term::scr_set_tab (int mode) 1623rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1624{
1610 if (mode < 0) 1625 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1626 memset (tabs, 0, ncol);
1612 else if (screen.cur.col < ncol) 1627 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1628 tabs [screen.cur.col] = !!mode;
1614} 1629}
1615 1630
1616/* ------------------------------------------------------------------------- */ 1631/* ------------------------------------------------------------------------- */
… …
1618 * Set reverse/normal video 1633 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1634 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1635 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1636 */
1622void 1637void
1623rxvt_term::scr_rvideo_mode (int mode) 1638rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1639{
1625 XGCValues gcvalue; 1640 rvideo_mode = on;
1626 1641
1642#ifndef NO_BELL
1643 on ^= rvideo_bell;
1644#endif
1645
1627 if (rvideo != mode) 1646 if (rvideo_state != on)
1628 { 1647 {
1629 rvideo = mode; 1648 rvideo_state = on;
1649
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1650 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1651#ifdef HAVE_BG_PIXMAP
1632 if (bgPixmap.pixmap == None) 1652 if (bgPixmap.pixmap == None)
1633#endif 1653#endif
1634#if TRANSPARENT 1654 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1636#endif
1637 XSetWindowBackground (display->display, vt,
1638 pix_colors[Color_bg]);
1639 1655
1656 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1659 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1660
1644 scr_clear (); 1661 scr_clear ();
1645 scr_touch (true); 1662 scr_touch (true);
1646 } 1663 }
1647} 1664}
1648 1665
… …
1650/* 1667/*
1651 * Report current cursor position 1668 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1669 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1670 */
1654void 1671void
1655rxvt_term::scr_report_position () 1672rxvt_term::scr_report_position () NOTHROW
1656{ 1673{
1657 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);
1658} 1675}
1659 1676
1660/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
… …
1663 1680
1664/* 1681/*
1665 * Set font style 1682 * Set font style
1666 */ 1683 */
1667void 1684void
1668rxvt_term::set_font_style () 1685rxvt_term::set_font_style () NOTHROW
1669{ 1686{
1670#if 0 1687#if 0
1671 switch (charsets [screen.charset]) 1688 switch (charsets [screen.charset])
1672 { 1689 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1690 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1712 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1713 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1714 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1715 */
1699void 1716void
1700rxvt_term::scr_charset_choose (int set) 1717rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1718{
1702 screen.charset = set; 1719 screen.charset = set;
1703 set_font_style (); 1720 set_font_style ();
1704} 1721}
1705 1722
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1728 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1729 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1730 * See set_font_style for possible values for <C>
1714 */ 1731 */
1715void 1732void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1733rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1734{
1718 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1736 set_font_style ();
1720} 1737}
1721 1738
… …
1726 1743
1727/* 1744/*
1728 * refresh matching text. 1745 * refresh matching text.
1729 */ 1746 */
1730bool 1747bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1748rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1749{
1733 bool found = false; 1750 bool found = false;
1734 1751
1735 for (int i = 0; i < nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1736 { 1753 {
1737 int col = 0;
1738 rend_t *drp = drawn_buf[i].r; 1754 rend_t *drp = drawn_buf[i].r;
1739 1755
1740 for (; col < ncol; col++, drp++) 1756 for (int col = 0; col < ncol; col++, drp++)
1741 if ((*drp & mask) == value) 1757 if ((*drp & mask) == value)
1742 { 1758 {
1743 found = true; 1759 found = true;
1744 *drp = ~value; 1760 *drp = ~value;
1745 } 1761 }
… …
1756 PART_END, 1772 PART_END,
1757 RC_COUNT 1773 RC_COUNT
1758}; 1774};
1759 1775
1760void 1776void
1761rxvt_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
1762{ 1778{
1763 int i; 1779 int i;
1764 row_col_t rc[RC_COUNT]; 1780 row_col_t rc[RC_COUNT];
1765 1781
1766 if (!drawn_buf) /* sanity check */ 1782 if (!drawn_buf) /* sanity check */
… …
1785 for (i = PART_BEG; i < RC_COUNT; i++) 1801 for (i = PART_BEG; i < RC_COUNT; i++)
1786 { 1802 {
1787 min_it (rc[i].col, ncol - 1); 1803 min_it (rc[i].col, ncol - 1);
1788 min_it (rc[i].row, nrow - 1); 1804 min_it (rc[i].row, nrow - 1);
1789 } 1805 }
1790 1806// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1791 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++)
1792 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);
1793 1809
1810 num_scr_allow = 0;
1811
1794 if (refresh) 1812 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1813 scr_refresh ();
1796} 1814}
1797 1815
1798/* ------------------------------------------------------------------------- */ 1816/* ------------------------------------------------------------------------- */
1799/* 1817/*
1800 * Refresh the entire screen 1818 * Refresh the entire screen
1801 */ 1819 */
1802void 1820void
1803rxvt_term::scr_touch (bool refresh) 1821rxvt_term::scr_touch (bool refresh) NOTHROW
1804{ 1822{
1805 scr_expose (0, 0, width, height, refresh); 1823 scr_expose (0, 0, width, height, refresh);
1806} 1824}
1807 1825
1808/* ------------------------------------------------------------------------- */ 1826/* ------------------------------------------------------------------------- */
1809/* 1827/*
1810 * 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
1811 * the top of the screen 1829 * the top of the screen
1812 */ 1830 */
1813int 1831void
1814rxvt_term::scr_move_to (int y, int len) 1832rxvt_term::scr_move_to (int y, int len) NOTHROW
1815{ 1833{
1816 long p = 0; 1834 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1817 unsigned int oldviewstart;
1818
1819 oldviewstart = view_start;
1820
1821 if (y < len)
1822 {
1823 p = (nrow + nsaved) * (len - y) / len;
1824 p -= (long) (nrow - 1);
1825 p = max (p, 0);
1826 }
1827
1828 view_start = (unsigned int)min (p, nsaved);
1829
1830 return scr_changeview (oldviewstart);
1831} 1835}
1832 1836
1833/* ------------------------------------------------------------------------- */ 1837/* ------------------------------------------------------------------------- */
1834/* 1838/*
1835 * Page the screen up/down nlines 1839 * Page the screen up/down nlines
1836 * direction should be UP or DN 1840 * direction should be UP or DN
1837 */ 1841 */
1838int 1842bool
1839rxvt_term::scr_page (enum page_dirn direction, int nlines) 1843rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1840{ 1844{
1841 int n; 1845 int new_view_start =
1842 unsigned int oldviewstart;
1843
1844 oldviewstart = view_start;
1845
1846 if (direction == UP)
1847 {
1848 n = view_start + nlines;
1849 view_start = min (n, nsaved);
1850 }
1851 else
1852 {
1853 n = view_start - nlines; 1846 direction == UP ? view_start - nlines
1854 view_start = max (n, 0); 1847 : view_start + nlines;
1855 }
1856 1848
1857 return scr_changeview (oldviewstart); 1849 return scr_changeview (new_view_start);
1858} 1850}
1859 1851
1860int 1852bool
1861rxvt_term::scr_changeview (unsigned int oldviewstart) 1853rxvt_term::scr_changeview (int new_view_start) NOTHROW
1862{ 1854{
1855 clamp_it (new_view_start, top_row, 0);
1856
1863 if (view_start != oldviewstart) 1857 if (new_view_start == view_start)
1864 { 1858 return false;
1859
1860 num_scr += new_view_start - view_start;
1861 view_start = new_view_start;
1862 want_refresh = 1;
1863
1865 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));
1866 1865
1867 want_refresh = 1; 1866 return true;
1868 num_scr -= (view_start - oldviewstart);
1869 }
1870
1871 return (int)view_start - (int)oldviewstart;
1872} 1867}
1873 1868
1874/* ------------------------------------------------------------------------- */ 1869#ifndef NO_BELL
1875void 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
1876rxvt_term::scr_bell () 1880rxvt_term::scr_bell () NOTHROW
1877{ 1881{
1878#ifndef NO_BELL 1882#ifndef NO_BELL
1879 1883
1880# ifndef NO_MAPALERT 1884# ifndef NO_MAPALERT
1881# ifdef MAPALERT_OPTION 1885# ifdef MAPALERT_OPTION
1882 if (OPTION (Opt_mapAlert)) 1886 if (option (Opt_mapAlert))
1883# endif 1887# endif
1884 XMapWindow (display->display, parent[0]); 1888 XMapWindow (dpy, parent[0]);
1885# endif 1889# endif
1886 1890
1887 if (OPTION (Opt_visualBell)) 1891# if ENABLE_FRILLS
1892 if (option (Opt_urgentOnBell))
1893 {
1894 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1895 {
1896 h->flags |= XUrgencyHint;
1897 XSetWMHints (dpy, parent[0], h);
1898 }
1888 { 1899 }
1889 scr_rvideo_mode (!rvideo); /* refresh also done */ 1900# endif
1901
1902 if (option (Opt_visualBell))
1903 {
1904 rvideo_bell = true;
1905 scr_rvideo_mode (rvideo_mode);
1890 display->flush (); 1906 display->flush ();
1891 rxvt_usleep (VISUAL_BELL_DURATION); 1907
1892 scr_rvideo_mode (!rvideo); /* refresh also done */ 1908 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1893 } 1909 }
1894 else 1910 else
1895 XBell (display->display, 0); 1911 XBell (dpy, 0);
1896
1897#endif 1912#endif
1898} 1913}
1899 1914
1900/* ------------------------------------------------------------------------- */ 1915/* ------------------------------------------------------------------------- */
1901/* ARGSUSED */ 1916/* ARGSUSED */
1902void 1917void
1903rxvt_term::scr_printscreen (int fullhist) 1918rxvt_term::scr_printscreen (int fullhist) NOTHROW
1904{ 1919{
1905#ifdef PRINTPIPE 1920#ifdef PRINTPIPE
1906 int nrows, row_start; 1921 int nrows, row_start;
1907 FILE *fd; 1922 FILE *fd;
1908 1923
1909 if ((fd = popen_printer ()) == NULL) 1924 if ((fd = popen_printer ()) == NULL)
1910 return; 1925 return;
1911 1926
1912 if (fullhist) 1927 if (fullhist)
1913 { 1928 {
1914 nrows = nrow + nsaved; 1929 nrows = nrow - top_row;
1915 row_start = -nsaved; 1930 row_start = top_row;
1916 } 1931 }
1917 else 1932 else
1918 { 1933 {
1919 nrows = nrow; 1934 nrows = nrow;
1920 row_start = -view_start; 1935 row_start = view_start;
1921 } 1936 }
1922 1937
1923 wctomb (0, 0); 1938 wctomb (0, 0);
1924 1939
1925 for (int r1 = 0; r1 < nrows; r1++) 1940 for (int r1 = 0; r1 < nrows; r1++)
… …
1957 * Refresh the screen 1972 * Refresh the screen
1958 * drawn_text/drawn_rend contain the screen information before the update. 1973 * drawn_text/drawn_rend contain the screen information before the update.
1959 * screen.text/screen.rend contain what the screen will change to. 1974 * screen.text/screen.rend contain what the screen will change to.
1960 */ 1975 */
1961void 1976void
1962rxvt_term::scr_refresh (unsigned char refresh_type) 1977rxvt_term::scr_refresh () NOTHROW
1963{ 1978{
1964 unsigned char must_clear, /* use draw_string not draw_image_string */ 1979 unsigned char have_bg,
1965 showcursor; /* show the cursor */ 1980 showcursor; /* show the cursor */
1966 int16_t col, row, /* column/row we're processing */ 1981 int16_t col, row, /* column/row we're processing */
1967 ocrow; /* old cursor row */ 1982 ocrow; /* old cursor row */
1968 int i; /* tmp */ 1983 int i; /* tmp */
1969#ifndef NO_CURSORCOLOR 1984#ifndef NO_CURSORCOLOR
1970 rend_t cc1; /* store colours at cursor position (s) */ 1985 rend_t cc1; /* store colours at cursor position (s) */
1971#endif 1986#endif
1972 rend_t *crp; // cursor rendition pointer 1987 rend_t *crp; // cursor rendition pointer
1988 rend_t ccol1, /* Cursor colour */
1989 ccol2; /* Cursor colour2 */
1973 1990
1974 want_refresh = 0; /* screen is current */ 1991 want_refresh = 0; /* screen is current */
1975 1992
1976 if (refresh_type == NO_REFRESH || !mapped) 1993 if (refresh_type == NO_REFRESH || !mapped)
1977 return; 1994 return;
1978 1995
1979 /* 1996 /*
1980 * A: set up vars 1997 * A: set up vars
1981 */ 1998 */
1982 must_clear = 0; 1999 have_bg = 0;
1983 refresh_count = 0; 2000 refresh_count = 0;
1984 2001
1985#if XPM_BACKGROUND 2002#ifdef HAVE_BG_PIXMAP
1986 must_clear |= bgPixmap.pixmap != None; 2003 have_bg |= bgPixmap.pixmap != None;
1987#endif
1988#if TRANSPARENT
1989 must_clear |= OPTION (Opt_transparent) && am_transparent;
1990#endif 2004#endif
1991 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2005 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1992 2006
1993 /* 2007 /*
1994 * B: reverse any characters which are selected 2008 * B: reverse any characters which are selected
… …
1998 /* 2012 /*
1999 * C: set the cursor character (s) 2013 * C: set the cursor character (s)
2000 */ 2014 */
2001 { 2015 {
2002 unsigned char setoldcursor; 2016 unsigned char setoldcursor;
2003 rend_t ccol1, /* Cursor colour */
2004 ccol2; /* Cursor colour2 */
2005 2017
2006 showcursor = (screen.flags & Screen_VisibleCursor); 2018 showcursor = (screen.flags & Screen_VisibleCursor);
2007#ifdef CURSOR_BLINK 2019#ifdef CURSOR_BLINK
2008 if (hidden_cursor) 2020 if (hidden_cursor)
2009 showcursor = 0; 2021 showcursor = 0;
… …
2016 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2028 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2017 col--; 2029 col--;
2018 2030
2019 crp = &ROW(screen.cur.row).r[col]; 2031 crp = &ROW(screen.cur.row).r[col];
2020 2032
2033#ifndef NO_CURSORCOLOR
2034 cc1 = *crp & (RS_fgMask | RS_bgMask);
2035 if (ISSET_PIXCOLOR (Color_cursor))
2036 ccol1 = Color_cursor;
2037 else
2038#endif
2039#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2040 ccol1 = fgcolor_of (rstyle);
2041#else
2042 ccol1 = Color_fg;
2043#endif
2044
2045#ifndef NO_CURSORCOLOR
2046 if (ISSET_PIXCOLOR (Color_cursor2))
2047 ccol2 = Color_cursor2;
2048 else
2049#endif
2050#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2051 ccol2 = bgcolor_of (rstyle);
2052#else
2053 ccol2 = Color_bg;
2054#endif
2055
2021 if (showcursor && focus) 2056 if (showcursor && focus)
2022 { 2057 {
2023 if (OPTION (Opt_cursorUnderline)) 2058 if (option (Opt_cursorUnderline))
2024 *crp ^= RS_Uline; 2059 *crp ^= RS_Uline;
2025 else 2060 else
2026 { 2061 {
2027 *crp ^= RS_RVid; 2062 *crp ^= RS_RVid;
2028
2029#ifndef NO_CURSORCOLOR
2030 cc1 = *crp & (RS_fgMask | RS_bgMask);
2031 if (ISSET_PIXCOLOR (Color_cursor))
2032 ccol1 = Color_cursor;
2033 else
2034#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2035 ccol1 = fgcolor_of (rstyle);
2036#else
2037 ccol1 = Color_fg;
2038#endif
2039 if (ISSET_PIXCOLOR (Color_cursor2))
2040 ccol2 = Color_cursor2;
2041 else
2042#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2043 ccol2 = bgcolor_of (rstyle);
2044#else
2045 ccol2 = Color_bg;
2046#endif
2047 *crp = SET_FGCOLOR (*crp, ccol1); 2063 *crp = SET_FGCOLOR (*crp, ccol1);
2048 *crp = SET_BGCOLOR (*crp, ccol2); 2064 *crp = SET_BGCOLOR (*crp, ccol2);
2049#endif
2050 } 2065 }
2051 } 2066 }
2052 } 2067 }
2053 2068
2054 /* make sure no outline cursor is left around */ 2069 /* make sure no outline cursor is left around */
2055 setoldcursor = 0; 2070 setoldcursor = 0;
2056 if (ocrow != -1) 2071 if (ocrow != -1)
2057 { 2072 {
2058 if (screen.cur.row + view_start != ocrow 2073 if (screen.cur.row - view_start != ocrow
2059 || screen.cur.col != oldcursor.col) 2074 || screen.cur.col != oldcursor.col)
2060 { 2075 {
2061 if (ocrow < nrow 2076 if (ocrow < nrow
2062 && oldcursor.col < ncol) 2077 && oldcursor.col < ncol)
2063 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2078 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2071 else if (!focus) 2086 else if (!focus)
2072 setoldcursor = 1; 2087 setoldcursor = 1;
2073 2088
2074 if (setoldcursor) 2089 if (setoldcursor)
2075 { 2090 {
2076 if (screen.cur.row + view_start >= nrow) 2091 if (screen.cur.row - view_start >= nrow)
2077 oldcursor.row = -1; 2092 oldcursor.row = -1;
2078 else 2093 else
2079 { 2094 {
2080 oldcursor.row = screen.cur.row + view_start; 2095 oldcursor.row = screen.cur.row - view_start;
2081 oldcursor.col = screen.cur.col; 2096 oldcursor.col = screen.cur.col;
2082 } 2097 }
2083 } 2098 }
2084 } 2099 }
2085 2100
… …
2091#ifndef NO_SLOW_LINK_SUPPORT 2106#ifndef NO_SLOW_LINK_SUPPORT
2092 /* 2107 /*
2093 * D: CopyArea pass - very useful for slower links 2108 * D: CopyArea pass - very useful for slower links
2094 * This has been deliberately kept simple. 2109 * This has been deliberately kept simple.
2095 */ 2110 */
2096 i = num_scr;
2097 if (!display->is_local 2111 if (!display->is_local
2098 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2112 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2099 && abs (num_scr) < nrow && !must_clear) 2113 && abs (num_scr) < nrow && !have_bg)
2100 { 2114 {
2101 int16_t nits; 2115 int16_t nits;
2116 int i = num_scr;
2102 int j; 2117 int j;
2103 int len, wlen; 2118 int len, wlen;
2119 dLocal (int, num_scr);
2104 2120
2105 j = nrow; 2121 j = nrow;
2106 wlen = len = -1; 2122 wlen = len = -1;
2107 row = i > 0 ? 0 : j - 1; 2123 row = i > 0 ? 0 : j - 1;
2124
2108 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2125 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2109 { 2126 {
2110 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2127 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2111 { 2128 {
2112 line_t s = ROW(row - view_start); 2129 line_t s = ROW(view_start + row);
2113 line_t d = drawn_buf[row]; 2130 line_t d = drawn_buf[row];
2114 line_t d2 = drawn_buf[row + i]; 2131 line_t d2 = drawn_buf[row + i];
2115 2132
2116 for (nits = 0, col = ncol; col--; ) 2133 for (nits = 0, col = ncol; col--; )
2117 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2134 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2133 wlen = row; 2150 wlen = row;
2134 continue; 2151 continue;
2135 } 2152 }
2136 } 2153 }
2137 2154
2138 if (len != -1) 2155 if (len >= 0)
2139 { 2156 {
2140 /* also comes here at end if needed because of >= above */ 2157 /* also comes here at end if needed because of >= above */
2141 if (wlen < len) 2158 if (wlen < len)
2142 ::swap (wlen, len); 2159 ::swap (wlen, len);
2143 2160
2161 XGCValues gcv;
2162
2163 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2144 XCopyArea (display->display, vt, vt, 2164 XCopyArea (dpy, vt, vt,
2145 gc, 0, Row2Pixel (len + i), 2165 gc, 0, Row2Pixel (len + i),
2146 (unsigned int)this->width, 2166 (unsigned int)this->width,
2147 (unsigned int)Height2Pixel (wlen - len + 1), 2167 (unsigned int)Height2Pixel (wlen - len + 1),
2148 0, Row2Pixel (len)); 2168 0, Row2Pixel (len));
2169 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2170
2149 len = -1; 2171 len = -1;
2150 } 2172 }
2151 } 2173 }
2152 } 2174 }
2153#endif 2175#endif
… …
2155 /* 2177 /*
2156 * E: main pass across every character 2178 * E: main pass across every character
2157 */ 2179 */
2158 for (row = 0; row < nrow; row++) 2180 for (row = 0; row < nrow; row++)
2159 { 2181 {
2160 text_t *stp = ROW(row - view_start).t; 2182 text_t *stp = ROW(view_start + row).t;
2161 rend_t *srp = ROW(row - view_start).r; 2183 rend_t *srp = ROW(view_start + row).r;
2162 text_t *dtp = drawn_buf[row].t; 2184 text_t *dtp = drawn_buf[row].t;
2163 rend_t *drp = drawn_buf[row].r; 2185 rend_t *drp = drawn_buf[row].r;
2164 2186
2165 /* 2187 /*
2166 * E2: OK, now the real pass 2188 * E2: OK, now the real pass
… …
2209 count++; 2231 count++;
2210 2232
2211 if (stp[col] != dtp[col] 2233 if (stp[col] != dtp[col]
2212 || !RS_SAME (srp[col], drp[col])) 2234 || !RS_SAME (srp[col], drp[col]))
2213 { 2235 {
2214 if (must_clear && (i++ > count / 2)) 2236 if (have_bg && (i++ > count / 2))
2215 break; 2237 break;
2216 2238
2217 dtp[col] = stp[col]; 2239 dtp[col] = stp[col];
2218 drp[col] = rend; 2240 drp[col] = rend;
2219 i = 0; 2241 i = 0;
2220 } 2242 }
2221 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2243 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2222 break; 2244 break;
2223 } 2245 }
2224 2246
2225 col--; /* went one too far. move back */ 2247 col--; /* went one too far. move back */
2226 count -= i; /* dump any matching trailing chars */ 2248 count -= i; /* dump any matching trailing chars */
… …
2236 int back = bgcolor_of (rend); // desired background 2258 int back = bgcolor_of (rend); // desired background
2237 2259
2238 // only do special processing if any attributes are set, which is unlikely 2260 // only do special processing if any attributes are set, which is unlikely
2239 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2261 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2240 { 2262 {
2241#if ENABLE_STYLES
2242 // force redraw after "careful" characters to avoid pixel droppings
2243 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2244 drp[col + 1] = ~srp[col + 1];
2245
2246 // include previous careful character(s) if possible, looks nicer (best effort...)
2247 while (text > stp
2248 && srp[text - stp - 1] & RS_Careful
2249 && RS_SAME (rend, srp[text - stp - 1]))
2250 text--, count++, xpixel -= fwidth;
2251#endif
2252
2253 bool invert = rend & RS_RVid; 2263 bool invert = rend & RS_RVid;
2254 2264
2255#ifndef NO_BOLD_UNDERLINE_REVERSE 2265#ifndef NO_BOLD_UNDERLINE_REVERSE
2256 if (rend & RS_Bold 2266 if (rend & RS_Bold
2257 && fore == Color_fg) 2267 && fore == Color_fg)
… …
2273 else 2283 else
2274 invert = !invert; 2284 invert = !invert;
2275# endif 2285# endif
2276 } 2286 }
2277 2287
2278 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2288 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2279 fore = Color_UL; 2289 fore = Color_UL;
2280#endif 2290#endif
2281 2291
2282 if (invert) 2292 if (invert)
2283 { 2293 {
2294#ifdef OPTION_HC
2295 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2296 || !ISSET_PIXCOLOR (Color_HC))
2297#endif
2298 /* invert the column if no highlightColor is set or it is the
2299 * current cursor column */
2284 ::swap (fore, back); 2300 ::swap (fore, back);
2301#ifdef OPTION_HC
2302 else if (ISSET_PIXCOLOR (Color_HC))
2303 back = Color_HC;
2304#endif
2285 2305
2286#ifndef NO_BOLD_UNDERLINE_REVERSE 2306#ifndef NO_BOLD_UNDERLINE_REVERSE
2307# ifndef OPTION_HC
2287 if (ISSET_PIXCOLOR (Color_RV)) 2308 if (ISSET_PIXCOLOR (Color_RV))
2288 back = Color_RV; 2309 back = Color_RV;
2289 2310# endif
2290 if (fore == back) 2311 if (fore == back)
2291 { 2312 {
2292 fore = Color_bg; 2313 fore = Color_bg;
2293 back = Color_fg; 2314 back = Color_fg;
2294 } 2315 }
… …
2305 } 2326 }
2306 else if (hidden_text) 2327 else if (hidden_text)
2307 fore = back; 2328 fore = back;
2308 } 2329 }
2309#endif 2330#endif
2331
2332#if ENABLE_STYLES
2333 // "careful" (too wide) character handling
2334
2335 // include previous careful character(s) if possible, looks nicer (best effort...)
2336 while (text > stp
2337 && srp[text - stp - 1] & RS_Careful
2338 && RS_SAME (rend, srp[text - stp - 1]))
2339 text--, count++, xpixel -= fwidth;
2340
2341 // force redraw after "careful" characters to avoid pixel droppings
2342 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2343 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2344
2345 // force redraw before "careful" characters to avoid pixel droppings
2346 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2347 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2348#endif
2310 } 2349 }
2311 2350
2312 /* 2351 /*
2313 * Actually do the drawing of the string here 2352 * Actually do the drawing of the string here
2314 */ 2353 */
2315 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2354 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2316 2355
2317 if (back == fore)
2318 font->clear_rect (*drawable, xpixel, ypixel,
2319 fwidth * count, fheight,
2320 back);
2321 else if (back == Color_bg) 2356 if (have_bg && back == Color_bg)
2322 { 2357 {
2323 if (must_clear) 2358 // this is very ugly, maybe push it into ->draw?
2324 {
2325 CLEAR_CHARS (xpixel, ypixel, count);
2326 2359
2327 for (i = 0; i < count; i++) /* don't draw empty strings */ 2360 for (i = 0; i < count; i++) /* don't draw empty strings */
2328 if (text[i] != ' ') 2361 if (text[i] != ' ')
2329 { 2362 {
2330 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2363 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2331 break; 2364 goto did_clear;
2332 }
2333 } 2365 }
2334 else 2366
2335 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2367 CLEAR_CHARS (xpixel, ypixel, count);
2368 did_clear: ;
2336 } 2369 }
2337 else 2370 else
2338 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2371 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2339 2372
2340 if (rend & RS_Uline && font->descent > 1 && fore != back) 2373 if (rend & RS_Uline && font->descent > 1 && fore != back)
2341 { 2374 {
2342#if ENABLE_FRILLS 2375#if ENABLE_FRILLS
2343 if (ISSET_PIXCOLOR (Color_underline)) 2376 if (ISSET_PIXCOLOR (Color_underline))
2344 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2377 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2345 else 2378 else
2346#endif 2379#endif
2347 XSetForeground (display->display, gc, pix_colors[fore]); 2380 XSetForeground (dpy, gc, pix_colors[fore]);
2348 2381
2349 XDrawLine (display->display, drawBuffer, gc, 2382 XDrawLine (dpy, drawBuffer, gc,
2350 xpixel, ypixel + font->ascent + 1, 2383 xpixel, ypixel + font->ascent + 1,
2351 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2384 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2352 } 2385 }
2353 } /* for (col....) */ 2386 } /* for (col....) */
2354 } /* for (row....) */ 2387 } /* for (row....) */
… …
2363 */ 2396 */
2364 if (showcursor) 2397 if (showcursor)
2365 { 2398 {
2366 if (focus) 2399 if (focus)
2367 { 2400 {
2368 if (OPTION (Opt_cursorUnderline)) 2401 if (option (Opt_cursorUnderline))
2369 *crp ^= RS_Uline; 2402 *crp ^= RS_Uline;
2370 else 2403 else
2371 { 2404 {
2372 *crp ^= RS_RVid; 2405 *crp ^= RS_RVid;
2373#ifndef NO_CURSORCOLOR 2406#ifndef NO_CURSORCOLOR
… …
2387 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2420 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2388 cursorwidth++; 2421 cursorwidth++;
2389 2422
2390#ifndef NO_CURSORCOLOR 2423#ifndef NO_CURSORCOLOR
2391 if (ISSET_PIXCOLOR (Color_cursor)) 2424 if (ISSET_PIXCOLOR (Color_cursor))
2392 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2425 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2426 else
2393#endif 2427#endif
2428 XSetForeground (dpy, gc, pix_colors[ccol1]);
2394 2429
2395 XDrawRectangle (display->display, drawBuffer, gc, 2430 XDrawRectangle (dpy, drawBuffer, gc,
2396 Col2Pixel (col), 2431 Col2Pixel (col),
2397 Row2Pixel (oldcursor.row), 2432 Row2Pixel (oldcursor.row),
2398 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2433 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2399 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2434 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2400 } 2435 }
… …
2408 num_scr = 0; 2443 num_scr = 0;
2409 num_scr_allow = 1; 2444 num_scr_allow = 1;
2410} 2445}
2411 2446
2412void 2447void
2413rxvt_term::scr_remap_chars (line_t &l) 2448rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2414{ 2449{
2415 if (!l.t) 2450 if (!l.t)
2416 return; 2451 return;
2417 2452
2418 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2453 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2420 for (int i = ncol; i--; ) 2455 for (int i = ncol; i--; )
2421 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2456 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2422} 2457}
2423 2458
2424void 2459void
2425rxvt_term::scr_remap_chars () 2460rxvt_term::scr_remap_chars () NOTHROW
2426{ 2461{
2427 for (int i = total_rows; i--; ) 2462 for (int i = total_rows; i--; )
2428 scr_remap_chars (row_buf [i]); 2463 scr_remap_chars (row_buf [i]);
2429 2464
2430 for (int i = nrow; i--; ) 2465 for (int i = nrow; i--; )
… …
2433 scr_remap_chars (swap_buf [i]); 2468 scr_remap_chars (swap_buf [i]);
2434 } 2469 }
2435} 2470}
2436 2471
2437void 2472void
2438rxvt_term::scr_recolour () 2473rxvt_term::scr_recolour () NOTHROW
2439{ 2474{
2440 if (1 2475#ifdef HAVE_BG_PIXMAP
2441#if TRANSPARENT 2476 bgPixmap.apply ();
2442 && !am_transparent 2477#else
2443#endif
2444#if XPM_BACKGROUND
2445 && !bgPixmap.pixmap
2446#endif
2447 )
2448 {
2449 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2478 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2450 XClearWindow (display->display, parent[0]); 2479 XClearWindow (dpy, parent[0]);
2451 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2480 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2452#if HAVE_SCROLLBARS 2481# if HAVE_SCROLLBARS
2453 if (scrollBar.win) 2482 if (scrollBar.win)
2454 { 2483 {
2455 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2484 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2456 scrollBar.setIdle (); 2485 scrollBar.setIdle ();
2457 scrollbar_show (0); 2486 scrollbar_show (0);
2458 } 2487 }
2459#endif 2488# endif
2460 }
2461
2462 scr_clear (); 2489 scr_clear ();
2463 scr_touch (true); 2490 scr_touch (true);
2464 want_refresh = 1; 2491 want_refresh = 1;
2492#endif
2493
2465} 2494}
2466 2495
2467/* ------------------------------------------------------------------------- */ 2496/* ------------------------------------------------------------------------- */
2468void 2497void
2469rxvt_term::scr_clear (bool really) 2498rxvt_term::scr_clear (bool really) NOTHROW
2470{ 2499{
2471 if (!mapped) 2500 if (!mapped)
2472 return; 2501 return;
2473 2502
2474 num_scr_allow = 0; 2503 num_scr_allow = 0;
2475 want_refresh = 1; 2504 want_refresh = 1;
2476 2505
2477 if (really) 2506 if (really)
2478 XClearWindow (display->display, vt); 2507 XClearWindow (dpy, vt);
2479} 2508}
2480 2509
2481void 2510void
2482rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2511rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2483{ 2512{
2484 int view_end = -view_start + nrow; 2513 int view_end = view_start + nrow;
2485 int row, col; 2514 int row, col;
2486 2515
2487 for (row = max (beg_row, -view_start); row <= min (end_row, view_end); row++) 2516 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2488 { 2517 {
2489 text_t *stp = ROW(row).t; 2518 text_t *stp = ROW(row).t;
2490 rend_t *srp = ROW(row).r; 2519 rend_t *srp = ROW(row).r;
2491 2520
2492 for (col = beg_col; col < end_col; col++) 2521 for (col = beg_col; col < end_col; col++)
… …
2499 srp[col] ^= rstyle2; 2528 srp[col] ^= rstyle2;
2500 } 2529 }
2501} 2530}
2502 2531
2503void 2532void
2504rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2533rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2505{ 2534{
2506 int view_end = -view_start + nrow; 2535 int view_end = view_start + nrow;
2507 int row, col; 2536 int row, col;
2508 2537
2509 if (beg_row >= -view_start) 2538 if (beg_row >= view_start)
2510 { 2539 {
2511 col = beg_col; 2540 col = beg_col;
2512 row = beg_row; 2541 row = beg_row;
2513 } 2542 }
2514 else 2543 else
2515 { 2544 {
2516 col = 0; 2545 col = 0;
2517 row = -view_start; 2546 row = view_start;
2518 } 2547 }
2519 2548
2520 for (; row < min (end_row, view_end); row++, col = 0) 2549 for (; row < min (end_row, view_end); row++, col = 0)
2521 for (rend_t *srp = ROW(row).r; col < ncol; col++) 2550 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2522 srp[col] ^= rstyle; 2551 srp[col] ^= rstyle;
… …
2526 srp[col] ^= rstyle; 2555 srp[col] ^= rstyle;
2527} 2556}
2528 2557
2529/* ------------------------------------------------------------------------- */ 2558/* ------------------------------------------------------------------------- */
2530void 2559void
2531rxvt_term::scr_reverse_selection () 2560rxvt_term::scr_reverse_selection () NOTHROW
2532{ 2561{
2533 if (selection.op 2562 if (selection.op
2534 && current_screen == selection.screen 2563 && current_screen == selection.screen
2535 && selection.end.row >= -view_start) 2564 && selection.end.row >= view_start)
2536 { 2565 {
2537#if ENABLE_FRILLS 2566#if !ENABLE_MINIMAL
2538 if (selection.rect) 2567 if (selection.rect)
2539 scr_xor_rect (selection.beg.row, selection.beg.col, 2568 scr_xor_rect (selection.beg.row, selection.beg.col,
2540 selection.end.row, selection.end.col, 2569 selection.end.row, selection.end.col,
2541 RS_RVid, RS_RVid | RS_Uline); 2570 RS_RVid, RS_RVid | RS_Uline);
2542 else 2571 else
… …
2552 * Dump the whole scrollback and screen to the passed filedescriptor. The 2581 * Dump the whole scrollback and screen to the passed filedescriptor. The
2553 * invoking routine must close the fd. 2582 * invoking routine must close the fd.
2554 */ 2583 */
2555#if 0 2584#if 0
2556void 2585void
2557rxvt_term::scr_dump (int fd) 2586rxvt_term::scr_dump (int fd) NOTHROW
2558{ 2587{
2559 int row, wrote; 2588 int row, wrote;
2560 unsigned int width, towrite; 2589 unsigned int width, towrite;
2561 char r1[] = "\n"; 2590 char r1[] = "\n";
2562 2591
… …
2581 2610
2582/* ------------------------------------------------------------------------- * 2611/* ------------------------------------------------------------------------- *
2583 * CHARACTER SELECTION * 2612 * CHARACTER SELECTION *
2584 * ------------------------------------------------------------------------- */ 2613 * ------------------------------------------------------------------------- */
2585void 2614void
2586rxvt_term::selection_check (int check_more) 2615rxvt_term::selection_check (int check_more) NOTHROW
2587{ 2616{
2588 row_col_t pos; 2617 row_col_t pos;
2589 2618
2590 if (!selection.op) 2619 if (!selection.op)
2591 return; 2620 return;
2592 2621
2593 pos.row = pos.col = 0; 2622 pos.row = pos.col = 0;
2594 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2623 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2595 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2624 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2596 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2625 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2597 || (check_more == 1 2626 || (check_more == 1
2598 && current_screen == selection.screen 2627 && current_screen == selection.screen
2599 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2628 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2600 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2629 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2601 || (check_more == 2 2630 || (check_more == 2
… …
2612/* ------------------------------------------------------------------------- */ 2641/* ------------------------------------------------------------------------- */
2613/* 2642/*
2614 * Paste a selection direct to the command fd 2643 * Paste a selection direct to the command fd
2615 */ 2644 */
2616void 2645void
2617rxvt_term::paste (char *data, unsigned int len) 2646rxvt_term::paste (char *data, unsigned int len) NOTHROW
2618{ 2647{
2619 /* convert normal newline chars into common keyboard Return key sequence */ 2648 /* convert normal newline chars into common keyboard Return key sequence */
2620 for (unsigned int i = 0; i < len; i++) 2649 for (unsigned int i = 0; i < len; i++)
2621 if (data[i] == C0_LF) 2650 if (data[i] == C0_LF)
2622 data[i] = C0_CR; 2651 data[i] = C0_CR;
… …
2628/* 2657/*
2629 * Respond to a notification that a primary selection has been sent 2658 * Respond to a notification that a primary selection has been sent
2630 * EXT: SelectionNotify 2659 * EXT: SelectionNotify
2631 */ 2660 */
2632void 2661void
2633rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2662rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2634{ 2663{
2635 if (prop == None) /* check for failed XConvertSelection */ 2664 if (prop == None) /* check for failed XConvertSelection */
2636 { 2665 {
2637 if ((selection_type & Sel_CompoundText)) 2666 if ((selection_type & Sel_CompoundText))
2638 { 2667 {
… …
2658 } 2687 }
2659 2688
2660 unsigned long bytes_after; 2689 unsigned long bytes_after;
2661 XTextProperty ct; 2690 XTextProperty ct;
2662 2691
2663 if (XGetWindowProperty (display->display, win, prop, 2692 if (XGetWindowProperty (dpy, win, prop,
2664 0, PROP_SIZE / 4, 2693 0, PROP_SIZE / 4,
2665 delete_prop, AnyPropertyType, 2694 delete_prop, AnyPropertyType,
2666 &ct.encoding, &ct.format, 2695 &ct.encoding, &ct.format,
2667 &ct.nitems, &bytes_after, 2696 &ct.nitems, &bytes_after,
2668 &ct.value) != Success) 2697 &ct.value) != Success)
… …
2677 if (bytes_after) 2706 if (bytes_after)
2678 { 2707 {
2679 // fetch and append remaining data 2708 // fetch and append remaining data
2680 XTextProperty ct2; 2709 XTextProperty ct2;
2681 2710
2682 if (XGetWindowProperty (display->display, win, prop, 2711 if (XGetWindowProperty (dpy, win, prop,
2683 ct.nitems / 4, (bytes_after + 3) / 4, 2712 ct.nitems / 4, (bytes_after + 3) / 4,
2684 delete_prop, AnyPropertyType, 2713 delete_prop, AnyPropertyType,
2685 &ct2.encoding, &ct2.format, 2714 &ct2.encoding, &ct2.format,
2686 &ct2.nitems, &bytes_after, 2715 &ct2.nitems, &bytes_after,
2687 &ct2.value) != Success) 2716 &ct2.value) != Success)
… …
2700 2729
2701 if (ct.encoding == xa[XA_INCR]) 2730 if (ct.encoding == xa[XA_INCR])
2702 { 2731 {
2703 // INCR selection, start handshake 2732 // INCR selection, start handshake
2704 if (!delete_prop) 2733 if (!delete_prop)
2705 XDeleteProperty (display->display, win, prop); 2734 XDeleteProperty (dpy, win, prop);
2706 2735
2707 selection_wait = Sel_incr; 2736 selection_wait = Sel_incr;
2708 incr_buf_fill = 0; 2737 incr_buf_fill = 0;
2709 incr_ev.start (NOW + 10); 2738 incr_ev.start (NOW + 10);
2710 2739
… …
2757 } 2786 }
2758 2787
2759 char **cl; 2788 char **cl;
2760 int cr; 2789 int cr;
2761 2790
2762#if ENABLE_FRILLS 2791#if !ENABLE_MINIMAL
2763 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2792 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2764 // so recode it manually 2793 // so recode it manually
2765 if (ct.encoding == xa[XA_UTF8_STRING]) 2794 if (ct.encoding == xa[XA_UTF8_STRING])
2766 { 2795 {
2767 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2796 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2771 paste (s, strlen (s)); 2800 paste (s, strlen (s));
2772 free (s); 2801 free (s);
2773 } 2802 }
2774 else 2803 else
2775#endif 2804#endif
2776 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2805 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2777 && cl) 2806 && cl)
2778 { 2807 {
2779 for (int i = 0; i < cr; i++) 2808 for (int i = 0; i < cr; i++)
2780 paste (cl[i], strlen (cl[i])); 2809 paste (cl[i], strlen (cl[i]));
2781 2810
… …
2790 if (selection_wait == Sel_normal) 2819 if (selection_wait == Sel_normal)
2791 selection_wait = Sel_none; 2820 selection_wait = Sel_none;
2792} 2821}
2793 2822
2794void 2823void
2795rxvt_term::incr_cb (time_watcher &w) 2824rxvt_term::incr_cb (time_watcher &w) NOTHROW
2796{ 2825{
2797 selection_wait = Sel_none; 2826 selection_wait = Sel_none;
2798 2827
2799 incr_buf_size = 0; 2828 incr_buf_size = 0;
2800 free (incr_buf); 2829 free (incr_buf);
2801 2830
2802 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2831 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2803} 2832}
2804 2833
2805void 2834void
2806rxvt_term::selection_property (Window win, Atom prop) 2835rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2807{ 2836{
2808 if (prop == None || selection_wait != Sel_incr) 2837 if (prop == None || selection_wait != Sel_incr)
2809 return; 2838 return;
2810 2839
2811 selection_paste (win, prop, true); 2840 selection_paste (win, prop, true);
… …
2820 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2849 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2821 * will auto fallback to CUT_BUFFER0 2850 * will auto fallback to CUT_BUFFER0
2822 * EXT: button 2 release 2851 * EXT: button 2 release
2823 */ 2852 */
2824void 2853void
2825rxvt_term::selection_request (Time tm, int x, int y) 2854rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2826{ 2855{
2827 if (x < 0 || x >= width || y < 0 || y >= height) 2856 if (selection.text && selnum == Sel_Primary)
2828 return; /* outside window */
2829
2830 if (selection.text)
2831 { /* internal selection */ 2857 { /* internal selection */
2832 char *str = rxvt_wcstombs (selection.text, selection.len); 2858 char *str = rxvt_wcstombs (selection.text, selection.len);
2833 paste (str, strlen (str)); 2859 paste (str, strlen (str));
2834 free (str); 2860 free (str);
2835 return; 2861 return;
2836 } 2862 }
2837 else 2863 else
2838 { 2864 {
2839 int i;
2840
2841 selection_request_time = tm; 2865 selection_request_time = tm;
2842 selection_wait = Sel_normal; 2866 selection_wait = Sel_normal;
2843 2867
2844 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2845 {
2846#if X_HAVE_UTF8_STRING 2868#if X_HAVE_UTF8_STRING
2847 selection_type = Sel_UTF8String; 2869 selection_type = Sel_UTF8String;
2848 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2870 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2849 return; 2871 return;
2850#else 2872#else
2851 selection_type = Sel_CompoundText; 2873 selection_type = Sel_CompoundText;
2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2874 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2853 return; 2875 return;
2854#endif 2876#endif
2855 }
2856 } 2877 }
2857 2878
2858 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2879 selection_wait = Sel_none; /* don't loop in selection_paste () */
2859 selection_paste (display->root, XA_CUT_BUFFER0, false); 2880 selection_paste (display->root, XA_CUT_BUFFER0, false);
2860} 2881}
2861 2882
2862int 2883int
2863rxvt_term::selection_request_other (Atom target, int selnum) 2884rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2864{ 2885{
2865 Atom sel; 2886 Atom sel;
2866 2887
2867 selection_type |= selnum; 2888 selection_type |= selnum;
2868 2889
… …
2871 else if (selnum == Sel_Secondary) 2892 else if (selnum == Sel_Secondary)
2872 sel = XA_SECONDARY; 2893 sel = XA_SECONDARY;
2873 else 2894 else
2874 sel = xa[XA_CLIPBOARD]; 2895 sel = xa[XA_CLIPBOARD];
2875 2896
2876 if (XGetSelectionOwner (display->display, sel) != None) 2897 if (XGetSelectionOwner (dpy, sel) != None)
2877 { 2898 {
2878 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2899 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2879 vt, selection_request_time); 2900 vt, selection_request_time);
2880 return 1; 2901 return 1;
2881 } 2902 }
2882 2903
2883 return 0; 2904 return 0;
… …
2887/* 2908/*
2888 * Clear all selected text 2909 * Clear all selected text
2889 * EXT: SelectionClear 2910 * EXT: SelectionClear
2890 */ 2911 */
2891void 2912void
2892rxvt_term::selection_clear () 2913rxvt_term::selection_clear () NOTHROW
2893{ 2914{
2894 want_refresh = 1; 2915 want_refresh = 1;
2895 free (selection.text); 2916 free (selection.text);
2896 selection.text = NULL; 2917 selection.text = NULL;
2897 selection.len = 0; 2918 selection.len = 0;
… …
2946 2967
2947 int end_col; 2968 int end_col;
2948 2969
2949 for (; row <= selection.end.row; row++, col = 0) 2970 for (; row <= selection.end.row; row++, col = 0)
2950 { 2971 {
2951#if ENABLE_FRILLS 2972#if !ENABLE_MINIMAL
2952 if (selection.rect) 2973 if (selection.rect)
2953 { 2974 {
2954 col = selection.beg.col; 2975 col = selection.beg.col;
2955 end_col = ncol + 1; 2976 end_col = ncol + 1;
2956 } 2977 }
… …
2959 end_col = ROW(row).l; 2980 end_col = ROW(row).l;
2960 2981
2961 col = max (col, 0); 2982 col = max (col, 0);
2962 2983
2963 if (row == selection.end.row 2984 if (row == selection.end.row
2964#if ENABLE_FRILLS 2985#if !ENABLE_MINIMAL
2965 || selection.rect 2986 || selection.rect
2966#endif 2987#endif
2967 ) 2988 )
2968 min_it (end_col, selection.end.col); 2989 min_it (end_col, selection.end.col);
2969 2990
… …
2992#endif 3013#endif
2993 else 3014 else
2994 new_selection_text[ofs++] = *t++; 3015 new_selection_text[ofs++] = *t++;
2995 } 3016 }
2996 3017
2997#if ENABLE_FRILLS 3018#if !ENABLE_MINIMAL
2998 if (selection.rect) 3019 if (selection.rect)
2999 { 3020 {
3000 while (ofs 3021 while (ofs
3001 && new_selection_text[ofs - 1] != C0_LF 3022 && new_selection_text[ofs - 1] != C0_LF
3002 && unicode::is_space (new_selection_text[ofs - 1])) 3023 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3032 3053
3033 selection_grab (tm); 3054 selection_grab (tm);
3034} 3055}
3035 3056
3036bool 3057bool
3037rxvt_term::selection_grab (Time tm) 3058rxvt_term::selection_grab (Time tm) NOTHROW
3038{ 3059{
3039 selection_time = tm; 3060 selection_time = tm;
3040 3061
3041 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3062 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3042 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3063 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3043 { 3064 {
3044 display->set_selection_owner (this); 3065 display->set_selection_owner (this);
3045 return true; 3066 return true;
3046 } 3067 }
3047 else 3068 else
… …
3051 } 3072 }
3052 3073
3053#if 0 3074#if 0
3054 XTextProperty ct; 3075 XTextProperty ct;
3055 3076
3056 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3077 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3057 { 3078 {
3058 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3079 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3059 XFree (ct.value); 3080 XFree (ct.value);
3060 } 3081 }
3061#endif 3082#endif
… …
3065/* 3086/*
3066 * Mark or select text based upon number of clicks: 1, 2, or 3 3087 * Mark or select text based upon number of clicks: 1, 2, or 3
3067 * EXT: button 1 press 3088 * EXT: button 1 press
3068 */ 3089 */
3069void 3090void
3070rxvt_term::selection_click (int clicks, int x, int y) 3091rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3071{ 3092{
3072 clicks = ((clicks - 1) % 3) + 1; 3093 clicks = ((clicks - 1) % 3) + 1;
3073 selection.clicks = clicks; /* save clicks so extend will work */ 3094 selection.clicks = clicks; /* save clicks so extend will work */
3074 3095
3075 if (clicks == 2 && !selection.rect 3096 if (clicks == 2 && !selection.rect
… …
3083 3104
3084 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3105 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3085 3106
3086 if (clicks == 2 || clicks == 3) 3107 if (clicks == 2 || clicks == 3)
3087 selection_extend_colrow (selection.mark.col, 3108 selection_extend_colrow (selection.mark.col,
3088 selection.mark.row + view_start, 3109 selection.mark.row - view_start,
3089 0, /* button 3 */ 3110 0, /* button 3 */
3090 1, /* button press */ 3111 1, /* button press */
3091 0); /* click change */ 3112 0); /* click change */
3092} 3113}
3093 3114
3094/* ------------------------------------------------------------------------- */ 3115/* ------------------------------------------------------------------------- */
3095/* 3116/*
3096 * Mark a selection at the specified col/row 3117 * Mark a selection at the specified col/row
3097 */ 3118 */
3098void 3119void
3099rxvt_term::selection_start_colrow (int col, int row) 3120rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3100{ 3121{
3101 want_refresh = 1; 3122 want_refresh = 1;
3102 3123
3103 selection.mark.row = row - view_start; 3124 selection.mark.row = row + view_start;
3104 selection.mark.col = col; 3125 selection.mark.col = col;
3105 3126
3106 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3127 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3107 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3128 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3108 3129
3109 while (selection.mark.col > 0 3130 while (selection.mark.col > 0
3110 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3131 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3111 --selection.mark.col; 3132 --selection.mark.col;
… …
3130#define DELIMIT_TEXT(x) \ 3151#define DELIMIT_TEXT(x) \
3131 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3152 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3132#define DELIMIT_REND(x) 1 3153#define DELIMIT_REND(x) 1
3133 3154
3134void 3155void
3135rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3156rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3136{ 3157{
3137 int col, row, dirnadd, tcol, trow, w1, w2; 3158 int col, row, dirnadd, tcol, trow, w1, w2;
3138 row_col_t bound; 3159 row_col_t bound;
3139 text_t *stp; 3160 text_t *stp;
3140 rend_t *srp; 3161 rend_t *srp;
3141 3162
3142 if (dirn == UP) 3163 if (dirn == UP)
3143 { 3164 {
3144 bound.row = - nsaved - 1; 3165 bound.row = top_row - 1;
3145 bound.col = 0; 3166 bound.col = 0;
3146 dirnadd = -1; 3167 dirnadd = -1;
3147 } 3168 }
3148 else 3169 else
3149 { 3170 {
… …
3214 * flag == 0 ==> button 1 3235 * flag == 0 ==> button 1
3215 * flag == 1 ==> button 3 press 3236 * flag == 1 ==> button 3 press
3216 * flag == 2 ==> button 3 motion 3237 * flag == 2 ==> button 3 motion
3217 */ 3238 */
3218void 3239void
3219rxvt_term::selection_extend (int x, int y, int flag) 3240rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3220{ 3241{
3221 int col = clamp (Pixel2Col (x), 0, ncol); 3242 int col = clamp (Pixel2Col (x), 0, ncol);
3222 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3243 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3223 3244
3224 /* 3245 /*
… …
3227 * select nothing. Otherwise, if we're to the right of the mark, you have to 3248 * select nothing. Otherwise, if we're to the right of the mark, you have to
3228 * be _past_ a character for it to be selected. 3249 * be _past_ a character for it to be selected.
3229 */ 3250 */
3230 if (((selection.clicks % 3) == 1) && !flag 3251 if (((selection.clicks % 3) == 1) && !flag
3231 && (col == selection.mark.col 3252 && (col == selection.mark.col
3232 && (row == selection.mark.row + view_start))) 3253 && (row == selection.mark.row - view_start)))
3233 { 3254 {
3234 /* select nothing */ 3255 /* select nothing */
3235 selection.beg.row = selection.end.row = 0; 3256 selection.beg.row = selection.end.row = 0;
3236 selection.beg.col = selection.end.col = 0; 3257 selection.beg.col = selection.end.col = 0;
3237 selection.clicks = 4; 3258 selection.clicks = 4;
… …
3250/* ------------------------------------------------------------------------- */ 3271/* ------------------------------------------------------------------------- */
3251/* 3272/*
3252 * Extend the selection to the specified col/row 3273 * Extend the selection to the specified col/row
3253 */ 3274 */
3254void 3275void
3255rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3276rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3256{ 3277{
3257 row_col_t pos; 3278 row_col_t pos;
3258 enum { 3279 enum {
3259 LEFT, RIGHT 3280 LEFT, RIGHT
3260 } closeto = RIGHT; 3281 } closeto = RIGHT;
… …
3292 selection.beg.col = selection.end.col = selection.mark.col; 3313 selection.beg.col = selection.end.col = selection.mark.col;
3293 selection.beg.row = selection.end.row = selection.mark.row; 3314 selection.beg.row = selection.end.row = selection.mark.row;
3294 } 3315 }
3295 3316
3296 pos.col = col; 3317 pos.col = col;
3297 pos.row = row - view_start; 3318 pos.row = view_start + row;
3298 3319
3299 /* 3320 /*
3300 * This is mainly xterm style selection with a couple of differences, mainly 3321 * This is mainly xterm style selection with a couple of differences, mainly
3301 * in the way button3 drag extension works. 3322 * in the way button3 drag extension works.
3302 * We're either doing: button1 drag; button3 press; or button3 drag 3323 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3363 3384
3364 if (selection.clicks == 1) 3385 if (selection.clicks == 1)
3365 { 3386 {
3366 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3387 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3367 && !ROW(selection.beg.row).is_longer () 3388 && !ROW(selection.beg.row).is_longer ()
3368#if ENABLE_FRILLS 3389#if !ENABLE_MINIMAL
3369 && !selection.rect 3390 && !selection.rect
3370#endif 3391#endif
3371 ) 3392 )
3372 selection.beg.col = ncol; 3393 selection.beg.col = ncol;
3373 3394
3374 if ( 3395 if (
3375 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3396 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3376 && !ROW(selection.end.row).is_longer () 3397 && !ROW(selection.end.row).is_longer ()
3377#if ENABLE_FRILLS 3398#if !ENABLE_MINIMAL
3378 && !selection.rect 3399 && !selection.rect
3379#endif 3400#endif
3380 ) 3401 )
3381 selection.end.col = ncol; 3402 selection.end.col = ncol;
3382 } 3403 }
… …
3389 selection_delimit_word (DN, &selection.end, &selection.end); 3410 selection_delimit_word (DN, &selection.end, &selection.end);
3390 } 3411 }
3391 else if (selection.clicks == 3) 3412 else if (selection.clicks == 3)
3392 { 3413 {
3393#if ENABLE_FRILLS 3414#if ENABLE_FRILLS
3394 if (OPTION (Opt_tripleclickwords)) 3415 if (option (Opt_tripleclickwords))
3395 { 3416 {
3396 selection_delimit_word (UP, &selection.beg, &selection.beg); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3397 3418
3398 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3419 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3399 { 3420 {
3400 if (!ROW(end_row).is_longer ()) 3421 if (!ROW(end_row).is_longer ())
3401 { 3422 {
3402 selection.end.row = end_row; 3423 selection.end.row = end_row;
3403 selection.end.col = ROW(end_row).l; 3424 selection.end.col = ROW(end_row).l;
3425# if !ENABLE_MINIMAL
3404 selection_remove_trailing_spaces (); 3426 selection_remove_trailing_spaces ();
3427# endif
3405 break; 3428 break;
3406 } 3429 }
3407 } 3430 }
3408 } 3431 }
3409 else 3432 else
… …
3438 selection.mark.row = selection.beg.row; 3461 selection.mark.row = selection.beg.row;
3439 selection.mark.col = selection.beg.col; 3462 selection.mark.col = selection.beg.col;
3440 } 3463 }
3441 } 3464 }
3442 3465
3443#if ENABLE_FRILLS 3466#if !ENABLE_MINIMAL
3444 if (selection.rect && selection.beg.col > selection.end.col) 3467 if (selection.rect && selection.beg.col > selection.end.col)
3445 ::swap (selection.beg.col, selection.end.col); 3468 ::swap (selection.beg.col, selection.end.col);
3446#endif 3469#endif
3447} 3470}
3448 3471
3449#if ENABLE_FRILLS 3472#if !ENABLE_MINIMAL
3450void 3473void
3451rxvt_term::selection_remove_trailing_spaces () 3474rxvt_term::selection_remove_trailing_spaces () NOTHROW
3452{ 3475{
3453 int32_t end_col, end_row; 3476 int32_t end_col, end_row;
3454 text_t *stp; 3477 text_t *stp;
3455 3478
3456 end_col = selection.end.col; 3479 end_col = selection.end.col;
… …
3494/* 3517/*
3495 * Double click on button 3 when already selected 3518 * Double click on button 3 when already selected
3496 * EXT: button 3 double click 3519 * EXT: button 3 double click
3497 */ 3520 */
3498void 3521void
3499rxvt_term::selection_rotate (int x, int y) 3522rxvt_term::selection_rotate (int x, int y) NOTHROW
3500{ 3523{
3501 selection.clicks = selection.clicks % 3 + 1; 3524 selection.clicks = selection.clicks % 3 + 1;
3502 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3525 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3503} 3526}
3504 3527
… …
3506/* 3529/*
3507 * Respond to a request for our current selection 3530 * Respond to a request for our current selection
3508 * EXT: SelectionRequest 3531 * EXT: SelectionRequest
3509 */ 3532 */
3510void 3533void
3511rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3534rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3512{ 3535{
3513 XSelectionEvent ev; 3536 XSelectionEvent ev;
3514 dDisp;
3515 3537
3516 ev.type = SelectionNotify; 3538 ev.type = SelectionNotify;
3517 ev.property = None; 3539 ev.property = None;
3518 ev.display = rq.display; 3540 ev.display = rq.display;
3519 ev.requestor = rq.requestor; 3541 ev.requestor = rq.requestor;
… …
3533 *target++ = xa[XA_COMPOUND_TEXT]; 3555 *target++ = xa[XA_COMPOUND_TEXT];
3534#if X_HAVE_UTF8_STRING 3556#if X_HAVE_UTF8_STRING
3535 *target++ = xa[XA_UTF8_STRING]; 3557 *target++ = xa[XA_UTF8_STRING];
3536#endif 3558#endif
3537 3559
3538 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3560 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3539 32, PropModeReplace, 3561 32, PropModeReplace,
3540 (unsigned char *)target_list, target - target_list); 3562 (unsigned char *)target_list, target - target_list);
3541 ev.property = rq.property; 3563 ev.property = rq.property;
3542 } 3564 }
3543#if TODO // TODO 3565#if TODO // TODO
… …
3546 /* TODO: Handle MULTIPLE */ 3568 /* TODO: Handle MULTIPLE */
3547 } 3569 }
3548#endif 3570#endif
3549 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3571 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3550 { 3572 {
3551 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3573 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3552 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3574 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3553 ev.property = rq.property; 3575 ev.property = rq.property;
3554 } 3576 }
3555 else if (rq.target == XA_STRING 3577 else if (rq.target == XA_STRING
3556 || rq.target == xa[XA_TEXT] 3578 || rq.target == xa[XA_TEXT]
… …
3580 style = enc_string; 3602 style = enc_string;
3581 else if (target == xa[XA_TEXT]) 3603 else if (target == xa[XA_TEXT])
3582 style = enc_text; 3604 style = enc_text;
3583 else if (target == xa[XA_COMPOUND_TEXT]) 3605 else if (target == xa[XA_COMPOUND_TEXT])
3584 style = enc_compound_text; 3606 style = enc_compound_text;
3585#if ENABLE_FRILLS 3607#if !ENABLE_MINIMAL
3586 else if (target == xa[XA_UTF8_STRING]) 3608 else if (target == xa[XA_UTF8_STRING])
3587 style = enc_utf8; 3609 style = enc_utf8;
3588#endif 3610#endif
3589 else 3611 else
3590 { 3612 {
… …
3601 { 3623 {
3602 cl = L""; 3624 cl = L"";
3603 selectlen = 0; 3625 selectlen = 0;
3604 } 3626 }
3605 3627
3606#if ENABLE_FRILLS 3628#if !ENABLE_MINIMAL
3607 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3629 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3608 // so recode it manually 3630 // so recode it manually
3609 if (style == enc_utf8) 3631 if (style == enc_utf8)
3610 { 3632 {
3611 freect = 1; 3633 freect = 1;
… …
3614 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3636 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3615 ct.nitems = strlen ((char *)ct.value); 3637 ct.nitems = strlen ((char *)ct.value);
3616 } 3638 }
3617 else 3639 else
3618#endif 3640#endif
3619 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3641 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3620 freect = 1; 3642 freect = 1;
3621 else 3643 else
3622 { 3644 {
3623 /* if we failed to convert then send it raw */ 3645 /* if we failed to convert then send it raw */
3624 ct.value = (unsigned char *)cl; 3646 ct.value = (unsigned char *)cl;
3625 ct.nitems = selectlen; 3647 ct.nitems = selectlen;
3626 ct.encoding = target; 3648 ct.encoding = target;
3627 } 3649 }
3628 3650
3629 XChangeProperty (disp, rq.requestor, rq.property, 3651 XChangeProperty (dpy, rq.requestor, rq.property,
3630 ct.encoding, 8, PropModeReplace, 3652 ct.encoding, 8, PropModeReplace,
3631 ct.value, (int)ct.nitems); 3653 ct.value, (int)ct.nitems);
3632 ev.property = rq.property; 3654 ev.property = rq.property;
3633 3655
3634 if (freect) 3656 if (freect)
3635 XFree (ct.value); 3657 XFree (ct.value);
3636 } 3658 }
3637 3659
3638 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3660 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3639} 3661}
3640 3662
3641/* ------------------------------------------------------------------------- * 3663/* ------------------------------------------------------------------------- *
3642 * MOUSE ROUTINES * 3664 * MOUSE ROUTINES *
3643 * ------------------------------------------------------------------------- */ 3665 * ------------------------------------------------------------------------- */
3644 3666
3645/*
3646 * return col/row values corresponding to x/y pixel values
3647 */
3648void
3649rxvt_term::pixel_position (int *x, int *y)
3650{
3651 *x = Pixel2Col (*x);
3652 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3653 *y = Pixel2Row (*y);
3654 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3655}
3656
3657/* ------------------------------------------------------------------------- */ 3667/* ------------------------------------------------------------------------- */
3658#ifdef USE_XIM 3668#ifdef USE_XIM
3659void 3669void
3660rxvt_term::im_set_position (XPoint &pos) 3670rxvt_term::im_set_position (XPoint &pos) NOTHROW
3661{ 3671{
3662 XWindowAttributes xwa; 3672 XWindowAttributes xwa;
3663 3673
3664 XGetWindowAttributes (display->display, vt, &xwa); 3674 XGetWindowAttributes (dpy, vt, &xwa);
3665 3675
3666 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3676 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3667 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3677 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3668} 3678}
3669#endif 3679#endif
3670 3680
3671#if ENABLE_OVERLAY 3681#if ENABLE_OVERLAY
3672void 3682void
3673rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3683rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3674{ 3684{
3675 if (nrow < 1 || ncol < 1) 3685 if (nrow < 1 || ncol < 1)
3676 return; 3686 return;
3677 3687
3678 want_refresh = 1; 3688 want_refresh = 1;
… …
3723 *rp = r; 3733 *rp = r;
3724 } 3734 }
3725} 3735}
3726 3736
3727void 3737void
3728rxvt_term::scr_overlay_off () 3738rxvt_term::scr_overlay_off () NOTHROW
3729{ 3739{
3730 if (!ov_text) 3740 if (!ov_text)
3731 return; 3741 return;
3732 3742
3733 want_refresh = 1; 3743 want_refresh = 1;
… …
3741 delete [] ov_text; ov_text = 0; 3751 delete [] ov_text; ov_text = 0;
3742 delete [] ov_rend; ov_rend = 0; 3752 delete [] ov_rend; ov_rend = 0;
3743} 3753}
3744 3754
3745void 3755void
3746rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3756rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3747{ 3757{
3748 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3758 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3749 return; 3759 return;
3750 3760
3751 x++, y++; 3761 x++, y++;
… …
3753 ov_text[y][x] = text; 3763 ov_text[y][x] = text;
3754 ov_rend[y][x] = rend; 3764 ov_rend[y][x] = rend;
3755} 3765}
3756 3766
3757void 3767void
3758rxvt_term::scr_overlay_set (int x, int y, const char *s) 3768rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3759{ 3769{
3760 while (*s) 3770 while (*s)
3761 scr_overlay_set (x++, y, *s++); 3771 scr_overlay_set (x++, y, *s++);
3762} 3772}
3763 3773
3764void 3774void
3765rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3775rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3766{ 3776{
3767 while (*s) 3777 while (*s)
3768 { 3778 {
3769 text_t t = *s++; 3779 text_t t = *s++;
3770 int width = wcwidth (t); 3780 int width = WCWIDTH (t);
3771 3781
3772 while (width--) 3782 while (width--)
3773 { 3783 {
3774 scr_overlay_set (x++, y, t); 3784 scr_overlay_set (x++, y, t);
3775 t = NOCHAR; 3785 t = NOCHAR;
3776 } 3786 }
3777 } 3787 }
3778} 3788}
3779 3789
3780void 3790void
3781rxvt_term::scr_swap_overlay () 3791rxvt_term::scr_swap_overlay () NOTHROW
3782{ 3792{
3783 if (!ov_text) 3793 if (!ov_text)
3784 return; 3794 return;
3785 3795
3786 // swap screen mem with overlay 3796 // swap screen mem with overlay
3787 for (int y = ov_h; y--; ) 3797 for (int y = ov_h; y--; )
3788 { 3798 {
3789 text_t *t1 = ov_text[y]; 3799 text_t *t1 = ov_text[y];
3790 rend_t *r1 = ov_rend[y]; 3800 rend_t *r1 = ov_rend[y];
3791 3801
3792 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3802 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3793 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3803 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3794 3804
3795 for (int x = ov_w; x--; ) 3805 for (int x = ov_w; x--; )
3796 { 3806 {
3797 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3807 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3798 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3808 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