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.234 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 2008 UTC

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

Diff Legend

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