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.230 by root, Sun Jan 15 16:47:29 2006 UTC vs.
Revision 1.304 by ayin, Tue Feb 19 10:47:03 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) 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) 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 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
623
624 // scroll everything up 'count' lines 629 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
626 631
632 // sever bottommost line
627 { 633 {
628 // severe bottommost scrolled line
629 line_t &l = ROW(row2 - count); 634 line_t &l = ROW(row2 - count);
635 l.is_longer (0);
630 l.touch (); 636 l.touch ();
631 l.is_longer (0);
632 } 637 }
633 638
634 // erase newly scorlled-in lines 639 // erase newly scrolled-in lines
635 for (int i = count; i; --i ) 640 for (int i = count; i--; )
636 { 641 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - i); 642 line_t &l = ROW(nrow - 1 - i);
640 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 {
641 scr_blank_line (l, 0, l.l, rstyle); 648 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0; 649 l.l = 0;
644 l.f = 0; 650 l.f = 0;
651 }
652 else
653 scr_blank_screen_mem (l, rstyle);
645 } 654 }
646 655
647 // now copy lines below the scroll region bottom to the 656 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they 657 // bottom of the screen again, so they look as if they
649 // hadn't moved. 658 // hadn't moved.
… …
653 line_t &l2 = ROW(i); 662 line_t &l2 = ROW(i);
654 663
655 ::swap (l1, l2); 664 ::swap (l1, l2);
656 l2.touch (); 665 l2.touch ();
657 } 666 }
658 667
659 // move and/or clear selection, if any 668 // move and/or clear selection, if any
660 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
661 { 670 {
662 selection.beg.row -= count; 671 selection.beg.row -= count;
663 selection.end.row -= count; 672 selection.end.row -= count;
… …
671 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
672 } 681 }
673 } 682 }
674 683
675 // finally move the view window, if desired 684 // finally move the view window, if desired
676 if (OPTION (Opt_scrollWithBuffer) 685 if (option (Opt_scrollWithBuffer)
677 && view_start != 0 686 && view_start != 0
678 && view_start != -saveLines) 687 && view_start != -saveLines)
679 scr_page (UP, count); 688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
680 } 692 }
681 else 693 else
682 { 694 {
683 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen)
684 { 696 {
… …
696 { 708 {
697 /* move selected region too */ 709 /* move selected region too */
698 selection.beg.row -= count; 710 selection.beg.row -= count;
699 selection.end.row -= count; 711 selection.end.row -= count;
700 selection.mark.row -= count; 712 selection.mark.row -= count;
701 713
702 selection_check (0); 714 selection_check (0);
703 } 715 }
704 } 716 }
705 717
706 // use a simple and robust scrolling algorithm, this 718 // use a simple and robust scrolling algorithm, this
… …
730/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
731/* 743/*
732 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
733 */ 745 */
734void 746void
735rxvt_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
736{ 748{
737 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
738 return; 750 return;
739 751
740 unsigned char checksel; 752 unsigned char checksel;
… …
746 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
747 759
748 if (minlines > 0) 760 if (minlines > 0)
749 { 761 {
750 minlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
751 764
752 if (minlines > 0 765 if (minlines > 0
753 && screen.tscroll == 0 766 && screen.tscroll == 0
754 && screen.bscroll == nrow - 1) 767 && screen.bscroll == nrow - 1)
755 { 768 {
… …
816 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
817 } 830 }
818 831
819 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
820 { 833 {
834 scr_do_wrap ();
835
821 max_it (line->l, ncol); 836 line->l = ncol;
822 line->is_longer (1); 837 line->is_longer (1);
823 838
824 scr_do_wrap ();
825
826 row = screen.cur.row; 839 row = screen.cur.row;
827 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
828 } 841 }
829 842
830 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
831 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
832 c = 0xfffd; 845 c = 0xfffd;
833 846
834 // 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
835 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
836 // for the line drawing characters below as they might be invalid in the current 849 // drawing characters below as they might be invalid in the current
837 // locale. 850 // locale.
838 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
839 852
840 if (charsets [screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
841 { 854 {
842 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
843 // 5f-7e standard vt100 856 // 5f-7e standard vt100
… …
994/* 1007/*
995 * 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
996 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
997 */ 1010 */
998void 1011void
999rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
1000{ 1013{
1001 want_refresh = 1;
1002
1003 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
1004 { 1015 {
1005 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1006 { 1017 {
1007#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1008 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
1009 screen.cur.row--; 1020 --screen.cur.row;
1010 return; 1021
1022 want_refresh = 1;
1011#endif 1023#endif
1012 } 1024 }
1013 } 1025 }
1014 else if (!(screen.flags & Screen_WrapNext)) 1026 else
1015 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1016
1017 screen.flags &= ~Screen_WrapNext;
1018} 1028}
1019 1029
1020/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1021/* 1031/*
1022 * Process Horizontal Tab 1032 * Process Horizontal Tab
1023 * count: +ve = forward; -ve = backwards 1033 * count: +ve = forward; -ve = backwards
1024 * XTERM_SEQ: CTRL-I 1034 * XTERM_SEQ: CTRL-I
1025 */ 1035 */
1026void 1036void
1027rxvt_term::scr_tab (int count, bool ht) 1037rxvt_term::scr_tab (int count, bool ht) NOTHROW
1028{ 1038{
1029 int i, x; 1039 int i, x;
1030 1040
1031 want_refresh = 1; 1041 want_refresh = 1;
1032 i = x = screen.cur.col; 1042 i = x = screen.cur.col;
… …
1045 x = i; 1055 x = i;
1046 1056
1047 if (!--count) 1057 if (!--count)
1048 break; 1058 break;
1049 } 1059 }
1050 else 1060 else
1051 ht &= l.t[i] == ' ' 1061 ht &= l.t[i] == ' '
1052 && RS_SAME (l.r[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1053 1063
1054 if (count) 1064 if (count)
1055 x = ncol - 1; 1065 x = ncol - 1;
1056 1066
1057 // store horizontal tab commands as characters inside the text 1067 // store horizontal tab commands as characters inside the text
1058 // buffer so they can be selected and pasted. 1068 // buffer so they can be selected and pasted.
1059 if (ht && OPTION (Opt_pastableTabs)) 1069 if (ht && option (Opt_pastableTabs))
1060 { 1070 {
1061 base_rend = SET_FONT (base_rend, 0); 1071 base_rend = SET_FONT (base_rend, 0);
1062 1072
1063 l.touch (x); 1073 l.touch (x);
1064 1074
… …
1097 * Process DEC Back Index 1107 * Process DEC Back Index
1098 * XTERM_SEQ: ESC 6 1108 * XTERM_SEQ: ESC 6
1099 * 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
1100 * in that row right. Clear left column. 1110 * in that row right. Clear left column.
1101 */ 1111 */
1102#if ENABLE_FRILLS 1112#if !ENABLE_MINIMAL
1103void 1113void
1104rxvt_term::scr_backindex () 1114rxvt_term::scr_backindex () NOTHROW
1105{ 1115{
1106 if (screen.cur.col > 0) 1116 if (screen.cur.col > 0)
1107 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1108 else 1118 else
1109 scr_insdel_chars (1, INSERT); 1119 scr_insdel_chars (1, INSERT);
… …
1114 * Process DEC Forward Index 1124 * Process DEC Forward Index
1115 * XTERM_SEQ: ESC 9 1125 * XTERM_SEQ: ESC 9
1116 * 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
1117 * in that row left. Clear right column. 1127 * in that row left. Clear right column.
1118 */ 1128 */
1119#if ENABLE_FRILLS 1129#if !ENABLE_MINIMAL
1120void 1130void
1121rxvt_term::scr_forwardindex () 1131rxvt_term::scr_forwardindex () NOTHROW
1122{ 1132{
1123 if (screen.cur.col < ncol - 1) 1133 if (screen.cur.col < ncol - 1)
1124 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1125 else 1135 else
1126 { 1136 {
… …
1139/* ------------------------------------------------------------------------- */ 1149/* ------------------------------------------------------------------------- */
1140/* 1150/*
1141 * Goto Row/Column 1151 * Goto Row/Column
1142 */ 1152 */
1143void 1153void
1144rxvt_term::scr_gotorc (int row, int col, int relative) 1154rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1145{ 1155{
1146 want_refresh = 1; 1156 want_refresh = 1;
1147 ZERO_SCROLLBACK (); 1157 ZERO_SCROLLBACK ();
1148 1158
1149 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1159 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1171 } 1181 }
1172 } 1182 }
1173 else 1183 else
1174 { 1184 {
1175 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1176 { /* relative origin mode */ 1187 /* relative origin mode */
1177 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1178 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1179 } 1190 }
1180 else 1191 else
1181 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1187/* ------------------------------------------------------------------------- */ 1198/* ------------------------------------------------------------------------- */
1188/* 1199/*
1189 * direction should be UP or DN 1200 * direction should be UP or DN
1190 */ 1201 */
1191void 1202void
1192rxvt_term::scr_index (enum page_dirn direction) 1203rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1193{ 1204{
1194 int dirn; 1205 int dirn;
1195 1206
1196 want_refresh = 1; 1207 want_refresh = 1;
1197 ZERO_SCROLLBACK (); 1208 ZERO_SCROLLBACK ();
… …
1216 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1217 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1218 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1219 */ 1230 */
1220void 1231void
1221rxvt_term::scr_erase_line (int mode) 1232rxvt_term::scr_erase_line (int mode) NOTHROW
1222{ 1233{
1223 unsigned int col, num; 1234 unsigned int col, num;
1224 1235
1225 want_refresh = 1; 1236 want_refresh = 1;
1226 ZERO_SCROLLBACK (); 1237 ZERO_SCROLLBACK ();
… …
1270 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1281 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1271 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1282 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1272 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1283 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1273 */ 1284 */
1274void 1285void
1275rxvt_term::scr_erase_screen (int mode) 1286rxvt_term::scr_erase_screen (int mode) NOTHROW
1276{ 1287{
1277 int num; 1288 int num;
1278 int32_t row; 1289 int32_t row;
1279 rend_t ren; 1290 rend_t ren;
1280 XGCValues gcvalue; 1291 XGCValues gcvalue;
… …
1325 } 1336 }
1326 else 1337 else
1327 { 1338 {
1328 ren = rstyle & (RS_fgMask | RS_bgMask); 1339 ren = rstyle & (RS_fgMask | RS_bgMask);
1329 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1330 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1341 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1331 ERASE_ROWS (row, num); 1342 ERASE_ROWS (row, num);
1332 gcvalue.foreground = pix_colors[Color_fg]; 1343 gcvalue.foreground = pix_colors[Color_fg];
1333 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1344 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1334 } 1345 }
1335 1346
1336 for (; num--; row++) 1347 for (; num--; row++)
1337 { 1348 {
1338 scr_blank_screen_mem (ROW(row), rstyle); 1349 scr_blank_screen_mem (ROW(row), rstyle);
1339 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1350 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1340 } 1351 }
1341} 1352}
1342 1353
1343#if ENABLE_FRILLS 1354#if !ENABLE_MINIMAL
1344void 1355void
1345rxvt_term::scr_erase_savelines () 1356rxvt_term::scr_erase_savelines () NOTHROW
1346{ 1357{
1347 want_refresh = 1; 1358 want_refresh = 1;
1348 ZERO_SCROLLBACK (); 1359 ZERO_SCROLLBACK ();
1349 1360
1350 top_row = 0; 1361 top_row = 0;
… …
1355/* 1366/*
1356 * Fill the screen with `E's 1367 * Fill the screen with `E's
1357 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1368 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1358 */ 1369 */
1359void 1370void
1360rxvt_term::scr_E () 1371rxvt_term::scr_E () NOTHROW
1361{ 1372{
1362 rend_t fs; 1373 rend_t fs;
1363 1374
1364 want_refresh = 1; 1375 want_refresh = 1;
1365 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
… …
1386/* ------------------------------------------------------------------------- */ 1397/* ------------------------------------------------------------------------- */
1387/* 1398/*
1388 * Insert/Delete <count> lines 1399 * Insert/Delete <count> lines
1389 */ 1400 */
1390void 1401void
1391rxvt_term::scr_insdel_lines (int count, int insdel) 1402rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1392{ 1403{
1393 int end; 1404 int end;
1394 1405
1395 ZERO_SCROLLBACK (); 1406 ZERO_SCROLLBACK ();
1396 1407
… …
1416/* ------------------------------------------------------------------------- */ 1427/* ------------------------------------------------------------------------- */
1417/* 1428/*
1418 * Insert/Delete <count> characters from the current position 1429 * Insert/Delete <count> characters from the current position
1419 */ 1430 */
1420void 1431void
1421rxvt_term::scr_insdel_chars (int count, int insdel) 1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1422{ 1433{
1423 int col, row; 1434 int col, row;
1424 rend_t tr; 1435 rend_t tr;
1425 1436
1426 want_refresh = 1; 1437 want_refresh = 1;
… …
1457 { 1468 {
1458 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
1459 || (selection.end.col + count >= ncol)) 1470 || (selection.end.col + count >= ncol))
1460 CLEAR_SELECTION (); 1471 CLEAR_SELECTION ();
1461 else 1472 else
1473 {
1462 { /* shift selection */ 1474 /* shift selection */
1463 selection.beg.col += count; 1475 selection.beg.col += count;
1464 selection.mark.col += count; /* XXX: yes? */ 1476 selection.mark.col += count; /* XXX: yes? */
1465 selection.end.col += count; 1477 selection.end.col += count;
1466 } 1478 }
1467 } 1479 }
… …
1514/* 1526/*
1515 * Set the scrolling region 1527 * Set the scrolling region
1516 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1528 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1517 */ 1529 */
1518void 1530void
1519rxvt_term::scr_scroll_region (int top, int bot) 1531rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1520{ 1532{
1521 max_it (top, 0); 1533 max_it (top, 0);
1522 min_it (bot, nrow - 1); 1534 min_it (bot, nrow - 1);
1523 1535
1524 if (top > bot) 1536 if (top > bot)
… …
1534 * Make the cursor visible/invisible 1546 * Make the cursor visible/invisible
1535 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1547 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1536 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1548 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1537 */ 1549 */
1538void 1550void
1539rxvt_term::scr_cursor_visible (int mode) 1551rxvt_term::scr_cursor_visible (int mode) NOTHROW
1540{ 1552{
1541 want_refresh = 1; 1553 want_refresh = 1;
1542 1554
1543 if (mode) 1555 if (mode)
1544 screen.flags |= Screen_VisibleCursor; 1556 screen.flags |= Screen_VisibleCursor;
… …
1551 * Set/unset automatic wrapping 1563 * Set/unset automatic wrapping
1552 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1564 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1553 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1565 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1554 */ 1566 */
1555void 1567void
1556rxvt_term::scr_autowrap (int mode) 1568rxvt_term::scr_autowrap (int mode) NOTHROW
1557{ 1569{
1558 if (mode) 1570 if (mode)
1559 screen.flags |= Screen_Autowrap; 1571 screen.flags |= Screen_Autowrap;
1560 else 1572 else
1561 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1573 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1570 * and the cursor cannot be moved outside. 1582 * and the cursor cannot be moved outside.
1571 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1583 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1572 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1584 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1573 */ 1585 */
1574void 1586void
1575rxvt_term::scr_relative_origin (int mode) 1587rxvt_term::scr_relative_origin (int mode) NOTHROW
1576{ 1588{
1577 if (mode) 1589 if (mode)
1578 screen.flags |= Screen_Relative; 1590 screen.flags |= Screen_Relative;
1579 else 1591 else
1580 screen.flags &= ~Screen_Relative; 1592 screen.flags &= ~Screen_Relative;
… …
1587 * Set insert/replace mode 1599 * Set insert/replace mode
1588 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1600 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1589 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1601 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1590 */ 1602 */
1591void 1603void
1592rxvt_term::scr_insert_mode (int mode) 1604rxvt_term::scr_insert_mode (int mode) NOTHROW
1593{ 1605{
1594 if (mode) 1606 if (mode)
1595 screen.flags |= Screen_Insert; 1607 screen.flags |= Screen_Insert;
1596 else 1608 else
1597 screen.flags &= ~Screen_Insert; 1609 screen.flags &= ~Screen_Insert;
… …
1603 * XTERM_SEQ: Set tab at current column : ESC H 1615 * XTERM_SEQ: Set tab at current column : ESC H
1604 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1616 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1605 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1617 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1606 */ 1618 */
1607void 1619void
1608rxvt_term::scr_set_tab (int mode) 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1609{ 1621{
1610 if (mode < 0) 1622 if (mode < 0)
1611 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol);
1612 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1613 tabs [screen.cur.col] = !!mode; 1625 tabs [screen.cur.col] = !!mode;
1614} 1626}
1615 1627
1616/* ------------------------------------------------------------------------- */ 1628/* ------------------------------------------------------------------------- */
… …
1618 * Set reverse/normal video 1630 * Set reverse/normal video
1619 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1631 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1620 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1632 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1621 */ 1633 */
1622void 1634void
1623rxvt_term::scr_rvideo_mode (int mode) 1635rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1624{ 1636{
1625 XGCValues gcvalue; 1637 rvideo_mode = on;
1626 1638
1639#ifndef NO_BELL
1640 on ^= rvideo_bell;
1641#endif
1642
1627 if (rvideo != mode) 1643 if (rvideo_state != on)
1628 { 1644 {
1629 rvideo = mode; 1645 rvideo_state = on;
1646
1630 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1631#if XPM_BACKGROUND 1648#ifdef HAVE_BG_PIXMAP
1632 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1633#endif 1650#endif
1634#if TRANSPARENT 1651 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1635 if (! OPTION (Opt_transparent) || am_transparent == 0)
1636#endif
1637 XSetWindowBackground (display->display, vt,
1638 pix_colors[Color_bg]);
1639 1652
1653 XGCValues gcvalue;
1640 gcvalue.foreground = pix_colors[Color_fg]; 1654 gcvalue.foreground = pix_colors[Color_fg];
1641 gcvalue.background = pix_colors[Color_bg]; 1655 gcvalue.background = pix_colors[Color_bg];
1642 XChangeGC (display->display, gc, GCBackground | GCForeground, 1656 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1643 &gcvalue); 1657
1644 scr_clear (); 1658 scr_clear ();
1645 scr_touch (true); 1659 scr_touch (true);
1646 } 1660 }
1647} 1661}
1648 1662
… …
1650/* 1664/*
1651 * Report current cursor position 1665 * Report current cursor position
1652 * XTERM_SEQ: Report position: ESC [ 6 n 1666 * XTERM_SEQ: Report position: ESC [ 6 n
1653 */ 1667 */
1654void 1668void
1655rxvt_term::scr_report_position () 1669rxvt_term::scr_report_position () NOTHROW
1656{ 1670{
1657 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1671 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1658} 1672}
1659 1673
1660/* ------------------------------------------------------------------------- * 1674/* ------------------------------------------------------------------------- *
… …
1663 1677
1664/* 1678/*
1665 * Set font style 1679 * Set font style
1666 */ 1680 */
1667void 1681void
1668rxvt_term::set_font_style () 1682rxvt_term::set_font_style () NOTHROW
1669{ 1683{
1670#if 0 1684#if 0
1671 switch (charsets [screen.charset]) 1685 switch (charsets [screen.charset])
1672 { 1686 {
1673 case '0': /* DEC Special Character & Line Drawing Set */ 1687 case '0': /* DEC Special Character & Line Drawing Set */
… …
1695 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1709 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1696 * XTERM_SEQ: Invoke G2 character set: ESC N 1710 * XTERM_SEQ: Invoke G2 character set: ESC N
1697 * XTERM_SEQ: Invoke G3 character set: ESC O 1711 * XTERM_SEQ: Invoke G3 character set: ESC O
1698 */ 1712 */
1699void 1713void
1700rxvt_term::scr_charset_choose (int set) 1714rxvt_term::scr_charset_choose (int set) NOTHROW
1701{ 1715{
1702 screen.charset = set; 1716 screen.charset = set;
1703 set_font_style (); 1717 set_font_style ();
1704} 1718}
1705 1719
… …
1711 * XTERM_SEQ: Set G2 character set: ESC * <C> 1725 * XTERM_SEQ: Set G2 character set: ESC * <C>
1712 * XTERM_SEQ: Set G3 character set: ESC + <C> 1726 * XTERM_SEQ: Set G3 character set: ESC + <C>
1713 * See set_font_style for possible values for <C> 1727 * See set_font_style for possible values for <C>
1714 */ 1728 */
1715void 1729void
1716rxvt_term::scr_charset_set (int set, unsigned int ch) 1730rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1717{ 1731{
1718 charsets[set] = (unsigned char)ch; 1732 charsets[set] = (unsigned char)ch;
1719 set_font_style (); 1733 set_font_style ();
1720} 1734}
1721 1735
… …
1726 1740
1727/* 1741/*
1728 * refresh matching text. 1742 * refresh matching text.
1729 */ 1743 */
1730bool 1744bool
1731rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1745rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1732{ 1746{
1733 bool found = false; 1747 bool found = false;
1734 1748
1735 for (int i = 0; i < nrow; i++) 1749 for (int i = 0; i < nrow; i++)
1736 { 1750 {
1737 int col = 0;
1738 rend_t *drp = drawn_buf[i].r; 1751 rend_t *drp = drawn_buf[i].r;
1739 1752
1740 for (; col < ncol; col++, drp++) 1753 for (int col = 0; col < ncol; col++, drp++)
1741 if ((*drp & mask) == value) 1754 if ((*drp & mask) == value)
1742 { 1755 {
1743 found = true; 1756 found = true;
1744 *drp = ~value; 1757 *drp = ~value;
1745 } 1758 }
… …
1756 PART_END, 1769 PART_END,
1757 RC_COUNT 1770 RC_COUNT
1758}; 1771};
1759 1772
1760void 1773void
1761rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1774rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1762{ 1775{
1763 int i; 1776 int i;
1764 row_col_t rc[RC_COUNT]; 1777 row_col_t rc[RC_COUNT];
1765 1778
1766 if (!drawn_buf) /* sanity check */ 1779 if (!drawn_buf) /* sanity check */
… …
1785 for (i = PART_BEG; i < RC_COUNT; i++) 1798 for (i = PART_BEG; i < RC_COUNT; i++)
1786 { 1799 {
1787 min_it (rc[i].col, ncol - 1); 1800 min_it (rc[i].col, ncol - 1);
1788 min_it (rc[i].row, nrow - 1); 1801 min_it (rc[i].row, nrow - 1);
1789 } 1802 }
1790 1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1791 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1804 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1792 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1805 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1793 1806
1807 num_scr_allow = 0;
1808
1794 if (refresh) 1809 if (refresh)
1795 scr_refresh (SLOW_REFRESH); 1810 scr_refresh ();
1796} 1811}
1797 1812
1798/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1799/* 1814/*
1800 * Refresh the entire screen 1815 * Refresh the entire screen
1801 */ 1816 */
1802void 1817void
1803rxvt_term::scr_touch (bool refresh) 1818rxvt_term::scr_touch (bool refresh) NOTHROW
1804{ 1819{
1805 scr_expose (0, 0, width, height, refresh); 1820 scr_expose (0, 0, width, height, refresh);
1806} 1821}
1807 1822
1808/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1809/* 1824/*
1810 * Move the display so that the line represented by scrollbar value Y is at 1825 * Move the display so that the line represented by scrollbar value Y is at
1811 * the top of the screen 1826 * the top of the screen
1812 */ 1827 */
1813void 1828void
1814rxvt_term::scr_move_to (int y, int len) 1829rxvt_term::scr_move_to (int y, int len) NOTHROW
1815{ 1830{
1816 int p = len
1817 ? (top_row - nrow) * (len - y) / len + (nrow - 1) 1831 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1818 : 0;
1819
1820 scr_changeview (p);
1821} 1832}
1822 1833
1823/* ------------------------------------------------------------------------- */ 1834/* ------------------------------------------------------------------------- */
1824/* 1835/*
1825 * Page the screen up/down nlines 1836 * Page the screen up/down nlines
1826 * direction should be UP or DN 1837 * direction should be UP or DN
1827 */ 1838 */
1828bool 1839bool
1829rxvt_term::scr_page (enum page_dirn direction, int nlines) 1840rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830{ 1841{
1831 int new_view_start = 1842 int new_view_start =
1832 direction == UP ? view_start - nlines 1843 direction == UP ? view_start - nlines
1833 : view_start + nlines; 1844 : view_start + nlines;
1834 1845
1835 return scr_changeview (new_view_start); 1846 return scr_changeview (new_view_start);
1836} 1847}
1837 1848
1838bool 1849bool
1839rxvt_term::scr_changeview (int new_view_start) 1850rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1851{
1841 clamp_it (new_view_start, top_row, 0); 1852 clamp_it (new_view_start, top_row, 0);
1842 1853
1843 if (new_view_start == view_start) 1854 if (new_view_start == view_start)
1844 return false; 1855 return false;
1845 1856
1846 num_scr += new_view_start - view_start; 1857 num_scr += new_view_start - view_start;
1847 view_start = new_view_start; 1858 view_start = new_view_start;
1859 want_refresh = 1;
1860
1848 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1861 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1849 want_refresh = 1;
1850 1862
1851 return true; 1863 return true;
1852} 1864}
1853 1865
1854/* ------------------------------------------------------------------------- */ 1866#ifndef NO_BELL
1855void 1867void
1868rxvt_term::bell_cb (ev::timer &w, int revents)
1869{
1870 rvideo_bell = false;
1871 scr_rvideo_mode (rvideo_mode);
1872 refresh_check ();
1873}
1874#endif
1875
1876/* ------------------------------------------------------------------------- */
1877void
1856rxvt_term::scr_bell () 1878rxvt_term::scr_bell () NOTHROW
1857{ 1879{
1858#ifndef NO_BELL 1880#ifndef NO_BELL
1859 1881
1860# ifndef NO_MAPALERT 1882# ifndef NO_MAPALERT
1861# ifdef MAPALERT_OPTION 1883# ifdef MAPALERT_OPTION
1862 if (OPTION (Opt_mapAlert)) 1884 if (option (Opt_mapAlert))
1863# endif 1885# endif
1864 XMapWindow (display->display, parent[0]); 1886 XMapWindow (dpy, parent[0]);
1865# endif 1887# endif
1866 1888
1867 if (OPTION (Opt_visualBell)) 1889# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell))
1891 {
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1868 { 1897 }
1869 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898# endif
1899
1900 if (option (Opt_visualBell))
1901 {
1902 rvideo_bell = true;
1903 scr_rvideo_mode (rvideo_mode);
1870 display->flush (); 1904 flush ();
1905
1871 rxvt_usleep (VISUAL_BELL_DURATION); 1906 bell_ev.start (VISUAL_BELL_DURATION);
1872 scr_rvideo_mode (!rvideo); /* refresh also done */
1873 } 1907 }
1874 else 1908 else
1875 XBell (display->display, 0); 1909 XBell (dpy, 0);
1876
1877#endif 1910#endif
1878} 1911}
1879 1912
1880/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1881/* ARGSUSED */ 1914/* ARGSUSED */
1882void 1915void
1883rxvt_term::scr_printscreen (int fullhist) 1916rxvt_term::scr_printscreen (int fullhist) NOTHROW
1884{ 1917{
1885#ifdef PRINTPIPE 1918#ifdef PRINTPIPE
1886 int nrows, row_start; 1919 int nrows, row_start;
1887 FILE *fd; 1920 FILE *fd;
1888 1921
… …
1937 * Refresh the screen 1970 * Refresh the screen
1938 * drawn_text/drawn_rend contain the screen information before the update. 1971 * drawn_text/drawn_rend contain the screen information before the update.
1939 * screen.text/screen.rend contain what the screen will change to. 1972 * screen.text/screen.rend contain what the screen will change to.
1940 */ 1973 */
1941void 1974void
1942rxvt_term::scr_refresh (unsigned char refresh_type) 1975rxvt_term::scr_refresh () NOTHROW
1943{ 1976{
1944 unsigned char must_clear, /* use draw_string not draw_image_string */ 1977 unsigned char have_bg,
1945 showcursor; /* show the cursor */ 1978 showcursor; /* show the cursor */
1946 int16_t col, row, /* column/row we're processing */ 1979 int16_t col, row, /* column/row we're processing */
1947 ocrow; /* old cursor row */ 1980 ocrow; /* old cursor row */
1948 int i; /* tmp */ 1981 int i; /* tmp */
1949#ifndef NO_CURSORCOLOR 1982#ifndef NO_CURSORCOLOR
1950 rend_t cc1; /* store colours at cursor position (s) */ 1983 rend_t cc1; /* store colours at cursor position (s) */
1951#endif 1984#endif
1952 rend_t *crp; // cursor rendition pointer 1985 rend_t *crp; // cursor rendition pointer
1986 rend_t ccol1, /* Cursor colour */
1987 ccol2; /* Cursor colour2 */
1953 1988
1954 want_refresh = 0; /* screen is current */ 1989 want_refresh = 0; /* screen is current */
1955 1990
1956 if (refresh_type == NO_REFRESH || !mapped) 1991 if (refresh_type == NO_REFRESH || !mapped)
1957 return; 1992 return;
1958 1993
1959 /* 1994 /*
1960 * A: set up vars 1995 * A: set up vars
1961 */ 1996 */
1962 must_clear = 0;
1963 refresh_count = 0; 1997 refresh_count = 0;
1964 1998
1965#if XPM_BACKGROUND 1999 have_bg = 0;
2000#ifdef HAVE_BG_PIXMAP
1966 must_clear |= bgPixmap.pixmap != None; 2001 have_bg = bgPixmap.pixmap != None;
1967#endif
1968#if TRANSPARENT
1969 must_clear |= OPTION (Opt_transparent) && am_transparent;
1970#endif 2002#endif
1971 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1972 2004
1973 /* 2005 /*
1974 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
1978 /* 2010 /*
1979 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
1980 */ 2012 */
1981 { 2013 {
1982 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
1983 rend_t ccol1, /* Cursor colour */
1984 ccol2; /* Cursor colour2 */
1985 2015
1986 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
1987#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
1988 if (hidden_cursor) 2018 if (hidden_cursor)
1989 showcursor = 0; 2019 showcursor = 0;
… …
1996 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1997 col--; 2027 col--;
1998 2028
1999 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
2000 2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053
2001 if (showcursor && focus) 2054 if (showcursor && focus)
2002 { 2055 {
2003 if (OPTION (Opt_cursorUnderline)) 2056 if (option (Opt_cursorUnderline))
2004 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
2005 else 2058 else
2006 { 2059 {
2007 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
2008
2009#ifndef NO_CURSORCOLOR
2010 cc1 = *crp & (RS_fgMask | RS_bgMask);
2011 if (ISSET_PIXCOLOR (Color_cursor))
2012 ccol1 = Color_cursor;
2013 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol1 = fgcolor_of (rstyle);
2016#else
2017 ccol1 = Color_fg;
2018#endif
2019 if (ISSET_PIXCOLOR (Color_cursor2))
2020 ccol2 = Color_cursor2;
2021 else
2022#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2023 ccol2 = bgcolor_of (rstyle);
2024#else
2025 ccol2 = Color_bg;
2026#endif
2027 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2028 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2029#endif
2030 } 2063 }
2031 } 2064 }
2032 } 2065 }
2033 2066
2034 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
… …
2071#ifndef NO_SLOW_LINK_SUPPORT 2104#ifndef NO_SLOW_LINK_SUPPORT
2072 /* 2105 /*
2073 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2074 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2075 */ 2108 */
2076 i = num_scr;
2077 if (!display->is_local 2109 if (!display->is_local
2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2079 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2080 { 2112 {
2081 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2082 int j; 2115 int j;
2083 int len, wlen; 2116 int len, wlen;
2117 dLocal (int, num_scr);
2084 2118
2085 j = nrow; 2119 j = nrow;
2086 wlen = len = -1; 2120 wlen = len = -1;
2087 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2088 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2089 { 2124 {
2090 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2091 { 2126 {
2092 line_t s = ROW(view_start + row); 2127 line_t s = ROW(view_start + row);
… …
2113 wlen = row; 2148 wlen = row;
2114 continue; 2149 continue;
2115 } 2150 }
2116 } 2151 }
2117 2152
2118 if (len != -1) 2153 if (len >= 0)
2119 { 2154 {
2120 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2121 if (wlen < len) 2156 if (wlen < len)
2122 ::swap (wlen, len); 2157 ::swap (wlen, len);
2123 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2124 XCopyArea (display->display, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2125 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2126 (unsigned int)this->width, 2164 (unsigned int)this->width,
2127 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2128 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2129 len = -1; 2169 len = -1;
2130 } 2170 }
2131 } 2171 }
2132 } 2172 }
2133#endif 2173#endif
… …
2189 count++; 2229 count++;
2190 2230
2191 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2192 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2193 { 2233 {
2194 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2195 break; 2235 break;
2196 2236
2197 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2198 drp[col] = rend; 2238 drp[col] = rend;
2199 i = 0; 2239 i = 0;
2200 } 2240 }
2201 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2202 break; 2242 break;
2203 } 2243 }
2204 2244
2205 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2206 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2216 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2217 2257
2218 // only do special processing if any attributes are set, which is unlikely 2258 // only do special processing if any attributes are set, which is unlikely
2219 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2220 { 2260 {
2221#if ENABLE_STYLES
2222 // force redraw after "careful" characters to avoid pixel droppings
2223 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2224 drp[col + 1] = ~srp[col + 1];
2225
2226 // include previous careful character(s) if possible, looks nicer (best effort...)
2227 while (text > stp
2228 && srp[text - stp - 1] & RS_Careful
2229 && RS_SAME (rend, srp[text - stp - 1]))
2230 text--, count++, xpixel -= fwidth;
2231#endif
2232
2233 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2234 2262
2235#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2236 if (rend & RS_Bold
2237 && fore == Color_fg) 2264 if (rend & RS_Bold && fore == Color_fg)
2238 { 2265 {
2239 if (ISSET_PIXCOLOR (Color_BD)) 2266 if (ISSET_PIXCOLOR (Color_BD))
2240 fore = Color_BD; 2267 fore = Color_BD;
2241# if !ENABLE_STYLES 2268# if !ENABLE_STYLES
2242 else 2269 else
2243 invert = !invert; 2270 invert = !invert;
2244# endif 2271# endif
2245 } 2272 }
2246 2273
2247 if (rend & RS_Italic 2274 if (rend & RS_Italic && fore == Color_fg)
2248 && fore == Color_fg)
2249 { 2275 {
2250 if (ISSET_PIXCOLOR (Color_IT)) 2276 if (ISSET_PIXCOLOR (Color_IT))
2251 fore = Color_IT; 2277 fore = Color_IT;
2252# if !ENABLE_STYLES 2278# if !ENABLE_STYLES
2253 else 2279 else
2254 invert = !invert; 2280 invert = !invert;
2255# endif 2281# endif
2256 } 2282 }
2257 2283
2258 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2259 fore = Color_UL; 2285 fore = Color_UL;
2260#endif 2286#endif
2261 2287
2262 if (invert) 2288 if (invert)
2263 { 2289 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2264 ::swap (fore, back); 2296 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2265 2301
2266#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2267 if (ISSET_PIXCOLOR (Color_RV)) 2304 if (ISSET_PIXCOLOR (Color_RV))
2268 back = Color_RV; 2305 back = Color_RV;
2269 2306# endif
2270 if (fore == back) 2307 if (fore == back)
2271 { 2308 {
2272 fore = Color_bg; 2309 fore = Color_bg;
2273 back = Color_fg; 2310 back = Color_fg;
2274 } 2311 }
… …
2276 } 2313 }
2277 2314
2278#ifdef TEXT_BLINK 2315#ifdef TEXT_BLINK
2279 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2280 { 2317 {
2281 if (!text_blink_ev.active) 2318 if (!text_blink_ev.is_active ())
2282 { 2319 {
2283 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2320 text_blink_ev.again ();
2284 hidden_text = 0; 2321 hidden_text = 0;
2285 } 2322 }
2286 else if (hidden_text) 2323 else if (hidden_text)
2287 fore = back; 2324 fore = back;
2288 } 2325 }
2289#endif 2326#endif
2327
2328#if ENABLE_STYLES
2329 // "careful" (too wide) character handling
2330
2331 // include previous careful character(s) if possible, looks nicer (best effort...)
2332 while (text > stp
2333 && srp[text - stp - 1] & RS_Careful
2334 && RS_SAME (rend, srp[text - stp - 1]))
2335 text--, count++, xpixel -= fwidth;
2336
2337 // force redraw after "careful" characters to avoid pixel droppings
2338 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2339 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2340
2341 // force redraw before "careful" characters to avoid pixel droppings
2342 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2343 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2344#endif
2290 } 2345 }
2291 2346
2292 /* 2347 /*
2293 * Actually do the drawing of the string here 2348 * Actually do the drawing of the string here
2294 */ 2349 */
2295 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2296 2351
2297 if (back == fore)
2298 font->clear_rect (*drawable, xpixel, ypixel,
2299 fwidth * count, fheight,
2300 back);
2301 else if (back == Color_bg) 2352 if (have_bg && back == Color_bg)
2302 { 2353 {
2303 if (must_clear) 2354 // this is very ugly, maybe push it into ->draw?
2304 {
2305 CLEAR_CHARS (xpixel, ypixel, count);
2306 2355
2307 for (i = 0; i < count; i++) /* don't draw empty strings */ 2356 for (i = 0; i < count; i++) /* don't draw empty strings */
2308 if (text[i] != ' ') 2357 if (text[i] != ' ')
2309 { 2358 {
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2359 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2311 break; 2360 goto did_clear;
2312 }
2313 } 2361 }
2314 else 2362
2315 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2363 CLEAR_CHARS (xpixel, ypixel, count);
2364 did_clear: ;
2316 } 2365 }
2317 else 2366 else
2318 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2319 2368
2320 if (rend & RS_Uline && font->descent > 1 && fore != back) 2369 if (rend & RS_Uline && font->descent > 1 && fore != back)
2321 { 2370 {
2322#if ENABLE_FRILLS 2371#if ENABLE_FRILLS
2323 if (ISSET_PIXCOLOR (Color_underline)) 2372 if (ISSET_PIXCOLOR (Color_underline))
2324 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2373 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2325 else 2374 else
2326#endif 2375#endif
2327 XSetForeground (display->display, gc, pix_colors[fore]); 2376 XSetForeground (dpy, gc, pix_colors[fore]);
2328 2377
2329 XDrawLine (display->display, drawBuffer, gc, 2378 XDrawLine (dpy, vt, gc,
2330 xpixel, ypixel + font->ascent + 1, 2379 xpixel, ypixel + font->ascent + 1,
2331 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2332 } 2381 }
2333 } /* for (col....) */ 2382 } /* for (col....) */
2334 } /* for (row....) */ 2383 } /* for (row....) */
… …
2343 */ 2392 */
2344 if (showcursor) 2393 if (showcursor)
2345 { 2394 {
2346 if (focus) 2395 if (focus)
2347 { 2396 {
2348 if (OPTION (Opt_cursorUnderline)) 2397 if (option (Opt_cursorUnderline))
2349 *crp ^= RS_Uline; 2398 *crp ^= RS_Uline;
2350 else 2399 else
2351 { 2400 {
2352 *crp ^= RS_RVid; 2401 *crp ^= RS_RVid;
2353#ifndef NO_CURSORCOLOR 2402#ifndef NO_CURSORCOLOR
… …
2367 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2416 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2368 cursorwidth++; 2417 cursorwidth++;
2369 2418
2370#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2371 if (ISSET_PIXCOLOR (Color_cursor)) 2420 if (ISSET_PIXCOLOR (Color_cursor))
2372 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2421 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2422 else
2373#endif 2423#endif
2424 XSetForeground (dpy, gc, pix_colors[ccol1]);
2374 2425
2375 XDrawRectangle (display->display, drawBuffer, gc, 2426 XDrawRectangle (dpy, vt, gc,
2376 Col2Pixel (col), 2427 Col2Pixel (col),
2377 Row2Pixel (oldcursor.row), 2428 Row2Pixel (oldcursor.row),
2378 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2429 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2379 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2430 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2380 } 2431 }
… …
2388 num_scr = 0; 2439 num_scr = 0;
2389 num_scr_allow = 1; 2440 num_scr_allow = 1;
2390} 2441}
2391 2442
2392void 2443void
2393rxvt_term::scr_remap_chars (line_t &l) 2444rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2394{ 2445{
2395 if (!l.t) 2446 if (!l.t)
2396 return; 2447 return;
2397 2448
2398 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2449 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2400 for (int i = ncol; i--; ) 2451 for (int i = ncol; i--; )
2401 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2452 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2402} 2453}
2403 2454
2404void 2455void
2405rxvt_term::scr_remap_chars () 2456rxvt_term::scr_remap_chars () NOTHROW
2406{ 2457{
2407 for (int i = total_rows; i--; ) 2458 for (int i = total_rows; i--; )
2408 scr_remap_chars (row_buf [i]); 2459 scr_remap_chars (row_buf [i]);
2409 2460
2410 for (int i = nrow; i--; ) 2461 for (int i = nrow; i--; )
… …
2413 scr_remap_chars (swap_buf [i]); 2464 scr_remap_chars (swap_buf [i]);
2414 } 2465 }
2415} 2466}
2416 2467
2417void 2468void
2418rxvt_term::scr_recolour () 2469rxvt_term::scr_recolour () NOTHROW
2419{ 2470{
2420 if (1 2471#ifdef HAVE_BG_PIXMAP
2421#if TRANSPARENT 2472 bgPixmap.apply ();
2422 && !am_transparent 2473#else
2423#endif 2474
2424#if XPM_BACKGROUND
2425 && !bgPixmap.pixmap
2426#endif
2427 )
2428 {
2429 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2430 XClearWindow (display->display, parent[0]); 2476 XClearWindow (dpy, parent[0]);
2431 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2432#if HAVE_SCROLLBARS 2478
2433 if (scrollBar.win) 2479 if (scrollBar.win)
2434 { 2480 {
2435 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2436 scrollBar.setIdle (); 2482 scrollBar.state = STATE_IDLE;
2437 scrollbar_show (0); 2483 scrollBar.show (0);
2438 }
2439#endif
2440 } 2484 }
2441 2485
2486#endif
2487
2488 /* bgPixmap.apply () does not do the following : */
2442 scr_clear (); 2489 scr_clear ();
2443 scr_touch (true); 2490 scr_touch (true);
2444 want_refresh = 1; 2491 want_refresh = 1;
2445} 2492}
2446 2493
2447/* ------------------------------------------------------------------------- */ 2494/* ------------------------------------------------------------------------- */
2448void 2495void
2449rxvt_term::scr_clear (bool really) 2496rxvt_term::scr_clear (bool really) NOTHROW
2450{ 2497{
2451 if (!mapped) 2498 if (!mapped)
2452 return; 2499 return;
2453 2500
2454 num_scr_allow = 0; 2501 num_scr_allow = 0;
2455 want_refresh = 1; 2502 want_refresh = 1;
2456 2503
2457 if (really) 2504 if (really)
2458 XClearWindow (display->display, vt); 2505 XClearWindow (dpy, vt);
2459} 2506}
2460 2507
2461void 2508void
2462rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2509rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2463{ 2510{
2464 int view_end = view_start + nrow; 2511 int view_end = view_start + nrow;
2465 int row, col; 2512 int row, col;
2466 2513
2467 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2514 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2479 srp[col] ^= rstyle2; 2526 srp[col] ^= rstyle2;
2480 } 2527 }
2481} 2528}
2482 2529
2483void 2530void
2484rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2531rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2485{ 2532{
2486 int view_end = view_start + nrow; 2533 int view_end = view_start + nrow;
2487 int row, col; 2534 int row, col;
2488 2535
2489 if (beg_row >= view_start) 2536 if (beg_row >= view_start)
… …
2506 srp[col] ^= rstyle; 2553 srp[col] ^= rstyle;
2507} 2554}
2508 2555
2509/* ------------------------------------------------------------------------- */ 2556/* ------------------------------------------------------------------------- */
2510void 2557void
2511rxvt_term::scr_reverse_selection () 2558rxvt_term::scr_reverse_selection () NOTHROW
2512{ 2559{
2513 if (selection.op 2560 if (selection.op
2514 && current_screen == selection.screen 2561 && current_screen == selection.screen
2515 && selection.end.row >= view_start) 2562 && selection.end.row >= view_start)
2516 { 2563 {
2517#if ENABLE_FRILLS 2564#if !ENABLE_MINIMAL
2518 if (selection.rect) 2565 if (selection.rect)
2519 scr_xor_rect (selection.beg.row, selection.beg.col, 2566 scr_xor_rect (selection.beg.row, selection.beg.col,
2520 selection.end.row, selection.end.col, 2567 selection.end.row, selection.end.col,
2521 RS_RVid, RS_RVid | RS_Uline); 2568 RS_RVid, RS_RVid | RS_Uline);
2522 else 2569 else
… …
2532 * Dump the whole scrollback and screen to the passed filedescriptor. The 2579 * Dump the whole scrollback and screen to the passed filedescriptor. The
2533 * invoking routine must close the fd. 2580 * invoking routine must close the fd.
2534 */ 2581 */
2535#if 0 2582#if 0
2536void 2583void
2537rxvt_term::scr_dump (int fd) 2584rxvt_term::scr_dump (int fd) NOTHROW
2538{ 2585{
2539 int row, wrote; 2586 int row, wrote;
2540 unsigned int width, towrite; 2587 unsigned int width, towrite;
2541 char r1[] = "\n"; 2588 char r1[] = "\n";
2542 2589
… …
2561 2608
2562/* ------------------------------------------------------------------------- * 2609/* ------------------------------------------------------------------------- *
2563 * CHARACTER SELECTION * 2610 * CHARACTER SELECTION *
2564 * ------------------------------------------------------------------------- */ 2611 * ------------------------------------------------------------------------- */
2565void 2612void
2566rxvt_term::selection_check (int check_more) 2613rxvt_term::selection_check (int check_more) NOTHROW
2567{ 2614{
2568 row_col_t pos; 2615 row_col_t pos;
2569 2616
2570 if (!selection.op) 2617 if (!selection.op)
2571 return; 2618 return;
… …
2592/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2593/* 2640/*
2594 * Paste a selection direct to the command fd 2641 * Paste a selection direct to the command fd
2595 */ 2642 */
2596void 2643void
2597rxvt_term::paste (char *data, unsigned int len) 2644rxvt_term::paste (char *data, unsigned int len) NOTHROW
2598{ 2645{
2599 /* convert normal newline chars into common keyboard Return key sequence */ 2646 /* convert normal newline chars into common keyboard Return key sequence */
2600 for (unsigned int i = 0; i < len; i++) 2647 for (unsigned int i = 0; i < len; i++)
2601 if (data[i] == C0_LF) 2648 if (data[i] == C0_LF)
2602 data[i] = C0_CR; 2649 data[i] = C0_CR;
2603 2650
2651 if (priv_modes & PrivMode_BracketPaste)
2652 tt_printf ("\e[200~");
2653
2604 tt_write (data, len); 2654 tt_write (data, len);
2655
2656 if (priv_modes & PrivMode_BracketPaste)
2657 tt_printf ("\e[201~");
2605} 2658}
2606 2659
2607/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2608/* 2661/*
2609 * Respond to a notification that a primary selection has been sent 2662 * Respond to a notification that a primary selection has been sent
2610 * EXT: SelectionNotify 2663 * EXT: SelectionNotify
2611 */ 2664 */
2612void 2665void
2613rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2614{ 2667{
2615 if (prop == None) /* check for failed XConvertSelection */ 2668 if (prop == None) /* check for failed XConvertSelection */
2616 { 2669 {
2617 if ((selection_type & Sel_CompoundText)) 2670 if ((selection_type & Sel_CompoundText))
2618 { 2671 {
… …
2638 } 2691 }
2639 2692
2640 unsigned long bytes_after; 2693 unsigned long bytes_after;
2641 XTextProperty ct; 2694 XTextProperty ct;
2642 2695
2643 if (XGetWindowProperty (display->display, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2644 0, PROP_SIZE / 4, 2697 0, PROP_SIZE / 4,
2645 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2646 &ct.encoding, &ct.format, 2699 &ct.encoding, &ct.format,
2647 &ct.nitems, &bytes_after, 2700 &ct.nitems, &bytes_after,
2648 &ct.value) != Success) 2701 &ct.value) != Success)
… …
2657 if (bytes_after) 2710 if (bytes_after)
2658 { 2711 {
2659 // fetch and append remaining data 2712 // fetch and append remaining data
2660 XTextProperty ct2; 2713 XTextProperty ct2;
2661 2714
2662 if (XGetWindowProperty (display->display, win, prop, 2715 if (XGetWindowProperty (dpy, win, prop,
2663 ct.nitems / 4, (bytes_after + 3) / 4, 2716 ct.nitems / 4, (bytes_after + 3) / 4,
2664 delete_prop, AnyPropertyType, 2717 delete_prop, AnyPropertyType,
2665 &ct2.encoding, &ct2.format, 2718 &ct2.encoding, &ct2.format,
2666 &ct2.nitems, &bytes_after, 2719 &ct2.nitems, &bytes_after,
2667 &ct2.value) != Success) 2720 &ct2.value) != Success)
… …
2680 2733
2681 if (ct.encoding == xa[XA_INCR]) 2734 if (ct.encoding == xa[XA_INCR])
2682 { 2735 {
2683 // INCR selection, start handshake 2736 // INCR selection, start handshake
2684 if (!delete_prop) 2737 if (!delete_prop)
2685 XDeleteProperty (display->display, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2686 2739
2687 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2688 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2689 incr_ev.start (NOW + 10); 2742 incr_ev.start (10);
2690 2743
2691 goto bailout; 2744 goto bailout;
2692 } 2745 }
2693 2746
2694 if (ct.nitems == 0) 2747 if (ct.nitems == 0)
… …
2703 ct.nitems = incr_buf_fill; 2756 ct.nitems = incr_buf_fill;
2704 incr_buf = 0; 2757 incr_buf = 0;
2705 incr_buf_size = 0; 2758 incr_buf_size = 0;
2706 incr_ev.stop (); 2759 incr_ev.stop ();
2707 } 2760 }
2708 else 2761 else
2709 { 2762 {
2710 if (selection_wait == Sel_normal 2763 if (selection_wait == Sel_normal
2711 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2712 { 2765 {
2713 /* 2766 /*
… …
2720 goto bailout; 2773 goto bailout;
2721 } 2774 }
2722 } 2775 }
2723 else if (selection_wait == Sel_incr) 2776 else if (selection_wait == Sel_incr)
2724 { 2777 {
2725 incr_ev.start (NOW + 10); 2778 incr_ev.start (10);
2726 2779
2727 while (incr_buf_fill + ct.nitems > incr_buf_size) 2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2728 { 2781 {
2729 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2730 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2737 } 2790 }
2738 2791
2739 char **cl; 2792 char **cl;
2740 int cr; 2793 int cr;
2741 2794
2742#if ENABLE_FRILLS 2795#if !ENABLE_MINIMAL
2743 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2744 // so recode it manually 2797 // so recode it manually
2745 if (ct.encoding == xa[XA_UTF8_STRING]) 2798 if (ct.encoding == xa[XA_UTF8_STRING])
2746 { 2799 {
2747 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2751 paste (s, strlen (s)); 2804 paste (s, strlen (s));
2752 free (s); 2805 free (s);
2753 } 2806 }
2754 else 2807 else
2755#endif 2808#endif
2756 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2757 && cl) 2810 && cl)
2758 { 2811 {
2759 for (int i = 0; i < cr; i++) 2812 for (int i = 0; i < cr; i++)
2760 paste (cl[i], strlen (cl[i])); 2813 paste (cl[i], strlen (cl[i]));
2761 2814
… …
2770 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2771 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2772} 2825}
2773 2826
2774void 2827void
2775rxvt_term::incr_cb (time_watcher &w) 2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2776{ 2829{
2777 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2778 2831
2779 incr_buf_size = 0; 2832 incr_buf_size = 0;
2780 free (incr_buf); 2833 free (incr_buf);
2781 2834
2782 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2783} 2836}
2784 2837
2785void 2838void
2786rxvt_term::selection_property (Window win, Atom prop) 2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2787{ 2840{
2788 if (prop == None || selection_wait != Sel_incr) 2841 if (prop == None || selection_wait != Sel_incr)
2789 return; 2842 return;
2790 2843
2791 selection_paste (win, prop, true); 2844 selection_paste (win, prop, true);
2792} 2845}
2793 2846
2794/* ------------------------------------------------------------------------- */ 2847/* ------------------------------------------------------------------------- */
2795/* 2848/*
2796 * Request the current selection: 2849 * Request the current selection:
2797 * Order: > internal selection if available 2850 * Order: > internal selection if available
2798 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2799 * > CUT_BUFFER0 2852 * > CUT_BUFFER0
2800 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2801 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
2802 * EXT: button 2 release 2855 * EXT: button 2 release
2803 */ 2856 */
2804void 2857void
2805rxvt_term::selection_request (Time tm, int x, int y) 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2806{ 2859{
2807 if (x < 0 || x >= width || y < 0 || y >= height) 2860 if (selection.text && selnum == Sel_Primary)
2808 return; /* outside window */ 2861 {
2809
2810 if (selection.text)
2811 { /* internal selection */ 2862 /* internal selection */
2812 char *str = rxvt_wcstombs (selection.text, selection.len); 2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2813 paste (str, strlen (str)); 2864 paste (str, strlen (str));
2814 free (str); 2865 free (str);
2815 return; 2866 return;
2816 } 2867 }
2817 else 2868 else
2818 { 2869 {
2819 int i;
2820
2821 selection_request_time = tm; 2870 selection_request_time = tm;
2822 selection_wait = Sel_normal; 2871 selection_wait = Sel_normal;
2823 2872
2824 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2825 {
2826#if X_HAVE_UTF8_STRING 2873#if X_HAVE_UTF8_STRING
2827 selection_type = Sel_UTF8String; 2874 selection_type = Sel_UTF8String;
2828 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2875 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2829 return; 2876 return;
2830#else 2877#else
2831 selection_type = Sel_CompoundText; 2878 selection_type = Sel_CompoundText;
2832 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2879 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2833 return; 2880 return;
2834#endif 2881#endif
2835 }
2836 } 2882 }
2837 2883
2838 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2884 selection_wait = Sel_none; /* don't loop in selection_paste () */
2839 selection_paste (display->root, XA_CUT_BUFFER0, false); 2885 selection_paste (display->root, XA_CUT_BUFFER0, false);
2840} 2886}
2841 2887
2842int 2888int
2843rxvt_term::selection_request_other (Atom target, int selnum) 2889rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2844{ 2890{
2845 Atom sel; 2891 Atom sel;
2846 2892
2847 selection_type |= selnum; 2893 selection_type |= selnum;
2848 2894
… …
2851 else if (selnum == Sel_Secondary) 2897 else if (selnum == Sel_Secondary)
2852 sel = XA_SECONDARY; 2898 sel = XA_SECONDARY;
2853 else 2899 else
2854 sel = xa[XA_CLIPBOARD]; 2900 sel = xa[XA_CLIPBOARD];
2855 2901
2856 if (XGetSelectionOwner (display->display, sel) != None) 2902 if (XGetSelectionOwner (dpy, sel) != None)
2857 { 2903 {
2858 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2904 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2859 vt, selection_request_time); 2905 vt, selection_request_time);
2860 return 1; 2906 return 1;
2861 } 2907 }
2862 2908
2863 return 0; 2909 return 0;
… …
2867/* 2913/*
2868 * Clear all selected text 2914 * Clear all selected text
2869 * EXT: SelectionClear 2915 * EXT: SelectionClear
2870 */ 2916 */
2871void 2917void
2872rxvt_term::selection_clear () 2918rxvt_term::selection_clear () NOTHROW
2873{ 2919{
2874 want_refresh = 1; 2920 want_refresh = 1;
2875 free (selection.text); 2921 free (selection.text);
2876 selection.text = NULL; 2922 selection.text = NULL;
2877 selection.len = 0; 2923 selection.len = 0;
… …
2926 2972
2927 int end_col; 2973 int end_col;
2928 2974
2929 for (; row <= selection.end.row; row++, col = 0) 2975 for (; row <= selection.end.row; row++, col = 0)
2930 { 2976 {
2931#if ENABLE_FRILLS 2977#if !ENABLE_MINIMAL
2932 if (selection.rect) 2978 if (selection.rect)
2933 { 2979 {
2934 col = selection.beg.col; 2980 col = selection.beg.col;
2935 end_col = ncol + 1; 2981 end_col = ncol + 1;
2936 } 2982 }
… …
2939 end_col = ROW(row).l; 2985 end_col = ROW(row).l;
2940 2986
2941 col = max (col, 0); 2987 col = max (col, 0);
2942 2988
2943 if (row == selection.end.row 2989 if (row == selection.end.row
2944#if ENABLE_FRILLS 2990#if !ENABLE_MINIMAL
2945 || selection.rect 2991 || selection.rect
2946#endif 2992#endif
2947 ) 2993 )
2948 min_it (end_col, selection.end.col); 2994 min_it (end_col, selection.end.col);
2949 2995
… …
2972#endif 3018#endif
2973 else 3019 else
2974 new_selection_text[ofs++] = *t++; 3020 new_selection_text[ofs++] = *t++;
2975 } 3021 }
2976 3022
2977#if ENABLE_FRILLS 3023#if !ENABLE_MINIMAL
2978 if (selection.rect) 3024 if (selection.rect)
2979 { 3025 {
2980 while (ofs 3026 while (ofs
2981 && new_selection_text[ofs - 1] != C0_LF 3027 && new_selection_text[ofs - 1] != C0_LF
2982 && unicode::is_space (new_selection_text[ofs - 1])) 3028 && unicode::is_space (new_selection_text[ofs - 1]))
… …
3012 3058
3013 selection_grab (tm); 3059 selection_grab (tm);
3014} 3060}
3015 3061
3016bool 3062bool
3017rxvt_term::selection_grab (Time tm) 3063rxvt_term::selection_grab (Time tm) NOTHROW
3018{ 3064{
3019 selection_time = tm; 3065 selection_time = tm;
3020 3066
3021 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3067 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3022 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3068 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3023 { 3069 {
3024 display->set_selection_owner (this); 3070 display->set_selection_owner (this);
3025 return true; 3071 return true;
3026 } 3072 }
3027 else 3073 else
… …
3031 } 3077 }
3032 3078
3033#if 0 3079#if 0
3034 XTextProperty ct; 3080 XTextProperty ct;
3035 3081
3036 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3082 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3037 { 3083 {
3038 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3084 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3039 XFree (ct.value); 3085 XFree (ct.value);
3040 } 3086 }
3041#endif 3087#endif
… …
3045/* 3091/*
3046 * Mark or select text based upon number of clicks: 1, 2, or 3 3092 * Mark or select text based upon number of clicks: 1, 2, or 3
3047 * EXT: button 1 press 3093 * EXT: button 1 press
3048 */ 3094 */
3049void 3095void
3050rxvt_term::selection_click (int clicks, int x, int y) 3096rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3051{ 3097{
3052 clicks = ((clicks - 1) % 3) + 1; 3098 clicks = ((clicks - 1) % 3) + 1;
3053 selection.clicks = clicks; /* save clicks so extend will work */ 3099 selection.clicks = clicks; /* save clicks so extend will work */
3054 3100
3055 if (clicks == 2 && !selection.rect 3101 if (clicks == 2 && !selection.rect
… …
3074/* ------------------------------------------------------------------------- */ 3120/* ------------------------------------------------------------------------- */
3075/* 3121/*
3076 * Mark a selection at the specified col/row 3122 * Mark a selection at the specified col/row
3077 */ 3123 */
3078void 3124void
3079rxvt_term::selection_start_colrow (int col, int row) 3125rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3080{ 3126{
3081 want_refresh = 1; 3127 want_refresh = 1;
3082 3128
3083 selection.mark.row = row + view_start; 3129 selection.mark.row = row + view_start;
3084 selection.mark.col = col; 3130 selection.mark.col = col;
… …
3087 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3133 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3088 3134
3089 while (selection.mark.col > 0 3135 while (selection.mark.col > 0
3090 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3136 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3091 --selection.mark.col; 3137 --selection.mark.col;
3092 3138
3093 if (selection.op) 3139 if (selection.op)
3140 {
3094 { /* clear the old selection */ 3141 /* clear the old selection */
3095 selection.beg.row = selection.end.row = selection.mark.row; 3142 selection.beg.row = selection.end.row = selection.mark.row;
3096 selection.beg.col = selection.end.col = selection.mark.col; 3143 selection.beg.col = selection.end.col = selection.mark.col;
3097 } 3144 }
3098 3145
3099 selection.op = SELECTION_INIT; 3146 selection.op = SELECTION_INIT;
… …
3110#define DELIMIT_TEXT(x) \ 3157#define DELIMIT_TEXT(x) \
3111 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3158 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3112#define DELIMIT_REND(x) 1 3159#define DELIMIT_REND(x) 1
3113 3160
3114void 3161void
3115rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3162rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3116{ 3163{
3117 int col, row, dirnadd, tcol, trow, w1, w2; 3164 int col, row, dirnadd, tcol, trow, w1, w2;
3118 row_col_t bound; 3165 row_col_t bound;
3119 text_t *stp; 3166 text_t *stp;
3120 rend_t *srp; 3167 rend_t *srp;
… …
3194 * flag == 0 ==> button 1 3241 * flag == 0 ==> button 1
3195 * flag == 1 ==> button 3 press 3242 * flag == 1 ==> button 3 press
3196 * flag == 2 ==> button 3 motion 3243 * flag == 2 ==> button 3 motion
3197 */ 3244 */
3198void 3245void
3199rxvt_term::selection_extend (int x, int y, int flag) 3246rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3200{ 3247{
3201 int col = clamp (Pixel2Col (x), 0, ncol); 3248 int col = clamp (Pixel2Col (x), 0, ncol);
3202 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3249 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3203 3250
3204 /* 3251 /*
… …
3230/* ------------------------------------------------------------------------- */ 3277/* ------------------------------------------------------------------------- */
3231/* 3278/*
3232 * Extend the selection to the specified col/row 3279 * Extend the selection to the specified col/row
3233 */ 3280 */
3234void 3281void
3235rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3282rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3236{ 3283{
3237 row_col_t pos; 3284 row_col_t pos;
3238 enum { 3285 enum {
3239 LEFT, RIGHT 3286 LEFT, RIGHT
3240 } closeto = RIGHT; 3287 } closeto = RIGHT;
… …
3288 * a point/word/line which is either the start or end of the selection 3335 * a point/word/line which is either the start or end of the selection
3289 * and it was decided by whichever point/word/line was `fixed' at the 3336 * and it was decided by whichever point/word/line was `fixed' at the
3290 * time of the most recent button3 press 3337 * time of the most recent button3 press
3291 */ 3338 */
3292 if (button3 && buttonpress) 3339 if (button3 && buttonpress)
3340 {
3293 { /* button3 press */ 3341 /* button3 press */
3294 /* 3342 /*
3295 * first determine which edge of the selection we are closest to 3343 * first determine which edge of the selection we are closest to
3296 */ 3344 */
3297 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3345 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3298 || (!ROWCOL_IS_AFTER (pos, selection.end) 3346 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3316 selection.mark.row = selection.beg.row; 3364 selection.mark.row = selection.beg.row;
3317 selection.mark.col = selection.beg.col; 3365 selection.mark.col = selection.beg.col;
3318 } 3366 }
3319 } 3367 }
3320 else 3368 else
3369 {
3321 { /* button1 drag or button3 drag */ 3370 /* button1 drag or button3 drag */
3322 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3371 if (ROWCOL_IS_AFTER (selection.mark, pos))
3323 { 3372 {
3324 if (selection.mark.row == selection.end.row 3373 if (selection.mark.row == selection.end.row
3325 && selection.mark.col == selection.end.col 3374 && selection.mark.col == selection.end.col
3326 && clickchange 3375 && clickchange
… …
3343 3392
3344 if (selection.clicks == 1) 3393 if (selection.clicks == 1)
3345 { 3394 {
3346 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3395 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3347 && !ROW(selection.beg.row).is_longer () 3396 && !ROW(selection.beg.row).is_longer ()
3348#if ENABLE_FRILLS 3397#if !ENABLE_MINIMAL
3349 && !selection.rect 3398 && !selection.rect
3350#endif 3399#endif
3351 ) 3400 )
3352 selection.beg.col = ncol; 3401 selection.beg.col = ncol;
3353 3402
3354 if ( 3403 if (
3355 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3404 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3356 && !ROW(selection.end.row).is_longer () 3405 && !ROW(selection.end.row).is_longer ()
3357#if ENABLE_FRILLS 3406#if !ENABLE_MINIMAL
3358 && !selection.rect 3407 && !selection.rect
3359#endif 3408#endif
3360 ) 3409 )
3361 selection.end.col = ncol; 3410 selection.end.col = ncol;
3362 } 3411 }
… …
3369 selection_delimit_word (DN, &selection.end, &selection.end); 3418 selection_delimit_word (DN, &selection.end, &selection.end);
3370 } 3419 }
3371 else if (selection.clicks == 3) 3420 else if (selection.clicks == 3)
3372 { 3421 {
3373#if ENABLE_FRILLS 3422#if ENABLE_FRILLS
3374 if (OPTION (Opt_tripleclickwords)) 3423 if (option (Opt_tripleclickwords))
3375 { 3424 {
3376 selection_delimit_word (UP, &selection.beg, &selection.beg); 3425 selection_delimit_word (UP, &selection.beg, &selection.beg);
3377 3426
3378 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3427 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3379 { 3428 {
3380 if (!ROW(end_row).is_longer ()) 3429 if (!ROW(end_row).is_longer ())
3381 { 3430 {
3382 selection.end.row = end_row; 3431 selection.end.row = end_row;
3383 selection.end.col = ROW(end_row).l; 3432 selection.end.col = ROW(end_row).l;
3433# if !ENABLE_MINIMAL
3384 selection_remove_trailing_spaces (); 3434 selection_remove_trailing_spaces ();
3435# endif
3385 break; 3436 break;
3386 } 3437 }
3387 } 3438 }
3388 } 3439 }
3389 else 3440 else
… …
3405 selection.end.row++; 3456 selection.end.row++;
3406 } 3457 }
3407 } 3458 }
3408 3459
3409 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3461 {
3410 { /* mark may need to be changed */ 3462 /* mark may need to be changed */
3411 if (closeto == LEFT) 3463 if (closeto == LEFT)
3412 { 3464 {
3413 selection.mark.row = selection.end.row; 3465 selection.mark.row = selection.end.row;
3414 selection.mark.col = selection.end.col - (selection.clicks == 2); 3466 selection.mark.col = selection.end.col - (selection.clicks == 2);
3415 } 3467 }
… …
3418 selection.mark.row = selection.beg.row; 3470 selection.mark.row = selection.beg.row;
3419 selection.mark.col = selection.beg.col; 3471 selection.mark.col = selection.beg.col;
3420 } 3472 }
3421 } 3473 }
3422 3474
3423#if ENABLE_FRILLS 3475#if !ENABLE_MINIMAL
3424 if (selection.rect && selection.beg.col > selection.end.col) 3476 if (selection.rect && selection.beg.col > selection.end.col)
3425 ::swap (selection.beg.col, selection.end.col); 3477 ::swap (selection.beg.col, selection.end.col);
3426#endif 3478#endif
3427} 3479}
3428 3480
3429#if ENABLE_FRILLS 3481#if !ENABLE_MINIMAL
3430void 3482void
3431rxvt_term::selection_remove_trailing_spaces () 3483rxvt_term::selection_remove_trailing_spaces () NOTHROW
3432{ 3484{
3433 int32_t end_col, end_row; 3485 int32_t end_col, end_row;
3434 text_t *stp; 3486 text_t *stp;
3435 3487
3436 end_col = selection.end.col; 3488 end_col = selection.end.col;
… …
3474/* 3526/*
3475 * Double click on button 3 when already selected 3527 * Double click on button 3 when already selected
3476 * EXT: button 3 double click 3528 * EXT: button 3 double click
3477 */ 3529 */
3478void 3530void
3479rxvt_term::selection_rotate (int x, int y) 3531rxvt_term::selection_rotate (int x, int y) NOTHROW
3480{ 3532{
3481 selection.clicks = selection.clicks % 3 + 1; 3533 selection.clicks = selection.clicks % 3 + 1;
3482 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3534 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3483} 3535}
3484 3536
… …
3486/* 3538/*
3487 * Respond to a request for our current selection 3539 * Respond to a request for our current selection
3488 * EXT: SelectionRequest 3540 * EXT: SelectionRequest
3489 */ 3541 */
3490void 3542void
3491rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3543rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3492{ 3544{
3493 XSelectionEvent ev; 3545 XSelectionEvent ev;
3494 dDisp;
3495 3546
3496 ev.type = SelectionNotify; 3547 ev.type = SelectionNotify;
3497 ev.property = None; 3548 ev.property = None;
3498 ev.display = rq.display; 3549 ev.display = rq.display;
3499 ev.requestor = rq.requestor; 3550 ev.requestor = rq.requestor;
… …
3513 *target++ = xa[XA_COMPOUND_TEXT]; 3564 *target++ = xa[XA_COMPOUND_TEXT];
3514#if X_HAVE_UTF8_STRING 3565#if X_HAVE_UTF8_STRING
3515 *target++ = xa[XA_UTF8_STRING]; 3566 *target++ = xa[XA_UTF8_STRING];
3516#endif 3567#endif
3517 3568
3518 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3569 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3519 32, PropModeReplace, 3570 32, PropModeReplace,
3520 (unsigned char *)target_list, target - target_list); 3571 (unsigned char *)target_list, target - target_list);
3521 ev.property = rq.property; 3572 ev.property = rq.property;
3522 } 3573 }
3523#if TODO // TODO 3574#if TODO // TODO
… …
3526 /* TODO: Handle MULTIPLE */ 3577 /* TODO: Handle MULTIPLE */
3527 } 3578 }
3528#endif 3579#endif
3529 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3580 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3530 { 3581 {
3531 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3582 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3532 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3583 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3533 ev.property = rq.property; 3584 ev.property = rq.property;
3534 } 3585 }
3535 else if (rq.target == XA_STRING 3586 else if (rq.target == XA_STRING
3536 || rq.target == xa[XA_TEXT] 3587 || rq.target == xa[XA_TEXT]
… …
3560 style = enc_string; 3611 style = enc_string;
3561 else if (target == xa[XA_TEXT]) 3612 else if (target == xa[XA_TEXT])
3562 style = enc_text; 3613 style = enc_text;
3563 else if (target == xa[XA_COMPOUND_TEXT]) 3614 else if (target == xa[XA_COMPOUND_TEXT])
3564 style = enc_compound_text; 3615 style = enc_compound_text;
3565#if ENABLE_FRILLS 3616#if !ENABLE_MINIMAL
3566 else if (target == xa[XA_UTF8_STRING]) 3617 else if (target == xa[XA_UTF8_STRING])
3567 style = enc_utf8; 3618 style = enc_utf8;
3568#endif 3619#endif
3569 else 3620 else
3570 { 3621 {
… …
3581 { 3632 {
3582 cl = L""; 3633 cl = L"";
3583 selectlen = 0; 3634 selectlen = 0;
3584 } 3635 }
3585 3636
3586#if ENABLE_FRILLS 3637#if !ENABLE_MINIMAL
3587 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3638 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3588 // so recode it manually 3639 // so recode it manually
3589 if (style == enc_utf8) 3640 if (style == enc_utf8)
3590 { 3641 {
3591 freect = 1; 3642 freect = 1;
… …
3594 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3645 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3595 ct.nitems = strlen ((char *)ct.value); 3646 ct.nitems = strlen ((char *)ct.value);
3596 } 3647 }
3597 else 3648 else
3598#endif 3649#endif
3599 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3650 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3600 freect = 1; 3651 freect = 1;
3601 else 3652 else
3602 { 3653 {
3603 /* if we failed to convert then send it raw */ 3654 /* if we failed to convert then send it raw */
3604 ct.value = (unsigned char *)cl; 3655 ct.value = (unsigned char *)cl;
3605 ct.nitems = selectlen; 3656 ct.nitems = selectlen;
3606 ct.encoding = target; 3657 ct.encoding = target;
3607 } 3658 }
3608 3659
3609 XChangeProperty (disp, rq.requestor, rq.property, 3660 XChangeProperty (dpy, rq.requestor, rq.property,
3610 ct.encoding, 8, PropModeReplace, 3661 ct.encoding, 8, PropModeReplace,
3611 ct.value, (int)ct.nitems); 3662 ct.value, (int)ct.nitems);
3612 ev.property = rq.property; 3663 ev.property = rq.property;
3613 3664
3614 if (freect) 3665 if (freect)
3615 XFree (ct.value); 3666 XFree (ct.value);
3616 } 3667 }
3617 3668
3618 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3669 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3619}
3620
3621/* ------------------------------------------------------------------------- *
3622 * MOUSE ROUTINES *
3623 * ------------------------------------------------------------------------- */
3624
3625/*
3626 * return col/row values corresponding to x/y pixel values
3627 */
3628void
3629rxvt_term::pixel_position (int *x, int *y)
3630{
3631 *x = Pixel2Col (*x);
3632 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3633 *y = Pixel2Row (*y);
3634 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3635} 3670}
3636 3671
3637/* ------------------------------------------------------------------------- */ 3672/* ------------------------------------------------------------------------- */
3638#ifdef USE_XIM 3673#ifdef USE_XIM
3639void 3674void
3640rxvt_term::im_set_position (XPoint &pos) 3675rxvt_term::im_set_position (XPoint &pos) NOTHROW
3641{ 3676{
3642 XWindowAttributes xwa; 3677 XWindowAttributes xwa;
3643 3678
3644 XGetWindowAttributes (display->display, vt, &xwa); 3679 XGetWindowAttributes (dpy, vt, &xwa);
3645 3680
3646 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3681 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3647 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3682 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3648} 3683}
3649#endif 3684#endif
3650 3685
3651#if ENABLE_OVERLAY 3686#if ENABLE_OVERLAY
3652void 3687void
3653rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3688rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3654{ 3689{
3655 if (nrow < 1 || ncol < 1) 3690 if (nrow < 1 || ncol < 1)
3656 return; 3691 return;
3657 3692
3658 want_refresh = 1; 3693 want_refresh = 1;
… …
3703 *rp = r; 3738 *rp = r;
3704 } 3739 }
3705} 3740}
3706 3741
3707void 3742void
3708rxvt_term::scr_overlay_off () 3743rxvt_term::scr_overlay_off () NOTHROW
3709{ 3744{
3710 if (!ov_text) 3745 if (!ov_text)
3711 return; 3746 return;
3712 3747
3713 want_refresh = 1; 3748 want_refresh = 1;
… …
3721 delete [] ov_text; ov_text = 0; 3756 delete [] ov_text; ov_text = 0;
3722 delete [] ov_rend; ov_rend = 0; 3757 delete [] ov_rend; ov_rend = 0;
3723} 3758}
3724 3759
3725void 3760void
3726rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3761rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3727{ 3762{
3728 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3763 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3729 return; 3764 return;
3730 3765
3731 x++, y++; 3766 x++, y++;
… …
3733 ov_text[y][x] = text; 3768 ov_text[y][x] = text;
3734 ov_rend[y][x] = rend; 3769 ov_rend[y][x] = rend;
3735} 3770}
3736 3771
3737void 3772void
3738rxvt_term::scr_overlay_set (int x, int y, const char *s) 3773rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3739{ 3774{
3740 while (*s) 3775 while (*s)
3741 scr_overlay_set (x++, y, *s++); 3776 scr_overlay_set (x++, y, *s++);
3742} 3777}
3743 3778
3744void 3779void
3745rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3780rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3746{ 3781{
3747 while (*s) 3782 while (*s)
3748 { 3783 {
3749 text_t t = *s++; 3784 text_t t = *s++;
3750 int width = wcwidth (t); 3785 int width = WCWIDTH (t);
3751 3786
3752 while (width--) 3787 while (width--)
3753 { 3788 {
3754 scr_overlay_set (x++, y, t); 3789 scr_overlay_set (x++, y, t);
3755 t = NOCHAR; 3790 t = NOCHAR;
3756 } 3791 }
3757 } 3792 }
3758} 3793}
3759 3794
3760void 3795void
3761rxvt_term::scr_swap_overlay () 3796rxvt_term::scr_swap_overlay () NOTHROW
3762{ 3797{
3763 if (!ov_text) 3798 if (!ov_text)
3764 return; 3799 return;
3765 3800
3766 // swap screen mem with overlay 3801 // swap screen mem with overlay

Diff Legend

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