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.209 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.264 by root, Thu Jul 6 18:56:10 2006 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-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2006 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.
… …
93 */ 93 */
94#define drawBuffer vt 94#define drawBuffer vt
95 95
96#define CLEAR_ROWS(row, num) \ 96#define CLEAR_ROWS(row, num) \
97 if (mapped) \ 97 if (mapped) \
98 XClearArea (display->display, drawBuffer, 0, \ 98 XClearArea (dpy, drawBuffer, 0, \
99 Row2Pixel (row), (unsigned int)width, \ 99 Row2Pixel (row), (unsigned int)width, \
100 (unsigned int)Height2Pixel (num), False) 100 (unsigned int)Height2Pixel (num), False)
101 101
102#define CLEAR_CHARS(x, y, num) \ 102#define CLEAR_CHARS(x, y, num) \
103 if (mapped) \ 103 if (mapped) \
104 XClearArea (display->display, drawBuffer, x, y, \ 104 XClearArea (dpy, drawBuffer, x, y, \
105 (unsigned int)Width2Pixel (num), \ 105 (unsigned int)Width2Pixel (num), \
106 (unsigned int)Height2Pixel (1), False) 106 (unsigned int)Height2Pixel (1), False)
107 107
108#define ERASE_ROWS(row, num) \ 108#define ERASE_ROWS(row, num) \
109 XFillRectangle (display->display, drawBuffer, gc, \ 109 XFillRectangle (dpy, drawBuffer, gc, \
110 0, Row2Pixel (row), \ 110 0, Row2Pixel (row), \
111 (unsigned int)width, \ 111 (unsigned int)width, \
112 (unsigned int)Height2Pixel (num)) 112 (unsigned int)Height2Pixel (num))
113 113
114/* ------------------------------------------------------------------------- * 114/* ------------------------------------------------------------------------- *
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 efs &= ~RS_baseattrMask; 129 l.touch ();
130
131 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
131 133
132 text_t *et = l.t + col; 134 text_t *et = l.t + col;
133 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
134 136
… …
140} 142}
141 143
142/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
143/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
144void 146void
145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
146{ 148{
147 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
148} 153}
149 154
150/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
151 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
152 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
168 nrow = 24; 173 nrow = 24;
169 174
170 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
171 return; 176 return;
172 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
173 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
174 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
175 { 183 {
176 //TODO//FIXME 184 //TODO//FIXME
177 saveLines++; 185 saveLines++;
178 prev_nrow--; 186 prev_nrow--;
179 nsaved++; 187 top_row--;
180 } 188 }
181 189
182 want_refresh = 1; 190 want_refresh = 1;
183 191
184 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
… …
189 197
190 if (!row_buf) 198 if (!row_buf)
191 { 199 {
192 /* 200 /*
193 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 202 */
196 nsaved = 0; /* no saved lines */ 203 top_row = 0;
197 term_start = 0; 204 term_start = 0;
198 205
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 208
202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 212
207 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
208 { 214 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
231 selection.text = NULL; 237 selection.text = NULL;
232 selection.len = 0; 238 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
235 selection.clicks = 0; 241 selection.clicks = 0;
236 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
237 rvideo = 0;
238 } 243 }
239 else 244 else
240 { 245 {
241 /* 246 /*
242 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
255 } 260 }
256 } 261 }
257#endif 262#endif
258 263
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 266
263 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
264 { 268 {
265 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
270 { 274 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 } 277 }
274 278
279 line_t *old_buf = row_buf;
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 281
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
280 285
281 if (nsaved) 286 if (top_row)
282 { 287 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
285 290
286 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
287 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
288 293
… …
290 { 295 {
291 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif 299#endif
295
296 int plines = 1; 300 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 302
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 303 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 304 {
… …
318 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
320 { 324 {
321 qline = row_buf + qrow; 325 qline = row_buf + qrow;
322 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
323 qline->set_is_longer (); 328 qline->is_longer (1);
324 329
325 int qcol = 0; 330 int qcol = 0;
326 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
327 // fill a single destination line 336 // fill a single destination line
328 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
329 { 338 {
330 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
331 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
341 350
342 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
343 352
344 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
345 354
346 assert (len);
347 assert (pline.t);
348
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
351 357
352 lofs += len; 358 lofs += len;
353 qcol += len; 359 qcol += len;
354 } 360 }
355 } 361 }
356 362
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 364 qline->is_longer (0);
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366 } 366 }
367 while (p != pend && q > 0); 367 while (p != pend && q > 0);
368 368
369 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
370 nsaved = term_start - q; 370 top_row = q - term_start;
371 371
372 // make sure all terminal lines exist 372 // make sure all terminal lines exist
373 while (nsaved < 0) 373 while (top_row > 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375
376 } 375 }
377 else 376 else
378 { 377 {
379 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
380 379
… …
393 } 392 }
394 393
395 term_start = 0; 394 term_start = 0;
396 } 395 }
397 396
398#ifdef DEBUG_STRICT //TODO: remove
399 for (int i = -nsaved; i < nrow; i++)
400 assert (ROW (i).t);
401#endif
402
403 free (old_buf); 397 free (old_buf);
404 delete old_ta; 398 delete old_ta;
405 delete old_ra; 399 delete old_ra;
406 400
407 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
408 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
409 403
410 if (tabs)
411 free (tabs); 404 free (tabs);
412 } 405 }
406
407 CLEAR_ALL_SELECTION ();
413 408
414 prev_nrow = nrow; 409 prev_nrow = nrow;
415 prev_ncol = ncol; 410 prev_ncol = ncol;
416 411
417 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
418 413
419 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
420 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
421 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
422 tt_winch (); 420 tt_winch ();
423 421
424 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
425} 423}
426 424
427/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
428/* 426/*
429 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
430 */ 428 */
431void 429void
432rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
433{ 431{
432 if (row_buf)
433 {
434 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
435 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
436 436
437 free (row_buf); 437 free (row_buf);
438 free (swap_buf); 438 free (swap_buf);
439 free (drawn_buf); 439 free (drawn_buf);
440 free (temp_buf);
441 free (tabs); 440 free (tabs);
442 441
443 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
444} 444}
445 445
446/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
447/* 447/*
448 * Hard reset 448 * Hard reset
… …
453 scr_release (); 453 scr_release ();
454 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
455 scr_reset (); 455 scr_reset ();
456 456
457 scr_clear (true); 457 scr_clear (true);
458 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
459} 459}
460 460
461/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
465 * Save and Restore cursor 465 * Save and Restore cursor
466 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
467 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
468 */ 468 */
469void 469void
470rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
471{ 471{
472 screen_t *s; 472 screen_t *s;
473 473
474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
475 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
507 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
508 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
509#endif 509#endif
510} 510}
511 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
512/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
513/* 528/*
514 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
515 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
516 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
517 */ 532 */
518int 533void
519rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
520{ 535{
536 if (scrn == current_screen)
537 return;
538
521 want_refresh = 1; 539 want_refresh = 1;
522 view_start = 0; 540 view_start = 0;
523 541
524 if (current_screen == scrn)
525 return scrn;
526
527 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
528 543
529 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
530
531 ::swap (screen.cur.row, swap.cur.row);
532 ::swap (screen.cur.col, swap.cur.col);
533
534 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
535 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
536 545
537#if NSCREENS 546#if NSCREENS
538 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
539 { 548 {
540 num_scr = 0; 549 num_scr = 0;
541 550
542 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
543 ::swap (ROW(i), swap_buf [i]);
544 552
545 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
546 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
547 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
548 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
549 } 557 }
550 else 558 else
551#endif 559#endif
552 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
553 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
554
555 return scrn;
556} 562}
557 563
558// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
559void 565void
560rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
561{ 567{
562 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
563 return; 569 return;
564 570
565 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
575/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
576/* 582/*
577 * Change the colour for following text 583 * Change the colour for following text
578 */ 584 */
579void 585void
580rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
581{ 587{
582 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
583 color = fgbg; 589 color = fgbg;
584 590
585 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
586 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
587 else 593 else
… …
591/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
592/* 598/*
593 * Change the rendition style for following text 599 * Change the rendition style for following text
594 */ 600 */
595void 601void
596rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
597 { 603 {
598 if (set) 604 if (set)
599 rstyle |= style; 605 rstyle |= style;
600 else if (style == ~RS_None) 606 else if (style == ~RS_None)
601 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
608 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
609 * count positive ==> scroll up 615 * count positive ==> scroll up
610 * count negative ==> scroll down 616 * count negative ==> scroll down
611 */ 617 */
612int 618int
613rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
614{ 620{
615 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
616 return 0; 622 return 0;
617 623
618 want_refresh = 1; 624 want_refresh = 1;
619 num_scr += count; 625 num_scr += count;
620 626
621 if (count > 0 627 if (count > 0
622 && row1 == 0 628 && row1 == 0
623 && row2 == nrow - 1
624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625 { 630 {
626 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
627 632
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635
636 // sever bottommost line
637 {
638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
642
643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 {
646 line_t &l = ROW(nrow - 1 - i);
647
648 // optimize if already cleared, can be significant on slow machines
649 // could be rolled into scr_blank_screen_mem
650 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
651 {
652 scr_blank_line (l, 0, l.l, rstyle);
653 l.l = 0;
654 l.f = 0;
655 }
656 else
657 scr_blank_screen_mem (l, rstyle);
658 }
659
660 // now copy lines below the scroll region bottom to the
661 // bottom of the screen again, so they look as if they
662 // hadn't moved.
663 for (int i = nrow; --i > row2; )
664 {
665 line_t &l1 = ROW(i - count);
666 line_t &l2 = ROW(i);
667
668 ::swap (l1, l2);
669 l2.touch ();
670 }
629 671
630 term_start = (term_start + count) % total_rows; 672 // move and/or clear selection, if any
631
632 if (selection.op && current_screen == selection.screen) 673 if (selection.op && current_screen == selection.screen)
633 { 674 {
634 selection.beg.row -= count; 675 selection.beg.row -= count;
635 selection.end.row -= count; 676 selection.end.row -= count;
636 selection.mark.row -= count; 677 selection.mark.row -= count;
637 678
638 if (selection.beg.row < -nsaved 679 if (selection.beg.row < top_row
639 || selection.end.row < -nsaved 680 || selection.end.row < top_row
640 || selection.mark.row < -nsaved) 681 || selection.mark.row < top_row)
641 { 682 {
642 CLEAR_ALL_SELECTION (); 683 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR; 684 selection.op = SELECTION_CLEAR;
644 } 685 }
645 } 686 }
646 687
647 for (int i = count; i--; ) 688 // finally move the view window, if desired
648 {
649 ROW(row2 - i).l = 0;
650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
652
653 if (OPTION (Opt_scrollWithBuffer) 689 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 690 && view_start != 0
655 && view_start != saveLines) 691 && view_start != -saveLines)
656 scr_page (UP, count); 692 scr_page (UP, count);
693
694 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
695 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
657 } 696 }
658 else 697 else
659 { 698 {
660 if (selection.op && current_screen == selection.screen) 699 if (selection.op && current_screen == selection.screen)
661 { 700 {
… …
685 724
686 int rows = row2 - row1 + 1; 725 int rows = row2 - row1 + 1;
687 726
688 min_it (count, rows); 727 min_it (count, rows);
689 728
729 line_t *temp_buf = row_buf + total_rows;
730
690 for (int row = 0; row < rows; row++) 731 for (int row = 0; row < rows; row++)
691 { 732 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 733 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693 734
694 if (!IN_RANGE_EXC (row + count, 0, rows)) 735 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
705/* ------------------------------------------------------------------------- */ 746/* ------------------------------------------------------------------------- */
706/* 747/*
707 * Add text given in <str> of length <len> to screen struct 748 * Add text given in <str> of length <len> to screen struct
708 */ 749 */
709void 750void
710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 751rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
711{ 752{
712 if (len <= 0) /* sanity */ 753 if (len <= 0) /* sanity */
713 return; 754 return;
714 755
715 unsigned char checksel; 756 unsigned char checksel;
716 unicode_t c; 757 unicode_t c;
717 int last_col; 758 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 759 const wchar_t *strend = str + len;
719 760
720 want_refresh = 1; 761 want_refresh = 1;
721 ZERO_SCROLLBACK (); 762 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 763
724 if (nlines > 0) 764 if (minlines > 0)
725 { 765 {
726 nlines += screen.cur.row - screen.bscroll; 766 minlines += screen.cur.row - screen.bscroll;
767 min_it (minlines, screen.cur.row - top_row);
727 768
728 if (nlines > 0 769 if (minlines > 0
729 && screen.tscroll == 0 770 && screen.tscroll == 0
730 && screen.bscroll == (nrow - 1)) 771 && screen.bscroll == nrow - 1)
731 { 772 {
732 /* _at least_ this many lines need to be scrolled */ 773 /* _at least_ this many lines need to be scrolled */
733 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 774 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
734 screen.cur.row -= nlines; 775 screen.cur.row -= minlines;
735 } 776 }
736 } 777 }
737 778
738#ifdef DEBUG_STRICT 779#ifdef DEBUG_STRICT
739 assert (screen.cur.col < last_col); 780 assert (screen.cur.col < ncol);
740 assert (screen.cur.row < nrow 781 assert (screen.cur.row < nrow
741 && screen.cur.row >= -nsaved); 782 && screen.cur.row >= top_row);
742#endif 783#endif
743 int row = screen.cur.row; 784 int row = screen.cur.row;
744 785
745 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 786 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
746 787
747 line_t *line = &ROW(row); 788 line_t *line = &ROW(row);
748 789
749 while (str < strend) 790 while (str < strend)
750 { 791 {
751 c = *str++; 792 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
752 793
753 if (c < 0x20) 794 if (c < 0x20)
754 if (c == C0_LF) 795 if (c == C0_LF)
755 { 796 {
756 if (!line->is_longer ()) /* XXX: think about this */
757 max_it (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
758 798
759 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
760 800
761 if (screen.cur.row == screen.bscroll) 801 if (screen.cur.row == screen.bscroll)
762 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 802 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
766 line = &ROW(row); /* _must_ refresh */ 806 line = &ROW(row); /* _must_ refresh */
767 continue; 807 continue;
768 } 808 }
769 else if (c == C0_CR) 809 else if (c == C0_CR)
770 { 810 {
771 if (!line->is_longer ()) /* XXX: think about this */
772 max_it (line->l, screen.cur.col); 811 max_it (line->l, screen.cur.col);
773 812
774 screen.flags &= ~Screen_WrapNext; 813 screen.flags &= ~Screen_WrapNext;
775 screen.cur.col = 0; 814 screen.cur.col = 0;
776 continue; 815 continue;
777 } 816 }
… …
794 CLEAR_SELECTION (); 833 CLEAR_SELECTION ();
795 } 834 }
796 835
797 if (screen.flags & Screen_WrapNext) 836 if (screen.flags & Screen_WrapNext)
798 { 837 {
799 line->set_is_longer ();
800
801 scr_do_wrap (); 838 scr_do_wrap ();
802 839
840 line->l = ncol;
841 line->is_longer (1);
842
803 row = screen.cur.row; 843 row = screen.cur.row;
804 line = &ROW(row); /* _must_ refresh */ 844 line = &ROW(row); /* _must_ refresh */
805 } 845 }
806 846
807 // some utf-8 decoders "decode" surrogate characters: let's fix this. 847 // some utf-8 decoders "decode" surrogate characters: let's fix this.
808 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 848 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
809 c = 0xfffd; 849 c = 0xfffd;
810 850
811 // rely on wcwidth to tell us the character width, at least for non-latin1 851 // rely on wcwidth to tell us the character width, do wcwidth before
812 // do wcwidth before further replacements, as wcwidth might return -1 852 // further replacements, as wcwidth might return -1 for the line
813 // for the line drawing characters below as they might be invalid in the current 853 // drawing characters below as they might be invalid in the current
814 // locale. 854 // locale.
815 int width = c < 0x100 ? 1 : wcwidth (c); 855 int width = WCWIDTH (c);
816 856
817 if (charsets[screen.charset] == '0') // DEC SPECIAL 857 if (charsets [screen.charset] == '0') // DEC SPECIAL
818 { 858 {
819 // vt100 special graphics and line drawing 859 // vt100 special graphics and line drawing
820 // 5f-7e standard vt100 860 // 5f-7e standard vt100
821 // 40-5e rxvt extension for extra curses acs chars 861 // 40-5e rxvt extension for extra curses acs chars
822 static uint16_t vt100_0[62] = { // 41 .. 7e 862 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
874 } 914 }
875 915
876 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 916 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
877 917
878 // if the character doesn't fit into the remaining columns... 918 // if the character doesn't fit into the remaining columns...
879 if (screen.cur.col > last_col - width && last_col >= width) 919 if (screen.cur.col > ncol - width && ncol >= width)
880 { 920 {
881 // ...output spaces 921 // ...output spaces
882 c = ' '; 922 c = ' ';
883 // and try the same character next loop iteration 923 // and try the same character next loop iteration
884 --str; 924 --str;
885 } 925 }
886 926
927 line->touch ();
928
887 do 929 do
888 { 930 {
889 line->t[screen.cur.col] = c; 931 line->t[screen.cur.col] = c;
890 line->r[screen.cur.col] = rend; 932 line->r[screen.cur.col] = rend;
891 933
892 if (screen.cur.col < last_col - 1) 934 if (screen.cur.col < ncol - 1)
893 screen.cur.col++; 935 screen.cur.col++;
894 else 936 else
895 { 937 {
896 line->l = last_col; 938 line->l = ncol;
897 if (screen.flags & Screen_Autowrap) 939 if (screen.flags & Screen_Autowrap)
898 screen.flags |= Screen_WrapNext; 940 screen.flags |= Screen_WrapNext;
899 break; 941 break;
900 } 942 }
901 943
… …
903 } 945 }
904 while (--width > 0); 946 while (--width > 0);
905 947
906 // pad with spaces when overwriting wide character with smaller one 948 // pad with spaces when overwriting wide character with smaller one
907 if (!width) 949 if (!width)
950 {
951 line->touch ();
952
908 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 953 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
909 { 954 {
910 line->t[c] = ' '; 955 line->t[c] = ' ';
911 line->r[c] = rend; 956 line->r[c] = rend;
912 } 957 }
958 }
913 } 959 }
914 else // width == 0 960 else // width == 0
915 { 961 {
916#if ENABLE_COMBINING 962#if ENABLE_COMBINING
917 // handle combining characters 963 // handle combining characters
918 // we just tag the accent on the previous on-screen character. 964 // we just tag the accent on the previous on-screen character.
919 // this is arguably not correct, but also arguably not wrong. 965 // this is arguably not correct, but also arguably not wrong.
920 // we don't handle double-width characters nicely yet. 966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
921 text_t *tp; 968 text_t *tp;
922 rend_t *rp; 969 rend_t *rp;
923 970
924 if (screen.cur.col > 0) 971 if (screen.cur.col > 0)
925 { 972 {
973 linep = line;
926 tp = line->t + screen.cur.col - 1; 974 tp = line->t + screen.cur.col - 1;
927 rp = line->r + screen.cur.col - 1; 975 rp = line->r + screen.cur.col - 1;
928
929 while (*tp == NOCHAR && tp > line->t)
930 tp--, rp--;
931 } 976 }
932 else if (screen.cur.row > 0 977 else if (screen.cur.row > 0
933 && ROW(screen.cur.row - 1).is_longer ()) 978 && ROW(screen.cur.row - 1).is_longer ())
934 { 979 {
935 line_t *line = &ROW(screen.cur.row - 1); 980 linep = &ROW(screen.cur.row - 1);
936
937 tp = line->t + last_col - 1; 981 tp = line->t + ncol - 1;
938 rp = line->r + last_col - 1; 982 rp = line->r + ncol - 1;
939
940 while (*tp == NOCHAR && tp > line->t)
941 tp--, rp--;
942 } 983 }
943 else 984 else
944 continue; 985 continue;
986
987 linep->touch ();
988
989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
945 991
946 // first try to find a precomposed character 992 // first try to find a precomposed character
947 unicode_t n = rxvt_compose (*tp, c); 993 unicode_t n = rxvt_compose (*tp, c);
948 if (n == NOCHAR) 994 if (n == NOCHAR)
949 n = rxvt_composite.compose (*tp, c); 995 n = rxvt_composite.compose (*tp, c);
… …
952 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
953#endif 999#endif
954 } 1000 }
955 } 1001 }
956 1002
957 if (!line->is_longer ()) /* XXX: think about this */
958 max_it (line->l, screen.cur.col); 1003 max_it (line->l, screen.cur.col);
959 1004
960#ifdef DEBUG_STRICT 1005#ifdef DEBUG_STRICT
961 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
962#endif 1007#endif
963} 1008}
… …
966/* 1011/*
967 * Process Backspace. Move back the cursor back a position, wrap if have to 1012 * Process Backspace. Move back the cursor back a position, wrap if have to
968 * XTERM_SEQ: CTRL-H 1013 * XTERM_SEQ: CTRL-H
969 */ 1014 */
970void 1015void
971rxvt_term::scr_backspace () 1016rxvt_term::scr_backspace () NOTHROW
972{ 1017{
973 want_refresh = 1; 1018 want_refresh = 1;
974 1019
975 if (screen.cur.col == 0) 1020 if (screen.cur.col == 0)
976 { 1021 {
… …
994 * Process Horizontal Tab 1039 * Process Horizontal Tab
995 * count: +ve = forward; -ve = backwards 1040 * count: +ve = forward; -ve = backwards
996 * XTERM_SEQ: CTRL-I 1041 * XTERM_SEQ: CTRL-I
997 */ 1042 */
998void 1043void
999rxvt_term::scr_tab (int count, bool ht) 1044rxvt_term::scr_tab (int count, bool ht) NOTHROW
1000{ 1045{
1001 int i, x; 1046 int i, x;
1002 1047
1003 want_refresh = 1; 1048 want_refresh = 1;
1004 i = x = screen.cur.col; 1049 i = x = screen.cur.col;
… …
1013 1058
1014 for (; ++i < ncol; ) 1059 for (; ++i < ncol; )
1015 if (tabs[i]) 1060 if (tabs[i])
1016 { 1061 {
1017 x = i; 1062 x = i;
1063
1018 if (!--count) 1064 if (!--count)
1019 break; 1065 break;
1020 } 1066 }
1021 else 1067 else
1022 ht &= l.t[i] == ' ' 1068 ht &= l.t[i] == ' '
… …
1029 // buffer so they can be selected and pasted. 1075 // buffer so they can be selected and pasted.
1030 if (ht && OPTION (Opt_pastableTabs)) 1076 if (ht && OPTION (Opt_pastableTabs))
1031 { 1077 {
1032 base_rend = SET_FONT (base_rend, 0); 1078 base_rend = SET_FONT (base_rend, 0);
1033 1079
1034 if (!l.is_longer ()) /* XXX: think about this */ 1080 l.touch (x);
1035 max_it (l.l, x);
1036 1081
1037 i = screen.cur.col; 1082 i = screen.cur.col;
1038 1083
1039 l.t[i] = '\t'; 1084 l.t[i] = '\t';
1040 l.r[i] = base_rend; 1085 l.r[i] = base_rend;
… …
1069 * Process DEC Back Index 1114 * Process DEC Back Index
1070 * XTERM_SEQ: ESC 6 1115 * XTERM_SEQ: ESC 6
1071 * Move cursor left in row. If we're at the left boundary, shift everything 1116 * Move cursor left in row. If we're at the left boundary, shift everything
1072 * in that row right. Clear left column. 1117 * in that row right. Clear left column.
1073 */ 1118 */
1074#if ENABLE_FRILLS 1119#if !ENABLE_MINIMAL
1075void 1120void
1076rxvt_term::scr_backindex () 1121rxvt_term::scr_backindex () NOTHROW
1077{ 1122{
1078 if (screen.cur.col > 0) 1123 if (screen.cur.col > 0)
1079 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1124 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1080 else 1125 else
1081 scr_insdel_chars (1, INSERT); 1126 scr_insdel_chars (1, INSERT);
… …
1086 * Process DEC Forward Index 1131 * Process DEC Forward Index
1087 * XTERM_SEQ: ESC 9 1132 * XTERM_SEQ: ESC 9
1088 * Move cursor right in row. If we're at the right boundary, shift everything 1133 * Move cursor right in row. If we're at the right boundary, shift everything
1089 * in that row left. Clear right column. 1134 * in that row left. Clear right column.
1090 */ 1135 */
1091#if ENABLE_FRILLS 1136#if !ENABLE_MINIMAL
1092void 1137void
1093rxvt_term::scr_forwardindex () 1138rxvt_term::scr_forwardindex () NOTHROW
1094{ 1139{
1095 if (screen.cur.col < ncol - 1) 1140 if (screen.cur.col < ncol - 1)
1096 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1141 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1097 else 1142 else
1098 { 1143 {
1099 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1144 line_t &l = ROW(screen.cur.row);
1100 ROW(screen.cur.row).l = ncol; 1145
1146 l.touch ();
1147 l.is_longer (0);
1101 1148
1102 scr_gotorc (0, 0, R_RELATIVE); 1149 scr_gotorc (0, 0, R_RELATIVE);
1103 scr_insdel_chars (1, DELETE); 1150 scr_insdel_chars (1, DELETE);
1104 scr_gotorc (0, ncol - 1, R_RELATIVE); 1151 scr_gotorc (0, ncol - 1, R_RELATIVE);
1105 } 1152 }
… …
1109/* ------------------------------------------------------------------------- */ 1156/* ------------------------------------------------------------------------- */
1110/* 1157/*
1111 * Goto Row/Column 1158 * Goto Row/Column
1112 */ 1159 */
1113void 1160void
1114rxvt_term::scr_gotorc (int row, int col, int relative) 1161rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115{ 1162{
1116 want_refresh = 1; 1163 want_refresh = 1;
1117 ZERO_SCROLLBACK (); 1164 ZERO_SCROLLBACK ();
1118 1165
1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1166 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1157/* ------------------------------------------------------------------------- */ 1204/* ------------------------------------------------------------------------- */
1158/* 1205/*
1159 * direction should be UP or DN 1206 * direction should be UP or DN
1160 */ 1207 */
1161void 1208void
1162rxvt_term::scr_index (enum page_dirn direction) 1209rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163{ 1210{
1164 int dirn; 1211 int dirn;
1165 1212
1166 want_refresh = 1; 1213 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1214 ZERO_SCROLLBACK ();
… …
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1233 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1234 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1235 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1189 */ 1236 */
1190void 1237void
1191rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1239{
1193 unsigned int col, num; 1240 unsigned int col, num;
1194 1241
1195 want_refresh = 1; 1242 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1197 1244
1198 selection_check (1); 1245 selection_check (1);
1199 1246
1200 line_t &line = ROW(screen.cur.row); 1247 line_t &line = ROW(screen.cur.row);
1248
1249 line.touch ();
1250 line.is_longer (0);
1201 1251
1202 switch (mode) 1252 switch (mode)
1203 { 1253 {
1204 case 0: /* erase to end of line */ 1254 case 0: /* erase to end of line */
1205 col = screen.cur.col; 1255 col = screen.cur.col;
… …
1237 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1287 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1238 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1288 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1239 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1289 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1240 */ 1290 */
1241void 1291void
1242rxvt_term::scr_erase_screen (int mode) 1292rxvt_term::scr_erase_screen (int mode) NOTHROW
1243{ 1293{
1244 int num; 1294 int num;
1245 int32_t row; 1295 int32_t row;
1246 rend_t ren; 1296 rend_t ren;
1247 XGCValues gcvalue; 1297 XGCValues gcvalue;
… …
1292 } 1342 }
1293 else 1343 else
1294 { 1344 {
1295 ren = rstyle & (RS_fgMask | RS_bgMask); 1345 ren = rstyle & (RS_fgMask | RS_bgMask);
1296 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; 1346 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1297 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1347 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1298 ERASE_ROWS (row, num); 1348 ERASE_ROWS (row, num);
1299 gcvalue.foreground = pix_colors[Color_fg]; 1349 gcvalue.foreground = pix_colors[Color_fg];
1300 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1350 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1301 } 1351 }
1302 1352
1303 for (; num--; row++) 1353 for (; num--; row++)
1304 { 1354 {
1305 ROW (row).l = 0;
1306 scr_blank_screen_mem (ROW (row), rstyle); 1355 scr_blank_screen_mem (ROW(row), rstyle);
1307 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1356 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1308 } 1357 }
1309} 1358}
1310 1359
1311#if ENABLE_FRILLS 1360#if !ENABLE_MINIMAL
1312void 1361void
1313rxvt_term::scr_erase_savelines () 1362rxvt_term::scr_erase_savelines () NOTHROW
1314{ 1363{
1315 want_refresh = 1; 1364 want_refresh = 1;
1316 ZERO_SCROLLBACK (); 1365 ZERO_SCROLLBACK ();
1317 1366
1318 nsaved = 0; 1367 top_row = 0;
1319} 1368}
1320#endif 1369#endif
1321 1370
1322/* ------------------------------------------------------------------------- */ 1371/* ------------------------------------------------------------------------- */
1323/* 1372/*
1324 * Fill the screen with `E's 1373 * Fill the screen with `E's
1325 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1374 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1326 */ 1375 */
1327void 1376void
1328rxvt_term::scr_E () 1377rxvt_term::scr_E () NOTHROW
1329{ 1378{
1330 rend_t fs; 1379 rend_t fs;
1331 1380
1332 want_refresh = 1; 1381 want_refresh = 1;
1333 ZERO_SCROLLBACK (); 1382 ZERO_SCROLLBACK ();
… …
1344 rend_t *r1 = line.r; 1393 rend_t *r1 = line.r;
1345 1394
1346 for (int j = ncol; j--; ) 1395 for (int j = ncol; j--; )
1347 *r1++ = fs; 1396 *r1++ = fs;
1348 1397
1349 line.l = ncol; /* make the `E's selectable */ 1398 line.is_longer (0);
1399 line.touch (ncol);
1350 } 1400 }
1351} 1401}
1352 1402
1353/* ------------------------------------------------------------------------- */ 1403/* ------------------------------------------------------------------------- */
1354/* 1404/*
1355 * Insert/Delete <count> lines 1405 * Insert/Delete <count> lines
1356 */ 1406 */
1357void 1407void
1358rxvt_term::scr_insdel_lines (int count, int insdel) 1408rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1359{ 1409{
1360 int end; 1410 int end;
1361 1411
1362 ZERO_SCROLLBACK (); 1412 ZERO_SCROLLBACK ();
1363 1413
… …
1383/* ------------------------------------------------------------------------- */ 1433/* ------------------------------------------------------------------------- */
1384/* 1434/*
1385 * Insert/Delete <count> characters from the current position 1435 * Insert/Delete <count> characters from the current position
1386 */ 1436 */
1387void 1437void
1388rxvt_term::scr_insdel_chars (int count, int insdel) 1438rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1389{ 1439{
1390 int col, row; 1440 int col, row;
1391 rend_t tr; 1441 rend_t tr;
1392 1442
1393 want_refresh = 1; 1443 want_refresh = 1;
… …
1402 min_it (count, ncol - screen.cur.col); 1452 min_it (count, ncol - screen.cur.col);
1403 1453
1404 row = screen.cur.row; 1454 row = screen.cur.row;
1405 1455
1406 line_t *line = &ROW(row); 1456 line_t *line = &ROW(row);
1457
1458 line->touch ();
1459 line->is_longer (0);
1407 1460
1408 switch (insdel) 1461 switch (insdel)
1409 { 1462 {
1410 case INSERT: 1463 case INSERT:
1411 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1464 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1412 { 1465 {
1413 line->t[col] = line->t[col - count]; 1466 line->t[col] = line->t[col - count];
1414 line->r[col] = line->r[col - count]; 1467 line->r[col] = line->r[col - count];
1415 } 1468 }
1416 1469
1417 if (!line->is_longer ()) 1470 line->l = min (line->l + count, ncol);
1418 {
1419 line->l += count;
1420 min_it (line->l, ncol);
1421 }
1422 1471
1423 if (selection.op && current_screen == selection.screen 1472 if (selection.op && current_screen == selection.screen
1424 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1473 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1425 { 1474 {
1426 if (selection.end.row != screen.cur.row 1475 if (selection.end.row != screen.cur.row
… …
1439 1488
1440 case ERASE: 1489 case ERASE:
1441 screen.cur.col += count; /* don't worry if > ncol */ 1490 screen.cur.col += count; /* don't worry if > ncol */
1442 selection_check (1); 1491 selection_check (1);
1443 screen.cur.col -= count; 1492 screen.cur.col -= count;
1493
1494 line->l = max (line->l - count, 0);
1444 scr_blank_line (*line, screen.cur.col, count, rstyle); 1495 scr_blank_line (*line, screen.cur.col, count, rstyle);
1445 break; 1496 break;
1446 1497
1447 case DELETE: 1498 case DELETE:
1448 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1499 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1451 { 1502 {
1452 line->t[col] = line->t[col + count]; 1503 line->t[col] = line->t[col + count];
1453 line->r[col] = line->r[col + count]; 1504 line->r[col] = line->r[col + count];
1454 } 1505 }
1455 1506
1507 line->l = max (line->l - count, 0);
1456 scr_blank_line (*line, ncol - count, count, tr); 1508 scr_blank_line (*line, ncol - count, count, tr);
1457
1458 if (line->is_longer ()) /* break line continuation */
1459 line->l = ncol;
1460
1461 line->l = max (line->l - count, 0);
1462 1509
1463 if (selection.op && current_screen == selection.screen 1510 if (selection.op && current_screen == selection.screen
1464 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1511 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1465 { 1512 {
1466 if (selection.end.row != screen.cur.row 1513 if (selection.end.row != screen.cur.row
… …
1484/* 1531/*
1485 * Set the scrolling region 1532 * Set the scrolling region
1486 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1533 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1487 */ 1534 */
1488void 1535void
1489rxvt_term::scr_scroll_region (int top, int bot) 1536rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1490{ 1537{
1491 max_it (top, 0); 1538 max_it (top, 0);
1492 min_it (bot, nrow - 1); 1539 min_it (bot, nrow - 1);
1493 1540
1494 if (top > bot) 1541 if (top > bot)
… …
1504 * Make the cursor visible/invisible 1551 * Make the cursor visible/invisible
1505 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1552 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1506 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1553 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1507 */ 1554 */
1508void 1555void
1509rxvt_term::scr_cursor_visible (int mode) 1556rxvt_term::scr_cursor_visible (int mode) NOTHROW
1510{ 1557{
1511 want_refresh = 1; 1558 want_refresh = 1;
1512 1559
1513 if (mode) 1560 if (mode)
1514 screen.flags |= Screen_VisibleCursor; 1561 screen.flags |= Screen_VisibleCursor;
… …
1521 * Set/unset automatic wrapping 1568 * Set/unset automatic wrapping
1522 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1569 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1523 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1570 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1524 */ 1571 */
1525void 1572void
1526rxvt_term::scr_autowrap (int mode) 1573rxvt_term::scr_autowrap (int mode) NOTHROW
1527{ 1574{
1528 if (mode) 1575 if (mode)
1529 screen.flags |= Screen_Autowrap; 1576 screen.flags |= Screen_Autowrap;
1530 else 1577 else
1531 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1578 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1540 * and the cursor cannot be moved outside. 1587 * and the cursor cannot be moved outside.
1541 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1588 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1542 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1589 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1543 */ 1590 */
1544void 1591void
1545rxvt_term::scr_relative_origin (int mode) 1592rxvt_term::scr_relative_origin (int mode) NOTHROW
1546{ 1593{
1547 if (mode) 1594 if (mode)
1548 screen.flags |= Screen_Relative; 1595 screen.flags |= Screen_Relative;
1549 else 1596 else
1550 screen.flags &= ~Screen_Relative; 1597 screen.flags &= ~Screen_Relative;
… …
1557 * Set insert/replace mode 1604 * Set insert/replace mode
1558 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1605 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1559 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1606 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1560 */ 1607 */
1561void 1608void
1562rxvt_term::scr_insert_mode (int mode) 1609rxvt_term::scr_insert_mode (int mode) NOTHROW
1563{ 1610{
1564 if (mode) 1611 if (mode)
1565 screen.flags |= Screen_Insert; 1612 screen.flags |= Screen_Insert;
1566 else 1613 else
1567 screen.flags &= ~Screen_Insert; 1614 screen.flags &= ~Screen_Insert;
… …
1573 * XTERM_SEQ: Set tab at current column : ESC H 1620 * XTERM_SEQ: Set tab at current column : ESC H
1574 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1621 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1575 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1622 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1576 */ 1623 */
1577void 1624void
1578rxvt_term::scr_set_tab (int mode) 1625rxvt_term::scr_set_tab (int mode) NOTHROW
1579{ 1626{
1580 if (mode < 0) 1627 if (mode < 0)
1581 memset (tabs, 0, ncol * sizeof (char)); 1628 memset (tabs, 0, ncol * sizeof (char));
1582 else if (screen.cur.col < ncol) 1629 else if (screen.cur.col < ncol)
1583 tabs[screen.cur.col] = (mode ? 1 : 0); 1630 tabs [screen.cur.col] = !!mode;
1584} 1631}
1585 1632
1586/* ------------------------------------------------------------------------- */ 1633/* ------------------------------------------------------------------------- */
1587/* 1634/*
1588 * Set reverse/normal video 1635 * Set reverse/normal video
1589 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1636 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1590 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1637 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1591 */ 1638 */
1592void 1639void
1593rxvt_term::scr_rvideo_mode (int mode) 1640rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1594{ 1641{
1595 XGCValues gcvalue; 1642 rvideo_mode = on;
1596 1643
1644#ifndef NO_BELL
1645 on ^= rvideo_bell;
1646#endif
1647
1597 if (rvideo != mode) 1648 if (rvideo_state != on)
1598 { 1649 {
1599 rvideo = mode; 1650 rvideo_state = on;
1651
1600 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1652 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1601#if XPM_BACKGROUND 1653#if XPM_BACKGROUND
1602 if (bgPixmap.pixmap == None) 1654 if (bgPixmap.pixmap == None)
1603#endif 1655#endif
1604#if TRANSPARENT 1656#if TRANSPARENT
1605 if (! OPTION (Opt_transparent) || am_transparent == 0) 1657 if (!OPTION (Opt_transparent) || am_transparent == 0)
1606#endif 1658#endif
1607 XSetWindowBackground (display->display, vt, 1659 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1608 pix_colors[Color_bg]);
1609 1660
1661 XGCValues gcvalue;
1610 gcvalue.foreground = pix_colors[Color_fg]; 1662 gcvalue.foreground = pix_colors[Color_fg];
1611 gcvalue.background = pix_colors[Color_bg]; 1663 gcvalue.background = pix_colors[Color_bg];
1612 XChangeGC (display->display, gc, GCBackground | GCForeground, 1664 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1613 &gcvalue); 1665
1614 scr_clear (); 1666 scr_clear ();
1615 scr_touch (true); 1667 scr_touch (true);
1616 } 1668 }
1617} 1669}
1618 1670
… …
1620/* 1672/*
1621 * Report current cursor position 1673 * Report current cursor position
1622 * XTERM_SEQ: Report position: ESC [ 6 n 1674 * XTERM_SEQ: Report position: ESC [ 6 n
1623 */ 1675 */
1624void 1676void
1625rxvt_term::scr_report_position () 1677rxvt_term::scr_report_position () NOTHROW
1626{ 1678{
1627 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1679 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1628} 1680}
1629 1681
1630/* ------------------------------------------------------------------------- * 1682/* ------------------------------------------------------------------------- *
… …
1633 1685
1634/* 1686/*
1635 * Set font style 1687 * Set font style
1636 */ 1688 */
1637void 1689void
1638rxvt_term::set_font_style () 1690rxvt_term::set_font_style () NOTHROW
1639{ 1691{
1692#if 0
1640 switch (charsets[screen.charset]) 1693 switch (charsets [screen.charset])
1641 { 1694 {
1642 case '0': /* DEC Special Character & Line Drawing Set */ 1695 case '0': /* DEC Special Character & Line Drawing Set */
1643 break; 1696 break;
1644 case 'A': /* United Kingdom (UK) */ 1697 case 'A': /* United Kingdom (UK) */
1645 break; 1698 break;
… …
1652 case 'C': /* Finnish character set */ 1705 case 'C': /* Finnish character set */
1653 break; 1706 break;
1654 case 'K': /* German character set */ 1707 case 'K': /* German character set */
1655 break; 1708 break;
1656 } 1709 }
1710#endif
1657} 1711}
1658 1712
1659/* ------------------------------------------------------------------------- */ 1713/* ------------------------------------------------------------------------- */
1660/* 1714/*
1661 * Choose a font 1715 * Choose a font
… …
1663 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1717 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1664 * XTERM_SEQ: Invoke G2 character set: ESC N 1718 * XTERM_SEQ: Invoke G2 character set: ESC N
1665 * XTERM_SEQ: Invoke G3 character set: ESC O 1719 * XTERM_SEQ: Invoke G3 character set: ESC O
1666 */ 1720 */
1667void 1721void
1668rxvt_term::scr_charset_choose (int set) 1722rxvt_term::scr_charset_choose (int set) NOTHROW
1669{ 1723{
1670 screen.charset = set; 1724 screen.charset = set;
1671 set_font_style (); 1725 set_font_style ();
1672} 1726}
1673 1727
… …
1679 * XTERM_SEQ: Set G2 character set: ESC * <C> 1733 * XTERM_SEQ: Set G2 character set: ESC * <C>
1680 * XTERM_SEQ: Set G3 character set: ESC + <C> 1734 * XTERM_SEQ: Set G3 character set: ESC + <C>
1681 * See set_font_style for possible values for <C> 1735 * See set_font_style for possible values for <C>
1682 */ 1736 */
1683void 1737void
1684rxvt_term::scr_charset_set (int set, unsigned int ch) 1738rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1685{ 1739{
1686 charsets[set] = (unsigned char)ch; 1740 charsets[set] = (unsigned char)ch;
1687 set_font_style (); 1741 set_font_style ();
1688} 1742}
1689 1743
… …
1694 1748
1695/* 1749/*
1696 * refresh matching text. 1750 * refresh matching text.
1697 */ 1751 */
1698bool 1752bool
1699rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1753rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1700{ 1754{
1701 bool found = false; 1755 bool found = false;
1702 1756
1703 for (int i = 0; i < nrow; i++) 1757 for (int i = 0; i < nrow; i++)
1704 { 1758 {
1705 int col = 0;
1706 rend_t *drp = drawn_buf[i].r; 1759 rend_t *drp = drawn_buf[i].r;
1707 1760
1708 for (; col < ncol; col++, drp++) 1761 for (int col = 0; col < ncol; col++, drp++)
1709 if ((*drp & mask) == value) 1762 if ((*drp & mask) == value)
1710 { 1763 {
1711 found = true; 1764 found = true;
1712 *drp = ~value; 1765 *drp = ~value;
1713 } 1766 }
… …
1724 PART_END, 1777 PART_END,
1725 RC_COUNT 1778 RC_COUNT
1726}; 1779};
1727 1780
1728void 1781void
1729rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1782rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1730{ 1783{
1731 int i; 1784 int i;
1732 row_col_t rc[RC_COUNT]; 1785 row_col_t rc[RC_COUNT];
1733 1786
1734 if (!drawn_buf) /* sanity check */ 1787 if (!drawn_buf) /* sanity check */
… …
1757 } 1810 }
1758 1811
1759 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1812 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1760 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1813 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1761 1814
1815 num_scr_allow = 0;
1816
1762 if (refresh) 1817 if (refresh)
1763 scr_refresh (SLOW_REFRESH); 1818 scr_refresh ();
1764} 1819}
1765 1820
1766/* ------------------------------------------------------------------------- */ 1821/* ------------------------------------------------------------------------- */
1767/* 1822/*
1768 * Refresh the entire screen 1823 * Refresh the entire screen
1769 */ 1824 */
1770void 1825void
1771rxvt_term::scr_touch (bool refresh) 1826rxvt_term::scr_touch (bool refresh) NOTHROW
1772{ 1827{
1773 scr_expose (0, 0, width, height, refresh); 1828 scr_expose (0, 0, width, height, refresh);
1774} 1829}
1775 1830
1776/* ------------------------------------------------------------------------- */ 1831/* ------------------------------------------------------------------------- */
1777/* 1832/*
1778 * Move the display so that the line represented by scrollbar value Y is at 1833 * Move the display so that the line represented by scrollbar value Y is at
1779 * the top of the screen 1834 * the top of the screen
1780 */ 1835 */
1781int 1836void
1782rxvt_term::scr_move_to (int y, int len) 1837rxvt_term::scr_move_to (int y, int len) NOTHROW
1783{ 1838{
1784 long p = 0; 1839 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1785 unsigned int oldviewstart;
1786
1787 oldviewstart = view_start;
1788
1789 if (y < len)
1790 {
1791 p = (nrow + nsaved) * (len - y) / len;
1792 p -= (long) (nrow - 1);
1793 p = max (p, 0);
1794 }
1795
1796 view_start = (unsigned int)min (p, nsaved);
1797
1798 return scr_changeview (oldviewstart);
1799} 1840}
1800 1841
1801/* ------------------------------------------------------------------------- */ 1842/* ------------------------------------------------------------------------- */
1802/* 1843/*
1803 * Page the screen up/down nlines 1844 * Page the screen up/down nlines
1804 * direction should be UP or DN 1845 * direction should be UP or DN
1805 */ 1846 */
1806int 1847bool
1807rxvt_term::scr_page (enum page_dirn direction, int nlines) 1848rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1808{ 1849{
1809 int n; 1850 int new_view_start =
1810 unsigned int oldviewstart;
1811
1812 oldviewstart = view_start;
1813
1814 if (direction == UP)
1815 {
1816 n = view_start + nlines;
1817 view_start = min (n, nsaved);
1818 }
1819 else
1820 {
1821 n = view_start - nlines; 1851 direction == UP ? view_start - nlines
1822 view_start = max (n, 0); 1852 : view_start + nlines;
1823 }
1824 1853
1825 return scr_changeview (oldviewstart); 1854 return scr_changeview (new_view_start);
1826} 1855}
1827 1856
1828int 1857bool
1829rxvt_term::scr_changeview (unsigned int oldviewstart) 1858rxvt_term::scr_changeview (int new_view_start) NOTHROW
1830{ 1859{
1860 clamp_it (new_view_start, top_row, 0);
1861
1862 if (new_view_start == view_start)
1863 return false;
1864
1865 num_scr += new_view_start - view_start;
1866 view_start = new_view_start;
1867 want_refresh = 1;
1868
1831 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1869 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1832 1870
1833 if (view_start != oldviewstart) 1871 return true;
1834 {
1835 want_refresh = 1;
1836 num_scr -= (view_start - oldviewstart);
1837 }
1838
1839 return (int) (view_start - oldviewstart);
1840} 1872}
1841 1873
1842/* ------------------------------------------------------------------------- */ 1874#ifndef NO_BELL
1843void 1875void
1876rxvt_term::bell_cb (time_watcher &w)
1877{
1878 rvideo_bell = false;
1879 scr_rvideo_mode (rvideo_mode);
1880}
1881#endif
1882
1883/* ------------------------------------------------------------------------- */
1884void
1844rxvt_term::scr_bell () 1885rxvt_term::scr_bell () NOTHROW
1845{ 1886{
1846#ifndef NO_BELL 1887#ifndef NO_BELL
1847 1888
1848# ifndef NO_MAPALERT 1889# ifndef NO_MAPALERT
1849# ifdef MAPALERT_OPTION 1890# ifdef MAPALERT_OPTION
1850 if (OPTION (Opt_mapAlert)) 1891 if (OPTION (Opt_mapAlert))
1851# endif 1892# endif
1852 XMapWindow (display->display, parent[0]); 1893 XMapWindow (dpy, parent[0]);
1853# endif 1894# endif
1854 1895
1855 if (OPTION (Opt_visualBell)) 1896 if (OPTION (Opt_visualBell))
1856 { 1897 {
1857 scr_rvideo_mode (!rvideo); /* refresh also done */ 1898 rvideo_bell = true;
1858 rxvt_usleep (VISUAL_BELL_DURATION); 1899 scr_rvideo_mode (rvideo_mode);
1859 scr_rvideo_mode (!rvideo); /* refresh also done */ 1900 display->flush ();
1901
1902 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1860 } 1903 }
1861 else 1904 else
1862 XBell (display->display, 0); 1905 XBell (dpy, 0);
1863 1906
1864#endif 1907#endif
1865} 1908}
1866 1909
1867/* ------------------------------------------------------------------------- */ 1910/* ------------------------------------------------------------------------- */
1868/* ARGSUSED */ 1911/* ARGSUSED */
1869void 1912void
1870rxvt_term::scr_printscreen (int fullhist) 1913rxvt_term::scr_printscreen (int fullhist) NOTHROW
1871{ 1914{
1872#ifdef PRINTPIPE 1915#ifdef PRINTPIPE
1873 int nrows, row_start; 1916 int nrows, row_start;
1874 FILE *fd; 1917 FILE *fd;
1875 1918
1876 if ((fd = popen_printer ()) == NULL) 1919 if ((fd = popen_printer ()) == NULL)
1877 return; 1920 return;
1878 1921
1879 if (fullhist) 1922 if (fullhist)
1880 { 1923 {
1881 nrows = nrow + nsaved; 1924 nrows = nrow - top_row;
1882 row_start = -nsaved; 1925 row_start = top_row;
1883 } 1926 }
1884 else 1927 else
1885 { 1928 {
1886 nrows = nrow; 1929 nrows = nrow;
1887 row_start = -view_start; 1930 row_start = view_start;
1888 } 1931 }
1889 1932
1890 wctomb (0, 0); 1933 wctomb (0, 0);
1891 1934
1892 for (int r1 = 0; r1 < nrows; r1++) 1935 for (int r1 = 0; r1 < nrows; r1++)
… …
1924 * Refresh the screen 1967 * Refresh the screen
1925 * drawn_text/drawn_rend contain the screen information before the update. 1968 * drawn_text/drawn_rend contain the screen information before the update.
1926 * screen.text/screen.rend contain what the screen will change to. 1969 * screen.text/screen.rend contain what the screen will change to.
1927 */ 1970 */
1928void 1971void
1929rxvt_term::scr_refresh (unsigned char refresh_type) 1972rxvt_term::scr_refresh () NOTHROW
1930{ 1973{
1931 unsigned char must_clear, /* use draw_string not draw_image_string */ 1974 unsigned char have_bg,
1932 showcursor; /* show the cursor */ 1975 showcursor; /* show the cursor */
1933 int16_t col, row, /* column/row we're processing */ 1976 int16_t col, row, /* column/row we're processing */
1934 ocrow; /* old cursor row */ 1977 ocrow; /* old cursor row */
1935 int i; /* tmp */ 1978 int i; /* tmp */
1936#ifndef NO_CURSORCOLOR 1979#ifndef NO_CURSORCOLOR
… …
1944 return; 1987 return;
1945 1988
1946 /* 1989 /*
1947 * A: set up vars 1990 * A: set up vars
1948 */ 1991 */
1949 must_clear = 0; 1992 have_bg = 0;
1950 refresh_count = 0; 1993 refresh_count = 0;
1951 1994
1952#if XPM_BACKGROUND 1995#if XPM_BACKGROUND
1953 must_clear |= bgPixmap.pixmap != None; 1996 have_bg |= bgPixmap.pixmap != None;
1954#endif 1997#endif
1955#if TRANSPARENT 1998#if TRANSPARENT
1956 must_clear |= OPTION (Opt_transparent) && am_transparent; 1999 have_bg |= OPTION (Opt_transparent) && am_transparent;
1957#endif 2000#endif
1958 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2001 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1959 2002
1960 /* 2003 /*
1961 * B: reverse any characters which are selected 2004 * B: reverse any characters which are selected
… …
2020 2063
2021 /* make sure no outline cursor is left around */ 2064 /* make sure no outline cursor is left around */
2022 setoldcursor = 0; 2065 setoldcursor = 0;
2023 if (ocrow != -1) 2066 if (ocrow != -1)
2024 { 2067 {
2025 if (screen.cur.row + view_start != ocrow 2068 if (screen.cur.row - view_start != ocrow
2026 || screen.cur.col != oldcursor.col) 2069 || screen.cur.col != oldcursor.col)
2027 { 2070 {
2028 if (ocrow < nrow 2071 if (ocrow < nrow
2029 && oldcursor.col < ncol) 2072 && oldcursor.col < ncol)
2030 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2073 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2038 else if (!focus) 2081 else if (!focus)
2039 setoldcursor = 1; 2082 setoldcursor = 1;
2040 2083
2041 if (setoldcursor) 2084 if (setoldcursor)
2042 { 2085 {
2043 if (screen.cur.row + view_start >= nrow) 2086 if (screen.cur.row - view_start >= nrow)
2044 oldcursor.row = -1; 2087 oldcursor.row = -1;
2045 else 2088 else
2046 { 2089 {
2047 oldcursor.row = screen.cur.row + view_start; 2090 oldcursor.row = screen.cur.row - view_start;
2048 oldcursor.col = screen.cur.col; 2091 oldcursor.col = screen.cur.col;
2049 } 2092 }
2050 } 2093 }
2051 } 2094 }
2052 2095
2053 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2096 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2054#if ENABLE_OVERLAY 2097#if ENABLE_OVERLAY
2055 scr_swap_overlay (); 2098 scr_swap_overlay ();
2056#endif 2099#endif
2057 2100
2058#ifndef NO_SLOW_LINK_SUPPORT 2101#ifndef NO_SLOW_LINK_SUPPORT
2059 /* 2102 /*
2060 * D: CopyArea pass - very useful for slower links 2103 * D: CopyArea pass - very useful for slower links
2061 * This has been deliberately kept simple. 2104 * This has been deliberately kept simple.
2062 */ 2105 */
2063 i = num_scr;
2064 if (!display->is_local 2106 if (!display->is_local
2065 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2107 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2066 && abs (num_scr) < nrow && !must_clear) 2108 && abs (num_scr) < nrow && !have_bg)
2067 { 2109 {
2068 int16_t nits; 2110 int16_t nits;
2111 int i = num_scr;
2069 int j; 2112 int j;
2070 int len, wlen; 2113 int len, wlen;
2114 dLocal (int, num_scr);
2071 2115
2072 j = nrow; 2116 j = nrow;
2073 wlen = len = -1; 2117 wlen = len = -1;
2074 row = i > 0 ? 0 : j - 1; 2118 row = i > 0 ? 0 : j - 1;
2119
2075 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2120 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2076 { 2121 {
2077 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2122 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2078 { 2123 {
2079 line_t s = ROW(row - view_start); 2124 line_t s = ROW(view_start + row);
2080 line_t d = drawn_buf[row]; 2125 line_t d = drawn_buf[row];
2081 line_t d2 = drawn_buf[row + i]; 2126 line_t d2 = drawn_buf[row + i];
2082 2127
2083 for (nits = 0, col = ncol; col--; ) 2128 for (nits = 0, col = ncol; col--; )
2084 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2129 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2100 wlen = row; 2145 wlen = row;
2101 continue; 2146 continue;
2102 } 2147 }
2103 } 2148 }
2104 2149
2105 if (len != -1) 2150 if (len >= 0)
2106 { 2151 {
2107 /* also comes here at end if needed because of >= above */ 2152 /* also comes here at end if needed because of >= above */
2108 if (wlen < len) 2153 if (wlen < len)
2109 ::swap (wlen, len); 2154 ::swap (wlen, len);
2110 2155
2156 XGCValues gcv;
2157
2158 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2111 XCopyArea (display->display, vt, vt, 2159 XCopyArea (dpy, vt, vt,
2112 gc, 0, Row2Pixel (len + i), 2160 gc, 0, Row2Pixel (len + i),
2113 (unsigned int)this->width, 2161 (unsigned int)this->width,
2114 (unsigned int)Height2Pixel (wlen - len + 1), 2162 (unsigned int)Height2Pixel (wlen - len + 1),
2115 0, Row2Pixel (len)); 2163 0, Row2Pixel (len));
2164 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2165
2116 len = -1; 2166 len = -1;
2117 } 2167 }
2118 } 2168 }
2119 } 2169 }
2120#endif 2170#endif
… …
2122 /* 2172 /*
2123 * E: main pass across every character 2173 * E: main pass across every character
2124 */ 2174 */
2125 for (row = 0; row < nrow; row++) 2175 for (row = 0; row < nrow; row++)
2126 { 2176 {
2127 text_t *stp = ROW(row - view_start).t; 2177 text_t *stp = ROW(view_start + row).t;
2128 rend_t *srp = ROW(row - view_start).r; 2178 rend_t *srp = ROW(view_start + row).r;
2129 text_t *dtp = drawn_buf[row].t; 2179 text_t *dtp = drawn_buf[row].t;
2130 rend_t *drp = drawn_buf[row].r; 2180 rend_t *drp = drawn_buf[row].r;
2131 2181
2132 /* 2182 /*
2133 * E2: OK, now the real pass 2183 * E2: OK, now the real pass
… …
2176 count++; 2226 count++;
2177 2227
2178 if (stp[col] != dtp[col] 2228 if (stp[col] != dtp[col]
2179 || !RS_SAME (srp[col], drp[col])) 2229 || !RS_SAME (srp[col], drp[col]))
2180 { 2230 {
2181 if (must_clear && (i++ > count / 2)) 2231 if (have_bg && (i++ > count / 2))
2182 break; 2232 break;
2183 2233
2184 dtp[col] = stp[col]; 2234 dtp[col] = stp[col];
2185 drp[col] = rend; 2235 drp[col] = rend;
2186 i = 0; 2236 i = 0;
2187 } 2237 }
2188 else if (must_clear || (stp[col] != ' ' && ++i >= 16)) 2238 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2189 break; 2239 break;
2190 } 2240 }
2191 2241
2192 col--; /* went one too far. move back */ 2242 col--; /* went one too far. move back */
2193 count -= i; /* dump any matching trailing chars */ 2243 count -= i; /* dump any matching trailing chars */
… …
2203 int back = bgcolor_of (rend); // desired background 2253 int back = bgcolor_of (rend); // desired background
2204 2254
2205 // only do special processing if any attributes are set, which is unlikely 2255 // only do special processing if any attributes are set, which is unlikely
2206 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2256 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2207 { 2257 {
2208#if ENABLE_STYLES
2209 // force redraw after "careful" characters to avoid pixel droppings
2210 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2211 drp[col + 1] = ~srp[col + 1];
2212
2213 // include previous careful character(s) if possible, looks nicer (best effort...)
2214 while (text > stp
2215 && srp[text - stp - 1] & RS_Careful
2216 && RS_SAME (rend, srp[text - stp - 1]))
2217 text--, count++, xpixel -= fwidth;
2218#endif
2219
2220 bool invert = rend & RS_RVid; 2258 bool invert = rend & RS_RVid;
2221 2259
2222#ifndef NO_BOLD_UNDERLINE_REVERSE 2260#ifndef NO_BOLD_UNDERLINE_REVERSE
2223 if (rend & RS_Bold 2261 if (rend & RS_Bold
2224 && fore == Color_fg) 2262 && fore == Color_fg)
… …
2240 else 2278 else
2241 invert = !invert; 2279 invert = !invert;
2242# endif 2280# endif
2243 } 2281 }
2244 2282
2245 if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) 2283 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2246 fore = Color_UL; 2284 fore = Color_UL;
2247#endif 2285#endif
2248 2286
2249 if (invert) 2287 if (invert)
2250 { 2288 {
2289#ifdef OPTION_HC
2290 if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2291 || !ISSET_PIXCOLOR (Color_HC))
2292#endif
2293 /* invert the column if no highlightColor is set or it is the
2294 * current cursor column */
2251 ::swap (fore, back); 2295 ::swap (fore, back);
2296#ifdef OPTION_HC
2297 else if (ISSET_PIXCOLOR (Color_HC))
2298 back = Color_HC;
2299#endif
2252 2300
2253#ifndef NO_BOLD_UNDERLINE_REVERSE 2301#ifndef NO_BOLD_UNDERLINE_REVERSE
2302# ifndef OPTION_HC
2254 if (ISSET_PIXCOLOR (Color_RV)) 2303 if (ISSET_PIXCOLOR (Color_RV))
2255 back = Color_RV; 2304 back = Color_RV;
2256 2305# endif
2257 if (fore == back) 2306 if (fore == back)
2258 { 2307 {
2259 fore = Color_bg; 2308 fore = Color_bg;
2260 back = Color_fg; 2309 back = Color_fg;
2261 } 2310 }
… …
2272 } 2321 }
2273 else if (hidden_text) 2322 else if (hidden_text)
2274 fore = back; 2323 fore = back;
2275 } 2324 }
2276#endif 2325#endif
2326
2327#if ENABLE_STYLES
2328 // "careful" (too wide) character handling
2329
2330 // include previous careful character(s) if possible, looks nicer (best effort...)
2331 while (text > stp
2332 && srp[text - stp - 1] & RS_Careful
2333 && RS_SAME (rend, srp[text - stp - 1]))
2334 text--, count++, xpixel -= fwidth;
2335
2336 // force redraw after "careful" characters to avoid pixel droppings
2337 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2338 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2339
2340 // force redraw before "careful" characters to avoid pixel droppings
2341 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2342 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2343#endif
2277 } 2344 }
2278 2345
2279 /* 2346 /*
2280 * Actually do the drawing of the string here 2347 * Actually do the drawing of the string here
2281 */ 2348 */
2282 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; 2349 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2283 2350
2284 if (back == fore) 2351 if (back == fore)
2285 font->clear_rect (*drawable, xpixel, ypixel, 2352 font->clear_rect (*drawable, xpixel, ypixel, fwidth * count, fheight, back);
2286 fwidth * count, fheight,
2287 back);
2288 else if (back == Color_bg) 2353 else if (back == Color_bg && have_bg)
2289 { 2354 {
2290 if (must_clear) 2355 // this is very ugly, maybe push it into ->draw?
2291 {
2292 CLEAR_CHARS (xpixel, ypixel, count);
2293 2356
2294 for (i = 0; i < count; i++) /* don't draw empty strings */ 2357 for (i = 0; i < count; i++) /* don't draw empty strings */
2295 if (text[i] != ' ') 2358 if (text[i] != ' ')
2296 { 2359 {
2297 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); 2360 font->draw (*drawable, xpixel, ypixel, text, count, fore, -1);
2298 break; 2361 goto did_clear;
2299 }
2300 } 2362 }
2301 else 2363
2302 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); 2364 CLEAR_CHARS (xpixel, ypixel, count);
2365 did_clear: ;
2303 } 2366 }
2304 else 2367 else
2305 font->draw (*drawable, xpixel, ypixel, text, count, fore, back); 2368 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2306 2369
2307 if (rend & RS_Uline && font->descent > 1 && fore != back) 2370 if (rend & RS_Uline && font->descent > 1 && fore != back)
2308 { 2371 {
2309#if ENABLE_FRILLS 2372#if ENABLE_FRILLS
2310 if (ISSET_PIXCOLOR (Color_underline)) 2373 if (ISSET_PIXCOLOR (Color_underline))
2311 XSetForeground (display->display, gc, pix_colors[Color_underline]); 2374 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2312 else 2375 else
2313#endif 2376#endif
2314 XSetForeground (display->display, gc, pix_colors[fore]); 2377 XSetForeground (dpy, gc, pix_colors[fore]);
2315 2378
2316 XDrawLine (display->display, drawBuffer, gc, 2379 XDrawLine (dpy, drawBuffer, gc,
2317 xpixel, ypixel + font->ascent + 1, 2380 xpixel, ypixel + font->ascent + 1,
2318 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2381 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2319 } 2382 }
2320 } /* for (col....) */ 2383 } /* for (col....) */
2321 } /* for (row....) */ 2384 } /* for (row....) */
2322 2385
2323#if ENABLE_OVERLAY 2386#if ENABLE_OVERLAY
2324 scr_swap_overlay (); 2387 scr_swap_overlay ();
2325#endif 2388#endif
2326 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2389 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2327 2390
2328 /* 2391 /*
2329 * G: cleanup cursor and display outline cursor if necessary 2392 * G: cleanup cursor and display outline cursor if necessary
2330 */ 2393 */
2331 if (showcursor) 2394 if (showcursor)
… …
2354 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) 2417 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2355 cursorwidth++; 2418 cursorwidth++;
2356 2419
2357#ifndef NO_CURSORCOLOR 2420#ifndef NO_CURSORCOLOR
2358 if (ISSET_PIXCOLOR (Color_cursor)) 2421 if (ISSET_PIXCOLOR (Color_cursor))
2359 XSetForeground (display->display, gc, pix_colors[Color_cursor]); 2422 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2360#endif 2423#endif
2361 2424
2362 XDrawRectangle (display->display, drawBuffer, gc, 2425 XDrawRectangle (dpy, drawBuffer, gc,
2363 Col2Pixel (col), 2426 Col2Pixel (col),
2364 Row2Pixel (oldcursor.row), 2427 Row2Pixel (oldcursor.row),
2365 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2428 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2366 (unsigned int) (Height2Pixel (1) - lineSpace - 1)); 2429 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2367 } 2430 }
… …
2370 /* 2433 /*
2371 * H: cleanup selection 2434 * H: cleanup selection
2372 */ 2435 */
2373 scr_reverse_selection (); 2436 scr_reverse_selection ();
2374 2437
2375 if (refresh_type & SMOOTH_REFRESH)
2376 XFlush (display->display);
2377
2378 num_scr = 0; 2438 num_scr = 0;
2379 num_scr_allow = 1; 2439 num_scr_allow = 1;
2380} 2440}
2381 2441
2382void 2442void
2383rxvt_term::scr_remap_chars (const line_t &l) 2443rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2384{ 2444{
2385 if (!l.t) 2445 if (!l.t)
2386 return; 2446 return;
2387 2447
2448 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2449
2388 for (int i = ncol; i--; ) 2450 for (int i = ncol; i--; )
2389 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2451 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2390} 2452}
2391 2453
2392void 2454void
2393rxvt_term::scr_remap_chars () 2455rxvt_term::scr_remap_chars () NOTHROW
2394{ 2456{
2395 for (int i = total_rows; i--; ) 2457 for (int i = total_rows; i--; )
2396 scr_remap_chars (row_buf [i]); 2458 scr_remap_chars (row_buf [i]);
2397 2459
2398 for (int i = nrow; i--; ) 2460 for (int i = nrow; i--; )
… …
2401 scr_remap_chars (swap_buf [i]); 2463 scr_remap_chars (swap_buf [i]);
2402 } 2464 }
2403} 2465}
2404 2466
2405void 2467void
2406rxvt_term::scr_recolour () 2468rxvt_term::scr_recolour () NOTHROW
2407{ 2469{
2408 if (1 2470 if (1
2409#if TRANSPARENT 2471#if TRANSPARENT
2410 && !am_transparent 2472 && !am_transparent
2411#endif 2473#endif
2412#if XPM_BACKGROUND 2474#if XPM_BACKGROUND
2413 && !bgPixmap.pixmap 2475 && !bgPixmap.pixmap
2414#endif 2476#endif
2415 ) 2477 )
2416 { 2478 {
2417 XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); 2479 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2418 XClearWindow (display->display, parent[0]); 2480 XClearWindow (dpy, parent[0]);
2419 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); 2481 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2420#if HAVE_SCROLLBARS 2482#if HAVE_SCROLLBARS
2421 if (scrollBar.win) 2483 if (scrollBar.win)
2422 { 2484 {
2423 XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); 2485 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2424 scrollBar.setIdle (); 2486 scrollBar.setIdle ();
2425 scrollbar_show (0); 2487 scrollbar_show (0);
2426 } 2488 }
2427#endif 2489#endif
2428 } 2490 }
… …
2432 want_refresh = 1; 2494 want_refresh = 1;
2433} 2495}
2434 2496
2435/* ------------------------------------------------------------------------- */ 2497/* ------------------------------------------------------------------------- */
2436void 2498void
2437rxvt_term::scr_clear (bool really) 2499rxvt_term::scr_clear (bool really) NOTHROW
2438{ 2500{
2439 if (!mapped) 2501 if (!mapped)
2440 return; 2502 return;
2441 2503
2442 num_scr_allow = 0; 2504 num_scr_allow = 0;
2443 want_refresh = 1; 2505 want_refresh = 1;
2444 2506
2445 if (really) 2507 if (really)
2446 XClearWindow (display->display, vt); 2508 XClearWindow (dpy, vt);
2447} 2509}
2448 2510
2449/* ------------------------------------------------------------------------- */
2450void 2511void
2512rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2513{
2514 int view_end = view_start + nrow;
2515 int row, col;
2516
2517 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2518 {
2519 text_t *stp = ROW(row).t;
2520 rend_t *srp = ROW(row).r;
2521
2522 for (col = beg_col; col < end_col; col++)
2523 srp[col] ^= rstyle1;
2524
2525 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2526 srp[col] ^= rstyle2;
2527
2528 if (++col < end_col)
2529 srp[col] ^= rstyle2;
2530 }
2531}
2532
2533void
2534rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2535{
2536 int view_end = view_start + nrow;
2537 int row, col;
2538
2539 if (beg_row >= view_start)
2540 {
2541 col = beg_col;
2542 row = beg_row;
2543 }
2544 else
2545 {
2546 col = 0;
2547 row = view_start;
2548 }
2549
2550 for (; row < min (end_row, view_end); row++, col = 0)
2551 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2552 srp[col] ^= rstyle;
2553
2554 if (row == end_row)
2555 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2556 srp[col] ^= rstyle;
2557}
2558
2559/* ------------------------------------------------------------------------- */
2560void
2451rxvt_term::scr_reverse_selection () 2561rxvt_term::scr_reverse_selection () NOTHROW
2452{ 2562{
2453 if (selection.op 2563 if (selection.op
2454 && current_screen == selection.screen 2564 && current_screen == selection.screen
2455 && selection.end.row >= -view_start) 2565 && selection.end.row >= view_start)
2456 { 2566 {
2457 int view_end = -view_start + nrow; 2567#if !ENABLE_MINIMAL
2458 int row, col;
2459
2460#if ENABLE_FRILLS
2461 if (selection.rect) 2568 if (selection.rect)
2462 { 2569 scr_xor_rect (selection.beg.row, selection.beg.col,
2463 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2570 selection.end.row, selection.end.col,
2464 { 2571 RS_RVid, RS_RVid | RS_Uline);
2465 text_t *stp = ROW(row).t;
2466 rend_t *srp = ROW(row).r;
2467
2468 for (col = selection.beg.col; col < selection.end.col; col++)
2469 srp[col] ^= RS_RVid;
2470
2471 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2472 srp[col] ^= RS_RVid | RS_Uline;
2473
2474 if (++col < selection.end.col)
2475 srp[col] ^= RS_RVid | RS_Uline;
2476 }
2477 }
2478 else 2572 else
2479#endif 2573#endif
2480 { 2574 scr_xor_span (selection.beg.row, selection.beg.col,
2481 if (selection.beg.row >= -view_start) 2575 selection.end.row, selection.end.col,
2482 { 2576 RS_RVid);
2483 col = selection.beg.col;
2484 row = selection.beg.row;
2485 }
2486 else
2487 {
2488 col = 0;
2489 row = -view_start;
2490 }
2491
2492 for (; row < min (selection.end.row, view_end); row++, col = 0)
2493 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2494 srp[col] ^= RS_RVid;
2495
2496 if (row == selection.end.row)
2497 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2498 srp[col] ^= RS_RVid;
2499 }
2500 } 2577 }
2501} 2578}
2502 2579
2503/* ------------------------------------------------------------------------- */ 2580/* ------------------------------------------------------------------------- */
2504/* 2581/*
2505 * Dump the whole scrollback and screen to the passed filedescriptor. The 2582 * Dump the whole scrollback and screen to the passed filedescriptor. The
2506 * invoking routine must close the fd. 2583 * invoking routine must close the fd.
2507 */ 2584 */
2508#if 0 2585#if 0
2509void 2586void
2510rxvt_term::scr_dump (int fd) 2587rxvt_term::scr_dump (int fd) NOTHROW
2511{ 2588{
2512 int row, wrote; 2589 int row, wrote;
2513 unsigned int width, towrite; 2590 unsigned int width, towrite;
2514 char r1[] = "\n"; 2591 char r1[] = "\n";
2515 2592
… …
2534 2611
2535/* ------------------------------------------------------------------------- * 2612/* ------------------------------------------------------------------------- *
2536 * CHARACTER SELECTION * 2613 * CHARACTER SELECTION *
2537 * ------------------------------------------------------------------------- */ 2614 * ------------------------------------------------------------------------- */
2538void 2615void
2539rxvt_term::selection_check (int check_more) 2616rxvt_term::selection_check (int check_more) NOTHROW
2540{ 2617{
2541 row_col_t pos; 2618 row_col_t pos;
2542 2619
2543 if (!selection.op) 2620 if (!selection.op)
2544 return; 2621 return;
2545 2622
2546 pos.row = pos.col = 0; 2623 pos.row = pos.col = 0;
2547 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2624 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2548 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2625 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2549 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2626 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2550 || (check_more == 1 2627 || (check_more == 1
2551 && current_screen == selection.screen 2628 && current_screen == selection.screen
2552 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2629 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2553 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2630 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2554 || (check_more == 2 2631 || (check_more == 2
… …
2565/* ------------------------------------------------------------------------- */ 2642/* ------------------------------------------------------------------------- */
2566/* 2643/*
2567 * Paste a selection direct to the command fd 2644 * Paste a selection direct to the command fd
2568 */ 2645 */
2569void 2646void
2570rxvt_term::paste (char *data, unsigned int len) 2647rxvt_term::paste (char *data, unsigned int len) NOTHROW
2571{ 2648{
2572 /* convert normal newline chars into common keyboard Return key sequence */ 2649 /* convert normal newline chars into common keyboard Return key sequence */
2573 for (unsigned int i = 0; i < len; i++) 2650 for (unsigned int i = 0; i < len; i++)
2574 if (data[i] == C0_LF) 2651 if (data[i] == C0_LF)
2575 data[i] = C0_CR; 2652 data[i] = C0_CR;
… …
2581/* 2658/*
2582 * Respond to a notification that a primary selection has been sent 2659 * Respond to a notification that a primary selection has been sent
2583 * EXT: SelectionNotify 2660 * EXT: SelectionNotify
2584 */ 2661 */
2585void 2662void
2586rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2663rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2587{ 2664{
2588 if (prop == None) /* check for failed XConvertSelection */ 2665 if (prop == None) /* check for failed XConvertSelection */
2589 { 2666 {
2590 if ((selection_type & Sel_CompoundText)) 2667 if ((selection_type & Sel_CompoundText))
2591 { 2668 {
… …
2611 } 2688 }
2612 2689
2613 unsigned long bytes_after; 2690 unsigned long bytes_after;
2614 XTextProperty ct; 2691 XTextProperty ct;
2615 2692
2616 if (XGetWindowProperty (display->display, win, prop, 2693 if (XGetWindowProperty (dpy, win, prop,
2617 0, PROP_SIZE / 4, 2694 0, PROP_SIZE / 4,
2618 delete_prop, AnyPropertyType, 2695 delete_prop, AnyPropertyType,
2619 &ct.encoding, &ct.format, 2696 &ct.encoding, &ct.format,
2620 &ct.nitems, &bytes_after, 2697 &ct.nitems, &bytes_after,
2621 &ct.value) != Success) 2698 &ct.value) != Success)
… …
2630 if (bytes_after) 2707 if (bytes_after)
2631 { 2708 {
2632 // fetch and append remaining data 2709 // fetch and append remaining data
2633 XTextProperty ct2; 2710 XTextProperty ct2;
2634 2711
2635 if (XGetWindowProperty (display->display, win, prop, 2712 if (XGetWindowProperty (dpy, win, prop,
2636 ct.nitems / 4, (bytes_after + 3) / 4, 2713 ct.nitems / 4, (bytes_after + 3) / 4,
2637 delete_prop, AnyPropertyType, 2714 delete_prop, AnyPropertyType,
2638 &ct2.encoding, &ct2.format, 2715 &ct2.encoding, &ct2.format,
2639 &ct2.nitems, &bytes_after, 2716 &ct2.nitems, &bytes_after,
2640 &ct2.value) != Success) 2717 &ct2.value) != Success)
… …
2653 2730
2654 if (ct.encoding == xa[XA_INCR]) 2731 if (ct.encoding == xa[XA_INCR])
2655 { 2732 {
2656 // INCR selection, start handshake 2733 // INCR selection, start handshake
2657 if (!delete_prop) 2734 if (!delete_prop)
2658 XDeleteProperty (display->display, win, prop); 2735 XDeleteProperty (dpy, win, prop);
2659 2736
2660 selection_wait = Sel_incr; 2737 selection_wait = Sel_incr;
2661 incr_buf_fill = 0; 2738 incr_buf_fill = 0;
2662 incr_ev.start (NOW + 10); 2739 incr_ev.start (NOW + 10);
2663 2740
… …
2710 } 2787 }
2711 2788
2712 char **cl; 2789 char **cl;
2713 int cr; 2790 int cr;
2714 2791
2715#if ENABLE_FRILLS 2792#if !ENABLE_MINIMAL
2716 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 2793 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2717 // so recode it manually 2794 // so recode it manually
2718 if (ct.encoding == xa[XA_UTF8_STRING]) 2795 if (ct.encoding == xa[XA_UTF8_STRING])
2719 { 2796 {
2720 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2797 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
… …
2724 paste (s, strlen (s)); 2801 paste (s, strlen (s));
2725 free (s); 2802 free (s);
2726 } 2803 }
2727 else 2804 else
2728#endif 2805#endif
2729 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2806 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2730 && cl) 2807 && cl)
2731 { 2808 {
2732 for (int i = 0; i < cr; i++) 2809 for (int i = 0; i < cr; i++)
2733 paste (cl[i], strlen (cl[i])); 2810 paste (cl[i], strlen (cl[i]));
2734 2811
… …
2743 if (selection_wait == Sel_normal) 2820 if (selection_wait == Sel_normal)
2744 selection_wait = Sel_none; 2821 selection_wait = Sel_none;
2745} 2822}
2746 2823
2747void 2824void
2748rxvt_term::incr_cb (time_watcher &w) 2825rxvt_term::incr_cb (time_watcher &w) NOTHROW
2749{ 2826{
2750 selection_wait = Sel_none; 2827 selection_wait = Sel_none;
2751 2828
2752 incr_buf_size = 0; 2829 incr_buf_size = 0;
2753 free (incr_buf); 2830 free (incr_buf);
2754 2831
2755 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2832 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2756} 2833}
2757 2834
2758void 2835void
2759rxvt_term::selection_property (Window win, Atom prop) 2836rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2760{ 2837{
2761 if (prop == None || selection_wait != Sel_incr) 2838 if (prop == None || selection_wait != Sel_incr)
2762 return; 2839 return;
2763 2840
2764 selection_paste (win, prop, true); 2841 selection_paste (win, prop, true);
… …
2773 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2850 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2774 * will auto fallback to CUT_BUFFER0 2851 * will auto fallback to CUT_BUFFER0
2775 * EXT: button 2 release 2852 * EXT: button 2 release
2776 */ 2853 */
2777void 2854void
2778rxvt_term::selection_request (Time tm, int x, int y) 2855rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2779{ 2856{
2780 if (x < 0 || x >= width || y < 0 || y >= height) 2857 if (selection.text && selnum == Sel_Primary)
2781 return; /* outside window */
2782
2783 if (selection.text)
2784 { /* internal selection */ 2858 { /* internal selection */
2785 char *str = rxvt_wcstombs (selection.text, selection.len); 2859 char *str = rxvt_wcstombs (selection.text, selection.len);
2786 paste (str, strlen (str)); 2860 paste (str, strlen (str));
2787 free (str); 2861 free (str);
2788 return; 2862 return;
2789 } 2863 }
2790 else 2864 else
2791 { 2865 {
2792 int i;
2793
2794 selection_request_time = tm; 2866 selection_request_time = tm;
2795 selection_wait = Sel_normal; 2867 selection_wait = Sel_normal;
2796 2868
2797 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2798 {
2799#if X_HAVE_UTF8_STRING 2869#if X_HAVE_UTF8_STRING
2800 selection_type = Sel_UTF8String; 2870 selection_type = Sel_UTF8String;
2801 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2871 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2802 return; 2872 return;
2803#else 2873#else
2804 selection_type = Sel_CompoundText; 2874 selection_type = Sel_CompoundText;
2805 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2875 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2806 return; 2876 return;
2807#endif 2877#endif
2808 }
2809 } 2878 }
2810 2879
2811 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2880 selection_wait = Sel_none; /* don't loop in selection_paste () */
2812 selection_paste (display->root, XA_CUT_BUFFER0, false); 2881 selection_paste (display->root, XA_CUT_BUFFER0, false);
2813} 2882}
2814 2883
2815int 2884int
2816rxvt_term::selection_request_other (Atom target, int selnum) 2885rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2817{ 2886{
2818 Atom sel; 2887 Atom sel;
2819 2888
2820 selection_type |= selnum; 2889 selection_type |= selnum;
2821 2890
… …
2824 else if (selnum == Sel_Secondary) 2893 else if (selnum == Sel_Secondary)
2825 sel = XA_SECONDARY; 2894 sel = XA_SECONDARY;
2826 else 2895 else
2827 sel = xa[XA_CLIPBOARD]; 2896 sel = xa[XA_CLIPBOARD];
2828 2897
2829 if (XGetSelectionOwner (display->display, sel) != None) 2898 if (XGetSelectionOwner (dpy, sel) != None)
2830 { 2899 {
2831 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2900 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2832 vt, selection_request_time); 2901 vt, selection_request_time);
2833 return 1; 2902 return 1;
2834 } 2903 }
2835 2904
2836 return 0; 2905 return 0;
… …
2840/* 2909/*
2841 * Clear all selected text 2910 * Clear all selected text
2842 * EXT: SelectionClear 2911 * EXT: SelectionClear
2843 */ 2912 */
2844void 2913void
2845rxvt_term::selection_clear () 2914rxvt_term::selection_clear () NOTHROW
2846{ 2915{
2847 want_refresh = 1; 2916 want_refresh = 1;
2848 free (selection.text); 2917 free (selection.text);
2849 selection.text = NULL; 2918 selection.text = NULL;
2850 selection.len = 0; 2919 selection.len = 0;
… …
2883 selection.op = SELECTION_DONE; 2952 selection.op = SELECTION_DONE;
2884 2953
2885 if (selection.clicks == 4) 2954 if (selection.clicks == 4)
2886 return; /* nothing selected, go away */ 2955 return; /* nothing selected, go away */
2887 2956
2888 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2957 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2889 return; 2958 return;
2890 2959
2891 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2960 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2892 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2961 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2893 2962
… …
2899 2968
2900 int end_col; 2969 int end_col;
2901 2970
2902 for (; row <= selection.end.row; row++, col = 0) 2971 for (; row <= selection.end.row; row++, col = 0)
2903 { 2972 {
2904#if ENABLE_FRILLS 2973#if !ENABLE_MINIMAL
2905 if (selection.rect) 2974 if (selection.rect)
2906 { 2975 {
2907 col = selection.beg.col; 2976 col = selection.beg.col;
2908 end_col = ncol + 1; 2977 end_col = ncol + 1;
2909 } 2978 }
2910 else 2979 else
2911#endif 2980#endif
2912 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2981 end_col = ROW(row).l;
2913 2982
2914 col = max (col, 0); 2983 col = max (col, 0);
2915 2984
2916 if (row == selection.end.row 2985 if (row == selection.end.row
2917#if ENABLE_FRILLS 2986#if !ENABLE_MINIMAL
2918 || selection.rect 2987 || selection.rect
2919#endif 2988#endif
2920 ) 2989 )
2921 min_it (end_col, selection.end.col); 2990 min_it (end_col, selection.end.col);
2922 2991
2923 t = ROW(row).t + col; 2992 t = ROW(row).t + col;
2993
2924 for (; col < end_col; col++) 2994 for (; col < end_col; col++)
2925 { 2995 {
2926 if (*t == NOCHAR) 2996 if (*t == NOCHAR)
2927 t++; 2997 t++;
2928#if ENABLE_COMBINING 2998#if ENABLE_COMBINING
… …
2944#endif 3014#endif
2945 else 3015 else
2946 new_selection_text[ofs++] = *t++; 3016 new_selection_text[ofs++] = *t++;
2947 } 3017 }
2948 3018
2949#if ENABLE_FRILLS 3019#if !ENABLE_MINIMAL
2950 if (selection.rect) 3020 if (selection.rect)
2951 { 3021 {
2952 while (ofs 3022 while (ofs
2953 && new_selection_text[ofs - 1] != C0_LF 3023 && new_selection_text[ofs - 1] != C0_LF
2954 && unicode::is_space (new_selection_text[ofs - 1])) 3024 && unicode::is_space (new_selection_text[ofs - 1]))
… …
2977 3047
2978 // we usually allocate much more than necessary, so realloc it smaller again 3048 // we usually allocate much more than necessary, so realloc it smaller again
2979 selection.len = ofs; 3049 selection.len = ofs;
2980 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3050 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2981 3051
2982 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 3052 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2983 return; 3053 return;
2984 3054
2985 selection_grab (tm); 3055 selection_grab (tm);
2986} 3056}
2987 3057
2988bool 3058bool
2989rxvt_term::selection_grab (Time tm) 3059rxvt_term::selection_grab (Time tm) NOTHROW
2990{ 3060{
2991 selection_time = tm; 3061 selection_time = tm;
2992 3062
2993 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3063 XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm);
2994 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3064 if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt)
2995 { 3065 {
2996 display->set_selection_owner (this); 3066 display->set_selection_owner (this);
2997 return true; 3067 return true;
2998 } 3068 }
2999 else 3069 else
3070 {
3071 selection_clear ();
3000 return false; 3072 return false;
3073 }
3001 3074
3002#if 0 3075#if 0
3003 XTextProperty ct; 3076 XTextProperty ct;
3004 3077
3005 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3078 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
3006 { 3079 {
3007 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3080 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
3008 XFree (ct.value); 3081 XFree (ct.value);
3009 } 3082 }
3010#endif 3083#endif
… …
3014/* 3087/*
3015 * Mark or select text based upon number of clicks: 1, 2, or 3 3088 * Mark or select text based upon number of clicks: 1, 2, or 3
3016 * EXT: button 1 press 3089 * EXT: button 1 press
3017 */ 3090 */
3018void 3091void
3019rxvt_term::selection_click (int clicks, int x, int y) 3092rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3020{ 3093{
3021 clicks = ((clicks - 1) % 3) + 1; 3094 clicks = ((clicks - 1) % 3) + 1;
3022 selection.clicks = clicks; /* save clicks so extend will work */ 3095 selection.clicks = clicks; /* save clicks so extend will work */
3023 3096
3097 if (clicks == 2 && !selection.rect
3098 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3099 {
3100 MEvent.clicks = 1; // what a mess
3101 selection.screen = current_screen;
3102 selection.op = SELECTION_CONT;
3103 return;
3104 }
3105
3024 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3106 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3025 3107
3026 if (clicks == 2 || clicks == 3) 3108 if (clicks == 2 || clicks == 3)
3027 selection_extend_colrow (selection.mark.col, 3109 selection_extend_colrow (selection.mark.col,
3028 selection.mark.row + view_start, 3110 selection.mark.row - view_start,
3029 0, /* button 3 */ 3111 0, /* button 3 */
3030 1, /* button press */ 3112 1, /* button press */
3031 0); /* click change */ 3113 0); /* click change */
3032} 3114}
3033 3115
3034/* ------------------------------------------------------------------------- */ 3116/* ------------------------------------------------------------------------- */
3035/* 3117/*
3036 * Mark a selection at the specified col/row 3118 * Mark a selection at the specified col/row
3037 */ 3119 */
3038void 3120void
3039rxvt_term::selection_start_colrow (int col, int row) 3121rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3040{ 3122{
3041 want_refresh = 1; 3123 want_refresh = 1;
3042 3124
3043 selection.mark.row = row - view_start; 3125 selection.mark.row = row + view_start;
3044 selection.mark.col = col; 3126 selection.mark.col = col;
3045 3127
3046 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3128 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3047 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3129 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3048 3130
3049 while (selection.mark.col > 0 3131 while (selection.mark.col > 0
3050 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3132 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3051 --selection.mark.col; 3133 --selection.mark.col;
… …
3070#define DELIMIT_TEXT(x) \ 3152#define DELIMIT_TEXT(x) \
3071 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3153 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3072#define DELIMIT_REND(x) 1 3154#define DELIMIT_REND(x) 1
3073 3155
3074void 3156void
3075rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3157rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3076{ 3158{
3077 int col, row, dirnadd, tcol, trow, w1, w2; 3159 int col, row, dirnadd, tcol, trow, w1, w2;
3078 row_col_t bound; 3160 row_col_t bound;
3079 text_t *stp; 3161 text_t *stp;
3080 rend_t *srp; 3162 rend_t *srp;
3081 3163
3082 if (dirn == UP) 3164 if (dirn == UP)
3083 { 3165 {
3084 bound.row = - nsaved - 1; 3166 bound.row = top_row - 1;
3085 bound.col = 0; 3167 bound.col = 0;
3086 dirnadd = -1; 3168 dirnadd = -1;
3087 } 3169 }
3088 else 3170 else
3089 { 3171 {
… …
3154 * flag == 0 ==> button 1 3236 * flag == 0 ==> button 1
3155 * flag == 1 ==> button 3 press 3237 * flag == 1 ==> button 3 press
3156 * flag == 2 ==> button 3 motion 3238 * flag == 2 ==> button 3 motion
3157 */ 3239 */
3158void 3240void
3159rxvt_term::selection_extend (int x, int y, int flag) 3241rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3160{ 3242{
3161 int col = clamp (Pixel2Col (x), 0, ncol); 3243 int col = clamp (Pixel2Col (x), 0, ncol);
3162 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3244 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3163 3245
3164 /* 3246 /*
… …
3167 * select nothing. Otherwise, if we're to the right of the mark, you have to 3249 * select nothing. Otherwise, if we're to the right of the mark, you have to
3168 * be _past_ a character for it to be selected. 3250 * be _past_ a character for it to be selected.
3169 */ 3251 */
3170 if (((selection.clicks % 3) == 1) && !flag 3252 if (((selection.clicks % 3) == 1) && !flag
3171 && (col == selection.mark.col 3253 && (col == selection.mark.col
3172 && (row == selection.mark.row + view_start))) 3254 && (row == selection.mark.row - view_start)))
3173 { 3255 {
3174 /* select nothing */ 3256 /* select nothing */
3175 selection.beg.row = selection.end.row = 0; 3257 selection.beg.row = selection.end.row = 0;
3176 selection.beg.col = selection.end.col = 0; 3258 selection.beg.col = selection.end.col = 0;
3177 selection.clicks = 4; 3259 selection.clicks = 4;
… …
3190/* ------------------------------------------------------------------------- */ 3272/* ------------------------------------------------------------------------- */
3191/* 3273/*
3192 * Extend the selection to the specified col/row 3274 * Extend the selection to the specified col/row
3193 */ 3275 */
3194void 3276void
3195rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3277rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3196{ 3278{
3197 row_col_t pos; 3279 row_col_t pos;
3198 enum { 3280 enum {
3199 LEFT, RIGHT 3281 LEFT, RIGHT
3200 } closeto = RIGHT; 3282 } closeto = RIGHT;
… …
3232 selection.beg.col = selection.end.col = selection.mark.col; 3314 selection.beg.col = selection.end.col = selection.mark.col;
3233 selection.beg.row = selection.end.row = selection.mark.row; 3315 selection.beg.row = selection.end.row = selection.mark.row;
3234 } 3316 }
3235 3317
3236 pos.col = col; 3318 pos.col = col;
3237 pos.row = row - view_start; 3319 pos.row = view_start + row;
3238 3320
3239 /* 3321 /*
3240 * This is mainly xterm style selection with a couple of differences, mainly 3322 * This is mainly xterm style selection with a couple of differences, mainly
3241 * in the way button3 drag extension works. 3323 * in the way button3 drag extension works.
3242 * We're either doing: button1 drag; button3 press; or button3 drag 3324 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3303 3385
3304 if (selection.clicks == 1) 3386 if (selection.clicks == 1)
3305 { 3387 {
3306 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN 3388 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3307 && !ROW(selection.beg.row).is_longer () 3389 && !ROW(selection.beg.row).is_longer ()
3308#if ENABLE_FRILLS 3390#if !ENABLE_MINIMAL
3309 && !selection.rect 3391 && !selection.rect
3310#endif 3392#endif
3311 ) 3393 )
3312 selection.beg.col = ncol; 3394 selection.beg.col = ncol;
3313 3395
3314 if ( 3396 if (
3315 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN 3397 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3316 && !ROW(selection.end.row).is_longer () 3398 && !ROW(selection.end.row).is_longer ()
3317#if ENABLE_FRILLS 3399#if !ENABLE_MINIMAL
3318 && !selection.rect 3400 && !selection.rect
3319#endif 3401#endif
3320 ) 3402 )
3321 selection.end.col = ncol; 3403 selection.end.col = ncol;
3322 } 3404 }
3323 else if (selection.clicks == 2) 3405 else if (selection.clicks == 2)
3324 { 3406 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3407 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3408 selection.end.col--;
3327 3409
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3410 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3411 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3333 } 3412 }
3334 else if (selection.clicks == 3) 3413 else if (selection.clicks == 3)
3335 { 3414 {
3336#if ENABLE_FRILLS 3415#if ENABLE_FRILLS
3337 if (OPTION (Opt_tripleclickwords)) 3416 if (OPTION (Opt_tripleclickwords))
… …
3342 { 3421 {
3343 if (!ROW(end_row).is_longer ()) 3422 if (!ROW(end_row).is_longer ())
3344 { 3423 {
3345 selection.end.row = end_row; 3424 selection.end.row = end_row;
3346 selection.end.col = ROW(end_row).l; 3425 selection.end.col = ROW(end_row).l;
3426# if !ENABLE_MINIMAL
3347 selection_remove_trailing_spaces (); 3427 selection_remove_trailing_spaces ();
3428# endif
3348 break; 3429 break;
3349 } 3430 }
3350 } 3431 }
3351 } 3432 }
3352 else 3433 else
… …
3381 selection.mark.row = selection.beg.row; 3462 selection.mark.row = selection.beg.row;
3382 selection.mark.col = selection.beg.col; 3463 selection.mark.col = selection.beg.col;
3383 } 3464 }
3384 } 3465 }
3385 3466
3386#if ENABLE_FRILLS 3467#if !ENABLE_MINIMAL
3387 if (selection.rect && selection.beg.col > selection.end.col) 3468 if (selection.rect && selection.beg.col > selection.end.col)
3388 ::swap (selection.beg.col, selection.end.col); 3469 ::swap (selection.beg.col, selection.end.col);
3389#endif 3470#endif
3390} 3471}
3391 3472
3392#if ENABLE_FRILLS 3473#if !ENABLE_MINIMAL
3393void 3474void
3394rxvt_term::selection_remove_trailing_spaces () 3475rxvt_term::selection_remove_trailing_spaces () NOTHROW
3395{ 3476{
3396 int32_t end_col, end_row; 3477 int32_t end_col, end_row;
3397 text_t *stp; 3478 text_t *stp;
3398 3479
3399 end_col = selection.end.col; 3480 end_col = selection.end.col;
… …
3437/* 3518/*
3438 * Double click on button 3 when already selected 3519 * Double click on button 3 when already selected
3439 * EXT: button 3 double click 3520 * EXT: button 3 double click
3440 */ 3521 */
3441void 3522void
3442rxvt_term::selection_rotate (int x, int y) 3523rxvt_term::selection_rotate (int x, int y) NOTHROW
3443{ 3524{
3444 selection.clicks = selection.clicks % 3 + 1; 3525 selection.clicks = selection.clicks % 3 + 1;
3445 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3526 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3446} 3527}
3447 3528
… …
3449/* 3530/*
3450 * Respond to a request for our current selection 3531 * Respond to a request for our current selection
3451 * EXT: SelectionRequest 3532 * EXT: SelectionRequest
3452 */ 3533 */
3453void 3534void
3454rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3535rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3455{ 3536{
3456 XSelectionEvent ev; 3537 XSelectionEvent ev;
3457 dDisp;
3458 3538
3459 ev.type = SelectionNotify; 3539 ev.type = SelectionNotify;
3460 ev.property = None; 3540 ev.property = None;
3461 ev.display = rq.display; 3541 ev.display = rq.display;
3462 ev.requestor = rq.requestor; 3542 ev.requestor = rq.requestor;
… …
3476 *target++ = xa[XA_COMPOUND_TEXT]; 3556 *target++ = xa[XA_COMPOUND_TEXT];
3477#if X_HAVE_UTF8_STRING 3557#if X_HAVE_UTF8_STRING
3478 *target++ = xa[XA_UTF8_STRING]; 3558 *target++ = xa[XA_UTF8_STRING];
3479#endif 3559#endif
3480 3560
3481 XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, 3561 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3482 32, PropModeReplace, 3562 32, PropModeReplace,
3483 (unsigned char *)target_list, target - target_list); 3563 (unsigned char *)target_list, target - target_list);
3484 ev.property = rq.property; 3564 ev.property = rq.property;
3485 } 3565 }
3486#if TODO // TODO 3566#if TODO // TODO
… …
3489 /* TODO: Handle MULTIPLE */ 3569 /* TODO: Handle MULTIPLE */
3490 } 3570 }
3491#endif 3571#endif
3492 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3572 else if (rq.target == xa[XA_TIMESTAMP] && selection.text)
3493 { 3573 {
3494 XChangeProperty (disp, rq.requestor, rq.property, rq.target, 3574 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3495 32, PropModeReplace, (unsigned char *)&selection_time, 1); 3575 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3496 ev.property = rq.property; 3576 ev.property = rq.property;
3497 } 3577 }
3498 else if (rq.target == XA_STRING 3578 else if (rq.target == XA_STRING
3499 || rq.target == xa[XA_TEXT] 3579 || rq.target == xa[XA_TEXT]
… …
3523 style = enc_string; 3603 style = enc_string;
3524 else if (target == xa[XA_TEXT]) 3604 else if (target == xa[XA_TEXT])
3525 style = enc_text; 3605 style = enc_text;
3526 else if (target == xa[XA_COMPOUND_TEXT]) 3606 else if (target == xa[XA_COMPOUND_TEXT])
3527 style = enc_compound_text; 3607 style = enc_compound_text;
3528#if ENABLE_FRILLS 3608#if !ENABLE_MINIMAL
3529 else if (target == xa[XA_UTF8_STRING]) 3609 else if (target == xa[XA_UTF8_STRING])
3530 style = enc_utf8; 3610 style = enc_utf8;
3531#endif 3611#endif
3532 else 3612 else
3533 { 3613 {
… …
3544 { 3624 {
3545 cl = L""; 3625 cl = L"";
3546 selectlen = 0; 3626 selectlen = 0;
3547 } 3627 }
3548 3628
3549#if ENABLE_FRILLS 3629#if !ENABLE_MINIMAL
3550 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it 3630 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3551 // so recode it manually 3631 // so recode it manually
3552 if (style == enc_utf8) 3632 if (style == enc_utf8)
3553 { 3633 {
3554 freect = 1; 3634 freect = 1;
… …
3557 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); 3637 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3558 ct.nitems = strlen ((char *)ct.value); 3638 ct.nitems = strlen ((char *)ct.value);
3559 } 3639 }
3560 else 3640 else
3561#endif 3641#endif
3562 if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) 3642 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3563 freect = 1; 3643 freect = 1;
3564 else 3644 else
3565 { 3645 {
3566 /* if we failed to convert then send it raw */ 3646 /* if we failed to convert then send it raw */
3567 ct.value = (unsigned char *)cl; 3647 ct.value = (unsigned char *)cl;
3568 ct.nitems = selectlen; 3648 ct.nitems = selectlen;
3569 ct.encoding = target; 3649 ct.encoding = target;
3570 } 3650 }
3571 3651
3572 XChangeProperty (disp, rq.requestor, rq.property, 3652 XChangeProperty (dpy, rq.requestor, rq.property,
3573 ct.encoding, 8, PropModeReplace, 3653 ct.encoding, 8, PropModeReplace,
3574 ct.value, (int)ct.nitems); 3654 ct.value, (int)ct.nitems);
3575 ev.property = rq.property; 3655 ev.property = rq.property;
3576 3656
3577 if (freect) 3657 if (freect)
3578 XFree (ct.value); 3658 XFree (ct.value);
3579 } 3659 }
3580 3660
3581 XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); 3661 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3582} 3662}
3583 3663
3584/* ------------------------------------------------------------------------- * 3664/* ------------------------------------------------------------------------- *
3585 * MOUSE ROUTINES * 3665 * MOUSE ROUTINES *
3586 * ------------------------------------------------------------------------- */ 3666 * ------------------------------------------------------------------------- */
3587 3667
3588/* 3668/*
3589 * return col/row values corresponding to x/y pixel values 3669 * return col/row values corresponding to x/y pixel values
3590 */ 3670 */
3591void 3671void
3592rxvt_term::pixel_position (int *x, int *y) 3672rxvt_term::pixel_position (int *x, int *y) NOTHROW
3593{ 3673{
3594 *x = Pixel2Col (*x); 3674 *x = Pixel2Col (*x);
3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3675 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3596 *y = Pixel2Row (*y); 3676 *y = Pixel2Row (*y);
3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3677 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3598} 3678}
3599 3679
3600/* ------------------------------------------------------------------------- */ 3680/* ------------------------------------------------------------------------- */
3601#ifdef USE_XIM 3681#ifdef USE_XIM
3602void 3682void
3603rxvt_term::im_set_position (XPoint &pos) 3683rxvt_term::im_set_position (XPoint &pos) NOTHROW
3604{ 3684{
3605 XWindowAttributes xwa; 3685 XWindowAttributes xwa;
3606 3686
3607 XGetWindowAttributes (display->display, vt, &xwa); 3687 XGetWindowAttributes (dpy, vt, &xwa);
3608 3688
3609 pos.x = xwa.x + Col2Pixel (screen.cur.col); 3689 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3610 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; 3690 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3611} 3691}
3612#endif 3692#endif
3613 3693
3614#if ENABLE_OVERLAY 3694#if ENABLE_OVERLAY
3615void 3695void
3616rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3696rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3617{ 3697{
3618 if (nrow < 1 || ncol < 1) 3698 if (nrow < 1 || ncol < 1)
3619 return; 3699 return;
3620 3700
3621 want_refresh = 1; 3701 want_refresh = 1;
… …
3666 *rp = r; 3746 *rp = r;
3667 } 3747 }
3668} 3748}
3669 3749
3670void 3750void
3671rxvt_term::scr_overlay_off () 3751rxvt_term::scr_overlay_off () NOTHROW
3672{ 3752{
3673 if (!ov_text) 3753 if (!ov_text)
3674 return; 3754 return;
3675 3755
3676 want_refresh = 1; 3756 want_refresh = 1;
… …
3684 delete [] ov_text; ov_text = 0; 3764 delete [] ov_text; ov_text = 0;
3685 delete [] ov_rend; ov_rend = 0; 3765 delete [] ov_rend; ov_rend = 0;
3686} 3766}
3687 3767
3688void 3768void
3689rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3769rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3690{ 3770{
3691 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3771 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3692 return; 3772 return;
3693 3773
3694 x++, y++; 3774 x++, y++;
… …
3696 ov_text[y][x] = text; 3776 ov_text[y][x] = text;
3697 ov_rend[y][x] = rend; 3777 ov_rend[y][x] = rend;
3698} 3778}
3699 3779
3700void 3780void
3701rxvt_term::scr_overlay_set (int x, int y, const char *s) 3781rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3702{ 3782{
3703 while (*s) 3783 while (*s)
3704 scr_overlay_set (x++, y, *s++); 3784 scr_overlay_set (x++, y, *s++);
3705} 3785}
3706 3786
3707void 3787void
3708rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3788rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3709{ 3789{
3710 while (*s) 3790 while (*s)
3711 { 3791 {
3712 text_t t = *s++; 3792 text_t t = *s++;
3713 int width = wcwidth (t); 3793 int width = WCWIDTH (t);
3714 3794
3715 while (width--) 3795 while (width--)
3716 { 3796 {
3717 scr_overlay_set (x++, y, t); 3797 scr_overlay_set (x++, y, t);
3718 t = NOCHAR; 3798 t = NOCHAR;
3719 } 3799 }
3720 } 3800 }
3721} 3801}
3722 3802
3723void 3803void
3724rxvt_term::scr_swap_overlay () 3804rxvt_term::scr_swap_overlay () NOTHROW
3725{ 3805{
3726 if (!ov_text) 3806 if (!ov_text)
3727 return; 3807 return;
3728 3808
3729 // swap screen mem with overlay 3809 // swap screen mem with overlay
3730 for (int y = ov_h; y--; ) 3810 for (int y = ov_h; y--; )
3731 { 3811 {
3732 text_t *t1 = ov_text[y]; 3812 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y]; 3813 rend_t *r1 = ov_rend[y];
3734 3814
3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3815 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3816 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3737 3817
3738 for (int x = ov_w; x--; ) 3818 for (int x = ov_w; x--; )
3739 { 3819 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3820 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3821 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