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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines