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.379 by sf-exg, Fri Apr 1 11:06:42 2011 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 <schmorp@schmorp.de>
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 separate compile!
36 34
35static inline void
37inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
38{ 37{
39 while (len--) 38 while (len--)
40 *start++ = value; 39 *start++ = value;
41} 40}
42 41
43/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
44#define PROP_SIZE 256*1024
45#define PASTE_SIZE 32768
46#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
47 44
48/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 48#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 49 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 50 view_start = 0
54#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_ALL_SELECTION() \
… …
85 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 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) \ 83#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) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
88 85
89/* 86/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * 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 */ 88 */
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) \ 89#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 90 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 93 (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 94
114/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
117 98
118/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
119void 100void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const 101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 102{
122 if (!l.t) 103 if (!l.t)
123 { 104 {
124 lalloc (l); 105 lalloc (l);
125 col = 0; 106 col = 0;
126 width = ncol; 107 width = ncol;
127 } 108 }
128 109
129 l.touch (); 110 l.touch ();
130 111
131 efs &= ~RS_baseattrMask; 112 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 113 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 114
134 text_t *et = l.t + col; 115 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 116 rend_t *er = l.r + col;
136 117
… …
142} 123}
143 124
144/* ------------------------------------------------------------------------- */ 125/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 126/* Fill a full line with blanks - make sure it is allocated first */
146void 127void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const 128rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 129{
149 scr_blank_line (l, 0, ncol, efs); 130 scr_blank_line (l, 0, ncol, efs);
150 131
151 l.l = 0; 132 l.l = 0;
152 l.f = 0; 133 l.f = 0;
134}
135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
153} 155}
154 156
155/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
156 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
157 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
… …
174 176
175 if (ncol == prev_ncol && nrow == prev_nrow) 177 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 178 return;
177 179
178 // we need at least two lines for wrapping to work correctly 180 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 181 while (nrow + saveLines < 2)
180 { 182 {
181 //TODO//FIXME 183 //TODO//FIXME
182 saveLines++; 184 saveLines++;
183 prev_nrow--; 185 prev_nrow--;
184 top_row--; 186 top_row--;
… …
195 if (!row_buf) 197 if (!row_buf)
196 { 198 {
197 /* 199 /*
198 * first time called so just malloc everything: don't rely on realloc 200 * first time called so just malloc everything: don't rely on realloc
199 */ 201 */
200 top_row = 0; /* no saved lines */ 202 top_row = 0;
201 term_start = 0; 203 term_start = 0;
202 204
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 205 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 206 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 207
… …
234 selection.text = NULL; 236 selection.text = NULL;
235 selection.len = 0; 237 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 238 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 239 selection.screen = PRIMARY;
238 selection.clicks = 0; 240 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 241 selection.clip_text = NULL;
240 rvideo = 0; 242 selection.clip_len = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 CLEAR_ALL_SELECTION ();
245
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
248 */ 248 */
249 249
250 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); 250 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); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
277 } 277 }
278 278
279 line_t *old_buf = row_buf; 279 line_t *old_buf = row_buf;
280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 281
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
285 285
286 if (top_row) 286 if (top_row)
287 { 287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 // TODO: maybe optimise when width didn't change
290 291
291 row_col_t ocur = screen.cur; 292 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 293 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 294
294 do 295 do
295 { 296 {
296 p = MOD (p - 1, prev_total_rows); 297 p = MOD (p - 1, prev_total_rows);
297#ifdef DEBUG_STRICT
298 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
299#endif
300 int plines = 1; 299 int plines = 1;
301 int llen = old_buf [MOD (p, prev_total_rows)].l; 300 int llen = old_buf [MOD (p, prev_total_rows)].l;
302 301
303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 302 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
304 { 303 {
… …
330 int qcol = 0; 329 int qcol = 0;
331 330
332 // see below for cursor adjustment rationale 331 // see below for cursor adjustment rationale
333 if (p == ocur.row) 332 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow); 333 screen.cur.row = q - (total_rows - nrow);
335 334
336 // fill a single destination line 335 // fill a single destination line
337 while (lofs < llen && qcol < ncol) 336 while (lofs < llen && qcol < ncol)
338 { 337 {
339 int prow = lofs / prev_ncol; 338 int prow = lofs / prev_ncol;
340 int pcol = lofs % prev_ncol; 339 int pcol = lofs % prev_ncol;
… …
350 349
351 line_t &pline = old_buf [prow]; 350 line_t &pline = old_buf [prow];
352 351
353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 352 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
354 353
355 assert (len);
356 assert (pline.t);
357
358 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
359 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
360 356
361 lofs += len; 357 lofs += len;
362 qcol += len; 358 qcol += len;
… …
369 } 365 }
370 while (p != pend && q > 0); 366 while (p != pend && q > 0);
371 367
372 term_start = total_rows - nrow; 368 term_start = total_rows - nrow;
373 top_row = q - term_start; 369 top_row = q - term_start;
374 370
375 // make sure all terminal lines exist 371 // make sure all terminal lines exist
376 while (top_row > 0) 372 while (top_row > 0)
377 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); 373 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
378 } 374 }
379 else 375 else
380 { 376 {
381 // if no scrollback exists (yet), wing, instead of wrap 377 // if no scrollback exists (yet), wing, instead of wrap
382 378
383 for (int row = min (nrow, prev_nrow); row--; ) 379 for (int row = min (nrow, prev_nrow); row--; )
384 { 380 {
385 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 381 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
386 line_t &qline = row_buf [row]; 382 line_t &qline = row_buf [row];
387 383
… …
401 delete old_ta; 397 delete old_ta;
402 delete old_ra; 398 delete old_ra;
403 399
404 clamp_it (screen.cur.row, 0, nrow - 1); 400 clamp_it (screen.cur.row, 0, nrow - 1);
405 clamp_it (screen.cur.col, 0, ncol - 1); 401 clamp_it (screen.cur.col, 0, ncol - 1);
402 }
406 403
407 if (tabs)
408 free (tabs); 404 free (tabs);
409 } 405 tabs = (char *)rxvt_malloc (ncol);
406
407 for (int col = ncol; col--; )
408 tabs [col] = col % TABSIZE == 0;
409
410 CLEAR_ALL_SELECTION ();
410 411
411 prev_nrow = nrow; 412 prev_nrow = nrow;
412 prev_ncol = ncol; 413 prev_ncol = ncol;
413 414
414 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
415
416 for (int col = ncol; col--; )
417 tabs [col] = col % TABSIZE == 0;
418
419 tt_winch (); 415 tt_winch ();
420 416
421 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 417 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
422} 418}
423 419
424/* ------------------------------------------------------------------------- */ 420/* ------------------------------------------------------------------------- */
425/* 421/*
426 * Free everything. That way malloc debugging can find leakage. 422 * Free everything. That way malloc debugging can find leakage.
427 */ 423 */
428void 424void
429rxvt_term::scr_release () 425rxvt_term::scr_release () NOTHROW
430{ 426{
427 if (row_buf)
428 {
431 delete talloc; talloc = 0; 429 delete talloc; talloc = 0;
432 delete ralloc; ralloc = 0; 430 delete ralloc; ralloc = 0;
433 431
434 free (row_buf); 432 free (row_buf);
435 free (swap_buf); 433 free (swap_buf);
436 free (drawn_buf); 434 free (drawn_buf);
437 free (tabs);
438
439 row_buf = 0; // signal that we freed all the arrays 435 row_buf = 0; // signal that we freed all the arrays above
440}
441 436
437 free (tabs);
438 tabs = 0;
439 }
440}
441
442/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
443/* 443/*
444 * Hard reset 444 * Hard/Soft reset
445 */ 445 */
446void 446void
447rxvt_term::scr_poweron () 447rxvt_term::scr_poweron ()
448{ 448{
449 scr_release (); 449 scr_release ();
450 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
451 rvideo_mode = false;
452 scr_soft_reset ();
451 scr_reset (); 453 scr_reset ();
452 454
453 scr_clear (true); 455 scr_clear (true);
454 scr_refresh (); 456 scr_refresh ();
457}
458
459void
460rxvt_term::scr_soft_reset ()
461{
462 /* only affects modes, nothing drastic such as clearing the screen */
463#if ENABLE_OVERLAY
464 scr_overlay_off ();
465#endif
466
467 if (current_screen != PRIMARY)
468 scr_swap_screen ();
469
470 scr_scroll_region (0, MAX_ROWS - 1);
471 scr_rendition (0, ~RS_None);
472 scr_insert_mode (0);
455} 473}
456 474
457/* ------------------------------------------------------------------------- * 475/* ------------------------------------------------------------------------- *
458 * PROCESS SCREEN COMMANDS * 476 * PROCESS SCREEN COMMANDS *
459 * ------------------------------------------------------------------------- */ 477 * ------------------------------------------------------------------------- */
… …
461 * Save and Restore cursor 479 * Save and Restore cursor
462 * XTERM_SEQ: Save cursor : ESC 7 480 * XTERM_SEQ: Save cursor : ESC 7
463 * XTERM_SEQ: Restore cursor: ESC 8 481 * XTERM_SEQ: Restore cursor: ESC 8
464 */ 482 */
465void 483void
466rxvt_term::scr_cursor (int mode) 484rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
467{ 485{
468 screen_t *s; 486 screen_t *s;
469 487
470#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 488#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
471 if (current_screen == SECONDARY) 489 if (current_screen == SECONDARY)
… …
497 } 515 }
498 516
499 /* boundary check in case screen size changed between SAVE and RESTORE */ 517 /* boundary check in case screen size changed between SAVE and RESTORE */
500 min_it (s->cur.row, nrow - 1); 518 min_it (s->cur.row, nrow - 1);
501 min_it (s->cur.col, ncol - 1); 519 min_it (s->cur.col, ncol - 1);
502#ifdef DEBUG_STRICT
503 assert (s->cur.row >= 0); 520 assert (s->cur.row >= 0);
504 assert (s->cur.col >= 0); 521 assert (s->cur.col >= 0);
505#endif 522}
523
524void
525rxvt_term::scr_swap_screen ()
526{
527 if (!option (Opt_secondaryScreen))
528 return;
529
530 for (int i = prev_nrow; i--; )
531 ::swap (ROW(i), swap_buf [i]);
532
533 ::swap (screen.cur, swap.cur);
534
535 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
536 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
506} 537}
507 538
508/* ------------------------------------------------------------------------- */ 539/* ------------------------------------------------------------------------- */
509/* 540/*
510 * Swap between primary and secondary screens 541 * Swap between primary and secondary screens
511 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 542 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
512 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 543 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
513 */ 544 */
514int 545void
515rxvt_term::scr_change_screen (int scrn) 546rxvt_term::scr_change_screen (int scrn)
516{ 547{
548 if (scrn == current_screen)
549 return;
550
517 want_refresh = 1; 551 want_refresh = 1;
518 view_start = 0; 552 view_start = 0;
519 553
520 if (current_screen == scrn)
521 return scrn;
522
523 selection_check (2); /* check for boundary cross */ 554 selection_check (2); /* check for boundary cross */
524 555
525 int i = current_screen; current_screen = scrn; scrn = i; 556 current_screen = scrn;
526
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 557
533#if NSCREENS 558#if NSCREENS
534 if (OPTION (Opt_secondaryScreen)) 559 if (option (Opt_secondaryScreen))
535 { 560 {
536 num_scr = 0; 561 num_scr = 0;
537 562
538 for (int i = prev_nrow; i--; ) 563 scr_swap_screen ();
539 ::swap (ROW(i), swap_buf [i]);
540 564
541 ::swap (screen.charset, swap.charset); 565 ::swap (screen.charset, swap.charset);
542 ::swap (screen.flags, swap.flags); 566 ::swap (screen.flags, swap.flags);
543 screen.flags |= Screen_VisibleCursor; 567 screen.flags |= Screen_VisibleCursor;
544 swap.flags |= Screen_VisibleCursor; 568 swap.flags |= Screen_VisibleCursor;
545 } 569 }
546 else 570 else
547#endif 571#endif
548 if (OPTION (Opt_secondaryScroll)) 572 if (option (Opt_secondaryScroll))
549 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 573 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
550
551 return scrn;
552} 574}
553 575
554// clear WrapNext indicator, solidifying position on next line 576// clear WrapNext indicator, solidifying position on next line
555void 577void
556rxvt_term::scr_do_wrap () 578rxvt_term::scr_do_wrap () NOTHROW
557{ 579{
558 if (!(screen.flags & Screen_WrapNext)) 580 if (!(screen.flags & Screen_WrapNext))
559 return; 581 return;
560 582
561 screen.flags &= ~Screen_WrapNext; 583 screen.flags &= ~Screen_WrapNext;
… …
571/* ------------------------------------------------------------------------- */ 593/* ------------------------------------------------------------------------- */
572/* 594/*
573 * Change the colour for following text 595 * Change the colour for following text
574 */ 596 */
575void 597void
576rxvt_term::scr_color (unsigned int color, int fgbg) 598rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
577{ 599{
578 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) 600 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
579 color = fgbg; 601 color = fgbg;
580 602
581 if (fgbg == Color_fg) 603 if (fgbg == Color_fg)
… …
587/* ------------------------------------------------------------------------- */ 609/* ------------------------------------------------------------------------- */
588/* 610/*
589 * Change the rendition style for following text 611 * Change the rendition style for following text
590 */ 612 */
591void 613void
592rxvt_term::scr_rendition (int set, int style) 614rxvt_term::scr_rendition (int set, int style) NOTHROW
593 { 615{
594 if (set) 616 if (set)
595 rstyle |= style; 617 rstyle |= style;
596 else if (style == ~RS_None) 618 else if (style == ~RS_None)
597 rstyle = DEFAULT_RSTYLE; 619 rstyle = DEFAULT_RSTYLE;
598 else 620 else
599 rstyle &= ~style; 621 rstyle &= ~style;
600 } 622}
601 623
602/* ------------------------------------------------------------------------- */ 624/* ------------------------------------------------------------------------- */
603/* 625/*
604 * Scroll text between <row1> and <row2> inclusive, by <count> lines 626 * Scroll text between <row1> and <row2> inclusive, by <count> lines
605 * count positive ==> scroll up 627 * count positive ==> scroll up
606 * count negative ==> scroll down 628 * count negative ==> scroll down
607 */ 629 */
608int 630int
609rxvt_term::scr_scroll_text (int row1, int row2, int count) 631rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
610{ 632{
611 if (count == 0 || (row1 > row2)) 633 if (count == 0 || (row1 > row2))
612 return 0; 634 return 0;
613 635
614 want_refresh = 1; 636 want_refresh = 1;
615 num_scr += count; 637 num_scr += count;
616 638
617 if (count > 0 639 if (count > 0
618 && row1 == 0 640 && row1 == 0
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 641 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620 { 642 {
621 top_row = max (top_row - count, -saveLines); 643 top_row = max (top_row - count, -saveLines);
622 644
623 // scroll everything up 'count' lines 645 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows; 646 term_start = (term_start + count) % total_rows;
… …
631 } 653 }
632 654
633 // erase newly scrolled-in lines 655 // erase newly scrolled-in lines
634 for (int i = count; i--; ) 656 for (int i = count; i--; )
635 { 657 {
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); 658 line_t &l = ROW(nrow - 1 - i);
639 659
660 // optimize if already cleared, can be significant on slow machines
661 // could be rolled into scr_blank_screen_mem
662 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
663 {
640 scr_blank_line (l, 0, l.l, rstyle); 664 scr_blank_line (l, 0, l.l, rstyle);
641
642 l.l = 0; 665 l.l = 0;
643 l.f = 0; 666 l.f = 0;
667 }
668 else
669 scr_blank_screen_mem (l, rstyle);
644 } 670 }
645 671
646 // now copy lines below the scroll region bottom to the 672 // now copy lines below the scroll region bottom to the
647 // bottom of the screen again, so they look as if they 673 // bottom of the screen again, so they look as if they
648 // hadn't moved. 674 // hadn't moved.
… …
652 line_t &l2 = ROW(i); 678 line_t &l2 = ROW(i);
653 679
654 ::swap (l1, l2); 680 ::swap (l1, l2);
655 l2.touch (); 681 l2.touch ();
656 } 682 }
657 683
658 // move and/or clear selection, if any 684 // move and/or clear selection, if any
659 if (selection.op && current_screen == selection.screen) 685 if (selection.op && current_screen == selection.screen)
660 { 686 {
661 selection.beg.row -= count; 687 selection.beg.row -= count;
662 selection.end.row -= count; 688 selection.end.row -= count;
… …
670 selection.op = SELECTION_CLEAR; 696 selection.op = SELECTION_CLEAR;
671 } 697 }
672 } 698 }
673 699
674 // finally move the view window, if desired 700 // finally move the view window, if desired
675 if (OPTION (Opt_scrollWithBuffer) 701 if (option (Opt_scrollWithBuffer)
676 && view_start != 0 702 && view_start != 0
677 && view_start != -saveLines) 703 && view_start != -saveLines)
678 scr_page (UP, count); 704 scr_page (UP, count);
679 705
680 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 706 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
698 { 724 {
699 /* move selected region too */ 725 /* move selected region too */
700 selection.beg.row -= count; 726 selection.beg.row -= count;
701 selection.end.row -= count; 727 selection.end.row -= count;
702 selection.mark.row -= count; 728 selection.mark.row -= count;
703 729
704 selection_check (0); 730 selection_check (0);
705 } 731 }
706 } 732 }
707 733
708 // use a simple and robust scrolling algorithm, this 734 // use a simple and robust scrolling algorithm, this
… …
732/* ------------------------------------------------------------------------- */ 758/* ------------------------------------------------------------------------- */
733/* 759/*
734 * Add text given in <str> of length <len> to screen struct 760 * Add text given in <str> of length <len> to screen struct
735 */ 761 */
736void 762void
737rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 763rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
738{ 764{
739 if (len <= 0) /* sanity */ 765 if (len <= 0) /* sanity */
740 return; 766 return;
741 767
742 unsigned char checksel; 768 unsigned char checksel;
… …
748 ZERO_SCROLLBACK (); 774 ZERO_SCROLLBACK ();
749 775
750 if (minlines > 0) 776 if (minlines > 0)
751 { 777 {
752 minlines += screen.cur.row - screen.bscroll; 778 minlines += screen.cur.row - screen.bscroll;
779 min_it (minlines, screen.cur.row - top_row);
753 780
754 if (minlines > 0 781 if (minlines > 0
755 && screen.tscroll == 0 782 && screen.tscroll == 0
756 && screen.bscroll == nrow - 1) 783 && screen.bscroll == nrow - 1)
757 { 784 {
… …
759 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 786 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
760 screen.cur.row -= minlines; 787 screen.cur.row -= minlines;
761 } 788 }
762 } 789 }
763 790
764#ifdef DEBUG_STRICT
765 assert (screen.cur.col < ncol); 791 assert (screen.cur.col < ncol);
766 assert (screen.cur.row < nrow 792 assert (screen.cur.row < nrow
767 && screen.cur.row >= top_row); 793 && screen.cur.row >= top_row);
768#endif
769 int row = screen.cur.row; 794 int row = screen.cur.row;
770 795
771 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 796 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
772 797
773 line_t *line = &ROW(row); 798 line_t *line = &ROW(row);
774 799
775 while (str < strend) 800 while (str < strend)
776 { 801 {
777 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 802 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
778 803
779 if (c < 0x20) 804 if (expect_false (c < 0x20))
780 if (c == C0_LF) 805 if (c == C0_LF)
781 { 806 {
782 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
783 808
784 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
… …
803 { 828 {
804 scr_tab (1, true); 829 scr_tab (1, true);
805 continue; 830 continue;
806 } 831 }
807 832
833 if (expect_false (
808 if (checksel /* see if we're writing within selection */ 834 checksel /* see if we're writing within selection */
809 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 835 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
810 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 836 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
837 ))
811 { 838 {
812 checksel = 0; 839 checksel = 0;
813 /* 840 /*
814 * If we wrote anywhere in the selected area, kill the selection 841 * If we wrote anywhere in the selected area, kill the selection
815 * XXX: should we kill the mark too? Possibly, but maybe that 842 * XXX: should we kill the mark too? Possibly, but maybe that
816 * should be a similar check. 843 * should be a similar check.
817 */ 844 */
818 CLEAR_SELECTION (); 845 CLEAR_SELECTION ();
819 } 846 }
820 847
821 if (screen.flags & Screen_WrapNext) 848 if (expect_false (screen.flags & Screen_WrapNext))
822 { 849 {
823 scr_do_wrap (); 850 scr_do_wrap ();
824 851
825 line->l = ncol; 852 line->l = ncol;
826 line->is_longer (1); 853 line->is_longer (1);
827 854
828 row = screen.cur.row; 855 row = screen.cur.row;
829 line = &ROW(row); /* _must_ refresh */ 856 line = &ROW(row); /* _must_ refresh */
830 } 857 }
831 858
832 // some utf-8 decoders "decode" surrogate characters: let's fix this. 859 // some utf-8 decoders "decode" surrogate characters: let's fix this.
833 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 860 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
834 c = 0xfffd; 861 c = 0xfffd;
835 862
836 // rely on wcwidth to tell us the character width, at least for non-latin1 863 // rely on wcwidth to tell us the character width, do wcwidth before
837 // do wcwidth before further replacements, as wcwidth might return -1 864 // 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 865 // drawing characters below as they might be invalid in the current
839 // locale. 866 // locale.
840 int width = c < 0x100 ? 1 : wcwidth (c); 867 int width = WCWIDTH (c);
841 868
842 if (charsets [screen.charset] == '0') // DEC SPECIAL 869 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
843 { 870 {
844 // vt100 special graphics and line drawing 871 // vt100 special graphics and line drawing
845 // 5f-7e standard vt100 872 // 5f-7e standard vt100
846 // 40-5e rxvt extension for extra curses acs chars 873 // 40-5e rxvt extension for extra curses acs chars
847 static uint16_t vt100_0[62] = { // 41 .. 7e 874 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
860 c = vt100_0[c - 0x41]; 887 c = vt100_0[c - 0x41];
861 width = 1; // vt100 line drawing characters are always single-width 888 width = 1; // vt100 line drawing characters are always single-width
862 } 889 }
863 } 890 }
864 891
865 if (screen.flags & Screen_Insert) 892 if (expect_false (screen.flags & Screen_Insert))
866 scr_insdel_chars (width, INSERT); 893 scr_insdel_chars (width, INSERT);
867 894
868 if (width != 0) 895 if (width != 0)
869 { 896 {
870#if !UNICODE_3 897#if !UNICODE_3
… …
875# else 902# else
876 c = 0xfffd; 903 c = 0xfffd;
877# endif 904# endif
878#endif 905#endif
879 906
907 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
908
909 // if the character doesn't fit into the remaining columns...
910 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
911 {
912 if (screen.flags & Screen_Autowrap)
913 {
914 // ... artificially enlargen the previous one
915 c = NOCHAR;
916 // and try the same character next loop iteration
917 --str;
918 }
919 else
920 screen.cur.col = ncol - width;
921 }
922
880 // nuke the character at this position, if required 923 // nuke the character at this position, if required
924 // due to wonderful coincidences everywhere else in this loop
925 // we never have to check for overwriting a wide char itself,
926 // only its tail.
881 if (line->t[screen.cur.col] == NOCHAR 927 if (expect_false (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 928 scr_kill_char (*line, screen.cur.col);
883 && line->t[screen.cur.col + 1] == NOCHAR))
884 {
885 int col = screen.cur.col;
886
887 // find begin
888 while (col > 0 && line->t[col] == NOCHAR)
889 col--;
890
891 rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
892
893 // found begin, nuke
894 do {
895 line->t[col] = ' ';
896 line->r[col] = rend;
897 col++;
898 } while (col < ncol && line->t[col] == NOCHAR);
899 }
900
901 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
902
903 // if the character doesn't fit into the remaining columns...
904 if (screen.cur.col > ncol - width && ncol >= width)
905 {
906 // ...output spaces
907 c = ' ';
908 // and try the same character next loop iteration
909 --str;
910 }
911 929
912 line->touch (); 930 line->touch ();
913 931
914 do 932 do
915 { 933 {
916 line->t[screen.cur.col] = c; 934 line->t[screen.cur.col] = c;
917 line->r[screen.cur.col] = rend; 935 line->r[screen.cur.col] = rend;
918 936
919 if (screen.cur.col < ncol - 1) 937 if (expect_true (screen.cur.col < ncol - 1))
920 screen.cur.col++; 938 screen.cur.col++;
921 else 939 else
922 { 940 {
923 line->l = ncol; 941 line->l = ncol;
924 if (screen.flags & Screen_Autowrap) 942 if (screen.flags & Screen_Autowrap)
925 screen.flags |= Screen_WrapNext; 943 screen.flags |= Screen_WrapNext;
926 break; 944
945 goto end_of_line;
927 } 946 }
928 947
929 c = NOCHAR; 948 c = NOCHAR;
930 } 949 }
931 while (--width > 0); 950 while (expect_false (--width > 0));
932 951
933 // pad with spaces when overwriting wide character with smaller one 952 // pad with spaces when overwriting wide character with smaller one
934 if (!width) 953 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
935 { 954 {
936 line->touch (); 955 line->t[c] = ' ';
956 line->r[c] = rend;
957 }
937 958
938 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 959end_of_line:
960 ;
961 }
962#if ENABLE_COMBINING
963 else // width == 0
964 {
965 if (c != 0xfeff) // ignore BOM
966 {
967 // handle combining characters
968 // we just tag the accent on the previous on-screen character.
969 // this is arguably not correct, but also arguably not wrong.
970 // we don't handle double-width characters nicely yet.
971 line_t *linep;
972 text_t *tp;
973 rend_t *rp;
974
975 if (screen.cur.col > 0)
939 { 976 {
940 line->t[c] = ' ';
941 line->r[c] = rend; 977 linep = line;
978 tp = line->t + screen.cur.col - 1;
979 rp = line->r + screen.cur.col - 1;
942 } 980 }
981 else if (screen.cur.row > 0
982 && ROW(screen.cur.row - 1).is_longer ())
983 {
984 linep = &ROW(screen.cur.row - 1);
985 tp = line->t + ncol - 1;
986 rp = line->r + ncol - 1;
987 }
988 else
989 continue;
990
991 linep->touch ();
992
993 while (*tp == NOCHAR && tp > linep->t)
994 tp--, rp--;
995
996 // first try to find a precomposed character
997 unicode_t n = rxvt_compose (*tp, c);
998 if (n == NOCHAR)
999 n = rxvt_composite.compose (*tp, c);
1000
1001 *tp = n;
1002 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
943 } 1003 }
944 } 1004 }
945 else // width == 0
946 {
947#if ENABLE_COMBINING
948 // handle combining characters
949 // we just tag the accent on the previous on-screen character.
950 // this is arguably not correct, but also arguably not wrong.
951 // we don't handle double-width characters nicely yet.
952 line_t *linep;
953 text_t *tp;
954 rend_t *rp;
955
956 if (screen.cur.col > 0)
957 {
958 linep = line;
959 tp = line->t + screen.cur.col - 1;
960 rp = line->r + screen.cur.col - 1;
961 }
962 else if (screen.cur.row > 0
963 && ROW(screen.cur.row - 1).is_longer ())
964 {
965 linep = &ROW(screen.cur.row - 1);
966 tp = line->t + ncol - 1;
967 rp = line->r + ncol - 1;
968 }
969 else
970 continue;
971
972 linep->touch ();
973
974 while (*tp == NOCHAR && tp > linep->t)
975 tp--, rp--;
976
977 // first try to find a precomposed character
978 unicode_t n = rxvt_compose (*tp, c);
979 if (n == NOCHAR)
980 n = rxvt_composite.compose (*tp, c);
981
982 *tp = n;
983 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
984#endif 1005#endif
985 }
986 } 1006 }
987 1007
988 max_it (line->l, screen.cur.col); 1008 max_it (line->l, screen.cur.col);
989 1009
990#ifdef DEBUG_STRICT
991 assert (screen.cur.row >= 0); 1010 assert (screen.cur.row >= 0);
992#endif
993} 1011}
994 1012
995/* ------------------------------------------------------------------------- */ 1013/* ------------------------------------------------------------------------- */
996/* 1014/*
997 * Process Backspace. Move back the cursor back a position, wrap if have to 1015 * Process Backspace. Move back the cursor back a position, wrap if have to
998 * XTERM_SEQ: CTRL-H 1016 * XTERM_SEQ: CTRL-H
999 */ 1017 */
1000void 1018void
1001rxvt_term::scr_backspace () 1019rxvt_term::scr_backspace () NOTHROW
1002{ 1020{
1003 want_refresh = 1;
1004
1005 if (screen.cur.col == 0) 1021 if (screen.cur.col == 0)
1006 { 1022 {
1007 if (screen.cur.row > 0) 1023 if (screen.cur.row > 0)
1008 { 1024 {
1009#ifdef TERMCAP_HAS_BW 1025#ifdef TERMCAP_HAS_BW
1010 screen.cur.col = ncol - 1; 1026 screen.cur.col = ncol - 1;
1011 screen.cur.row--; 1027 --screen.cur.row;
1012 return; 1028
1029 want_refresh = 1;
1013#endif 1030#endif
1014 } 1031 }
1015 } 1032 }
1016 else if (!(screen.flags & Screen_WrapNext)) 1033 else if (screen.flags & Screen_WrapNext)
1034 screen.flags &= ~Screen_WrapNext;
1035 else
1017 scr_gotorc (0, -1, RELATIVE); 1036 scr_gotorc (0, -1, RELATIVE);
1018
1019 screen.flags &= ~Screen_WrapNext;
1020} 1037}
1021 1038
1022/* ------------------------------------------------------------------------- */ 1039/* ------------------------------------------------------------------------- */
1023/* 1040/*
1024 * Process Horizontal Tab 1041 * Process Horizontal Tab
1025 * count: +ve = forward; -ve = backwards 1042 * count: +ve = forward; -ve = backwards
1026 * XTERM_SEQ: CTRL-I 1043 * XTERM_SEQ: CTRL-I
1027 */ 1044 */
1028void 1045void
1029rxvt_term::scr_tab (int count, bool ht) 1046rxvt_term::scr_tab (int count, bool ht) NOTHROW
1030{ 1047{
1031 int i, x; 1048 int i, x;
1032 1049
1033 want_refresh = 1; 1050 want_refresh = 1;
1034 i = x = screen.cur.col; 1051 i = x = screen.cur.col;
… …
1047 x = i; 1064 x = i;
1048 1065
1049 if (!--count) 1066 if (!--count)
1050 break; 1067 break;
1051 } 1068 }
1052 else 1069 else
1053 ht &= l.t[i] == ' ' 1070 ht &= l.t[i] == ' '
1054 && RS_SAME (l.r[i], base_rend); 1071 && RS_SAME (l.r[i], base_rend);
1055 1072
1056 if (count) 1073 if (count)
1057 x = ncol - 1; 1074 x = ncol - 1;
1058 1075
1059 // store horizontal tab commands as characters inside the text 1076 // store horizontal tab commands as characters inside the text
1060 // buffer so they can be selected and pasted. 1077 // buffer so they can be selected and pasted.
1061 if (ht && OPTION (Opt_pastableTabs)) 1078 if (ht && option (Opt_pastableTabs))
1062 { 1079 {
1063 base_rend = SET_FONT (base_rend, 0); 1080 base_rend = SET_FONT (base_rend, 0);
1064 1081
1065 l.touch (x); 1082 l.touch (x);
1066 1083
… …
1099 * Process DEC Back Index 1116 * Process DEC Back Index
1100 * XTERM_SEQ: ESC 6 1117 * XTERM_SEQ: ESC 6
1101 * Move cursor left in row. If we're at the left boundary, shift everything 1118 * Move cursor left in row. If we're at the left boundary, shift everything
1102 * in that row right. Clear left column. 1119 * in that row right. Clear left column.
1103 */ 1120 */
1104#if ENABLE_FRILLS 1121#if !ENABLE_MINIMAL
1105void 1122void
1106rxvt_term::scr_backindex () 1123rxvt_term::scr_backindex () NOTHROW
1107{ 1124{
1108 if (screen.cur.col > 0) 1125 if (screen.cur.col > 0)
1109 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1126 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1110 else 1127 else
1111 scr_insdel_chars (1, INSERT); 1128 scr_insdel_chars (1, INSERT);
… …
1116 * Process DEC Forward Index 1133 * Process DEC Forward Index
1117 * XTERM_SEQ: ESC 9 1134 * XTERM_SEQ: ESC 9
1118 * Move cursor right in row. If we're at the right boundary, shift everything 1135 * Move cursor right in row. If we're at the right boundary, shift everything
1119 * in that row left. Clear right column. 1136 * in that row left. Clear right column.
1120 */ 1137 */
1121#if ENABLE_FRILLS 1138#if !ENABLE_MINIMAL
1122void 1139void
1123rxvt_term::scr_forwardindex () 1140rxvt_term::scr_forwardindex () NOTHROW
1124{ 1141{
1125 if (screen.cur.col < ncol - 1) 1142 if (screen.cur.col < ncol - 1)
1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1143 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1127 else 1144 else
1128 { 1145 {
… …
1141/* ------------------------------------------------------------------------- */ 1158/* ------------------------------------------------------------------------- */
1142/* 1159/*
1143 * Goto Row/Column 1160 * Goto Row/Column
1144 */ 1161 */
1145void 1162void
1146rxvt_term::scr_gotorc (int row, int col, int relative) 1163rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1147{ 1164{
1148 want_refresh = 1; 1165 want_refresh = 1;
1149 ZERO_SCROLLBACK (); 1166 ZERO_SCROLLBACK ();
1150 1167
1151 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1168 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1173 } 1190 }
1174 } 1191 }
1175 else 1192 else
1176 { 1193 {
1177 if (screen.flags & Screen_Relative) 1194 if (screen.flags & Screen_Relative)
1195 {
1178 { /* relative origin mode */ 1196 /* relative origin mode */
1179 screen.cur.row = row + screen.tscroll; 1197 screen.cur.row = row + screen.tscroll;
1180 min_it (screen.cur.row, screen.bscroll); 1198 min_it (screen.cur.row, screen.bscroll);
1181 } 1199 }
1182 else 1200 else
1183 screen.cur.row = row; 1201 screen.cur.row = row;
… …
1189/* ------------------------------------------------------------------------- */ 1207/* ------------------------------------------------------------------------- */
1190/* 1208/*
1191 * direction should be UP or DN 1209 * direction should be UP or DN
1192 */ 1210 */
1193void 1211void
1194rxvt_term::scr_index (enum page_dirn direction) 1212rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1195{ 1213{
1196 int dirn; 1214 int dirn;
1197 1215
1198 want_refresh = 1; 1216 want_refresh = 1;
1199 ZERO_SCROLLBACK (); 1217 ZERO_SCROLLBACK ();
… …
1216/* 1234/*
1217 * Erase part or whole of a line 1235 * Erase part or whole of a line
1218 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1236 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1219 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1237 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1220 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1238 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1239 * extension: clear to right unless wrapped: ESC [ 3 K
1221 */ 1240 */
1222void 1241void
1223rxvt_term::scr_erase_line (int mode) 1242rxvt_term::scr_erase_line (int mode) NOTHROW
1224{ 1243{
1225 unsigned int col, num; 1244 unsigned int col, num;
1226 1245
1227 want_refresh = 1; 1246 want_refresh = 1;
1228 ZERO_SCROLLBACK (); 1247 ZERO_SCROLLBACK ();
… …
1234 line.touch (); 1253 line.touch ();
1235 line.is_longer (0); 1254 line.is_longer (0);
1236 1255
1237 switch (mode) 1256 switch (mode)
1238 { 1257 {
1258 case 3:
1259 if (screen.flags & Screen_WrapNext)
1260 return;
1261
1262 /* fall through */
1263
1239 case 0: /* erase to end of line */ 1264 case 0: /* erase to end of line */
1240 col = screen.cur.col; 1265 col = screen.cur.col;
1241 num = ncol - col; 1266 num = ncol - col;
1242 min_it (line.l, col); 1267 min_it (line.l, col);
1268
1243 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1244 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1245 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1246 break; 1272 break;
1273
1247 case 1: /* erase to beginning of line */ 1274 case 1: /* erase to beginning of line */
1248 col = 0; 1275 col = 0;
1249 num = screen.cur.col + 1; 1276 num = screen.cur.col + 1;
1277
1250 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1278 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1251 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1279 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1252 CLEAR_SELECTION (); 1280 CLEAR_SELECTION ();
1253 break; 1281 break;
1282
1254 case 2: /* erase whole line */ 1283 case 2: /* erase whole line */
1255 col = 0; 1284 col = 0;
1256 num = ncol; 1285 num = ncol;
1257 line.l = 0; 1286 line.l = 0;
1258 if (selection.beg.row <= screen.cur.row 1287 if (selection.beg.row <= screen.cur.row
… …
1272 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1301 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1273 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1302 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1274 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1303 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1275 */ 1304 */
1276void 1305void
1277rxvt_term::scr_erase_screen (int mode) 1306rxvt_term::scr_erase_screen (int mode) NOTHROW
1278{ 1307{
1279 int num; 1308 int num;
1280 int32_t row; 1309 int32_t row;
1281 rend_t ren; 1310 rend_t ren;
1282 XGCValues gcvalue; 1311 XGCValues gcvalue;
… …
1316 if (row >= nrow) /* Out Of Bounds */ 1345 if (row >= nrow) /* Out Of Bounds */
1317 return; 1346 return;
1318 1347
1319 min_it (num, nrow - row); 1348 min_it (num, nrow - row);
1320 1349
1321 if (rstyle & (RS_RVid | RS_Uline)) 1350 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1322 ren = (rend_t) ~RS_None; 1351 ren = (rend_t) ~RS_None;
1323 else if (GET_BASEBG (rstyle) == Color_bg) 1352 else if (GET_BASEBG (rstyle) == Color_bg)
1324 { 1353 {
1325 ren = DEFAULT_RSTYLE; 1354 ren = DEFAULT_RSTYLE;
1326 CLEAR_ROWS (row, num); 1355
1356 if (mapped)
1357 XClearArea (dpy, vt, 0,
1358 Row2Pixel (row - view_start), (unsigned int)width,
1359 (unsigned int)Height2Pixel (num), False);
1327 } 1360 }
1328 else 1361 else
1329 { 1362 {
1330 ren = rstyle & (RS_fgMask | RS_bgMask); 1363 ren = rstyle & (RS_fgMask | RS_bgMask);
1364
1365 if (mapped)
1366 {
1331 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1367 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1332 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1333 ERASE_ROWS (row, num); 1369 XFillRectangle (dpy, vt, gc,
1370 0, Row2Pixel (row - view_start),
1371 (unsigned int)width,
1372 (unsigned int)Height2Pixel (num));
1334 gcvalue.foreground = pix_colors[Color_fg]; 1373 gcvalue.foreground = pix_colors[Color_fg];
1335 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1374 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1375 }
1336 } 1376 }
1337 1377
1338 for (; num--; row++) 1378 for (; num--; row++)
1339 { 1379 {
1340 scr_blank_screen_mem (ROW(row), rstyle); 1380 scr_blank_screen_mem (ROW(row), rstyle);
1381
1382 if (row - view_start < nrow)
1341 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1383 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1342 } 1384 }
1343} 1385}
1344 1386
1345#if ENABLE_FRILLS 1387#if !ENABLE_MINIMAL
1346void 1388void
1347rxvt_term::scr_erase_savelines () 1389rxvt_term::scr_erase_savelines () NOTHROW
1348{ 1390{
1349 want_refresh = 1; 1391 want_refresh = 1;
1350 ZERO_SCROLLBACK (); 1392 ZERO_SCROLLBACK ();
1351 1393
1352 top_row = 0; 1394 top_row = 0;
… …
1357/* 1399/*
1358 * Fill the screen with `E's 1400 * Fill the screen with `E's
1359 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1401 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1360 */ 1402 */
1361void 1403void
1362rxvt_term::scr_E () 1404rxvt_term::scr_E () NOTHROW
1363{ 1405{
1364 rend_t fs; 1406 rend_t fs;
1365 1407
1366 want_refresh = 1; 1408 want_refresh = 1;
1367 ZERO_SCROLLBACK (); 1409 ZERO_SCROLLBACK ();
… …
1388/* ------------------------------------------------------------------------- */ 1430/* ------------------------------------------------------------------------- */
1389/* 1431/*
1390 * Insert/Delete <count> lines 1432 * Insert/Delete <count> lines
1391 */ 1433 */
1392void 1434void
1393rxvt_term::scr_insdel_lines (int count, int insdel) 1435rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1394{ 1436{
1395 int end; 1437 int end;
1396 1438
1397 ZERO_SCROLLBACK (); 1439 ZERO_SCROLLBACK ();
1398 1440
… …
1418/* ------------------------------------------------------------------------- */ 1460/* ------------------------------------------------------------------------- */
1419/* 1461/*
1420 * Insert/Delete <count> characters from the current position 1462 * Insert/Delete <count> characters from the current position
1421 */ 1463 */
1422void 1464void
1423rxvt_term::scr_insdel_chars (int count, int insdel) 1465rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1424{ 1466{
1425 int col, row;
1426 rend_t tr;
1427
1428 want_refresh = 1; 1467 want_refresh = 1;
1429 ZERO_SCROLLBACK (); 1468 ZERO_SCROLLBACK ();
1430 1469
1431 if (count <= 0) 1470 if (count <= 0)
1432 return; 1471 return;
… …
1434 scr_do_wrap (); 1473 scr_do_wrap ();
1435 1474
1436 selection_check (1); 1475 selection_check (1);
1437 min_it (count, ncol - screen.cur.col); 1476 min_it (count, ncol - screen.cur.col);
1438 1477
1439 row = screen.cur.row; 1478 int row = screen.cur.row;
1440 1479
1441 line_t *line = &ROW(row); 1480 line_t *line = &ROW(row);
1442 1481
1443 line->touch (); 1482 line->touch ();
1444 line->is_longer (0); 1483 line->is_longer (0);
1445 1484
1485 // nuke wide spanning the start
1486 if (line->t[screen.cur.col] == NOCHAR)
1487 scr_kill_char (*line, screen.cur.col);
1488
1446 switch (insdel) 1489 switch (insdel)
1447 { 1490 {
1448 case INSERT: 1491 case INSERT:
1449 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1492 line->l = min (line->l + count, ncol);
1493
1494 if (line->t[screen.cur.col] == NOCHAR)
1495 scr_kill_char (*line, screen.cur.col);
1496
1497 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1450 { 1498 {
1451 line->t[col] = line->t[col - count]; 1499 line->t[col] = line->t[col - count];
1452 line->r[col] = line->r[col - count]; 1500 line->r[col] = line->r[col - count];
1453 } 1501 }
1454
1455 line->l = min (line->l + count, ncol);
1456 1502
1457 if (selection.op && current_screen == selection.screen 1503 if (selection.op && current_screen == selection.screen
1458 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1504 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1459 { 1505 {
1460 if (selection.end.row != screen.cur.row 1506 if (selection.end.row != screen.cur.row
1461 || (selection.end.col + count >= ncol)) 1507 || (selection.end.col + count >= ncol))
1462 CLEAR_SELECTION (); 1508 CLEAR_SELECTION ();
1463 else 1509 else
1510 {
1464 { /* shift selection */ 1511 /* shift selection */
1465 selection.beg.col += count; 1512 selection.beg.col += count;
1466 selection.mark.col += count; /* XXX: yes? */ 1513 selection.mark.col += count; /* XXX: yes? */
1467 selection.end.col += count; 1514 selection.end.col += count;
1468 } 1515 }
1469 } 1516 }
… …
1474 case ERASE: 1521 case ERASE:
1475 screen.cur.col += count; /* don't worry if > ncol */ 1522 screen.cur.col += count; /* don't worry if > ncol */
1476 selection_check (1); 1523 selection_check (1);
1477 screen.cur.col -= count; 1524 screen.cur.col -= count;
1478 1525
1479 line->l = max (line->l - count, 0); 1526 // nuke wide char after the end
1527 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1528 scr_kill_char (*line, screen.cur.col + count);
1529
1480 scr_blank_line (*line, screen.cur.col, count, rstyle); 1530 scr_blank_line (*line, screen.cur.col, count, rstyle);
1481 break; 1531 break;
1482 1532
1483 case DELETE: 1533 case DELETE:
1484 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1534 line->l = max (line->l - count, 0);
1485 1535
1536 // nuke wide char spanning the end
1537 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1538 scr_kill_char (*line, screen.cur.col + count);
1539
1486 for (col = screen.cur.col; (col + count) < ncol; col++) 1540 for (int col = screen.cur.col; (col + count) < ncol; col++)
1487 { 1541 {
1488 line->t[col] = line->t[col + count]; 1542 line->t[col] = line->t[col + count];
1489 line->r[col] = line->r[col + count]; 1543 line->r[col] = line->r[col + count];
1490 } 1544 }
1491 1545
1492 line->l = max (line->l - count, 0);
1493 scr_blank_line (*line, ncol - count, count, tr); 1546 scr_blank_line (*line, ncol - count, count, rstyle);
1494 1547
1495 if (selection.op && current_screen == selection.screen 1548 if (selection.op && current_screen == selection.screen
1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1549 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1497 { 1550 {
1498 if (selection.end.row != screen.cur.row 1551 if (selection.end.row != screen.cur.row
… …
1516/* 1569/*
1517 * Set the scrolling region 1570 * Set the scrolling region
1518 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1571 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1519 */ 1572 */
1520void 1573void
1521rxvt_term::scr_scroll_region (int top, int bot) 1574rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1522{ 1575{
1523 max_it (top, 0); 1576 max_it (top, 0);
1524 min_it (bot, nrow - 1); 1577 min_it (bot, nrow - 1);
1525 1578
1526 if (top > bot) 1579 if (top > bot)
… …
1536 * Make the cursor visible/invisible 1589 * Make the cursor visible/invisible
1537 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1590 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1538 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1591 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1539 */ 1592 */
1540void 1593void
1541rxvt_term::scr_cursor_visible (int mode) 1594rxvt_term::scr_cursor_visible (int mode) NOTHROW
1542{ 1595{
1543 want_refresh = 1; 1596 want_refresh = 1;
1544 1597
1545 if (mode) 1598 if (mode)
1546 screen.flags |= Screen_VisibleCursor; 1599 screen.flags |= Screen_VisibleCursor;
… …
1553 * Set/unset automatic wrapping 1606 * Set/unset automatic wrapping
1554 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1607 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1555 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1608 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1556 */ 1609 */
1557void 1610void
1558rxvt_term::scr_autowrap (int mode) 1611rxvt_term::scr_autowrap (int mode) NOTHROW
1559{ 1612{
1560 if (mode) 1613 if (mode)
1561 screen.flags |= Screen_Autowrap; 1614 screen.flags |= Screen_Autowrap;
1562 else 1615 else
1563 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1616 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1572 * and the cursor cannot be moved outside. 1625 * and the cursor cannot be moved outside.
1573 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1626 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1574 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1627 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1575 */ 1628 */
1576void 1629void
1577rxvt_term::scr_relative_origin (int mode) 1630rxvt_term::scr_relative_origin (int mode) NOTHROW
1578{ 1631{
1579 if (mode) 1632 if (mode)
1580 screen.flags |= Screen_Relative; 1633 screen.flags |= Screen_Relative;
1581 else 1634 else
1582 screen.flags &= ~Screen_Relative; 1635 screen.flags &= ~Screen_Relative;
… …
1589 * Set insert/replace mode 1642 * Set insert/replace mode
1590 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1643 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1591 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1644 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1592 */ 1645 */
1593void 1646void
1594rxvt_term::scr_insert_mode (int mode) 1647rxvt_term::scr_insert_mode (int mode) NOTHROW
1595{ 1648{
1596 if (mode) 1649 if (mode)
1597 screen.flags |= Screen_Insert; 1650 screen.flags |= Screen_Insert;
1598 else 1651 else
1599 screen.flags &= ~Screen_Insert; 1652 screen.flags &= ~Screen_Insert;
… …
1605 * XTERM_SEQ: Set tab at current column : ESC H 1658 * XTERM_SEQ: Set tab at current column : ESC H
1606 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1659 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1607 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1660 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1608 */ 1661 */
1609void 1662void
1610rxvt_term::scr_set_tab (int mode) 1663rxvt_term::scr_set_tab (int mode) NOTHROW
1611{ 1664{
1612 if (mode < 0) 1665 if (mode < 0)
1613 memset (tabs, 0, ncol * sizeof (char)); 1666 memset (tabs, 0, ncol);
1614 else if (screen.cur.col < ncol) 1667 else if (screen.cur.col < ncol)
1615 tabs [screen.cur.col] = !!mode; 1668 tabs [screen.cur.col] = !!mode;
1616} 1669}
1617 1670
1618/* ------------------------------------------------------------------------- */ 1671/* ------------------------------------------------------------------------- */
… …
1620 * Set reverse/normal video 1673 * Set reverse/normal video
1621 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1674 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1622 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1675 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1623 */ 1676 */
1624void 1677void
1625rxvt_term::scr_rvideo_mode (int mode) 1678rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1626{ 1679{
1627 XGCValues gcvalue; 1680 rvideo_mode = on;
1628 1681
1682#ifndef NO_BELL
1683 on ^= rvideo_bell;
1684#endif
1685
1629 if (rvideo != mode) 1686 if (rvideo_state != on)
1630 { 1687 {
1631 rvideo = mode; 1688 rvideo_state = on;
1689
1632 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1690 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1633#if XPM_BACKGROUND 1691#ifdef HAVE_BG_PIXMAP
1634 if (bgPixmap.pixmap == None) 1692 if (bg_pixmap == None)
1635#endif 1693#endif
1636#if TRANSPARENT 1694 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 1695
1696 XGCValues gcvalue;
1642 gcvalue.foreground = pix_colors[Color_fg]; 1697 gcvalue.foreground = pix_colors[Color_fg];
1643 gcvalue.background = pix_colors[Color_bg]; 1698 gcvalue.background = pix_colors[Color_bg];
1644 XChangeGC (display->display, gc, GCBackground | GCForeground, 1699 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1645 &gcvalue); 1700
1646 scr_clear (); 1701 scr_clear ();
1647 scr_touch (true); 1702 scr_touch (true);
1648 } 1703 }
1649} 1704}
1650 1705
… …
1652/* 1707/*
1653 * Report current cursor position 1708 * Report current cursor position
1654 * XTERM_SEQ: Report position: ESC [ 6 n 1709 * XTERM_SEQ: Report position: ESC [ 6 n
1655 */ 1710 */
1656void 1711void
1657rxvt_term::scr_report_position () 1712rxvt_term::scr_report_position () NOTHROW
1658{ 1713{
1659 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1714 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1660} 1715}
1661 1716
1662/* ------------------------------------------------------------------------- * 1717/* ------------------------------------------------------------------------- *
… …
1665 1720
1666/* 1721/*
1667 * Set font style 1722 * Set font style
1668 */ 1723 */
1669void 1724void
1670rxvt_term::set_font_style () 1725rxvt_term::set_font_style () NOTHROW
1671{ 1726{
1672#if 0 1727#if 0
1673 switch (charsets [screen.charset]) 1728 switch (charsets [screen.charset])
1674 { 1729 {
1675 case '0': /* DEC Special Character & Line Drawing Set */ 1730 case '0': /* DEC Special Character & Line Drawing Set */
… …
1697 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1752 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1698 * XTERM_SEQ: Invoke G2 character set: ESC N 1753 * XTERM_SEQ: Invoke G2 character set: ESC N
1699 * XTERM_SEQ: Invoke G3 character set: ESC O 1754 * XTERM_SEQ: Invoke G3 character set: ESC O
1700 */ 1755 */
1701void 1756void
1702rxvt_term::scr_charset_choose (int set) 1757rxvt_term::scr_charset_choose (int set) NOTHROW
1703{ 1758{
1704 screen.charset = set; 1759 screen.charset = set;
1705 set_font_style (); 1760 set_font_style ();
1706} 1761}
1707 1762
… …
1713 * XTERM_SEQ: Set G2 character set: ESC * <C> 1768 * XTERM_SEQ: Set G2 character set: ESC * <C>
1714 * XTERM_SEQ: Set G3 character set: ESC + <C> 1769 * XTERM_SEQ: Set G3 character set: ESC + <C>
1715 * See set_font_style for possible values for <C> 1770 * See set_font_style for possible values for <C>
1716 */ 1771 */
1717void 1772void
1718rxvt_term::scr_charset_set (int set, unsigned int ch) 1773rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1719{ 1774{
1720 charsets[set] = (unsigned char)ch; 1775 charsets[set] = (unsigned char)ch;
1721 set_font_style (); 1776 set_font_style ();
1722} 1777}
1723 1778
… …
1728 1783
1729/* 1784/*
1730 * refresh matching text. 1785 * refresh matching text.
1731 */ 1786 */
1732bool 1787bool
1733rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1788rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1734{ 1789{
1735 bool found = false; 1790 bool found = false;
1736 1791
1737 for (int i = 0; i < nrow; i++) 1792 for (int i = 0; i < nrow; i++)
1738 { 1793 {
1739 int col = 0;
1740 rend_t *drp = drawn_buf[i].r; 1794 rend_t *drp = drawn_buf[i].r;
1741 1795
1742 for (; col < ncol; col++, drp++) 1796 for (int col = 0; col < ncol; col++, drp++)
1743 if ((*drp & mask) == value) 1797 if ((*drp & mask) == value)
1744 { 1798 {
1745 found = true; 1799 found = true;
1746 *drp = ~value; 1800 *drp = ~value;
1747 } 1801 }
… …
1758 PART_END, 1812 PART_END,
1759 RC_COUNT 1813 RC_COUNT
1760}; 1814};
1761 1815
1762void 1816void
1763rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1817rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1764{ 1818{
1765 int i; 1819 int i;
1766 row_col_t rc[RC_COUNT]; 1820 row_col_t rc[RC_COUNT];
1767 1821
1768 if (!drawn_buf) /* sanity check */ 1822 if (!drawn_buf) /* sanity check */
… …
1802/* ------------------------------------------------------------------------- */ 1856/* ------------------------------------------------------------------------- */
1803/* 1857/*
1804 * Refresh the entire screen 1858 * Refresh the entire screen
1805 */ 1859 */
1806void 1860void
1807rxvt_term::scr_touch (bool refresh) 1861rxvt_term::scr_touch (bool refresh) NOTHROW
1808{ 1862{
1809 scr_expose (0, 0, width, height, refresh); 1863 scr_expose (0, 0, width, height, refresh);
1810} 1864}
1811 1865
1812/* ------------------------------------------------------------------------- */ 1866/* ------------------------------------------------------------------------- */
1813/* 1867/*
1814 * Move the display so that the line represented by scrollbar value Y is at 1868 * Move the display so that the line represented by scrollbar value Y is at
1815 * the top of the screen 1869 * the top of the screen
1816 */ 1870 */
1817void 1871void
1818rxvt_term::scr_move_to (int y, int len) 1872rxvt_term::scr_move_to (int y, int len) NOTHROW
1819{ 1873{
1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1874 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1821} 1875}
1822 1876
1823/* ------------------------------------------------------------------------- */ 1877/* ------------------------------------------------------------------------- */
1824/* 1878/*
1825 * Page the screen up/down nlines 1879 * Page the screen up/down nlines
1826 * direction should be UP or DN 1880 * direction should be UP or DN
1827 */ 1881 */
1828bool 1882bool
1829rxvt_term::scr_page (enum page_dirn direction, int nlines) 1883rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830{ 1884{
1831 int new_view_start = 1885 int new_view_start =
1832 direction == UP ? view_start - nlines 1886 direction == UP ? view_start - nlines
1833 : view_start + nlines; 1887 : view_start + nlines;
1834 1888
1835 return scr_changeview (new_view_start); 1889 return scr_changeview (new_view_start);
1836} 1890}
1837 1891
1838bool 1892bool
1839rxvt_term::scr_changeview (int new_view_start) 1893rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1894{
1841 clamp_it (new_view_start, top_row, 0); 1895 clamp_it (new_view_start, top_row, 0);
1842 1896
1843 if (new_view_start == view_start) 1897 if (new_view_start == view_start)
1844 return false; 1898 return false;
… …
1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1904 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851 1905
1852 return true; 1906 return true;
1853} 1907}
1854 1908
1855/* ------------------------------------------------------------------------- */ 1909#ifndef NO_BELL
1856void 1910void
1911rxvt_term::bell_cb (ev::timer &w, int revents)
1912{
1913 rvideo_bell = false;
1914 scr_rvideo_mode (rvideo_mode);
1915 refresh_check ();
1916}
1917#endif
1918
1919/* ------------------------------------------------------------------------- */
1920void
1857rxvt_term::scr_bell () 1921rxvt_term::scr_bell () NOTHROW
1858{ 1922{
1859#ifndef NO_BELL 1923#ifndef NO_BELL
1860 1924
1861# ifndef NO_MAPALERT 1925# ifndef NO_MAPALERT
1862# ifdef MAPALERT_OPTION 1926# ifdef MAPALERT_OPTION
1863 if (OPTION (Opt_mapAlert)) 1927 if (option (Opt_mapAlert))
1864# endif 1928# endif
1865 XMapWindow (display->display, parent[0]); 1929 XMapWindow (dpy, parent[0]);
1866# endif 1930# endif
1867 1931
1932# if ENABLE_FRILLS
1933 if (option (Opt_urgentOnBell))
1934 set_urgency (1);
1935# endif
1936
1868 if (OPTION (Opt_visualBell)) 1937 if (option (Opt_visualBell))
1869 { 1938 {
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1939 rvideo_bell = true;
1940 scr_rvideo_mode (rvideo_mode);
1871 display->flush (); 1941 flush ();
1942
1872 rxvt_usleep (VISUAL_BELL_DURATION); 1943 bell_ev.start (VISUAL_BELL_DURATION);
1873 scr_rvideo_mode (!rvideo); /* refresh also done */
1874 } 1944 }
1875 else 1945 else
1876 XBell (display->display, 0); 1946 XBell (dpy, 0);
1877 1947 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1878#endif 1948#endif
1879} 1949}
1880 1950
1881/* ------------------------------------------------------------------------- */ 1951/* ------------------------------------------------------------------------- */
1882/* ARGSUSED */ 1952/* ARGSUSED */
1883void 1953void
1884rxvt_term::scr_printscreen (int fullhist) 1954rxvt_term::scr_printscreen (int fullhist) NOTHROW
1885{ 1955{
1886#ifdef PRINTPIPE 1956#ifdef PRINTPIPE
1887 int nrows, row_start; 1957 int nrows, row_start;
1888 FILE *fd; 1958 FILE *fd = popen_printer ();
1889 1959
1890 if ((fd = popen_printer ()) == NULL) 1960 if (!fd)
1891 return; 1961 return;
1892 1962
1893 if (fullhist) 1963 if (fullhist)
1894 { 1964 {
1895 nrows = nrow - top_row; 1965 nrows = nrow - top_row;
… …
1901 row_start = view_start; 1971 row_start = view_start;
1902 } 1972 }
1903 1973
1904 wctomb (0, 0); 1974 wctomb (0, 0);
1905 1975
1906 for (int r1 = 0; r1 < nrows; r1++) 1976 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1907 { 1977 {
1908 text_t *tp = ROW(r1).t; 1978 text_t *tp = ROW(r1).t;
1909 int len = ROW(r1).l; 1979 int len = ROW(r1).l;
1910 1980
1911 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1981 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1938 * Refresh the screen 2008 * Refresh the screen
1939 * drawn_text/drawn_rend contain the screen information before the update. 2009 * drawn_text/drawn_rend contain the screen information before the update.
1940 * screen.text/screen.rend contain what the screen will change to. 2010 * screen.text/screen.rend contain what the screen will change to.
1941 */ 2011 */
1942void 2012void
1943rxvt_term::scr_refresh () 2013rxvt_term::scr_refresh () NOTHROW
1944{ 2014{
1945 unsigned char must_clear, /* use draw_string not draw_image_string */
1946 showcursor; /* show the cursor */
1947 int16_t col, row, /* column/row we're processing */ 2015 int16_t col, row, /* column/row we're processing */
1948 ocrow; /* old cursor row */ 2016 ocrow; /* old cursor row */
1949 int i; /* tmp */ 2017 int i; /* tmp */
1950#ifndef NO_CURSORCOLOR 2018#ifndef NO_CURSORCOLOR
1951 rend_t cc1; /* store colours at cursor position (s) */ 2019 rend_t cc1; /* store colours at cursor position (s) */
1952#endif 2020#endif
1953 rend_t *crp; // cursor rendition pointer 2021 rend_t *crp; // cursor rendition pointer
2022 rend_t ccol1, /* Cursor colour */
2023 ccol2; /* Cursor colour2 */
1954 2024
1955 want_refresh = 0; /* screen is current */ 2025 want_refresh = 0; /* screen is current */
1956 2026
1957 if (refresh_type == NO_REFRESH || !mapped) 2027 if (refresh_type == NO_REFRESH || !mapped)
1958 return; 2028 return;
1959 2029
1960 /* 2030 /*
1961 * A: set up vars 2031 * A: set up vars
1962 */ 2032 */
1963 must_clear = 0;
1964 refresh_count = 0; 2033 refresh_count = 0;
1965 2034
1966#if XPM_BACKGROUND 2035 unsigned int old_screen_flags = screen.flags;
1967 must_clear |= bgPixmap.pixmap != None; 2036 char have_bg = 0;
1968#endif 2037#ifdef HAVE_BG_PIXMAP
1969#if TRANSPARENT 2038 have_bg = bg_pixmap != None;
1970 must_clear |= OPTION (Opt_transparent) && am_transparent;
1971#endif 2039#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2040 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 2041
1974 /* 2042 /*
1975 * B: reverse any characters which are selected 2043 * B: reverse any characters which are selected
1976 */ 2044 */
1977 scr_reverse_selection (); 2045 scr_reverse_selection ();
2046
2047 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2048#if ENABLE_OVERLAY
2049 scr_swap_overlay ();
2050#endif
2051
2052 char showcursor = screen.flags & Screen_VisibleCursor;
1978 2053
1979 /* 2054 /*
1980 * C: set the cursor character (s) 2055 * C: set the cursor character (s)
1981 */ 2056 */
1982 { 2057 {
1983 unsigned char setoldcursor; 2058 unsigned char setoldcursor;
1984 rend_t ccol1, /* Cursor colour */
1985 ccol2; /* Cursor colour2 */
1986 2059
1987 showcursor = (screen.flags & Screen_VisibleCursor);
1988#ifdef CURSOR_BLINK 2060#ifdef CURSOR_BLINK
1989 if (hidden_cursor) 2061 if (hidden_cursor)
1990 showcursor = 0; 2062 showcursor = 0;
1991#endif 2063#endif
1992 2064
… …
1997 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2069 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1998 col--; 2070 col--;
1999 2071
2000 crp = &ROW(screen.cur.row).r[col]; 2072 crp = &ROW(screen.cur.row).r[col];
2001 2073
2002 if (showcursor && focus) 2074#ifndef NO_CURSORCOLOR
2075 cc1 = *crp & (RS_fgMask | RS_bgMask);
2076 if (ISSET_PIXCOLOR (Color_cursor))
2077 ccol1 = Color_cursor;
2078 else
2079#endif
2080#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2081 ccol1 = fgcolor_of (rstyle);
2082#else
2083 ccol1 = Color_fg;
2084#endif
2085
2086#ifndef NO_CURSORCOLOR
2087 if (ISSET_PIXCOLOR (Color_cursor2))
2088 ccol2 = Color_cursor2;
2089 else
2090#endif
2091#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2092 ccol2 = bgcolor_of (rstyle);
2093#else
2094 ccol2 = Color_bg;
2095#endif
2096
2097 if (focus)
2003 { 2098 {
2004 if (OPTION (Opt_cursorUnderline)) 2099 if (option (Opt_cursorUnderline))
2005 *crp ^= RS_Uline; 2100 *crp ^= RS_Uline;
2006 else 2101 else
2007 { 2102 {
2008 *crp ^= RS_RVid; 2103 *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); 2104 *crp = SET_FGCOLOR (*crp, ccol1);
2029 *crp = SET_BGCOLOR (*crp, ccol2); 2105 *crp = SET_BGCOLOR (*crp, ccol2);
2030#endif
2031 } 2106 }
2032 } 2107 }
2033 } 2108 }
2034 2109
2035 /* make sure no outline cursor is left around */ 2110 /* make sure no outline cursor is left around */
… …
2062 oldcursor.col = screen.cur.col; 2137 oldcursor.col = screen.cur.col;
2063 } 2138 }
2064 } 2139 }
2065 } 2140 }
2066 2141
2067 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2068#if ENABLE_OVERLAY
2069 scr_swap_overlay ();
2070#endif
2071
2072#ifndef NO_SLOW_LINK_SUPPORT 2142#ifndef NO_SLOW_LINK_SUPPORT
2073 /* 2143 /*
2074 * D: CopyArea pass - very useful for slower links 2144 * D: CopyArea pass - very useful for slower links
2075 * This has been deliberately kept simple. 2145 * This has been deliberately kept simple.
2076 */ 2146 */
2077 if (!display->is_local 2147 if (!display->is_local
2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2148 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2079 && abs (num_scr) < nrow && !must_clear) 2149 && abs (num_scr) < nrow && !have_bg)
2080 { 2150 {
2081 int16_t nits; 2151 int16_t nits;
2152 int i = num_scr;
2082 int j; 2153 int j;
2083 int len, wlen; 2154 int len, wlen;
2084 dLocal (int, num_scr); 2155 dLocal (int, num_scr);
2085 2156
2086 j = nrow; 2157 j = nrow;
2087 wlen = len = -1; 2158 wlen = len = -1;
2088 row = i > 0 ? 0 : j - 1; 2159 row = i > 0 ? 0 : j - 1;
2160
2089 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2161 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2090 { 2162 {
2091 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2163 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2092 { 2164 {
2093 line_t s = ROW(view_start + row); 2165 line_t s = ROW(view_start + row);
… …
2114 wlen = row; 2186 wlen = row;
2115 continue; 2187 continue;
2116 } 2188 }
2117 } 2189 }
2118 2190
2119 if (len != -1) 2191 if (len >= 0)
2120 { 2192 {
2121 /* also comes here at end if needed because of >= above */ 2193 /* also comes here at end if needed because of >= above */
2122 if (wlen < len) 2194 if (wlen < len)
2123 ::swap (wlen, len); 2195 ::swap (wlen, len);
2124 2196
2197 XGCValues gcv;
2198
2199 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2125 XCopyArea (display->display, vt, vt, 2200 XCopyArea (dpy, vt, vt,
2126 gc, 0, Row2Pixel (len + i), 2201 gc, 0, Row2Pixel (len + i),
2127 (unsigned int)this->width, 2202 (unsigned int)this->width,
2128 (unsigned int)Height2Pixel (wlen - len + 1), 2203 (unsigned int)Height2Pixel (wlen - len + 1),
2129 0, Row2Pixel (len)); 2204 0, Row2Pixel (len));
2205 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2206
2130 len = -1; 2207 len = -1;
2131 } 2208 }
2132 } 2209 }
2133 } 2210 }
2134#endif 2211#endif
… …
2158 continue; 2235 continue;
2159 2236
2160 // redraw one or more characters 2237 // redraw one or more characters
2161 2238
2162 // seek to the beginning of wide characters 2239 // seek to the beginning of wide characters
2163 while (stp[col] == NOCHAR && col > 0) 2240 while (expect_false (stp[col] == NOCHAR && col > 0))
2164 --col; 2241 --col;
2165 2242
2166 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2243 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2167 text_t *text = stp + col; 2244 text_t *text = stp + col;
2168 int count = 1; 2245 int count = 1;
2169 2246
2170 dtp[col] = stp[col]; 2247 dtp[col] = stp[col];
2171 drp[col] = rend; 2248 drp[col] = rend;
… …
2175 for (i = 0; ++col < ncol; ) 2252 for (i = 0; ++col < ncol; )
2176 { 2253 {
2177 if (stp[col] == NOCHAR) 2254 if (stp[col] == NOCHAR)
2178 { 2255 {
2179 dtp[col] = stp[col]; 2256 dtp[col] = stp[col];
2180 drp[col] = rend; 2257 drp[col] = srp[col];
2258
2181 count++; 2259 count++;
2182 i++; 2260 i++;
2183 2261
2184 continue; 2262 continue;
2185 } 2263 }
… …
2190 count++; 2268 count++;
2191 2269
2192 if (stp[col] != dtp[col] 2270 if (stp[col] != dtp[col]
2193 || !RS_SAME (srp[col], drp[col])) 2271 || !RS_SAME (srp[col], drp[col]))
2194 { 2272 {
2195 if (must_clear && (i++ > count / 2)) 2273 if (have_bg && (i++ > count / 2))
2196 break; 2274 break;
2197 2275
2198 dtp[col] = stp[col]; 2276 dtp[col] = stp[col];
2199 drp[col] = rend; 2277 drp[col] = rend;
2200 i = 0; 2278 i = 0;
2201 } 2279 }
2202 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2280 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2203 break; 2281 break;
2204 } 2282 }
2205 2283
2206 col--; /* went one too far. move back */ 2284 col--; /* went one too far. move back */
2207 count -= i; /* dump any matching trailing chars */ 2285 count -= i; /* dump any matching trailing chars */
2208 2286
2209 // sometimes we optimize away the trailing NOCHAR's, add them back 2287 // sometimes we optimize away the trailing NOCHAR's, add them back
2210 while (i && text[count] == NOCHAR) 2288 while (expect_false (i && text[count] == NOCHAR))
2211 count++, i--; 2289 count++, i--;
2212 2290
2213 /* 2291 /*
2214 * Determine the attributes for the string 2292 * Determine the attributes for the string
2215 */ 2293 */
2216 int fore = fgcolor_of (rend); // desired foreground 2294 int fore = fgcolor_of (rend); // desired foreground
2217 int back = bgcolor_of (rend); // desired background 2295 int back = bgcolor_of (rend); // desired background
2218 2296
2219 // only do special processing if any attributes are set, which is unlikely 2297 // 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)) 2298 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2221 { 2299 {
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; 2300 bool invert = rend & RS_RVid;
2235 2301
2236#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2237 if (rend & RS_Bold
2238 && fore == Color_fg) 2303 if (rend & RS_Bold && fore == Color_fg)
2239 { 2304 {
2240 if (ISSET_PIXCOLOR (Color_BD)) 2305 if (ISSET_PIXCOLOR (Color_BD))
2241 fore = Color_BD; 2306 fore = Color_BD;
2242# if !ENABLE_STYLES 2307# if !ENABLE_STYLES
2243 else 2308 else
2244 invert = !invert; 2309 invert = !invert;
2245# endif 2310# endif
2246 } 2311 }
2247 2312
2248 if (rend & RS_Italic 2313 if (rend & RS_Italic && fore == Color_fg)
2249 && fore == Color_fg)
2250 { 2314 {
2251 if (ISSET_PIXCOLOR (Color_IT)) 2315 if (ISSET_PIXCOLOR (Color_IT))
2252 fore = Color_IT; 2316 fore = Color_IT;
2253# if !ENABLE_STYLES 2317# if !ENABLE_STYLES
2254 else 2318 else
2255 invert = !invert; 2319 invert = !invert;
2256# endif 2320# endif
2257 } 2321 }
2258 2322
2259 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2323 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2260 fore = Color_UL; 2324 fore = Color_UL;
2325#endif
2326
2327#ifdef OPTION_HC
2328 if (rend & RS_Sel)
2329 {
2330 /* invert the column if no highlightColor is set or it is the
2331 * current cursor column */
2332 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2333 && ISSET_PIXCOLOR (Color_HC))
2334 {
2335 if (ISSET_PIXCOLOR (Color_HTC))
2336 fore = Color_HTC;
2337 // if invert is 0 reverse video is set so we use bg color as fg color
2338 else if (!invert)
2339 fore = back;
2340
2341 back = Color_HC;
2342 invert = 0;
2343 }
2344 }
2261#endif 2345#endif
2262 2346
2263 if (invert) 2347 if (invert)
2264 { 2348 {
2265 ::swap (fore, back); 2349 ::swap (fore, back);
2266 2350
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2351#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (ISSET_PIXCOLOR (Color_RV))
2269 back = Color_RV;
2270
2271 if (fore == back) 2352 if (fore == back)
2272 { 2353 {
2273 fore = Color_bg; 2354 fore = Color_bg;
2274 back = Color_fg; 2355 back = Color_fg;
2275 } 2356 }
… …
2277 } 2358 }
2278 2359
2279#ifdef TEXT_BLINK 2360#ifdef TEXT_BLINK
2280 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2361 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2281 { 2362 {
2282 if (!text_blink_ev.active) 2363 if (!text_blink_ev.is_active ())
2283 { 2364 {
2284 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2365 text_blink_ev.again ();
2285 hidden_text = 0; 2366 hidden_text = 0;
2286 } 2367 }
2287 else if (hidden_text) 2368 else if (hidden_text)
2288 fore = back; 2369 fore = back;
2289 } 2370 }
2290#endif 2371#endif
2372
2373#if ENABLE_STYLES
2374 // "careful" (too wide) character handling
2375
2376 // include previous careful character(s) if possible, looks nicer (best effort...)
2377 while (text > stp
2378 && srp[text - stp - 1] & RS_Careful
2379 && RS_SAME (rend, srp[text - stp - 1]))
2380 text--, count++, xpixel -= fwidth;
2381
2382 // force redraw after "careful" characters to avoid pixel droppings
2383 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2384 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2385
2386 // force redraw before "careful" characters to avoid pixel droppings
2387 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2388 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2389#endif
2291 } 2390 }
2292 2391
2293 /* 2392 /*
2294 * Actually do the drawing of the string here 2393 * Actually do the drawing of the string here
2295 */ 2394 */
2296 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2395 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2297 2396
2298 if (back == fore) 2397 if (expect_true (have_bg && back == Color_bg))
2299 font->clear_rect (*drawable, xpixel, ypixel,
2300 fwidth * count, fheight,
2301 back);
2302 else if (back == Color_bg)
2303 { 2398 {
2304 if (must_clear) 2399 // this is very ugly, maybe push it into ->draw?
2305 {
2306 CLEAR_CHARS (xpixel, ypixel, count);
2307 2400
2308 for (i = 0; i < count; i++) /* don't draw empty strings */ 2401 for (i = 0; i < count; i++) /* don't draw empty strings */
2309 if (text[i] != ' ') 2402 if (text[i] != ' ')
2310 { 2403 {
2311 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2404 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2312 break; 2405 goto did_clear;
2313 }
2314 } 2406 }
2315 else 2407
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2408 CLEAR_CHARS (xpixel, ypixel, count);
2409 did_clear: ;
2317 } 2410 }
2318 else 2411 else
2319 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2320 2413
2321 if (rend & RS_Uline && font->descent > 1 && fore != back) 2414 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2322 { 2415 {
2323#if ENABLE_FRILLS 2416#if ENABLE_FRILLS
2324 if (ISSET_PIXCOLOR (Color_underline)) 2417 if (ISSET_PIXCOLOR (Color_underline))
2325 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2418 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2326 else 2419 else
2327#endif 2420#endif
2328 XSetForeground (display->display, gc, pix_colors[fore]); 2421 XSetForeground (dpy, gc, pix_colors[fore]);
2329 2422
2330 XDrawLine (display->display, drawBuffer, gc, 2423 XDrawLine (dpy, vt, gc,
2331 xpixel, ypixel + font->ascent + 1, 2424 xpixel, ypixel + font->ascent + 1,
2332 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2425 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2333 } 2426 }
2334 } /* for (col....) */ 2427 } /* for (col....) */
2335 } /* for (row....) */ 2428 } /* for (row....) */
2336 2429
2337#if ENABLE_OVERLAY
2338 scr_swap_overlay ();
2339#endif
2340 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2341
2342 /* 2430 /*
2343 * G: cleanup cursor and display outline cursor if necessary 2431 * G: cleanup cursor and display outline cursor if necessary
2344 */ 2432 */
2345 if (showcursor) 2433 if (showcursor)
2346 { 2434 {
2347 if (focus) 2435 if (focus)
2348 { 2436 {
2349 if (OPTION (Opt_cursorUnderline)) 2437 if (option (Opt_cursorUnderline))
2350 *crp ^= RS_Uline; 2438 *crp ^= RS_Uline;
2351 else 2439 else
2352 { 2440 {
2353 *crp ^= RS_RVid; 2441 *crp ^= RS_RVid;
2354#ifndef NO_CURSORCOLOR 2442#ifndef NO_CURSORCOLOR
… …
2368 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2456 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2369 cursorwidth++; 2457 cursorwidth++;
2370 2458
2371#ifndef NO_CURSORCOLOR 2459#ifndef NO_CURSORCOLOR
2372 if (ISSET_PIXCOLOR (Color_cursor)) 2460 if (ISSET_PIXCOLOR (Color_cursor))
2373 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2461 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2462 else
2374#endif 2463#endif
2464 XSetForeground (dpy, gc, pix_colors[ccol1]);
2375 2465
2376 XDrawRectangle (display->display, drawBuffer, gc, 2466 XDrawRectangle (dpy, vt, gc,
2377 Col2Pixel (col), 2467 Col2Pixel (col),
2378 Row2Pixel (oldcursor.row), 2468 Row2Pixel (oldcursor.row),
2379 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2469 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2380 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2470 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2381 } 2471 }
2382 } 2472 }
2383 2473
2384 /* 2474 /*
2385 * H: cleanup selection 2475 * H: cleanup selection
2386 */ 2476 */
2477#if ENABLE_OVERLAY
2478 scr_swap_overlay ();
2479#endif
2480 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2481
2387 scr_reverse_selection (); 2482 scr_reverse_selection ();
2388 2483
2484 screen.flags = old_screen_flags;
2389 num_scr = 0; 2485 num_scr = 0;
2390 num_scr_allow = 1; 2486 num_scr_allow = 1;
2391} 2487}
2392 2488
2393void 2489void
2394rxvt_term::scr_remap_chars (line_t &l) 2490rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2395{ 2491{
2396 if (!l.t) 2492 if (!l.t)
2397 return; 2493 return;
2398 2494
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2495 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2401 for (int i = ncol; i--; ) 2497 for (int i = ncol; i--; )
2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2498 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2403} 2499}
2404 2500
2405void 2501void
2406rxvt_term::scr_remap_chars () 2502rxvt_term::scr_remap_chars () NOTHROW
2407{ 2503{
2408 for (int i = total_rows; i--; ) 2504 for (int i = total_rows; i--; )
2409 scr_remap_chars (row_buf [i]); 2505 scr_remap_chars (row_buf [i]);
2410 2506
2411 for (int i = nrow; i--; ) 2507 for (int i = nrow; i--; )
… …
2414 scr_remap_chars (swap_buf [i]); 2510 scr_remap_chars (swap_buf [i]);
2415 } 2511 }
2416} 2512}
2417 2513
2418void 2514void
2419rxvt_term::scr_recolour () 2515rxvt_term::scr_recolour (bool refresh) NOTHROW
2420{ 2516{
2421 if (1 2517 bool transparent = false;
2422#if TRANSPARENT 2518
2423 && !am_transparent 2519#ifdef HAVE_BG_PIXMAP
2520 if (bg_pixmap != None)
2521 {
2522# ifdef ENABLE_TRANSPARENCY
2523 if (bg_flags & BG_IS_TRANSPARENT)
2524 {
2525 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2526 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2527
2528 transparent = true;
2529 }
2530 else
2424#endif 2531# endif
2425#if XPM_BACKGROUND
2426 && !bgPixmap.pixmap
2427#endif
2428 ) 2532 {
2533 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2534 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2535 }
2429 { 2536 }
2537 else
2538#endif
2539 {
2430 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2540 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2431 XClearWindow (display->display, parent[0]);
2432 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2541 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2433#if HAVE_SCROLLBARS 2542 }
2543
2544 XClearWindow (dpy, parent[0]);
2545
2434 if (scrollBar.win) 2546 if (scrollBar.win)
2435 { 2547 {
2548 if (transparent)
2549 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2550 else
2436 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2551 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2437 scrollBar.setIdle (); 2552 scrollBar.state = STATE_IDLE;
2438 scrollbar_show (0); 2553 scrollBar.show (0);
2439 } 2554 }
2440#endif 2555
2556 if (refresh)
2441 } 2557 {
2442
2443 scr_clear (); 2558 scr_clear ();
2444 scr_touch (true); 2559 scr_touch (true);
2560 }
2445 want_refresh = 1; 2561 want_refresh = 1;
2446} 2562}
2447 2563
2448/* ------------------------------------------------------------------------- */ 2564/* ------------------------------------------------------------------------- */
2449void 2565void
2450rxvt_term::scr_clear (bool really) 2566rxvt_term::scr_clear (bool really) NOTHROW
2451{ 2567{
2452 if (!mapped) 2568 if (!mapped)
2453 return; 2569 return;
2454 2570
2455 num_scr_allow = 0; 2571 num_scr_allow = 0;
2456 want_refresh = 1; 2572 want_refresh = 1;
2457 2573
2458 if (really) 2574 if (really)
2459 XClearWindow (display->display, vt); 2575 XClearWindow (dpy, vt);
2460} 2576}
2461 2577
2462void 2578void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2579rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2464{ 2580{
2465 int view_end = view_start + nrow; 2581 int view_end = view_start + nrow;
2466 int row, col; 2582 int row, col;
2467 2583
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2584 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2480 srp[col] ^= rstyle2; 2596 srp[col] ^= rstyle2;
2481 } 2597 }
2482} 2598}
2483 2599
2484void 2600void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2601rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2486{ 2602{
2487 int view_end = view_start + nrow; 2603 int view_end = view_start + nrow;
2488 int row, col; 2604 int row, col;
2489 2605
2490 if (beg_row >= view_start) 2606 if (beg_row >= view_start)
… …
2507 srp[col] ^= rstyle; 2623 srp[col] ^= rstyle;
2508} 2624}
2509 2625
2510/* ------------------------------------------------------------------------- */ 2626/* ------------------------------------------------------------------------- */
2511void 2627void
2512rxvt_term::scr_reverse_selection () 2628rxvt_term::scr_reverse_selection () NOTHROW
2513{ 2629{
2514 if (selection.op 2630 if (selection.op
2515 && current_screen == selection.screen 2631 && current_screen == selection.screen
2516 && selection.end.row >= view_start) 2632 && selection.end.row >= view_start)
2517 { 2633 {
2518#if ENABLE_FRILLS 2634#if !ENABLE_MINIMAL
2519 if (selection.rect) 2635 if (selection.rect)
2520 scr_xor_rect (selection.beg.row, selection.beg.col, 2636 scr_xor_rect (selection.beg.row, selection.beg.col,
2521 selection.end.row, selection.end.col, 2637 selection.end.row, selection.end.col,
2522 RS_RVid, RS_RVid | RS_Uline); 2638 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2523 else 2639 else
2524#endif 2640#endif
2525 scr_xor_span (selection.beg.row, selection.beg.col, 2641 scr_xor_span (selection.beg.row, selection.beg.col,
2526 selection.end.row, selection.end.col, 2642 selection.end.row, selection.end.col,
2527 RS_RVid); 2643 RS_Sel | RS_RVid);
2528 } 2644 }
2529} 2645}
2530 2646
2531/* ------------------------------------------------------------------------- */ 2647/* ------------------------------------------------------------------------- */
2532/* 2648/*
2533 * Dump the whole scrollback and screen to the passed filedescriptor. The 2649 * Dump the whole scrollback and screen to the passed filedescriptor. The
2534 * invoking routine must close the fd. 2650 * invoking routine must close the fd.
2535 */ 2651 */
2536#if 0 2652#if 0
2537void 2653void
2538rxvt_term::scr_dump (int fd) 2654rxvt_term::scr_dump (int fd) NOTHROW
2539{ 2655{
2540 int row, wrote; 2656 int row, wrote;
2541 unsigned int width, towrite; 2657 unsigned int width, towrite;
2542 char r1[] = "\n"; 2658 const char r1[] = "\n";
2543 2659
2544 for (row = saveLines - nsaved; 2660 for (row = saveLines + top_row;
2545 row < saveLines + nrow - 1; row++) 2661 row < saveLines + nrow - 1; row++)
2546 { 2662 {
2547 width = row_buf[row].l >= 0 ? row_buf[row].l 2663 width = row_buf[row].l >= 0 ? row_buf[row].l
2548 : ncol; 2664 : ncol;
2549 for (towrite = width; towrite; towrite -= wrote) 2665 for (towrite = width; towrite; towrite -= wrote)
… …
2562 2678
2563/* ------------------------------------------------------------------------- * 2679/* ------------------------------------------------------------------------- *
2564 * CHARACTER SELECTION * 2680 * CHARACTER SELECTION *
2565 * ------------------------------------------------------------------------- */ 2681 * ------------------------------------------------------------------------- */
2566void 2682void
2567rxvt_term::selection_check (int check_more) 2683rxvt_term::selection_check (int check_more) NOTHROW
2568{ 2684{
2569 row_col_t pos; 2685 row_col_t pos;
2570 2686
2571 if (!selection.op) 2687 if (!selection.op)
2572 return; 2688 return;
… …
2593/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2594/* 2710/*
2595 * Paste a selection direct to the command fd 2711 * Paste a selection direct to the command fd
2596 */ 2712 */
2597void 2713void
2598rxvt_term::paste (char *data, unsigned int len) 2714rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2599{ 2715{
2600 /* convert normal newline chars into common keyboard Return key sequence */ 2716 /* convert normal newline chars into common keyboard Return key sequence */
2601 for (unsigned int i = 0; i < len; i++) 2717 for (unsigned int i = 0; i < len; i++)
2602 if (data[i] == C0_LF) 2718 if (data[i] == C0_LF)
2603 data[i] = C0_CR; 2719 data[i] = C0_CR;
2604 2720
2721 if (priv_modes & PrivMode_BracketPaste)
2722 tt_printf ("\e[200~");
2723
2605 tt_write (data, len); 2724 tt_write (data, len);
2606}
2607 2725
2608/* ------------------------------------------------------------------------- */ 2726 if (priv_modes & PrivMode_BracketPaste)
2609/* 2727 tt_printf ("\e[201~");
2610 * Respond to a notification that a primary selection has been sent
2611 * EXT: SelectionNotify
2612 */
2613void
2614rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2615{
2616 if (prop == None) /* check for failed XConvertSelection */
2617 {
2618 if ((selection_type & Sel_CompoundText))
2619 {
2620 int selnum = selection_type & Sel_whereMask;
2621
2622 selection_type = 0;
2623 if (selnum != Sel_direct)
2624 selection_request_other (XA_STRING, selnum);
2625 }
2626
2627 if ((selection_type & Sel_UTF8String))
2628 {
2629 int selnum = selection_type & Sel_whereMask;
2630
2631 selection_type = Sel_CompoundText;
2632 if (selnum != Sel_direct)
2633 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2634 else
2635 selection_type = 0;
2636 }
2637
2638 return;
2639 }
2640
2641 unsigned long bytes_after;
2642 XTextProperty ct;
2643
2644 if (XGetWindowProperty (display->display, win, prop,
2645 0, PROP_SIZE / 4,
2646 delete_prop, AnyPropertyType,
2647 &ct.encoding, &ct.format,
2648 &ct.nitems, &bytes_after,
2649 &ct.value) != Success)
2650 {
2651 ct.value = 0;
2652 goto bailout;
2653 }
2654
2655 if (ct.encoding == None)
2656 goto bailout;
2657
2658 if (bytes_after)
2659 {
2660 // fetch and append remaining data
2661 XTextProperty ct2;
2662
2663 if (XGetWindowProperty (display->display, win, prop,
2664 ct.nitems / 4, (bytes_after + 3) / 4,
2665 delete_prop, AnyPropertyType,
2666 &ct2.encoding, &ct2.format,
2667 &ct2.nitems, &bytes_after,
2668 &ct2.value) != Success)
2669 goto bailout;
2670
2671 // realloc should be compatible to XFree, here, and elsewhere, too
2672 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2673 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2674 ct.nitems += ct2.nitems;
2675
2676 XFree (ct2.value);
2677 }
2678
2679 if (ct.value == 0)
2680 goto bailout;
2681
2682 if (ct.encoding == xa[XA_INCR])
2683 {
2684 // INCR selection, start handshake
2685 if (!delete_prop)
2686 XDeleteProperty (display->display, win, prop);
2687
2688 selection_wait = Sel_incr;
2689 incr_buf_fill = 0;
2690 incr_ev.start (NOW + 10);
2691
2692 goto bailout;
2693 }
2694
2695 if (ct.nitems == 0)
2696 {
2697 if (selection_wait == Sel_incr)
2698 {
2699 XFree (ct.value);
2700
2701 // finally complete, now paste the whole thing
2702 selection_wait = Sel_normal;
2703 ct.value = (unsigned char *)incr_buf;
2704 ct.nitems = incr_buf_fill;
2705 incr_buf = 0;
2706 incr_buf_size = 0;
2707 incr_ev.stop ();
2708 }
2709 else
2710 {
2711 if (selection_wait == Sel_normal
2712 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2713 {
2714 /*
2715 * pass through again trying CUT_BUFFER0 if we've come from
2716 * XConvertSelection () but nothing was presented
2717 */
2718 selection_paste (display->root, XA_CUT_BUFFER0, False);
2719 }
2720
2721 goto bailout;
2722 }
2723 }
2724 else if (selection_wait == Sel_incr)
2725 {
2726 incr_ev.start (NOW + 10);
2727
2728 while (incr_buf_fill + ct.nitems > incr_buf_size)
2729 {
2730 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2731 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2732 }
2733
2734 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2735 incr_buf_fill += ct.nitems;
2736
2737 goto bailout;
2738 }
2739
2740 char **cl;
2741 int cr;
2742
2743#if ENABLE_FRILLS
2744 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2745 // so recode it manually
2746 if (ct.encoding == xa[XA_UTF8_STRING])
2747 {
2748 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2749 char *s = rxvt_wcstombs (w);
2750 free (w);
2751 // TODO: strlen == only the first element will be converted. well...
2752 paste (s, strlen (s));
2753 free (s);
2754 }
2755 else
2756#endif
2757 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2758 && cl)
2759 {
2760 for (int i = 0; i < cr; i++)
2761 paste (cl[i], strlen (cl[i]));
2762
2763 XFreeStringList (cl);
2764 }
2765 else
2766 paste ((char *)ct.value, ct.nitems); // paste raw
2767
2768bailout:
2769 XFree (ct.value);
2770
2771 if (selection_wait == Sel_normal)
2772 selection_wait = Sel_none;
2773} 2728}
2774 2729
2775void 2730void
2776rxvt_term::incr_cb (time_watcher &w) 2731rxvt_term::paste (char *data, unsigned int len) NOTHROW
2777{ 2732{
2778 selection_wait = Sel_none; 2733 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2779
2780 incr_buf_size = 0;
2781 free (incr_buf);
2782
2783 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2784}
2785
2786void
2787rxvt_term::selection_property (Window win, Atom prop)
2788{
2789 if (prop == None || selection_wait != Sel_incr)
2790 return; 2734 return;
2791 2735
2792 selection_paste (win, prop, true); 2736 tt_paste (data, len);
2793} 2737}
2794 2738
2795/* ------------------------------------------------------------------------- */ 2739/* ------------------------------------------------------------------------- */
2796/* 2740/*
2797 * Request the current selection: 2741 * Request the current selection:
2798 * Order: > internal selection if available 2742 * Order: > internal selection if available
2799 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2743 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2800 * > CUT_BUFFER0 2744 * > CUT_BUFFER0
2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2745 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2802 * will auto fallback to CUT_BUFFER0 2746 * will auto fallback to CUT_BUFFER0
2803 * EXT: button 2 release 2747 * EXT: button 2 release
2804 */ 2748 */
2805void 2749void
2806rxvt_term::selection_request (Time tm) 2750rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2807{ 2751{
2808 if (selection.text) 2752 if (!selection_req)
2809 { /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str));
2812 free (str);
2813 return;
2814 } 2753 {
2815 else 2754 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2755 selection_req->run ();
2816 { 2756 }
2817 int i;
2818
2819 selection_request_time = tm;
2820 selection_wait = Sel_normal;
2821
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i))
2827 return;
2828#else
2829 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2831 return;
2832#endif
2833 }
2834 }
2835
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838}
2839
2840int
2841rxvt_term::selection_request_other (Atom target, int selnum)
2842{
2843 Atom sel;
2844
2845 selection_type |= selnum;
2846
2847 if (selnum == Sel_Primary)
2848 sel = XA_PRIMARY;
2849 else if (selnum == Sel_Secondary)
2850 sel = XA_SECONDARY;
2851 else
2852 sel = xa[XA_CLIPBOARD];
2853
2854 if (XGetSelectionOwner (display->display, sel) != None)
2855 {
2856 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2857 vt, selection_request_time);
2858 return 1;
2859 }
2860
2861 return 0;
2862} 2757}
2863 2758
2864/* ------------------------------------------------------------------------- */ 2759/* ------------------------------------------------------------------------- */
2865/* 2760/*
2866 * Clear all selected text 2761 * Clear all selected text
2867 * EXT: SelectionClear 2762 * EXT: SelectionClear
2868 */ 2763 */
2869void 2764void
2870rxvt_term::selection_clear () 2765rxvt_term::selection_clear (bool clipboard) NOTHROW
2871{ 2766{
2767 if (!clipboard)
2768 {
2872 want_refresh = 1; 2769 want_refresh = 1;
2873 free (selection.text); 2770 free (selection.text);
2874 selection.text = NULL; 2771 selection.text = NULL;
2875 selection.len = 0; 2772 selection.len = 0;
2876 CLEAR_SELECTION (); 2773 CLEAR_SELECTION ();
2877 2774
2878 if (display->selection_owner == this) 2775 if (display->selection_owner == this)
2879 display->selection_owner = 0; 2776 display->selection_owner = 0;
2777 }
2778 else
2779 {
2780 free (selection.clip_text);
2781 selection.clip_text = NULL;
2782 selection.clip_len = 0;
2783
2784 if (display->clipboard_owner == this)
2785 display->clipboard_owner = 0;
2786 }
2880} 2787}
2881 2788
2882/* ------------------------------------------------------------------------- */ 2789/* ------------------------------------------------------------------------- */
2883/* 2790/*
2884 * Copy a selection into the cut buffer 2791 * Copy a selection into the cut buffer
2885 * EXT: button 1 or 3 release 2792 * EXT: button 1 or 3 release
2886 */ 2793 */
2887void 2794void
2888rxvt_term::selection_make (Time tm) 2795rxvt_term::selection_make (Time tm)
2889{ 2796{
2890 int i; 2797 int size;
2891 wchar_t *new_selection_text; 2798 wchar_t *new_selection_text;
2892 text_t *t; 2799 text_t *t;
2893 2800
2894 switch (selection.op) 2801 switch (selection.op)
2895 { 2802 {
… …
2911 return; /* nothing selected, go away */ 2818 return; /* nothing selected, go away */
2912 2819
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2820 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return; 2821 return;
2915 2822
2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2823 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2824 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2918 2825
2919 int ofs = 0; 2826 int ofs = 0;
2920 int extra = 0; 2827 int extra = 0;
2921 2828
2922 int col = selection.beg.col; 2829 int col = selection.beg.col;
… …
2924 2831
2925 int end_col; 2832 int end_col;
2926 2833
2927 for (; row <= selection.end.row; row++, col = 0) 2834 for (; row <= selection.end.row; row++, col = 0)
2928 { 2835 {
2929#if ENABLE_FRILLS 2836#if !ENABLE_MINIMAL
2930 if (selection.rect) 2837 if (selection.rect)
2931 { 2838 {
2932 col = selection.beg.col; 2839 col = selection.beg.col;
2933 end_col = ncol + 1; 2840 end_col = selection.end.col;
2934 } 2841 }
2935 else 2842 else
2936#endif 2843#endif
2937 end_col = ROW(row).l; 2844 end_col = ROW(row).l;
2938 2845
2939 col = max (col, 0); 2846 col = max (col, 0);
2940 2847
2941 if (row == selection.end.row 2848 if (row == selection.end.row)
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2946 min_it (end_col, selection.end.col); 2849 min_it (end_col, selection.end.col);
2947 2850
2948 t = ROW(row).t + col; 2851 t = ROW(row).t + col;
2949 2852
2950 for (; col < end_col; col++) 2853 for (; col < end_col; col++)
… …
2958 2861
2959 extra -= (len - 1); 2862 extra -= (len - 1);
2960 2863
2961 if (extra < 0) 2864 if (extra < 0)
2962 { 2865 {
2963 extra += i; 2866 extra += size;
2964 i += i; 2867 size += size;
2965 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2868 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2966 } 2869 }
2967 2870
2968 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2871 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2969 } 2872 }
2970#endif 2873#endif
2971 else 2874 else
2972 new_selection_text[ofs++] = *t++; 2875 new_selection_text[ofs++] = *t++;
2973 } 2876 }
2974 2877
2975#if ENABLE_FRILLS 2878#if !ENABLE_MINIMAL
2976 if (selection.rect) 2879 if (selection.rect)
2977 { 2880 {
2978 while (ofs 2881 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF 2882 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1])) 2883 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2982 2885
2983 new_selection_text[ofs++] = C0_LF; 2886 new_selection_text[ofs++] = C0_LF;
2984 } 2887 }
2985 else 2888 else
2986#endif 2889#endif
2987 if (!ROW(row).is_longer () && row != selection.end.row) 2890 if (!ROW(row).is_longer ()
2891 && (row != selection.end.row || end_col != selection.end.col)
2892 && (row != selection.beg.row || selection.beg.col < ncol))
2988 new_selection_text[ofs++] = C0_LF; 2893 new_selection_text[ofs++] = C0_LF;
2989 } 2894 }
2990
2991 if (end_col != selection.end.col)
2992 new_selection_text[ofs++] = C0_LF;
2993 2895
2994 new_selection_text[ofs] = 0; 2896 new_selection_text[ofs] = 0;
2995 2897
2996 if (ofs == 0) 2898 if (ofs == 0)
2997 { 2899 {
… …
3010 2912
3011 selection_grab (tm); 2913 selection_grab (tm);
3012} 2914}
3013 2915
3014bool 2916bool
3015rxvt_term::selection_grab (Time tm) 2917rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3016{ 2918{
2919 Atom sel;
2920
2921 if (!clipboard)
2922 {
3017 selection_time = tm; 2923 selection_time = tm;
3018 2924 sel = XA_PRIMARY;
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 { 2925 }
2926 else
2927 {
2928 clipboard_time = tm;
2929 sel = xa[XA_CLIPBOARD];
2930 }
2931
2932 XSetSelectionOwner (dpy, sel, vt, tm);
2933 if (XGetSelectionOwner (dpy, sel) == vt)
2934 {
3022 display->set_selection_owner (this); 2935 display->set_selection_owner (this, clipboard);
3023 return true; 2936 return true;
3024 } 2937 }
3025 else 2938 else
3026 { 2939 {
3027 selection_clear (); 2940 selection_clear (clipboard);
3028 return false; 2941 return false;
3029 } 2942 }
3030 2943
3031#if 0 2944#if 0
3032 XTextProperty ct; 2945 XTextProperty ct;
3033 2946
3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2947 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3035 { 2948 {
3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2949 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3037 XFree (ct.value); 2950 XFree (ct.value);
3038 } 2951 }
3039#endif 2952#endif
… …
3043/* 2956/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 2957 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 2958 * EXT: button 1 press
3046 */ 2959 */
3047void 2960void
3048rxvt_term::selection_click (int clicks, int x, int y) 2961rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 2962{
3050 clicks = ((clicks - 1) % 3) + 1; 2963 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 2964 selection.clicks = clicks; /* save clicks so extend will work */
3052 2965
3053 if (clicks == 2 && !selection.rect 2966 if (clicks == 2 && !selection.rect
… …
3072/* ------------------------------------------------------------------------- */ 2985/* ------------------------------------------------------------------------- */
3073/* 2986/*
3074 * Mark a selection at the specified col/row 2987 * Mark a selection at the specified col/row
3075 */ 2988 */
3076void 2989void
3077rxvt_term::selection_start_colrow (int col, int row) 2990rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078{ 2991{
3079 want_refresh = 1; 2992 want_refresh = 1;
3080 2993
3081 selection.mark.row = row + view_start; 2994 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 2995 selection.mark.col = col;
… …
3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 2998 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3086 2999
3087 while (selection.mark.col > 0 3000 while (selection.mark.col > 0
3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3001 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3002 --selection.mark.col;
3090 3003
3091 if (selection.op) 3004 if (selection.op)
3005 {
3092 { /* clear the old selection */ 3006 /* clear the old selection */
3093 selection.beg.row = selection.end.row = selection.mark.row; 3007 selection.beg.row = selection.end.row = selection.mark.row;
3094 selection.beg.col = selection.end.col = selection.mark.col; 3008 selection.beg.col = selection.end.col = selection.mark.col;
3095 } 3009 }
3096 3010
3097 selection.op = SELECTION_INIT; 3011 selection.op = SELECTION_INIT;
… …
3108#define DELIMIT_TEXT(x) \ 3022#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3023 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3024#define DELIMIT_REND(x) 1
3111 3025
3112void 3026void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3027rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3028{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3029 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3030 row_col_t bound;
3117 text_t *stp; 3031 text_t *stp;
3118 rend_t *srp; 3032 rend_t *srp;
… …
3192 * flag == 0 ==> button 1 3106 * flag == 0 ==> button 1
3193 * flag == 1 ==> button 3 press 3107 * flag == 1 ==> button 3 press
3194 * flag == 2 ==> button 3 motion 3108 * flag == 2 ==> button 3 motion
3195 */ 3109 */
3196void 3110void
3197rxvt_term::selection_extend (int x, int y, int flag) 3111rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198{ 3112{
3199 int col = clamp (Pixel2Col (x), 0, ncol); 3113 int col = clamp (Pixel2Col (x), 0, ncol);
3200 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3114 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201 3115
3202 /* 3116 /*
… …
3228/* ------------------------------------------------------------------------- */ 3142/* ------------------------------------------------------------------------- */
3229/* 3143/*
3230 * Extend the selection to the specified col/row 3144 * Extend the selection to the specified col/row
3231 */ 3145 */
3232void 3146void
3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3147rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234{ 3148{
3235 row_col_t pos; 3149 row_col_t pos;
3236 enum { 3150 enum {
3237 LEFT, RIGHT 3151 LEFT, RIGHT
3238 } closeto = RIGHT; 3152 } closeto = RIGHT;
… …
3286 * a point/word/line which is either the start or end of the selection 3200 * 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 3201 * and it was decided by whichever point/word/line was `fixed' at the
3288 * time of the most recent button3 press 3202 * time of the most recent button3 press
3289 */ 3203 */
3290 if (button3 && buttonpress) 3204 if (button3 && buttonpress)
3205 {
3291 { /* button3 press */ 3206 /* button3 press */
3292 /* 3207 /*
3293 * first determine which edge of the selection we are closest to 3208 * first determine which edge of the selection we are closest to
3294 */ 3209 */
3295 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3210 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3296 || (!ROWCOL_IS_AFTER (pos, selection.end) 3211 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3314 selection.mark.row = selection.beg.row; 3229 selection.mark.row = selection.beg.row;
3315 selection.mark.col = selection.beg.col; 3230 selection.mark.col = selection.beg.col;
3316 } 3231 }
3317 } 3232 }
3318 else 3233 else
3234 {
3319 { /* button1 drag or button3 drag */ 3235 /* button1 drag or button3 drag */
3320 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3236 if (ROWCOL_IS_AFTER (selection.mark, pos))
3321 { 3237 {
3322 if (selection.mark.row == selection.end.row 3238 if (selection.mark.row == selection.end.row
3323 && selection.mark.col == selection.end.col 3239 && selection.mark.col == selection.end.col
3324 && clickchange 3240 && clickchange
… …
3341 3257
3342 if (selection.clicks == 1) 3258 if (selection.clicks == 1)
3343 { 3259 {
3344 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3260 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3345 && !ROW(selection.beg.row).is_longer () 3261 && !ROW(selection.beg.row).is_longer ()
3346#if ENABLE_FRILLS 3262#if !ENABLE_MINIMAL
3347 && !selection.rect 3263 && !selection.rect
3348#endif 3264#endif
3349 ) 3265 )
3350 selection.beg.col = ncol; 3266 selection.beg.col = ncol;
3351 3267
3352 if ( 3268 if (
3353 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3269 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3354 && !ROW(selection.end.row).is_longer () 3270 && !ROW(selection.end.row).is_longer ()
3355#if ENABLE_FRILLS 3271#if !ENABLE_MINIMAL
3356 && !selection.rect 3272 && !selection.rect
3357#endif 3273#endif
3358 ) 3274 )
3359 selection.end.col = ncol; 3275 selection.end.col = ncol;
3360 } 3276 }
… …
3367 selection_delimit_word (DN, &selection.end, &selection.end); 3283 selection_delimit_word (DN, &selection.end, &selection.end);
3368 } 3284 }
3369 else if (selection.clicks == 3) 3285 else if (selection.clicks == 3)
3370 { 3286 {
3371#if ENABLE_FRILLS 3287#if ENABLE_FRILLS
3372 if (OPTION (Opt_tripleclickwords)) 3288 if (option (Opt_tripleclickwords))
3373 { 3289 {
3374 selection_delimit_word (UP, &selection.beg, &selection.beg); 3290 selection_delimit_word (UP, &selection.beg, &selection.beg);
3375 3291
3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3292 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3377 { 3293 {
3378 if (!ROW(end_row).is_longer ()) 3294 if (!ROW(end_row).is_longer ())
3379 { 3295 {
3380 selection.end.row = end_row; 3296 selection.end.row = end_row;
3381 selection.end.col = ROW(end_row).l; 3297 selection.end.col = ROW(end_row).l;
3298# if !ENABLE_MINIMAL
3382 selection_remove_trailing_spaces (); 3299 selection_remove_trailing_spaces ();
3300# endif
3383 break; 3301 break;
3384 } 3302 }
3385 } 3303 }
3386 } 3304 }
3387 else 3305 else
… …
3403 selection.end.row++; 3321 selection.end.row++;
3404 } 3322 }
3405 } 3323 }
3406 3324
3407 if (button3 && buttonpress) 3325 if (button3 && buttonpress)
3326 {
3408 { /* mark may need to be changed */ 3327 /* mark may need to be changed */
3409 if (closeto == LEFT) 3328 if (closeto == LEFT)
3410 { 3329 {
3411 selection.mark.row = selection.end.row; 3330 selection.mark.row = selection.end.row;
3412 selection.mark.col = selection.end.col - (selection.clicks == 2); 3331 selection.mark.col = selection.end.col - (selection.clicks == 2);
3413 } 3332 }
… …
3416 selection.mark.row = selection.beg.row; 3335 selection.mark.row = selection.beg.row;
3417 selection.mark.col = selection.beg.col; 3336 selection.mark.col = selection.beg.col;
3418 } 3337 }
3419 } 3338 }
3420 3339
3421#if ENABLE_FRILLS 3340#if !ENABLE_MINIMAL
3422 if (selection.rect && selection.beg.col > selection.end.col) 3341 if (selection.rect && selection.beg.col > selection.end.col)
3423 ::swap (selection.beg.col, selection.end.col); 3342 ::swap (selection.beg.col, selection.end.col);
3424#endif 3343#endif
3425} 3344}
3426 3345
3427#if ENABLE_FRILLS 3346#if !ENABLE_MINIMAL
3428void 3347void
3429rxvt_term::selection_remove_trailing_spaces () 3348rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430{ 3349{
3431 int32_t end_col, end_row; 3350 int32_t end_col, end_row;
3432 text_t *stp; 3351 text_t *stp;
3433 3352
3434 end_col = selection.end.col; 3353 end_col = selection.end.col;
… …
3472/* 3391/*
3473 * Double click on button 3 when already selected 3392 * Double click on button 3 when already selected
3474 * EXT: button 3 double click 3393 * EXT: button 3 double click
3475 */ 3394 */
3476void 3395void
3477rxvt_term::selection_rotate (int x, int y) 3396rxvt_term::selection_rotate (int x, int y) NOTHROW
3478{ 3397{
3479 selection.clicks = selection.clicks % 3 + 1; 3398 selection.clicks = selection.clicks % 3 + 1;
3480 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3399 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481} 3400}
3482 3401
… …
3484/* 3403/*
3485 * Respond to a request for our current selection 3404 * Respond to a request for our current selection
3486 * EXT: SelectionRequest 3405 * EXT: SelectionRequest
3487 */ 3406 */
3488void 3407void
3489rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3408rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490{ 3409{
3491 XSelectionEvent ev; 3410 XSelectionEvent ev;
3492 dDisp;
3493 3411
3494 ev.type = SelectionNotify; 3412 ev.type = SelectionNotify;
3495 ev.property = None; 3413 ev.property = None;
3496 ev.display = rq.display; 3414 ev.display = rq.display;
3497 ev.requestor = rq.requestor; 3415 ev.requestor = rq.requestor;
… …
3511 *target++ = xa[XA_COMPOUND_TEXT]; 3429 *target++ = xa[XA_COMPOUND_TEXT];
3512#if X_HAVE_UTF8_STRING 3430#if X_HAVE_UTF8_STRING
3513 *target++ = xa[XA_UTF8_STRING]; 3431 *target++ = xa[XA_UTF8_STRING];
3514#endif 3432#endif
3515 3433
3516 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3434 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3517 32, PropModeReplace, 3435 32, PropModeReplace,
3518 (unsigned char *)target_list, target - target_list); 3436 (unsigned char *)target_list, target - target_list);
3519 ev.property = rq.property; 3437 ev.property = rq.property;
3520 } 3438 }
3521#if TODO // TODO 3439#if TODO // TODO
3522 else if (rq.target == xa[XA_MULTIPLE]) 3440 else if (rq.target == xa[XA_MULTIPLE])
3523 { 3441 {
3524 /* TODO: Handle MULTIPLE */ 3442 /* TODO: Handle MULTIPLE */
3525 } 3443 }
3526#endif 3444#endif
3527 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3445 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3528 { 3446 {
3529 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3447 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3530 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3448 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3449 ev.property = rq.property;
3450 }
3451 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3452 {
3453 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3454 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3531 ev.property = rq.property; 3455 ev.property = rq.property;
3532 } 3456 }
3533 else if (rq.target == XA_STRING 3457 else if (rq.target == XA_STRING
3534 || rq.target == xa[XA_TEXT] 3458 || rq.target == xa[XA_TEXT]
3535 || rq.target == xa[XA_COMPOUND_TEXT] 3459 || rq.target == xa[XA_COMPOUND_TEXT]
… …
3558 style = enc_string; 3482 style = enc_string;
3559 else if (target == xa[XA_TEXT]) 3483 else if (target == xa[XA_TEXT])
3560 style = enc_text; 3484 style = enc_text;
3561 else if (target == xa[XA_COMPOUND_TEXT]) 3485 else if (target == xa[XA_COMPOUND_TEXT])
3562 style = enc_compound_text; 3486 style = enc_compound_text;
3563#if ENABLE_FRILLS 3487#if !ENABLE_MINIMAL
3564 else if (target == xa[XA_UTF8_STRING]) 3488 else if (target == xa[XA_UTF8_STRING])
3565 style = enc_utf8; 3489 style = enc_utf8;
3566#endif 3490#endif
3567 else 3491 else
3568 { 3492 {
3569 target = xa[XA_COMPOUND_TEXT]; 3493 target = xa[XA_COMPOUND_TEXT];
3570 style = enc_compound_text; 3494 style = enc_compound_text;
3571 } 3495 }
3572 3496
3573 if (selection.text) 3497 if (rq.selection == XA_PRIMARY && selection.text)
3574 { 3498 {
3575 cl = selection.text; 3499 cl = selection.text;
3576 selectlen = selection.len; 3500 selectlen = selection.len;
3577 } 3501 }
3502 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3503 {
3504 cl = selection.clip_text;
3505 selectlen = selection.clip_len;
3506 }
3578 else 3507 else
3579 { 3508 {
3580 cl = L""; 3509 cl = L"";
3581 selectlen = 0; 3510 selectlen = 0;
3582 } 3511 }
3583 3512
3584#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3585 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3514 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3586 // so recode it manually 3515 // so recode it manually
3587 if (style == enc_utf8) 3516 if (style == enc_utf8)
3588 { 3517 {
3589 freect = 1; 3518 freect = 1;
… …
3592 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3521 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3593 ct.nitems = strlen ((char *)ct.value); 3522 ct.nitems = strlen ((char *)ct.value);
3594 } 3523 }
3595 else 3524 else
3596#endif 3525#endif
3597 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3526 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3598 freect = 1; 3527 freect = 1;
3599 else 3528 else
3600 { 3529 {
3601 /* if we failed to convert then send it raw */ 3530 /* if we failed to convert then send it raw */
3602 ct.value = (unsigned char *)cl; 3531 ct.value = (unsigned char *)cl;
3603 ct.nitems = selectlen; 3532 ct.nitems = selectlen;
3604 ct.encoding = target; 3533 ct.encoding = target;
3605 } 3534 }
3606 3535
3607 XChangeProperty (disp, rq.requestor, rq.property, 3536 XChangeProperty (dpy, rq.requestor, rq.property,
3608 ct.encoding, 8, PropModeReplace, 3537 ct.encoding, 8, PropModeReplace,
3609 ct.value, (int)ct.nitems); 3538 ct.value, (int)ct.nitems);
3610 ev.property = rq.property; 3539 ev.property = rq.property;
3611 3540
3612 if (freect) 3541 if (freect)
3613 XFree (ct.value); 3542 XFree (ct.value);
3614 } 3543 }
3615 3544
3616 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3545 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} 3546}
3634 3547
3635/* ------------------------------------------------------------------------- */ 3548/* ------------------------------------------------------------------------- */
3636#ifdef USE_XIM 3549#ifdef USE_XIM
3637void 3550void
3638rxvt_term::im_set_position (XPoint &pos) 3551rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639{ 3552{
3640 XWindowAttributes xwa; 3553 XWindowAttributes xwa;
3641 3554
3642 XGetWindowAttributes (display->display, vt, &xwa); 3555 XGetWindowAttributes (dpy, vt, &xwa);
3643 3556
3644 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3557 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3645 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3558 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3646} 3559}
3647#endif 3560#endif
3648 3561
3649#if ENABLE_OVERLAY 3562#if ENABLE_OVERLAY
3650void 3563void
3651rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3564rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652{ 3565{
3653 if (nrow < 1 || ncol < 1) 3566 if (nrow < 1 || ncol < 1)
3654 return; 3567 return;
3655 3568
3656 want_refresh = 1; 3569 want_refresh = 1;
… …
3665 h += 2; min_it (h, nrow); 3578 h += 2; min_it (h, nrow);
3666 3579
3667 x -= 1; clamp_it (x, 0, ncol - w); 3580 x -= 1; clamp_it (x, 0, ncol - w);
3668 y -= 1; clamp_it (y, 0, nrow - h); 3581 y -= 1; clamp_it (y, 0, nrow - h);
3669 3582
3670 ov_x = x; ov_y = y; 3583 ov.x = x; ov.y = y;
3671 ov_w = w; ov_h = h; 3584 ov.w = w; ov.h = h;
3672 3585
3673 ov_text = new text_t *[h]; 3586 ov.text = new text_t *[h];
3674 ov_rend = new rend_t *[h]; 3587 ov.rend = new rend_t *[h];
3675 3588
3676 for (y = 0; y < h; y++) 3589 for (y = 0; y < h; y++)
3677 { 3590 {
3678 text_t *tp = ov_text[y] = new text_t[w]; 3591 text_t *tp = ov.text[y] = new text_t[w];
3679 rend_t *rp = ov_rend[y] = new rend_t[w]; 3592 rend_t *rp = ov.rend[y] = new rend_t[w];
3680 3593
3681 text_t t0, t1, t2; 3594 text_t t0, t1, t2;
3682 rend_t r = OVERLAY_RSTYLE; 3595 rend_t r = OVERLAY_RSTYLE;
3683 3596
3684 if (y == 0) 3597 if (y == 0)
… …
3701 *rp = r; 3614 *rp = r;
3702 } 3615 }
3703} 3616}
3704 3617
3705void 3618void
3706rxvt_term::scr_overlay_off () 3619rxvt_term::scr_overlay_off () NOTHROW
3707{ 3620{
3708 if (!ov_text) 3621 if (!ov.text)
3709 return; 3622 return;
3710 3623
3711 want_refresh = 1; 3624 want_refresh = 1;
3712 3625
3713 for (int y = 0; y < ov_h; y++) 3626 for (int y = 0; y < ov.h; y++)
3714 { 3627 {
3715 delete [] ov_text[y]; 3628 delete [] ov.text[y];
3716 delete [] ov_rend[y]; 3629 delete [] ov.rend[y];
3717 } 3630 }
3718 3631
3719 delete [] ov_text; ov_text = 0; 3632 delete [] ov.text; ov.text = 0;
3720 delete [] ov_rend; ov_rend = 0; 3633 delete [] ov.rend; ov.rend = 0;
3721} 3634}
3722 3635
3723void 3636void
3724rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3637rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725{ 3638{
3726 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3639 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3727 return; 3640 return;
3728 3641
3729 x++, y++; 3642 x++, y++;
3730 3643
3731 ov_text[y][x] = text; 3644 ov.text[y][x] = text;
3732 ov_rend[y][x] = rend; 3645 ov.rend[y][x] = rend;
3733} 3646}
3734 3647
3735void 3648void
3736rxvt_term::scr_overlay_set (int x, int y, const char *s) 3649rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737{ 3650{
3738 while (*s) 3651 while (*s)
3739 scr_overlay_set (x++, y, *s++); 3652 scr_overlay_set (x++, y, *s++);
3740} 3653}
3741 3654
3742void 3655void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3656rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744{ 3657{
3745 while (*s) 3658 while (*s)
3746 { 3659 {
3747 text_t t = *s++; 3660 text_t t = *s++;
3748 int width = wcwidth (t); 3661 int width = WCWIDTH (t);
3749 3662
3750 while (width--) 3663 while (width--)
3751 { 3664 {
3752 scr_overlay_set (x++, y, t); 3665 scr_overlay_set (x++, y, t);
3753 t = NOCHAR; 3666 t = NOCHAR;
3754 } 3667 }
3755 } 3668 }
3756} 3669}
3757 3670
3758void 3671void
3759rxvt_term::scr_swap_overlay () 3672rxvt_term::scr_swap_overlay () NOTHROW
3760{ 3673{
3761 if (!ov_text) 3674 if (!ov.text)
3762 return; 3675 return;
3763 3676
3677 // hide cursor if it is within the overlay area
3678 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3679 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3680 screen.flags &= ~Screen_VisibleCursor;
3681
3764 // swap screen mem with overlay 3682 // swap screen mem with overlay
3765 for (int y = ov_h; y--; ) 3683 for (int y = ov.h; y--; )
3766 { 3684 {
3767 text_t *t1 = ov_text[y]; 3685 text_t *t1 = ov.text[y];
3768 rend_t *r1 = ov_rend[y]; 3686 rend_t *r1 = ov.rend[y];
3769 3687
3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3688 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3771 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; 3689 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3772 3690
3773 for (int x = ov_w; x--; ) 3691 for (int x = ov.w; x--; )
3774 { 3692 {
3775 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3693 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3694 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3777 } 3695 }
3778 } 3696 }

Diff Legend

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