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.196 by root, Mon Dec 26 23:12:59 2005 UTC vs.
Revision 1.250 by root, Wed Jan 25 13:24:45 2006 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*--------------------------------*-C-*--------------------------------------*
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.
… …
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
29#include "rxvtperl.h" /* NECESSARY */
29 30
30#include <X11/Xmd.h> /* get the typedef for CARD32 */ 31#include <X11/Xmd.h> /* get the typedef for CARD32 */
31 32
32#include <inttypes.h> 33#include <inttypes.h>
33 34
… …
46 47
47/* ------------------------------------------------------------------------- * 48/* ------------------------------------------------------------------------- *
48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 49 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
49 * ------------------------------------------------------------------------- */ 50 * ------------------------------------------------------------------------- */
50#define ZERO_SCROLLBACK() \ 51#define ZERO_SCROLLBACK() \
51 if (options & Opt_scrollTtyOutput) \ 52 if (OPTION (Opt_scrollTtyOutput)) \
52 view_start = 0 53 view_start = 0
53#define CLEAR_SELECTION() \ 54#define CLEAR_SELECTION() \
54 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
55 = selection.end.row = selection.end.col = 0 56 = selection.end.row = selection.end.col = 0
56#define CLEAR_ALL_SELECTION() \ 57#define CLEAR_ALL_SELECTION() \
… …
114 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
115 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
116 117
117/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
118void 119void
119rxvt_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
120{ 121{
121 if (!l.t) 122 if (!l.t)
122 { 123 {
123 lalloc (l); 124 lalloc (l);
124 col = 0; 125 col = 0;
125 width = ncol; 126 width = ncol;
126 } 127 }
127 128
129 l.touch ();
130
128 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
129 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
130 133
131 text_t *et = l.t + col; 134 text_t *et = l.t + col;
132 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
139} 142}
140 143
141/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
142/* 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 */
143void 146void
144rxvt_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
145{ 148{
146 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
147} 153}
148 154
149/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
167 nrow = 24; 173 nrow = 24;
168 174
169 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
170 return; 176 return;
171 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
172 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
173 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
174 { 183 {
175 //TODO//FIXME 184 //TODO//FIXME
176 saveLines++; 185 saveLines++;
177 prev_nrow--; 186 prev_nrow--;
178 nsaved++; 187 top_row--;
179 } 188 }
180 189
181 want_refresh = 1; 190 want_refresh = 1;
182 191
183 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
… …
188 197
189 if (!row_buf) 198 if (!row_buf)
190 { 199 {
191 /* 200 /*
192 * 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
193 * Note: this is still needed so that all the scrollback lines are NULL
194 */ 202 */
195 nsaved = 0; /* no saved lines */ 203 top_row = 0;
196 term_start = 0; 204 term_start = 0;
197 205
198 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
199 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
200 208
201 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
202 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
203 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
204 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 212
206 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
207 { 214 {
208 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
209 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
230 selection.text = NULL; 237 selection.text = NULL;
231 selection.len = 0; 238 selection.len = 0;
232 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
233 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
234 selection.clicks = 0; 241 selection.clicks = 0;
235 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
236 rvideo = 0;
237 } 243 }
238 else 244 else
239 { 245 {
240 /* 246 /*
241 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
254 } 260 }
255 } 261 }
256#endif 262#endif
257 263
258 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));
259 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
260 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));
261 266
262 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
263 { 268 {
264 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
269 { 274 {
270 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);
271 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);
272 } 277 }
273 278
279 line_t *old_buf = row_buf;
274 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));
275 281
276 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
277 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
278 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
279 285
280 if (nsaved) 286 if (top_row)
281 { 287 {
282 // 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
283 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
284 290
285 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
286 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
287 293
… …
289 { 295 {
290 p = MOD (p - 1, prev_total_rows); 296 p = MOD (p - 1, prev_total_rows);
291#ifdef DEBUG_STRICT 297#ifdef DEBUG_STRICT
292 assert (old_buf [MOD (p, prev_total_rows)].t); 298 assert (old_buf [MOD (p, prev_total_rows)].t);
293#endif 299#endif
294
295 int plines = 1; 300 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l; 301 int llen = old_buf [MOD (p, prev_total_rows)].l;
297 302
298 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 ())
299 { 304 {
… …
317 // re-assemble the full line by destination lines 322 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++) 323 for (int qrow = q; qlines--; qrow++)
319 { 324 {
320 qline = row_buf + qrow; 325 qline = row_buf + qrow;
321 lalloc (*qline); 326 lalloc (*qline);
327 qline->l = ncol;
322 qline->set_is_longer (); 328 qline->is_longer (1);
323 329
324 int qcol = 0; 330 int qcol = 0;
325 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
326 // fill a single destination line 336 // fill a single destination line
327 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
328 { 338 {
329 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
330 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
340 350
341 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
342 352
343 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
344 354
345 assert (len);
346 assert (pline.t);
347
348 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
349 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
350 357
351 lofs += len; 358 lofs += len;
352 qcol += len; 359 qcol += len;
353 } 360 }
354 } 361 }
355 362
356 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 363 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
357#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 364 qline->is_longer (0);
358 if (qline->l < 0)
359 {
360 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
361 qline->l = 0;
362 }
363#endif
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
365 } 366 }
366 while (p != pend && q > 0); 367 while (p != pend && q > 0);
367 368
368 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
369 nsaved = term_start - q; 370 top_row = q - term_start;
370 371
371 // make sure all terminal lines exist 372 // make sure all terminal lines exist
372 while (nsaved < 0) 373 while (top_row > 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
374
375 } 375 }
376 else 376 else
377 { 377 {
378 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
379 379
… …
392 } 392 }
393 393
394 term_start = 0; 394 term_start = 0;
395 } 395 }
396 396
397#ifdef DEBUG_STRICT //TODO: remove
398 for (int i = -nsaved; i < nrow; i++)
399 assert (ROW (i).t);
400#endif
401
402 free (old_buf); 397 free (old_buf);
403 delete old_ta; 398 delete old_ta;
404 delete old_ra; 399 delete old_ra;
405 400
406 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
407 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
408 403
409 if (tabs)
410 free (tabs); 404 free (tabs);
411 } 405 }
406
407 CLEAR_ALL_SELECTION ();
412 408
413 prev_nrow = nrow; 409 prev_nrow = nrow;
414 prev_ncol = ncol; 410 prev_ncol = ncol;
415 411
416 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
417 413
418 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
419 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
420 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
421 tt_winch (); 420 tt_winch ();
421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
422} 423}
423 424
424/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
425/* 426/*
426 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
427 */ 428 */
428void 429void
429rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
430{ 431{
432 if (row_buf)
433 {
431 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
432 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
433 436
434 free (row_buf); 437 free (row_buf);
435 free (swap_buf); 438 free (swap_buf);
436 free (drawn_buf); 439 free (drawn_buf);
437 free (temp_buf);
438 free (tabs); 440 free (tabs);
439 441
440 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
441} 444}
442 445
443/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
444/* 447/*
445 * Hard reset 448 * Hard reset
… …
450 scr_release (); 453 scr_release ();
451 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
452 scr_reset (); 455 scr_reset ();
453 456
454 scr_clear (true); 457 scr_clear (true);
455 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
456} 459}
457 460
458/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
459 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
460 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
462 * Save and Restore cursor 465 * Save and Restore cursor
463 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
464 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
465 */ 468 */
466void 469void
467rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
468{ 471{
469 screen_t *s; 472 screen_t *s;
470 473
471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
472 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
504 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
505 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
506#endif 509#endif
507} 510}
508 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
509/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
510/* 528/*
511 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
514 */ 532 */
515int 533void
516rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
517{ 535{
536 if (scrn == current_screen)
537 return;
538
518 want_refresh = 1; 539 want_refresh = 1;
519 view_start = 0; 540 view_start = 0;
520 541
521 if (current_screen == scrn)
522 return scrn;
523
524 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
525 543
526 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
527 545
528 ::swap (screen.cur.row, swap.cur.row);
529 ::swap (screen.cur.col, swap.cur.col);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
533
534#if NSCREENS 546#if NSCREENS
535 if (options & Opt_secondaryScreen) 547 if (OPTION (Opt_secondaryScreen))
536 { 548 {
537 num_scr = 0; 549 num_scr = 0;
538 550
539 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
540 ::swap (ROW(i), swap_buf [i]);
541 552
542 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
543 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
544 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
545 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
546 } 557 }
547 else 558 else
548#endif 559#endif
549 if (options & Opt_secondaryScroll) 560 if (OPTION (Opt_secondaryScroll))
550 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
551
552 return scrn;
553} 562}
554 563
555// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
556void 565void
557rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
558{ 567{
559 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
560 return; 569 return;
561 570
562 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
572/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
573/* 582/*
574 * Change the colour for following text 583 * Change the colour for following text
575 */ 584 */
576void 585void
577rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
578{ 587{
579 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
580 color = fgbg; 589 color = fgbg;
581 590
582 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
583 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
584 else 593 else
… …
588/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
589/* 598/*
590 * Change the rendition style for following text 599 * Change the rendition style for following text
591 */ 600 */
592void 601void
593rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
594 { 603 {
595 if (set) 604 if (set)
596 rstyle |= style; 605 rstyle |= style;
597 else if (style == ~RS_None) 606 else if (style == ~RS_None)
598 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
605 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
606 * count positive ==> scroll up 615 * count positive ==> scroll up
607 * count negative ==> scroll down 616 * count negative ==> scroll down
608 */ 617 */
609int 618int
610rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
611{ 620{
612 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
613 return 0; 622 return 0;
614 623
615 want_refresh = 1; 624 want_refresh = 1;
616 num_scr += count; 625 num_scr += count;
617 626
618 if (count > 0 627 if (count > 0
619 && row1 == 0 628 && row1 == 0
620 && row2 == nrow - 1
621 && (current_screen == PRIMARY || options & Opt_secondaryScroll)) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
622 { 630 {
623 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
632
633 // scroll everything up 'count' lines
624 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
625 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 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i);
649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
667
668 // move and/or clear selection, if any
626 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
627 { 670 {
628 selection.beg.row -= count; 671 selection.beg.row -= count;
629 selection.end.row -= count; 672 selection.end.row -= count;
630 selection.mark.row -= count; 673 selection.mark.row -= count;
631 674
632 if (selection.beg.row < -nsaved 675 if (selection.beg.row < top_row
633 || selection.end.row < -nsaved 676 || selection.end.row < top_row
634 || selection.mark.row < -nsaved) 677 || selection.mark.row < top_row)
635 { 678 {
636 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
637 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
638 } 681 }
639 } 682 }
640 683
641 for (int i = count; i--; ) 684 // finally move the view window, if desired
642 {
643 ROW(row2 - i).l = 0;
644 scr_blank_screen_mem (ROW(row2 - i), rstyle);
645 }
646
647 if ((options & Opt_scrollWithBuffer) 685 if (OPTION (Opt_scrollWithBuffer)
648 && view_start != 0 686 && view_start != 0
649 && view_start != saveLines) 687 && view_start != -saveLines)
650 scr_page (UP, count); 688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
651 } 692 }
652 else 693 else
653 { 694 {
654 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen)
655 { 696 {
… …
679 720
680 int rows = row2 - row1 + 1; 721 int rows = row2 - row1 + 1;
681 722
682 min_it (count, rows); 723 min_it (count, rows);
683 724
725 line_t *temp_buf = row_buf + total_rows;
726
684 for (int row = 0; row < rows; row++) 727 for (int row = 0; row < rows; row++)
685 { 728 {
686 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
687 730
688 if (!IN_RANGE_EXC (row + count, 0, rows)) 731 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
699/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
700/* 743/*
701 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
702 */ 745 */
703void 746void
704rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
705{ 748{
706 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
707 return; 750 return;
708 751
709 unsigned char checksel; 752 unsigned char checksel;
710 unicode_t c; 753 unicode_t c;
711 int last_col; 754 int ncol = this->ncol;
712 const unicode_t *strend = str + len; 755 const wchar_t *strend = str + len;
713 756
714 want_refresh = 1; 757 want_refresh = 1;
715 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
716 last_col = ncol;
717 759
718 if (nlines > 0) 760 if (minlines > 0)
719 { 761 {
720 nlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
764
721 if (nlines > 0 765 if (minlines > 0
722 && screen.tscroll == 0 766 && screen.tscroll == 0
723 && screen.bscroll == (nrow - 1)) 767 && screen.bscroll == nrow - 1)
724 { 768 {
725 /* _at least_ this many lines need to be scrolled */ 769 /* _at least_ this many lines need to be scrolled */
726 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 770 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
727 screen.cur.row -= nlines; 771 screen.cur.row -= minlines;
728 } 772 }
729 } 773 }
730 774
731#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
732 assert (screen.cur.col < last_col); 776 assert (screen.cur.col < ncol);
733 assert (screen.cur.row < nrow 777 assert (screen.cur.row < nrow
734 && screen.cur.row >= -nsaved); 778 && screen.cur.row >= top_row);
735#endif 779#endif
736 int row = screen.cur.row; 780 int row = screen.cur.row;
737 781
738 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
739 783
740 line_t *line = &ROW(row); 784 line_t *line = &ROW(row);
741 785
742 while (str < strend) 786 while (str < strend)
743 { 787 {
744 c = *str++; 788 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
745 789
746 if (c < 0x20) 790 if (c < 0x20)
747 if (c == C0_LF) 791 if (c == C0_LF)
748 { 792 {
749 if (!line->is_longer ()) /* XXX: think about this */
750 max_it (line->l, screen.cur.col); 793 max_it (line->l, screen.cur.col);
751 794
752 screen.flags &= ~Screen_WrapNext; 795 screen.flags &= ~Screen_WrapNext;
753 796
754 if (screen.cur.row == screen.bscroll) 797 if (screen.cur.row == screen.bscroll)
755 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 798 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
759 line = &ROW(row); /* _must_ refresh */ 802 line = &ROW(row); /* _must_ refresh */
760 continue; 803 continue;
761 } 804 }
762 else if (c == C0_CR) 805 else if (c == C0_CR)
763 { 806 {
764 if (!line->is_longer ()) /* XXX: think about this */
765 max_it (line->l, screen.cur.col); 807 max_it (line->l, screen.cur.col);
766 808
767 screen.flags &= ~Screen_WrapNext; 809 screen.flags &= ~Screen_WrapNext;
768 screen.cur.col = 0; 810 screen.cur.col = 0;
769 continue; 811 continue;
770 } 812 }
… …
787 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
788 } 830 }
789 831
790 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
791 { 833 {
792 line->set_is_longer ();
793
794 scr_do_wrap (); 834 scr_do_wrap ();
795 835
836 line->l = ncol;
837 line->is_longer (1);
838
796 row = screen.cur.row; 839 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
798 } 841 }
799 842
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
801 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802 c = 0xfffd; 845 c = 0xfffd;
803 846
804 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
805 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
806 // for the line drawing characters below as they might be invalid in the current 849 // drawing characters below as they might be invalid in the current
807 // locale. 850 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
809 852
810 if (charsets[screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 854 {
812 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 856 // 5f-7e standard vt100
814 // 40-5e rxvt extension for extra curses acs chars 857 // 40-5e rxvt extension for extra curses acs chars
815 static uint16_t vt100_0[62] = { // 41 .. 7e 858 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
867 } 910 }
868 911
869 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 912 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
870 913
871 // if the character doesn't fit into the remaining columns... 914 // if the character doesn't fit into the remaining columns...
872 if (screen.cur.col > last_col - width && last_col >= width) 915 if (screen.cur.col > ncol - width && ncol >= width)
873 { 916 {
874 // ...output spaces 917 // ...output spaces
875 c = ' '; 918 c = ' ';
876 // and try the same character next loop iteration 919 // and try the same character next loop iteration
877 --str; 920 --str;
878 } 921 }
879 922
923 line->touch ();
924
880 do 925 do
881 { 926 {
882 line->t[screen.cur.col] = c; 927 line->t[screen.cur.col] = c;
883 line->r[screen.cur.col] = rend; 928 line->r[screen.cur.col] = rend;
884 929
885 if (screen.cur.col < last_col - 1) 930 if (screen.cur.col < ncol - 1)
886 screen.cur.col++; 931 screen.cur.col++;
887 else 932 else
888 { 933 {
889 line->l = last_col; 934 line->l = ncol;
890 if (screen.flags & Screen_Autowrap) 935 if (screen.flags & Screen_Autowrap)
891 screen.flags |= Screen_WrapNext; 936 screen.flags |= Screen_WrapNext;
892 break; 937 break;
893 } 938 }
894 939
… …
896 } 941 }
897 while (--width > 0); 942 while (--width > 0);
898 943
899 // pad with spaces when overwriting wide character with smaller one 944 // pad with spaces when overwriting wide character with smaller one
900 if (!width) 945 if (!width)
946 {
947 line->touch ();
948
901 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 949 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
902 { 950 {
903 line->t[c] = ' '; 951 line->t[c] = ' ';
904 line->r[c] = rend; 952 line->r[c] = rend;
905 } 953 }
954 }
906 } 955 }
907 else // width == 0 956 else // width == 0
908 { 957 {
909#if ENABLE_COMBINING 958#if ENABLE_COMBINING
910 // handle combining characters 959 // handle combining characters
911 // we just tag the accent on the previous on-screen character. 960 // we just tag the accent on the previous on-screen character.
912 // this is arguably not correct, but also arguably not wrong. 961 // this is arguably not correct, but also arguably not wrong.
913 // we don't handle double-width characters nicely yet. 962 // we don't handle double-width characters nicely yet.
963 line_t *linep;
914 text_t *tp; 964 text_t *tp;
915 rend_t *rp; 965 rend_t *rp;
916 966
917 if (screen.cur.col > 0) 967 if (screen.cur.col > 0)
918 { 968 {
969 linep = line;
919 tp = line->t + screen.cur.col - 1; 970 tp = line->t + screen.cur.col - 1;
920 rp = line->r + screen.cur.col - 1; 971 rp = line->r + screen.cur.col - 1;
921
922 while (*tp == NOCHAR && tp > line->t)
923 tp--, rp--;
924 } 972 }
925 else if (screen.cur.row > 0 973 else if (screen.cur.row > 0
926 && ROW(screen.cur.row - 1).is_longer ()) 974 && ROW(screen.cur.row - 1).is_longer ())
927 { 975 {
928 line_t *line = &ROW(screen.cur.row - 1); 976 linep = &ROW(screen.cur.row - 1);
929
930 tp = line->t + last_col - 1; 977 tp = line->t + ncol - 1;
931 rp = line->r + last_col - 1; 978 rp = line->r + ncol - 1;
932
933 while (*tp == NOCHAR && tp > line->t)
934 tp--, rp--;
935 } 979 }
936 else 980 else
937 continue; 981 continue;
982
983 linep->touch ();
984
985 while (*tp == NOCHAR && tp > linep->t)
986 tp--, rp--;
938 987
939 // first try to find a precomposed character 988 // first try to find a precomposed character
940 unicode_t n = rxvt_compose (*tp, c); 989 unicode_t n = rxvt_compose (*tp, c);
941 if (n == NOCHAR) 990 if (n == NOCHAR)
942 n = rxvt_composite.compose (*tp, c); 991 n = rxvt_composite.compose (*tp, c);
… …
945 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 994 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
946#endif 995#endif
947 } 996 }
948 } 997 }
949 998
950 if (!line->is_longer ()) /* XXX: think about this */
951 max_it (line->l, screen.cur.col); 999 max_it (line->l, screen.cur.col);
952 1000
953#ifdef DEBUG_STRICT 1001#ifdef DEBUG_STRICT
954 assert (screen.cur.row >= 0); 1002 assert (screen.cur.row >= 0);
955#endif 1003#endif
956} 1004}
… …
959/* 1007/*
960 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
961 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
962 */ 1010 */
963void 1011void
964rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
965{ 1013{
966 want_refresh = 1; 1014 want_refresh = 1;
967 1015
968 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
969 { 1017 {
… …
987 * Process Horizontal Tab 1035 * Process Horizontal Tab
988 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
989 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
990 */ 1038 */
991void 1039void
992rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
993{ 1041{
994 int i, x; 1042 int i, x;
995 1043
996 want_refresh = 1; 1044 want_refresh = 1;
997 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
… …
1006 1054
1007 for (; ++i < ncol; ) 1055 for (; ++i < ncol; )
1008 if (tabs[i]) 1056 if (tabs[i])
1009 { 1057 {
1010 x = i; 1058 x = i;
1059
1011 if (!--count) 1060 if (!--count)
1012 break; 1061 break;
1013 } 1062 }
1014 else 1063 else
1015 ht &= l.t[i] == ' ' 1064 ht &= l.t[i] == ' '
… …
1018 if (count) 1067 if (count)
1019 x = ncol - 1; 1068 x = ncol - 1;
1020 1069
1021 // store horizontal tab commands as characters inside the text 1070 // store horizontal tab commands as characters inside the text
1022 // buffer so they can be selected and pasted. 1071 // buffer so they can be selected and pasted.
1023 if (ht && options & Opt_pastableTabs) 1072 if (ht && OPTION (Opt_pastableTabs))
1024 { 1073 {
1025 base_rend = SET_FONT (base_rend, 0); 1074 base_rend = SET_FONT (base_rend, 0);
1026 1075
1027 if (!l.is_longer ()) /* XXX: think about this */ 1076 l.touch (x);
1028 max_it (l.l, x);
1029 1077
1030 i = screen.cur.col; 1078 i = screen.cur.col;
1031 1079
1032 l.t[i] = '\t'; 1080 l.t[i] = '\t';
1033 l.r[i] = base_rend; 1081 l.r[i] = base_rend;
… …
1064 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1065 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1066 */ 1114 */
1067#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1068void 1116void
1069rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1070{ 1118{
1071 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1072 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1073 else 1121 else
1074 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
… …
1081 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1082 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1083 */ 1131 */
1084#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1085void 1133void
1086rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1087{ 1135{
1088 if (screen.cur.col < ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1089 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1090 else 1138 else
1091 { 1139 {
1092 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1140 line_t &l = ROW(screen.cur.row);
1093 ROW(screen.cur.row).l = ncol; 1141
1142 l.touch ();
1143 l.is_longer (0);
1094 1144
1095 scr_gotorc (0, 0, R_RELATIVE); 1145 scr_gotorc (0, 0, R_RELATIVE);
1096 scr_insdel_chars (1, DELETE); 1146 scr_insdel_chars (1, DELETE);
1097 scr_gotorc (0, ncol - 1, R_RELATIVE); 1147 scr_gotorc (0, ncol - 1, R_RELATIVE);
1098 } 1148 }
… …
1102/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1103/* 1153/*
1104 * Goto Row/Column 1154 * Goto Row/Column
1105 */ 1155 */
1106void 1156void
1107rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1108{ 1158{
1109 want_refresh = 1; 1159 want_refresh = 1;
1110 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1111 1161
1112 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1150/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1151/* 1201/*
1152 * direction should be UP or DN 1202 * direction should be UP or DN
1153 */ 1203 */
1154void 1204void
1155rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1156{ 1206{
1157 int dirn; 1207 int dirn;
1158 1208
1159 want_refresh = 1; 1209 want_refresh = 1;
1160 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1179 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1180 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1181 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1182 */ 1232 */
1183void 1233void
1184rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1185{ 1235{
1186 unsigned int col, num; 1236 unsigned int col, num;
1187 1237
1188 want_refresh = 1; 1238 want_refresh = 1;
1189 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
1190 1240
1191 selection_check (1); 1241 selection_check (1);
1192 1242
1193 line_t &line = ROW(screen.cur.row); 1243 line_t &line = ROW(screen.cur.row);
1244
1245 line.touch ();
1246 line.is_longer (0);
1194 1247
1195 switch (mode) 1248 switch (mode)
1196 { 1249 {
1197 case 0: /* erase to end of line */ 1250 case 0: /* erase to end of line */
1198 col = screen.cur.col; 1251 col = screen.cur.col;
… …
1230 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1231 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1232 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1233 */ 1286 */
1234void 1287void
1235rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1236{ 1289{
1237 int num; 1290 int num;
1238 int32_t row; 1291 int32_t row;
1239 rend_t ren; 1292 rend_t ren;
1240 XGCValues gcvalue; 1293 XGCValues gcvalue;
… …
1284 CLEAR_ROWS (row, num); 1337 CLEAR_ROWS (row, num);
1285 } 1338 }
1286 else 1339 else
1287 { 1340 {
1288 ren = rstyle & (RS_fgMask | RS_bgMask); 1341 ren = rstyle & (RS_fgMask | RS_bgMask);
1289 gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; 1342 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1290 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1343 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1291 ERASE_ROWS (row, num); 1344 ERASE_ROWS (row, num);
1292 gcvalue.foreground = pix_colors[Color_fg]; 1345 gcvalue.foreground = pix_colors[Color_fg];
1293 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1294 } 1347 }
1295 1348
1296 for (; num--; row++) 1349 for (; num--; row++)
1297 { 1350 {
1298 ROW (row).l = 0;
1299 scr_blank_screen_mem (ROW (row), rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1300 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1352 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1301 } 1353 }
1302} 1354}
1303 1355
1304#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1305void 1357void
1306rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1307{ 1359{
1308 want_refresh = 1; 1360 want_refresh = 1;
1309 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1310 1362
1311 nsaved = 0; 1363 top_row = 0;
1312} 1364}
1313#endif 1365#endif
1314 1366
1315/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1316/* 1368/*
1317 * Fill the screen with `E's 1369 * Fill the screen with `E's
1318 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1319 */ 1371 */
1320void 1372void
1321rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1322{ 1374{
1323 rend_t fs; 1375 rend_t fs;
1324 1376
1325 want_refresh = 1; 1377 want_refresh = 1;
1326 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
… …
1337 rend_t *r1 = line.r; 1389 rend_t *r1 = line.r;
1338 1390
1339 for (int j = ncol; j--; ) 1391 for (int j = ncol; j--; )
1340 *r1++ = fs; 1392 *r1++ = fs;
1341 1393
1342 line.l = ncol; /* make the `E's selectable */ 1394 line.is_longer (0);
1395 line.touch (ncol);
1343 } 1396 }
1344} 1397}
1345 1398
1346/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1347/* 1400/*
1348 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1349 */ 1402 */
1350void 1403void
1351rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1352{ 1405{
1353 int end; 1406 int end;
1354 1407
1355 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1356 1409
… …
1376/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1377/* 1430/*
1378 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1379 */ 1432 */
1380void 1433void
1381rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1382{ 1435{
1383 int col, row; 1436 int col, row;
1384 rend_t tr; 1437 rend_t tr;
1385 1438
1386 want_refresh = 1; 1439 want_refresh = 1;
… …
1395 min_it (count, ncol - screen.cur.col); 1448 min_it (count, ncol - screen.cur.col);
1396 1449
1397 row = screen.cur.row; 1450 row = screen.cur.row;
1398 1451
1399 line_t *line = &ROW(row); 1452 line_t *line = &ROW(row);
1453
1454 line->touch ();
1455 line->is_longer (0);
1400 1456
1401 switch (insdel) 1457 switch (insdel)
1402 { 1458 {
1403 case INSERT: 1459 case INSERT:
1404 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1460 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1405 { 1461 {
1406 line->t[col] = line->t[col - count]; 1462 line->t[col] = line->t[col - count];
1407 line->r[col] = line->r[col - count]; 1463 line->r[col] = line->r[col - count];
1408 } 1464 }
1409 1465
1410 if (!line->is_longer ()) 1466 line->l = min (line->l + count, ncol);
1411 {
1412 line->l += count;
1413 min_it (line->l, ncol);
1414 }
1415 1467
1416 if (selection.op && current_screen == selection.screen 1468 if (selection.op && current_screen == selection.screen
1417 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1469 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1418 { 1470 {
1419 if (selection.end.row != screen.cur.row 1471 if (selection.end.row != screen.cur.row
… …
1432 1484
1433 case ERASE: 1485 case ERASE:
1434 screen.cur.col += count; /* don't worry if > ncol */ 1486 screen.cur.col += count; /* don't worry if > ncol */
1435 selection_check (1); 1487 selection_check (1);
1436 screen.cur.col -= count; 1488 screen.cur.col -= count;
1489
1490 line->l = max (line->l - count, 0);
1437 scr_blank_line (*line, screen.cur.col, count, rstyle); 1491 scr_blank_line (*line, screen.cur.col, count, rstyle);
1438 break; 1492 break;
1439 1493
1440 case DELETE: 1494 case DELETE:
1441 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1495 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1444 { 1498 {
1445 line->t[col] = line->t[col + count]; 1499 line->t[col] = line->t[col + count];
1446 line->r[col] = line->r[col + count]; 1500 line->r[col] = line->r[col + count];
1447 } 1501 }
1448 1502
1503 line->l = max (line->l - count, 0);
1449 scr_blank_line (*line, ncol - count, count, tr); 1504 scr_blank_line (*line, ncol - count, count, tr);
1450
1451 if (line->is_longer ()) /* break line continuation */
1452 line->l = ncol;
1453
1454 line->l = max (line->l - count, 0);
1455 1505
1456 if (selection.op && current_screen == selection.screen 1506 if (selection.op && current_screen == selection.screen
1457 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1507 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1458 { 1508 {
1459 if (selection.end.row != screen.cur.row 1509 if (selection.end.row != screen.cur.row
… …
1477/* 1527/*
1478 * Set the scrolling region 1528 * Set the scrolling region
1479 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1480 */ 1530 */
1481void 1531void
1482rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1483{ 1533{
1484 max_it (top, 0); 1534 max_it (top, 0);
1485 min_it (bot, nrow - 1); 1535 min_it (bot, nrow - 1);
1486 1536
1487 if (top > bot) 1537 if (top > bot)
… …
1497 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1498 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1499 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1500 */ 1550 */
1501void 1551void
1502rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1503{ 1553{
1504 want_refresh = 1; 1554 want_refresh = 1;
1505 1555
1506 if (mode) 1556 if (mode)
1507 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1514 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1515 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1516 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1517 */ 1567 */
1518void 1568void
1519rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1520{ 1570{
1521 if (mode) 1571 if (mode)
1522 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1523 else 1573 else
1524 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1533 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1534 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1535 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1536 */ 1586 */
1537void 1587void
1538rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1539{ 1589{
1540 if (mode) 1590 if (mode)
1541 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1542 else 1592 else
1543 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1550 * Set insert/replace mode 1600 * Set insert/replace mode
1551 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1552 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1553 */ 1603 */
1554void 1604void
1555rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1556{ 1606{
1557 if (mode) 1607 if (mode)
1558 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1559 else 1609 else
1560 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1566 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1567 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1568 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1569 */ 1619 */
1570void 1620void
1571rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1572{ 1622{
1573 if (mode < 0) 1623 if (mode < 0)
1574 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1575 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1576 tabs[screen.cur.col] = (mode ? 1 : 0); 1626 tabs [screen.cur.col] = !!mode;
1577} 1627}
1578 1628
1579/* ------------------------------------------------------------------------- */ 1629/* ------------------------------------------------------------------------- */
1580/* 1630/*
1581 * Set reverse/normal video 1631 * Set reverse/normal video
1582 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1583 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1584 */ 1634 */
1585void 1635void
1586rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1587{ 1637{
1588 XGCValues gcvalue; 1638 rvideo_mode = on;
1589 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1590 if (rvideo != mode) 1644 if (rvideo_state != on)
1591 { 1645 {
1592 rvideo = mode; 1646 rvideo_state = on;
1647
1593 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1594#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1595 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1596#endif 1651#endif
1597#if TRANSPARENT 1652#if TRANSPARENT
1598 if (! (options & Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1599#endif 1654#endif
1600 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1601 pix_colors[Color_bg]);
1602 1656
1657 XGCValues gcvalue;
1603 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1604 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1605 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1606 &gcvalue); 1661
1607 scr_clear (); 1662 scr_clear ();
1608 scr_touch (true); 1663 scr_touch (true);
1609 } 1664 }
1610} 1665}
1611 1666
… …
1613/* 1668/*
1614 * Report current cursor position 1669 * Report current cursor position
1615 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1616 */ 1671 */
1617void 1672void
1618rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1619{ 1674{
1620 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1621} 1676}
1622 1677
1623/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1626 1681
1627/* 1682/*
1628 * Set font style 1683 * Set font style
1629 */ 1684 */
1630void 1685void
1631rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1632{ 1687{
1688#if 0
1633 switch (charsets[screen.charset]) 1689 switch (charsets [screen.charset])
1634 { 1690 {
1635 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
1636 break; 1692 break;
1637 case 'A': /* United Kingdom (UK) */ 1693 case 'A': /* United Kingdom (UK) */
1638 break; 1694 break;
… …
1645 case 'C': /* Finnish character set */ 1701 case 'C': /* Finnish character set */
1646 break; 1702 break;
1647 case 'K': /* German character set */ 1703 case 'K': /* German character set */
1648 break; 1704 break;
1649 } 1705 }
1706#endif
1650} 1707}
1651 1708
1652/* ------------------------------------------------------------------------- */ 1709/* ------------------------------------------------------------------------- */
1653/* 1710/*
1654 * Choose a font 1711 * Choose a font
… …
1656 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1657 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1658 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1659 */ 1716 */
1660void 1717void
1661rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1662{ 1719{
1663 screen.charset = set; 1720 screen.charset = set;
1664 set_font_style (); 1721 set_font_style ();
1665} 1722}
1666 1723
… …
1672 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1673 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1674 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1675 */ 1732 */
1676void 1733void
1677rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1678{ 1735{
1679 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1680 set_font_style (); 1737 set_font_style ();
1681} 1738}
1682 1739
… …
1687 1744
1688/* 1745/*
1689 * refresh matching text. 1746 * refresh matching text.
1690 */ 1747 */
1691bool 1748bool
1692rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1693{ 1750{
1694 bool found = false; 1751 bool found = false;
1695 1752
1696 for (int i = 0; i < nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1697 { 1754 {
… …
1717 PART_END, 1774 PART_END,
1718 RC_COUNT 1775 RC_COUNT
1719}; 1776};
1720 1777
1721void 1778void
1722rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1723{ 1780{
1724 int i; 1781 int i;
1725 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1726 1783
1727 if (!drawn_buf) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
… …
1750 } 1807 }
1751 1808
1752 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1753 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1754 1811
1812 num_scr_allow = 0;
1813
1755 if (refresh) 1814 if (refresh)
1756 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1757} 1816}
1758 1817
1759/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1760/* 1819/*
1761 * Refresh the entire screen 1820 * Refresh the entire screen
1762 */ 1821 */
1763void 1822void
1764rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1765{ 1824{
1766 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1767} 1826}
1768 1827
1769/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1770/* 1829/*
1771 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1772 * the top of the screen 1831 * the top of the screen
1773 */ 1832 */
1774int 1833void
1775rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1776{ 1835{
1777 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1778 unsigned int oldviewstart;
1779
1780 oldviewstart = view_start;
1781
1782 if (y < len)
1783 {
1784 p = (nrow + nsaved) * (len - y) / len;
1785 p -= (long) (nrow - 1);
1786 p = max (p, 0);
1787 }
1788
1789 view_start = (unsigned int)min (p, nsaved);
1790
1791 return scr_changeview (oldviewstart);
1792} 1837}
1793 1838
1794/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1795/* 1840/*
1796 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1797 * direction should be UP or DN 1842 * direction should be UP or DN
1798 */ 1843 */
1799int 1844bool
1800rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1801{ 1846{
1802 int n; 1847 int new_view_start =
1803 unsigned int oldviewstart;
1804
1805 oldviewstart = view_start;
1806
1807 if (direction == UP)
1808 {
1809 n = view_start + nlines;
1810 view_start = min (n, nsaved);
1811 }
1812 else
1813 {
1814 n = view_start - nlines; 1848 direction == UP ? view_start - nlines
1815 view_start = max (n, 0); 1849 : view_start + nlines;
1816 }
1817 1850
1818 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1819} 1852}
1820 1853
1821int 1854bool
1822rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1823{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1824 if (view_start != oldviewstart) 1859 if (new_view_start == view_start)
1825 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1826 want_refresh = 1; 1864 want_refresh = 1;
1827 num_scr -= (view_start - oldviewstart);
1828 }
1829 1865
1830 return (int) (view_start - oldviewstart); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831}
1832 1867
1833/* ------------------------------------------------------------------------- */ 1868 return true;
1869}
1870
1871#ifndef NO_BELL
1834void 1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1835rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1836{ 1883{
1837#ifndef NO_BELL 1884#ifndef NO_BELL
1838 1885
1839# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1840# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
1841 if (options & Opt_mapAlert) 1888 if (OPTION (Opt_mapAlert))
1842# endif 1889# endif
1843 XMapWindow (display->display, parent[0]); 1890 XMapWindow (display->display, parent[0]);
1844# endif 1891# endif
1845 1892
1846 if (options & Opt_visualBell) 1893 if (OPTION (Opt_visualBell))
1847 { 1894 {
1848 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1849 rxvt_usleep (VISUAL_BELL_DURATION); 1896 scr_rvideo_mode (rvideo_mode);
1850 scr_rvideo_mode (!rvideo); /* refresh also done */ 1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1851 } 1900 }
1852 else 1901 else
1853 XBell (display->display, 0); 1902 XBell (display->display, 0);
1854 1903
1855#endif 1904#endif
1856} 1905}
1857 1906
1858/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1859/* ARGSUSED */ 1908/* ARGSUSED */
1860void 1909void
1861rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1862{ 1911{
1863#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1864 int nrows, row_start; 1913 int nrows, row_start;
1865 FILE *fd; 1914 FILE *fd;
1866 1915
1867 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1868 return; 1917 return;
1869 1918
1870 if (fullhist) 1919 if (fullhist)
1871 { 1920 {
1872 nrows = nrow + nsaved; 1921 nrows = nrow - top_row;
1873 row_start = -nsaved; 1922 row_start = top_row;
1874 } 1923 }
1875 else 1924 else
1876 { 1925 {
1877 nrows = nrow; 1926 nrows = nrow;
1878 row_start = -view_start; 1927 row_start = view_start;
1879 } 1928 }
1880 1929
1881 wctomb (0, 0); 1930 wctomb (0, 0);
1882 1931
1883 for (int r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
… …
1915 * Refresh the screen 1964 * Refresh the screen
1916 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
1917 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
1918 */ 1967 */
1919void 1968void
1920rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
1921{ 1970{
1922 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1923 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
1924 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
1925 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
… …
1942 1991
1943#if XPM_BACKGROUND 1992#if XPM_BACKGROUND
1944 must_clear |= bgPixmap.pixmap != None; 1993 must_clear |= bgPixmap.pixmap != None;
1945#endif 1994#endif
1946#if TRANSPARENT 1995#if TRANSPARENT
1947 must_clear |= (options & Opt_transparent) && am_transparent; 1996 must_clear |= OPTION (Opt_transparent) && am_transparent;
1948#endif 1997#endif
1949 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 1998 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1950 1999
1951 /* 2000 /*
1952 * B: reverse any characters which are selected 2001 * B: reverse any characters which are selected
… …
1976 2025
1977 crp = &ROW(screen.cur.row).r[col]; 2026 crp = &ROW(screen.cur.row).r[col];
1978 2027
1979 if (showcursor && focus) 2028 if (showcursor && focus)
1980 { 2029 {
1981 if (options & Opt_cursorUnderline) 2030 if (OPTION (Opt_cursorUnderline))
1982 *crp ^= RS_Uline; 2031 *crp ^= RS_Uline;
1983 else 2032 else
1984 { 2033 {
1985 *crp ^= RS_RVid; 2034 *crp ^= RS_RVid;
1986 2035
… …
1988 cc1 = *crp & (RS_fgMask | RS_bgMask); 2037 cc1 = *crp & (RS_fgMask | RS_bgMask);
1989 if (ISSET_PIXCOLOR (Color_cursor)) 2038 if (ISSET_PIXCOLOR (Color_cursor))
1990 ccol1 = Color_cursor; 2039 ccol1 = Color_cursor;
1991 else 2040 else
1992#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2041#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1993 ccol1 = GET_FGCOLOR (rstyle); 2042 ccol1 = fgcolor_of (rstyle);
1994#else 2043#else
1995 ccol1 = Color_fg; 2044 ccol1 = Color_fg;
1996#endif 2045#endif
1997 if (ISSET_PIXCOLOR (Color_cursor2)) 2046 if (ISSET_PIXCOLOR (Color_cursor2))
1998 ccol2 = Color_cursor2; 2047 ccol2 = Color_cursor2;
1999 else 2048 else
2000#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2049#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2001 ccol2 = GET_BGCOLOR (rstyle); 2050 ccol2 = bgcolor_of (rstyle);
2002#else 2051#else
2003 ccol2 = Color_bg; 2052 ccol2 = Color_bg;
2004#endif 2053#endif
2005 *crp = SET_FGCOLOR (*crp, ccol1); 2054 *crp = SET_FGCOLOR (*crp, ccol1);
2006 *crp = SET_BGCOLOR (*crp, ccol2); 2055 *crp = SET_BGCOLOR (*crp, ccol2);
… …
2011 2060
2012 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
2013 setoldcursor = 0; 2062 setoldcursor = 0;
2014 if (ocrow != -1) 2063 if (ocrow != -1)
2015 { 2064 {
2016 if (screen.cur.row + view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
2017 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
2018 { 2067 {
2019 if (ocrow < nrow 2068 if (ocrow < nrow
2020 && oldcursor.col < ncol) 2069 && oldcursor.col < ncol)
2021 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2029 else if (!focus) 2078 else if (!focus)
2030 setoldcursor = 1; 2079 setoldcursor = 1;
2031 2080
2032 if (setoldcursor) 2081 if (setoldcursor)
2033 { 2082 {
2034 if (screen.cur.row + view_start >= nrow) 2083 if (screen.cur.row - view_start >= nrow)
2035 oldcursor.row = -1; 2084 oldcursor.row = -1;
2036 else 2085 else
2037 { 2086 {
2038 oldcursor.row = screen.cur.row + view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2039 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2040 } 2089 }
2041 } 2090 }
2042 } 2091 }
2043 2092
2093 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY 2094#if ENABLE_OVERLAY
2045 scr_swap_overlay (); 2095 scr_swap_overlay ();
2046#endif 2096#endif
2047 2097
2048#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2049 /* 2099 /*
2050 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2051 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2052 */ 2102 */
2053 i = num_scr;
2054 if (!display->is_local 2103 if (!display->is_local
2055 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2056 && abs (num_scr) < nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2057 { 2106 {
2058 int16_t nits; 2107 int16_t nits;
2059 int j; 2108 int j;
2060 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2061 2111
2062 j = nrow; 2112 j = nrow;
2063 wlen = len = -1; 2113 wlen = len = -1;
2064 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2065 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2066 { 2116 {
2067 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2068 { 2118 {
2069 line_t s = ROW(row - view_start); 2119 line_t s = ROW(view_start + row);
2070 line_t d = drawn_buf[row]; 2120 line_t d = drawn_buf[row];
2071 line_t d2 = drawn_buf[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2072 2122
2073 for (nits = 0, col = ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2074 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2124 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2098 if (wlen < len) 2148 if (wlen < len)
2099 ::swap (wlen, len); 2149 ::swap (wlen, len);
2100 2150
2101 XCopyArea (display->display, vt, vt, 2151 XCopyArea (display->display, vt, vt,
2102 gc, 0, Row2Pixel (len + i), 2152 gc, 0, Row2Pixel (len + i),
2103 (unsigned int)TermWin_TotalWidth (), 2153 (unsigned int)this->width,
2104 (unsigned int)Height2Pixel (wlen - len + 1), 2154 (unsigned int)Height2Pixel (wlen - len + 1),
2105 0, Row2Pixel (len)); 2155 0, Row2Pixel (len));
2106 len = -1; 2156 len = -1;
2107 } 2157 }
2108 } 2158 }
… …
2112 /* 2162 /*
2113 * E: main pass across every character 2163 * E: main pass across every character
2114 */ 2164 */
2115 for (row = 0; row < nrow; row++) 2165 for (row = 0; row < nrow; row++)
2116 { 2166 {
2117 text_t *stp = ROW(row - view_start).t; 2167 text_t *stp = ROW(view_start + row).t;
2118 rend_t *srp = ROW(row - view_start).r; 2168 rend_t *srp = ROW(view_start + row).r;
2119 text_t *dtp = drawn_buf[row].t; 2169 text_t *dtp = drawn_buf[row].t;
2120 rend_t *drp = drawn_buf[row].r; 2170 rend_t *drp = drawn_buf[row].r;
2121 2171
2122 /* 2172 /*
2123 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
… …
2187 count++, i--; 2237 count++, i--;
2188 2238
2189 /* 2239 /*
2190 * Determine the attributes for the string 2240 * Determine the attributes for the string
2191 */ 2241 */
2192 int fore = GET_FGCOLOR (rend); // desired foreground 2242 int fore = fgcolor_of (rend); // desired foreground
2193 int back = GET_BGCOLOR (rend); // desired background 2243 int back = bgcolor_of (rend); // desired background
2194 2244
2195 // only do special processing if any attributes are set, which is rare 2245 // only do special processing if any attributes are set, which is unlikely
2196 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2197 { 2247 {
2198#if ENABLE_STYLES 2248#if ENABLE_STYLES
2199 // force redraw after "careful" characters to avoid pixel droppings 2249 // "careful" (too wide) character handling
2200 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2201 drp[col + 1] = ~srp[col + 1];
2202 2250
2203 // include previous careful character(s) if possible, looks nicer (best effort...) 2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2204 while (text > stp 2252 while (text > stp
2205 && srp[text - stp - 1] & RS_Careful 2253 && srp[text - stp - 1] & RS_Careful
2206 && RS_SAME (rend, srp[text - stp - 1])) 2254 && RS_SAME (rend, srp[text - stp - 1]))
2207 text--, count++, xpixel -= fwidth; 2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2208#endif 2264#endif
2209 2265
2210 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2211 2267
2212#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2311 } /* for (row....) */ 2367 } /* for (row....) */
2312 2368
2313#if ENABLE_OVERLAY 2369#if ENABLE_OVERLAY
2314 scr_swap_overlay (); 2370 scr_swap_overlay ();
2315#endif 2371#endif
2372 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2316 2373
2317 /* 2374 /*
2318 * G: cleanup cursor and display outline cursor if necessary 2375 * G: cleanup cursor and display outline cursor if necessary
2319 */ 2376 */
2320 if (showcursor) 2377 if (showcursor)
2321 { 2378 {
2322 if (focus) 2379 if (focus)
2323 { 2380 {
2324 if (options & Opt_cursorUnderline) 2381 if (OPTION (Opt_cursorUnderline))
2325 *crp ^= RS_Uline; 2382 *crp ^= RS_Uline;
2326 else 2383 else
2327 { 2384 {
2328 *crp ^= RS_RVid; 2385 *crp ^= RS_RVid;
2329#ifndef NO_CURSORCOLOR 2386#ifndef NO_CURSORCOLOR
… …
2359 /* 2416 /*
2360 * H: cleanup selection 2417 * H: cleanup selection
2361 */ 2418 */
2362 scr_reverse_selection (); 2419 scr_reverse_selection ();
2363 2420
2364 if (refresh_type & SMOOTH_REFRESH)
2365 XFlush (display->display);
2366
2367 num_scr = 0; 2421 num_scr = 0;
2368 num_scr_allow = 1; 2422 num_scr_allow = 1;
2369} 2423}
2370 2424
2371void 2425void
2372rxvt_term::scr_remap_chars (const line_t &l) 2426rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2373{ 2427{
2374 if (!l.t) 2428 if (!l.t)
2375 return; 2429 return;
2376 2430
2431 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2432
2377 for (int i = ncol; i--; ) 2433 for (int i = ncol; i--; )
2378 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2434 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2379} 2435}
2380 2436
2381void 2437void
2382rxvt_term::scr_remap_chars () 2438rxvt_term::scr_remap_chars () NOTHROW
2383{ 2439{
2384 for (int i = total_rows; i--; ) 2440 for (int i = total_rows; i--; )
2385 scr_remap_chars (row_buf [i]); 2441 scr_remap_chars (row_buf [i]);
2386 2442
2387 for (int i = nrow; i--; ) 2443 for (int i = nrow; i--; )
… …
2390 scr_remap_chars (swap_buf [i]); 2446 scr_remap_chars (swap_buf [i]);
2391 } 2447 }
2392} 2448}
2393 2449
2394void 2450void
2395rxvt_term::scr_recolour () 2451rxvt_term::scr_recolour () NOTHROW
2396{ 2452{
2397 if (1 2453 if (1
2398#if TRANSPARENT 2454#if TRANSPARENT
2399 && !am_transparent 2455 && !am_transparent
2400#endif 2456#endif
… …
2421 want_refresh = 1; 2477 want_refresh = 1;
2422} 2478}
2423 2479
2424/* ------------------------------------------------------------------------- */ 2480/* ------------------------------------------------------------------------- */
2425void 2481void
2426rxvt_term::scr_clear (bool really) 2482rxvt_term::scr_clear (bool really) NOTHROW
2427{ 2483{
2428 if (!mapped) 2484 if (!mapped)
2429 return; 2485 return;
2430 2486
2431 num_scr_allow = 0; 2487 num_scr_allow = 0;
… …
2433 2489
2434 if (really) 2490 if (really)
2435 XClearWindow (display->display, vt); 2491 XClearWindow (display->display, vt);
2436} 2492}
2437 2493
2438/* ------------------------------------------------------------------------- */
2439void 2494void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{
2497 int view_end = view_start + nrow;
2498 int row, col;
2499
2500 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2501 {
2502 text_t *stp = ROW(row).t;
2503 rend_t *srp = ROW(row).r;
2504
2505 for (col = beg_col; col < end_col; col++)
2506 srp[col] ^= rstyle1;
2507
2508 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2509 srp[col] ^= rstyle2;
2510
2511 if (++col < end_col)
2512 srp[col] ^= rstyle2;
2513 }
2514}
2515
2516void
2517rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2518{
2519 int view_end = view_start + nrow;
2520 int row, col;
2521
2522 if (beg_row >= view_start)
2523 {
2524 col = beg_col;
2525 row = beg_row;
2526 }
2527 else
2528 {
2529 col = 0;
2530 row = view_start;
2531 }
2532
2533 for (; row < min (end_row, view_end); row++, col = 0)
2534 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2535 srp[col] ^= rstyle;
2536
2537 if (row == end_row)
2538 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2539 srp[col] ^= rstyle;
2540}
2541
2542/* ------------------------------------------------------------------------- */
2543void
2440rxvt_term::scr_reverse_selection () 2544rxvt_term::scr_reverse_selection () NOTHROW
2441{ 2545{
2442 if (selection.op 2546 if (selection.op
2443 && current_screen == selection.screen 2547 && current_screen == selection.screen
2444 && selection.end.row >= -view_start) 2548 && selection.end.row >= view_start)
2445 { 2549 {
2446 int view_end = -view_start + nrow;
2447 int row, col;
2448
2449#if ENABLE_FRILLS 2550#if ENABLE_FRILLS
2450 if (selection.rect) 2551 if (selection.rect)
2451 { 2552 scr_xor_rect (selection.beg.row, selection.beg.col,
2452 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2553 selection.end.row, selection.end.col,
2453 for (rend_t *srp = ROW(row).r, col = selection.beg.col; col < selection.end.col; col++) 2554 RS_RVid, RS_RVid | RS_Uline);
2454 srp[col] ^= RS_RVid;
2455 }
2456 else 2555 else
2457#endif 2556#endif
2458 { 2557 scr_xor_span (selection.beg.row, selection.beg.col,
2459 if (selection.beg.row >= -view_start) 2558 selection.end.row, selection.end.col,
2460 { 2559 RS_RVid);
2461 col = selection.beg.col;
2462 row = selection.beg.row;
2463 }
2464 else
2465 {
2466 col = 0;
2467 row = -view_start;
2468 }
2469
2470 for (; row < min (selection.end.row, view_end); row++, col = 0)
2471 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2472 srp[col] ^= RS_RVid;
2473
2474 if (row == selection.end.row)
2475 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2476 srp[col] ^= RS_RVid;
2477 }
2478 } 2560 }
2479} 2561}
2480 2562
2481/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2482/* 2564/*
2483 * Dump the whole scrollback and screen to the passed filedescriptor. The 2565 * Dump the whole scrollback and screen to the passed filedescriptor. The
2484 * invoking routine must close the fd. 2566 * invoking routine must close the fd.
2485 */ 2567 */
2486#if 0 2568#if 0
2487void 2569void
2488rxvt_term::scr_dump (int fd) 2570rxvt_term::scr_dump (int fd) NOTHROW
2489{ 2571{
2490 int row, wrote; 2572 int row, wrote;
2491 unsigned int width, towrite; 2573 unsigned int width, towrite;
2492 char r1[] = "\n"; 2574 char r1[] = "\n";
2493 2575
… …
2512 2594
2513/* ------------------------------------------------------------------------- * 2595/* ------------------------------------------------------------------------- *
2514 * CHARACTER SELECTION * 2596 * CHARACTER SELECTION *
2515 * ------------------------------------------------------------------------- */ 2597 * ------------------------------------------------------------------------- */
2516void 2598void
2517rxvt_term::selection_check (int check_more) 2599rxvt_term::selection_check (int check_more) NOTHROW
2518{ 2600{
2519 row_col_t pos; 2601 row_col_t pos;
2520 2602
2521 if (!selection.op) 2603 if (!selection.op)
2522 return; 2604 return;
2523 2605
2524 pos.row = pos.col = 0; 2606 pos.row = pos.col = 0;
2525 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2607 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2526 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2608 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2527 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2609 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2528 || (check_more == 1 2610 || (check_more == 1
2529 && current_screen == selection.screen 2611 && current_screen == selection.screen
2530 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2612 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2531 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2613 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2532 || (check_more == 2 2614 || (check_more == 2
… …
2543/* ------------------------------------------------------------------------- */ 2625/* ------------------------------------------------------------------------- */
2544/* 2626/*
2545 * Paste a selection direct to the command fd 2627 * Paste a selection direct to the command fd
2546 */ 2628 */
2547void 2629void
2548rxvt_term::paste (unsigned char *data, unsigned int len) 2630rxvt_term::paste (char *data, unsigned int len) NOTHROW
2549{ 2631{
2550 /* convert normal newline chars into common keyboard Return key sequence */ 2632 /* convert normal newline chars into common keyboard Return key sequence */
2551 for (unsigned int i = 0; i < len; i++) 2633 for (unsigned int i = 0; i < len; i++)
2552 if (data[i] == C0_LF) 2634 if (data[i] == C0_LF)
2553 data[i] = C0_CR; 2635 data[i] = C0_CR;
… …
2559/* 2641/*
2560 * Respond to a notification that a primary selection has been sent 2642 * Respond to a notification that a primary selection has been sent
2561 * EXT: SelectionNotify 2643 * EXT: SelectionNotify
2562 */ 2644 */
2563void 2645void
2564rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2646rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2565{ 2647{
2566 if (prop == None) /* check for failed XConvertSelection */ 2648 if (prop == None) /* check for failed XConvertSelection */
2567 { 2649 {
2568 if ((selection_type & Sel_CompoundText)) 2650 if ((selection_type & Sel_CompoundText))
2569 { 2651 {
… …
2697 { 2779 {
2698 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2780 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2699 char *s = rxvt_wcstombs (w); 2781 char *s = rxvt_wcstombs (w);
2700 free (w); 2782 free (w);
2701 // TODO: strlen == only the first element will be converted. well... 2783 // TODO: strlen == only the first element will be converted. well...
2702 paste ((unsigned char *)s, strlen (s)); 2784 paste (s, strlen (s));
2703 free (s); 2785 free (s);
2704 } 2786 }
2705 else 2787 else
2706#endif 2788#endif
2707 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2789 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2708 && cl) 2790 && cl)
2709 { 2791 {
2710 for (int i = 0; i < cr; i++) 2792 for (int i = 0; i < cr; i++)
2711 paste ((unsigned char *)cl[i], strlen (cl[i])); 2793 paste (cl[i], strlen (cl[i]));
2712 2794
2713 XFreeStringList (cl); 2795 XFreeStringList (cl);
2714 } 2796 }
2715 else 2797 else
2716 paste (ct.value, ct.nitems); // paste raw 2798 paste ((char *)ct.value, ct.nitems); // paste raw
2717 2799
2718bailout: 2800bailout:
2719 XFree (ct.value); 2801 XFree (ct.value);
2720 2802
2721 if (selection_wait == Sel_normal) 2803 if (selection_wait == Sel_normal)
2722 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2723} 2805}
2724 2806
2725void 2807void
2726rxvt_term::incr_cb (time_watcher &w) 2808rxvt_term::incr_cb (time_watcher &w) NOTHROW
2727{ 2809{
2728 selection_wait = Sel_none; 2810 selection_wait = Sel_none;
2729 2811
2730 incr_buf_size = 0; 2812 incr_buf_size = 0;
2731 free (incr_buf); 2813 free (incr_buf);
2732 2814
2733 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2815 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2734} 2816}
2735 2817
2736void 2818void
2737rxvt_term::selection_property (Window win, Atom prop) 2819rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2738{ 2820{
2739 if (prop == None || selection_wait != Sel_incr) 2821 if (prop == None || selection_wait != Sel_incr)
2740 return; 2822 return;
2741 2823
2742 selection_paste (win, prop, true); 2824 selection_paste (win, prop, true);
… …
2751 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2833 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2752 * will auto fallback to CUT_BUFFER0 2834 * will auto fallback to CUT_BUFFER0
2753 * EXT: button 2 release 2835 * EXT: button 2 release
2754 */ 2836 */
2755void 2837void
2756rxvt_term::selection_request (Time tm, int x, int y) 2838rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2757{ 2839{
2758 if (x < 0 || x >= width || y < 0 || y >= height) 2840 if (selection.text && selnum == Sel_Primary)
2759 return; /* outside window */
2760
2761 if (selection.text)
2762 { /* internal selection */ 2841 { /* internal selection */
2763 char *str = rxvt_wcstombs (selection.text, selection.len); 2842 char *str = rxvt_wcstombs (selection.text, selection.len);
2764 paste ((unsigned char *)str, strlen (str)); 2843 paste (str, strlen (str));
2765 free (str); 2844 free (str);
2766 return; 2845 return;
2767 } 2846 }
2768 else 2847 else
2769 { 2848 {
2770 int i;
2771
2772 selection_request_time = tm; 2849 selection_request_time = tm;
2773 selection_wait = Sel_normal; 2850 selection_wait = Sel_normal;
2774 2851
2775 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2776 {
2777#if X_HAVE_UTF8_STRING 2852#if X_HAVE_UTF8_STRING
2778 selection_type = Sel_UTF8String; 2853 selection_type = Sel_UTF8String;
2779 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2854 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2780 return; 2855 return;
2781#else 2856#else
2782 selection_type = Sel_CompoundText; 2857 selection_type = Sel_CompoundText;
2783 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2858 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2784 return; 2859 return;
2785#endif 2860#endif
2786 }
2787 } 2861 }
2788 2862
2789 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2863 selection_wait = Sel_none; /* don't loop in selection_paste () */
2790 selection_paste (display->root, XA_CUT_BUFFER0, false); 2864 selection_paste (display->root, XA_CUT_BUFFER0, false);
2791} 2865}
2792 2866
2793int 2867int
2794rxvt_term::selection_request_other (Atom target, int selnum) 2868rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2795{ 2869{
2796 Atom sel; 2870 Atom sel;
2797 2871
2798 selection_type |= selnum; 2872 selection_type |= selnum;
2799 2873
… …
2818/* 2892/*
2819 * Clear all selected text 2893 * Clear all selected text
2820 * EXT: SelectionClear 2894 * EXT: SelectionClear
2821 */ 2895 */
2822void 2896void
2823rxvt_term::selection_clear () 2897rxvt_term::selection_clear () NOTHROW
2824{ 2898{
2825 want_refresh = 1; 2899 want_refresh = 1;
2826 free (selection.text); 2900 free (selection.text);
2827 selection.text = NULL; 2901 selection.text = NULL;
2828 selection.len = 0; 2902 selection.len = 0;
… …
2861 selection.op = SELECTION_DONE; 2935 selection.op = SELECTION_DONE;
2862 2936
2863 if (selection.clicks == 4) 2937 if (selection.clicks == 4)
2864 return; /* nothing selected, go away */ 2938 return; /* nothing selected, go away */
2865 2939
2940 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2941 return;
2942
2866 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2943 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2867 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2944 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2868 2945
2869 int ofs = 0; 2946 int ofs = 0;
2870 int extra = 0; 2947 int extra = 0;
… …
2882 col = selection.beg.col; 2959 col = selection.beg.col;
2883 end_col = ncol + 1; 2960 end_col = ncol + 1;
2884 } 2961 }
2885 else 2962 else
2886#endif 2963#endif
2887 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2964 end_col = ROW(row).l;
2888 2965
2889 col = max (col, 0); 2966 col = max (col, 0);
2890 2967
2891 if (row == selection.end.row || selection.rect) 2968 if (row == selection.end.row
2969#if ENABLE_FRILLS
2970 || selection.rect
2971#endif
2972 )
2892 end_col = min (end_col, selection.end.col); 2973 min_it (end_col, selection.end.col);
2893 2974
2894 t = ROW(row).t + col; 2975 t = ROW(row).t + col;
2976
2895 for (; col < end_col; col++) 2977 for (; col < end_col; col++)
2896 { 2978 {
2897 if (*t == NOCHAR) 2979 if (*t == NOCHAR)
2898 t++; 2980 t++;
2899#if ENABLE_COMBINING 2981#if ENABLE_COMBINING
… …
2915#endif 2997#endif
2916 else 2998 else
2917 new_selection_text[ofs++] = *t++; 2999 new_selection_text[ofs++] = *t++;
2918 } 3000 }
2919 3001
3002#if ENABLE_FRILLS
3003 if (selection.rect)
3004 {
3005 while (ofs
3006 && new_selection_text[ofs - 1] != C0_LF
3007 && unicode::is_space (new_selection_text[ofs - 1]))
3008 --ofs;
3009
3010 new_selection_text[ofs++] = C0_LF;
3011 }
3012 else
3013#endif
2920 if (!ROW(row).is_longer () && row != selection.end.row) 3014 if (!ROW(row).is_longer () && row != selection.end.row)
2921 new_selection_text[ofs++] = C0_LF; 3015 new_selection_text[ofs++] = C0_LF;
2922 } 3016 }
2923 3017
2924 if (end_col != selection.end.col) 3018 if (end_col != selection.end.col)
2925 new_selection_text[ofs++] = C0_LF; 3019 new_selection_text[ofs++] = C0_LF;
2926 3020
… …
2936 3030
2937 // we usually allocate much more than necessary, so realloc it smaller again 3031 // we usually allocate much more than necessary, so realloc it smaller again
2938 selection.len = ofs; 3032 selection.len = ofs;
2939 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3033 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2940 3034
3035 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
3036 return;
3037
3038 selection_grab (tm);
3039}
3040
3041bool
3042rxvt_term::selection_grab (Time tm) NOTHROW
3043{
3044 selection_time = tm;
3045
2941 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2942 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3048 {
2943 display->set_selection_owner (this); 3049 display->set_selection_owner (this);
3050 return true;
3051 }
2944 else 3052 else
2945 rxvt_warn ("can't get primary selection, ignoring.\n"); 3053 {
3054 selection_clear ();
3055 return false;
3056 }
2946 3057
2947#if 0 3058#if 0
2948 XTextProperty ct; 3059 XTextProperty ct;
2949 3060
2950 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
2951 { 3062 {
2952 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); 3063 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2953 XFree (ct.value); 3064 XFree (ct.value);
2954 } 3065 }
2955#endif 3066#endif
2956
2957 selection_time = tm;
2958} 3067}
2959 3068
2960/* ------------------------------------------------------------------------- */ 3069/* ------------------------------------------------------------------------- */
2961/* 3070/*
2962 * Mark or select text based upon number of clicks: 1, 2, or 3 3071 * Mark or select text based upon number of clicks: 1, 2, or 3
2963 * EXT: button 1 press 3072 * EXT: button 1 press
2964 */ 3073 */
2965void 3074void
2966rxvt_term::selection_click (int clicks, int x, int y) 3075rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2967{ 3076{
2968 clicks = ((clicks - 1) % 3) + 1; 3077 clicks = ((clicks - 1) % 3) + 1;
2969 selection.clicks = clicks; /* save clicks so extend will work */ 3078 selection.clicks = clicks; /* save clicks so extend will work */
2970 3079
3080 if (clicks == 2 && !selection.rect
3081 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3082 {
3083 MEvent.clicks = 1; // what a mess
3084 selection.screen = current_screen;
3085 selection.op = SELECTION_CONT;
3086 return;
3087 }
3088
2971 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3089 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2972 3090
2973 if (clicks == 2 || clicks == 3) 3091 if (clicks == 2 || clicks == 3)
2974 selection_extend_colrow (selection.mark.col, 3092 selection_extend_colrow (selection.mark.col,
2975 selection.mark.row + view_start, 3093 selection.mark.row - view_start,
2976 0, /* button 3 */ 3094 0, /* button 3 */
2977 1, /* button press */ 3095 1, /* button press */
2978 0); /* click change */ 3096 0); /* click change */
2979} 3097}
2980 3098
2981/* ------------------------------------------------------------------------- */ 3099/* ------------------------------------------------------------------------- */
2982/* 3100/*
2983 * Mark a selection at the specified col/row 3101 * Mark a selection at the specified col/row
2984 */ 3102 */
2985void 3103void
2986rxvt_term::selection_start_colrow (int col, int row) 3104rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2987{ 3105{
2988 want_refresh = 1; 3106 want_refresh = 1;
2989 3107
2990 selection.mark.row = row - view_start; 3108 selection.mark.row = row + view_start;
2991 selection.mark.col = col; 3109 selection.mark.col = col;
2992 3110
2993 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3111 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2994 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3112 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
2995 3113
2996 while (selection.mark.col > 0 3114 while (selection.mark.col > 0
2997 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3115 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
2998 --selection.mark.col; 3116 --selection.mark.col;
… …
3017#define DELIMIT_TEXT(x) \ 3135#define DELIMIT_TEXT(x) \
3018 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3136 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3019#define DELIMIT_REND(x) 1 3137#define DELIMIT_REND(x) 1
3020 3138
3021void 3139void
3022rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3140rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3023{ 3141{
3024 int col, row, dirnadd, tcol, trow, w1, w2; 3142 int col, row, dirnadd, tcol, trow, w1, w2;
3025 row_col_t bound; 3143 row_col_t bound;
3026 text_t *stp; 3144 text_t *stp;
3027 rend_t *srp; 3145 rend_t *srp;
3028 3146
3029 if (dirn == UP) 3147 if (dirn == UP)
3030 { 3148 {
3031 bound.row = - nsaved - 1; 3149 bound.row = top_row - 1;
3032 bound.col = 0; 3150 bound.col = 0;
3033 dirnadd = -1; 3151 dirnadd = -1;
3034 } 3152 }
3035 else 3153 else
3036 { 3154 {
… …
3084 } 3202 }
3085 } 3203 }
3086 break; 3204 break;
3087 } 3205 }
3088 3206
3089Old_Word_Selection_You_Die:
3090 if (dirn == DN) 3207 if (dirn == DN)
3091 col++; /* put us on one past the end */ 3208 col++; /* put us on one past the end */
3092 3209
3093 /* Poke the values back in */ 3210 /* Poke the values back in */
3094 ret->row = row; 3211 ret->row = row;
… …
3102 * flag == 0 ==> button 1 3219 * flag == 0 ==> button 1
3103 * flag == 1 ==> button 3 press 3220 * flag == 1 ==> button 3 press
3104 * flag == 2 ==> button 3 motion 3221 * flag == 2 ==> button 3 motion
3105 */ 3222 */
3106void 3223void
3107rxvt_term::selection_extend (int x, int y, int flag) 3224rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3108{ 3225{
3109 int col = clamp (Pixel2Col (x), 0, ncol); 3226 int col = clamp (Pixel2Col (x), 0, ncol);
3110 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3227 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3111 3228
3112 /* 3229 /*
… …
3115 * select nothing. Otherwise, if we're to the right of the mark, you have to 3232 * select nothing. Otherwise, if we're to the right of the mark, you have to
3116 * be _past_ a character for it to be selected. 3233 * be _past_ a character for it to be selected.
3117 */ 3234 */
3118 if (((selection.clicks % 3) == 1) && !flag 3235 if (((selection.clicks % 3) == 1) && !flag
3119 && (col == selection.mark.col 3236 && (col == selection.mark.col
3120 && (row == selection.mark.row + view_start))) 3237 && (row == selection.mark.row - view_start)))
3121 { 3238 {
3122 /* select nothing */ 3239 /* select nothing */
3123 selection.beg.row = selection.end.row = 0; 3240 selection.beg.row = selection.end.row = 0;
3124 selection.beg.col = selection.end.col = 0; 3241 selection.beg.col = selection.end.col = 0;
3125 selection.clicks = 4; 3242 selection.clicks = 4;
… …
3138/* ------------------------------------------------------------------------- */ 3255/* ------------------------------------------------------------------------- */
3139/* 3256/*
3140 * Extend the selection to the specified col/row 3257 * Extend the selection to the specified col/row
3141 */ 3258 */
3142void 3259void
3143rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3144{ 3261{
3145 row_col_t pos; 3262 row_col_t pos;
3146 enum { 3263 enum {
3147 LEFT, RIGHT 3264 LEFT, RIGHT
3148 } closeto = RIGHT; 3265 } closeto = RIGHT;
… …
3180 selection.beg.col = selection.end.col = selection.mark.col; 3297 selection.beg.col = selection.end.col = selection.mark.col;
3181 selection.beg.row = selection.end.row = selection.mark.row; 3298 selection.beg.row = selection.end.row = selection.mark.row;
3182 } 3299 }
3183 3300
3184 pos.col = col; 3301 pos.col = col;
3185 pos.row = row - view_start; 3302 pos.row = view_start + row;
3186 3303
3187 /* 3304 /*
3188 * This is mainly xterm style selection with a couple of differences, mainly 3305 * This is mainly xterm style selection with a couple of differences, mainly
3189 * in the way button3 drag extension works. 3306 * in the way button3 drag extension works.
3190 * We're either doing: button1 drag; button3 press; or button3 drag 3307 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3277 selection_delimit_word (DN, &selection.end, &selection.end); 3394 selection_delimit_word (DN, &selection.end, &selection.end);
3278 } 3395 }
3279 else if (selection.clicks == 3) 3396 else if (selection.clicks == 3)
3280 { 3397 {
3281#if ENABLE_FRILLS 3398#if ENABLE_FRILLS
3282 if (options & Opt_tripleclickwords) 3399 if (OPTION (Opt_tripleclickwords))
3283 { 3400 {
3284 selection_delimit_word (UP, &selection.beg, &selection.beg); 3401 selection_delimit_word (UP, &selection.beg, &selection.beg);
3285 3402
3286 for (int end_row = selection.mark.row; end_row < nrow; end_row++) 3403 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3287 { 3404 {
… …
3334#endif 3451#endif
3335} 3452}
3336 3453
3337#if ENABLE_FRILLS 3454#if ENABLE_FRILLS
3338void 3455void
3339rxvt_term::selection_remove_trailing_spaces () 3456rxvt_term::selection_remove_trailing_spaces () NOTHROW
3340{ 3457{
3341 int32_t end_col, end_row; 3458 int32_t end_col, end_row;
3342 text_t *stp; 3459 text_t *stp;
3343 3460
3344 end_col = selection.end.col; 3461 end_col = selection.end.col;
… …
3348 { 3465 {
3349 stp = ROW(end_row).t; 3466 stp = ROW(end_row).t;
3350 3467
3351 while (--end_col >= 0) 3468 while (--end_col >= 0)
3352 { 3469 {
3353 if (stp[end_col] != ' ' 3470 if (stp[end_col] != NOCHAR
3354 && stp[end_col] != '\t' 3471 && !unicode::is_space (stp[end_col]))
3355 && stp[end_col] != NOCHAR)
3356 break; 3472 break;
3357 } 3473 }
3358 3474
3359 if (end_col >= 0 3475 if (end_col >= 0
3360 || !ROW(end_row - 1).is_longer ()) 3476 || !ROW(end_row - 1).is_longer ())
… …
3383/* 3499/*
3384 * Double click on button 3 when already selected 3500 * Double click on button 3 when already selected
3385 * EXT: button 3 double click 3501 * EXT: button 3 double click
3386 */ 3502 */
3387void 3503void
3388rxvt_term::selection_rotate (int x, int y) 3504rxvt_term::selection_rotate (int x, int y) NOTHROW
3389{ 3505{
3390 selection.clicks = selection.clicks % 3 + 1; 3506 selection.clicks = selection.clicks % 3 + 1;
3391 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3507 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3392} 3508}
3393 3509
… …
3395/* 3511/*
3396 * Respond to a request for our current selection 3512 * Respond to a request for our current selection
3397 * EXT: SelectionRequest 3513 * EXT: SelectionRequest
3398 */ 3514 */
3399void 3515void
3400rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3516rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3401{ 3517{
3402 XSelectionEvent ev; 3518 XSelectionEvent ev;
3403 dDisp; 3519 dDisp;
3404 3520
3405 ev.type = SelectionNotify; 3521 ev.type = SelectionNotify;
… …
3533 3649
3534/* 3650/*
3535 * return col/row values corresponding to x/y pixel values 3651 * return col/row values corresponding to x/y pixel values
3536 */ 3652 */
3537void 3653void
3538rxvt_term::pixel_position (int *x, int *y) 3654rxvt_term::pixel_position (int *x, int *y) NOTHROW
3539{ 3655{
3540 *x = Pixel2Col (*x); 3656 *x = Pixel2Col (*x);
3541 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3657 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3542 *y = Pixel2Row (*y); 3658 *y = Pixel2Row (*y);
3543 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3659 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3544} 3660}
3545 3661
3546/* ------------------------------------------------------------------------- */ 3662/* ------------------------------------------------------------------------- */
3547#ifdef USE_XIM 3663#ifdef USE_XIM
3548void 3664void
3549rxvt_term::im_set_position (XPoint &pos) 3665rxvt_term::im_set_position (XPoint &pos) NOTHROW
3550{ 3666{
3551 XWindowAttributes xwa; 3667 XWindowAttributes xwa;
3552 3668
3553 XGetWindowAttributes (display->display, vt, &xwa); 3669 XGetWindowAttributes (display->display, vt, &xwa);
3554 3670
… …
3557} 3673}
3558#endif 3674#endif
3559 3675
3560#if ENABLE_OVERLAY 3676#if ENABLE_OVERLAY
3561void 3677void
3562rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3678rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3563{ 3679{
3564 if (nrow < 3 || ncol < 3) 3680 if (nrow < 1 || ncol < 1)
3565 return; 3681 return;
3566 3682
3567 want_refresh = 1; 3683 want_refresh = 1;
3568 3684
3569 scr_overlay_off (); 3685 scr_overlay_off ();
… …
3612 *rp = r; 3728 *rp = r;
3613 } 3729 }
3614} 3730}
3615 3731
3616void 3732void
3617rxvt_term::scr_overlay_off () 3733rxvt_term::scr_overlay_off () NOTHROW
3618{ 3734{
3619 if (!ov_text) 3735 if (!ov_text)
3620 return; 3736 return;
3621 3737
3622 want_refresh = 1; 3738 want_refresh = 1;
… …
3630 delete [] ov_text; ov_text = 0; 3746 delete [] ov_text; ov_text = 0;
3631 delete [] ov_rend; ov_rend = 0; 3747 delete [] ov_rend; ov_rend = 0;
3632} 3748}
3633 3749
3634void 3750void
3635rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3751rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3636{ 3752{
3637 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3753 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3638 return; 3754 return;
3639 3755
3640 x++, y++; 3756 x++, y++;
… …
3642 ov_text[y][x] = text; 3758 ov_text[y][x] = text;
3643 ov_rend[y][x] = rend; 3759 ov_rend[y][x] = rend;
3644} 3760}
3645 3761
3646void 3762void
3647rxvt_term::scr_overlay_set (int x, int y, const char *s) 3763rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3648{ 3764{
3649 while (*s) 3765 while (*s)
3650 scr_overlay_set (x++, y, *s++); 3766 scr_overlay_set (x++, y, *s++);
3651} 3767}
3652 3768
3653void 3769void
3654rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3770rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3655{ 3771{
3656 while (*s) 3772 while (*s)
3657 { 3773 {
3658 text_t t = *s++; 3774 text_t t = *s++;
3659 int width = wcwidth (t); 3775 int width = WCWIDTH (t);
3660 3776
3661 while (width--) 3777 while (width--)
3662 { 3778 {
3663 scr_overlay_set (x++, y, t); 3779 scr_overlay_set (x++, y, t);
3664 t = NOCHAR; 3780 t = NOCHAR;
3665 } 3781 }
3666 } 3782 }
3667} 3783}
3668 3784
3669void 3785void
3670rxvt_term::scr_swap_overlay () 3786rxvt_term::scr_swap_overlay () NOTHROW
3671{ 3787{
3672 if (!ov_text) 3788 if (!ov_text)
3673 return; 3789 return;
3674 3790
3675 // swap screen mem with overlay 3791 // swap screen mem with overlay
3676 for (int y = ov_h; y--; ) 3792 for (int y = ov_h; y--; )
3677 { 3793 {
3678 text_t *t1 = ov_text[y]; 3794 text_t *t1 = ov_text[y];
3679 rend_t *r1 = ov_rend[y]; 3795 rend_t *r1 = ov_rend[y];
3680 3796
3681 text_t *t2 = ROW(y - view_start).t + ov_x; 3797 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3682 rend_t *r2 = ROW(y - view_start).r + ov_x; 3798 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3683 3799
3684 for (int x = ov_w; x--; ) 3800 for (int x = ov_w; x--; )
3685 { 3801 {
3686 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3802 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3687 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3803 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