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

Diff Legend

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