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.215 by root, Sun Jan 8 06:35:23 2006 UTC vs.
Revision 1.305 by ayin, Thu Feb 21 10:30:24 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);
150 146
151 l.l = 0; 147 l.l = 0;
152 l.f = 0; 148 l.f = 0;
… …
161{ 157{
162#if ENABLE_OVERLAY 158#if ENABLE_OVERLAY
163 scr_overlay_off (); 159 scr_overlay_off ();
164#endif 160#endif
165 161
162 rvideo_mode = false;
166 view_start = 0; 163 view_start = 0;
167 num_scr = 0; 164 num_scr = 0;
168 165
169 if (ncol == 0) 166 if (ncol == 0)
170 ncol = 80; 167 ncol = 80;
… …
173 nrow = 24; 170 nrow = 24;
174 171
175 if (ncol == prev_ncol && nrow == prev_nrow) 172 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 173 return;
177 174
175 if (current_screen != PRIMARY)
176 scr_swap_screen ();
177
178 // we need at least two lines for wrapping to work correctly 178 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 179 while (nrow + saveLines < 2)
180 { 180 {
181 //TODO//FIXME 181 //TODO//FIXME
182 saveLines++; 182 saveLines++;
183 prev_nrow--; 183 prev_nrow--;
184 nsaved++; 184 top_row--;
185 } 185 }
186 186
187 want_refresh = 1; 187 want_refresh = 1;
188 188
189 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
194 194
195 if (!row_buf) 195 if (!row_buf)
196 { 196 {
197 /* 197 /*
198 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
199 * Note: this is still needed so that all the scrollback lines are NULL
200 */ 199 */
201 nsaved = 0; /* no saved lines */ 200 top_row = 0;
202 term_start = 0; 201 term_start = 0;
203 202
204 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
205 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
206 205
207 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
208 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 209
212 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
213 { 211 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
236 selection.text = NULL; 234 selection.text = NULL;
237 selection.len = 0; 235 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
240 selection.clicks = 0; 238 selection.clicks = 0;
241 CLEAR_ALL_SELECTION ();
242 rvideo = 0;
243 } 239 }
244 else 240 else
245 { 241 {
246 /* 242 /*
247 * add or delete rows as appropriate 243 * add or delete rows as appropriate
… …
260 } 256 }
261 } 257 }
262#endif 258#endif
263 259
264 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));
265 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
266 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));
267 262
268 for (int row = min (nrow, prev_nrow); row--; ) 263 for (int row = min (nrow, prev_nrow); row--; )
269 { 264 {
270 lresize (drawn_buf[row]); 265 lresize (drawn_buf[row]);
… …
275 { 270 {
276 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);
277 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);
278 } 273 }
279 274
275 line_t *old_buf = row_buf;
280 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));
281 277
282 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
283 int pend = MOD (term_start - nsaved , prev_total_rows); 279 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 280 int q = total_rows; // rewrapped row
285 281
286 if (nsaved) 282 if (top_row)
287 { 283 {
288 // 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
289 // to come up with a lean and mean algorithm. 285 // to come up with a lean and mean algorithm.
290 286
291 row_col_t ocur = screen.cur; 287 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 288 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 289
… …
327 qline->l = ncol; 323 qline->l = ncol;
328 qline->is_longer (1); 324 qline->is_longer (1);
329 325
330 int qcol = 0; 326 int qcol = 0;
331 327
328 // see below for cursor adjustment rationale
329 if (p == ocur.row)
330 screen.cur.row = q - (total_rows - nrow);
331
332 // fill a single destination line 332 // fill a single destination line
333 while (lofs < llen && qcol < ncol) 333 while (lofs < llen && qcol < ncol)
334 { 334 {
335 int prow = lofs / prev_ncol; 335 int prow = lofs / prev_ncol;
336 int pcol = lofs % prev_ncol; 336 int pcol = lofs % prev_ncol;
… …
346 346
347 line_t &pline = old_buf [prow]; 347 line_t &pline = old_buf [prow];
348 348
349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
350 350
351 assert (len);
352 assert (pline.t);
353
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
356 353
357 lofs += len; 354 lofs += len;
358 qcol += len; 355 qcol += len;
… …
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
365 } 362 }
366 while (p != pend && q > 0); 363 while (p != pend && q > 0);
367 364
368 term_start = total_rows - nrow; 365 term_start = total_rows - nrow;
369 nsaved = term_start - q; 366 top_row = q - term_start;
370 367
371 // make sure all terminal lines exist 368 // make sure all terminal lines exist
372 while (nsaved < 0) 369 while (top_row > 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 370 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
374 } 371 }
375 else 372 else
376 { 373 {
377 // if no scrollback exists (yet), wing, instead of wrap 374 // if no scrollback exists (yet), wing, instead of wrap
378 375
379 for (int row = min (nrow, prev_nrow); row--; ) 376 for (int row = min (nrow, prev_nrow); row--; )
380 { 377 {
381 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)];
382 line_t &qline = row_buf [row]; 379 line_t &qline = row_buf [row];
383 380
… …
391 } 388 }
392 389
393 term_start = 0; 390 term_start = 0;
394 } 391 }
395 392
396#ifdef DEBUG_STRICT //TODO: remove
397 for (int i = -nsaved; i < nrow; i++)
398 assert (ROW (i).t);
399#endif
400
401 free (old_buf); 393 free (old_buf);
402 delete old_ta; 394 delete old_ta;
403 delete old_ra; 395 delete old_ra;
404 396
405 clamp_it (screen.cur.row, 0, nrow - 1); 397 clamp_it (screen.cur.row, 0, nrow - 1);
406 clamp_it (screen.cur.col, 0, ncol - 1); 398 clamp_it (screen.cur.col, 0, ncol - 1);
407 399
408 if (tabs)
409 free (tabs); 400 free (tabs);
410 } 401 }
402
403 CLEAR_ALL_SELECTION ();
411 404
412 prev_nrow = nrow; 405 prev_nrow = nrow;
413 prev_ncol = ncol; 406 prev_ncol = ncol;
414 407
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 408 tabs = (char *)rxvt_malloc (ncol);
416 409
417 for (int col = ncol; col--; ) 410 for (int col = ncol; --col; )
418 tabs [col] = col % TABSIZE == 0; 411 tabs [col] = col % TABSIZE == 0;
419 412
413 if (current_screen != PRIMARY)
414 scr_swap_screen ();
415
420 tt_winch (); 416 tt_winch ();
421 417
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 418 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 419}
424 420
425/* ------------------------------------------------------------------------- */ 421/* ------------------------------------------------------------------------- */
426/* 422/*
427 * Free everything. That way malloc debugging can find leakage. 423 * Free everything. That way malloc debugging can find leakage.
428 */ 424 */
429void 425void
430rxvt_term::scr_release () 426rxvt_term::scr_release () NOTHROW
431{ 427{
428 if (row_buf)
429 {
432 delete talloc; talloc = 0; 430 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 431 delete ralloc; ralloc = 0;
434 432
435 free (row_buf); 433 free (row_buf);
436 free (swap_buf); 434 free (swap_buf);
437 free (drawn_buf); 435 free (drawn_buf);
438 free (temp_buf);
439 free (tabs); 436 free (tabs);
440 437
441 row_buf = 0; // signal that we freed all the arrays 438 row_buf = 0; // signal that we freed all the arrays
439 }
442} 440}
443 441
444/* ------------------------------------------------------------------------- */ 442/* ------------------------------------------------------------------------- */
445/* 443/*
446 * Hard reset 444 * Hard reset
… …
451 scr_release (); 449 scr_release ();
452 prev_nrow = prev_ncol = 0; 450 prev_nrow = prev_ncol = 0;
453 scr_reset (); 451 scr_reset ();
454 452
455 scr_clear (true); 453 scr_clear (true);
456 scr_refresh (SLOW_REFRESH); 454 scr_refresh ();
457} 455}
458 456
459/* ------------------------------------------------------------------------- * 457/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 458 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 459 * ------------------------------------------------------------------------- */
… …
463 * Save and Restore cursor 461 * Save and Restore cursor
464 * XTERM_SEQ: Save cursor : ESC 7 462 * XTERM_SEQ: Save cursor : ESC 7
465 * XTERM_SEQ: Restore cursor: ESC 8 463 * XTERM_SEQ: Restore cursor: ESC 8
466 */ 464 */
467void 465void
468rxvt_term::scr_cursor (int mode) 466rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
469{ 467{
470 screen_t *s; 468 screen_t *s;
471 469
472#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 470#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
473 if (current_screen == SECONDARY) 471 if (current_screen == SECONDARY)
… …
505 assert (s->cur.row >= 0); 503 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 504 assert (s->cur.col >= 0);
507#endif 505#endif
508} 506}
509 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
510/* ------------------------------------------------------------------------- */ 523/* ------------------------------------------------------------------------- */
511/* 524/*
512 * Swap between primary and secondary screens 525 * Swap between primary and secondary screens
513 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 526 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
514 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 527 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
515 */ 528 */
516int 529void
517rxvt_term::scr_change_screen (int scrn) 530rxvt_term::scr_change_screen (int scrn)
518{ 531{
532 if (scrn == current_screen)
533 return;
534
519 want_refresh = 1; 535 want_refresh = 1;
520 view_start = 0; 536 view_start = 0;
521 537
522 if (current_screen == scrn)
523 return scrn;
524
525 selection_check (2); /* check for boundary cross */ 538 selection_check (2); /* check for boundary cross */
526 539
527 int i = current_screen; current_screen = scrn; scrn = i; 540 int i = current_screen; current_screen = scrn; scrn = i;
528 541
529 ::swap (screen.cur.row, swap.cur.row);
530 ::swap (screen.cur.col, swap.cur.col);
531
532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
534
535#if NSCREENS 542#if NSCREENS
536 if (OPTION (Opt_secondaryScreen)) 543 if (option (Opt_secondaryScreen))
537 { 544 {
538 num_scr = 0; 545 num_scr = 0;
539 546
540 for (int i = prev_nrow; i--; ) 547 scr_swap_screen ();
541 ::swap (ROW(i), swap_buf [i]);
542 548
543 ::swap (screen.charset, swap.charset); 549 ::swap (screen.charset, swap.charset);
544 ::swap (screen.flags, swap.flags); 550 ::swap (screen.flags, swap.flags);
545 screen.flags |= Screen_VisibleCursor; 551 screen.flags |= Screen_VisibleCursor;
546 swap.flags |= Screen_VisibleCursor; 552 swap.flags |= Screen_VisibleCursor;
547 } 553 }
548 else 554 else
549#endif 555#endif
550 if (OPTION (Opt_secondaryScroll)) 556 if (option (Opt_secondaryScroll))
551 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 557 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
552
553 return scrn;
554} 558}
555 559
556// clear WrapNext indicator, solidifying position on next line 560// clear WrapNext indicator, solidifying position on next line
557void 561void
558rxvt_term::scr_do_wrap () 562rxvt_term::scr_do_wrap () NOTHROW
559{ 563{
560 if (!(screen.flags & Screen_WrapNext)) 564 if (!(screen.flags & Screen_WrapNext))
561 return; 565 return;
562 566
563 screen.flags &= ~Screen_WrapNext; 567 screen.flags &= ~Screen_WrapNext;
… …
573/* ------------------------------------------------------------------------- */ 577/* ------------------------------------------------------------------------- */
574/* 578/*
575 * Change the colour for following text 579 * Change the colour for following text
576 */ 580 */
577void 581void
578rxvt_term::scr_color (unsigned int color, int fgbg) 582rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
579{ 583{
580 if (color > maxTermCOLOR) 584 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
581 color = fgbg; 585 color = fgbg;
582 586
583 if (fgbg == Color_fg) 587 if (fgbg == Color_fg)
584 rstyle = SET_FGCOLOR (rstyle, color); 588 rstyle = SET_FGCOLOR (rstyle, color);
585 else 589 else
… …
589/* ------------------------------------------------------------------------- */ 593/* ------------------------------------------------------------------------- */
590/* 594/*
591 * Change the rendition style for following text 595 * Change the rendition style for following text
592 */ 596 */
593void 597void
594rxvt_term::scr_rendition (int set, int style) 598rxvt_term::scr_rendition (int set, int style) NOTHROW
595 { 599{
596 if (set) 600 if (set)
597 rstyle |= style; 601 rstyle |= style;
598 else if (style == ~RS_None) 602 else if (style == ~RS_None)
599 rstyle = DEFAULT_RSTYLE; 603 rstyle = DEFAULT_RSTYLE;
600 else 604 else
601 rstyle &= ~style; 605 rstyle &= ~style;
602 } 606}
603 607
604/* ------------------------------------------------------------------------- */ 608/* ------------------------------------------------------------------------- */
605/* 609/*
606 * Scroll text between <row1> and <row2> inclusive, by <count> lines 610 * Scroll text between <row1> and <row2> inclusive, by <count> lines
607 * count positive ==> scroll up 611 * count positive ==> scroll up
608 * count negative ==> scroll down 612 * count negative ==> scroll down
609 */ 613 */
610int 614int
611rxvt_term::scr_scroll_text (int row1, int row2, int count) 615rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
612{ 616{
613 if (count == 0 || (row1 > row2)) 617 if (count == 0 || (row1 > row2))
614 return 0; 618 return 0;
615 619
616 want_refresh = 1; 620 want_refresh = 1;
617 num_scr += count; 621 num_scr += count;
618 622
619 if (count > 0 623 if (count > 0
620 && row1 == 0 624 && row1 == 0
621 && row2 == nrow - 1
622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 625 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
623 { 626 {
624 nsaved = min (nsaved + count, saveLines); 627 top_row = max (top_row - count, -saveLines);
625 628
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 629 // scroll everything up 'count' lines
627
628 term_start = (term_start + count) % total_rows; 630 term_start = (term_start + count) % total_rows;
629 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
630 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
631 { 670 {
632 selection.beg.row -= count; 671 selection.beg.row -= count;
633 selection.end.row -= count; 672 selection.end.row -= count;
634 selection.mark.row -= count; 673 selection.mark.row -= count;
635 674
636 if (selection.beg.row < -nsaved 675 if (selection.beg.row < top_row
637 || selection.end.row < -nsaved 676 || selection.end.row < top_row
638 || selection.mark.row < -nsaved) 677 || selection.mark.row < top_row)
639 { 678 {
640 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
642 } 681 }
643 } 682 }
644 683
645 for (int i = count; i--; ) 684 // finally move the view window, if desired
646 scr_blank_screen_mem (ROW(row2 - i), rstyle);
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 scr_blank_screen_mem (ROW(row), rstyle); 1349 scr_blank_screen_mem (ROW(row), rstyle);
1309 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1350 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1310 } 1351 }
1311} 1352}
1312 1353
1313#if ENABLE_FRILLS 1354#if !ENABLE_MINIMAL
1314void 1355void
1315rxvt_term::scr_erase_savelines () 1356rxvt_term::scr_erase_savelines () NOTHROW
1316{ 1357{
1317 want_refresh = 1; 1358 want_refresh = 1;
1318 ZERO_SCROLLBACK (); 1359 ZERO_SCROLLBACK ();
1319 1360
1320 nsaved = 0; 1361 top_row = 0;
1321} 1362}
1322#endif 1363#endif
1323 1364
1324/* ------------------------------------------------------------------------- */ 1365/* ------------------------------------------------------------------------- */
1325/* 1366/*
1326 * Fill the screen with `E's 1367 * Fill the screen with `E's
1327 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1368 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1328 */ 1369 */
1329void 1370void
1330rxvt_term::scr_E () 1371rxvt_term::scr_E () NOTHROW
1331{ 1372{
1332 rend_t fs; 1373 rend_t fs;
1333 1374
1334 want_refresh = 1; 1375 want_refresh = 1;
1335 ZERO_SCROLLBACK (); 1376 ZERO_SCROLLBACK ();
… …
1356/* ------------------------------------------------------------------------- */ 1397/* ------------------------------------------------------------------------- */
1357/* 1398/*
1358 * Insert/Delete <count> lines 1399 * Insert/Delete <count> lines
1359 */ 1400 */
1360void 1401void
1361rxvt_term::scr_insdel_lines (int count, int insdel) 1402rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1362{ 1403{
1363 int end; 1404 int end;
1364 1405
1365 ZERO_SCROLLBACK (); 1406 ZERO_SCROLLBACK ();
1366 1407
… …
1386/* ------------------------------------------------------------------------- */ 1427/* ------------------------------------------------------------------------- */
1387/* 1428/*
1388 * Insert/Delete <count> characters from the current position 1429 * Insert/Delete <count> characters from the current position
1389 */ 1430 */
1390void 1431void
1391rxvt_term::scr_insdel_chars (int count, int insdel) 1432rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1392{ 1433{
1393 int col, row; 1434 int col, row;
1394 rend_t tr; 1435 rend_t tr;
1395 1436
1396 want_refresh = 1; 1437 want_refresh = 1;
… …
1427 { 1468 {
1428 if (selection.end.row != screen.cur.row 1469 if (selection.end.row != screen.cur.row
1429 || (selection.end.col + count >= ncol)) 1470 || (selection.end.col + count >= ncol))
1430 CLEAR_SELECTION (); 1471 CLEAR_SELECTION ();
1431 else 1472 else
1473 {
1432 { /* shift selection */ 1474 /* shift selection */
1433 selection.beg.col += count; 1475 selection.beg.col += count;
1434 selection.mark.col += count; /* XXX: yes? */ 1476 selection.mark.col += count; /* XXX: yes? */
1435 selection.end.col += count; 1477 selection.end.col += count;
1436 } 1478 }
1437 } 1479 }
… …
1484/* 1526/*
1485 * Set the scrolling region 1527 * Set the scrolling region
1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1528 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1487 */ 1529 */
1488void 1530void
1489rxvt_term::scr_scroll_region (int top, int bot) 1531rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1490{ 1532{
1491 max_it (top, 0); 1533 max_it (top, 0);
1492 min_it (bot, nrow - 1); 1534 min_it (bot, nrow - 1);
1493 1535
1494 if (top > bot) 1536 if (top > bot)
… …
1504 * Make the cursor visible/invisible 1546 * Make the cursor visible/invisible
1505 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1547 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1506 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1548 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1507 */ 1549 */
1508void 1550void
1509rxvt_term::scr_cursor_visible (int mode) 1551rxvt_term::scr_cursor_visible (int mode) NOTHROW
1510{ 1552{
1511 want_refresh = 1; 1553 want_refresh = 1;
1512 1554
1513 if (mode) 1555 if (mode)
1514 screen.flags |= Screen_VisibleCursor; 1556 screen.flags |= Screen_VisibleCursor;
… …
1521 * Set/unset automatic wrapping 1563 * Set/unset automatic wrapping
1522 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1564 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1523 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1565 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1524 */ 1566 */
1525void 1567void
1526rxvt_term::scr_autowrap (int mode) 1568rxvt_term::scr_autowrap (int mode) NOTHROW
1527{ 1569{
1528 if (mode) 1570 if (mode)
1529 screen.flags |= Screen_Autowrap; 1571 screen.flags |= Screen_Autowrap;
1530 else 1572 else
1531 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1573 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1540 * and the cursor cannot be moved outside. 1582 * and the cursor cannot be moved outside.
1541 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1583 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1542 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1584 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1543 */ 1585 */
1544void 1586void
1545rxvt_term::scr_relative_origin (int mode) 1587rxvt_term::scr_relative_origin (int mode) NOTHROW
1546{ 1588{
1547 if (mode) 1589 if (mode)
1548 screen.flags |= Screen_Relative; 1590 screen.flags |= Screen_Relative;
1549 else 1591 else
1550 screen.flags &= ~Screen_Relative; 1592 screen.flags &= ~Screen_Relative;
… …
1557 * Set insert/replace mode 1599 * Set insert/replace mode
1558 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1600 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1559 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1601 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1560 */ 1602 */
1561void 1603void
1562rxvt_term::scr_insert_mode (int mode) 1604rxvt_term::scr_insert_mode (int mode) NOTHROW
1563{ 1605{
1564 if (mode) 1606 if (mode)
1565 screen.flags |= Screen_Insert; 1607 screen.flags |= Screen_Insert;
1566 else 1608 else
1567 screen.flags &= ~Screen_Insert; 1609 screen.flags &= ~Screen_Insert;
… …
1573 * XTERM_SEQ: Set tab at current column : ESC H 1615 * XTERM_SEQ: Set tab at current column : ESC H
1574 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1616 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1575 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1617 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1576 */ 1618 */
1577void 1619void
1578rxvt_term::scr_set_tab (int mode) 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1579{ 1621{
1580 if (mode < 0) 1622 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol);
1582 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1583 tabs [screen.cur.col] = !!mode; 1625 tabs [screen.cur.col] = !!mode;
1584} 1626}
1585 1627
1586/* ------------------------------------------------------------------------- */ 1628/* ------------------------------------------------------------------------- */
… …
1588 * Set reverse/normal video 1630 * Set reverse/normal video
1589 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1631 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1590 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1632 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1591 */ 1633 */
1592void 1634void
1593rxvt_term::scr_rvideo_mode (int mode) 1635rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1594{ 1636{
1595 XGCValues gcvalue; 1637 rvideo_mode = on;
1596 1638
1639#ifndef NO_BELL
1640 on ^= rvideo_bell;
1641#endif
1642
1597 if (rvideo != mode) 1643 if (rvideo_state != on)
1598 { 1644 {
1599 rvideo = mode; 1645 rvideo_state = on;
1646
1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1601#if XPM_BACKGROUND 1648#ifdef HAVE_BG_PIXMAP
1602 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1603#endif 1650#endif
1604#if TRANSPARENT 1651 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1605 if (! OPTION (Opt_transparent) || am_transparent == 0)
1606#endif
1607 XSetWindowBackground (display->display, vt,
1608 pix_colors[Color_bg]);
1609 1652
1653 XGCValues gcvalue;
1610 gcvalue.foreground = pix_colors[Color_fg]; 1654 gcvalue.foreground = pix_colors[Color_fg];
1611 gcvalue.background = pix_colors[Color_bg]; 1655 gcvalue.background = pix_colors[Color_bg];
1612 XChangeGC (display->display, gc, GCBackground | GCForeground, 1656 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1613 &gcvalue); 1657
1614 scr_clear (); 1658 scr_clear ();
1615 scr_touch (true); 1659 scr_touch (true);
1616 } 1660 }
1617} 1661}
1618 1662
… …
1620/* 1664/*
1621 * Report current cursor position 1665 * Report current cursor position
1622 * XTERM_SEQ: Report position: ESC [ 6 n 1666 * XTERM_SEQ: Report position: ESC [ 6 n
1623 */ 1667 */
1624void 1668void
1625rxvt_term::scr_report_position () 1669rxvt_term::scr_report_position () NOTHROW
1626{ 1670{
1627 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);
1628} 1672}
1629 1673
1630/* ------------------------------------------------------------------------- * 1674/* ------------------------------------------------------------------------- *
… …
1633 1677
1634/* 1678/*
1635 * Set font style 1679 * Set font style
1636 */ 1680 */
1637void 1681void
1638rxvt_term::set_font_style () 1682rxvt_term::set_font_style () NOTHROW
1639{ 1683{
1640#if 0 1684#if 0
1641 switch (charsets [screen.charset]) 1685 switch (charsets [screen.charset])
1642 { 1686 {
1643 case '0': /* DEC Special Character & Line Drawing Set */ 1687 case '0': /* DEC Special Character & Line Drawing Set */
… …
1665 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1709 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1666 * XTERM_SEQ: Invoke G2 character set: ESC N 1710 * XTERM_SEQ: Invoke G2 character set: ESC N
1667 * XTERM_SEQ: Invoke G3 character set: ESC O 1711 * XTERM_SEQ: Invoke G3 character set: ESC O
1668 */ 1712 */
1669void 1713void
1670rxvt_term::scr_charset_choose (int set) 1714rxvt_term::scr_charset_choose (int set) NOTHROW
1671{ 1715{
1672 screen.charset = set; 1716 screen.charset = set;
1673 set_font_style (); 1717 set_font_style ();
1674} 1718}
1675 1719
… …
1681 * XTERM_SEQ: Set G2 character set: ESC * <C> 1725 * XTERM_SEQ: Set G2 character set: ESC * <C>
1682 * XTERM_SEQ: Set G3 character set: ESC + <C> 1726 * XTERM_SEQ: Set G3 character set: ESC + <C>
1683 * See set_font_style for possible values for <C> 1727 * See set_font_style for possible values for <C>
1684 */ 1728 */
1685void 1729void
1686rxvt_term::scr_charset_set (int set, unsigned int ch) 1730rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1687{ 1731{
1688 charsets[set] = (unsigned char)ch; 1732 charsets[set] = (unsigned char)ch;
1689 set_font_style (); 1733 set_font_style ();
1690} 1734}
1691 1735
… …
1696 1740
1697/* 1741/*
1698 * refresh matching text. 1742 * refresh matching text.
1699 */ 1743 */
1700bool 1744bool
1701rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1745rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1702{ 1746{
1703 bool found = false; 1747 bool found = false;
1704 1748
1705 for (int i = 0; i < nrow; i++) 1749 for (int i = 0; i < nrow; i++)
1706 { 1750 {
1707 int col = 0;
1708 rend_t *drp = drawn_buf[i].r; 1751 rend_t *drp = drawn_buf[i].r;
1709 1752
1710 for (; col < ncol; col++, drp++) 1753 for (int col = 0; col < ncol; col++, drp++)
1711 if ((*drp & mask) == value) 1754 if ((*drp & mask) == value)
1712 { 1755 {
1713 found = true; 1756 found = true;
1714 *drp = ~value; 1757 *drp = ~value;
1715 } 1758 }
… …
1726 PART_END, 1769 PART_END,
1727 RC_COUNT 1770 RC_COUNT
1728}; 1771};
1729 1772
1730void 1773void
1731rxvt_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
1732{ 1775{
1733 int i; 1776 int i;
1734 row_col_t rc[RC_COUNT]; 1777 row_col_t rc[RC_COUNT];
1735 1778
1736 if (!drawn_buf) /* sanity check */ 1779 if (!drawn_buf) /* sanity check */
… …
1755 for (i = PART_BEG; i < RC_COUNT; i++) 1798 for (i = PART_BEG; i < RC_COUNT; i++)
1756 { 1799 {
1757 min_it (rc[i].col, ncol - 1); 1800 min_it (rc[i].col, ncol - 1);
1758 min_it (rc[i].row, nrow - 1); 1801 min_it (rc[i].row, nrow - 1);
1759 } 1802 }
1760 1803// TODO: this line somehow causes segfault if scr_expose() is called just after resize
1761 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++)
1762 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);
1763 1806
1807 num_scr_allow = 0;
1808
1764 if (refresh) 1809 if (refresh)
1765 scr_refresh (SLOW_REFRESH); 1810 scr_refresh ();
1766} 1811}
1767 1812
1768/* ------------------------------------------------------------------------- */ 1813/* ------------------------------------------------------------------------- */
1769/* 1814/*
1770 * Refresh the entire screen 1815 * Refresh the entire screen
1771 */ 1816 */
1772void 1817void
1773rxvt_term::scr_touch (bool refresh) 1818rxvt_term::scr_touch (bool refresh) NOTHROW
1774{ 1819{
1775 scr_expose (0, 0, width, height, refresh); 1820 scr_expose (0, 0, width, height, refresh);
1776} 1821}
1777 1822
1778/* ------------------------------------------------------------------------- */ 1823/* ------------------------------------------------------------------------- */
1779/* 1824/*
1780 * 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
1781 * the top of the screen 1826 * the top of the screen
1782 */ 1827 */
1783int 1828void
1784rxvt_term::scr_move_to (int y, int len) 1829rxvt_term::scr_move_to (int y, int len) NOTHROW
1785{ 1830{
1786 long p = 0; 1831 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1787 unsigned int oldviewstart;
1788
1789 oldviewstart = view_start;
1790
1791 if (y < len)
1792 {
1793 p = (nrow + nsaved) * (len - y) / len;
1794 p -= (long) (nrow - 1);
1795 p = max (p, 0);
1796 }
1797
1798 view_start = (unsigned int)min (p, nsaved);
1799
1800 return scr_changeview (oldviewstart);
1801} 1832}
1802 1833
1803/* ------------------------------------------------------------------------- */ 1834/* ------------------------------------------------------------------------- */
1804/* 1835/*
1805 * Page the screen up/down nlines 1836 * Page the screen up/down nlines
1806 * direction should be UP or DN 1837 * direction should be UP or DN
1807 */ 1838 */
1808int 1839bool
1809rxvt_term::scr_page (enum page_dirn direction, int nlines) 1840rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1810{ 1841{
1811 int n; 1842 int new_view_start =
1812 unsigned int oldviewstart;
1813
1814 oldviewstart = view_start;
1815
1816 if (direction == UP)
1817 {
1818 n = view_start + nlines;
1819 view_start = min (n, nsaved);
1820 }
1821 else
1822 {
1823 n = view_start - nlines; 1843 direction == UP ? view_start - nlines
1824 view_start = max (n, 0); 1844 : view_start + nlines;
1825 }
1826 1845
1827 return scr_changeview (oldviewstart); 1846 return scr_changeview (new_view_start);
1828} 1847}
1829 1848
1830int 1849bool
1831rxvt_term::scr_changeview (unsigned int oldviewstart) 1850rxvt_term::scr_changeview (int new_view_start) NOTHROW
1832{ 1851{
1852 clamp_it (new_view_start, top_row, 0);
1853
1833 if (view_start != oldviewstart) 1854 if (new_view_start == view_start)
1834 { 1855 return false;
1856
1857 num_scr += new_view_start - view_start;
1858 view_start = new_view_start;
1859 want_refresh = 1;
1860
1835 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));
1836 1862
1837 want_refresh = 1; 1863 return true;
1838 num_scr -= (view_start - oldviewstart);
1839 }
1840
1841 return (int)view_start - (int)oldviewstart;
1842} 1864}
1843 1865
1844/* ------------------------------------------------------------------------- */ 1866#ifndef NO_BELL
1845void 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
1846rxvt_term::scr_bell () 1878rxvt_term::scr_bell () NOTHROW
1847{ 1879{
1848#ifndef NO_BELL 1880#ifndef NO_BELL
1849 1881
1850# ifndef NO_MAPALERT 1882# ifndef NO_MAPALERT
1851# ifdef MAPALERT_OPTION 1883# ifdef MAPALERT_OPTION
1852 if (OPTION (Opt_mapAlert)) 1884 if (option (Opt_mapAlert))
1853# endif 1885# endif
1854 XMapWindow (display->display, parent[0]); 1886 XMapWindow (dpy, parent[0]);
1855# endif 1887# endif
1856 1888
1857 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 }
1858 { 1897 }
1859 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
1860 rxvt_usleep (VISUAL_BELL_DURATION); 1906 bell_ev.start (VISUAL_BELL_DURATION);
1861 scr_rvideo_mode (!rvideo); /* refresh also done */
1862 } 1907 }
1863 else 1908 else
1864 XBell (display->display, 0); 1909 XBell (dpy, 0);
1865
1866#endif 1910#endif
1867} 1911}
1868 1912
1869/* ------------------------------------------------------------------------- */ 1913/* ------------------------------------------------------------------------- */
1870/* ARGSUSED */ 1914/* ARGSUSED */
1871void 1915void
1872rxvt_term::scr_printscreen (int fullhist) 1916rxvt_term::scr_printscreen (int fullhist) NOTHROW
1873{ 1917{
1874#ifdef PRINTPIPE 1918#ifdef PRINTPIPE
1875 int nrows, row_start; 1919 int nrows, row_start;
1876 FILE *fd; 1920 FILE *fd;
1877 1921
1878 if ((fd = popen_printer ()) == NULL) 1922 if ((fd = popen_printer ()) == NULL)
1879 return; 1923 return;
1880 1924
1881 if (fullhist) 1925 if (fullhist)
1882 { 1926 {
1883 nrows = nrow + nsaved; 1927 nrows = nrow - top_row;
1884 row_start = -nsaved; 1928 row_start = top_row;
1885 } 1929 }
1886 else 1930 else
1887 { 1931 {
1888 nrows = nrow; 1932 nrows = nrow;
1889 row_start = -view_start; 1933 row_start = view_start;
1890 } 1934 }
1891 1935
1892 wctomb (0, 0); 1936 wctomb (0, 0);
1893 1937
1894 for (int r1 = 0; r1 < nrows; r1++) 1938 for (int r1 = 0; r1 < nrows; r1++)
… …
1926 * Refresh the screen 1970 * Refresh the screen
1927 * drawn_text/drawn_rend contain the screen information before the update. 1971 * drawn_text/drawn_rend contain the screen information before the update.
1928 * screen.text/screen.rend contain what the screen will change to. 1972 * screen.text/screen.rend contain what the screen will change to.
1929 */ 1973 */
1930void 1974void
1931rxvt_term::scr_refresh (unsigned char refresh_type) 1975rxvt_term::scr_refresh () NOTHROW
1932{ 1976{
1933 unsigned char must_clear, /* use draw_string not draw_image_string */ 1977 unsigned char have_bg,
1934 showcursor; /* show the cursor */ 1978 showcursor; /* show the cursor */
1935 int16_t col, row, /* column/row we're processing */ 1979 int16_t col, row, /* column/row we're processing */
1936 ocrow; /* old cursor row */ 1980 ocrow; /* old cursor row */
1937 int i; /* tmp */ 1981 int i; /* tmp */
1938#ifndef NO_CURSORCOLOR 1982#ifndef NO_CURSORCOLOR
1939 rend_t cc1; /* store colours at cursor position (s) */ 1983 rend_t cc1; /* store colours at cursor position (s) */
1940#endif 1984#endif
1941 rend_t *crp; // cursor rendition pointer 1985 rend_t *crp; // cursor rendition pointer
1986 rend_t ccol1, /* Cursor colour */
1987 ccol2; /* Cursor colour2 */
1942 1988
1943 want_refresh = 0; /* screen is current */ 1989 want_refresh = 0; /* screen is current */
1944 1990
1945 if (refresh_type == NO_REFRESH || !mapped) 1991 if (refresh_type == NO_REFRESH || !mapped)
1946 return; 1992 return;
1947 1993
1948 /* 1994 /*
1949 * A: set up vars 1995 * A: set up vars
1950 */ 1996 */
1951 must_clear = 0;
1952 refresh_count = 0; 1997 refresh_count = 0;
1953 1998
1954#if XPM_BACKGROUND 1999 have_bg = 0;
2000#ifdef HAVE_BG_PIXMAP
1955 must_clear |= bgPixmap.pixmap != None; 2001 have_bg = bgPixmap.pixmap != None;
1956#endif
1957#if TRANSPARENT
1958 must_clear |= OPTION (Opt_transparent) && am_transparent;
1959#endif 2002#endif
1960 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2003 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1961 2004
1962 /* 2005 /*
1963 * B: reverse any characters which are selected 2006 * B: reverse any characters which are selected
… …
1967 /* 2010 /*
1968 * C: set the cursor character (s) 2011 * C: set the cursor character (s)
1969 */ 2012 */
1970 { 2013 {
1971 unsigned char setoldcursor; 2014 unsigned char setoldcursor;
1972 rend_t ccol1, /* Cursor colour */
1973 ccol2; /* Cursor colour2 */
1974 2015
1975 showcursor = (screen.flags & Screen_VisibleCursor); 2016 showcursor = (screen.flags & Screen_VisibleCursor);
1976#ifdef CURSOR_BLINK 2017#ifdef CURSOR_BLINK
1977 if (hidden_cursor) 2018 if (hidden_cursor)
1978 showcursor = 0; 2019 showcursor = 0;
… …
1985 while (col && ROW(screen.cur.row).t[col] == NOCHAR) 2026 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
1986 col--; 2027 col--;
1987 2028
1988 crp = &ROW(screen.cur.row).r[col]; 2029 crp = &ROW(screen.cur.row).r[col];
1989 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
1990 if (showcursor && focus) 2054 if (showcursor && focus)
1991 { 2055 {
1992 if (OPTION (Opt_cursorUnderline)) 2056 if (option (Opt_cursorUnderline))
1993 *crp ^= RS_Uline; 2057 *crp ^= RS_Uline;
1994 else 2058 else
1995 { 2059 {
1996 *crp ^= RS_RVid; 2060 *crp ^= RS_RVid;
1997
1998#ifndef NO_CURSORCOLOR
1999 cc1 = *crp & (RS_fgMask | RS_bgMask);
2000 if (ISSET_PIXCOLOR (Color_cursor))
2001 ccol1 = Color_cursor;
2002 else
2003#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2004 ccol1 = fgcolor_of (rstyle);
2005#else
2006 ccol1 = Color_fg;
2007#endif
2008 if (ISSET_PIXCOLOR (Color_cursor2))
2009 ccol2 = Color_cursor2;
2010 else
2011#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2012 ccol2 = bgcolor_of (rstyle);
2013#else
2014 ccol2 = Color_bg;
2015#endif
2016 *crp = SET_FGCOLOR (*crp, ccol1); 2061 *crp = SET_FGCOLOR (*crp, ccol1);
2017 *crp = SET_BGCOLOR (*crp, ccol2); 2062 *crp = SET_BGCOLOR (*crp, ccol2);
2018#endif
2019 } 2063 }
2020 } 2064 }
2021 } 2065 }
2022 2066
2023 /* make sure no outline cursor is left around */ 2067 /* make sure no outline cursor is left around */
2024 setoldcursor = 0; 2068 setoldcursor = 0;
2025 if (ocrow != -1) 2069 if (ocrow != -1)
2026 { 2070 {
2027 if (screen.cur.row + view_start != ocrow 2071 if (screen.cur.row - view_start != ocrow
2028 || screen.cur.col != oldcursor.col) 2072 || screen.cur.col != oldcursor.col)
2029 { 2073 {
2030 if (ocrow < nrow 2074 if (ocrow < nrow
2031 && oldcursor.col < ncol) 2075 && oldcursor.col < ncol)
2032 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2076 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2040 else if (!focus) 2084 else if (!focus)
2041 setoldcursor = 1; 2085 setoldcursor = 1;
2042 2086
2043 if (setoldcursor) 2087 if (setoldcursor)
2044 { 2088 {
2045 if (screen.cur.row + view_start >= nrow) 2089 if (screen.cur.row - view_start >= nrow)
2046 oldcursor.row = -1; 2090 oldcursor.row = -1;
2047 else 2091 else
2048 { 2092 {
2049 oldcursor.row = screen.cur.row + view_start; 2093 oldcursor.row = screen.cur.row - view_start;
2050 oldcursor.col = screen.cur.col; 2094 oldcursor.col = screen.cur.col;
2051 } 2095 }
2052 } 2096 }
2053 } 2097 }
2054 2098
… …
2060#ifndef NO_SLOW_LINK_SUPPORT 2104#ifndef NO_SLOW_LINK_SUPPORT
2061 /* 2105 /*
2062 * D: CopyArea pass - very useful for slower links 2106 * D: CopyArea pass - very useful for slower links
2063 * This has been deliberately kept simple. 2107 * This has been deliberately kept simple.
2064 */ 2108 */
2065 i = num_scr;
2066 if (!display->is_local 2109 if (!display->is_local
2067 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2110 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2068 && abs (num_scr) < nrow && !must_clear) 2111 && abs (num_scr) < nrow && !have_bg)
2069 { 2112 {
2070 int16_t nits; 2113 int16_t nits;
2114 int i = num_scr;
2071 int j; 2115 int j;
2072 int len, wlen; 2116 int len, wlen;
2117 dLocal (int, num_scr);
2073 2118
2074 j = nrow; 2119 j = nrow;
2075 wlen = len = -1; 2120 wlen = len = -1;
2076 row = i > 0 ? 0 : j - 1; 2121 row = i > 0 ? 0 : j - 1;
2122
2077 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2123 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2078 { 2124 {
2079 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2125 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2080 { 2126 {
2081 line_t s = ROW(row - view_start); 2127 line_t s = ROW(view_start + row);
2082 line_t d = drawn_buf[row]; 2128 line_t d = drawn_buf[row];
2083 line_t d2 = drawn_buf[row + i]; 2129 line_t d2 = drawn_buf[row + i];
2084 2130
2085 for (nits = 0, col = ncol; col--; ) 2131 for (nits = 0, col = ncol; col--; )
2086 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])
… …
2102 wlen = row; 2148 wlen = row;
2103 continue; 2149 continue;
2104 } 2150 }
2105 } 2151 }
2106 2152
2107 if (len != -1) 2153 if (len >= 0)
2108 { 2154 {
2109 /* also comes here at end if needed because of >= above */ 2155 /* also comes here at end if needed because of >= above */
2110 if (wlen < len) 2156 if (wlen < len)
2111 ::swap (wlen, len); 2157 ::swap (wlen, len);
2112 2158
2159 XGCValues gcv;
2160
2161 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2113 XCopyArea (display->display, vt, vt, 2162 XCopyArea (dpy, vt, vt,
2114 gc, 0, Row2Pixel (len + i), 2163 gc, 0, Row2Pixel (len + i),
2115 (unsigned int)this->width, 2164 (unsigned int)this->width,
2116 (unsigned int)Height2Pixel (wlen - len + 1), 2165 (unsigned int)Height2Pixel (wlen - len + 1),
2117 0, Row2Pixel (len)); 2166 0, Row2Pixel (len));
2167 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2168
2118 len = -1; 2169 len = -1;
2119 } 2170 }
2120 } 2171 }
2121 } 2172 }
2122#endif 2173#endif
… …
2124 /* 2175 /*
2125 * E: main pass across every character 2176 * E: main pass across every character
2126 */ 2177 */
2127 for (row = 0; row < nrow; row++) 2178 for (row = 0; row < nrow; row++)
2128 { 2179 {
2129 text_t *stp = ROW(row - view_start).t; 2180 text_t *stp = ROW(view_start + row).t;
2130 rend_t *srp = ROW(row - view_start).r; 2181 rend_t *srp = ROW(view_start + row).r;
2131 text_t *dtp = drawn_buf[row].t; 2182 text_t *dtp = drawn_buf[row].t;
2132 rend_t *drp = drawn_buf[row].r; 2183 rend_t *drp = drawn_buf[row].r;
2133 2184
2134 /* 2185 /*
2135 * E2: OK, now the real pass 2186 * E2: OK, now the real pass
… …
2178 count++; 2229 count++;
2179 2230
2180 if (stp[col] != dtp[col] 2231 if (stp[col] != dtp[col]
2181 || !RS_SAME (srp[col], drp[col])) 2232 || !RS_SAME (srp[col], drp[col]))
2182 { 2233 {
2183 if (must_clear && (i++ > count / 2)) 2234 if (have_bg && (i++ > count / 2))
2184 break; 2235 break;
2185 2236
2186 dtp[col] = stp[col]; 2237 dtp[col] = stp[col];
2187 drp[col] = rend; 2238 drp[col] = rend;
2188 i = 0; 2239 i = 0;
2189 } 2240 }
2190 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2241 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2191 break; 2242 break;
2192 } 2243 }
2193 2244
2194 col--; /* went one too far. move back */ 2245 col--; /* went one too far. move back */
2195 count -= i; /* dump any matching trailing chars */ 2246 count -= i; /* dump any matching trailing chars */
… …
2205 int back = bgcolor_of (rend); // desired background 2256 int back = bgcolor_of (rend); // desired background
2206 2257
2207 // 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
2208 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))
2209 { 2260 {
2210#if ENABLE_STYLES
2211 // force redraw after "careful" characters to avoid pixel droppings
2212 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2213 drp[col + 1] = ~srp[col + 1];
2214
2215 // include previous careful character(s) if possible, looks nicer (best effort...)
2216 while (text > stp
2217 && srp[text - stp - 1] & RS_Careful
2218 && RS_SAME (rend, srp[text - stp - 1]))
2219 text--, count++, xpixel -= fwidth;
2220#endif
2221
2222 bool invert = rend & RS_RVid; 2261 bool invert = rend & RS_RVid;
2223 2262
2224#ifndef NO_BOLD_UNDERLINE_REVERSE 2263#ifndef NO_BOLD_UNDERLINE_REVERSE
2225 if (rend & RS_Bold
2226 && fore == Color_fg) 2264 if (rend & RS_Bold && fore == Color_fg)
2227 { 2265 {
2228 if (ISSET_PIXCOLOR (Color_BD)) 2266 if (ISSET_PIXCOLOR (Color_BD))
2229 fore = Color_BD; 2267 fore = Color_BD;
2230# if !ENABLE_STYLES 2268# if !ENABLE_STYLES
2231 else 2269 else
2232 invert = !invert; 2270 invert = !invert;
2233# endif 2271# endif
2234 } 2272 }
2235 2273
2236 if (rend & RS_Italic 2274 if (rend & RS_Italic && fore == Color_fg)
2237 && fore == Color_fg)
2238 { 2275 {
2239 if (ISSET_PIXCOLOR (Color_IT)) 2276 if (ISSET_PIXCOLOR (Color_IT))
2240 fore = Color_IT; 2277 fore = Color_IT;
2241# if !ENABLE_STYLES 2278# if !ENABLE_STYLES
2242 else 2279 else
2243 invert = !invert; 2280 invert = !invert;
2244# endif 2281# endif
2245 } 2282 }
2246 2283
2247 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2284 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2248 fore = Color_UL; 2285 fore = Color_UL;
2249#endif 2286#endif
2250 2287
2251 if (invert) 2288 if (invert)
2252 { 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 */
2253 ::swap (fore, back); 2296 ::swap (fore, back);
2297#ifdef OPTION_HC
2298 else if (ISSET_PIXCOLOR (Color_HC))
2299 back = Color_HC;
2300#endif
2254 2301
2255#ifndef NO_BOLD_UNDERLINE_REVERSE 2302#ifndef NO_BOLD_UNDERLINE_REVERSE
2303# ifndef OPTION_HC
2256 if (ISSET_PIXCOLOR (Color_RV)) 2304 if (ISSET_PIXCOLOR (Color_RV))
2257 back = Color_RV; 2305 back = Color_RV;
2258 2306# endif
2259 if (fore == back) 2307 if (fore == back)
2260 { 2308 {
2261 fore = Color_bg; 2309 fore = Color_bg;
2262 back = Color_fg; 2310 back = Color_fg;
2263 } 2311 }
… …
2265 } 2313 }
2266 2314
2267#ifdef TEXT_BLINK 2315#ifdef TEXT_BLINK
2268 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) 2316 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2269 { 2317 {
2270 if (!text_blink_ev.active) 2318 if (!text_blink_ev.is_active ())
2271 { 2319 {
2272 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 2320 text_blink_ev.again ();
2273 hidden_text = 0; 2321 hidden_text = 0;
2274 } 2322 }
2275 else if (hidden_text) 2323 else if (hidden_text)
2276 fore = back; 2324 fore = back;
2277 } 2325 }
2278#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
2279 } 2345 }
2280 2346
2281 /* 2347 /*
2282 * Actually do the drawing of the string here 2348 * Actually do the drawing of the string here
2283 */ 2349 */
2284 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2350 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2285 2351
2286 if (back == fore)
2287 font->clear_rect (*drawable, xpixel, ypixel,
2288 fwidth * count, fheight,
2289 back);
2290 else if (back == Color_bg) 2352 if (have_bg && back == Color_bg)
2291 { 2353 {
2292 if (must_clear) 2354 // this is very ugly, maybe push it into ->draw?
2293 {
2294 CLEAR_CHARS (xpixel, ypixel, count);
2295 2355
2296 for (i = 0; i < count; i++) /* don't draw empty strings */ 2356 for (i = 0; i < count; i++) /* don't draw empty strings */
2297 if (text[i] != ' ') 2357 if (text[i] != ' ')
2298 { 2358 {
2299 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2359 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2300 break; 2360 goto did_clear;
2301 }
2302 } 2361 }
2303 else 2362
2304 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2363 CLEAR_CHARS (xpixel, ypixel, count);
2364 did_clear: ;
2305 } 2365 }
2306 else 2366 else
2307 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2367 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2308 2368
2309 if (rend & RS_Uline && font->descent > 1 && fore != back) 2369 if (rend & RS_Uline && font->descent > 1 && fore != back)
2310 { 2370 {
2311#if ENABLE_FRILLS 2371#if ENABLE_FRILLS
2312 if (ISSET_PIXCOLOR (Color_underline)) 2372 if (ISSET_PIXCOLOR (Color_underline))
2313 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2373 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2314 else 2374 else
2315#endif 2375#endif
2316 XSetForeground (display->display, gc, pix_colors[fore]); 2376 XSetForeground (dpy, gc, pix_colors[fore]);
2317 2377
2318 XDrawLine (display->display, drawBuffer, gc, 2378 XDrawLine (dpy, vt, gc,
2319 xpixel, ypixel + font->ascent + 1, 2379 xpixel, ypixel + font->ascent + 1,
2320 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2380 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2321 } 2381 }
2322 } /* for (col....) */ 2382 } /* for (col....) */
2323 } /* for (row....) */ 2383 } /* for (row....) */
… …
2332 */ 2392 */
2333 if (showcursor) 2393 if (showcursor)
2334 { 2394 {
2335 if (focus) 2395 if (focus)
2336 { 2396 {
2337 if (OPTION (Opt_cursorUnderline)) 2397 if (option (Opt_cursorUnderline))
2338 *crp ^= RS_Uline; 2398 *crp ^= RS_Uline;
2339 else 2399 else
2340 { 2400 {
2341 *crp ^= RS_RVid; 2401 *crp ^= RS_RVid;
2342#ifndef NO_CURSORCOLOR 2402#ifndef NO_CURSORCOLOR
… …
2356 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2416 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2357 cursorwidth++; 2417 cursorwidth++;
2358 2418
2359#ifndef NO_CURSORCOLOR 2419#ifndef NO_CURSORCOLOR
2360 if (ISSET_PIXCOLOR (Color_cursor)) 2420 if (ISSET_PIXCOLOR (Color_cursor))
2361 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2421 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2422 else
2362#endif 2423#endif
2424 XSetForeground (dpy, gc, pix_colors[ccol1]);
2363 2425
2364 XDrawRectangle (display->display, drawBuffer, gc, 2426 XDrawRectangle (dpy, vt, gc,
2365 Col2Pixel (col), 2427 Col2Pixel (col),
2366 Row2Pixel (oldcursor.row), 2428 Row2Pixel (oldcursor.row),
2367 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2429 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2368 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2430 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2369 } 2431 }
… …
2372 /* 2434 /*
2373 * H: cleanup selection 2435 * H: cleanup selection
2374 */ 2436 */
2375 scr_reverse_selection (); 2437 scr_reverse_selection ();
2376 2438
2377 if (refresh_type & SMOOTH_REFRESH)
2378 XFlush (display->display);
2379
2380 num_scr = 0; 2439 num_scr = 0;
2381 num_scr_allow = 1; 2440 num_scr_allow = 1;
2382} 2441}
2383 2442
2384void 2443void
2385rxvt_term::scr_remap_chars (line_t &l) 2444rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2386{ 2445{
2387 if (!l.t) 2446 if (!l.t)
2388 return; 2447 return;
2389 2448
2390 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2449 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2392 for (int i = ncol; i--; ) 2451 for (int i = ncol; i--; )
2393 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]));
2394} 2453}
2395 2454
2396void 2455void
2397rxvt_term::scr_remap_chars () 2456rxvt_term::scr_remap_chars () NOTHROW
2398{ 2457{
2399 for (int i = total_rows; i--; ) 2458 for (int i = total_rows; i--; )
2400 scr_remap_chars (row_buf [i]); 2459 scr_remap_chars (row_buf [i]);
2401 2460
2402 for (int i = nrow; i--; ) 2461 for (int i = nrow; i--; )
… …
2405 scr_remap_chars (swap_buf [i]); 2464 scr_remap_chars (swap_buf [i]);
2406 } 2465 }
2407} 2466}
2408 2467
2409void 2468void
2410rxvt_term::scr_recolour () 2469rxvt_term::scr_recolour () NOTHROW
2411{ 2470{
2412 if (1 2471#ifdef HAVE_BG_PIXMAP
2413#if TRANSPARENT 2472 bgPixmap.apply ();
2414 && !am_transparent 2473#else
2415#endif 2474
2416#if XPM_BACKGROUND
2417 && !bgPixmap.pixmap
2418#endif
2419 )
2420 {
2421 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2475 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2422 XClearWindow (display->display, parent[0]); 2476 XClearWindow (dpy, parent[0]);
2423 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2477 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2424#if HAVE_SCROLLBARS 2478
2425 if (scrollBar.win) 2479 if (scrollBar.win)
2426 { 2480 {
2427 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2481 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2428 scrollBar.setIdle (); 2482 scrollBar.state = STATE_IDLE;
2429 scrollbar_show (0); 2483 scrollBar.show (0);
2430 }
2431#endif
2432 } 2484 }
2433 2485
2486#endif
2487
2488 /* bgPixmap.apply () does not do the following : */
2434 scr_clear (); 2489 scr_clear ();
2435 scr_touch (true); 2490 scr_touch (true);
2436 want_refresh = 1; 2491 want_refresh = 1;
2437} 2492}
2438 2493
2439/* ------------------------------------------------------------------------- */ 2494/* ------------------------------------------------------------------------- */
2440void 2495void
2441rxvt_term::scr_clear (bool really) 2496rxvt_term::scr_clear (bool really) NOTHROW
2442{ 2497{
2443 if (!mapped) 2498 if (!mapped)
2444 return; 2499 return;
2445 2500
2446 num_scr_allow = 0; 2501 num_scr_allow = 0;
2447 want_refresh = 1; 2502 want_refresh = 1;
2448 2503
2449 if (really) 2504 if (really)
2450 XClearWindow (display->display, vt); 2505 XClearWindow (dpy, vt);
2451} 2506}
2452 2507
2453/* ------------------------------------------------------------------------- */
2454void 2508void
2509rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2510{
2511 int view_end = view_start + nrow;
2512 int row, col;
2513
2514 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2515 {
2516 text_t *stp = ROW(row).t;
2517 rend_t *srp = ROW(row).r;
2518
2519 for (col = beg_col; col < end_col; col++)
2520 srp[col] ^= rstyle1;
2521
2522 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2523 srp[col] ^= rstyle2;
2524
2525 if (++col < end_col)
2526 srp[col] ^= rstyle2;
2527 }
2528}
2529
2530void
2531rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2532{
2533 int view_end = view_start + nrow;
2534 int row, col;
2535
2536 if (beg_row >= view_start)
2537 {
2538 col = beg_col;
2539 row = beg_row;
2540 }
2541 else
2542 {
2543 col = 0;
2544 row = view_start;
2545 }
2546
2547 for (; row < min (end_row, view_end); row++, col = 0)
2548 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2549 srp[col] ^= rstyle;
2550
2551 if (row == end_row)
2552 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2553 srp[col] ^= rstyle;
2554}
2555
2556/* ------------------------------------------------------------------------- */
2557void
2455rxvt_term::scr_reverse_selection () 2558rxvt_term::scr_reverse_selection () NOTHROW
2456{ 2559{
2457 if (selection.op 2560 if (selection.op
2458 && current_screen == selection.screen 2561 && current_screen == selection.screen
2459 && selection.end.row >= -view_start) 2562 && selection.end.row >= view_start)
2460 { 2563 {
2461 int view_end = -view_start + nrow; 2564#if !ENABLE_MINIMAL
2462 int row, col;
2463
2464#if ENABLE_FRILLS
2465 if (selection.rect) 2565 if (selection.rect)
2466 { 2566 scr_xor_rect (selection.beg.row, selection.beg.col,
2467 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2567 selection.end.row, selection.end.col,
2468 { 2568 RS_RVid, RS_RVid | RS_Uline);
2469 text_t *stp = ROW(row).t;
2470 rend_t *srp = ROW(row).r;
2471
2472 for (col = selection.beg.col; col < selection.end.col; col++)
2473 srp[col] ^= RS_RVid;
2474
2475 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2476 srp[col] ^= RS_RVid | RS_Uline;
2477
2478 if (++col < selection.end.col)
2479 srp[col] ^= RS_RVid | RS_Uline;
2480 }
2481 }
2482 else 2569 else
2483#endif 2570#endif
2484 { 2571 scr_xor_span (selection.beg.row, selection.beg.col,
2485 if (selection.beg.row >= -view_start) 2572 selection.end.row, selection.end.col,
2486 { 2573 RS_RVid);
2487 col = selection.beg.col;
2488 row = selection.beg.row;
2489 }
2490 else
2491 {
2492 col = 0;
2493 row = -view_start;
2494 }
2495
2496 for (; row < min (selection.end.row, view_end); row++, col = 0)
2497 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2498 srp[col] ^= RS_RVid;
2499
2500 if (row == selection.end.row)
2501 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2502 srp[col] ^= RS_RVid;
2503 }
2504 } 2574 }
2505} 2575}
2506 2576
2507/* ------------------------------------------------------------------------- */ 2577/* ------------------------------------------------------------------------- */
2508/* 2578/*
2509 * Dump the whole scrollback and screen to the passed filedescriptor. The 2579 * Dump the whole scrollback and screen to the passed filedescriptor. The
2510 * invoking routine must close the fd. 2580 * invoking routine must close the fd.
2511 */ 2581 */
2512#if 0 2582#if 0
2513void 2583void
2514rxvt_term::scr_dump (int fd) 2584rxvt_term::scr_dump (int fd) NOTHROW
2515{ 2585{
2516 int row, wrote; 2586 int row, wrote;
2517 unsigned int width, towrite; 2587 unsigned int width, towrite;
2518 char r1[] = "\n"; 2588 char r1[] = "\n";
2519 2589
2520 for (row = saveLines - nsaved; 2590 for (row = saveLines + top_row;
2521 row < saveLines + nrow - 1; row++) 2591 row < saveLines + nrow - 1; row++)
2522 { 2592 {
2523 width = row_buf[row].l >= 0 ? row_buf[row].l 2593 width = row_buf[row].l >= 0 ? row_buf[row].l
2524 : ncol; 2594 : ncol;
2525 for (towrite = width; towrite; towrite -= wrote) 2595 for (towrite = width; towrite; towrite -= wrote)
… …
2538 2608
2539/* ------------------------------------------------------------------------- * 2609/* ------------------------------------------------------------------------- *
2540 * CHARACTER SELECTION * 2610 * CHARACTER SELECTION *
2541 * ------------------------------------------------------------------------- */ 2611 * ------------------------------------------------------------------------- */
2542void 2612void
2543rxvt_term::selection_check (int check_more) 2613rxvt_term::selection_check (int check_more) NOTHROW
2544{ 2614{
2545 row_col_t pos; 2615 row_col_t pos;
2546 2616
2547 if (!selection.op) 2617 if (!selection.op)
2548 return; 2618 return;
2549 2619
2550 pos.row = pos.col = 0; 2620 pos.row = pos.col = 0;
2551 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2621 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2552 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2622 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2553 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2623 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2554 || (check_more == 1 2624 || (check_more == 1
2555 && current_screen == selection.screen 2625 && current_screen == selection.screen
2556 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2626 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2557 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2627 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2558 || (check_more == 2 2628 || (check_more == 2
… …
2569/* ------------------------------------------------------------------------- */ 2639/* ------------------------------------------------------------------------- */
2570/* 2640/*
2571 * Paste a selection direct to the command fd 2641 * Paste a selection direct to the command fd
2572 */ 2642 */
2573void 2643void
2574rxvt_term::paste (char *data, unsigned int len) 2644rxvt_term::paste (char *data, unsigned int len) NOTHROW
2575{ 2645{
2576 /* convert normal newline chars into common keyboard Return key sequence */ 2646 /* convert normal newline chars into common keyboard Return key sequence */
2577 for (unsigned int i = 0; i < len; i++) 2647 for (unsigned int i = 0; i < len; i++)
2578 if (data[i] == C0_LF) 2648 if (data[i] == C0_LF)
2579 data[i] = C0_CR; 2649 data[i] = C0_CR;
2580 2650
2651 if (priv_modes & PrivMode_BracketPaste)
2652 tt_printf ("\e[200~");
2653
2581 tt_write (data, len); 2654 tt_write (data, len);
2655
2656 if (priv_modes & PrivMode_BracketPaste)
2657 tt_printf ("\e[201~");
2582} 2658}
2583 2659
2584/* ------------------------------------------------------------------------- */ 2660/* ------------------------------------------------------------------------- */
2585/* 2661/*
2586 * Respond to a notification that a primary selection has been sent 2662 * Respond to a notification that a primary selection has been sent
2587 * EXT: SelectionNotify 2663 * EXT: SelectionNotify
2588 */ 2664 */
2589void 2665void
2590rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2666rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2591{ 2667{
2592 if (prop == None) /* check for failed XConvertSelection */ 2668 if (prop == None) /* check for failed XConvertSelection */
2593 { 2669 {
2594 if ((selection_type & Sel_CompoundText)) 2670 if ((selection_type & Sel_CompoundText))
2595 { 2671 {
… …
2615 } 2691 }
2616 2692
2617 unsigned long bytes_after; 2693 unsigned long bytes_after;
2618 XTextProperty ct; 2694 XTextProperty ct;
2619 2695
2620 if (XGetWindowProperty (display->display, win, prop, 2696 if (XGetWindowProperty (dpy, win, prop,
2621 0, PROP_SIZE / 4, 2697 0, PROP_SIZE / 4,
2622 delete_prop, AnyPropertyType, 2698 delete_prop, AnyPropertyType,
2623 &ct.encoding, &ct.format, 2699 &ct.encoding, &ct.format,
2624 &ct.nitems, &bytes_after, 2700 &ct.nitems, &bytes_after,
2625 &ct.value) != Success) 2701 &ct.value) != Success)
… …
2634 if (bytes_after) 2710 if (bytes_after)
2635 { 2711 {
2636 // fetch and append remaining data 2712 // fetch and append remaining data
2637 XTextProperty ct2; 2713 XTextProperty ct2;
2638 2714
2639 if (XGetWindowProperty (display->display, win, prop, 2715 if (XGetWindowProperty (dpy, win, prop,
2640 ct.nitems / 4, (bytes_after + 3) / 4, 2716 ct.nitems / 4, (bytes_after + 3) / 4,
2641 delete_prop, AnyPropertyType, 2717 delete_prop, AnyPropertyType,
2642 &ct2.encoding, &ct2.format, 2718 &ct2.encoding, &ct2.format,
2643 &ct2.nitems, &bytes_after, 2719 &ct2.nitems, &bytes_after,
2644 &ct2.value) != Success) 2720 &ct2.value) != Success)
… …
2657 2733
2658 if (ct.encoding == xa[XA_INCR]) 2734 if (ct.encoding == xa[XA_INCR])
2659 { 2735 {
2660 // INCR selection, start handshake 2736 // INCR selection, start handshake
2661 if (!delete_prop) 2737 if (!delete_prop)
2662 XDeleteProperty (display->display, win, prop); 2738 XDeleteProperty (dpy, win, prop);
2663 2739
2664 selection_wait = Sel_incr; 2740 selection_wait = Sel_incr;
2665 incr_buf_fill = 0; 2741 incr_buf_fill = 0;
2666 incr_ev.start (NOW + 10); 2742 incr_ev.start (10);
2667 2743
2668 goto bailout; 2744 goto bailout;
2669 } 2745 }
2670 2746
2671 if (ct.nitems == 0) 2747 if (ct.nitems == 0)
… …
2680 ct.nitems = incr_buf_fill; 2756 ct.nitems = incr_buf_fill;
2681 incr_buf = 0; 2757 incr_buf = 0;
2682 incr_buf_size = 0; 2758 incr_buf_size = 0;
2683 incr_ev.stop (); 2759 incr_ev.stop ();
2684 } 2760 }
2685 else 2761 else
2686 { 2762 {
2687 if (selection_wait == Sel_normal 2763 if (selection_wait == Sel_normal
2688 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2764 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2689 { 2765 {
2690 /* 2766 /*
… …
2697 goto bailout; 2773 goto bailout;
2698 } 2774 }
2699 } 2775 }
2700 else if (selection_wait == Sel_incr) 2776 else if (selection_wait == Sel_incr)
2701 { 2777 {
2702 incr_ev.start (NOW + 10); 2778 incr_ev.start (10);
2703 2779
2704 while (incr_buf_fill + ct.nitems > incr_buf_size) 2780 while (incr_buf_fill + ct.nitems > incr_buf_size)
2705 { 2781 {
2706 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; 2782 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2707 incr_buf = (char *)realloc (incr_buf, incr_buf_size); 2783 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
… …
2714 } 2790 }
2715 2791
2716 char **cl; 2792 char **cl;
2717 int cr; 2793 int cr;
2718 2794
2719#if ENABLE_FRILLS 2795#if !ENABLE_MINIMAL
2720 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2796 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2721 // so recode it manually 2797 // so recode it manually
2722 if (ct.encoding == xa[XA_UTF8_STRING]) 2798 if (ct.encoding == xa[XA_UTF8_STRING])
2723 { 2799 {
2724 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2800 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2728 paste (s, strlen (s)); 2804 paste (s, strlen (s));
2729 free (s); 2805 free (s);
2730 } 2806 }
2731 else 2807 else
2732#endif 2808#endif
2733 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2809 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2734 && cl) 2810 && cl)
2735 { 2811 {
2736 for (int i = 0; i < cr; i++) 2812 for (int i = 0; i < cr; i++)
2737 paste (cl[i], strlen (cl[i])); 2813 paste (cl[i], strlen (cl[i]));
2738 2814
… …
2747 if (selection_wait == Sel_normal) 2823 if (selection_wait == Sel_normal)
2748 selection_wait = Sel_none; 2824 selection_wait = Sel_none;
2749} 2825}
2750 2826
2751void 2827void
2752rxvt_term::incr_cb (time_watcher &w) 2828rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2753{ 2829{
2754 selection_wait = Sel_none; 2830 selection_wait = Sel_none;
2755 2831
2756 incr_buf_size = 0; 2832 incr_buf_size = 0;
2757 free (incr_buf); 2833 free (incr_buf);
2758 2834
2759 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2835 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2760} 2836}
2761 2837
2762void 2838void
2763rxvt_term::selection_property (Window win, Atom prop) 2839rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2764{ 2840{
2765 if (prop == None || selection_wait != Sel_incr) 2841 if (prop == None || selection_wait != Sel_incr)
2766 return; 2842 return;
2767 2843
2768 selection_paste (win, prop, true); 2844 selection_paste (win, prop, true);
2769} 2845}
2770 2846
2771/* ------------------------------------------------------------------------- */ 2847/* ------------------------------------------------------------------------- */
2772/* 2848/*
2773 * Request the current selection: 2849 * Request the current selection:
2774 * Order: > internal selection if available 2850 * Order: > internal selection if available
2775 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2851 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2776 * > CUT_BUFFER0 2852 * > CUT_BUFFER0
2777 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2853 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2778 * will auto fallback to CUT_BUFFER0 2854 * will auto fallback to CUT_BUFFER0
2779 * EXT: button 2 release 2855 * EXT: button 2 release
2780 */ 2856 */
2781void 2857void
2782rxvt_term::selection_request (Time tm, int x, int y) 2858rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2783{ 2859{
2784 if (x < 0 || x >= width || y < 0 || y >= height) 2860 if (selection.text && selnum == Sel_Primary)
2785 return; /* outside window */ 2861 {
2786
2787 if (selection.text)
2788 { /* internal selection */ 2862 /* internal selection */
2789 char *str = rxvt_wcstombs (selection.text, selection.len); 2863 char *str = rxvt_wcstombs (selection.text, selection.len);
2790 paste (str, strlen (str)); 2864 paste (str, strlen (str));
2791 free (str); 2865 free (str);
2792 return; 2866 return;
2793 } 2867 }
2794 else 2868 else
2795 { 2869 {
2796 int i;
2797
2798 selection_request_time = tm; 2870 selection_request_time = tm;
2799 selection_wait = Sel_normal; 2871 selection_wait = Sel_normal;
2800 2872
2801 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2802 {
2803#if X_HAVE_UTF8_STRING 2873#if X_HAVE_UTF8_STRING
2804 selection_type = Sel_UTF8String; 2874 selection_type = Sel_UTF8String;
2805 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2875 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2806 return; 2876 return;
2807#else 2877#else
2808 selection_type = Sel_CompoundText; 2878 selection_type = Sel_CompoundText;
2809 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2879 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2810 return; 2880 return;
2811#endif 2881#endif
2812 }
2813 } 2882 }
2814 2883
2815 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2884 selection_wait = Sel_none; /* don't loop in selection_paste () */
2816 selection_paste (display->root, XA_CUT_BUFFER0, false); 2885 selection_paste (display->root, XA_CUT_BUFFER0, false);
2817} 2886}
2818 2887
2819int 2888int
2820rxvt_term::selection_request_other (Atom target, int selnum) 2889rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2821{ 2890{
2822 Atom sel; 2891 Atom sel;
2823 2892
2824 selection_type |= selnum; 2893 selection_type |= selnum;
2825 2894
… …
2828 else if (selnum == Sel_Secondary) 2897 else if (selnum == Sel_Secondary)
2829 sel = XA_SECONDARY; 2898 sel = XA_SECONDARY;
2830 else 2899 else
2831 sel = xa[XA_CLIPBOARD]; 2900 sel = xa[XA_CLIPBOARD];
2832 2901
2833 if (XGetSelectionOwner (display->display, sel) != None) 2902 if (XGetSelectionOwner (dpy, sel) != None)
2834 { 2903 {
2835 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2904 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2836 vt, selection_request_time); 2905 vt, selection_request_time);
2837 return 1; 2906 return 1;
2838 } 2907 }
2839 2908
2840 return 0; 2909 return 0;
… …
2844/* 2913/*
2845 * Clear all selected text 2914 * Clear all selected text
2846 * EXT: SelectionClear 2915 * EXT: SelectionClear
2847 */ 2916 */
2848void 2917void
2849rxvt_term::selection_clear () 2918rxvt_term::selection_clear () NOTHROW
2850{ 2919{
2851 want_refresh = 1; 2920 want_refresh = 1;
2852 free (selection.text); 2921 free (selection.text);
2853 selection.text = NULL; 2922 selection.text = NULL;
2854 selection.len = 0; 2923 selection.len = 0;
… …
2903 2972
2904 int end_col; 2973 int end_col;
2905 2974
2906 for (; row <= selection.end.row; row++, col = 0) 2975 for (; row <= selection.end.row; row++, col = 0)
2907 { 2976 {
2908#if ENABLE_FRILLS 2977#if !ENABLE_MINIMAL
2909 if (selection.rect) 2978 if (selection.rect)
2910 { 2979 {
2911 col = selection.beg.col; 2980 col = selection.beg.col;
2912 end_col = ncol + 1; 2981 end_col = ncol + 1;
2913 } 2982 }
… …
2916 end_col = ROW(row).l; 2985 end_col = ROW(row).l;
2917 2986
2918 col = max (col, 0); 2987 col = max (col, 0);
2919 2988
2920 if (row == selection.end.row 2989 if (row == selection.end.row
2921#if ENABLE_FRILLS 2990#if !ENABLE_MINIMAL
2922 || selection.rect 2991 || selection.rect
2923#endif 2992#endif
2924 ) 2993 )
2925 min_it (end_col, selection.end.col); 2994 min_it (end_col, selection.end.col);
2926 2995
… …
2949#endif 3018#endif
2950 else 3019 else
2951 new_selection_text[ofs++] = *t++; 3020 new_selection_text[ofs++] = *t++;
2952 } 3021 }
2953 3022
2954#if ENABLE_FRILLS 3023#if !ENABLE_MINIMAL
2955 if (selection.rect) 3024 if (selection.rect)
2956 { 3025 {
2957 while (ofs 3026 while (ofs
2958 && new_selection_text[ofs - 1] != C0_LF 3027 && new_selection_text[ofs - 1] != C0_LF
2959 && unicode::is_space (new_selection_text[ofs - 1])) 3028 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2989 3058
2990 selection_grab (tm); 3059 selection_grab (tm);
2991} 3060}
2992 3061
2993bool 3062bool
2994rxvt_term::selection_grab (Time tm) 3063rxvt_term::selection_grab (Time tm) NOTHROW
2995{ 3064{
2996 selection_time = tm; 3065 selection_time = tm;
2997 3066
2998 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3067 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2999 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3068 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
3000 { 3069 {
3001 display->set_selection_owner (this); 3070 display->set_selection_owner (this);
3002 return true; 3071 return true;
3003 } 3072 }
3004 else 3073 else
3074 {
3075 selection_clear ();
3005 return false; 3076 return false;
3077 }
3006 3078
3007#if 0 3079#if 0
3008 XTextProperty ct; 3080 XTextProperty ct;
3009 3081
3010 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3082 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3011 { 3083 {
3012 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3084 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3013 XFree (ct.value); 3085 XFree (ct.value);
3014 } 3086 }
3015#endif 3087#endif
… …
3019/* 3091/*
3020 * Mark or select text based upon number of clicks: 1, 2, or 3 3092 * Mark or select text based upon number of clicks: 1, 2, or 3
3021 * EXT: button 1 press 3093 * EXT: button 1 press
3022 */ 3094 */
3023void 3095void
3024rxvt_term::selection_click (int clicks, int x, int y) 3096rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3025{ 3097{
3026 clicks = ((clicks - 1) % 3) + 1; 3098 clicks = ((clicks - 1) % 3) + 1;
3027 selection.clicks = clicks; /* save clicks so extend will work */ 3099 selection.clicks = clicks; /* save clicks so extend will work */
3028 3100
3101 if (clicks == 2 && !selection.rect
3102 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3103 {
3104 MEvent.clicks = 1; // what a mess
3105 selection.screen = current_screen;
3106 selection.op = SELECTION_CONT;
3107 return;
3108 }
3109
3029 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3110 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3030 3111
3031 if (clicks == 2 || clicks == 3) 3112 if (clicks == 2 || clicks == 3)
3032 selection_extend_colrow (selection.mark.col, 3113 selection_extend_colrow (selection.mark.col,
3033 selection.mark.row + view_start, 3114 selection.mark.row - view_start,
3034 0, /* button 3 */ 3115 0, /* button 3 */
3035 1, /* button press */ 3116 1, /* button press */
3036 0); /* click change */ 3117 0); /* click change */
3037} 3118}
3038 3119
3039/* ------------------------------------------------------------------------- */ 3120/* ------------------------------------------------------------------------- */
3040/* 3121/*
3041 * Mark a selection at the specified col/row 3122 * Mark a selection at the specified col/row
3042 */ 3123 */
3043void 3124void
3044rxvt_term::selection_start_colrow (int col, int row) 3125rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3045{ 3126{
3046 want_refresh = 1; 3127 want_refresh = 1;
3047 3128
3048 selection.mark.row = row - view_start; 3129 selection.mark.row = row + view_start;
3049 selection.mark.col = col; 3130 selection.mark.col = col;
3050 3131
3051 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3132 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3052 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3133 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3053 3134
3054 while (selection.mark.col > 0 3135 while (selection.mark.col > 0
3055 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3136 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3056 --selection.mark.col; 3137 --selection.mark.col;
3057 3138
3058 if (selection.op) 3139 if (selection.op)
3140 {
3059 { /* clear the old selection */ 3141 /* clear the old selection */
3060 selection.beg.row = selection.end.row = selection.mark.row; 3142 selection.beg.row = selection.end.row = selection.mark.row;
3061 selection.beg.col = selection.end.col = selection.mark.col; 3143 selection.beg.col = selection.end.col = selection.mark.col;
3062 } 3144 }
3063 3145
3064 selection.op = SELECTION_INIT; 3146 selection.op = SELECTION_INIT;
… …
3075#define DELIMIT_TEXT(x) \ 3157#define DELIMIT_TEXT(x) \
3076 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3158 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3077#define DELIMIT_REND(x) 1 3159#define DELIMIT_REND(x) 1
3078 3160
3079void 3161void
3080rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3162rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3081{ 3163{
3082 int col, row, dirnadd, tcol, trow, w1, w2; 3164 int col, row, dirnadd, tcol, trow, w1, w2;
3083 row_col_t bound; 3165 row_col_t bound;
3084 text_t *stp; 3166 text_t *stp;
3085 rend_t *srp; 3167 rend_t *srp;
3086 3168
3087 if (dirn == UP) 3169 if (dirn == UP)
3088 { 3170 {
3089 bound.row = - nsaved - 1; 3171 bound.row = top_row - 1;
3090 bound.col = 0; 3172 bound.col = 0;
3091 dirnadd = -1; 3173 dirnadd = -1;
3092 } 3174 }
3093 else 3175 else
3094 { 3176 {
… …
3159 * flag == 0 ==> button 1 3241 * flag == 0 ==> button 1
3160 * flag == 1 ==> button 3 press 3242 * flag == 1 ==> button 3 press
3161 * flag == 2 ==> button 3 motion 3243 * flag == 2 ==> button 3 motion
3162 */ 3244 */
3163void 3245void
3164rxvt_term::selection_extend (int x, int y, int flag) 3246rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3165{ 3247{
3166 int col = clamp (Pixel2Col (x), 0, ncol); 3248 int col = clamp (Pixel2Col (x), 0, ncol);
3167 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3249 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3168 3250
3169 /* 3251 /*
… …
3172 * select nothing. Otherwise, if we're to the right of the mark, you have to 3254 * select nothing. Otherwise, if we're to the right of the mark, you have to
3173 * be _past_ a character for it to be selected. 3255 * be _past_ a character for it to be selected.
3174 */ 3256 */
3175 if (((selection.clicks % 3) == 1) && !flag 3257 if (((selection.clicks % 3) == 1) && !flag
3176 && (col == selection.mark.col 3258 && (col == selection.mark.col
3177 && (row == selection.mark.row + view_start))) 3259 && (row == selection.mark.row - view_start)))
3178 { 3260 {
3179 /* select nothing */ 3261 /* select nothing */
3180 selection.beg.row = selection.end.row = 0; 3262 selection.beg.row = selection.end.row = 0;
3181 selection.beg.col = selection.end.col = 0; 3263 selection.beg.col = selection.end.col = 0;
3182 selection.clicks = 4; 3264 selection.clicks = 4;
… …
3195/* ------------------------------------------------------------------------- */ 3277/* ------------------------------------------------------------------------- */
3196/* 3278/*
3197 * Extend the selection to the specified col/row 3279 * Extend the selection to the specified col/row
3198 */ 3280 */
3199void 3281void
3200rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3282rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3201{ 3283{
3202 row_col_t pos; 3284 row_col_t pos;
3203 enum { 3285 enum {
3204 LEFT, RIGHT 3286 LEFT, RIGHT
3205 } closeto = RIGHT; 3287 } closeto = RIGHT;
… …
3237 selection.beg.col = selection.end.col = selection.mark.col; 3319 selection.beg.col = selection.end.col = selection.mark.col;
3238 selection.beg.row = selection.end.row = selection.mark.row; 3320 selection.beg.row = selection.end.row = selection.mark.row;
3239 } 3321 }
3240 3322
3241 pos.col = col; 3323 pos.col = col;
3242 pos.row = row - view_start; 3324 pos.row = view_start + row;
3243 3325
3244 /* 3326 /*
3245 * This is mainly xterm style selection with a couple of differences, mainly 3327 * This is mainly xterm style selection with a couple of differences, mainly
3246 * in the way button3 drag extension works. 3328 * in the way button3 drag extension works.
3247 * We're either doing: button1 drag; button3 press; or button3 drag 3329 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3253 * a point/word/line which is either the start or end of the selection 3335 * a point/word/line which is either the start or end of the selection
3254 * and it was decided by whichever point/word/line was `fixed' at the 3336 * and it was decided by whichever point/word/line was `fixed' at the
3255 * time of the most recent button3 press 3337 * time of the most recent button3 press
3256 */ 3338 */
3257 if (button3 && buttonpress) 3339 if (button3 && buttonpress)
3340 {
3258 { /* button3 press */ 3341 /* button3 press */
3259 /* 3342 /*
3260 * first determine which edge of the selection we are closest to 3343 * first determine which edge of the selection we are closest to
3261 */ 3344 */
3262 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3345 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3263 || (!ROWCOL_IS_AFTER (pos, selection.end) 3346 || (!ROWCOL_IS_AFTER (pos, selection.end)
… …
3281 selection.mark.row = selection.beg.row; 3364 selection.mark.row = selection.beg.row;
3282 selection.mark.col = selection.beg.col; 3365 selection.mark.col = selection.beg.col;
3283 } 3366 }
3284 } 3367 }
3285 else 3368 else
3369 {
3286 { /* button1 drag or button3 drag */ 3370 /* button1 drag or button3 drag */
3287 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3371 if (ROWCOL_IS_AFTER (selection.mark, pos))
3288 { 3372 {
3289 if (selection.mark.row == selection.end.row 3373 if (selection.mark.row == selection.end.row
3290 && selection.mark.col == selection.end.col 3374 && selection.mark.col == selection.end.col
3291 && clickchange 3375 && clickchange
… …
3308 3392
3309 if (selection.clicks == 1) 3393 if (selection.clicks == 1)
3310 { 3394 {
3311 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3395 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3312 && !ROW(selection.beg.row).is_longer () 3396 && !ROW(selection.beg.row).is_longer ()
3313#if ENABLE_FRILLS 3397#if !ENABLE_MINIMAL
3314 && !selection.rect 3398 && !selection.rect
3315#endif 3399#endif
3316 ) 3400 )
3317 selection.beg.col = ncol; 3401 selection.beg.col = ncol;
3318 3402
3319 if ( 3403 if (
3320 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3404 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3321 && !ROW(selection.end.row).is_longer () 3405 && !ROW(selection.end.row).is_longer ()
3322#if ENABLE_FRILLS 3406#if !ENABLE_MINIMAL
3323 && !selection.rect 3407 && !selection.rect
3324#endif 3408#endif
3325 ) 3409 )
3326 selection.end.col = ncol; 3410 selection.end.col = ncol;
3327 } 3411 }
3328 else if (selection.clicks == 2) 3412 else if (selection.clicks == 2)
3329 { 3413 {
3330 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3414 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3331 selection.end.col--; 3415 selection.end.col--;
3332 3416
3333 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3334 {
3335 selection_delimit_word (UP, &selection.beg, &selection.beg); 3417 selection_delimit_word (UP, &selection.beg, &selection.beg);
3336 selection_delimit_word (DN, &selection.end, &selection.end); 3418 selection_delimit_word (DN, &selection.end, &selection.end);
3337 }
3338 } 3419 }
3339 else if (selection.clicks == 3) 3420 else if (selection.clicks == 3)
3340 { 3421 {
3341#if ENABLE_FRILLS 3422#if ENABLE_FRILLS
3342 if (OPTION (Opt_tripleclickwords)) 3423 if (option (Opt_tripleclickwords))
3343 { 3424 {
3344 selection_delimit_word (UP, &selection.beg, &selection.beg); 3425 selection_delimit_word (UP, &selection.beg, &selection.beg);
3345 3426
3346 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3427 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3347 { 3428 {
3348 if (!ROW(end_row).is_longer ()) 3429 if (!ROW(end_row).is_longer ())
3349 { 3430 {
3350 selection.end.row = end_row; 3431 selection.end.row = end_row;
3351 selection.end.col = ROW(end_row).l; 3432 selection.end.col = ROW(end_row).l;
3433# if !ENABLE_MINIMAL
3352 selection_remove_trailing_spaces (); 3434 selection_remove_trailing_spaces ();
3435# endif
3353 break; 3436 break;
3354 } 3437 }
3355 } 3438 }
3356 } 3439 }
3357 else 3440 else
… …
3373 selection.end.row++; 3456 selection.end.row++;
3374 } 3457 }
3375 } 3458 }
3376 3459
3377 if (button3 && buttonpress) 3460 if (button3 && buttonpress)
3461 {
3378 { /* mark may need to be changed */ 3462 /* mark may need to be changed */
3379 if (closeto == LEFT) 3463 if (closeto == LEFT)
3380 { 3464 {
3381 selection.mark.row = selection.end.row; 3465 selection.mark.row = selection.end.row;
3382 selection.mark.col = selection.end.col - (selection.clicks == 2); 3466 selection.mark.col = selection.end.col - (selection.clicks == 2);
3383 } 3467 }
… …
3386 selection.mark.row = selection.beg.row; 3470 selection.mark.row = selection.beg.row;
3387 selection.mark.col = selection.beg.col; 3471 selection.mark.col = selection.beg.col;
3388 } 3472 }
3389 } 3473 }
3390 3474
3391#if ENABLE_FRILLS 3475#if !ENABLE_MINIMAL
3392 if (selection.rect && selection.beg.col > selection.end.col) 3476 if (selection.rect && selection.beg.col > selection.end.col)
3393 ::swap (selection.beg.col, selection.end.col); 3477 ::swap (selection.beg.col, selection.end.col);
3394#endif 3478#endif
3395} 3479}
3396 3480
3397#if ENABLE_FRILLS 3481#if !ENABLE_MINIMAL
3398void 3482void
3399rxvt_term::selection_remove_trailing_spaces () 3483rxvt_term::selection_remove_trailing_spaces () NOTHROW
3400{ 3484{
3401 int32_t end_col, end_row; 3485 int32_t end_col, end_row;
3402 text_t *stp; 3486 text_t *stp;
3403 3487
3404 end_col = selection.end.col; 3488 end_col = selection.end.col;
… …
3442/* 3526/*
3443 * Double click on button 3 when already selected 3527 * Double click on button 3 when already selected
3444 * EXT: button 3 double click 3528 * EXT: button 3 double click
3445 */ 3529 */
3446void 3530void
3447rxvt_term::selection_rotate (int x, int y) 3531rxvt_term::selection_rotate (int x, int y) NOTHROW
3448{ 3532{
3449 selection.clicks = selection.clicks % 3 + 1; 3533 selection.clicks = selection.clicks % 3 + 1;
3450 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3534 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3451} 3535}
3452 3536
… …
3454/* 3538/*
3455 * Respond to a request for our current selection 3539 * Respond to a request for our current selection
3456 * EXT: SelectionRequest 3540 * EXT: SelectionRequest
3457 */ 3541 */
3458void 3542void
3459rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3543rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3460{ 3544{
3461 XSelectionEvent ev; 3545 XSelectionEvent ev;
3462 dDisp;
3463 3546
3464 ev.type = SelectionNotify; 3547 ev.type = SelectionNotify;
3465 ev.property = None; 3548 ev.property = None;
3466 ev.display = rq.display; 3549 ev.display = rq.display;
3467 ev.requestor = rq.requestor; 3550 ev.requestor = rq.requestor;
… …
3481 *target++ = xa[XA_COMPOUND_TEXT]; 3564 *target++ = xa[XA_COMPOUND_TEXT];
3482#if X_HAVE_UTF8_STRING 3565#if X_HAVE_UTF8_STRING
3483 *target++ = xa[XA_UTF8_STRING]; 3566 *target++ = xa[XA_UTF8_STRING];
3484#endif 3567#endif
3485 3568
3486 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3569 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3487 32, PropModeReplace, 3570 32, PropModeReplace,
3488 (unsigned char *)target_list, target - target_list); 3571 (unsigned char *)target_list, target - target_list);
3489 ev.property = rq.property; 3572 ev.property = rq.property;
3490 } 3573 }
3491#if TODO // TODO 3574#if TODO // TODO
… …
3494 /* TODO: Handle MULTIPLE */ 3577 /* TODO: Handle MULTIPLE */
3495 } 3578 }
3496#endif 3579#endif
3497 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3580 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3498 { 3581 {
3499 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3582 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3500 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3583 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3501 ev.property = rq.property; 3584 ev.property = rq.property;
3502 } 3585 }
3503 else if (rq.target == XA_STRING 3586 else if (rq.target == XA_STRING
3504 || rq.target == xa[XA_TEXT] 3587 || rq.target == xa[XA_TEXT]
… …
3528 style = enc_string; 3611 style = enc_string;
3529 else if (target == xa[XA_TEXT]) 3612 else if (target == xa[XA_TEXT])
3530 style = enc_text; 3613 style = enc_text;
3531 else if (target == xa[XA_COMPOUND_TEXT]) 3614 else if (target == xa[XA_COMPOUND_TEXT])
3532 style = enc_compound_text; 3615 style = enc_compound_text;
3533#if ENABLE_FRILLS 3616#if !ENABLE_MINIMAL
3534 else if (target == xa[XA_UTF8_STRING]) 3617 else if (target == xa[XA_UTF8_STRING])
3535 style = enc_utf8; 3618 style = enc_utf8;
3536#endif 3619#endif
3537 else 3620 else
3538 { 3621 {
… …
3549 { 3632 {
3550 cl = L""; 3633 cl = L"";
3551 selectlen = 0; 3634 selectlen = 0;
3552 } 3635 }
3553 3636
3554#if ENABLE_FRILLS 3637#if !ENABLE_MINIMAL
3555 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3638 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3556 // so recode it manually 3639 // so recode it manually
3557 if (style == enc_utf8) 3640 if (style == enc_utf8)
3558 { 3641 {
3559 freect = 1; 3642 freect = 1;
… …
3562 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3645 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3563 ct.nitems = strlen ((char *)ct.value); 3646 ct.nitems = strlen ((char *)ct.value);
3564 } 3647 }
3565 else 3648 else
3566#endif 3649#endif
3567 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3650 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3568 freect = 1; 3651 freect = 1;
3569 else 3652 else
3570 { 3653 {
3571 /* if we failed to convert then send it raw */ 3654 /* if we failed to convert then send it raw */
3572 ct.value = (unsigned char *)cl; 3655 ct.value = (unsigned char *)cl;
3573 ct.nitems = selectlen; 3656 ct.nitems = selectlen;
3574 ct.encoding = target; 3657 ct.encoding = target;
3575 } 3658 }
3576 3659
3577 XChangeProperty (disp, rq.requestor, rq.property, 3660 XChangeProperty (dpy, rq.requestor, rq.property,
3578 ct.encoding, 8, PropModeReplace, 3661 ct.encoding, 8, PropModeReplace,
3579 ct.value, (int)ct.nitems); 3662 ct.value, (int)ct.nitems);
3580 ev.property = rq.property; 3663 ev.property = rq.property;
3581 3664
3582 if (freect) 3665 if (freect)
3583 XFree (ct.value); 3666 XFree (ct.value);
3584 } 3667 }
3585 3668
3586 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3669 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3587}
3588
3589/* ------------------------------------------------------------------------- *
3590 * MOUSE ROUTINES *
3591 * ------------------------------------------------------------------------- */
3592
3593/*
3594 * return col/row values corresponding to x/y pixel values
3595 */
3596void
3597rxvt_term::pixel_position (int *x, int *y)
3598{
3599 *x = Pixel2Col (*x);
3600 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3601 *y = Pixel2Row (*y);
3602 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3603} 3670}
3604 3671
3605/* ------------------------------------------------------------------------- */ 3672/* ------------------------------------------------------------------------- */
3606#ifdef USE_XIM 3673#ifdef USE_XIM
3607void 3674void
3608rxvt_term::im_set_position (XPoint &pos) 3675rxvt_term::im_set_position (XPoint &pos) NOTHROW
3609{ 3676{
3610 XWindowAttributes xwa; 3677 XWindowAttributes xwa;
3611 3678
3612 XGetWindowAttributes (display->display, vt, &xwa); 3679 XGetWindowAttributes (dpy, vt, &xwa);
3613 3680
3614 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3681 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3615 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3682 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3616} 3683}
3617#endif 3684#endif
3618 3685
3619#if ENABLE_OVERLAY 3686#if ENABLE_OVERLAY
3620void 3687void
3621rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3688rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3622{ 3689{
3623 if (nrow < 1 || ncol < 1) 3690 if (nrow < 1 || ncol < 1)
3624 return; 3691 return;
3625 3692
3626 want_refresh = 1; 3693 want_refresh = 1;
… …
3671 *rp = r; 3738 *rp = r;
3672 } 3739 }
3673} 3740}
3674 3741
3675void 3742void
3676rxvt_term::scr_overlay_off () 3743rxvt_term::scr_overlay_off () NOTHROW
3677{ 3744{
3678 if (!ov_text) 3745 if (!ov_text)
3679 return; 3746 return;
3680 3747
3681 want_refresh = 1; 3748 want_refresh = 1;
… …
3689 delete [] ov_text; ov_text = 0; 3756 delete [] ov_text; ov_text = 0;
3690 delete [] ov_rend; ov_rend = 0; 3757 delete [] ov_rend; ov_rend = 0;
3691} 3758}
3692 3759
3693void 3760void
3694rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3761rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3695{ 3762{
3696 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3763 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3697 return; 3764 return;
3698 3765
3699 x++, y++; 3766 x++, y++;
… …
3701 ov_text[y][x] = text; 3768 ov_text[y][x] = text;
3702 ov_rend[y][x] = rend; 3769 ov_rend[y][x] = rend;
3703} 3770}
3704 3771
3705void 3772void
3706rxvt_term::scr_overlay_set (int x, int y, const char *s) 3773rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3707{ 3774{
3708 while (*s) 3775 while (*s)
3709 scr_overlay_set (x++, y, *s++); 3776 scr_overlay_set (x++, y, *s++);
3710} 3777}
3711 3778
3712void 3779void
3713rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3780rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3714{ 3781{
3715 while (*s) 3782 while (*s)
3716 { 3783 {
3717 text_t t = *s++; 3784 text_t t = *s++;
3718 int width = wcwidth (t); 3785 int width = WCWIDTH (t);
3719 3786
3720 while (width--) 3787 while (width--)
3721 { 3788 {
3722 scr_overlay_set (x++, y, t); 3789 scr_overlay_set (x++, y, t);
3723 t = NOCHAR; 3790 t = NOCHAR;
3724 } 3791 }
3725 } 3792 }
3726} 3793}
3727 3794
3728void 3795void
3729rxvt_term::scr_swap_overlay () 3796rxvt_term::scr_swap_overlay () NOTHROW
3730{ 3797{
3731 if (!ov_text) 3798 if (!ov_text)
3732 return; 3799 return;
3733 3800
3734 // swap screen mem with overlay 3801 // swap screen mem with overlay
3735 for (int y = ov_h; y--; ) 3802 for (int y = ov_h; y--; )
3736 { 3803 {
3737 text_t *t1 = ov_text[y]; 3804 text_t *t1 = ov_text[y];
3738 rend_t *r1 = ov_rend[y]; 3805 rend_t *r1 = ov_rend[y];
3739 3806
3740 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3807 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3741 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3808 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3742 3809
3743 for (int x = ov_w; x--; ) 3810 for (int x = ov_w; x--; )
3744 { 3811 {
3745 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3812 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3746 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3813 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