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.222 by root, Wed Jan 11 05:14:26 2006 UTC vs.
Revision 1.388 by root, Fri Jul 8 00:08:40 2011 UTC

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

Diff Legend

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