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.406 by sf-exg, Wed Nov 16 18:26:47 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
206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); 208 row_buf = (line_t *)rxvt_calloc (total_rows , sizeof (line_t));
207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
209 211
210 for (int row = nrow; row--; ) 212 for (int row = nrow; row--; )
211 { 213 {
… …
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));
… …
275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
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, 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 {
643 min_it (count, total_rows - (nrow - (row2 + 1)));
644
621 top_row = max (top_row - count, -saveLines); 645 top_row = max (top_row - count, -saveLines);
622
623 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows;
625 646
626 // sever bottommost line 647 // sever bottommost line
627 { 648 {
628 line_t &l = ROW(row2 - count); 649 line_t &l = ROW(row2);
629 l.is_longer (0); 650 l.is_longer (0);
630 l.touch (); 651 l.touch ();
631 } 652 }
632 653
633 // erase newly scrolled-in lines 654 // scroll everything up 'count' lines
634 for (int i = count; i--; ) 655 term_start = (term_start + count) % total_rows;
635 {
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);
639
640 scr_blank_line (l, 0, l.l, rstyle);
641
642 l.l = 0;
643 l.f = 0;
644 }
645 656
646 // now copy lines below the scroll region bottom to the 657 // now copy lines below the scroll region bottom to the
647 // bottom of the screen again, so they look as if they 658 // bottom of the screen again, so they look as if they
648 // hadn't moved. 659 // hadn't moved.
649 for (int i = nrow; --i > row2; ) 660 for (int i = nrow; --i > row2; )
… …
652 line_t &l2 = ROW(i); 663 line_t &l2 = ROW(i);
653 664
654 ::swap (l1, l2); 665 ::swap (l1, l2);
655 l2.touch (); 666 l2.touch ();
656 } 667 }
668
669 // erase newly scrolled-in lines
670 for (int i = count; i--; )
657 671 {
672 line_t &l = ROW(row2 - i);
673
674 // optimise if already cleared, can be significant on slow machines
675 // could be rolled into scr_blank_screen_mem
676 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
677 {
678 scr_blank_line (l, 0, l.l, rstyle);
679 l.l = 0;
680 l.f = 0;
681 }
682 else
683 scr_blank_screen_mem (l, rstyle);
684 }
685
658 // move and/or clear selection, if any 686 // move and/or clear selection, if any
659 if (selection.op && current_screen == selection.screen) 687 if (selection.op && current_screen == selection.screen
688 && selection.beg.row <= row2)
660 { 689 {
661 selection.beg.row -= count; 690 selection.beg.row -= count;
662 selection.end.row -= count; 691 selection.end.row -= count;
663 selection.mark.row -= count; 692 selection.mark.row -= count;
664 693
665 if (selection.beg.row < top_row 694 selection_check (0);
666 || selection.end.row < top_row
667 || selection.mark.row < top_row)
668 {
669 CLEAR_ALL_SELECTION ();
670 selection.op = SELECTION_CLEAR;
671 }
672 } 695 }
673 696
674 // finally move the view window, if desired 697 // finally move the view window, if desired
675 if (OPTION (Opt_scrollWithBuffer) 698 if (option (Opt_scrollWithBuffer)
676 && view_start != 0 699 && view_start != 0
677 && view_start != -saveLines) 700 && view_start != -saveLines)
678 scr_page (UP, count); 701 scr_page (UP, count);
679 702
680 if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) 703 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
… …
698 { 721 {
699 /* move selected region too */ 722 /* move selected region too */
700 selection.beg.row -= count; 723 selection.beg.row -= count;
701 selection.end.row -= count; 724 selection.end.row -= count;
702 selection.mark.row -= count; 725 selection.mark.row -= count;
703 726
704 selection_check (0); 727 selection_check (0);
705 } 728 }
706 } 729 }
707 730
708 // use a simple and robust scrolling algorithm, this 731 // use a simple and robust scrolling algorithm, this
709 // part of scr_scroll_text is not time-critical. 732 // part of scr_scroll_text is not time-critical.
710 733
734 // sever line above scroll region
735 if (row1)
736 {
737 line_t &l = ROW(row1 - 1);
738 l.is_longer (0);
739 l.touch ();
740 }
741
711 int rows = row2 - row1 + 1; 742 int rows = row2 - row1 + 1;
712 743
713 min_it (count, rows); 744 min_it (count, rows);
714 745
715 line_t *temp_buf = row_buf + total_rows; 746 line_t *temp_buf = rxvt_temp_buf<line_t> (rows);
716 747
717 for (int row = 0; row < rows; row++) 748 for (int row = 0; row < rows; row++)
718 { 749 {
719 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 750 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
720 751
… …
722 scr_blank_screen_mem (temp_buf [row], rstyle); 753 scr_blank_screen_mem (temp_buf [row], rstyle);
723 } 754 }
724 755
725 for (int row = 0; row < rows; row++) 756 for (int row = 0; row < rows; row++)
726 ROW(row1 + row) = temp_buf [row]; 757 ROW(row1 + row) = temp_buf [row];
758
759 // sever bottommost line
760 {
761 line_t &l = ROW(row2);
762 l.is_longer (0);
763 l.touch ();
764 }
727 } 765 }
728 766
729 return count; 767 return count;
730} 768}
731 769
732/* ------------------------------------------------------------------------- */ 770/* ------------------------------------------------------------------------- */
733/* 771/*
734 * Add text given in <str> of length <len> to screen struct 772 * Add text given in <str> of length <len> to screen struct
735 */ 773 */
736void 774void
737rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 775rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
738{ 776{
739 if (len <= 0) /* sanity */ 777 if (len <= 0) /* sanity */
740 return; 778 return;
741 779
742 unsigned char checksel; 780 bool checksel;
743 unicode_t c; 781 unicode_t c;
744 int ncol = this->ncol; 782 int ncol = this->ncol;
745 const wchar_t *strend = str + len; 783 const wchar_t *strend = str + len;
746 784
747 want_refresh = 1; 785 want_refresh = 1;
748 ZERO_SCROLLBACK (); 786 ZERO_SCROLLBACK ();
749 787
750 if (minlines > 0) 788 if (minlines > 0)
751 { 789 {
752 minlines += screen.cur.row - screen.bscroll; 790 minlines += screen.cur.row - screen.bscroll;
791 min_it (minlines, screen.cur.row - top_row);
753 792
754 if (minlines > 0 793 if (minlines > 0
755 && screen.tscroll == 0 794 && screen.tscroll == 0
756 && screen.bscroll == nrow - 1) 795 && screen.bscroll == nrow - 1)
757 { 796 {
… …
759 scr_scroll_text (screen.tscroll, screen.bscroll, minlines); 798 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
760 screen.cur.row -= minlines; 799 screen.cur.row -= minlines;
761 } 800 }
762 } 801 }
763 802
764#ifdef DEBUG_STRICT
765 assert (screen.cur.col < ncol); 803 assert (screen.cur.col < ncol);
766 assert (screen.cur.row < nrow 804 assert (screen.cur.row < nrow
767 && screen.cur.row >= top_row); 805 && screen.cur.row >= top_row);
768#endif
769 int row = screen.cur.row; 806 int row = screen.cur.row;
770 807
771 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 808 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
772 809
773 line_t *line = &ROW(row); 810 line_t *line = &ROW(row);
774 811
775 while (str < strend) 812 while (str < strend)
776 { 813 {
777 c = (unicode_t)*str++; // convert to rxvt-unicodes representation 814 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
778 815
779 if (c < 0x20) 816 if (ecb_unlikely (c < 0x20))
780 if (c == C0_LF) 817 if (c == C0_LF)
781 { 818 {
782 max_it (line->l, screen.cur.col); 819 max_it (line->l, screen.cur.col);
783 820
784 screen.flags &= ~Screen_WrapNext; 821 screen.flags &= ~Screen_WrapNext;
… …
803 { 840 {
804 scr_tab (1, true); 841 scr_tab (1, true);
805 continue; 842 continue;
806 } 843 }
807 844
845 if (ecb_unlikely (
808 if (checksel /* see if we're writing within selection */ 846 checksel /* see if we're writing within selection */
809 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 847 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
810 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 848 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
849 ))
811 { 850 {
812 checksel = 0; 851 checksel = 0;
813 /* 852 /*
814 * If we wrote anywhere in the selected area, kill the selection 853 * If we wrote anywhere in the selected area, kill the selection
815 * XXX: should we kill the mark too? Possibly, but maybe that 854 * XXX: should we kill the mark too? Possibly, but maybe that
816 * should be a similar check. 855 * should be a similar check.
817 */ 856 */
818 CLEAR_SELECTION (); 857 CLEAR_SELECTION ();
819 } 858 }
820 859
821 if (screen.flags & Screen_WrapNext) 860 if (ecb_unlikely (screen.flags & Screen_WrapNext))
822 { 861 {
823 scr_do_wrap (); 862 scr_do_wrap ();
824 863
825 line->l = ncol; 864 line->l = ncol;
826 line->is_longer (1); 865 line->is_longer (1);
827 866
828 row = screen.cur.row; 867 row = screen.cur.row;
829 line = &ROW(row); /* _must_ refresh */ 868 line = &ROW(row); /* _must_ refresh */
830 } 869 }
831 870
832 // some utf-8 decoders "decode" surrogate characters: let's fix this. 871 // some utf-8 decoders "decode" surrogate characters: let's fix this.
833 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 872 if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff)))
834 c = 0xfffd; 873 c = 0xfffd;
835 874
836 // rely on wcwidth to tell us the character width, at least for non-latin1 875 // rely on wcwidth to tell us the character width, do wcwidth before
837 // do wcwidth before further replacements, as wcwidth might return -1 876 // 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 877 // drawing characters below as they might be invalid in the current
839 // locale. 878 // locale.
840 int width = c < 0x100 ? 1 : wcwidth (c); 879 int width = WCWIDTH (c);
841 880
842 if (charsets [screen.charset] == '0') // DEC SPECIAL 881 if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL
843 { 882 {
844 // vt100 special graphics and line drawing 883 // vt100 special graphics and line drawing
845 // 5f-7e standard vt100 884 // 5f-7e standard vt100
846 // 40-5e rxvt extension for extra curses acs chars 885 // 40-5e rxvt extension for extra curses acs chars
847 static uint16_t vt100_0[62] = { // 41 .. 7e 886 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
860 c = vt100_0[c - 0x41]; 899 c = vt100_0[c - 0x41];
861 width = 1; // vt100 line drawing characters are always single-width 900 width = 1; // vt100 line drawing characters are always single-width
862 } 901 }
863 } 902 }
864 903
865 if (screen.flags & Screen_Insert) 904 if (ecb_unlikely (screen.flags & Screen_Insert))
866 scr_insdel_chars (width, INSERT); 905 scr_insdel_chars (width, INSERT);
867 906
868 if (width != 0) 907 if (width != 0)
869 { 908 {
870#if !UNICODE_3 909#if !UNICODE_3
… …
875# else 914# else
876 c = 0xfffd; 915 c = 0xfffd;
877# endif 916# endif
878#endif 917#endif
879 918
919 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
920
921 // if the character doesn't fit into the remaining columns...
922 if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width))
923 {
924 if (screen.flags & Screen_Autowrap)
925 {
926 // ... artificially enlargen the previous one
927 c = NOCHAR;
928 // and try the same character next loop iteration
929 --str;
930 }
931 else
932 screen.cur.col = ncol - width;
933 }
934
880 // nuke the character at this position, if required 935 // nuke the character at this position, if required
936 // due to wonderful coincidences everywhere else in this loop
937 // we never have to check for overwriting a wide char itself,
938 // only its tail.
881 if (line->t[screen.cur.col] == NOCHAR 939 if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR))
882 || (screen.cur.col < ncol - 1 940 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 941
912 line->touch (); 942 line->touch ();
913 943
914 do 944 do
915 { 945 {
916 line->t[screen.cur.col] = c; 946 line->t[screen.cur.col] = c;
917 line->r[screen.cur.col] = rend; 947 line->r[screen.cur.col] = rend;
918 948
919 if (screen.cur.col < ncol - 1) 949 if (ecb_likely (screen.cur.col < ncol - 1))
920 screen.cur.col++; 950 screen.cur.col++;
921 else 951 else
922 { 952 {
923 line->l = ncol; 953 line->l = ncol;
924 if (screen.flags & Screen_Autowrap) 954 if (screen.flags & Screen_Autowrap)
925 screen.flags |= Screen_WrapNext; 955 screen.flags |= Screen_WrapNext;
926 break; 956
957 goto end_of_line;
927 } 958 }
928 959
929 c = NOCHAR; 960 c = NOCHAR;
930 } 961 }
931 while (--width > 0); 962 while (ecb_unlikely (--width > 0));
932 963
933 // pad with spaces when overwriting wide character with smaller one 964 // pad with spaces when overwriting wide character with smaller one
934 if (!width) 965 for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++)
935 { 966 {
936 line->touch (); 967 line->t[c] = ' ';
968 line->r[c] = rend;
969 }
937 970
938 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) 971end_of_line:
972 ;
973 }
974#if ENABLE_COMBINING
975 else // width == 0
976 {
977 if (c != 0xfeff) // ignore BOM
978 {
979 // handle combining characters
980 // we just tag the accent on the previous on-screen character.
981 // this is arguably not correct, but also arguably not wrong.
982 // we don't handle double-width characters nicely yet.
983 line_t *linep;
984 text_t *tp;
985 rend_t *rp;
986
987 if (screen.cur.col > 0)
939 { 988 {
940 line->t[c] = ' ';
941 line->r[c] = rend; 989 linep = line;
990 tp = line->t + screen.cur.col - 1;
991 rp = line->r + screen.cur.col - 1;
942 } 992 }
993 else if (screen.cur.row > 0
994 && ROW(screen.cur.row - 1).is_longer ())
995 {
996 linep = &ROW(screen.cur.row - 1);
997 tp = line->t + ncol - 1;
998 rp = line->r + ncol - 1;
999 }
1000 else
1001 continue;
1002
1003 linep->touch ();
1004
1005 while (*tp == NOCHAR && tp > linep->t)
1006 tp--, rp--;
1007
1008 // first try to find a precomposed character
1009 unicode_t n = rxvt_compose (*tp, c);
1010 if (n == NOCHAR)
1011 n = rxvt_composite.compose (*tp, c);
1012
1013 *tp = n;
1014 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
943 } 1015 }
944 } 1016 }
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 1017#endif
985 }
986 } 1018 }
987 1019
988 max_it (line->l, screen.cur.col); 1020 max_it (line->l, screen.cur.col);
989 1021
990#ifdef DEBUG_STRICT
991 assert (screen.cur.row >= 0); 1022 assert (screen.cur.row >= 0);
992#endif
993} 1023}
994 1024
995/* ------------------------------------------------------------------------- */ 1025/* ------------------------------------------------------------------------- */
996/* 1026/*
997 * Process Backspace. Move back the cursor back a position, wrap if have to 1027 * Process Backspace. Move back the cursor back a position, wrap if have to
998 * XTERM_SEQ: CTRL-H 1028 * XTERM_SEQ: CTRL-H
999 */ 1029 */
1000void 1030void
1001rxvt_term::scr_backspace () 1031rxvt_term::scr_backspace () NOTHROW
1002{ 1032{
1003 want_refresh = 1;
1004
1005 if (screen.cur.col == 0) 1033 if (screen.cur.col == 0)
1006 { 1034 {
1007 if (screen.cur.row > 0) 1035 if (screen.cur.row > 0)
1008 { 1036 {
1009#ifdef TERMCAP_HAS_BW 1037#ifdef TERMCAP_HAS_BW
1010 screen.cur.col = ncol - 1; 1038 screen.cur.col = ncol - 1;
1011 screen.cur.row--; 1039 --screen.cur.row;
1012 return; 1040
1041 want_refresh = 1;
1013#endif 1042#endif
1014 } 1043 }
1015 } 1044 }
1016 else if (!(screen.flags & Screen_WrapNext)) 1045 else if (screen.flags & Screen_WrapNext)
1046 screen.flags &= ~Screen_WrapNext;
1047 else
1017 scr_gotorc (0, -1, RELATIVE); 1048 scr_gotorc (0, -1, RELATIVE);
1018
1019 screen.flags &= ~Screen_WrapNext;
1020} 1049}
1021 1050
1022/* ------------------------------------------------------------------------- */ 1051/* ------------------------------------------------------------------------- */
1023/* 1052/*
1024 * Process Horizontal Tab 1053 * Process Horizontal Tab
1025 * count: +ve = forward; -ve = backwards 1054 * count: +ve = forward; -ve = backwards
1026 * XTERM_SEQ: CTRL-I 1055 * XTERM_SEQ: CTRL-I
1027 */ 1056 */
1028void 1057void
1029rxvt_term::scr_tab (int count, bool ht) 1058rxvt_term::scr_tab (int count, bool ht) NOTHROW
1030{ 1059{
1031 int i, x; 1060 int i, x;
1032 1061
1033 want_refresh = 1; 1062 want_refresh = 1;
1034 i = x = screen.cur.col; 1063 i = x = screen.cur.col;
… …
1047 x = i; 1076 x = i;
1048 1077
1049 if (!--count) 1078 if (!--count)
1050 break; 1079 break;
1051 } 1080 }
1052 else 1081 else
1053 ht &= l.t[i] == ' ' 1082 ht &= l.t[i] == ' '
1054 && RS_SAME (l.r[i], base_rend); 1083 && RS_SAME (l.r[i], base_rend);
1055 1084
1056 if (count) 1085 if (count)
1057 x = ncol - 1; 1086 x = ncol - 1;
1058 1087
1059 // store horizontal tab commands as characters inside the text 1088 // store horizontal tab commands as characters inside the text
1060 // buffer so they can be selected and pasted. 1089 // buffer so they can be selected and pasted.
1061 if (ht && OPTION (Opt_pastableTabs)) 1090 if (ht && option (Opt_pastableTabs))
1062 { 1091 {
1063 base_rend = SET_FONT (base_rend, 0); 1092 base_rend = SET_FONT (base_rend, 0);
1064 1093
1065 l.touch (x); 1094 l.touch (x);
1066 1095
… …
1099 * Process DEC Back Index 1128 * Process DEC Back Index
1100 * XTERM_SEQ: ESC 6 1129 * XTERM_SEQ: ESC 6
1101 * Move cursor left in row. If we're at the left boundary, shift everything 1130 * Move cursor left in row. If we're at the left boundary, shift everything
1102 * in that row right. Clear left column. 1131 * in that row right. Clear left column.
1103 */ 1132 */
1104#if ENABLE_FRILLS 1133#if !ENABLE_MINIMAL
1105void 1134void
1106rxvt_term::scr_backindex () 1135rxvt_term::scr_backindex () NOTHROW
1107{ 1136{
1108 if (screen.cur.col > 0) 1137 if (screen.cur.col > 0)
1109 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1138 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1110 else 1139 else
1111 scr_insdel_chars (1, INSERT); 1140 scr_insdel_chars (1, INSERT);
… …
1116 * Process DEC Forward Index 1145 * Process DEC Forward Index
1117 * XTERM_SEQ: ESC 9 1146 * XTERM_SEQ: ESC 9
1118 * Move cursor right in row. If we're at the right boundary, shift everything 1147 * Move cursor right in row. If we're at the right boundary, shift everything
1119 * in that row left. Clear right column. 1148 * in that row left. Clear right column.
1120 */ 1149 */
1121#if ENABLE_FRILLS 1150#if !ENABLE_MINIMAL
1122void 1151void
1123rxvt_term::scr_forwardindex () 1152rxvt_term::scr_forwardindex () NOTHROW
1124{ 1153{
1125 if (screen.cur.col < ncol - 1) 1154 if (screen.cur.col < ncol - 1)
1126 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1155 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1127 else 1156 else
1128 { 1157 {
… …
1141/* ------------------------------------------------------------------------- */ 1170/* ------------------------------------------------------------------------- */
1142/* 1171/*
1143 * Goto Row/Column 1172 * Goto Row/Column
1144 */ 1173 */
1145void 1174void
1146rxvt_term::scr_gotorc (int row, int col, int relative) 1175rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1147{ 1176{
1148 want_refresh = 1; 1177 want_refresh = 1;
1149 ZERO_SCROLLBACK (); 1178 ZERO_SCROLLBACK ();
1150 1179
1151 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1180 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1173 } 1202 }
1174 } 1203 }
1175 else 1204 else
1176 { 1205 {
1177 if (screen.flags & Screen_Relative) 1206 if (screen.flags & Screen_Relative)
1207 {
1178 { /* relative origin mode */ 1208 /* relative origin mode */
1179 screen.cur.row = row + screen.tscroll; 1209 screen.cur.row = row + screen.tscroll;
1180 min_it (screen.cur.row, screen.bscroll); 1210 min_it (screen.cur.row, screen.bscroll);
1181 } 1211 }
1182 else 1212 else
1183 screen.cur.row = row; 1213 screen.cur.row = row;
… …
1189/* ------------------------------------------------------------------------- */ 1219/* ------------------------------------------------------------------------- */
1190/* 1220/*
1191 * direction should be UP or DN 1221 * direction should be UP or DN
1192 */ 1222 */
1193void 1223void
1194rxvt_term::scr_index (enum page_dirn direction) 1224rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1195{ 1225{
1196 int dirn; 1226 int dirn;
1197 1227
1198 want_refresh = 1; 1228 want_refresh = 1;
1199 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
… …
1216/* 1246/*
1217 * Erase part or whole of a line 1247 * Erase part or whole of a line
1218 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1248 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1219 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1249 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1220 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1250 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1251 * extension: clear to right unless wrapped: ESC [ 3 K
1221 */ 1252 */
1222void 1253void
1223rxvt_term::scr_erase_line (int mode) 1254rxvt_term::scr_erase_line (int mode) NOTHROW
1224{ 1255{
1225 unsigned int col, num; 1256 unsigned int col, num;
1226 1257
1227 want_refresh = 1; 1258 want_refresh = 1;
1228 ZERO_SCROLLBACK (); 1259 ZERO_SCROLLBACK ();
… …
1234 line.touch (); 1265 line.touch ();
1235 line.is_longer (0); 1266 line.is_longer (0);
1236 1267
1237 switch (mode) 1268 switch (mode)
1238 { 1269 {
1270 case 3:
1271 if (screen.flags & Screen_WrapNext)
1272 return;
1273
1274 /* fall through */
1275
1239 case 0: /* erase to end of line */ 1276 case 0: /* erase to end of line */
1240 col = screen.cur.col; 1277 col = screen.cur.col;
1241 num = ncol - col; 1278 num = ncol - col;
1242 min_it (line.l, col); 1279 min_it (line.l, col);
1280
1243 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1281 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1244 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1282 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1245 CLEAR_SELECTION (); 1283 CLEAR_SELECTION ();
1246 break; 1284 break;
1285
1247 case 1: /* erase to beginning of line */ 1286 case 1: /* erase to beginning of line */
1248 col = 0; 1287 col = 0;
1249 num = screen.cur.col + 1; 1288 num = screen.cur.col + 1;
1289
1250 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1290 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1251 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1291 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1252 CLEAR_SELECTION (); 1292 CLEAR_SELECTION ();
1253 break; 1293 break;
1294
1254 case 2: /* erase whole line */ 1295 case 2: /* erase whole line */
1255 col = 0; 1296 col = 0;
1256 num = ncol; 1297 num = ncol;
1257 line.l = 0; 1298 line.l = 0;
1258 if (selection.beg.row <= screen.cur.row 1299 if (selection.beg.row <= screen.cur.row
… …
1272 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1313 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1273 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1314 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1274 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1315 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1275 */ 1316 */
1276void 1317void
1277rxvt_term::scr_erase_screen (int mode) 1318rxvt_term::scr_erase_screen (int mode) NOTHROW
1278{ 1319{
1279 int num; 1320 int num;
1280 int32_t row; 1321 int32_t row;
1281 rend_t ren; 1322 rend_t ren;
1282 XGCValues gcvalue; 1323 XGCValues gcvalue;
… …
1285 ZERO_SCROLLBACK (); 1326 ZERO_SCROLLBACK ();
1286 1327
1287 switch (mode) 1328 switch (mode)
1288 { 1329 {
1289 case 0: /* erase to end of screen */ 1330 case 0: /* erase to end of screen */
1290 selection_check (1);
1291 scr_erase_line (0); 1331 scr_erase_line (0);
1292 row = screen.cur.row + 1; /* possible OOB */ 1332 row = screen.cur.row + 1; /* possible OOB */
1293 num = nrow - row; 1333 num = nrow - row;
1294 break; 1334 break;
1295 case 1: /* erase to beginning of screen */ 1335 case 1: /* erase to beginning of screen */
1296 selection_check (3);
1297 scr_erase_line (1); 1336 scr_erase_line (1);
1298 row = 0; 1337 row = 0;
1299 num = screen.cur.row; 1338 num = screen.cur.row;
1300 break; 1339 break;
1301 case 2: /* erase whole screen */ 1340 case 2: /* erase whole screen */
1302 selection_check (3);
1303 row = 0; 1341 row = 0;
1304 num = nrow; 1342 num = nrow;
1305 break; 1343 break;
1306 default: 1344 default:
1307 return; 1345 return;
… …
1316 if (row >= nrow) /* Out Of Bounds */ 1354 if (row >= nrow) /* Out Of Bounds */
1317 return; 1355 return;
1318 1356
1319 min_it (num, nrow - row); 1357 min_it (num, nrow - row);
1320 1358
1321 if (rstyle & (RS_RVid | RS_Uline)) 1359 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1322 ren = (rend_t) ~RS_None; 1360 ren = (rend_t) ~RS_None;
1323 else if (GET_BASEBG (rstyle) == Color_bg) 1361 else if (GET_BASEBG (rstyle) == Color_bg)
1324 { 1362 {
1325 ren = DEFAULT_RSTYLE; 1363 ren = DEFAULT_RSTYLE;
1326 CLEAR_ROWS (row, num); 1364
1365 if (mapped)
1366 XClearArea (dpy, vt, 0,
1367 Row2Pixel (row - view_start), (unsigned int)width,
1368 (unsigned int)Height2Pixel (num), False);
1327 } 1369 }
1328 else 1370 else
1329 { 1371 {
1330 ren = rstyle & (RS_fgMask | RS_bgMask); 1372 ren = rstyle & (RS_fgMask | RS_bgMask);
1373
1374 if (mapped)
1375 {
1331 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1376 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1332 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1377 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1333 ERASE_ROWS (row, num); 1378 XFillRectangle (dpy, vt, gc,
1379 0, Row2Pixel (row - view_start),
1380 (unsigned int)width,
1381 (unsigned int)Height2Pixel (num));
1334 gcvalue.foreground = pix_colors[Color_fg]; 1382 gcvalue.foreground = pix_colors[Color_fg];
1335 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1383 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1384 }
1336 } 1385 }
1337 1386
1338 for (; num--; row++) 1387 for (; num--; row++)
1339 { 1388 {
1340 scr_blank_screen_mem (ROW(row), rstyle); 1389 scr_blank_screen_mem (ROW(row), rstyle);
1390
1391 if (row - view_start < nrow)
1341 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1392 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1342 } 1393 }
1343} 1394}
1344 1395
1345#if ENABLE_FRILLS 1396#if !ENABLE_MINIMAL
1346void 1397void
1347rxvt_term::scr_erase_savelines () 1398rxvt_term::scr_erase_savelines () NOTHROW
1348{ 1399{
1349 want_refresh = 1; 1400 want_refresh = 1;
1350 ZERO_SCROLLBACK (); 1401 ZERO_SCROLLBACK ();
1351 1402
1352 top_row = 0; 1403 top_row = 0;
… …
1357/* 1408/*
1358 * Fill the screen with `E's 1409 * Fill the screen with `E's
1359 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1410 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1360 */ 1411 */
1361void 1412void
1362rxvt_term::scr_E () 1413rxvt_term::scr_E () NOTHROW
1363{ 1414{
1364 rend_t fs; 1415 rend_t fs;
1365 1416
1366 want_refresh = 1; 1417 want_refresh = 1;
1367 ZERO_SCROLLBACK (); 1418 ZERO_SCROLLBACK ();
… …
1388/* ------------------------------------------------------------------------- */ 1439/* ------------------------------------------------------------------------- */
1389/* 1440/*
1390 * Insert/Delete <count> lines 1441 * Insert/Delete <count> lines
1391 */ 1442 */
1392void 1443void
1393rxvt_term::scr_insdel_lines (int count, int insdel) 1444rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1394{ 1445{
1395 int end; 1446 int end;
1396 1447
1397 ZERO_SCROLLBACK (); 1448 ZERO_SCROLLBACK ();
1398 1449
… …
1418/* ------------------------------------------------------------------------- */ 1469/* ------------------------------------------------------------------------- */
1419/* 1470/*
1420 * Insert/Delete <count> characters from the current position 1471 * Insert/Delete <count> characters from the current position
1421 */ 1472 */
1422void 1473void
1423rxvt_term::scr_insdel_chars (int count, int insdel) 1474rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1424{ 1475{
1425 int col, row;
1426 rend_t tr;
1427
1428 want_refresh = 1; 1476 want_refresh = 1;
1429 ZERO_SCROLLBACK (); 1477 ZERO_SCROLLBACK ();
1430 1478
1431 if (count <= 0) 1479 if (count <= 0)
1432 return; 1480 return;
… …
1434 scr_do_wrap (); 1482 scr_do_wrap ();
1435 1483
1436 selection_check (1); 1484 selection_check (1);
1437 min_it (count, ncol - screen.cur.col); 1485 min_it (count, ncol - screen.cur.col);
1438 1486
1439 row = screen.cur.row; 1487 int row = screen.cur.row;
1440 1488
1441 line_t *line = &ROW(row); 1489 line_t *line = &ROW(row);
1442 1490
1443 line->touch (); 1491 line->touch ();
1444 line->is_longer (0); 1492 line->is_longer (0);
1445 1493
1494 // nuke wide spanning the start
1495 if (line->t[screen.cur.col] == NOCHAR)
1496 scr_kill_char (*line, screen.cur.col);
1497
1446 switch (insdel) 1498 switch (insdel)
1447 { 1499 {
1448 case INSERT: 1500 case INSERT:
1449 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1501 line->l = min (line->l + count, ncol);
1502
1503 if (line->t[screen.cur.col] == NOCHAR)
1504 scr_kill_char (*line, screen.cur.col);
1505
1506 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1450 { 1507 {
1451 line->t[col] = line->t[col - count]; 1508 line->t[col] = line->t[col - count];
1452 line->r[col] = line->r[col - count]; 1509 line->r[col] = line->r[col - count];
1453 } 1510 }
1454
1455 line->l = min (line->l + count, ncol);
1456 1511
1457 if (selection.op && current_screen == selection.screen 1512 if (selection.op && current_screen == selection.screen
1458 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1513 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1459 { 1514 {
1460 if (selection.end.row != screen.cur.row 1515 if (selection.end.row != screen.cur.row
1461 || (selection.end.col + count >= ncol)) 1516 || (selection.end.col + count >= ncol))
1462 CLEAR_SELECTION (); 1517 CLEAR_SELECTION ();
1463 else 1518 else
1519 {
1464 { /* shift selection */ 1520 /* shift selection */
1465 selection.beg.col += count; 1521 selection.beg.col += count;
1466 selection.mark.col += count; /* XXX: yes? */ 1522 selection.mark.col += count; /* XXX: yes? */
1467 selection.end.col += count; 1523 selection.end.col += count;
1468 } 1524 }
1469 } 1525 }
… …
1474 case ERASE: 1530 case ERASE:
1475 screen.cur.col += count; /* don't worry if > ncol */ 1531 screen.cur.col += count; /* don't worry if > ncol */
1476 selection_check (1); 1532 selection_check (1);
1477 screen.cur.col -= count; 1533 screen.cur.col -= count;
1478 1534
1479 line->l = max (line->l - count, 0); 1535 // nuke wide char after the end
1536 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1537 scr_kill_char (*line, screen.cur.col + count);
1538
1480 scr_blank_line (*line, screen.cur.col, count, rstyle); 1539 scr_blank_line (*line, screen.cur.col, count, rstyle);
1481 break; 1540 break;
1482 1541
1483 case DELETE: 1542 case DELETE:
1484 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1543 line->l = max (line->l - count, 0);
1485 1544
1545 // nuke wide char spanning the end
1546 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1547 scr_kill_char (*line, screen.cur.col + count);
1548
1486 for (col = screen.cur.col; (col + count) < ncol; col++) 1549 for (int col = screen.cur.col; (col + count) < ncol; col++)
1487 { 1550 {
1488 line->t[col] = line->t[col + count]; 1551 line->t[col] = line->t[col + count];
1489 line->r[col] = line->r[col + count]; 1552 line->r[col] = line->r[col + count];
1490 } 1553 }
1491 1554
1492 line->l = max (line->l - count, 0);
1493 scr_blank_line (*line, ncol - count, count, tr); 1555 scr_blank_line (*line, ncol - count, count, rstyle);
1494 1556
1495 if (selection.op && current_screen == selection.screen 1557 if (selection.op && current_screen == selection.screen
1496 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1558 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1497 { 1559 {
1498 if (selection.end.row != screen.cur.row 1560 if (selection.end.row != screen.cur.row
… …
1516/* 1578/*
1517 * Set the scrolling region 1579 * Set the scrolling region
1518 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1580 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1519 */ 1581 */
1520void 1582void
1521rxvt_term::scr_scroll_region (int top, int bot) 1583rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1522{ 1584{
1523 max_it (top, 0); 1585 max_it (top, 0);
1524 min_it (bot, nrow - 1); 1586 min_it (bot, nrow - 1);
1525 1587
1526 if (top > bot) 1588 if (top > bot)
… …
1536 * Make the cursor visible/invisible 1598 * Make the cursor visible/invisible
1537 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1599 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1538 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1600 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1539 */ 1601 */
1540void 1602void
1541rxvt_term::scr_cursor_visible (int mode) 1603rxvt_term::scr_cursor_visible (int mode) NOTHROW
1542{ 1604{
1543 want_refresh = 1; 1605 want_refresh = 1;
1544 1606
1545 if (mode) 1607 if (mode)
1546 screen.flags |= Screen_VisibleCursor; 1608 screen.flags |= Screen_VisibleCursor;
… …
1553 * Set/unset automatic wrapping 1615 * Set/unset automatic wrapping
1554 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1616 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1555 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1617 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1556 */ 1618 */
1557void 1619void
1558rxvt_term::scr_autowrap (int mode) 1620rxvt_term::scr_autowrap (int mode) NOTHROW
1559{ 1621{
1560 if (mode) 1622 if (mode)
1561 screen.flags |= Screen_Autowrap; 1623 screen.flags |= Screen_Autowrap;
1562 else 1624 else
1563 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1625 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1572 * and the cursor cannot be moved outside. 1634 * and the cursor cannot be moved outside.
1573 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1635 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1574 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1636 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1575 */ 1637 */
1576void 1638void
1577rxvt_term::scr_relative_origin (int mode) 1639rxvt_term::scr_relative_origin (int mode) NOTHROW
1578{ 1640{
1579 if (mode) 1641 if (mode)
1580 screen.flags |= Screen_Relative; 1642 screen.flags |= Screen_Relative;
1581 else 1643 else
1582 screen.flags &= ~Screen_Relative; 1644 screen.flags &= ~Screen_Relative;
… …
1589 * Set insert/replace mode 1651 * Set insert/replace mode
1590 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1652 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1591 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1653 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1592 */ 1654 */
1593void 1655void
1594rxvt_term::scr_insert_mode (int mode) 1656rxvt_term::scr_insert_mode (int mode) NOTHROW
1595{ 1657{
1596 if (mode) 1658 if (mode)
1597 screen.flags |= Screen_Insert; 1659 screen.flags |= Screen_Insert;
1598 else 1660 else
1599 screen.flags &= ~Screen_Insert; 1661 screen.flags &= ~Screen_Insert;
… …
1605 * XTERM_SEQ: Set tab at current column : ESC H 1667 * XTERM_SEQ: Set tab at current column : ESC H
1606 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1668 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1607 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1669 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1608 */ 1670 */
1609void 1671void
1610rxvt_term::scr_set_tab (int mode) 1672rxvt_term::scr_set_tab (int mode) NOTHROW
1611{ 1673{
1612 if (mode < 0) 1674 if (mode < 0)
1613 memset (tabs, 0, ncol * sizeof (char)); 1675 memset (tabs, 0, ncol);
1614 else if (screen.cur.col < ncol) 1676 else if (screen.cur.col < ncol)
1615 tabs [screen.cur.col] = !!mode; 1677 tabs [screen.cur.col] = !!mode;
1616} 1678}
1617 1679
1618/* ------------------------------------------------------------------------- */ 1680/* ------------------------------------------------------------------------- */
… …
1620 * Set reverse/normal video 1682 * Set reverse/normal video
1621 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1683 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1622 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1684 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1623 */ 1685 */
1624void 1686void
1625rxvt_term::scr_rvideo_mode (int mode) 1687rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1626{ 1688{
1627 XGCValues gcvalue; 1689 rvideo_mode = on;
1628 1690
1691#ifndef NO_BELL
1692 on ^= rvideo_bell;
1693#endif
1694
1629 if (rvideo != mode) 1695 if (rvideo_state != on)
1630 { 1696 {
1631 rvideo = mode; 1697 rvideo_state = on;
1698
1632 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1699 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1633#if XPM_BACKGROUND 1700#ifdef HAVE_BG_PIXMAP
1634 if (bgPixmap.pixmap == None) 1701 if (bg_pixmap == None)
1635#endif 1702#endif
1636#if TRANSPARENT 1703 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 1704
1705 XGCValues gcvalue;
1642 gcvalue.foreground = pix_colors[Color_fg]; 1706 gcvalue.foreground = pix_colors[Color_fg];
1643 gcvalue.background = pix_colors[Color_bg]; 1707 gcvalue.background = pix_colors[Color_bg];
1644 XChangeGC (display->display, gc, GCBackground | GCForeground, 1708 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1645 &gcvalue); 1709
1646 scr_clear (); 1710 scr_clear ();
1647 scr_touch (true); 1711 scr_touch (true);
1648 } 1712 }
1649} 1713}
1650 1714
… …
1652/* 1716/*
1653 * Report current cursor position 1717 * Report current cursor position
1654 * XTERM_SEQ: Report position: ESC [ 6 n 1718 * XTERM_SEQ: Report position: ESC [ 6 n
1655 */ 1719 */
1656void 1720void
1657rxvt_term::scr_report_position () 1721rxvt_term::scr_report_position () NOTHROW
1658{ 1722{
1659 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1723 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1660} 1724}
1661 1725
1662/* ------------------------------------------------------------------------- * 1726/* ------------------------------------------------------------------------- *
… …
1665 1729
1666/* 1730/*
1667 * Set font style 1731 * Set font style
1668 */ 1732 */
1669void 1733void
1670rxvt_term::set_font_style () 1734rxvt_term::set_font_style () NOTHROW
1671{ 1735{
1672#if 0 1736#if 0
1673 switch (charsets [screen.charset]) 1737 switch (charsets [screen.charset])
1674 { 1738 {
1675 case '0': /* DEC Special Character & Line Drawing Set */ 1739 case '0': /* DEC Special Character & Line Drawing Set */
… …
1697 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1761 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1698 * XTERM_SEQ: Invoke G2 character set: ESC N 1762 * XTERM_SEQ: Invoke G2 character set: ESC N
1699 * XTERM_SEQ: Invoke G3 character set: ESC O 1763 * XTERM_SEQ: Invoke G3 character set: ESC O
1700 */ 1764 */
1701void 1765void
1702rxvt_term::scr_charset_choose (int set) 1766rxvt_term::scr_charset_choose (int set) NOTHROW
1703{ 1767{
1704 screen.charset = set; 1768 screen.charset = set;
1705 set_font_style (); 1769 set_font_style ();
1706} 1770}
1707 1771
… …
1713 * XTERM_SEQ: Set G2 character set: ESC * <C> 1777 * XTERM_SEQ: Set G2 character set: ESC * <C>
1714 * XTERM_SEQ: Set G3 character set: ESC + <C> 1778 * XTERM_SEQ: Set G3 character set: ESC + <C>
1715 * See set_font_style for possible values for <C> 1779 * See set_font_style for possible values for <C>
1716 */ 1780 */
1717void 1781void
1718rxvt_term::scr_charset_set (int set, unsigned int ch) 1782rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1719{ 1783{
1720 charsets[set] = (unsigned char)ch; 1784 charsets[set] = (unsigned char)ch;
1721 set_font_style (); 1785 set_font_style ();
1722} 1786}
1723 1787
… …
1728 1792
1729/* 1793/*
1730 * refresh matching text. 1794 * refresh matching text.
1731 */ 1795 */
1732bool 1796bool
1733rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1797rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1734{ 1798{
1735 bool found = false; 1799 bool found = false;
1736 1800
1737 for (int i = 0; i < nrow; i++) 1801 for (int i = 0; i < nrow; i++)
1738 { 1802 {
1739 int col = 0;
1740 rend_t *drp = drawn_buf[i].r; 1803 rend_t *drp = drawn_buf[i].r;
1741 1804
1742 for (; col < ncol; col++, drp++) 1805 for (int col = 0; col < ncol; col++, drp++)
1743 if ((*drp & mask) == value) 1806 if ((*drp & mask) == value)
1744 { 1807 {
1745 found = true; 1808 found = true;
1746 *drp = ~value; 1809 *drp = ~value;
1747 } 1810 }
… …
1758 PART_END, 1821 PART_END,
1759 RC_COUNT 1822 RC_COUNT
1760}; 1823};
1761 1824
1762void 1825void
1763rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1826rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1764{ 1827{
1765 int i; 1828 int i;
1766 row_col_t rc[RC_COUNT]; 1829 row_col_t rc[RC_COUNT];
1767 1830
1768 if (!drawn_buf) /* sanity check */ 1831 if (!drawn_buf) /* sanity check */
… …
1802/* ------------------------------------------------------------------------- */ 1865/* ------------------------------------------------------------------------- */
1803/* 1866/*
1804 * Refresh the entire screen 1867 * Refresh the entire screen
1805 */ 1868 */
1806void 1869void
1807rxvt_term::scr_touch (bool refresh) 1870rxvt_term::scr_touch (bool refresh) NOTHROW
1808{ 1871{
1809 scr_expose (0, 0, width, height, refresh); 1872 scr_expose (0, 0, width, height, refresh);
1810} 1873}
1811 1874
1812/* ------------------------------------------------------------------------- */ 1875/* ------------------------------------------------------------------------- */
1813/* 1876/*
1814 * Move the display so that the line represented by scrollbar value Y is at 1877 * Move the display so that the line represented by scrollbar value Y is at
1815 * the top of the screen 1878 * the top of the screen
1816 */ 1879 */
1817void 1880void
1818rxvt_term::scr_move_to (int y, int len) 1881rxvt_term::scr_move_to (int y, int len) NOTHROW
1819{ 1882{
1820 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1883 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1821} 1884}
1822 1885
1823/* ------------------------------------------------------------------------- */ 1886/* ------------------------------------------------------------------------- */
1824/* 1887/*
1825 * Page the screen up/down nlines 1888 * Page the screen up/down nlines
1826 * direction should be UP or DN 1889 * direction should be UP or DN
1827 */ 1890 */
1828bool 1891bool
1829rxvt_term::scr_page (enum page_dirn direction, int nlines) 1892rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1830{ 1893{
1831 int new_view_start = 1894 int new_view_start =
1832 direction == UP ? view_start - nlines 1895 direction == UP ? view_start - nlines
1833 : view_start + nlines; 1896 : view_start + nlines;
1834 1897
1835 return scr_changeview (new_view_start); 1898 return scr_changeview (new_view_start);
1836} 1899}
1837 1900
1838bool 1901bool
1839rxvt_term::scr_changeview (int new_view_start) 1902rxvt_term::scr_changeview (int new_view_start) NOTHROW
1840{ 1903{
1841 clamp_it (new_view_start, top_row, 0); 1904 clamp_it (new_view_start, top_row, 0);
1842 1905
1843 if (new_view_start == view_start) 1906 if (new_view_start == view_start)
1844 return false; 1907 return false;
… …
1850 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1913 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1851 1914
1852 return true; 1915 return true;
1853} 1916}
1854 1917
1855/* ------------------------------------------------------------------------- */ 1918#ifndef NO_BELL
1856void 1919void
1920rxvt_term::bell_cb (ev::timer &w, int revents)
1921{
1922 rvideo_bell = false;
1923 scr_rvideo_mode (rvideo_mode);
1924 refresh_check ();
1925}
1926#endif
1927
1928/* ------------------------------------------------------------------------- */
1929void
1857rxvt_term::scr_bell () 1930rxvt_term::scr_bell () NOTHROW
1858{ 1931{
1859#ifndef NO_BELL 1932#ifndef NO_BELL
1860 1933
1861# ifndef NO_MAPALERT 1934# ifndef NO_MAPALERT
1862# ifdef MAPALERT_OPTION 1935# ifdef MAPALERT_OPTION
1863 if (OPTION (Opt_mapAlert)) 1936 if (option (Opt_mapAlert))
1864# endif 1937# endif
1865 XMapWindow (display->display, parent[0]); 1938 XMapWindow (dpy, parent);
1866# endif 1939# endif
1867 1940
1941# if ENABLE_FRILLS
1942 if (option (Opt_urgentOnBell))
1943 set_urgency (1);
1944# endif
1945
1868 if (OPTION (Opt_visualBell)) 1946 if (option (Opt_visualBell))
1869 { 1947 {
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1948 rvideo_bell = true;
1949 scr_rvideo_mode (rvideo_mode);
1871 display->flush (); 1950 flush ();
1951
1872 rxvt_usleep (VISUAL_BELL_DURATION); 1952 bell_ev.start (VISUAL_BELL_DURATION);
1873 scr_rvideo_mode (!rvideo); /* refresh also done */
1874 } 1953 }
1875 else 1954 else
1876 XBell (display->display, 0); 1955 XBell (dpy, 0);
1877 1956 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1878#endif 1957#endif
1879} 1958}
1880 1959
1881/* ------------------------------------------------------------------------- */ 1960/* ------------------------------------------------------------------------- */
1882/* ARGSUSED */
1883void 1961void
1884rxvt_term::scr_printscreen (int fullhist) 1962rxvt_term::scr_printscreen (int fullhist) NOTHROW
1885{ 1963{
1886#ifdef PRINTPIPE 1964#ifdef PRINTPIPE
1887 int nrows, row_start; 1965 int nrows, row_start;
1888 FILE *fd; 1966 FILE *fd = popen_printer ();
1889 1967
1890 if ((fd = popen_printer ()) == NULL) 1968 if (!fd)
1891 return; 1969 return;
1892 1970
1893 if (fullhist) 1971 if (fullhist)
1894 { 1972 {
1895 nrows = nrow - top_row; 1973 nrows = nrow - top_row;
… …
1901 row_start = view_start; 1979 row_start = view_start;
1902 } 1980 }
1903 1981
1904 wctomb (0, 0); 1982 wctomb (0, 0);
1905 1983
1906 for (int r1 = 0; r1 < nrows; r1++) 1984 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1907 { 1985 {
1908 text_t *tp = ROW(r1).t; 1986 text_t *tp = ROW(r1).t;
1909 int len = ROW(r1).l; 1987 int len = ROW(r1).l;
1910 1988
1911 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN 1989 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
… …
1938 * Refresh the screen 2016 * Refresh the screen
1939 * drawn_text/drawn_rend contain the screen information before the update. 2017 * drawn_text/drawn_rend contain the screen information before the update.
1940 * screen.text/screen.rend contain what the screen will change to. 2018 * screen.text/screen.rend contain what the screen will change to.
1941 */ 2019 */
1942void 2020void
1943rxvt_term::scr_refresh () 2021rxvt_term::scr_refresh () NOTHROW
1944{ 2022{
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 */ 2023 int16_t col, row, /* column/row we're processing */
1948 ocrow; /* old cursor row */ 2024 ocrow; /* old cursor row */
1949 int i; /* tmp */ 2025 int i; /* tmp */
1950#ifndef NO_CURSORCOLOR 2026#ifndef NO_CURSORCOLOR
1951 rend_t cc1; /* store colours at cursor position (s) */ 2027 rend_t cc1; /* store colours at cursor position (s) */
1952#endif 2028#endif
1953 rend_t *crp; // cursor rendition pointer 2029 rend_t *crp; // cursor rendition pointer
2030 rend_t ccol1, /* Cursor colour */
2031 ccol2; /* Cursor colour2 */
1954 2032
1955 want_refresh = 0; /* screen is current */ 2033 want_refresh = 0; /* screen is current */
1956 2034
1957 if (refresh_type == NO_REFRESH || !mapped) 2035 if (refresh_type == NO_REFRESH || !mapped)
1958 return; 2036 return;
1959 2037
1960 /* 2038 /*
1961 * A: set up vars 2039 * A: set up vars
1962 */ 2040 */
1963 must_clear = 0;
1964 refresh_count = 0; 2041 refresh_count = 0;
1965 2042
1966#if XPM_BACKGROUND 2043 unsigned int old_screen_flags = screen.flags;
1967 must_clear |= bgPixmap.pixmap != None; 2044 bool have_bg = 0;
1968#endif 2045#ifdef HAVE_BG_PIXMAP
1969#if TRANSPARENT 2046 have_bg = bg_pixmap != None;
1970 must_clear |= OPTION (Opt_transparent) && am_transparent;
1971#endif 2047#endif
1972 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2048 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1973 2049
1974 /* 2050 /*
1975 * B: reverse any characters which are selected 2051 * B: reverse any characters which are selected
1976 */ 2052 */
1977 scr_reverse_selection (); 2053 scr_reverse_selection ();
1978 2054
2055 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2056#if ENABLE_OVERLAY
2057 scr_swap_overlay ();
2058#endif
2059
2060 bool showcursor = screen.flags & Screen_VisibleCursor;
2061
1979 /* 2062 /*
1980 * C: set the cursor character (s) 2063 * C: set the cursor character (s)
1981 */ 2064 */
1982 { 2065 {
1983 unsigned char setoldcursor; 2066 bool setoldcursor;
1984 rend_t ccol1, /* Cursor colour */
1985 ccol2; /* Cursor colour2 */
1986 2067
1987 showcursor = (screen.flags & Screen_VisibleCursor);
1988#ifdef CURSOR_BLINK 2068#ifdef CURSOR_BLINK
1989 if (hidden_cursor) 2069 if (hidden_cursor)
1990 showcursor = 0; 2070 showcursor = 0;
1991#endif 2071#endif
1992 2072
… …
1997 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2077 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1998 col--; 2078 col--;
1999 2079
2000 crp = &ROW(screen.cur.row).r[col]; 2080 crp = &ROW(screen.cur.row).r[col];
2001 2081
2002 if (showcursor && focus) 2082#ifndef NO_CURSORCOLOR
2083 cc1 = *crp & (RS_fgMask | RS_bgMask);
2084 if (ISSET_PIXCOLOR (Color_cursor))
2085 ccol1 = Color_cursor;
2086 else
2087#endif
2088#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2089 ccol1 = fgcolor_of (rstyle);
2090#else
2091 ccol1 = Color_fg;
2092#endif
2093
2094#ifndef NO_CURSORCOLOR
2095 if (ISSET_PIXCOLOR (Color_cursor2))
2096 ccol2 = Color_cursor2;
2097 else
2098#endif
2099#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2100 ccol2 = bgcolor_of (rstyle);
2101#else
2102 ccol2 = Color_bg;
2103#endif
2104
2105 if (focus)
2003 { 2106 {
2004 if (OPTION (Opt_cursorUnderline)) 2107 if (option (Opt_cursorUnderline))
2005 *crp ^= RS_Uline; 2108 *crp ^= RS_Uline;
2006 else 2109 else
2007 { 2110 {
2008 *crp ^= RS_RVid; 2111 *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); 2112 *crp = SET_FGCOLOR (*crp, ccol1);
2029 *crp = SET_BGCOLOR (*crp, ccol2); 2113 *crp = SET_BGCOLOR (*crp, ccol2);
2030#endif
2031 } 2114 }
2032 } 2115 }
2033 } 2116 }
2034 2117
2035 /* make sure no outline cursor is left around */ 2118 /* make sure no outline cursor is left around */
… …
2062 oldcursor.col = screen.cur.col; 2145 oldcursor.col = screen.cur.col;
2063 } 2146 }
2064 } 2147 }
2065 } 2148 }
2066 2149
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 2150#ifndef NO_SLOW_LINK_SUPPORT
2073 /* 2151 /*
2074 * D: CopyArea pass - very useful for slower links 2152 * D: CopyArea pass - very useful for slower links
2075 * This has been deliberately kept simple. 2153 * This has been deliberately kept simple.
2076 */ 2154 */
2077 if (!display->is_local 2155 if (!display->is_local
2078 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2156 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2079 && abs (num_scr) < nrow && !must_clear) 2157 && abs (num_scr) < nrow && !have_bg)
2080 { 2158 {
2081 int16_t nits; 2159 int16_t nits;
2160 int i = num_scr;
2082 int j; 2161 int j;
2083 int len, wlen; 2162 int len, wlen;
2084 dLocal (int, num_scr); 2163 dLocal (int, num_scr);
2085 2164
2086 j = nrow; 2165 j = nrow;
2087 wlen = len = -1; 2166 wlen = len = -1;
2088 row = i > 0 ? 0 : j - 1; 2167 row = i > 0 ? 0 : j - 1;
2168
2089 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2169 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2090 { 2170 {
2091 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2171 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2092 { 2172 {
2093 line_t s = ROW(view_start + row); 2173 line_t s = ROW(view_start + row);
… …
2114 wlen = row; 2194 wlen = row;
2115 continue; 2195 continue;
2116 } 2196 }
2117 } 2197 }
2118 2198
2119 if (len != -1) 2199 if (len >= 0)
2120 { 2200 {
2121 /* also comes here at end if needed because of >= above */ 2201 /* also comes here at end if needed because of >= above */
2122 if (wlen < len) 2202 if (wlen < len)
2123 ::swap (wlen, len); 2203 ::swap (wlen, len);
2124 2204
2205 XGCValues gcv;
2206
2207 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2125 XCopyArea (display->display, vt, vt, 2208 XCopyArea (dpy, vt, vt,
2126 gc, 0, Row2Pixel (len + i), 2209 gc, 0, Row2Pixel (len + i),
2127 (unsigned int)this->width, 2210 (unsigned int)this->width,
2128 (unsigned int)Height2Pixel (wlen - len + 1), 2211 (unsigned int)Height2Pixel (wlen - len + 1),
2129 0, Row2Pixel (len)); 2212 0, Row2Pixel (len));
2213 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2214
2130 len = -1; 2215 len = -1;
2131 } 2216 }
2132 } 2217 }
2133 } 2218 }
2134#endif 2219#endif
… …
2158 continue; 2243 continue;
2159 2244
2160 // redraw one or more characters 2245 // redraw one or more characters
2161 2246
2162 // seek to the beginning of wide characters 2247 // seek to the beginning of wide characters
2163 while (stp[col] == NOCHAR && col > 0) 2248 while (ecb_unlikely (stp[col] == NOCHAR && col > 0))
2164 --col; 2249 --col;
2165 2250
2166 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2251 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2167 text_t *text = stp + col; 2252 text_t *text = stp + col;
2168 int count = 1; 2253 int count = 1;
2169 2254
2170 dtp[col] = stp[col]; 2255 dtp[col] = stp[col];
2171 drp[col] = rend; 2256 drp[col] = rend;
… …
2175 for (i = 0; ++col < ncol; ) 2260 for (i = 0; ++col < ncol; )
2176 { 2261 {
2177 if (stp[col] == NOCHAR) 2262 if (stp[col] == NOCHAR)
2178 { 2263 {
2179 dtp[col] = stp[col]; 2264 dtp[col] = stp[col];
2180 drp[col] = rend; 2265 drp[col] = srp[col];
2266
2181 count++; 2267 count++;
2182 i++; 2268 i++;
2183 2269
2184 continue; 2270 continue;
2185 } 2271 }
… …
2190 count++; 2276 count++;
2191 2277
2192 if (stp[col] != dtp[col] 2278 if (stp[col] != dtp[col]
2193 || !RS_SAME (srp[col], drp[col])) 2279 || !RS_SAME (srp[col], drp[col]))
2194 { 2280 {
2195 if (must_clear && (i++ > count / 2)) 2281 if (have_bg && (i++ > count / 2))
2196 break; 2282 break;
2197 2283
2198 dtp[col] = stp[col]; 2284 dtp[col] = stp[col];
2199 drp[col] = rend; 2285 drp[col] = rend;
2200 i = 0; 2286 i = 0;
2201 } 2287 }
2202 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2288 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2203 break; 2289 break;
2204 } 2290 }
2205 2291
2206 col--; /* went one too far. move back */ 2292 col--; /* went one too far. move back */
2207 count -= i; /* dump any matching trailing chars */ 2293 count -= i; /* dump any matching trailing chars */
2208 2294
2209 // sometimes we optimize away the trailing NOCHAR's, add them back 2295 // sometimes we optimize away the trailing NOCHAR's, add them back
2210 while (i && text[count] == NOCHAR) 2296 while (ecb_unlikely (i && text[count] == NOCHAR))
2211 count++, i--; 2297 count++, i--;
2212 2298
2213 /* 2299 /*
2214 * Determine the attributes for the string 2300 * Determine the attributes for the string
2215 */ 2301 */
2216 int fore = fgcolor_of (rend); // desired foreground 2302 int fore = fgcolor_of (rend); // desired foreground
2217 int back = bgcolor_of (rend); // desired background 2303 int back = bgcolor_of (rend); // desired background
2218 2304
2219 // only do special processing if any attributes are set, which is unlikely 2305 // 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)) 2306 if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2221 { 2307 {
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; 2308 bool invert = rend & RS_RVid;
2235 2309
2236#ifndef NO_BOLD_UNDERLINE_REVERSE 2310#ifndef NO_BOLD_UNDERLINE_REVERSE
2237 if (rend & RS_Bold
2238 && fore == Color_fg) 2311 if (rend & RS_Bold && fore == Color_fg)
2239 { 2312 {
2240 if (ISSET_PIXCOLOR (Color_BD)) 2313 if (ISSET_PIXCOLOR (Color_BD))
2241 fore = Color_BD; 2314 fore = Color_BD;
2242# if !ENABLE_STYLES 2315# if !ENABLE_STYLES
2243 else 2316 else
2244 invert = !invert; 2317 invert = !invert;
2245# endif 2318# endif
2246 } 2319 }
2247 2320
2248 if (rend & RS_Italic 2321 if (rend & RS_Italic && fore == Color_fg)
2249 && fore == Color_fg)
2250 { 2322 {
2251 if (ISSET_PIXCOLOR (Color_IT)) 2323 if (ISSET_PIXCOLOR (Color_IT))
2252 fore = Color_IT; 2324 fore = Color_IT;
2253# if !ENABLE_STYLES 2325# if !ENABLE_STYLES
2254 else 2326 else
2255 invert = !invert; 2327 invert = !invert;
2256# endif 2328# endif
2257 } 2329 }
2258 2330
2259 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2331 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2260 fore = Color_UL; 2332 fore = Color_UL;
2333#endif
2334
2335#ifdef OPTION_HC
2336 if (rend & RS_Sel)
2337 {
2338 /* invert the column if no highlightColor is set or it is the
2339 * current cursor column */
2340 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2341 && ISSET_PIXCOLOR (Color_HC))
2342 {
2343 if (ISSET_PIXCOLOR (Color_HTC))
2344 fore = Color_HTC;
2345 // if invert is 0 reverse video is set so we use bg color as fg color
2346 else if (!invert)
2347 fore = back;
2348
2349 back = Color_HC;
2350 invert = 0;
2351 }
2352 }
2261#endif 2353#endif
2262 2354
2263 if (invert) 2355 if (invert)
2264 { 2356 {
2265 ::swap (fore, back); 2357 ::swap (fore, back);
2266 2358
2267#ifndef NO_BOLD_UNDERLINE_REVERSE 2359#ifndef NO_BOLD_UNDERLINE_REVERSE
2268 if (ISSET_PIXCOLOR (Color_RV))
2269 back = Color_RV;
2270
2271 if (fore == back) 2360 if (fore == back)
2272 { 2361 {
2273 fore = Color_bg; 2362 fore = Color_bg;
2274 back = Color_fg; 2363 back = Color_fg;
2275 } 2364 }
… …
2277 } 2366 }
2278 2367
2279#ifdef TEXT_BLINK 2368#ifdef TEXT_BLINK
2280 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2369 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2281 { 2370 {
2282 if (!text_blink_ev.active) 2371 if (!text_blink_ev.is_active ())
2283 { 2372 {
2284 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2373 text_blink_ev.again ();
2285 hidden_text = 0; 2374 hidden_text = 0;
2286 } 2375 }
2287 else if (hidden_text) 2376 else if (hidden_text)
2288 fore = back; 2377 fore = back;
2289 } 2378 }
2290#endif 2379#endif
2380
2381#if ENABLE_STYLES
2382 // "careful" (too wide) character handling
2383
2384 // include previous careful character(s) if possible, looks nicer (best effort...)
2385 while (text > stp
2386 && srp[text - stp - 1] & RS_Careful
2387 && RS_SAME (rend, srp[text - stp - 1]))
2388 text--, count++, xpixel -= fwidth;
2389
2390 // force redraw after "careful" characters to avoid pixel droppings
2391 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2392 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2393
2394 // force redraw before "careful" characters to avoid pixel droppings
2395 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2396 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2397#endif
2291 } 2398 }
2292 2399
2293 /* 2400 /*
2294 * Actually do the drawing of the string here 2401 * Actually do the drawing of the string here
2295 */ 2402 */
2296 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2403 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2297 2404
2298 if (back == fore) 2405 if (ecb_likely (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 { 2406 {
2304 if (must_clear) 2407 // this is very ugly, maybe push it into ->draw?
2305 {
2306 CLEAR_CHARS (xpixel, ypixel, count);
2307 2408
2308 for (i = 0; i < count; i++) /* don't draw empty strings */ 2409 for (i = 0; i < count; i++) /* don't draw empty strings */
2309 if (text[i] != ' ') 2410 if (text[i] != ' ')
2310 { 2411 {
2311 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2412 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2312 break; 2413 goto did_clear;
2313 }
2314 } 2414 }
2315 else 2415
2316 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2416 CLEAR_CHARS (xpixel, ypixel, count);
2417 did_clear: ;
2317 } 2418 }
2318 else 2419 else
2319 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2420 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2320 2421
2321 if (rend & RS_Uline && font->descent > 1 && fore != back) 2422 if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back))
2322 { 2423 {
2323#if ENABLE_FRILLS 2424#if ENABLE_FRILLS
2324 if (ISSET_PIXCOLOR (Color_underline)) 2425 if (ISSET_PIXCOLOR (Color_underline))
2325 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2426 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2326 else 2427 else
2327#endif 2428#endif
2328 XSetForeground (display->display, gc, pix_colors[fore]); 2429 XSetForeground (dpy, gc, pix_colors[fore]);
2329 2430
2330 XDrawLine (display->display, drawBuffer, gc, 2431 XDrawLine (dpy, vt, gc,
2331 xpixel, ypixel + font->ascent + 1, 2432 xpixel, ypixel + font->ascent + 1,
2332 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2433 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2333 } 2434 }
2334 } /* for (col....) */ 2435 } /* for (col....) */
2335 } /* for (row....) */ 2436 } /* for (row....) */
2336 2437
2337#if ENABLE_OVERLAY
2338 scr_swap_overlay ();
2339#endif
2340 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2341
2342 /* 2438 /*
2343 * G: cleanup cursor and display outline cursor if necessary 2439 * G: cleanup cursor and display outline cursor if necessary
2344 */ 2440 */
2345 if (showcursor) 2441 if (showcursor)
2346 { 2442 {
2347 if (focus) 2443 if (focus)
2348 { 2444 {
2349 if (OPTION (Opt_cursorUnderline)) 2445 if (option (Opt_cursorUnderline))
2350 *crp ^= RS_Uline; 2446 *crp ^= RS_Uline;
2351 else 2447 else
2352 { 2448 {
2353 *crp ^= RS_RVid; 2449 *crp ^= RS_RVid;
2354#ifndef NO_CURSORCOLOR 2450#ifndef NO_CURSORCOLOR
… …
2368 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2464 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2369 cursorwidth++; 2465 cursorwidth++;
2370 2466
2371#ifndef NO_CURSORCOLOR 2467#ifndef NO_CURSORCOLOR
2372 if (ISSET_PIXCOLOR (Color_cursor)) 2468 if (ISSET_PIXCOLOR (Color_cursor))
2373 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2469 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2470 else
2374#endif 2471#endif
2472 XSetForeground (dpy, gc, pix_colors[ccol1]);
2375 2473
2376 XDrawRectangle (display->display, drawBuffer, gc, 2474 XDrawRectangle (dpy, vt, gc,
2377 Col2Pixel (col), 2475 Col2Pixel (col),
2378 Row2Pixel (oldcursor.row), 2476 Row2Pixel (oldcursor.row),
2379 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2477 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2380 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2478 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2381 } 2479 }
2382 } 2480 }
2383 2481
2384 /* 2482 /*
2385 * H: cleanup selection 2483 * H: cleanup selection
2386 */ 2484 */
2485#if ENABLE_OVERLAY
2486 scr_swap_overlay ();
2487#endif
2488 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2489
2387 scr_reverse_selection (); 2490 scr_reverse_selection ();
2388 2491
2492 screen.flags = old_screen_flags;
2389 num_scr = 0; 2493 num_scr = 0;
2390 num_scr_allow = 1; 2494 num_scr_allow = 1;
2391} 2495}
2392 2496
2393void 2497void
2394rxvt_term::scr_remap_chars (line_t &l) 2498rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2395{ 2499{
2396 if (!l.t) 2500 if (!l.t)
2397 return; 2501 return;
2398 2502
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2503 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2401 for (int i = ncol; i--; ) 2505 for (int i = ncol; i--; )
2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2506 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2403} 2507}
2404 2508
2405void 2509void
2406rxvt_term::scr_remap_chars () 2510rxvt_term::scr_remap_chars () NOTHROW
2407{ 2511{
2408 for (int i = total_rows; i--; ) 2512 for (int i = total_rows; i--; )
2409 scr_remap_chars (row_buf [i]); 2513 scr_remap_chars (row_buf [i]);
2410 2514
2411 for (int i = nrow; i--; ) 2515 for (int i = nrow; i--; )
… …
2414 scr_remap_chars (swap_buf [i]); 2518 scr_remap_chars (swap_buf [i]);
2415 } 2519 }
2416} 2520}
2417 2521
2418void 2522void
2419rxvt_term::scr_recolour () 2523rxvt_term::scr_recolour (bool refresh) NOTHROW
2420{ 2524{
2421 if (1 2525 bool transparent = false;
2422#if TRANSPARENT 2526
2423 && !am_transparent 2527#ifdef HAVE_BG_PIXMAP
2528 if (bg_pixmap != None)
2529 {
2530# ifdef ENABLE_TRANSPARENCY
2531 if (bg_flags & BG_IS_TRANSPARENT)
2532 {
2533 XSetWindowBackgroundPixmap (dpy, parent, bg_pixmap);
2534 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2535
2536 transparent = true;
2537 }
2538 else
2424#endif 2539# endif
2425#if XPM_BACKGROUND
2426 && !bgPixmap.pixmap
2427#endif
2428 ) 2540 {
2541 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2542 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2543 }
2429 { 2544 }
2545 else
2546#endif
2547 {
2430 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2548 XSetWindowBackground (dpy, parent, pix_colors[Color_border]);
2431 XClearWindow (display->display, parent[0]);
2432 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2549 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2433#if HAVE_SCROLLBARS 2550 }
2551
2552 XClearWindow (dpy, parent);
2553
2434 if (scrollBar.win) 2554 if (scrollBar.win)
2435 { 2555 {
2556 if (transparent)
2557 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2558 else
2436 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2559 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2437 scrollBar.setIdle (); 2560 scrollBar.state = SB_STATE_IDLE;
2438 scrollbar_show (0); 2561 scrollBar.show (0);
2439 } 2562 }
2440#endif 2563
2564 if (refresh)
2441 } 2565 {
2442
2443 scr_clear (); 2566 scr_clear ();
2444 scr_touch (true); 2567 scr_touch (true);
2568 }
2445 want_refresh = 1; 2569 want_refresh = 1;
2446} 2570}
2447 2571
2448/* ------------------------------------------------------------------------- */ 2572/* ------------------------------------------------------------------------- */
2449void 2573void
2450rxvt_term::scr_clear (bool really) 2574rxvt_term::scr_clear (bool really) NOTHROW
2451{ 2575{
2452 if (!mapped) 2576 if (!mapped)
2453 return; 2577 return;
2454 2578
2455 num_scr_allow = 0; 2579 num_scr_allow = 0;
2456 want_refresh = 1; 2580 want_refresh = 1;
2457 2581
2458 if (really) 2582 if (really)
2459 XClearWindow (display->display, vt); 2583 XClearWindow (dpy, vt);
2460} 2584}
2461 2585
2462void 2586void
2463rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2587rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2464{ 2588{
2465 int view_end = view_start + nrow; 2589 int view_end = view_start + nrow;
2466 int row, col; 2590 int row, col;
2467 2591
2468 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2592 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2480 srp[col] ^= rstyle2; 2604 srp[col] ^= rstyle2;
2481 } 2605 }
2482} 2606}
2483 2607
2484void 2608void
2485rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2609rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2486{ 2610{
2487 int view_end = view_start + nrow; 2611 int view_end = view_start + nrow;
2488 int row, col; 2612 int row, col;
2489 2613
2490 if (beg_row >= view_start) 2614 if (beg_row >= view_start)
… …
2507 srp[col] ^= rstyle; 2631 srp[col] ^= rstyle;
2508} 2632}
2509 2633
2510/* ------------------------------------------------------------------------- */ 2634/* ------------------------------------------------------------------------- */
2511void 2635void
2512rxvt_term::scr_reverse_selection () 2636rxvt_term::scr_reverse_selection () NOTHROW
2513{ 2637{
2514 if (selection.op 2638 if (selection.op
2515 && current_screen == selection.screen 2639 && current_screen == selection.screen
2516 && selection.end.row >= view_start) 2640 && selection.end.row >= view_start)
2517 { 2641 {
2518#if ENABLE_FRILLS 2642#if !ENABLE_MINIMAL
2519 if (selection.rect) 2643 if (selection.rect)
2520 scr_xor_rect (selection.beg.row, selection.beg.col, 2644 scr_xor_rect (selection.beg.row, selection.beg.col,
2521 selection.end.row, selection.end.col, 2645 selection.end.row, selection.end.col,
2522 RS_RVid, RS_RVid | RS_Uline); 2646 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2523 else 2647 else
2524#endif 2648#endif
2525 scr_xor_span (selection.beg.row, selection.beg.col, 2649 scr_xor_span (selection.beg.row, selection.beg.col,
2526 selection.end.row, selection.end.col, 2650 selection.end.row, selection.end.col,
2527 RS_RVid); 2651 RS_Sel | RS_RVid);
2528 } 2652 }
2529} 2653}
2530 2654
2531/* ------------------------------------------------------------------------- */ 2655/* ------------------------------------------------------------------------- */
2532/* 2656/*
2533 * Dump the whole scrollback and screen to the passed filedescriptor. The 2657 * Dump the whole scrollback and screen to the passed filedescriptor. The
2534 * invoking routine must close the fd. 2658 * invoking routine must close the fd.
2535 */ 2659 */
2536#if 0 2660#if 0
2537void 2661void
2538rxvt_term::scr_dump (int fd) 2662rxvt_term::scr_dump (int fd) NOTHROW
2539{ 2663{
2540 int row, wrote; 2664 int row, wrote;
2541 unsigned int width, towrite; 2665 unsigned int width, towrite;
2542 char r1[] = "\n"; 2666 const char r1[] = "\n";
2543 2667
2544 for (row = saveLines - nsaved; 2668 for (row = saveLines + top_row;
2545 row < saveLines + nrow - 1; row++) 2669 row < saveLines + nrow - 1; row++)
2546 { 2670 {
2547 width = row_buf[row].l >= 0 ? row_buf[row].l 2671 width = row_buf[row].l >= 0 ? row_buf[row].l
2548 : ncol; 2672 : ncol;
2549 for (towrite = width; towrite; towrite -= wrote) 2673 for (towrite = width; towrite; towrite -= wrote)
… …
2562 2686
2563/* ------------------------------------------------------------------------- * 2687/* ------------------------------------------------------------------------- *
2564 * CHARACTER SELECTION * 2688 * CHARACTER SELECTION *
2565 * ------------------------------------------------------------------------- */ 2689 * ------------------------------------------------------------------------- */
2566void 2690void
2567rxvt_term::selection_check (int check_more) 2691rxvt_term::selection_check (int check_more) NOTHROW
2568{ 2692{
2569 row_col_t pos;
2570
2571 if (!selection.op) 2693 if (!selection.op)
2572 return; 2694 return;
2573 2695
2696 row_col_t pos;
2574 pos.row = pos.col = 0; 2697 pos.row = pos.col = 0;
2698
2575 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) 2699 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2576 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) 2700 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2577 || !IN_RANGE_EXC (selection.end.row, top_row, nrow) 2701 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2578 || (check_more == 1 2702 || (check_more == 1
2579 && current_screen == selection.screen 2703 && current_screen == selection.screen
… …
2581 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2705 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2582 || (check_more == 2 2706 || (check_more == 2
2583 && ROWCOL_IS_BEFORE (selection.beg, pos) 2707 && ROWCOL_IS_BEFORE (selection.beg, pos)
2584 && ROWCOL_IS_AFTER (selection.end, pos)) 2708 && ROWCOL_IS_AFTER (selection.end, pos))
2585 || (check_more == 3 2709 || (check_more == 3
2586 && ROWCOL_IS_AFTER (selection.end, pos)) 2710 && ROWCOL_IS_AFTER (selection.end, pos)))
2587 || (check_more == 4 /* screen width change */
2588 && (selection.beg.row != selection.end.row
2589 || selection.end.col > ncol)))
2590 CLEAR_SELECTION (); 2711 CLEAR_ALL_SELECTION ();
2591} 2712}
2592 2713
2593/* ------------------------------------------------------------------------- */ 2714/* ------------------------------------------------------------------------- */
2594/* 2715/*
2595 * Paste a selection direct to the command fd 2716 * Paste a selection direct to the command fd
2596 */ 2717 */
2597void 2718void
2598rxvt_term::paste (char *data, unsigned int len) 2719rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2599{ 2720{
2600 /* convert normal newline chars into common keyboard Return key sequence */ 2721 /* convert normal newline chars into common keyboard Return key sequence */
2601 for (unsigned int i = 0; i < len; i++) 2722 for (unsigned int i = 0; i < len; i++)
2602 if (data[i] == C0_LF) 2723 if (data[i] == C0_LF)
2603 data[i] = C0_CR; 2724 data[i] = C0_CR;
2604 2725
2726 if (priv_modes & PrivMode_BracketPaste)
2727 tt_printf ("\e[200~");
2728
2605 tt_write (data, len); 2729 tt_write (data, len);
2606}
2607 2730
2608/* ------------------------------------------------------------------------- */ 2731 if (priv_modes & PrivMode_BracketPaste)
2609/* 2732 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} 2733}
2774 2734
2775void 2735void
2776rxvt_term::incr_cb (time_watcher &w) 2736rxvt_term::paste (char *data, unsigned int len) NOTHROW
2777{ 2737{
2778 selection_wait = Sel_none; 2738 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; 2739 return;
2791 2740
2792 selection_paste (win, prop, true); 2741 tt_paste (data, len);
2793} 2742}
2794 2743
2795/* ------------------------------------------------------------------------- */ 2744/* ------------------------------------------------------------------------- */
2796/* 2745/*
2797 * Request the current selection: 2746 * Request PRIMARY, SECONDARY or CLIPBOARD selection.
2798 * Order: > internal selection if available 2747 * if the requested selection has no owner or is empty CUT_BUFFER0 is used
2799 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2748 * as fallback
2800 * > CUT_BUFFER0
2801 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2802 * will auto fallback to CUT_BUFFER0
2803 * EXT: button 2 release 2749 * EXT: button 2 release
2804 */ 2750 */
2805void 2751void
2806rxvt_term::selection_request (Time tm) 2752rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2807{ 2753{
2808 if (selection.text) 2754 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 } 2755 {
2815 else 2756 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2757 selection_req->run ();
2816 { 2758 }
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} 2759}
2863 2760
2864/* ------------------------------------------------------------------------- */ 2761/* ------------------------------------------------------------------------- */
2865/* 2762/*
2866 * Clear all selected text 2763 * Clear all selected text
2867 * EXT: SelectionClear 2764 * EXT: SelectionClear
2868 */ 2765 */
2869void 2766void
2870rxvt_term::selection_clear () 2767rxvt_term::selection_clear (bool clipboard) NOTHROW
2871{ 2768{
2769 if (!clipboard)
2770 {
2872 want_refresh = 1; 2771 want_refresh = 1;
2873 free (selection.text); 2772 free (selection.text);
2874 selection.text = NULL; 2773 selection.text = NULL;
2875 selection.len = 0; 2774 selection.len = 0;
2876 CLEAR_SELECTION (); 2775 CLEAR_SELECTION ();
2877 2776
2878 if (display->selection_owner == this) 2777 if (display->selection_owner == this)
2879 display->selection_owner = 0; 2778 display->selection_owner = 0;
2779 }
2780 else
2781 {
2782 free (selection.clip_text);
2783 selection.clip_text = NULL;
2784 selection.clip_len = 0;
2785
2786 if (display->clipboard_owner == this)
2787 display->clipboard_owner = 0;
2788 }
2880} 2789}
2881 2790
2882/* ------------------------------------------------------------------------- */ 2791/* ------------------------------------------------------------------------- */
2883/* 2792/*
2884 * Copy a selection into the cut buffer 2793 * Copy a selection into the cut buffer
2885 * EXT: button 1 or 3 release 2794 * EXT: button 1 or 3 release
2886 */ 2795 */
2887void 2796void
2888rxvt_term::selection_make (Time tm) 2797rxvt_term::selection_make (Time tm)
2889{ 2798{
2890 int i; 2799 int size;
2891 wchar_t *new_selection_text; 2800 wchar_t *new_selection_text;
2892 text_t *t; 2801 text_t *t;
2893 2802
2894 switch (selection.op) 2803 switch (selection.op)
2895 { 2804 {
… …
2911 return; /* nothing selected, go away */ 2820 return; /* nothing selected, go away */
2912 2821
2913 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2822 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2914 return; 2823 return;
2915 2824
2916 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2825 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2917 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2826 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2918 2827
2919 int ofs = 0; 2828 int ofs = 0;
2920 int extra = 0; 2829 int extra = 0;
2921 2830
2922 int col = selection.beg.col; 2831 int col = selection.beg.col;
… …
2924 2833
2925 int end_col; 2834 int end_col;
2926 2835
2927 for (; row <= selection.end.row; row++, col = 0) 2836 for (; row <= selection.end.row; row++, col = 0)
2928 { 2837 {
2929#if ENABLE_FRILLS 2838#if !ENABLE_MINIMAL
2930 if (selection.rect) 2839 if (selection.rect)
2931 { 2840 {
2932 col = selection.beg.col; 2841 col = selection.beg.col;
2933 end_col = ncol + 1; 2842 end_col = selection.end.col;
2934 } 2843 }
2935 else 2844 else
2936#endif 2845#endif
2937 end_col = ROW(row).l; 2846 end_col = ROW(row).l;
2938 2847
2939 col = max (col, 0); 2848 col = max (col, 0);
2940 2849
2941 if (row == selection.end.row 2850 if (row == selection.end.row)
2942#if ENABLE_FRILLS
2943 || selection.rect
2944#endif
2945 )
2946 min_it (end_col, selection.end.col); 2851 min_it (end_col, selection.end.col);
2947 2852
2948 t = ROW(row).t + col; 2853 t = ROW(row).t + col;
2949 2854
2950 for (; col < end_col; col++) 2855 for (; col < end_col; col++)
… …
2958 2863
2959 extra -= (len - 1); 2864 extra -= (len - 1);
2960 2865
2961 if (extra < 0) 2866 if (extra < 0)
2962 { 2867 {
2963 extra += i; 2868 extra += size;
2964 i += i; 2869 size += size;
2965 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 2870 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2966 } 2871 }
2967 2872
2968 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 2873 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2969 } 2874 }
2970#endif 2875#endif
2971 else 2876 else
2972 new_selection_text[ofs++] = *t++; 2877 new_selection_text[ofs++] = *t++;
2973 } 2878 }
2974 2879
2975#if ENABLE_FRILLS 2880#if !ENABLE_MINIMAL
2976 if (selection.rect) 2881 if (selection.rect)
2977 { 2882 {
2978 while (ofs 2883 while (ofs
2979 && new_selection_text[ofs - 1] != C0_LF 2884 && new_selection_text[ofs - 1] != C0_LF
2980 && unicode::is_space (new_selection_text[ofs - 1])) 2885 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2982 2887
2983 new_selection_text[ofs++] = C0_LF; 2888 new_selection_text[ofs++] = C0_LF;
2984 } 2889 }
2985 else 2890 else
2986#endif 2891#endif
2987 if (!ROW(row).is_longer () && row != selection.end.row) 2892 if (!ROW(row).is_longer ()
2893 && (row != selection.end.row || end_col != selection.end.col)
2894 && (row != selection.beg.row || selection.beg.col < ncol))
2988 new_selection_text[ofs++] = C0_LF; 2895 new_selection_text[ofs++] = C0_LF;
2989 } 2896 }
2990
2991 if (end_col != selection.end.col)
2992 new_selection_text[ofs++] = C0_LF;
2993 2897
2994 new_selection_text[ofs] = 0; 2898 new_selection_text[ofs] = 0;
2995 2899
2996 if (ofs == 0) 2900 if (ofs == 0)
2997 { 2901 {
… …
3010 2914
3011 selection_grab (tm); 2915 selection_grab (tm);
3012} 2916}
3013 2917
3014bool 2918bool
3015rxvt_term::selection_grab (Time tm) 2919rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3016{ 2920{
2921 Atom sel;
2922
2923 if (!clipboard)
2924 {
3017 selection_time = tm; 2925 selection_time = tm;
3018 2926 sel = XA_PRIMARY;
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3021 { 2927 }
2928 else
2929 {
2930 clipboard_time = tm;
2931 sel = xa[XA_CLIPBOARD];
2932 }
2933
2934 XSetSelectionOwner (dpy, sel, vt, tm);
2935 if (XGetSelectionOwner (dpy, sel) == vt)
2936 {
3022 display->set_selection_owner (this); 2937 display->set_selection_owner (this, clipboard);
3023 return true; 2938 return true;
3024 } 2939 }
3025 else 2940 else
3026 { 2941 {
3027 selection_clear (); 2942 selection_clear (clipboard);
3028 return false; 2943 return false;
3029 } 2944 }
3030 2945
3031#if 0 2946#if 0
3032 XTextProperty ct; 2947 XTextProperty ct;
3033 2948
3034 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 2949 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3035 { 2950 {
3036 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 2951 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3037 XFree (ct.value); 2952 XFree (ct.value);
3038 } 2953 }
3039#endif 2954#endif
… …
3043/* 2958/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 2959 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 2960 * EXT: button 1 press
3046 */ 2961 */
3047void 2962void
3048rxvt_term::selection_click (int clicks, int x, int y) 2963rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 2964{
3050 clicks = ((clicks - 1) % 3) + 1; 2965 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 2966 selection.clicks = clicks; /* save clicks so extend will work */
3052 2967
3053 if (clicks == 2 && !selection.rect 2968 if (clicks == 2 && !selection.rect
… …
3072/* ------------------------------------------------------------------------- */ 2987/* ------------------------------------------------------------------------- */
3073/* 2988/*
3074 * Mark a selection at the specified col/row 2989 * Mark a selection at the specified col/row
3075 */ 2990 */
3076void 2991void
3077rxvt_term::selection_start_colrow (int col, int row) 2992rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078{ 2993{
3079 want_refresh = 1; 2994 want_refresh = 1;
3080 2995
3081 selection.mark.row = row + view_start; 2996 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 2997 selection.mark.col = col;
… …
3085 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3000 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3086 3001
3087 while (selection.mark.col > 0 3002 while (selection.mark.col > 0
3088 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3003 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3089 --selection.mark.col; 3004 --selection.mark.col;
3090 3005
3091 if (selection.op) 3006 if (selection.op)
3007 {
3092 { /* clear the old selection */ 3008 /* clear the old selection */
3093 selection.beg.row = selection.end.row = selection.mark.row; 3009 selection.beg.row = selection.end.row = selection.mark.row;
3094 selection.beg.col = selection.end.col = selection.mark.col; 3010 selection.beg.col = selection.end.col = selection.mark.col;
3095 } 3011 }
3096 3012
3097 selection.op = SELECTION_INIT; 3013 selection.op = SELECTION_INIT;
… …
3108#define DELIMIT_TEXT(x) \ 3024#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3025 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3026#define DELIMIT_REND(x) 1
3111 3027
3112void 3028void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3029rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3030{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3031 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3032 row_col_t bound;
3117 text_t *stp; 3033 text_t *stp;
3118 rend_t *srp; 3034 rend_t *srp;
… …
3192 * flag == 0 ==> button 1 3108 * flag == 0 ==> button 1
3193 * flag == 1 ==> button 3 press 3109 * flag == 1 ==> button 3 press
3194 * flag == 2 ==> button 3 motion 3110 * flag == 2 ==> button 3 motion
3195 */ 3111 */
3196void 3112void
3197rxvt_term::selection_extend (int x, int y, int flag) 3113rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198{ 3114{
3199 int col = clamp (Pixel2Col (x), 0, ncol); 3115 int col = clamp (Pixel2Col (x), 0, ncol);
3200 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3116 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201 3117
3202 /* 3118 /*
… …
3228/* ------------------------------------------------------------------------- */ 3144/* ------------------------------------------------------------------------- */
3229/* 3145/*
3230 * Extend the selection to the specified col/row 3146 * Extend the selection to the specified col/row
3231 */ 3147 */
3232void 3148void
3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3149rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234{ 3150{
3235 row_col_t pos; 3151 row_col_t pos;
3236 enum { 3152 enum {
3237 LEFT, RIGHT 3153 LEFT, RIGHT
3238 } closeto = RIGHT; 3154 } closeto = RIGHT;
… …
3286 * a point/word/line which is either the start or end of the selection 3202 * 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 3203 * and it was decided by whichever point/word/line was `fixed' at the
3288 * time of the most recent button3 press 3204 * time of the most recent button3 press
3289 */ 3205 */
3290 if (button3 && buttonpress) 3206 if (button3 && buttonpress)
3207 {
3291 { /* button3 press */ 3208 /* button3 press */
3292 /* 3209 /*
3293 * first determine which edge of the selection we are closest to 3210 * first determine which edge of the selection we are closest to
3294 */ 3211 */
3295 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3212 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3296 || (!ROWCOL_IS_AFTER (pos, selection.end) 3213 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3314 selection.mark.row = selection.beg.row; 3231 selection.mark.row = selection.beg.row;
3315 selection.mark.col = selection.beg.col; 3232 selection.mark.col = selection.beg.col;
3316 } 3233 }
3317 } 3234 }
3318 else 3235 else
3236 {
3319 { /* button1 drag or button3 drag */ 3237 /* button1 drag or button3 drag */
3320 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3238 if (ROWCOL_IS_AFTER (selection.mark, pos))
3321 { 3239 {
3322 if (selection.mark.row == selection.end.row 3240 if (selection.mark.row == selection.end.row
3323 && selection.mark.col == selection.end.col 3241 && selection.mark.col == selection.end.col
3324 && clickchange 3242 && clickchange
… …
3341 3259
3342 if (selection.clicks == 1) 3260 if (selection.clicks == 1)
3343 { 3261 {
3344 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3262 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3345 && !ROW(selection.beg.row).is_longer () 3263 && !ROW(selection.beg.row).is_longer ()
3346#if ENABLE_FRILLS 3264#if !ENABLE_MINIMAL
3347 && !selection.rect 3265 && !selection.rect
3348#endif 3266#endif
3349 ) 3267 )
3350 selection.beg.col = ncol; 3268 selection.beg.col = ncol;
3351 3269
3352 if ( 3270 if (
3353 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3271 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3354 && !ROW(selection.end.row).is_longer () 3272 && !ROW(selection.end.row).is_longer ()
3355#if ENABLE_FRILLS 3273#if !ENABLE_MINIMAL
3356 && !selection.rect 3274 && !selection.rect
3357#endif 3275#endif
3358 ) 3276 )
3359 selection.end.col = ncol; 3277 selection.end.col = ncol;
3360 } 3278 }
… …
3367 selection_delimit_word (DN, &selection.end, &selection.end); 3285 selection_delimit_word (DN, &selection.end, &selection.end);
3368 } 3286 }
3369 else if (selection.clicks == 3) 3287 else if (selection.clicks == 3)
3370 { 3288 {
3371#if ENABLE_FRILLS 3289#if ENABLE_FRILLS
3372 if (OPTION (Opt_tripleclickwords)) 3290 if (option (Opt_tripleclickwords))
3373 { 3291 {
3374 selection_delimit_word (UP, &selection.beg, &selection.beg); 3292 selection_delimit_word (UP, &selection.beg, &selection.beg);
3375 3293
3376 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3294 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3377 { 3295 {
3378 if (!ROW(end_row).is_longer ()) 3296 if (!ROW(end_row).is_longer ())
3379 { 3297 {
3380 selection.end.row = end_row; 3298 selection.end.row = end_row;
3381 selection.end.col = ROW(end_row).l; 3299 selection.end.col = ROW(end_row).l;
3300# if !ENABLE_MINIMAL
3382 selection_remove_trailing_spaces (); 3301 selection_remove_trailing_spaces ();
3302# endif
3383 break; 3303 break;
3384 } 3304 }
3385 } 3305 }
3386 } 3306 }
3387 else 3307 else
… …
3403 selection.end.row++; 3323 selection.end.row++;
3404 } 3324 }
3405 } 3325 }
3406 3326
3407 if (button3 && buttonpress) 3327 if (button3 && buttonpress)
3328 {
3408 { /* mark may need to be changed */ 3329 /* mark may need to be changed */
3409 if (closeto == LEFT) 3330 if (closeto == LEFT)
3410 { 3331 {
3411 selection.mark.row = selection.end.row; 3332 selection.mark.row = selection.end.row;
3412 selection.mark.col = selection.end.col - (selection.clicks == 2); 3333 selection.mark.col = selection.end.col - (selection.clicks == 2);
3413 } 3334 }
… …
3416 selection.mark.row = selection.beg.row; 3337 selection.mark.row = selection.beg.row;
3417 selection.mark.col = selection.beg.col; 3338 selection.mark.col = selection.beg.col;
3418 } 3339 }
3419 } 3340 }
3420 3341
3421#if ENABLE_FRILLS 3342#if !ENABLE_MINIMAL
3422 if (selection.rect && selection.beg.col > selection.end.col) 3343 if (selection.rect && selection.beg.col > selection.end.col)
3423 ::swap (selection.beg.col, selection.end.col); 3344 ::swap (selection.beg.col, selection.end.col);
3424#endif 3345#endif
3425} 3346}
3426 3347
3427#if ENABLE_FRILLS 3348#if !ENABLE_MINIMAL
3428void 3349void
3429rxvt_term::selection_remove_trailing_spaces () 3350rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430{ 3351{
3431 int32_t end_col, end_row; 3352 int32_t end_col, end_row;
3432 text_t *stp; 3353 text_t *stp;
3433 3354
3434 end_col = selection.end.col; 3355 end_col = selection.end.col;
… …
3472/* 3393/*
3473 * Double click on button 3 when already selected 3394 * Double click on button 3 when already selected
3474 * EXT: button 3 double click 3395 * EXT: button 3 double click
3475 */ 3396 */
3476void 3397void
3477rxvt_term::selection_rotate (int x, int y) 3398rxvt_term::selection_rotate (int x, int y) NOTHROW
3478{ 3399{
3479 selection.clicks = selection.clicks % 3 + 1; 3400 selection.clicks = selection.clicks % 3 + 1;
3480 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3401 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481} 3402}
3482 3403
… …
3484/* 3405/*
3485 * Respond to a request for our current selection 3406 * Respond to a request for our current selection
3486 * EXT: SelectionRequest 3407 * EXT: SelectionRequest
3487 */ 3408 */
3488void 3409void
3489rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3410rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490{ 3411{
3412 Atom property = rq.property == None ? rq.target : rq.property;
3491 XSelectionEvent ev; 3413 XSelectionEvent ev;
3492 dDisp;
3493 3414
3494 ev.type = SelectionNotify; 3415 ev.type = SelectionNotify;
3495 ev.property = None; 3416 ev.property = None;
3496 ev.display = rq.display; 3417 ev.display = rq.display;
3497 ev.requestor = rq.requestor; 3418 ev.requestor = rq.requestor;
… …
3511 *target++ = xa[XA_COMPOUND_TEXT]; 3432 *target++ = xa[XA_COMPOUND_TEXT];
3512#if X_HAVE_UTF8_STRING 3433#if X_HAVE_UTF8_STRING
3513 *target++ = xa[XA_UTF8_STRING]; 3434 *target++ = xa[XA_UTF8_STRING];
3514#endif 3435#endif
3515 3436
3516 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3437 XChangeProperty (dpy, rq.requestor, property, XA_ATOM,
3517 32, PropModeReplace, 3438 32, PropModeReplace,
3518 (unsigned char *)target_list, target - target_list); 3439 (unsigned char *)target_list, target - target_list);
3519 ev.property = rq.property; 3440 ev.property = property;
3520 } 3441 }
3521#if TODO // TODO 3442#if TODO // TODO
3522 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3523 { 3444 {
3524 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3525 } 3446 }
3526#endif 3447#endif
3527 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3528 { 3449 {
3529 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3450 XChangeProperty (dpy, rq.requestor, property, rq.target,
3530 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3531 ev.property = rq.property; 3452 ev.property = property;
3453 }
3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3455 {
3456 XChangeProperty (dpy, rq.requestor, property, rq.target,
3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3458 ev.property = property;
3532 } 3459 }
3533 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3534 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3535 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
3536 || rq.target == xa[XA_UTF8_STRING] 3463 || rq.target == xa[XA_UTF8_STRING]
… …
3558 style = enc_string; 3485 style = enc_string;
3559 else if (target == xa[XA_TEXT]) 3486 else if (target == xa[XA_TEXT])
3560 style = enc_text; 3487 style = enc_text;
3561 else if (target == xa[XA_COMPOUND_TEXT]) 3488 else if (target == xa[XA_COMPOUND_TEXT])
3562 style = enc_compound_text; 3489 style = enc_compound_text;
3563#if ENABLE_FRILLS 3490#if !ENABLE_MINIMAL
3564 else if (target == xa[XA_UTF8_STRING]) 3491 else if (target == xa[XA_UTF8_STRING])
3565 style = enc_utf8; 3492 style = enc_utf8;
3566#endif 3493#endif
3567 else 3494 else
3568 { 3495 {
3569 target = xa[XA_COMPOUND_TEXT]; 3496 target = xa[XA_COMPOUND_TEXT];
3570 style = enc_compound_text; 3497 style = enc_compound_text;
3571 } 3498 }
3572 3499
3573 if (selection.text) 3500 if (rq.selection == XA_PRIMARY && selection.text)
3574 { 3501 {
3575 cl = selection.text; 3502 cl = selection.text;
3576 selectlen = selection.len; 3503 selectlen = selection.len;
3577 } 3504 }
3505 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3506 {
3507 cl = selection.clip_text;
3508 selectlen = selection.clip_len;
3509 }
3578 else 3510 else
3579 { 3511 {
3580 cl = L""; 3512 cl = L"";
3581 selectlen = 0; 3513 selectlen = 0;
3582 } 3514 }
3583 3515
3584#if ENABLE_FRILLS 3516#if !ENABLE_MINIMAL
3585 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3517 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3586 // so recode it manually 3518 // so recode it manually
3587 if (style == enc_utf8) 3519 if (style == enc_utf8)
3588 { 3520 {
3589 freect = 1; 3521 freect = 1;
… …
3592 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3524 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3593 ct.nitems = strlen ((char *)ct.value); 3525 ct.nitems = strlen ((char *)ct.value);
3594 } 3526 }
3595 else 3527 else
3596#endif 3528#endif
3597 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3529 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3598 freect = 1; 3530 freect = 1;
3599 else 3531 else
3600 { 3532 {
3601 /* if we failed to convert then send it raw */ 3533 /* if we failed to convert then send it raw */
3602 ct.value = (unsigned char *)cl; 3534 ct.value = (unsigned char *)cl;
3603 ct.nitems = selectlen; 3535 ct.nitems = selectlen;
3604 ct.encoding = target; 3536 ct.encoding = target;
3605 } 3537 }
3606 3538
3607 XChangeProperty (disp, rq.requestor, rq.property, 3539 XChangeProperty (dpy, rq.requestor, property,
3608 ct.encoding, 8, PropModeReplace, 3540 ct.encoding, 8, PropModeReplace,
3609 ct.value, (int)ct.nitems); 3541 ct.value, (int)ct.nitems);
3610 ev.property = rq.property; 3542 ev.property = property;
3611 3543
3612 if (freect) 3544 if (freect)
3613 XFree (ct.value); 3545 XFree (ct.value);
3614 } 3546 }
3615 3547
3616 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3548 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} 3549}
3634 3550
3635/* ------------------------------------------------------------------------- */ 3551/* ------------------------------------------------------------------------- */
3636#ifdef USE_XIM 3552#ifdef USE_XIM
3637void 3553void
3638rxvt_term::im_set_position (XPoint &pos) 3554rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639{ 3555{
3640 XWindowAttributes xwa; 3556 XWindowAttributes xwa;
3641 3557
3642 XGetWindowAttributes (display->display, vt, &xwa); 3558 XGetWindowAttributes (dpy, vt, &xwa);
3643 3559
3644 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3560 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3645 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3561 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3646} 3562}
3647#endif 3563#endif
3648 3564
3649#if ENABLE_OVERLAY 3565#if ENABLE_OVERLAY
3650void 3566void
3651rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3567rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652{ 3568{
3653 if (nrow < 1 || ncol < 1) 3569 if (nrow < 1 || ncol < 1)
3654 return; 3570 return;
3655 3571
3656 want_refresh = 1; 3572 want_refresh = 1;
… …
3665 h += 2; min_it (h, nrow); 3581 h += 2; min_it (h, nrow);
3666 3582
3667 x -= 1; clamp_it (x, 0, ncol - w); 3583 x -= 1; clamp_it (x, 0, ncol - w);
3668 y -= 1; clamp_it (y, 0, nrow - h); 3584 y -= 1; clamp_it (y, 0, nrow - h);
3669 3585
3670 ov_x = x; ov_y = y; 3586 ov.x = x; ov.y = y;
3671 ov_w = w; ov_h = h; 3587 ov.w = w; ov.h = h;
3672 3588
3673 ov_text = new text_t *[h]; 3589 ov.text = new text_t *[h];
3674 ov_rend = new rend_t *[h]; 3590 ov.rend = new rend_t *[h];
3675 3591
3676 for (y = 0; y < h; y++) 3592 for (y = 0; y < h; y++)
3677 { 3593 {
3678 text_t *tp = ov_text[y] = new text_t[w]; 3594 text_t *tp = ov.text[y] = new text_t[w];
3679 rend_t *rp = ov_rend[y] = new rend_t[w]; 3595 rend_t *rp = ov.rend[y] = new rend_t[w];
3680 3596
3681 text_t t0, t1, t2; 3597 text_t t0, t1, t2;
3682 rend_t r = OVERLAY_RSTYLE; 3598 rend_t r = OVERLAY_RSTYLE;
3683 3599
3684 if (y == 0) 3600 if (y == 0)
… …
3701 *rp = r; 3617 *rp = r;
3702 } 3618 }
3703} 3619}
3704 3620
3705void 3621void
3706rxvt_term::scr_overlay_off () 3622rxvt_term::scr_overlay_off () NOTHROW
3707{ 3623{
3708 if (!ov_text) 3624 if (!ov.text)
3709 return; 3625 return;
3710 3626
3711 want_refresh = 1; 3627 want_refresh = 1;
3712 3628
3713 for (int y = 0; y < ov_h; y++) 3629 for (int y = 0; y < ov.h; y++)
3714 { 3630 {
3715 delete [] ov_text[y]; 3631 delete [] ov.text[y];
3716 delete [] ov_rend[y]; 3632 delete [] ov.rend[y];
3717 } 3633 }
3718 3634
3719 delete [] ov_text; ov_text = 0; 3635 delete [] ov.text; ov.text = 0;
3720 delete [] ov_rend; ov_rend = 0; 3636 delete [] ov.rend; ov.rend = 0;
3721} 3637}
3722 3638
3723void 3639void
3724rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3640rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725{ 3641{
3726 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3642 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3727 return; 3643 return;
3728 3644
3729 x++, y++; 3645 x++, y++;
3730 3646
3731 ov_text[y][x] = text; 3647 ov.text[y][x] = text;
3732 ov_rend[y][x] = rend; 3648 ov.rend[y][x] = rend;
3733} 3649}
3734 3650
3735void 3651void
3736rxvt_term::scr_overlay_set (int x, int y, const char *s) 3652rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737{ 3653{
3738 while (*s) 3654 while (*s)
3739 scr_overlay_set (x++, y, *s++); 3655 scr_overlay_set (x++, y, *s++);
3740} 3656}
3741 3657
3742void 3658void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3659rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744{ 3660{
3745 while (*s) 3661 while (*s)
3746 { 3662 {
3747 text_t t = *s++; 3663 text_t t = *s++;
3748 int width = wcwidth (t); 3664 int width = WCWIDTH (t);
3749 3665
3750 while (width--) 3666 while (width--)
3751 { 3667 {
3752 scr_overlay_set (x++, y, t); 3668 scr_overlay_set (x++, y, t);
3753 t = NOCHAR; 3669 t = NOCHAR;
3754 } 3670 }
3755 } 3671 }
3756} 3672}
3757 3673
3758void 3674void
3759rxvt_term::scr_swap_overlay () 3675rxvt_term::scr_swap_overlay () NOTHROW
3760{ 3676{
3761 if (!ov_text) 3677 if (!ov.text)
3762 return; 3678 return;
3763 3679
3680 // hide cursor if it is within the overlay area
3681 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3682 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3683 screen.flags &= ~Screen_VisibleCursor;
3684
3764 // swap screen mem with overlay 3685 // swap screen mem with overlay
3765 for (int y = ov_h; y--; ) 3686 for (int y = ov.h; y--; )
3766 { 3687 {
3767 text_t *t1 = ov_text[y]; 3688 text_t *t1 = ov.text[y];
3768 rend_t *r1 = ov_rend[y]; 3689 rend_t *r1 = ov.rend[y];
3769 3690
3770 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; 3691 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; 3692 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3772 3693
3773 for (int x = ov_w; x--; ) 3694 for (int x = ov.w; x--; )
3774 { 3695 {
3775 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3696 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3776 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3697 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3777 } 3698 }
3778 } 3699 }

Diff Legend

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