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

Diff Legend

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