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.213 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.300 by ayin, Sun Jan 27 22:48:33 2008 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.C 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */ 29#include "rxvtperl.h" /* NECESSARY */
30 30
31#include <X11/Xmd.h> /* get the typedef for CARD32 */
32
33#include <inttypes.h> 31#include <inttypes.h>
34 32
35#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a seperate compile!
36 34
37inline void fill_text (text_t *start, text_t value, int len) 35static inline void fill_text (text_t *start, text_t value, int len)
38{ 36{
39 while (len--) 37 while (len--)
40 *start++ = value; 38 *start++ = value;
41} 39}
42 40
… …
47 45
48/* ------------------------------------------------------------------------- * 46/* ------------------------------------------------------------------------- *
49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 47 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
50 * ------------------------------------------------------------------------- */ 48 * ------------------------------------------------------------------------- */
51#define ZERO_SCROLLBACK() \ 49#define ZERO_SCROLLBACK() \
52 if (OPTION (Opt_scrollTtyOutput)) \ 50 if (option (Opt_scrollTtyOutput)) \
53 view_start = 0 51 view_start = 0
54#define CLEAR_SELECTION() \ 52#define CLEAR_SELECTION() \
55 selection.beg.row = selection.beg.col \ 53 selection.beg.row = selection.beg.col \
56 = selection.end.row = selection.end.col = 0 54 = selection.end.row = selection.end.col = 0
57#define CLEAR_ALL_SELECTION() \ 55#define CLEAR_ALL_SELECTION() \
… …
89/* 87/*
90 * CLEAR_ROWS : clear <num> rows starting from row <row> 88 * CLEAR_ROWS : clear <num> rows starting from row <row>
91 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
92 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour 90 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
93 */ 91 */
94#define drawBuffer vt
95
96#define CLEAR_ROWS(row, num) \ 92#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 93 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 94 XClearArea (dpy, vt, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 95 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 96 (unsigned int)Height2Pixel (num), False)
101 97
102#define CLEAR_CHARS(x, y, num) \ 98#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 99 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 100 XClearArea (dpy, vt, x, y, \
105 (unsigned int)Width2Pixel (num), \ 101 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 102 (unsigned int)Height2Pixel (1), False)
107 103
108#define ERASE_ROWS(row, num) \ 104#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 105 XFillRectangle (dpy, vt, gc, \
110 0, Row2Pixel (row), \ 106 0, Row2Pixel (row), \
111 (unsigned int)width, \ 107 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 108 (unsigned int)Height2Pixel (num))
113 109
114/* ------------------------------------------------------------------------- * 110/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 111 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 112 * ------------------------------------------------------------------------- */
117 113
118/* Fill part/all of a line with blanks. */ 114/* Fill part/all of a line with blanks. */
119void 115void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 116rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 117{
122 if (!l.t) 118 if (!l.t)
123 { 119 {
124 lalloc (l); 120 lalloc (l);
125 col = 0; 121 col = 0;
126 width = ncol; 122 width = ncol;
127 } 123 }
128 124
129 l.touch (); 125 l.touch ();
130 126
131 efs &= ~RS_baseattrMask; 127 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 128 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
133 129
134 text_t *et = l.t + col; 130 text_t *et = l.t + col;
135 rend_t *er = l.r + col; 131 rend_t *er = l.r + col;
136 132
… …
142} 138}
143 139
144/* ------------------------------------------------------------------------- */ 140/* ------------------------------------------------------------------------- */
145/* Fill a full line with blanks - make sure it is allocated first */ 141/* Fill a full line with blanks - make sure it is allocated first */
146void 142void
147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 143rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
148{ 144{
149 scr_blank_line (l, 0, ncol, efs); 145 scr_blank_line (l, 0, ncol, efs);
146
147 l.l = 0;
148 l.f = 0;
150} 149}
151 150
152/* ------------------------------------------------------------------------- * 151/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 152 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 153 * ------------------------------------------------------------------------- */
… …
158{ 157{
159#if ENABLE_OVERLAY 158#if ENABLE_OVERLAY
160 scr_overlay_off (); 159 scr_overlay_off ();
161#endif 160#endif
162 161
162 rvideo_mode = false;
163 view_start = 0; 163 view_start = 0;
164 num_scr = 0; 164 num_scr = 0;
165 165
166 if (ncol == 0) 166 if (ncol == 0)
167 ncol = 80; 167 ncol = 80;
… …
170 nrow = 24; 170 nrow = 24;
171 171
172 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 173 return;
174 174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177
175 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
176 if (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
177 { 180 {
178 //TODO//FIXME 181 //TODO//FIXME
179 saveLines++; 182 saveLines++;
180 prev_nrow--; 183 prev_nrow--;
181 nsaved++; 184 top_row--;
182 } 185 }
183 186
184 want_refresh = 1; 187 want_refresh = 1;
185 188
186 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
191 194
192 if (!row_buf) 195 if (!row_buf)
193 { 196 {
194 /* 197 /*
195 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
196 * Note: this is still needed so that all the scrollback lines are NULL
197 */ 199 */
198 nsaved = 0; /* no saved lines */ 200 top_row = 0;
199 term_start = 0; 201 term_start = 0;
200 202
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 205
204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 209
209 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
210 { 211 {
211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
233 selection.text = NULL; 234 selection.text = NULL;
234 selection.len = 0; 235 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
237 selection.clicks = 0; 238 selection.clicks = 0;
238 CLEAR_ALL_SELECTION ();
239 rvideo = 0;
240 } 239 }
241 else 240 else
242 { 241 {
243 /* 242 /*
244 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
257 } 256 }
258 } 257 }
259#endif 258#endif
260 259
261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
264 262
265 for (int row = min (nrow, prev_nrow); row--; ) 263 for (int row = min (nrow, prev_nrow); row--; )
266 { 264 {
267 lresize (drawn_buf[row]); 265 lresize (drawn_buf[row]);
… …
272 { 270 {
273 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
274 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
275 } 273 }
276 274
275 line_t *old_buf = row_buf;
277 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
278 277
279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
280 int pend = MOD (term_start - nsaved , prev_total_rows); 279 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 280 int q = total_rows; // rewrapped row
282 281
283 if (nsaved) 282 if (top_row)
284 { 283 {
285 // re-wrap lines, this is rather ugly, possibly because I am too dumb 284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
286 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
287 286
288 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 289
… …
324 qline->l = ncol; 323 qline->l = ncol;
325 qline->is_longer (1); 324 qline->is_longer (1);
326 325
327 int qcol = 0; 326 int qcol = 0;
328 327
328 // see below for cursor adjustment rationale
329 if (p == ocur.row)
330 screen.cur.row = q - (total_rows - nrow);
331
329 // fill a single destination line 332 // fill a single destination line
330 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
331 { 334 {
332 int prow = lofs / prev_ncol; 335 int prow = lofs / prev_ncol;
333 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
… …
343 346
344 line_t &pline = old_buf [prow]; 347 line_t &pline = old_buf [prow];
345 348
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347 350
348 assert (len);
349 assert (pline.t);
350
351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
353 353
354 lofs += len; 354 lofs += len;
355 qcol += len; 355 qcol += len;
… …
361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
362 } 362 }
363 while (p != pend && q > 0); 363 while (p != pend && q > 0);
364 364
365 term_start = total_rows - nrow; 365 term_start = total_rows - nrow;
366 nsaved = term_start - q; 366 top_row = q - term_start;
367 367
368 // make sure all terminal lines exist 368 // make sure all terminal lines exist
369 while (nsaved < 0) 369 while (top_row > 0)
370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 370 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
371 } 371 }
372 else 372 else
373 { 373 {
374 // if no scrollback exists (yet), wing, instead of wrap 374 // if no scrollback exists (yet), wing, instead of wrap
375 375
376 for (int row = min (nrow, prev_nrow); row--; ) 376 for (int row = min (nrow, prev_nrow); row--; )
377 { 377 {
378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; 378 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
379 line_t &qline = row_buf [row]; 379 line_t &qline = row_buf [row];
380 380
… …
388 } 388 }
389 389
390 term_start = 0; 390 term_start = 0;
391 } 391 }
392 392
393#ifdef DEBUG_STRICT //TODO: remove
394 for (int i = -nsaved; i < nrow; i++)
395 assert (ROW (i).t);
396#endif
397
398 free (old_buf); 393 free (old_buf);
399 delete old_ta; 394 delete old_ta;
400 delete old_ra; 395 delete old_ra;
401 396
402 clamp_it (screen.cur.row, 0, nrow - 1); 397 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 398 clamp_it (screen.cur.col, 0, ncol - 1);
404 399
405 if (tabs)
406 free (tabs); 400 free (tabs);
407 } 401 }
402
403 CLEAR_ALL_SELECTION ();
408 404
409 prev_nrow = nrow; 405 prev_nrow = nrow;
410 prev_ncol = ncol; 406 prev_ncol = ncol;
411 407
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 408 tabs = (char *)rxvt_malloc (ncol);
413 409
414 for (int col = ncol; col--; ) 410 for (int col = ncol; --col; )
415 tabs [col] = col % TABSIZE == 0; 411 tabs [col] = col % TABSIZE == 0;
416 412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415
417 tt_winch (); 416 tt_winch ();
418 417
419 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 418 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
420} 419}
421 420
422/* ------------------------------------------------------------------------- */ 421/* ------------------------------------------------------------------------- */
423/* 422/*
424 * Free everything. That way malloc debugging can find leakage. 423 * Free everything. That way malloc debugging can find leakage.
425 */ 424 */
426void 425void
427rxvt_term::scr_release () 426rxvt_term::scr_release () NOTHROW
428{ 427{
428 if (row_buf)
429 {
429 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
431 432
432 free (row_buf); 433 free (row_buf);
433 free (swap_buf); 434 free (swap_buf);
434 free (drawn_buf); 435 free (drawn_buf);
435 free (temp_buf);
436 free (tabs); 436 free (tabs);
437 437
438 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
439 }
439} 440}
440 441
441/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
442/* 443/*
443 * Hard reset 444 * Hard reset
… …
448 scr_release (); 449 scr_release ();
449 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
450 scr_reset (); 451 scr_reset ();
451 452
452 scr_clear (true); 453 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
454} 455}
455 456
456/* ------------------------------------------------------------------------- * 457/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 458 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 459 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 461 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 462 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 463 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 464 */
464void 465void
465rxvt_term::scr_cursor (int mode) 466rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 467{
467 screen_t *s; 468 screen_t *s;
468 469
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 470#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 471 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 503 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 504 assert (s->cur.col >= 0);
504#endif 505#endif
505} 506}
506 507
508void
509rxvt_term::scr_swap_screen ()
510{
511 if (!option (Opt_secondaryScreen))
512 return;
513
514 for (int i = prev_nrow; i--; )
515 ::swap (ROW(i), swap_buf [i]);
516
517 ::swap (screen.cur, swap.cur);
518
519 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
520 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
521}
522
507/* ------------------------------------------------------------------------- */ 523/* ------------------------------------------------------------------------- */
508/* 524/*
509 * Swap between primary and secondary screens 525 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 526 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 527 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 528 */
513int 529void
514rxvt_term::scr_change_screen (int scrn) 530rxvt_term::scr_change_screen (int scrn)
515{ 531{
532 if (scrn == current_screen)
533 return;
534
516 want_refresh = 1; 535 want_refresh = 1;
517 view_start = 0; 536 view_start = 0;
518 537
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 538 selection_check (2); /* check for boundary cross */
523 539
524 int i = current_screen; current_screen = scrn; scrn = i; 540 int i = current_screen; current_screen = scrn; scrn = i;
525 541
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
532#if NSCREENS 542#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 543 if (option (Opt_secondaryScreen))
534 { 544 {
535 num_scr = 0; 545 num_scr = 0;
536 546
537 for (int i = prev_nrow; i--; ) 547 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 548
540 ::swap (screen.charset, swap.charset); 549 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 550 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 551 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 552 swap.flags |= Screen_VisibleCursor;
544 } 553 }
545 else 554 else
546#endif 555#endif
547 if (OPTION (Opt_secondaryScroll)) 556 if (option (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 557 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 558}
552 559
553// clear WrapNext indicator, solidifying position on next line 560// clear WrapNext indicator, solidifying position on next line
554void 561void
555rxvt_term::scr_do_wrap () 562rxvt_term::scr_do_wrap () NOTHROW
556{ 563{
557 if (!(screen.flags & Screen_WrapNext)) 564 if (!(screen.flags & Screen_WrapNext))
558 return; 565 return;
559 566
560 screen.flags &= ~Screen_WrapNext; 567 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 577/* ------------------------------------------------------------------------- */
571/* 578/*
572 * Change the colour for following text 579 * Change the colour for following text
573 */ 580 */
574void 581void
575rxvt_term::scr_color (unsigned int color, int fgbg) 582rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 583{
577 if (color > maxTermCOLOR) 584 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 585 color = fgbg;
579 586
580 if (fgbg == Color_fg) 587 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 588 rstyle = SET_FGCOLOR (rstyle, color);
582 else 589 else
… …
586/* ------------------------------------------------------------------------- */ 593/* ------------------------------------------------------------------------- */
587/* 594/*
588 * Change the rendition style for following text 595 * Change the rendition style for following text
589 */ 596 */
590void 597void
591rxvt_term::scr_rendition (int set, int style) 598rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 599{
593 if (set) 600 if (set)
594 rstyle |= style; 601 rstyle |= style;
595 else if (style == ~RS_None) 602 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 603 rstyle = DEFAULT_RSTYLE;
597 else 604 else
598 rstyle &= ~style; 605 rstyle &= ~style;
599 } 606}
600 607
601/* ------------------------------------------------------------------------- */ 608/* ------------------------------------------------------------------------- */
602/* 609/*
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 610 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 611 * count positive ==> scroll up
605 * count negative ==> scroll down 612 * count negative ==> scroll down
606 */ 613 */
607int 614int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 615rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 616{
610 if (count == 0 || (row1 > row2)) 617 if (count == 0 || (row1 > row2))
611 return 0; 618 return 0;
612 619
613 want_refresh = 1; 620 want_refresh = 1;
614 num_scr += count; 621 num_scr += count;
615 622
616 if (count > 0 623 if (count > 0
617 && row1 == 0 624 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 625 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
620 { 626 {
621 nsaved = min (nsaved + count, saveLines); 627 top_row = max (top_row - count, -saveLines);
622 628
623 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 629 // scroll everything up 'count' lines
624
625 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
626 631
632 // sever bottommost line
633 {
634 line_t &l = ROW(row2 - count);
635 l.is_longer (0);
636 l.touch ();
637 }
638
639 // erase newly scrolled-in lines
640 for (int i = count; i--; )
641 {
642 line_t &l = ROW(nrow - 1 - i);
643
644 // optimize if already cleared, can be significant on slow machines
645 // could be rolled into scr_blank_screen_mem
646 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
647 {
648 scr_blank_line (l, 0, l.l, rstyle);
649 l.l = 0;
650 l.f = 0;
651 }
652 else
653 scr_blank_screen_mem (l, rstyle);
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any
627 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
628 { 670 {
629 selection.beg.row -= count; 671 selection.beg.row -= count;
630 selection.end.row -= count; 672 selection.end.row -= count;
631 selection.mark.row -= count; 673 selection.mark.row -= count;
632 674
633 if (selection.beg.row < -nsaved 675 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 676 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 677 || selection.mark.row < top_row)
636 { 678 {
637 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
639 } 681 }
640 } 682 }
641 683
642 for (int i = count; i--; ) 684 // finally move the view window, if desired
643 {
644 ROW(row2 - i).l = 0;
645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
646 }
647
648 if (OPTION (Opt_scrollWithBuffer) 685 if (option (Opt_scrollWithBuffer)
649 && view_start != 0 686 && view_start != 0
650 && view_start != saveLines) 687 && view_start != -saveLines)
651 scr_page (UP, count); 688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
652 } 692 }
653 else 693 else
654 { 694 {
655 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen)
656 { 696 {
… …
668 { 708 {
669 /* move selected region too */ 709 /* move selected region too */
670 selection.beg.row -= count; 710 selection.beg.row -= count;
671 selection.end.row -= count; 711 selection.end.row -= count;
672 selection.mark.row -= count; 712 selection.mark.row -= count;
673 713
674 selection_check (0); 714 selection_check (0);
675 } 715 }
676 } 716 }
677 717
678 // use a simple and robust scrolling algorithm, this 718 // use a simple and robust scrolling algorithm, this
… …
680 720
681 int rows = row2 - row1 + 1; 721 int rows = row2 - row1 + 1;
682 722
683 min_it (count, rows); 723 min_it (count, rows);
684 724
725 line_t *temp_buf = row_buf + total_rows;
726
685 for (int row = 0; row < rows; row++) 727 for (int row = 0; row < rows; row++)
686 { 728 {
687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688 730
689 if (!IN_RANGE_EXC (row + count, 0, rows)) 731 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
700/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
701/* 743/*
702 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
703 */ 745 */
704void 746void
705rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
706{ 748{
707 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
708 return; 750 return;
709 751
710 unsigned char checksel; 752 unsigned char checksel;
… …
716 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
717 759
718 if (minlines > 0) 760 if (minlines > 0)
719 { 761 {
720 minlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
721 764
722 if (minlines > 0 765 if (minlines > 0
723 && screen.tscroll == 0 766 && screen.tscroll == 0
724 && screen.bscroll == nrow - 1) 767 && screen.bscroll == nrow - 1)
725 { 768 {
… …
730 } 773 }
731 774
732#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 776 assert (screen.cur.col < ncol);
734 assert (screen.cur.row < nrow 777 assert (screen.cur.row < nrow
735 && screen.cur.row >= -nsaved); 778 && screen.cur.row >= top_row);
736#endif 779#endif
737 int row = screen.cur.row; 780 int row = screen.cur.row;
738 781
739 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
740 783
… …
786 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
787 } 830 }
788 831
789 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
790 { 833 {
834 scr_do_wrap ();
835
791 max_it (line->l, ncol); 836 line->l = ncol;
792 line->is_longer (1); 837 line->is_longer (1);
793 838
794 scr_do_wrap ();
795
796 row = screen.cur.row; 839 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
798 } 841 }
799 842
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
801 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802 c = 0xfffd; 845 c = 0xfffd;
803 846
804 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
805 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
806 // for the line drawing characters below as they might be invalid in the current 849 // drawing characters below as they might be invalid in the current
807 // locale. 850 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
809 852
810 if (charsets [screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 854 {
812 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 856 // 5f-7e standard vt100
… …
964/* 1007/*
965 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
966 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
967 */ 1010 */
968void 1011void
969rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
970{ 1013{
971 want_refresh = 1;
972
973 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
974 { 1015 {
975 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
976 { 1017 {
977#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
978 screen.cur.col = ncol - 1; 1019 screen.cur.col = ncol - 1;
979 screen.cur.row--; 1020 --screen.cur.row;
980 return; 1021
1022 want_refresh = 1;
981#endif 1023#endif
982 } 1024 }
983 } 1025 }
984 else if (!(screen.flags & Screen_WrapNext)) 1026 else
985 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
986
987 screen.flags &= ~Screen_WrapNext;
988} 1028}
989 1029
990/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
991/* 1031/*
992 * Process Horizontal Tab 1032 * Process Horizontal Tab
993 * count: +ve = forward; -ve = backwards 1033 * count: +ve = forward; -ve = backwards
994 * XTERM_SEQ: CTRL-I 1034 * XTERM_SEQ: CTRL-I
995 */ 1035 */
996void 1036void
997rxvt_term::scr_tab (int count, bool ht) 1037rxvt_term::scr_tab (int count, bool ht) NOTHROW
998{ 1038{
999 int i, x; 1039 int i, x;
1000 1040
1001 want_refresh = 1; 1041 want_refresh = 1;
1002 i = x = screen.cur.col; 1042 i = x = screen.cur.col;
… …
1015 x = i; 1055 x = i;
1016 1056
1017 if (!--count) 1057 if (!--count)
1018 break; 1058 break;
1019 } 1059 }
1020 else 1060 else
1021 ht &= l.t[i] == ' ' 1061 ht &= l.t[i] == ' '
1022 && RS_SAME (l.r[i], base_rend); 1062 && RS_SAME (l.r[i], base_rend);
1023 1063
1024 if (count) 1064 if (count)
1025 x = ncol - 1; 1065 x = ncol - 1;
1026 1066
1027 // store horizontal tab commands as characters inside the text 1067 // store horizontal tab commands as characters inside the text
1028 // buffer so they can be selected and pasted. 1068 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1069 if (ht && option (Opt_pastableTabs))
1030 { 1070 {
1031 base_rend = SET_FONT (base_rend, 0); 1071 base_rend = SET_FONT (base_rend, 0);
1032 1072
1033 l.touch (x); 1073 l.touch (x);
1034 1074
… …
1067 * Process DEC Back Index 1107 * Process DEC Back Index
1068 * XTERM_SEQ: ESC 6 1108 * XTERM_SEQ: ESC 6
1069 * Move cursor left in row. If we're at the left boundary, shift everything 1109 * Move cursor left in row. If we're at the left boundary, shift everything
1070 * in that row right. Clear left column. 1110 * in that row right. Clear left column.
1071 */ 1111 */
1072#if ENABLE_FRILLS 1112#if !ENABLE_MINIMAL
1073void 1113void
1074rxvt_term::scr_backindex () 1114rxvt_term::scr_backindex () NOTHROW
1075{ 1115{
1076 if (screen.cur.col > 0) 1116 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1118 else
1079 scr_insdel_chars (1, INSERT); 1119 scr_insdel_chars (1, INSERT);
… …
1084 * Process DEC Forward Index 1124 * Process DEC Forward Index
1085 * XTERM_SEQ: ESC 9 1125 * XTERM_SEQ: ESC 9
1086 * Move cursor right in row. If we're at the right boundary, shift everything 1126 * Move cursor right in row. If we're at the right boundary, shift everything
1087 * in that row left. Clear right column. 1127 * in that row left. Clear right column.
1088 */ 1128 */
1089#if ENABLE_FRILLS 1129#if !ENABLE_MINIMAL
1090void 1130void
1091rxvt_term::scr_forwardindex () 1131rxvt_term::scr_forwardindex () NOTHROW
1092{ 1132{
1093 if (screen.cur.col < ncol - 1) 1133 if (screen.cur.col < ncol - 1)
1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1095 else 1135 else
1096 { 1136 {
… …
1109/* ------------------------------------------------------------------------- */ 1149/* ------------------------------------------------------------------------- */
1110/* 1150/*
1111 * Goto Row/Column 1151 * Goto Row/Column
1112 */ 1152 */
1113void 1153void
1114rxvt_term::scr_gotorc (int row, int col, int relative) 1154rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115{ 1155{
1116 want_refresh = 1; 1156 want_refresh = 1;
1117 ZERO_SCROLLBACK (); 1157 ZERO_SCROLLBACK ();
1118 1158
1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1159 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1141 } 1181 }
1142 } 1182 }
1143 else 1183 else
1144 { 1184 {
1145 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1146 { /* relative origin mode */ 1187 /* relative origin mode */
1147 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1148 min_it (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1149 } 1190 }
1150 else 1191 else
1151 screen.cur.row = row; 1192 screen.cur.row = row;
… …
1157/* ------------------------------------------------------------------------- */ 1198/* ------------------------------------------------------------------------- */
1158/* 1199/*
1159 * direction should be UP or DN 1200 * direction should be UP or DN
1160 */ 1201 */
1161void 1202void
1162rxvt_term::scr_index (enum page_dirn direction) 1203rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163{ 1204{
1164 int dirn; 1205 int dirn;
1165 1206
1166 want_refresh = 1; 1207 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1208 ZERO_SCROLLBACK ();
… …
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1189 */ 1230 */
1190void 1231void
1191rxvt_term::scr_erase_line (int mode) 1232rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1233{
1193 unsigned int col, num; 1234 unsigned int col, num;
1194 1235
1195 want_refresh = 1; 1236 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1237 ZERO_SCROLLBACK ();
… …
1240 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1281 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1241 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1282 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1242 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1283 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1243 */ 1284 */
1244void 1285void
1245rxvt_term::scr_erase_screen (int mode) 1286rxvt_term::scr_erase_screen (int mode) NOTHROW
1246{ 1287{
1247 int num; 1288 int num;
1248 int32_t row; 1289 int32_t row;
1249 rend_t ren; 1290 rend_t ren;
1250 XGCValues gcvalue; 1291 XGCValues gcvalue;
… …
1295 } 1336 }
1296 else 1337 else
1297 { 1338 {
1298 ren = rstyle & (RS_fgMask | RS_bgMask); 1339 ren = rstyle & (RS_fgMask | RS_bgMask);
1299 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1340 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1341 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1301 ERASE_ROWS (row, num); 1342 ERASE_ROWS (row, num);
1302 gcvalue.foreground = pix_colors[Color_fg]; 1343 gcvalue.foreground = pix_colors[Color_fg];
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1344 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1304 } 1345 }
1305 1346
1306 for (; num--; row++) 1347 for (; num--; row++)
1307 { 1348 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle); 1349 scr_blank_screen_mem (ROW(row), rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1350 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 } 1351 }
1314} 1352}
1315 1353
1316#if ENABLE_FRILLS 1354#if !ENABLE_MINIMAL
1317void 1355void
1318rxvt_term::scr_erase_savelines () 1356rxvt_term::scr_erase_savelines () NOTHROW
1319{ 1357{
1320 want_refresh = 1; 1358 want_refresh = 1;
1321 ZERO_SCROLLBACK (); 1359 ZERO_SCROLLBACK ();
1322 1360
1323 nsaved = 0; 1361 top_row = 0;
1324} 1362}
1325#endif 1363#endif
1326 1364
1327/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1328/* 1366/*
1329 * Fill the screen with `E's 1367 * Fill the screen with `E's
1330 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1368 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1331 */ 1369 */
1332void 1370void
1333rxvt_term::scr_E () 1371rxvt_term::scr_E () NOTHROW
1334{ 1372{
1335 rend_t fs; 1373 rend_t fs;
1336 1374
1337 want_refresh = 1; 1375 want_refresh = 1;
1338 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
… …
1359/* ------------------------------------------------------------------------- */ 1397/* ------------------------------------------------------------------------- */
1360/* 1398/*
1361 * Insert/Delete <count> lines 1399 * Insert/Delete <count> lines
1362 */ 1400 */
1363void 1401void
1364rxvt_term::scr_insdel_lines (int count, int insdel) 1402rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1365{ 1403{
1366 int end; 1404 int end;
1367 1405
1368 ZERO_SCROLLBACK (); 1406 ZERO_SCROLLBACK ();
1369 1407
… …
1389/* ------------------------------------------------------------------------- */ 1427/* ------------------------------------------------------------------------- */
1390/* 1428/*
1391 * Insert/Delete <count> characters from the current position 1429 * Insert/Delete <count> characters from the current position
1392 */ 1430 */
1393void 1431void
1394rxvt_term::scr_insdel_chars (int count, int insdel) 1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1395{ 1433{
1396 int col, row; 1434 int col, row;
1397 rend_t tr; 1435 rend_t tr;
1398 1436
1399 want_refresh = 1; 1437 want_refresh = 1;
… …
1430 { 1468 {
1431 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
1432 || (selection.end.col + count >= ncol)) 1470 || (selection.end.col + count >= ncol))
1433 CLEAR_SELECTION (); 1471 CLEAR_SELECTION ();
1434 else 1472 else
1473 {
1435 { /* shift selection */ 1474 /* shift selection */
1436 selection.beg.col += count; 1475 selection.beg.col += count;
1437 selection.mark.col += count; /* XXX: yes? */ 1476 selection.mark.col += count; /* XXX: yes? */
1438 selection.end.col += count; 1477 selection.end.col += count;
1439 } 1478 }
1440 } 1479 }
… …
1487/* 1526/*
1488 * Set the scrolling region 1527 * Set the scrolling region
1489 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1528 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1490 */ 1529 */
1491void 1530void
1492rxvt_term::scr_scroll_region (int top, int bot) 1531rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1493{ 1532{
1494 max_it (top, 0); 1533 max_it (top, 0);
1495 min_it (bot, nrow - 1); 1534 min_it (bot, nrow - 1);
1496 1535
1497 if (top > bot) 1536 if (top > bot)
… …
1507 * Make the cursor visible/invisible 1546 * Make the cursor visible/invisible
1508 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1547 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1509 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1548 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1510 */ 1549 */
1511void 1550void
1512rxvt_term::scr_cursor_visible (int mode) 1551rxvt_term::scr_cursor_visible (int mode) NOTHROW
1513{ 1552{
1514 want_refresh = 1; 1553 want_refresh = 1;
1515 1554
1516 if (mode) 1555 if (mode)
1517 screen.flags |= Screen_VisibleCursor; 1556 screen.flags |= Screen_VisibleCursor;
… …
1524 * Set/unset automatic wrapping 1563 * Set/unset automatic wrapping
1525 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1564 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1526 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1565 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1527 */ 1566 */
1528void 1567void
1529rxvt_term::scr_autowrap (int mode) 1568rxvt_term::scr_autowrap (int mode) NOTHROW
1530{ 1569{
1531 if (mode) 1570 if (mode)
1532 screen.flags |= Screen_Autowrap; 1571 screen.flags |= Screen_Autowrap;
1533 else 1572 else
1534 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1573 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1543 * and the cursor cannot be moved outside. 1582 * and the cursor cannot be moved outside.
1544 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1583 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1545 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1584 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1546 */ 1585 */
1547void 1586void
1548rxvt_term::scr_relative_origin (int mode) 1587rxvt_term::scr_relative_origin (int mode) NOTHROW
1549{ 1588{
1550 if (mode) 1589 if (mode)
1551 screen.flags |= Screen_Relative; 1590 screen.flags |= Screen_Relative;
1552 else 1591 else
1553 screen.flags &= ~Screen_Relative; 1592 screen.flags &= ~Screen_Relative;
… …
1560 * Set insert/replace mode 1599 * Set insert/replace mode
1561 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1600 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1562 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1601 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1563 */ 1602 */
1564void 1603void
1565rxvt_term::scr_insert_mode (int mode) 1604rxvt_term::scr_insert_mode (int mode) NOTHROW
1566{ 1605{
1567 if (mode) 1606 if (mode)
1568 screen.flags |= Screen_Insert; 1607 screen.flags |= Screen_Insert;
1569 else 1608 else
1570 screen.flags &= ~Screen_Insert; 1609 screen.flags &= ~Screen_Insert;
… …
1576 * XTERM_SEQ: Set tab at current column : ESC H 1615 * XTERM_SEQ: Set tab at current column : ESC H
1577 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1616 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1578 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1617 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1579 */ 1618 */
1580void 1619void
1581rxvt_term::scr_set_tab (int mode) 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1582{ 1621{
1583 if (mode < 0) 1622 if (mode < 0)
1584 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol);
1585 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1586 tabs [screen.cur.col] = !!mode; 1625 tabs [screen.cur.col] = !!mode;
1587} 1626}
1588 1627
1589/* ------------------------------------------------------------------------- */ 1628/* ------------------------------------------------------------------------- */
… …
1591 * Set reverse/normal video 1630 * Set reverse/normal video
1592 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1631 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1593 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1632 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1594 */ 1633 */
1595void 1634void
1596rxvt_term::scr_rvideo_mode (int mode) 1635rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1597{ 1636{
1598 XGCValues gcvalue; 1637 rvideo_mode = on;
1599 1638
1639#ifndef NO_BELL
1640 on ^= rvideo_bell;
1641#endif
1642
1600 if (rvideo != mode) 1643 if (rvideo_state != on)
1601 { 1644 {
1602 rvideo = mode; 1645 rvideo_state = on;
1646
1603 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1604#if XPM_BACKGROUND 1648#ifdef HAVE_BG_PIXMAP
1605 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1606#endif 1650#endif
1607#if TRANSPARENT 1651 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1608 if (! OPTION (Opt_transparent) || am_transparent == 0)
1609#endif
1610 XSetWindowBackground (display->display, vt,
1611 pix_colors[Color_bg]);
1612 1652
1653 XGCValues gcvalue;
1613 gcvalue.foreground = pix_colors[Color_fg]; 1654 gcvalue.foreground = pix_colors[Color_fg];
1614 gcvalue.background = pix_colors[Color_bg]; 1655 gcvalue.background = pix_colors[Color_bg];
1615 XChangeGC (display->display, gc, GCBackground | GCForeground, 1656 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1616 &gcvalue); 1657
1617 scr_clear (); 1658 scr_clear ();
1618 scr_touch (true); 1659 scr_touch (true);
1619 } 1660 }
1620} 1661}
1621 1662
… …
1623/* 1664/*
1624 * Report current cursor position 1665 * Report current cursor position
1625 * XTERM_SEQ: Report position: ESC [ 6 n 1666 * XTERM_SEQ: Report position: ESC [ 6 n
1626 */ 1667 */
1627void 1668void
1628rxvt_term::scr_report_position () 1669rxvt_term::scr_report_position () NOTHROW
1629{ 1670{
1630 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1671 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1631} 1672}
1632 1673
1633/* ------------------------------------------------------------------------- * 1674/* ------------------------------------------------------------------------- *
… …
1636 1677
1637/* 1678/*
1638 * Set font style 1679 * Set font style
1639 */ 1680 */
1640void 1681void
1641rxvt_term::set_font_style () 1682rxvt_term::set_font_style () NOTHROW
1642{ 1683{
1643#if 0 1684#if 0
1644 switch (charsets [screen.charset]) 1685 switch (charsets [screen.charset])
1645 { 1686 {
1646 case '0': /* DEC Special Character & Line Drawing Set */ 1687 case '0': /* DEC Special Character & Line Drawing Set */
… …
1668 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1709 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1669 * XTERM_SEQ: Invoke G2 character set: ESC N 1710 * XTERM_SEQ: Invoke G2 character set: ESC N
1670 * XTERM_SEQ: Invoke G3 character set: ESC O 1711 * XTERM_SEQ: Invoke G3 character set: ESC O
1671 */ 1712 */
1672void 1713void
1673rxvt_term::scr_charset_choose (int set) 1714rxvt_term::scr_charset_choose (int set) NOTHROW
1674{ 1715{
1675 screen.charset = set; 1716 screen.charset = set;
1676 set_font_style (); 1717 set_font_style ();
1677} 1718}
1678 1719
… …
1684 * XTERM_SEQ: Set G2 character set: ESC * <C> 1725 * XTERM_SEQ: Set G2 character set: ESC * <C>
1685 * XTERM_SEQ: Set G3 character set: ESC + <C> 1726 * XTERM_SEQ: Set G3 character set: ESC + <C>
1686 * See set_font_style for possible values for <C> 1727 * See set_font_style for possible values for <C>
1687 */ 1728 */
1688void 1729void
1689rxvt_term::scr_charset_set (int set, unsigned int ch) 1730rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1690{ 1731{
1691 charsets[set] = (unsigned char)ch; 1732 charsets[set] = (unsigned char)ch;
1692 set_font_style (); 1733 set_font_style ();
1693} 1734}
1694 1735
… …
1699 1740
1700/* 1741/*
1701 * refresh matching text. 1742 * refresh matching text.
1702 */ 1743 */
1703bool 1744bool
1704rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1745rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1705{ 1746{
1706 bool found = false; 1747 bool found = false;
1707 1748
1708 for (int i = 0; i < nrow; i++) 1749 for (int i = 0; i < nrow; i++)
1709 { 1750 {
1710 int col = 0;
1711 rend_t *drp = drawn_buf[i].r; 1751 rend_t *drp = drawn_buf[i].r;
1712 1752
1713 for (; col < ncol; col++, drp++) 1753 for (int col = 0; col < ncol; col++, drp++)
1714 if ((*drp & mask) == value) 1754 if ((*drp & mask) == value)
1715 { 1755 {
1716 found = true; 1756 found = true;
1717 *drp = ~value; 1757 *drp = ~value;
1718 } 1758 }
… …
1729 PART_END, 1769 PART_END,
1730 RC_COUNT 1770 RC_COUNT
1731}; 1771};
1732 1772
1733void 1773void
1734rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1774rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1735{ 1775{
1736 int i; 1776 int i;
1737 row_col_t rc[RC_COUNT]; 1777 row_col_t rc[RC_COUNT];
1738 1778
1739 if (!drawn_buf) /* sanity check */ 1779 if (!drawn_buf) /* sanity check */
… …
1758 for (i = PART_BEG; i < RC_COUNT; i++) 1798 for (i = PART_BEG; i < RC_COUNT; i++)
1759 { 1799 {
1760 min_it (rc[i].col, ncol - 1); 1800 min_it (rc[i].col, ncol - 1);
1761 min_it (rc[i].row, nrow - 1); 1801 min_it (rc[i].row, nrow - 1);
1762 } 1802 }
1763 1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1764 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1804 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1765 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1805 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1766 1806
1807 num_scr_allow = 0;
1808
1767 if (refresh) 1809 if (refresh)
1768 scr_refresh (SLOW_REFRESH); 1810 scr_refresh ();
1769} 1811}
1770 1812
1771/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1772/* 1814/*
1773 * Refresh the entire screen 1815 * Refresh the entire screen
1774 */ 1816 */
1775void 1817void
1776rxvt_term::scr_touch (bool refresh) 1818rxvt_term::scr_touch (bool refresh) NOTHROW
1777{ 1819{
1778 scr_expose (0, 0, width, height, refresh); 1820 scr_expose (0, 0, width, height, refresh);
1779} 1821}
1780 1822
1781/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1782/* 1824/*
1783 * Move the display so that the line represented by scrollbar value Y is at 1825 * Move the display so that the line represented by scrollbar value Y is at
1784 * the top of the screen 1826 * the top of the screen
1785 */ 1827 */
1786int 1828void
1787rxvt_term::scr_move_to (int y, int len) 1829rxvt_term::scr_move_to (int y, int len) NOTHROW
1788{ 1830{
1789 long p = 0; 1831 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1790 unsigned int oldviewstart;
1791
1792 oldviewstart = view_start;
1793
1794 if (y < len)
1795 {
1796 p = (nrow + nsaved) * (len - y) / len;
1797 p -= (long) (nrow - 1);
1798 p = max (p, 0);
1799 }
1800
1801 view_start = (unsigned int)min (p, nsaved);
1802
1803 return scr_changeview (oldviewstart);
1804} 1832}
1805 1833
1806/* ------------------------------------------------------------------------- */ 1834/* ------------------------------------------------------------------------- */
1807/* 1835/*
1808 * Page the screen up/down nlines 1836 * Page the screen up/down nlines
1809 * direction should be UP or DN 1837 * direction should be UP or DN
1810 */ 1838 */
1811int 1839bool
1812rxvt_term::scr_page (enum page_dirn direction, int nlines) 1840rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1813{ 1841{
1814 int n; 1842 int new_view_start =
1815 unsigned int oldviewstart;
1816
1817 oldviewstart = view_start;
1818
1819 if (direction == UP)
1820 {
1821 n = view_start + nlines;
1822 view_start = min (n, nsaved);
1823 }
1824 else
1825 {
1826 n = view_start - nlines; 1843 direction == UP ? view_start - nlines
1827 view_start = max (n, 0); 1844 : view_start + nlines;
1828 }
1829 1845
1830 return scr_changeview (oldviewstart); 1846 return scr_changeview (new_view_start);
1831} 1847}
1832 1848
1833int 1849bool
1834rxvt_term::scr_changeview (unsigned int oldviewstart) 1850rxvt_term::scr_changeview (int new_view_start) NOTHROW
1835{ 1851{
1852 clamp_it (new_view_start, top_row, 0);
1853
1836 if (view_start != oldviewstart) 1854 if (new_view_start == view_start)
1837 { 1855 return false;
1856
1857 num_scr += new_view_start - view_start;
1858 view_start = new_view_start;
1859 want_refresh = 1;
1860
1838 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1861 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839 1862
1840 want_refresh = 1; 1863 return true;
1841 num_scr -= (view_start - oldviewstart);
1842 }
1843
1844 return (int)view_start - (int)oldviewstart;
1845} 1864}
1846 1865
1847/* ------------------------------------------------------------------------- */ 1866#ifndef NO_BELL
1848void 1867void
1868rxvt_term::bell_cb (ev::timer &w, int revents)
1869{
1870 rvideo_bell = false;
1871 scr_rvideo_mode (rvideo_mode);
1872 refresh_check ();
1873}
1874#endif
1875
1876/* ------------------------------------------------------------------------- */
1877void
1849rxvt_term::scr_bell () 1878rxvt_term::scr_bell () NOTHROW
1850{ 1879{
1851#ifndef NO_BELL 1880#ifndef NO_BELL
1852 1881
1853# ifndef NO_MAPALERT 1882# ifndef NO_MAPALERT
1854# ifdef MAPALERT_OPTION 1883# ifdef MAPALERT_OPTION
1855 if (OPTION (Opt_mapAlert)) 1884 if (option (Opt_mapAlert))
1856# endif 1885# endif
1857 XMapWindow (display->display, parent[0]); 1886 XMapWindow (dpy, parent[0]);
1858# endif 1887# endif
1859 1888
1860 if (OPTION (Opt_visualBell)) 1889# if ENABLE_FRILLS
1890 if (option (Opt_urgentOnBell))
1891 {
1892 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1893 {
1894 h->flags |= XUrgencyHint;
1895 XSetWMHints (dpy, parent[0], h);
1896 }
1861 { 1897 }
1862 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898# endif
1899
1900 if (option (Opt_visualBell))
1901 {
1902 rvideo_bell = true;
1903 scr_rvideo_mode (rvideo_mode);
1904 flush ();
1905
1863 rxvt_usleep (VISUAL_BELL_DURATION); 1906 bell_ev.start (VISUAL_BELL_DURATION);
1864 scr_rvideo_mode (!rvideo); /* refresh also done */
1865 } 1907 }
1866 else 1908 else
1867 XBell (display->display, 0); 1909 XBell (dpy, 0);
1868
1869#endif 1910#endif
1870} 1911}
1871 1912
1872/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1873/* ARGSUSED */ 1914/* ARGSUSED */
1874void 1915void
1875rxvt_term::scr_printscreen (int fullhist) 1916rxvt_term::scr_printscreen (int fullhist) NOTHROW
1876{ 1917{
1877#ifdef PRINTPIPE 1918#ifdef PRINTPIPE
1878 int nrows, row_start; 1919 int nrows, row_start;
1879 FILE *fd; 1920 FILE *fd;
1880 1921
1881 if ((fd = popen_printer ()) == NULL) 1922 if ((fd = popen_printer ()) == NULL)
1882 return; 1923 return;
1883 1924
1884 if (fullhist) 1925 if (fullhist)
1885 { 1926 {
1886 nrows = nrow + nsaved; 1927 nrows = nrow - top_row;
1887 row_start = -nsaved; 1928 row_start = top_row;
1888 } 1929 }
1889 else 1930 else
1890 { 1931 {
1891 nrows = nrow; 1932 nrows = nrow;
1892 row_start = -view_start; 1933 row_start = view_start;
1893 } 1934 }
1894 1935
1895 wctomb (0, 0); 1936 wctomb (0, 0);
1896 1937
1897 for (int r1 = 0; r1 < nrows; r1++) 1938 for (int r1 = 0; r1 < nrows; r1++)
… …
1929 * Refresh the screen 1970 * Refresh the screen
1930 * drawn_text/drawn_rend contain the screen information before the update. 1971 * drawn_text/drawn_rend contain the screen information before the update.
1931 * screen.text/screen.rend contain what the screen will change to. 1972 * screen.text/screen.rend contain what the screen will change to.
1932 */ 1973 */
1933void 1974void
1934rxvt_term::scr_refresh (unsigned char refresh_type) 1975rxvt_term::scr_refresh () NOTHROW
1935{ 1976{
1936 unsigned char must_clear, /* use draw_string not draw_image_string */ 1977 unsigned char have_bg,
1937 showcursor; /* show the cursor */ 1978 showcursor; /* show the cursor */
1938 int16_t col, row, /* column/row we're processing */ 1979 int16_t col, row, /* column/row we're processing */
1939 ocrow; /* old cursor row */ 1980 ocrow; /* old cursor row */
1940 int i; /* tmp */ 1981 int i; /* tmp */
1941#ifndef NO_CURSORCOLOR 1982#ifndef NO_CURSORCOLOR
1942 rend_t cc1; /* store colours at cursor position (s) */ 1983 rend_t cc1; /* store colours at cursor position (s) */
1943#endif 1984#endif
1944 rend_t *crp; // cursor rendition pointer 1985 rend_t *crp; // cursor rendition pointer
1986 rend_t ccol1, /* Cursor colour */
1987 ccol2; /* Cursor colour2 */
1945 1988
1946 want_refresh = 0; /* screen is current */ 1989 want_refresh = 0; /* screen is current */
1947 1990
1948 if (refresh_type == NO_REFRESH || !mapped) 1991 if (refresh_type == NO_REFRESH || !mapped)
1949 return; 1992 return;
1950 1993
1951 /* 1994 /*
1952 * A: set up vars 1995 * A: set up vars
1953 */ 1996 */
1954 must_clear = 0; 1997 have_bg = 0;
1955 refresh_count = 0; 1998 refresh_count = 0;
1956 1999
1957#if XPM_BACKGROUND 2000#ifdef HAVE_BG_PIXMAP
1958 must_clear |= bgPixmap.pixmap != None; 2001 have_bg |= bgPixmap.pixmap != None;
1959#endif
1960#if TRANSPARENT
1961 must_clear |= OPTION (Opt_transparent) && am_transparent;
1962#endif 2002#endif
1963 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1964 2004
1965 /* 2005 /*
1966 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
1970 /* 2010 /*
1971 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
1972 */ 2012 */
1973 { 2013 {
1974 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
1975 rend_t ccol1, /* Cursor colour */
1976 ccol2; /* Cursor colour2 */
1977 2015
1978 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
1979#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
1980 if (hidden_cursor) 2018 if (hidden_cursor)
1981 showcursor = 0; 2019 showcursor = 0;
… …
1988 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1989 col--; 2027 col--;
1990 2028
1991 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
1992 2030
2031#ifndef NO_CURSORCOLOR
2032 cc1 = *crp & (RS_fgMask | RS_bgMask);
2033 if (ISSET_PIXCOLOR (Color_cursor))
2034 ccol1 = Color_cursor;
2035 else
2036#endif
2037#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2038 ccol1 = fgcolor_of (rstyle);
2039#else
2040 ccol1 = Color_fg;
2041#endif
2042
2043#ifndef NO_CURSORCOLOR
2044 if (ISSET_PIXCOLOR (Color_cursor2))
2045 ccol2 = Color_cursor2;
2046 else
2047#endif
2048#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2049 ccol2 = bgcolor_of (rstyle);
2050#else
2051 ccol2 = Color_bg;
2052#endif
2053
1993 if (showcursor && focus) 2054 if (showcursor && focus)
1994 { 2055 {
1995 if (OPTION (Opt_cursorUnderline)) 2056 if (option (Opt_cursorUnderline))
1996 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
1997 else 2058 else
1998 { 2059 {
1999 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
2000
2001#ifndef NO_CURSORCOLOR
2002 cc1 = *crp & (RS_fgMask | RS_bgMask);
2003 if (ISSET_PIXCOLOR (Color_cursor))
2004 ccol1 = Color_cursor;
2005 else
2006#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2007 ccol1 = fgcolor_of (rstyle);
2008#else
2009 ccol1 = Color_fg;
2010#endif
2011 if (ISSET_PIXCOLOR (Color_cursor2))
2012 ccol2 = Color_cursor2;
2013 else
2014#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2015 ccol2 = bgcolor_of (rstyle);
2016#else
2017 ccol2 = Color_bg;
2018#endif
2019 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2020 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2021#endif
2022 } 2063 }
2023 } 2064 }
2024 } 2065 }
2025 2066
2026 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
2027 setoldcursor = 0; 2068 setoldcursor = 0;
2028 if (ocrow != -1) 2069 if (ocrow != -1)
2029 { 2070 {
2030 if (screen.cur.row + view_start != ocrow 2071 if (screen.cur.row - view_start != ocrow
2031 || screen.cur.col != oldcursor.col) 2072 || screen.cur.col != oldcursor.col)
2032 { 2073 {
2033 if (ocrow < nrow 2074 if (ocrow < nrow
2034 && oldcursor.col < ncol) 2075 && oldcursor.col < ncol)
2035 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2076 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2043 else if (!focus) 2084 else if (!focus)
2044 setoldcursor = 1; 2085 setoldcursor = 1;
2045 2086
2046 if (setoldcursor) 2087 if (setoldcursor)
2047 { 2088 {
2048 if (screen.cur.row + view_start >= nrow) 2089 if (screen.cur.row - view_start >= nrow)
2049 oldcursor.row = -1; 2090 oldcursor.row = -1;
2050 else 2091 else
2051 { 2092 {
2052 oldcursor.row = screen.cur.row + view_start; 2093 oldcursor.row = screen.cur.row - view_start;
2053 oldcursor.col = screen.cur.col; 2094 oldcursor.col = screen.cur.col;
2054 } 2095 }
2055 } 2096 }
2056 } 2097 }
2057 2098
… …
2063#ifndef NO_SLOW_LINK_SUPPORT 2104#ifndef NO_SLOW_LINK_SUPPORT
2064 /* 2105 /*
2065 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2066 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2067 */ 2108 */
2068 i = num_scr;
2069 if (!display->is_local 2109 if (!display->is_local
2070 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2071 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2072 { 2112 {
2073 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2074 int j; 2115 int j;
2075 int len, wlen; 2116 int len, wlen;
2117 dLocal (int, num_scr);
2076 2118
2077 j = nrow; 2119 j = nrow;
2078 wlen = len = -1; 2120 wlen = len = -1;
2079 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2080 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2081 { 2124 {
2082 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2083 { 2126 {
2084 line_t s = ROW(row - view_start); 2127 line_t s = ROW(view_start + row);
2085 line_t d = drawn_buf[row]; 2128 line_t d = drawn_buf[row];
2086 line_t d2 = drawn_buf[row + i]; 2129 line_t d2 = drawn_buf[row + i];
2087 2130
2088 for (nits = 0, col = ncol; col--; ) 2131 for (nits = 0, col = ncol; col--; )
2089 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2132 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2105 wlen = row; 2148 wlen = row;
2106 continue; 2149 continue;
2107 } 2150 }
2108 } 2151 }
2109 2152
2110 if (len != -1) 2153 if (len >= 0)
2111 { 2154 {
2112 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2113 if (wlen < len) 2156 if (wlen < len)
2114 ::swap (wlen, len); 2157 ::swap (wlen, len);
2115 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2116 XCopyArea (display->display, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2117 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2118 (unsigned int)this->width, 2164 (unsigned int)this->width,
2119 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2120 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2121 len = -1; 2169 len = -1;
2122 } 2170 }
2123 } 2171 }
2124 } 2172 }
2125#endif 2173#endif
… …
2127 /* 2175 /*
2128 * E: main pass across every character 2176 * E: main pass across every character
2129 */ 2177 */
2130 for (row = 0; row < nrow; row++) 2178 for (row = 0; row < nrow; row++)
2131 { 2179 {
2132 text_t *stp = ROW(row - view_start).t; 2180 text_t *stp = ROW(view_start + row).t;
2133 rend_t *srp = ROW(row - view_start).r; 2181 rend_t *srp = ROW(view_start + row).r;
2134 text_t *dtp = drawn_buf[row].t; 2182 text_t *dtp = drawn_buf[row].t;
2135 rend_t *drp = drawn_buf[row].r; 2183 rend_t *drp = drawn_buf[row].r;
2136 2184
2137 /* 2185 /*
2138 * E2: OK, now the real pass 2186 * E2: OK, now the real pass
… …
2181 count++; 2229 count++;
2182 2230
2183 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2184 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2185 { 2233 {
2186 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2187 break; 2235 break;
2188 2236
2189 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2190 drp[col] = rend; 2238 drp[col] = rend;
2191 i = 0; 2239 i = 0;
2192 } 2240 }
2193 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2194 break; 2242 break;
2195 } 2243 }
2196 2244
2197 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2198 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2208 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2209 2257
2210 // only do special processing if any attributes are set, which is unlikely 2258 // only do special processing if any attributes are set, which is unlikely
2211 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2259 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2212 { 2260 {
2213#if ENABLE_STYLES
2214 // force redraw after "careful" characters to avoid pixel droppings
2215 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2216 drp[col + 1] = ~srp[col + 1];
2217
2218 // include previous careful character(s) if possible, looks nicer (best effort...)
2219 while (text > stp
2220 && srp[text - stp - 1] & RS_Careful
2221 && RS_SAME (rend, srp[text - stp - 1]))
2222 text--, count++, xpixel -= fwidth;
2223#endif
2224
2225 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2226 2262
2227#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2228 if (rend & RS_Bold
2229 && fore == Color_fg) 2264 if (rend & RS_Bold && fore == Color_fg)
2230 { 2265 {
2231 if (ISSET_PIXCOLOR (Color_BD)) 2266 if (ISSET_PIXCOLOR (Color_BD))
2232 fore = Color_BD; 2267 fore = Color_BD;
2233# if !ENABLE_STYLES 2268# if !ENABLE_STYLES
2234 else 2269 else
2235 invert = !invert; 2270 invert = !invert;
2236# endif 2271# endif
2237 } 2272 }
2238 2273
2239 if (rend & RS_Italic 2274 if (rend & RS_Italic && fore == Color_fg)
2240 && fore == Color_fg)
2241 { 2275 {
2242 if (ISSET_PIXCOLOR (Color_IT)) 2276 if (ISSET_PIXCOLOR (Color_IT))
2243 fore = Color_IT; 2277 fore = Color_IT;
2244# if !ENABLE_STYLES 2278# if !ENABLE_STYLES
2245 else 2279 else
2246 invert = !invert; 2280 invert = !invert;
2247# endif 2281# endif
2248 } 2282 }
2249 2283
2250 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2251 fore = Color_UL; 2285 fore = Color_UL;
2252#endif 2286#endif
2253 2287
2254 if (invert) 2288 if (invert)
2255 { 2289 {
2290#ifdef OPTION_HC
2291 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2292 || !ISSET_PIXCOLOR (Color_HC))
2293#endif
2294 /* invert the column if no highlightColor is set or it is the
2295 * current cursor column */
2256 ::swap (fore, back); 2296 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2257 2301
2258#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2259 if (ISSET_PIXCOLOR (Color_RV)) 2304 if (ISSET_PIXCOLOR (Color_RV))
2260 back = Color_RV; 2305 back = Color_RV;
2261 2306# endif
2262 if (fore == back) 2307 if (fore == back)
2263 { 2308 {
2264 fore = Color_bg; 2309 fore = Color_bg;
2265 back = Color_fg; 2310 back = Color_fg;
2266 } 2311 }
… …
2268 } 2313 }
2269 2314
2270#ifdef TEXT_BLINK 2315#ifdef TEXT_BLINK
2271 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2272 { 2317 {
2273 if (!text_blink_ev.active) 2318 if (!text_blink_ev.is_active ())
2274 { 2319 {
2275 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2320 text_blink_ev.again ();
2276 hidden_text = 0; 2321 hidden_text = 0;
2277 } 2322 }
2278 else if (hidden_text) 2323 else if (hidden_text)
2279 fore = back; 2324 fore = back;
2280 } 2325 }
2281#endif 2326#endif
2327
2328#if ENABLE_STYLES
2329 // "careful" (too wide) character handling
2330
2331 // include previous careful character(s) if possible, looks nicer (best effort...)
2332 while (text > stp
2333 && srp[text - stp - 1] & RS_Careful
2334 && RS_SAME (rend, srp[text - stp - 1]))
2335 text--, count++, xpixel -= fwidth;
2336
2337 // force redraw after "careful" characters to avoid pixel droppings
2338 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2339 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2340
2341 // force redraw before "careful" characters to avoid pixel droppings
2342 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2343 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2344#endif
2282 } 2345 }
2283 2346
2284 /* 2347 /*
2285 * Actually do the drawing of the string here 2348 * Actually do the drawing of the string here
2286 */ 2349 */
2287 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2288 2351
2289 if (back == fore)
2290 font->clear_rect (*drawable, xpixel, ypixel,
2291 fwidth * count, fheight,
2292 back);
2293 else if (back == Color_bg) 2352 if (have_bg && back == Color_bg)
2294 { 2353 {
2295 if (must_clear) 2354 // this is very ugly, maybe push it into ->draw?
2296 {
2297 CLEAR_CHARS (xpixel, ypixel, count);
2298 2355
2299 for (i = 0; i < count; i++) /* don't draw empty strings */ 2356 for (i = 0; i < count; i++) /* don't draw empty strings */
2300 if (text[i] != ' ') 2357 if (text[i] != ' ')
2301 { 2358 {
2302 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2359 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2303 break; 2360 goto did_clear;
2304 }
2305 } 2361 }
2306 else 2362
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2363 CLEAR_CHARS (xpixel, ypixel, count);
2364 did_clear: ;
2308 } 2365 }
2309 else 2366 else
2310 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2311 2368
2312 if (rend & RS_Uline && font->descent > 1 && fore != back) 2369 if (rend & RS_Uline && font->descent > 1 && fore != back)
2313 { 2370 {
2314#if ENABLE_FRILLS 2371#if ENABLE_FRILLS
2315 if (ISSET_PIXCOLOR (Color_underline)) 2372 if (ISSET_PIXCOLOR (Color_underline))
2316 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2373 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2317 else 2374 else
2318#endif 2375#endif
2319 XSetForeground (display->display, gc, pix_colors[fore]); 2376 XSetForeground (dpy, gc, pix_colors[fore]);
2320 2377
2321 XDrawLine (display->display, drawBuffer, gc, 2378 XDrawLine (dpy, vt, gc,
2322 xpixel, ypixel + font->ascent + 1, 2379 xpixel, ypixel + font->ascent + 1,
2323 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2324 } 2381 }
2325 } /* for (col....) */ 2382 } /* for (col....) */
2326 } /* for (row....) */ 2383 } /* for (row....) */
… …
2335 */ 2392 */
2336 if (showcursor) 2393 if (showcursor)
2337 { 2394 {
2338 if (focus) 2395 if (focus)
2339 { 2396 {
2340 if (OPTION (Opt_cursorUnderline)) 2397 if (option (Opt_cursorUnderline))
2341 *crp ^= RS_Uline; 2398 *crp ^= RS_Uline;
2342 else 2399 else
2343 { 2400 {
2344 *crp ^= RS_RVid; 2401 *crp ^= RS_RVid;
2345#ifndef NO_CURSORCOLOR 2402#ifndef NO_CURSORCOLOR
… …
2359 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2416 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2360 cursorwidth++; 2417 cursorwidth++;
2361 2418
2362#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2363 if (ISSET_PIXCOLOR (Color_cursor)) 2420 if (ISSET_PIXCOLOR (Color_cursor))
2364 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2421 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2422 else
2365#endif 2423#endif
2424 XSetForeground (dpy, gc, pix_colors[ccol1]);
2366 2425
2367 XDrawRectangle (display->display, drawBuffer, gc, 2426 XDrawRectangle (dpy, vt, gc,
2368 Col2Pixel (col), 2427 Col2Pixel (col),
2369 Row2Pixel (oldcursor.row), 2428 Row2Pixel (oldcursor.row),
2370 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2429 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2371 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2430 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2372 } 2431 }
… …
2375 /* 2434 /*
2376 * H: cleanup selection 2435 * H: cleanup selection
2377 */ 2436 */
2378 scr_reverse_selection (); 2437 scr_reverse_selection ();
2379 2438
2380 if (refresh_type & SMOOTH_REFRESH)
2381 XFlush (display->display);
2382
2383 num_scr = 0; 2439 num_scr = 0;
2384 num_scr_allow = 1; 2440 num_scr_allow = 1;
2385} 2441}
2386 2442
2387void 2443void
2388rxvt_term::scr_remap_chars (line_t &l) 2444rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2389{ 2445{
2390 if (!l.t) 2446 if (!l.t)
2391 return; 2447 return;
2392 2448
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant 2449 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2394 2450
2395 for (int i = ncol; i--; ) 2451 for (int i = ncol; i--; )
2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2452 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2397} 2453}
2398 2454
2399void 2455void
2400rxvt_term::scr_remap_chars () 2456rxvt_term::scr_remap_chars () NOTHROW
2401{ 2457{
2402 for (int i = total_rows; i--; ) 2458 for (int i = total_rows; i--; )
2403 scr_remap_chars (row_buf [i]); 2459 scr_remap_chars (row_buf [i]);
2404 2460
2405 for (int i = nrow; i--; ) 2461 for (int i = nrow; i--; )
… …
2408 scr_remap_chars (swap_buf [i]); 2464 scr_remap_chars (swap_buf [i]);
2409 } 2465 }
2410} 2466}
2411 2467
2412void 2468void
2413rxvt_term::scr_recolour () 2469rxvt_term::scr_recolour () NOTHROW
2414{ 2470{
2415 if (1 2471#ifdef HAVE_BG_PIXMAP
2416#if TRANSPARENT 2472 bgPixmap.apply ();
2417 && !am_transparent 2473#else
2418#endif 2474
2419#if XPM_BACKGROUND
2420 && !bgPixmap.pixmap
2421#endif
2422 )
2423 {
2424 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2425 XClearWindow (display->display, parent[0]); 2476 XClearWindow (dpy, parent[0]);
2426 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2427#if HAVE_SCROLLBARS 2478
2428 if (scrollBar.win) 2479 if (scrollBar.win)
2429 { 2480 {
2430 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2431 scrollBar.setIdle (); 2482 scrollBar.setIdle ();
2432 scrollbar_show (0); 2483 scrollbar_show (0);
2433 }
2434#endif
2435 } 2484 }
2436 2485
2437 scr_clear (); 2486 scr_clear ();
2438 scr_touch (true); 2487 scr_touch (true);
2439 want_refresh = 1; 2488 want_refresh = 1;
2440}
2441 2489
2490#endif
2491}
2492
2442/* ------------------------------------------------------------------------- */ 2493/* ------------------------------------------------------------------------- */
2443void 2494void
2444rxvt_term::scr_clear (bool really) 2495rxvt_term::scr_clear (bool really) NOTHROW
2445{ 2496{
2446 if (!mapped) 2497 if (!mapped)
2447 return; 2498 return;
2448 2499
2449 num_scr_allow = 0; 2500 num_scr_allow = 0;
2450 want_refresh = 1; 2501 want_refresh = 1;
2451 2502
2452 if (really) 2503 if (really)
2453 XClearWindow (display->display, vt); 2504 XClearWindow (dpy, vt);
2454} 2505}
2455 2506
2456/* ------------------------------------------------------------------------- */
2457void 2507void
2508rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2509{
2510 int view_end = view_start + nrow;
2511 int row, col;
2512
2513 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2514 {
2515 text_t *stp = ROW(row).t;
2516 rend_t *srp = ROW(row).r;
2517
2518 for (col = beg_col; col < end_col; col++)
2519 srp[col] ^= rstyle1;
2520
2521 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2522 srp[col] ^= rstyle2;
2523
2524 if (++col < end_col)
2525 srp[col] ^= rstyle2;
2526 }
2527}
2528
2529void
2530rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2531{
2532 int view_end = view_start + nrow;
2533 int row, col;
2534
2535 if (beg_row >= view_start)
2536 {
2537 col = beg_col;
2538 row = beg_row;
2539 }
2540 else
2541 {
2542 col = 0;
2543 row = view_start;
2544 }
2545
2546 for (; row < min (end_row, view_end); row++, col = 0)
2547 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2548 srp[col] ^= rstyle;
2549
2550 if (row == end_row)
2551 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2552 srp[col] ^= rstyle;
2553}
2554
2555/* ------------------------------------------------------------------------- */
2556void
2458rxvt_term::scr_reverse_selection () 2557rxvt_term::scr_reverse_selection () NOTHROW
2459{ 2558{
2460 if (selection.op 2559 if (selection.op
2461 && current_screen == selection.screen 2560 && current_screen == selection.screen
2462 && selection.end.row >= -view_start) 2561 && selection.end.row >= view_start)
2463 { 2562 {
2464 int view_end = -view_start + nrow; 2563#if !ENABLE_MINIMAL
2465 int row, col;
2466
2467#if ENABLE_FRILLS
2468 if (selection.rect) 2564 if (selection.rect)
2469 { 2565 scr_xor_rect (selection.beg.row, selection.beg.col,
2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2566 selection.end.row, selection.end.col,
2471 { 2567 RS_RVid, RS_RVid | RS_Uline);
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2474
2475 for (col = selection.beg.col; col < selection.end.col; col++)
2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2484 }
2485 else 2568 else
2486#endif 2569#endif
2487 { 2570 scr_xor_span (selection.beg.row, selection.beg.col,
2488 if (selection.beg.row >= -view_start) 2571 selection.end.row, selection.end.col,
2489 { 2572 RS_RVid);
2490 col = selection.beg.col;
2491 row = selection.beg.row;
2492 }
2493 else
2494 {
2495 col = 0;
2496 row = -view_start;
2497 }
2498
2499 for (; row < min (selection.end.row, view_end); row++, col = 0)
2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2501 srp[col] ^= RS_RVid;
2502
2503 if (row == selection.end.row)
2504 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2505 srp[col] ^= RS_RVid;
2506 }
2507 } 2573 }
2508} 2574}
2509 2575
2510/* ------------------------------------------------------------------------- */ 2576/* ------------------------------------------------------------------------- */
2511/* 2577/*
2512 * Dump the whole scrollback and screen to the passed filedescriptor. The 2578 * Dump the whole scrollback and screen to the passed filedescriptor. The
2513 * invoking routine must close the fd. 2579 * invoking routine must close the fd.
2514 */ 2580 */
2515#if 0 2581#if 0
2516void 2582void
2517rxvt_term::scr_dump (int fd) 2583rxvt_term::scr_dump (int fd) NOTHROW
2518{ 2584{
2519 int row, wrote; 2585 int row, wrote;
2520 unsigned int width, towrite; 2586 unsigned int width, towrite;
2521 char r1[] = "\n"; 2587 char r1[] = "\n";
2522 2588
… …
2541 2607
2542/* ------------------------------------------------------------------------- * 2608/* ------------------------------------------------------------------------- *
2543 * CHARACTER SELECTION * 2609 * CHARACTER SELECTION *
2544 * ------------------------------------------------------------------------- */ 2610 * ------------------------------------------------------------------------- */
2545void 2611void
2546rxvt_term::selection_check (int check_more) 2612rxvt_term::selection_check (int check_more) NOTHROW
2547{ 2613{
2548 row_col_t pos; 2614 row_col_t pos;
2549 2615
2550 if (!selection.op) 2616 if (!selection.op)
2551 return; 2617 return;
2552 2618
2553 pos.row = pos.col = 0; 2619 pos.row = pos.col = 0;
2554 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2620 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2555 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2621 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2556 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2622 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2557 || (check_more == 1 2623 || (check_more == 1
2558 && current_screen == selection.screen 2624 && current_screen == selection.screen
2559 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2625 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2560 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2626 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2561 || (check_more == 2 2627 || (check_more == 2
… …
2572/* ------------------------------------------------------------------------- */ 2638/* ------------------------------------------------------------------------- */
2573/* 2639/*
2574 * Paste a selection direct to the command fd 2640 * Paste a selection direct to the command fd
2575 */ 2641 */
2576void 2642void
2577rxvt_term::paste (char *data, unsigned int len) 2643rxvt_term::paste (char *data, unsigned int len) NOTHROW
2578{ 2644{
2579 /* convert normal newline chars into common keyboard Return key sequence */ 2645 /* convert normal newline chars into common keyboard Return key sequence */
2580 for (unsigned int i = 0; i < len; i++) 2646 for (unsigned int i = 0; i < len; i++)
2581 if (data[i] == C0_LF) 2647 if (data[i] == C0_LF)
2582 data[i] = C0_CR; 2648 data[i] = C0_CR;
2583 2649
2650 if (priv_modes & PrivMode_BracketPaste)
2651 tt_printf ("\e[200~");
2652
2584 tt_write (data, len); 2653 tt_write (data, len);
2654
2655 if (priv_modes & PrivMode_BracketPaste)
2656 tt_printf ("\e[201~");
2585} 2657}
2586 2658
2587/* ------------------------------------------------------------------------- */ 2659/* ------------------------------------------------------------------------- */
2588/* 2660/*
2589 * Respond to a notification that a primary selection has been sent 2661 * Respond to a notification that a primary selection has been sent
2590 * EXT: SelectionNotify 2662 * EXT: SelectionNotify
2591 */ 2663 */
2592void 2664void
2593rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2665rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2594{ 2666{
2595 if (prop == None) /* check for failed XConvertSelection */ 2667 if (prop == None) /* check for failed XConvertSelection */
2596 { 2668 {
2597 if ((selection_type & Sel_CompoundText)) 2669 if ((selection_type & Sel_CompoundText))
2598 { 2670 {
… …
2618 } 2690 }
2619 2691
2620 unsigned long bytes_after; 2692 unsigned long bytes_after;
2621 XTextProperty ct; 2693 XTextProperty ct;
2622 2694
2623 if (XGetWindowProperty (display->display, win, prop, 2695 if (XGetWindowProperty (dpy, win, prop,
2624 0, PROP_SIZE / 4, 2696 0, PROP_SIZE / 4,
2625 delete_prop, AnyPropertyType, 2697 delete_prop, AnyPropertyType,
2626 &ct.encoding, &ct.format, 2698 &ct.encoding, &ct.format,
2627 &ct.nitems, &bytes_after, 2699 &ct.nitems, &bytes_after,
2628 &ct.value) != Success) 2700 &ct.value) != Success)
… …
2637 if (bytes_after) 2709 if (bytes_after)
2638 { 2710 {
2639 // fetch and append remaining data 2711 // fetch and append remaining data
2640 XTextProperty ct2; 2712 XTextProperty ct2;
2641 2713
2642 if (XGetWindowProperty (display->display, win, prop, 2714 if (XGetWindowProperty (dpy, win, prop,
2643 ct.nitems / 4, (bytes_after + 3) / 4, 2715 ct.nitems / 4, (bytes_after + 3) / 4,
2644 delete_prop, AnyPropertyType, 2716 delete_prop, AnyPropertyType,
2645 &ct2.encoding, &ct2.format, 2717 &ct2.encoding, &ct2.format,
2646 &ct2.nitems, &bytes_after, 2718 &ct2.nitems, &bytes_after,
2647 &ct2.value) != Success) 2719 &ct2.value) != Success)
… …
2660 2732
2661 if (ct.encoding == xa[XA_INCR]) 2733 if (ct.encoding == xa[XA_INCR])
2662 { 2734 {
2663 // INCR selection, start handshake 2735 // INCR selection, start handshake
2664 if (!delete_prop) 2736 if (!delete_prop)
2665 XDeleteProperty (display->display, win, prop); 2737 XDeleteProperty (dpy, win, prop);
2666 2738
2667 selection_wait = Sel_incr; 2739 selection_wait = Sel_incr;
2668 incr_buf_fill = 0; 2740 incr_buf_fill = 0;
2669 incr_ev.start (NOW + 10); 2741 incr_ev.start (10);
2670 2742
2671 goto bailout; 2743 goto bailout;
2672 } 2744 }
2673 2745
2674 if (ct.nitems == 0) 2746 if (ct.nitems == 0)
… …
2683 ct.nitems = incr_buf_fill; 2755 ct.nitems = incr_buf_fill;
2684 incr_buf = 0; 2756 incr_buf = 0;
2685 incr_buf_size = 0; 2757 incr_buf_size = 0;
2686 incr_ev.stop (); 2758 incr_ev.stop ();
2687 } 2759 }
2688 else 2760 else
2689 { 2761 {
2690 if (selection_wait == Sel_normal 2762 if (selection_wait == Sel_normal
2691 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2763 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2692 { 2764 {
2693 /* 2765 /*
… …
2700 goto bailout; 2772 goto bailout;
2701 } 2773 }
2702 } 2774 }
2703 else if (selection_wait == Sel_incr) 2775 else if (selection_wait == Sel_incr)
2704 { 2776 {
2705 incr_ev.start (NOW + 10); 2777 incr_ev.start (10);
2706 2778
2707 while (incr_buf_fill + ct.nitems > incr_buf_size) 2779 while (incr_buf_fill + ct.nitems > incr_buf_size)
2708 { 2780 {
2709 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2781 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2710 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2782 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2717 } 2789 }
2718 2790
2719 char **cl; 2791 char **cl;
2720 int cr; 2792 int cr;
2721 2793
2722#if ENABLE_FRILLS 2794#if !ENABLE_MINIMAL
2723 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2795 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2724 // so recode it manually 2796 // so recode it manually
2725 if (ct.encoding == xa[XA_UTF8_STRING]) 2797 if (ct.encoding == xa[XA_UTF8_STRING])
2726 { 2798 {
2727 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2799 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2731 paste (s, strlen (s)); 2803 paste (s, strlen (s));
2732 free (s); 2804 free (s);
2733 } 2805 }
2734 else 2806 else
2735#endif 2807#endif
2736 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2808 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2737 && cl) 2809 && cl)
2738 { 2810 {
2739 for (int i = 0; i < cr; i++) 2811 for (int i = 0; i < cr; i++)
2740 paste (cl[i], strlen (cl[i])); 2812 paste (cl[i], strlen (cl[i]));
2741 2813
… …
2750 if (selection_wait == Sel_normal) 2822 if (selection_wait == Sel_normal)
2751 selection_wait = Sel_none; 2823 selection_wait = Sel_none;
2752} 2824}
2753 2825
2754void 2826void
2755rxvt_term::incr_cb (time_watcher &w) 2827rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2756{ 2828{
2757 selection_wait = Sel_none; 2829 selection_wait = Sel_none;
2758 2830
2759 incr_buf_size = 0; 2831 incr_buf_size = 0;
2760 free (incr_buf); 2832 free (incr_buf);
2761 2833
2762 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2834 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2763} 2835}
2764 2836
2765void 2837void
2766rxvt_term::selection_property (Window win, Atom prop) 2838rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2767{ 2839{
2768 if (prop == None || selection_wait != Sel_incr) 2840 if (prop == None || selection_wait != Sel_incr)
2769 return; 2841 return;
2770 2842
2771 selection_paste (win, prop, true); 2843 selection_paste (win, prop, true);
2772} 2844}
2773 2845
2774/* ------------------------------------------------------------------------- */ 2846/* ------------------------------------------------------------------------- */
2775/* 2847/*
2776 * Request the current selection: 2848 * Request the current selection:
2777 * Order: > internal selection if available 2849 * Order: > internal selection if available
2778 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2850 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2779 * > CUT_BUFFER0 2851 * > CUT_BUFFER0
2780 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2852 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2781 * will auto fallback to CUT_BUFFER0 2853 * will auto fallback to CUT_BUFFER0
2782 * EXT: button 2 release 2854 * EXT: button 2 release
2783 */ 2855 */
2784void 2856void
2785rxvt_term::selection_request (Time tm, int x, int y) 2857rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2786{ 2858{
2787 if (x < 0 || x >= width || y < 0 || y >= height) 2859 if (selection.text && selnum == Sel_Primary)
2788 return; /* outside window */ 2860 {
2789
2790 if (selection.text)
2791 { /* internal selection */ 2861 /* internal selection */
2792 char *str = rxvt_wcstombs (selection.text, selection.len); 2862 char *str = rxvt_wcstombs (selection.text, selection.len);
2793 paste (str, strlen (str)); 2863 paste (str, strlen (str));
2794 free (str); 2864 free (str);
2795 return; 2865 return;
2796 } 2866 }
2797 else 2867 else
2798 { 2868 {
2799 int i;
2800
2801 selection_request_time = tm; 2869 selection_request_time = tm;
2802 selection_wait = Sel_normal; 2870 selection_wait = Sel_normal;
2803 2871
2804 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2805 {
2806#if X_HAVE_UTF8_STRING 2872#if X_HAVE_UTF8_STRING
2807 selection_type = Sel_UTF8String; 2873 selection_type = Sel_UTF8String;
2808 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2874 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2809 return; 2875 return;
2810#else 2876#else
2811 selection_type = Sel_CompoundText; 2877 selection_type = Sel_CompoundText;
2812 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2878 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2813 return; 2879 return;
2814#endif 2880#endif
2815 }
2816 } 2881 }
2817 2882
2818 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2883 selection_wait = Sel_none; /* don't loop in selection_paste () */
2819 selection_paste (display->root, XA_CUT_BUFFER0, false); 2884 selection_paste (display->root, XA_CUT_BUFFER0, false);
2820} 2885}
2821 2886
2822int 2887int
2823rxvt_term::selection_request_other (Atom target, int selnum) 2888rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2824{ 2889{
2825 Atom sel; 2890 Atom sel;
2826 2891
2827 selection_type |= selnum; 2892 selection_type |= selnum;
2828 2893
… …
2831 else if (selnum == Sel_Secondary) 2896 else if (selnum == Sel_Secondary)
2832 sel = XA_SECONDARY; 2897 sel = XA_SECONDARY;
2833 else 2898 else
2834 sel = xa[XA_CLIPBOARD]; 2899 sel = xa[XA_CLIPBOARD];
2835 2900
2836 if (XGetSelectionOwner (display->display, sel) != None) 2901 if (XGetSelectionOwner (dpy, sel) != None)
2837 { 2902 {
2838 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2903 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2839 vt, selection_request_time); 2904 vt, selection_request_time);
2840 return 1; 2905 return 1;
2841 } 2906 }
2842 2907
2843 return 0; 2908 return 0;
… …
2847/* 2912/*
2848 * Clear all selected text 2913 * Clear all selected text
2849 * EXT: SelectionClear 2914 * EXT: SelectionClear
2850 */ 2915 */
2851void 2916void
2852rxvt_term::selection_clear () 2917rxvt_term::selection_clear () NOTHROW
2853{ 2918{
2854 want_refresh = 1; 2919 want_refresh = 1;
2855 free (selection.text); 2920 free (selection.text);
2856 selection.text = NULL; 2921 selection.text = NULL;
2857 selection.len = 0; 2922 selection.len = 0;
… …
2906 2971
2907 int end_col; 2972 int end_col;
2908 2973
2909 for (; row <= selection.end.row; row++, col = 0) 2974 for (; row <= selection.end.row; row++, col = 0)
2910 { 2975 {
2911#if ENABLE_FRILLS 2976#if !ENABLE_MINIMAL
2912 if (selection.rect) 2977 if (selection.rect)
2913 { 2978 {
2914 col = selection.beg.col; 2979 col = selection.beg.col;
2915 end_col = ncol + 1; 2980 end_col = ncol + 1;
2916 } 2981 }
… …
2919 end_col = ROW(row).l; 2984 end_col = ROW(row).l;
2920 2985
2921 col = max (col, 0); 2986 col = max (col, 0);
2922 2987
2923 if (row == selection.end.row 2988 if (row == selection.end.row
2924#if ENABLE_FRILLS 2989#if !ENABLE_MINIMAL
2925 || selection.rect 2990 || selection.rect
2926#endif 2991#endif
2927 ) 2992 )
2928 min_it (end_col, selection.end.col); 2993 min_it (end_col, selection.end.col);
2929 2994
… …
2952#endif 3017#endif
2953 else 3018 else
2954 new_selection_text[ofs++] = *t++; 3019 new_selection_text[ofs++] = *t++;
2955 } 3020 }
2956 3021
2957#if ENABLE_FRILLS 3022#if !ENABLE_MINIMAL
2958 if (selection.rect) 3023 if (selection.rect)
2959 { 3024 {
2960 while (ofs 3025 while (ofs
2961 && new_selection_text[ofs - 1] != C0_LF 3026 && new_selection_text[ofs - 1] != C0_LF
2962 && unicode::is_space (new_selection_text[ofs - 1])) 3027 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2992 3057
2993 selection_grab (tm); 3058 selection_grab (tm);
2994} 3059}
2995 3060
2996bool 3061bool
2997rxvt_term::selection_grab (Time tm) 3062rxvt_term::selection_grab (Time tm) NOTHROW
2998{ 3063{
2999 selection_time = tm; 3064 selection_time = tm;
3000 3065
3001 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3066 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
3002 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3067 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3003 { 3068 {
3004 display->set_selection_owner (this); 3069 display->set_selection_owner (this);
3005 return true; 3070 return true;
3006 } 3071 }
3007 else 3072 else
3073 {
3074 selection_clear ();
3008 return false; 3075 return false;
3076 }
3009 3077
3010#if 0 3078#if 0
3011 XTextProperty ct; 3079 XTextProperty ct;
3012 3080
3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3081 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3014 { 3082 {
3015 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3083 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3016 XFree (ct.value); 3084 XFree (ct.value);
3017 } 3085 }
3018#endif 3086#endif
… …
3022/* 3090/*
3023 * Mark or select text based upon number of clicks: 1, 2, or 3 3091 * Mark or select text based upon number of clicks: 1, 2, or 3
3024 * EXT: button 1 press 3092 * EXT: button 1 press
3025 */ 3093 */
3026void 3094void
3027rxvt_term::selection_click (int clicks, int x, int y) 3095rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3028{ 3096{
3029 clicks = ((clicks - 1) % 3) + 1; 3097 clicks = ((clicks - 1) % 3) + 1;
3030 selection.clicks = clicks; /* save clicks so extend will work */ 3098 selection.clicks = clicks; /* save clicks so extend will work */
3031 3099
3100 if (clicks == 2 && !selection.rect
3101 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3102 {
3103 MEvent.clicks = 1; // what a mess
3104 selection.screen = current_screen;
3105 selection.op = SELECTION_CONT;
3106 return;
3107 }
3108
3032 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3109 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3033 3110
3034 if (clicks == 2 || clicks == 3) 3111 if (clicks == 2 || clicks == 3)
3035 selection_extend_colrow (selection.mark.col, 3112 selection_extend_colrow (selection.mark.col,
3036 selection.mark.row + view_start, 3113 selection.mark.row - view_start,
3037 0, /* button 3 */ 3114 0, /* button 3 */
3038 1, /* button press */ 3115 1, /* button press */
3039 0); /* click change */ 3116 0); /* click change */
3040} 3117}
3041 3118
3042/* ------------------------------------------------------------------------- */ 3119/* ------------------------------------------------------------------------- */
3043/* 3120/*
3044 * Mark a selection at the specified col/row 3121 * Mark a selection at the specified col/row
3045 */ 3122 */
3046void 3123void
3047rxvt_term::selection_start_colrow (int col, int row) 3124rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3048{ 3125{
3049 want_refresh = 1; 3126 want_refresh = 1;
3050 3127
3051 selection.mark.row = row - view_start; 3128 selection.mark.row = row + view_start;
3052 selection.mark.col = col; 3129 selection.mark.col = col;
3053 3130
3054 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3131 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3055 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3132 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3056 3133
3057 while (selection.mark.col > 0 3134 while (selection.mark.col > 0
3058 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3135 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3059 --selection.mark.col; 3136 --selection.mark.col;
3060 3137
3061 if (selection.op) 3138 if (selection.op)
3139 {
3062 { /* clear the old selection */ 3140 /* clear the old selection */
3063 selection.beg.row = selection.end.row = selection.mark.row; 3141 selection.beg.row = selection.end.row = selection.mark.row;
3064 selection.beg.col = selection.end.col = selection.mark.col; 3142 selection.beg.col = selection.end.col = selection.mark.col;
3065 } 3143 }
3066 3144
3067 selection.op = SELECTION_INIT; 3145 selection.op = SELECTION_INIT;
… …
3078#define DELIMIT_TEXT(x) \ 3156#define DELIMIT_TEXT(x) \
3079 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3157 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3080#define DELIMIT_REND(x) 1 3158#define DELIMIT_REND(x) 1
3081 3159
3082void 3160void
3083rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3161rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3084{ 3162{
3085 int col, row, dirnadd, tcol, trow, w1, w2; 3163 int col, row, dirnadd, tcol, trow, w1, w2;
3086 row_col_t bound; 3164 row_col_t bound;
3087 text_t *stp; 3165 text_t *stp;
3088 rend_t *srp; 3166 rend_t *srp;
3089 3167
3090 if (dirn == UP) 3168 if (dirn == UP)
3091 { 3169 {
3092 bound.row = - nsaved - 1; 3170 bound.row = top_row - 1;
3093 bound.col = 0; 3171 bound.col = 0;
3094 dirnadd = -1; 3172 dirnadd = -1;
3095 } 3173 }
3096 else 3174 else
3097 { 3175 {
… …
3162 * flag == 0 ==> button 1 3240 * flag == 0 ==> button 1
3163 * flag == 1 ==> button 3 press 3241 * flag == 1 ==> button 3 press
3164 * flag == 2 ==> button 3 motion 3242 * flag == 2 ==> button 3 motion
3165 */ 3243 */
3166void 3244void
3167rxvt_term::selection_extend (int x, int y, int flag) 3245rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3168{ 3246{
3169 int col = clamp (Pixel2Col (x), 0, ncol); 3247 int col = clamp (Pixel2Col (x), 0, ncol);
3170 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3248 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3171 3249
3172 /* 3250 /*
… …
3175 * select nothing. Otherwise, if we're to the right of the mark, you have to 3253 * select nothing. Otherwise, if we're to the right of the mark, you have to
3176 * be _past_ a character for it to be selected. 3254 * be _past_ a character for it to be selected.
3177 */ 3255 */
3178 if (((selection.clicks % 3) == 1) && !flag 3256 if (((selection.clicks % 3) == 1) && !flag
3179 && (col == selection.mark.col 3257 && (col == selection.mark.col
3180 && (row == selection.mark.row + view_start))) 3258 && (row == selection.mark.row - view_start)))
3181 { 3259 {
3182 /* select nothing */ 3260 /* select nothing */
3183 selection.beg.row = selection.end.row = 0; 3261 selection.beg.row = selection.end.row = 0;
3184 selection.beg.col = selection.end.col = 0; 3262 selection.beg.col = selection.end.col = 0;
3185 selection.clicks = 4; 3263 selection.clicks = 4;
… …
3198/* ------------------------------------------------------------------------- */ 3276/* ------------------------------------------------------------------------- */
3199/* 3277/*
3200 * Extend the selection to the specified col/row 3278 * Extend the selection to the specified col/row
3201 */ 3279 */
3202void 3280void
3203rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3281rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3204{ 3282{
3205 row_col_t pos; 3283 row_col_t pos;
3206 enum { 3284 enum {
3207 LEFT, RIGHT 3285 LEFT, RIGHT
3208 } closeto = RIGHT; 3286 } closeto = RIGHT;
… …
3240 selection.beg.col = selection.end.col = selection.mark.col; 3318 selection.beg.col = selection.end.col = selection.mark.col;
3241 selection.beg.row = selection.end.row = selection.mark.row; 3319 selection.beg.row = selection.end.row = selection.mark.row;
3242 } 3320 }
3243 3321
3244 pos.col = col; 3322 pos.col = col;
3245 pos.row = row - view_start; 3323 pos.row = view_start + row;
3246 3324
3247 /* 3325 /*
3248 * This is mainly xterm style selection with a couple of differences, mainly 3326 * This is mainly xterm style selection with a couple of differences, mainly
3249 * in the way button3 drag extension works. 3327 * in the way button3 drag extension works.
3250 * We're either doing: button1 drag; button3 press; or button3 drag 3328 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3256 * a point/word/line which is either the start or end of the selection 3334 * a point/word/line which is either the start or end of the selection
3257 * and it was decided by whichever point/word/line was `fixed' at the 3335 * and it was decided by whichever point/word/line was `fixed' at the
3258 * time of the most recent button3 press 3336 * time of the most recent button3 press
3259 */ 3337 */
3260 if (button3 && buttonpress) 3338 if (button3 && buttonpress)
3339 {
3261 { /* button3 press */ 3340 /* button3 press */
3262 /* 3341 /*
3263 * first determine which edge of the selection we are closest to 3342 * first determine which edge of the selection we are closest to
3264 */ 3343 */
3265 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3344 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3266 || (!ROWCOL_IS_AFTER (pos, selection.end) 3345 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3284 selection.mark.row = selection.beg.row; 3363 selection.mark.row = selection.beg.row;
3285 selection.mark.col = selection.beg.col; 3364 selection.mark.col = selection.beg.col;
3286 } 3365 }
3287 } 3366 }
3288 else 3367 else
3368 {
3289 { /* button1 drag or button3 drag */ 3369 /* button1 drag or button3 drag */
3290 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3370 if (ROWCOL_IS_AFTER (selection.mark, pos))
3291 { 3371 {
3292 if (selection.mark.row == selection.end.row 3372 if (selection.mark.row == selection.end.row
3293 && selection.mark.col == selection.end.col 3373 && selection.mark.col == selection.end.col
3294 && clickchange 3374 && clickchange
… …
3311 3391
3312 if (selection.clicks == 1) 3392 if (selection.clicks == 1)
3313 { 3393 {
3314 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3394 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3315 && !ROW(selection.beg.row).is_longer () 3395 && !ROW(selection.beg.row).is_longer ()
3316#if ENABLE_FRILLS 3396#if !ENABLE_MINIMAL
3317 && !selection.rect 3397 && !selection.rect
3318#endif 3398#endif
3319 ) 3399 )
3320 selection.beg.col = ncol; 3400 selection.beg.col = ncol;
3321 3401
3322 if ( 3402 if (
3323 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3403 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3324 && !ROW(selection.end.row).is_longer () 3404 && !ROW(selection.end.row).is_longer ()
3325#if ENABLE_FRILLS 3405#if !ENABLE_MINIMAL
3326 && !selection.rect 3406 && !selection.rect
3327#endif 3407#endif
3328 ) 3408 )
3329 selection.end.col = ncol; 3409 selection.end.col = ncol;
3330 } 3410 }
3331 else if (selection.clicks == 2) 3411 else if (selection.clicks == 2)
3332 { 3412 {
3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3413 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334 selection.end.col--; 3414 selection.end.col--;
3335 3415
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3338 selection_delimit_word (UP, &selection.beg, &selection.beg); 3416 selection_delimit_word (UP, &selection.beg, &selection.beg);
3339 selection_delimit_word (DN, &selection.end, &selection.end); 3417 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3341 } 3418 }
3342 else if (selection.clicks == 3) 3419 else if (selection.clicks == 3)
3343 { 3420 {
3344#if ENABLE_FRILLS 3421#if ENABLE_FRILLS
3345 if (OPTION (Opt_tripleclickwords)) 3422 if (option (Opt_tripleclickwords))
3346 { 3423 {
3347 selection_delimit_word (UP, &selection.beg, &selection.beg); 3424 selection_delimit_word (UP, &selection.beg, &selection.beg);
3348 3425
3349 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3426 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3350 { 3427 {
3351 if (!ROW(end_row).is_longer ()) 3428 if (!ROW(end_row).is_longer ())
3352 { 3429 {
3353 selection.end.row = end_row; 3430 selection.end.row = end_row;
3354 selection.end.col = ROW(end_row).l; 3431 selection.end.col = ROW(end_row).l;
3432# if !ENABLE_MINIMAL
3355 selection_remove_trailing_spaces (); 3433 selection_remove_trailing_spaces ();
3434# endif
3356 break; 3435 break;
3357 } 3436 }
3358 } 3437 }
3359 } 3438 }
3360 else 3439 else
… …
3376 selection.end.row++; 3455 selection.end.row++;
3377 } 3456 }
3378 } 3457 }
3379 3458
3380 if (button3 && buttonpress) 3459 if (button3 && buttonpress)
3460 {
3381 { /* mark may need to be changed */ 3461 /* mark may need to be changed */
3382 if (closeto == LEFT) 3462 if (closeto == LEFT)
3383 { 3463 {
3384 selection.mark.row = selection.end.row; 3464 selection.mark.row = selection.end.row;
3385 selection.mark.col = selection.end.col - (selection.clicks == 2); 3465 selection.mark.col = selection.end.col - (selection.clicks == 2);
3386 } 3466 }
… …
3389 selection.mark.row = selection.beg.row; 3469 selection.mark.row = selection.beg.row;
3390 selection.mark.col = selection.beg.col; 3470 selection.mark.col = selection.beg.col;
3391 } 3471 }
3392 } 3472 }
3393 3473
3394#if ENABLE_FRILLS 3474#if !ENABLE_MINIMAL
3395 if (selection.rect && selection.beg.col > selection.end.col) 3475 if (selection.rect && selection.beg.col > selection.end.col)
3396 ::swap (selection.beg.col, selection.end.col); 3476 ::swap (selection.beg.col, selection.end.col);
3397#endif 3477#endif
3398} 3478}
3399 3479
3400#if ENABLE_FRILLS 3480#if !ENABLE_MINIMAL
3401void 3481void
3402rxvt_term::selection_remove_trailing_spaces () 3482rxvt_term::selection_remove_trailing_spaces () NOTHROW
3403{ 3483{
3404 int32_t end_col, end_row; 3484 int32_t end_col, end_row;
3405 text_t *stp; 3485 text_t *stp;
3406 3486
3407 end_col = selection.end.col; 3487 end_col = selection.end.col;
… …
3445/* 3525/*
3446 * Double click on button 3 when already selected 3526 * Double click on button 3 when already selected
3447 * EXT: button 3 double click 3527 * EXT: button 3 double click
3448 */ 3528 */
3449void 3529void
3450rxvt_term::selection_rotate (int x, int y) 3530rxvt_term::selection_rotate (int x, int y) NOTHROW
3451{ 3531{
3452 selection.clicks = selection.clicks % 3 + 1; 3532 selection.clicks = selection.clicks % 3 + 1;
3453 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3533 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3454} 3534}
3455 3535
… …
3457/* 3537/*
3458 * Respond to a request for our current selection 3538 * Respond to a request for our current selection
3459 * EXT: SelectionRequest 3539 * EXT: SelectionRequest
3460 */ 3540 */
3461void 3541void
3462rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3542rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3463{ 3543{
3464 XSelectionEvent ev; 3544 XSelectionEvent ev;
3465 dDisp;
3466 3545
3467 ev.type = SelectionNotify; 3546 ev.type = SelectionNotify;
3468 ev.property = None; 3547 ev.property = None;
3469 ev.display = rq.display; 3548 ev.display = rq.display;
3470 ev.requestor = rq.requestor; 3549 ev.requestor = rq.requestor;
… …
3484 *target++ = xa[XA_COMPOUND_TEXT]; 3563 *target++ = xa[XA_COMPOUND_TEXT];
3485#if X_HAVE_UTF8_STRING 3564#if X_HAVE_UTF8_STRING
3486 *target++ = xa[XA_UTF8_STRING]; 3565 *target++ = xa[XA_UTF8_STRING];
3487#endif 3566#endif
3488 3567
3489 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3568 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3490 32, PropModeReplace, 3569 32, PropModeReplace,
3491 (unsigned char *)target_list, target - target_list); 3570 (unsigned char *)target_list, target - target_list);
3492 ev.property = rq.property; 3571 ev.property = rq.property;
3493 } 3572 }
3494#if TODO // TODO 3573#if TODO // TODO
… …
3497 /* TODO: Handle MULTIPLE */ 3576 /* TODO: Handle MULTIPLE */
3498 } 3577 }
3499#endif 3578#endif
3500 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3579 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3501 { 3580 {
3502 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3581 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3503 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3582 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3504 ev.property = rq.property; 3583 ev.property = rq.property;
3505 } 3584 }
3506 else if (rq.target == XA_STRING 3585 else if (rq.target == XA_STRING
3507 || rq.target == xa[XA_TEXT] 3586 || rq.target == xa[XA_TEXT]
… …
3531 style = enc_string; 3610 style = enc_string;
3532 else if (target == xa[XA_TEXT]) 3611 else if (target == xa[XA_TEXT])
3533 style = enc_text; 3612 style = enc_text;
3534 else if (target == xa[XA_COMPOUND_TEXT]) 3613 else if (target == xa[XA_COMPOUND_TEXT])
3535 style = enc_compound_text; 3614 style = enc_compound_text;
3536#if ENABLE_FRILLS 3615#if !ENABLE_MINIMAL
3537 else if (target == xa[XA_UTF8_STRING]) 3616 else if (target == xa[XA_UTF8_STRING])
3538 style = enc_utf8; 3617 style = enc_utf8;
3539#endif 3618#endif
3540 else 3619 else
3541 { 3620 {
… …
3552 { 3631 {
3553 cl = L""; 3632 cl = L"";
3554 selectlen = 0; 3633 selectlen = 0;
3555 } 3634 }
3556 3635
3557#if ENABLE_FRILLS 3636#if !ENABLE_MINIMAL
3558 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3637 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3559 // so recode it manually 3638 // so recode it manually
3560 if (style == enc_utf8) 3639 if (style == enc_utf8)
3561 { 3640 {
3562 freect = 1; 3641 freect = 1;
… …
3565 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3644 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3566 ct.nitems = strlen ((char *)ct.value); 3645 ct.nitems = strlen ((char *)ct.value);
3567 } 3646 }
3568 else 3647 else
3569#endif 3648#endif
3570 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3649 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3571 freect = 1; 3650 freect = 1;
3572 else 3651 else
3573 { 3652 {
3574 /* if we failed to convert then send it raw */ 3653 /* if we failed to convert then send it raw */
3575 ct.value = (unsigned char *)cl; 3654 ct.value = (unsigned char *)cl;
3576 ct.nitems = selectlen; 3655 ct.nitems = selectlen;
3577 ct.encoding = target; 3656 ct.encoding = target;
3578 } 3657 }
3579 3658
3580 XChangeProperty (disp, rq.requestor, rq.property, 3659 XChangeProperty (dpy, rq.requestor, rq.property,
3581 ct.encoding, 8, PropModeReplace, 3660 ct.encoding, 8, PropModeReplace,
3582 ct.value, (int)ct.nitems); 3661 ct.value, (int)ct.nitems);
3583 ev.property = rq.property; 3662 ev.property = rq.property;
3584 3663
3585 if (freect) 3664 if (freect)
3586 XFree (ct.value); 3665 XFree (ct.value);
3587 } 3666 }
3588 3667
3589 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3668 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3590}
3591
3592/* ------------------------------------------------------------------------- *
3593 * MOUSE ROUTINES *
3594 * ------------------------------------------------------------------------- */
3595
3596/*
3597 * return col/row values corresponding to x/y pixel values
3598 */
3599void
3600rxvt_term::pixel_position (int *x, int *y)
3601{
3602 *x = Pixel2Col (*x);
3603 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3604 *y = Pixel2Row (*y);
3605 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3606} 3669}
3607 3670
3608/* ------------------------------------------------------------------------- */ 3671/* ------------------------------------------------------------------------- */
3609#ifdef USE_XIM 3672#ifdef USE_XIM
3610void 3673void
3611rxvt_term::im_set_position (XPoint &pos) 3674rxvt_term::im_set_position (XPoint &pos) NOTHROW
3612{ 3675{
3613 XWindowAttributes xwa; 3676 XWindowAttributes xwa;
3614 3677
3615 XGetWindowAttributes (display->display, vt, &xwa); 3678 XGetWindowAttributes (dpy, vt, &xwa);
3616 3679
3617 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3680 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3618 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3681 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3619} 3682}
3620#endif 3683#endif
3621 3684
3622#if ENABLE_OVERLAY 3685#if ENABLE_OVERLAY
3623void 3686void
3624rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3687rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3625{ 3688{
3626 if (nrow < 1 || ncol < 1) 3689 if (nrow < 1 || ncol < 1)
3627 return; 3690 return;
3628 3691
3629 want_refresh = 1; 3692 want_refresh = 1;
… …
3674 *rp = r; 3737 *rp = r;
3675 } 3738 }
3676} 3739}
3677 3740
3678void 3741void
3679rxvt_term::scr_overlay_off () 3742rxvt_term::scr_overlay_off () NOTHROW
3680{ 3743{
3681 if (!ov_text) 3744 if (!ov_text)
3682 return; 3745 return;
3683 3746
3684 want_refresh = 1; 3747 want_refresh = 1;
… …
3692 delete [] ov_text; ov_text = 0; 3755 delete [] ov_text; ov_text = 0;
3693 delete [] ov_rend; ov_rend = 0; 3756 delete [] ov_rend; ov_rend = 0;
3694} 3757}
3695 3758
3696void 3759void
3697rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3760rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3698{ 3761{
3699 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3762 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3700 return; 3763 return;
3701 3764
3702 x++, y++; 3765 x++, y++;
… …
3704 ov_text[y][x] = text; 3767 ov_text[y][x] = text;
3705 ov_rend[y][x] = rend; 3768 ov_rend[y][x] = rend;
3706} 3769}
3707 3770
3708void 3771void
3709rxvt_term::scr_overlay_set (int x, int y, const char *s) 3772rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3710{ 3773{
3711 while (*s) 3774 while (*s)
3712 scr_overlay_set (x++, y, *s++); 3775 scr_overlay_set (x++, y, *s++);
3713} 3776}
3714 3777
3715void 3778void
3716rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3779rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3717{ 3780{
3718 while (*s) 3781 while (*s)
3719 { 3782 {
3720 text_t t = *s++; 3783 text_t t = *s++;
3721 int width = wcwidth (t); 3784 int width = WCWIDTH (t);
3722 3785
3723 while (width--) 3786 while (width--)
3724 { 3787 {
3725 scr_overlay_set (x++, y, t); 3788 scr_overlay_set (x++, y, t);
3726 t = NOCHAR; 3789 t = NOCHAR;
3727 } 3790 }
3728 } 3791 }
3729} 3792}
3730 3793
3731void 3794void
3732rxvt_term::scr_swap_overlay () 3795rxvt_term::scr_swap_overlay () NOTHROW
3733{ 3796{
3734 if (!ov_text) 3797 if (!ov_text)
3735 return; 3798 return;
3736 3799
3737 // swap screen mem with overlay 3800 // swap screen mem with overlay
3738 for (int y = ov_h; y--; ) 3801 for (int y = ov_h; y--; )
3739 { 3802 {
3740 text_t *t1 = ov_text[y]; 3803 text_t *t1 = ov_text[y];
3741 rend_t *r1 = ov_rend[y]; 3804 rend_t *r1 = ov_rend[y];
3742 3805
3743 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3806 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3744 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3807 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3745 3808
3746 for (int x = ov_w; x--; ) 3809 for (int x = ov_w; x--; )
3747 { 3810 {
3748 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3811 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3749 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3812 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

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