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.240 by root, Thu Jan 19 17:21:20 2006 UTC vs.
Revision 1.308 by root, Tue Jul 15 16:41:22 2008 UTC

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

Diff Legend

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