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.206 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.246 by root, Sat Jan 21 14:25:05 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.
… …
115 * SCREEN `COMMON' ROUTINES * 115 * SCREEN `COMMON' ROUTINES *
116 * ------------------------------------------------------------------------- */ 116 * ------------------------------------------------------------------------- */
117 117
118/* Fill part/all of a line with blanks. */ 118/* Fill part/all of a line with blanks. */
119void 119void
120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) 120rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 121{
122 if (!l.t) 122 if (!l.t)
123 { 123 {
124 lalloc (l); 124 lalloc (l);
125 col = 0; 125 col = 0;
126 width = ncol; 126 width = ncol;
127 } 127 }
128 128
129 l.touch ();
130
129 efs &= ~RS_baseattrMask; 131 efs &= ~RS_baseattrMask;
130 efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); 132 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
131 133
132 text_t *et = l.t + col; 134 text_t *et = l.t + col;
133 rend_t *er = l.r + col; 135 rend_t *er = l.r + col;
… …
140} 142}
141 143
142/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
143/* Fill a full line with blanks - make sure it is allocated first */ 145/* Fill a full line with blanks - make sure it is allocated first */
144void 146void
145rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) 147rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
146{ 148{
147 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150
151 l.l = 0;
152 l.f = 0;
148} 153}
149 154
150/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
151 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
152 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
174 if (nrow + saveLines < 2) 179 if (nrow + saveLines < 2)
175 { 180 {
176 //TODO//FIXME 181 //TODO//FIXME
177 saveLines++; 182 saveLines++;
178 prev_nrow--; 183 prev_nrow--;
179 nsaved++; 184 top_row--;
180 } 185 }
181 186
182 want_refresh = 1; 187 want_refresh = 1;
183 188
184 int prev_total_rows = prev_nrow + saveLines; 189 int prev_total_rows = prev_nrow + saveLines;
… …
189 194
190 if (!row_buf) 195 if (!row_buf)
191 { 196 {
192 /* 197 /*
193 * first time called so just malloc everything: don't rely on realloc 198 * first time called so just malloc everything: don't rely on realloc
194 * Note: this is still needed so that all the scrollback lines are NULL
195 */ 199 */
196 nsaved = 0; /* no saved lines */ 200 top_row = 0; /* no saved lines */
197 term_start = 0; 201 term_start = 0;
198 202
199 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 203 talloc = new rxvt_salloc (ncol * sizeof (text_t));
200 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
201 205
202 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 206 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
203 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
204 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 207 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
205 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 208 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
206 209
207 for (int row = nrow; row--; ) 210 for (int row = nrow; row--; )
208 { 211 {
209 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 212 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
210 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 213 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
231 selection.text = NULL; 234 selection.text = NULL;
232 selection.len = 0; 235 selection.len = 0;
233 selection.op = SELECTION_CLEAR; 236 selection.op = SELECTION_CLEAR;
234 selection.screen = PRIMARY; 237 selection.screen = PRIMARY;
235 selection.clicks = 0; 238 selection.clicks = 0;
236 CLEAR_ALL_SELECTION (); 239 rvideo_state = rvideo_mode = false;
237 rvideo = 0;
238 } 240 }
239 else 241 else
240 { 242 {
241 /* 243 /*
242 * add or delete rows as appropriate 244 * add or delete rows as appropriate
… …
255 } 257 }
256 } 258 }
257#endif 259#endif
258 260
259 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 261 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
260 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 262 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262 263
263 for (int row = min (nrow, prev_nrow); row--; ) 264 for (int row = min (nrow, prev_nrow); row--; )
264 { 265 {
265 lresize (drawn_buf[row]); 266 lresize (drawn_buf[row]);
… …
270 { 271 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 272 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 273 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 } 274 }
274 275
276 line_t *old_buf = row_buf;
275 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 277 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
276 278
277 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 279 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
278 int pend = MOD (term_start - nsaved , prev_total_rows); 280 int pend = MOD (term_start + top_row , prev_total_rows);
279 int q = total_rows; // rewrapped row 281 int q = total_rows; // rewrapped row
280 282
281 if (nsaved) 283 if (top_row)
282 { 284 {
283 // re-wrap lines, this is rather ugly, possibly because I am too dumb 285 // re-wrap lines, this is rather ugly, possibly because I am too dumb
284 // to come up with a lean and mean algorithm. 286 // to come up with a lean and mean algorithm.
285 287
286 row_col_t ocur = screen.cur; 288 row_col_t ocur = screen.cur;
… …
290 { 292 {
291 p = MOD (p - 1, prev_total_rows); 293 p = MOD (p - 1, prev_total_rows);
292#ifdef DEBUG_STRICT 294#ifdef DEBUG_STRICT
293 assert (old_buf [MOD (p, prev_total_rows)].t); 295 assert (old_buf [MOD (p, prev_total_rows)].t);
294#endif 296#endif
295
296 int plines = 1; 297 int plines = 1;
297 int llen = old_buf [MOD (p, prev_total_rows)].l; 298 int llen = old_buf [MOD (p, prev_total_rows)].l;
298 299
299 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) 300 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
300 { 301 {
… …
318 // re-assemble the full line by destination lines 319 // re-assemble the full line by destination lines
319 for (int qrow = q; qlines--; qrow++) 320 for (int qrow = q; qlines--; qrow++)
320 { 321 {
321 qline = row_buf + qrow; 322 qline = row_buf + qrow;
322 lalloc (*qline); 323 lalloc (*qline);
324 qline->l = ncol;
323 qline->set_is_longer (); 325 qline->is_longer (1);
324 326
325 int qcol = 0; 327 int qcol = 0;
326 328
329 // see below for cursor adjustment rationale
330 if (p == ocur.row)
331 screen.cur.row = q - (total_rows - nrow);
332
327 // fill a single destination line 333 // fill a single destination line
328 while (lofs < llen && qcol < ncol) 334 while (lofs < llen && qcol < ncol)
329 { 335 {
330 int prow = lofs / prev_ncol; 336 int prow = lofs / prev_ncol;
331 int pcol = lofs % prev_ncol; 337 int pcol = lofs % prev_ncol;
… …
341 347
342 line_t &pline = old_buf [prow]; 348 line_t &pline = old_buf [prow];
343 349
344 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 350 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
345 351
352#if DEBUG_STRICT
346 assert (len); 353 assert (len);
347 assert (pline.t); 354 assert (pline.t);
355#endif
348 356
349 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 357 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
350 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 358 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
351 359
352 lofs += len; 360 lofs += len;
353 qcol += len; 361 qcol += len;
354 } 362 }
355 } 363 }
356 364
357 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0; 365 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
358#ifdef DEBUG_STRICT //TODO//FIXME//TEMPORARY 366 qline->is_longer (0);
359 if (qline->l < 0)
360 {
361 fprintf (stderr, "ERROR, PLEASE REPORT to rxvt-unicode@plan9.de: qline->l %d = llen %d < ncol %d ? %d : MOD %d\n", qline->l,llen,ncol,llen,MOD (llen - 1, ncol) + 1);//D
362 qline->l = 0;
363 }
364#endif
365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 367 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
366 } 368 }
367 while (p != pend && q > 0); 369 while (p != pend && q > 0);
368 370
369 term_start = total_rows - nrow; 371 term_start = total_rows - nrow;
370 nsaved = term_start - q; 372 top_row = q - term_start;
371 373
372 // make sure all terminal lines exist 374 // make sure all terminal lines exist
373 while (nsaved < 0) 375 while (top_row > 0)
374 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 376 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
375
376 } 377 }
377 else 378 else
378 { 379 {
379 // if no scrollback exists (yet), wing, instead of wrap 380 // if no scrollback exists (yet), wing, instead of wrap
380 381
… …
393 } 394 }
394 395
395 term_start = 0; 396 term_start = 0;
396 } 397 }
397 398
398#ifdef DEBUG_STRICT //TODO: remove
399 for (int i = -nsaved; i < nrow; i++)
400 assert (ROW (i).t);
401#endif
402
403 free (old_buf); 399 free (old_buf);
404 delete old_ta; 400 delete old_ta;
405 delete old_ra; 401 delete old_ra;
406 402
407 clamp_it (screen.cur.row, 0, nrow - 1); 403 clamp_it (screen.cur.row, 0, nrow - 1);
… …
409 405
410 if (tabs) 406 if (tabs)
411 free (tabs); 407 free (tabs);
412 } 408 }
413 409
410 CLEAR_ALL_SELECTION ();
411
414 prev_nrow = nrow; 412 prev_nrow = nrow;
415 prev_ncol = ncol; 413 prev_ncol = ncol;
416 414
417 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 415 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
418 416
419 for (int col = ncol; col--; ) 417 for (int col = ncol; col--; )
420 tabs [col] = col % TABSIZE == 0; 418 tabs [col] = col % TABSIZE == 0;
421 419
422 tt_winch (); 420 tt_winch ();
423 421
424 PERL_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
425} 423}
426 424
427/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
428/* 426/*
429 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
430 */ 428 */
431void 429void
432rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
433{ 431{
434 delete talloc; talloc = 0; 432 delete talloc; talloc = 0;
435 delete ralloc; ralloc = 0; 433 delete ralloc; ralloc = 0;
436 434
437 free (row_buf); 435 free (row_buf);
438 free (swap_buf); 436 free (swap_buf);
439 free (drawn_buf); 437 free (drawn_buf);
440 free (temp_buf);
441 free (tabs); 438 free (tabs);
442 439
443 row_buf = 0; // signal that we freed all the arrays 440 row_buf = 0; // signal that we freed all the arrays
444} 441}
445 442
446/* ------------------------------------------------------------------------- */ 443/* ------------------------------------------------------------------------- */
447/* 444/*
448 * Hard reset 445 * Hard reset
449 */ 446 */
450void 447void
451rxvt_term::scr_poweron () 448rxvt_term::scr_poweron () NOTHROW
452{ 449{
453 scr_release (); 450 scr_release ();
454 prev_nrow = prev_ncol = 0; 451 prev_nrow = prev_ncol = 0;
455 scr_reset (); 452 scr_reset ();
456 453
457 scr_clear (true); 454 scr_clear (true);
458 scr_refresh (SLOW_REFRESH); 455 scr_refresh ();
459} 456}
460 457
461/* ------------------------------------------------------------------------- * 458/* ------------------------------------------------------------------------- *
462 * PROCESS SCREEN COMMANDS * 459 * PROCESS SCREEN COMMANDS *
463 * ------------------------------------------------------------------------- */ 460 * ------------------------------------------------------------------------- */
… …
465 * Save and Restore cursor 462 * Save and Restore cursor
466 * XTERM_SEQ: Save cursor : ESC 7 463 * XTERM_SEQ: Save cursor : ESC 7
467 * XTERM_SEQ: Restore cursor: ESC 8 464 * XTERM_SEQ: Restore cursor: ESC 8
468 */ 465 */
469void 466void
470rxvt_term::scr_cursor (int mode) 467rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
471{ 468{
472 screen_t *s; 469 screen_t *s;
473 470
474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 471#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
475 if (current_screen == SECONDARY) 472 if (current_screen == SECONDARY)
… …
514 * Swap between primary and secondary screens 511 * Swap between primary and secondary screens
515 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 512 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
516 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 513 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
517 */ 514 */
518int 515int
519rxvt_term::scr_change_screen (int scrn) 516rxvt_term::scr_change_screen (int scrn) NOTHROW
520{ 517{
521 want_refresh = 1; 518 want_refresh = 1;
522 view_start = 0; 519 view_start = 0;
523 520
524 if (current_screen == scrn) 521 if (current_screen == scrn)
… …
555 return scrn; 552 return scrn;
556} 553}
557 554
558// clear WrapNext indicator, solidifying position on next line 555// clear WrapNext indicator, solidifying position on next line
559void 556void
560rxvt_term::scr_do_wrap () 557rxvt_term::scr_do_wrap () NOTHROW
561{ 558{
562 if (!(screen.flags & Screen_WrapNext)) 559 if (!(screen.flags & Screen_WrapNext))
563 return; 560 return;
564 561
565 screen.flags &= ~Screen_WrapNext; 562 screen.flags &= ~Screen_WrapNext;
… …
575/* ------------------------------------------------------------------------- */ 572/* ------------------------------------------------------------------------- */
576/* 573/*
577 * Change the colour for following text 574 * Change the colour for following text
578 */ 575 */
579void 576void
580rxvt_term::scr_color (unsigned int color, int fgbg) 577rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
581{ 578{
582 if (color > maxTermCOLOR) 579 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
583 color = fgbg; 580 color = fgbg;
584 581
585 if (fgbg == Color_fg) 582 if (fgbg == Color_fg)
586 rstyle = SET_FGCOLOR (rstyle, color); 583 rstyle = SET_FGCOLOR (rstyle, color);
587 else 584 else
… …
591/* ------------------------------------------------------------------------- */ 588/* ------------------------------------------------------------------------- */
592/* 589/*
593 * Change the rendition style for following text 590 * Change the rendition style for following text
594 */ 591 */
595void 592void
596rxvt_term::scr_rendition (int set, int style) 593rxvt_term::scr_rendition (int set, int style) NOTHROW
597 { 594 {
598 if (set) 595 if (set)
599 rstyle |= style; 596 rstyle |= style;
600 else if (style == ~RS_None) 597 else if (style == ~RS_None)
601 rstyle = DEFAULT_RSTYLE; 598 rstyle = DEFAULT_RSTYLE;
… …
608 * Scroll text between <row1> and <row2> inclusive, by <count> lines 605 * Scroll text between <row1> and <row2> inclusive, by <count> lines
609 * count positive ==> scroll up 606 * count positive ==> scroll up
610 * count negative ==> scroll down 607 * count negative ==> scroll down
611 */ 608 */
612int 609int
613rxvt_term::scr_scroll_text (int row1, int row2, int count) 610rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
614{ 611{
615 if (count == 0 || (row1 > row2)) 612 if (count == 0 || (row1 > row2))
616 return 0; 613 return 0;
617 614
618 want_refresh = 1; 615 want_refresh = 1;
619 num_scr += count; 616 num_scr += count;
620 617
621 if (count > 0 618 if (count > 0
622 && row1 == 0 619 && row1 == 0
623 && row2 == nrow - 1
624 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 620 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
625 { 621 {
626 nsaved = min (nsaved + count, saveLines); 622 top_row = max (top_row - count, -saveLines);
627 623
628 PERL_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 624 // scroll everything up 'count' lines
625 term_start = (term_start + count) % total_rows;
626
627 // sever bottommost line
628 {
629 line_t &l = ROW(row2 - count);
630 l.is_longer (0);
631 l.touch ();
632 }
633
634 // erase newly scrolled-in lines
635 for (int i = count; i--; )
636 {
637 // basically this is a slightly optimized scr_blank_screen_mem
638 // it is worth the effort on slower machines
639 line_t &l = ROW(nrow - 1 - i);
640
641 scr_blank_line (l, 0, l.l, rstyle);
642
643 l.l = 0;
644 l.f = 0;
645 }
646
647 // now copy lines below the scroll region bottom to the
648 // bottom of the screen again, so they look as if they
649 // hadn't moved.
650 for (int i = nrow; --i > row2; )
651 {
652 line_t &l1 = ROW(i - count);
653 line_t &l2 = ROW(i);
654
655 ::swap (l1, l2);
656 l2.touch ();
657 }
629 658
630 term_start = (term_start + count) % total_rows; 659 // move and/or clear selection, if any
631
632 if (selection.op && current_screen == selection.screen) 660 if (selection.op && current_screen == selection.screen)
633 { 661 {
634 selection.beg.row -= count; 662 selection.beg.row -= count;
635 selection.end.row -= count; 663 selection.end.row -= count;
636 selection.mark.row -= count; 664 selection.mark.row -= count;
637 665
638 if (selection.beg.row < -nsaved 666 if (selection.beg.row < top_row
639 || selection.end.row < -nsaved 667 || selection.end.row < top_row
640 || selection.mark.row < -nsaved) 668 || selection.mark.row < top_row)
641 { 669 {
642 CLEAR_ALL_SELECTION (); 670 CLEAR_ALL_SELECTION ();
643 selection.op = SELECTION_CLEAR; 671 selection.op = SELECTION_CLEAR;
644 } 672 }
645 } 673 }
646 674
647 for (int i = count; i--; ) 675 // finally move the view window, if desired
648 {
649 ROW(row2 - i).l = 0;
650 scr_blank_screen_mem (ROW(row2 - i), rstyle);
651 }
652
653 if (OPTION (Opt_scrollWithBuffer) 676 if (OPTION (Opt_scrollWithBuffer)
654 && view_start != 0 677 && view_start != 0
655 && view_start != saveLines) 678 && view_start != -saveLines)
656 scr_page (UP, count); 679 scr_page (UP, count);
680
681 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
682 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
657 } 683 }
658 else 684 else
659 { 685 {
660 if (selection.op && current_screen == selection.screen) 686 if (selection.op && current_screen == selection.screen)
661 { 687 {
… …
685 711
686 int rows = row2 - row1 + 1; 712 int rows = row2 - row1 + 1;
687 713
688 min_it (count, rows); 714 min_it (count, rows);
689 715
716 line_t *temp_buf = row_buf + total_rows;
717
690 for (int row = 0; row < rows; row++) 718 for (int row = 0; row < rows; row++)
691 { 719 {
692 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 720 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
693 721
694 if (!IN_RANGE_EXC (row + count, 0, rows)) 722 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
705/* ------------------------------------------------------------------------- */ 733/* ------------------------------------------------------------------------- */
706/* 734/*
707 * Add text given in <str> of length <len> to screen struct 735 * Add text given in <str> of length <len> to screen struct
708 */ 736 */
709void 737void
710rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) 738rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
711{ 739{
712 if (len <= 0) /* sanity */ 740 if (len <= 0) /* sanity */
713 return; 741 return;
714 742
715 unsigned char checksel; 743 unsigned char checksel;
716 unicode_t c; 744 unicode_t c;
717 int last_col; 745 int ncol = this->ncol;
718 const unicode_t *strend = str + len; 746 const wchar_t *strend = str + len;
719 747
720 want_refresh = 1; 748 want_refresh = 1;
721 ZERO_SCROLLBACK (); 749 ZERO_SCROLLBACK ();
722 last_col = ncol;
723 750
724 if (nlines > 0) 751 if (minlines > 0)
725 { 752 {
726 nlines += screen.cur.row - screen.bscroll; 753 minlines += screen.cur.row - screen.bscroll;
754
727 if (nlines > 0 755 if (minlines > 0
728 && screen.tscroll == 0 756 && screen.tscroll == 0
729 && screen.bscroll == (nrow - 1)) 757 && screen.bscroll == nrow - 1)
730 { 758 {
731 /* _at least_ this many lines need to be scrolled */ 759 /* _at least_ this many lines need to be scrolled */
732 scr_scroll_text (screen.tscroll, screen.bscroll, nlines); 760 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
733 screen.cur.row -= nlines; 761 screen.cur.row -= minlines;
734 } 762 }
735 } 763 }
736 764
737#ifdef DEBUG_STRICT 765#ifdef DEBUG_STRICT
738 assert (screen.cur.col < last_col); 766 assert (screen.cur.col < ncol);
739 assert (screen.cur.row < nrow 767 assert (screen.cur.row < nrow
740 && screen.cur.row >= -nsaved); 768 && screen.cur.row >= top_row);
741#endif 769#endif
742 int row = screen.cur.row; 770 int row = screen.cur.row;
743 771
744 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 772 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
745 773
746 line_t *line = &ROW(row); 774 line_t *line = &ROW(row);
747 775
748 while (str < strend) 776 while (str < strend)
749 { 777 {
750 c = *str++; 778 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
751 779
752 if (c < 0x20) 780 if (c < 0x20)
753 if (c == C0_LF) 781 if (c == C0_LF)
754 { 782 {
755 if (!line->is_longer ()) /* XXX: think about this */
756 max_it (line->l, screen.cur.col); 783 max_it (line->l, screen.cur.col);
757 784
758 screen.flags &= ~Screen_WrapNext; 785 screen.flags &= ~Screen_WrapNext;
759 786
760 if (screen.cur.row == screen.bscroll) 787 if (screen.cur.row == screen.bscroll)
761 scr_scroll_text (screen.tscroll, screen.bscroll, 1); 788 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
… …
765 line = &ROW(row); /* _must_ refresh */ 792 line = &ROW(row); /* _must_ refresh */
766 continue; 793 continue;
767 } 794 }
768 else if (c == C0_CR) 795 else if (c == C0_CR)
769 { 796 {
770 if (!line->is_longer ()) /* XXX: think about this */
771 max_it (line->l, screen.cur.col); 797 max_it (line->l, screen.cur.col);
772 798
773 screen.flags &= ~Screen_WrapNext; 799 screen.flags &= ~Screen_WrapNext;
774 screen.cur.col = 0; 800 screen.cur.col = 0;
775 continue; 801 continue;
776 } 802 }
… …
793 CLEAR_SELECTION (); 819 CLEAR_SELECTION ();
794 } 820 }
795 821
796 if (screen.flags & Screen_WrapNext) 822 if (screen.flags & Screen_WrapNext)
797 { 823 {
798 line->set_is_longer ();
799
800 scr_do_wrap (); 824 scr_do_wrap ();
801 825
826 line->l = ncol;
827 line->is_longer (1);
828
802 row = screen.cur.row; 829 row = screen.cur.row;
803 line = &ROW(row); /* _must_ refresh */ 830 line = &ROW(row); /* _must_ refresh */
804 } 831 }
805 832
806 // some utf-8 decoders "decode" surrogate characters: let's fix this. 833 // some utf-8 decoders "decode" surrogate characters: let's fix this.
… …
811 // do wcwidth before further replacements, as wcwidth might return -1 838 // do wcwidth before further replacements, as wcwidth might return -1
812 // for the line drawing characters below as they might be invalid in the current 839 // for the line drawing characters below as they might be invalid in the current
813 // locale. 840 // locale.
814 int width = c < 0x100 ? 1 : wcwidth (c); 841 int width = c < 0x100 ? 1 : wcwidth (c);
815 842
816 if (charsets[screen.charset] == '0') // DEC SPECIAL 843 if (charsets [screen.charset] == '0') // DEC SPECIAL
817 { 844 {
818 // vt100 special graphics and line drawing 845 // vt100 special graphics and line drawing
819 // 5f-7e standard vt100 846 // 5f-7e standard vt100
820 // 40-5e rxvt extension for extra curses acs chars 847 // 40-5e rxvt extension for extra curses acs chars
821 static uint16_t vt100_0[62] = { // 41 .. 7e 848 static uint16_t vt100_0[62] = { // 41 .. 7e
… …
873 } 900 }
874 901
875 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); 902 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
876 903
877 // if the character doesn't fit into the remaining columns... 904 // if the character doesn't fit into the remaining columns...
878 if (screen.cur.col > last_col - width && last_col >= width) 905 if (screen.cur.col > ncol - width && ncol >= width)
879 { 906 {
880 // ...output spaces 907 // ...output spaces
881 c = ' '; 908 c = ' ';
882 // and try the same character next loop iteration 909 // and try the same character next loop iteration
883 --str; 910 --str;
884 } 911 }
885 912
913 line->touch ();
914
886 do 915 do
887 { 916 {
888 line->t[screen.cur.col] = c; 917 line->t[screen.cur.col] = c;
889 line->r[screen.cur.col] = rend; 918 line->r[screen.cur.col] = rend;
890 919
891 if (screen.cur.col < last_col - 1) 920 if (screen.cur.col < ncol - 1)
892 screen.cur.col++; 921 screen.cur.col++;
893 else 922 else
894 { 923 {
895 line->l = last_col; 924 line->l = ncol;
896 if (screen.flags & Screen_Autowrap) 925 if (screen.flags & Screen_Autowrap)
897 screen.flags |= Screen_WrapNext; 926 screen.flags |= Screen_WrapNext;
898 break; 927 break;
899 } 928 }
900 929
… …
902 } 931 }
903 while (--width > 0); 932 while (--width > 0);
904 933
905 // pad with spaces when overwriting wide character with smaller one 934 // pad with spaces when overwriting wide character with smaller one
906 if (!width) 935 if (!width)
936 {
937 line->touch ();
938
907 for (int c = screen.cur.col; c < last_col && line->t[c] == NOCHAR; c++) 939 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
908 { 940 {
909 line->t[c] = ' '; 941 line->t[c] = ' ';
910 line->r[c] = rend; 942 line->r[c] = rend;
911 } 943 }
944 }
912 } 945 }
913 else // width == 0 946 else // width == 0
914 { 947 {
915#if ENABLE_COMBINING 948#if ENABLE_COMBINING
916 // handle combining characters 949 // handle combining characters
917 // we just tag the accent on the previous on-screen character. 950 // we just tag the accent on the previous on-screen character.
918 // this is arguably not correct, but also arguably not wrong. 951 // this is arguably not correct, but also arguably not wrong.
919 // we don't handle double-width characters nicely yet. 952 // we don't handle double-width characters nicely yet.
953 line_t *linep;
920 text_t *tp; 954 text_t *tp;
921 rend_t *rp; 955 rend_t *rp;
922 956
923 if (screen.cur.col > 0) 957 if (screen.cur.col > 0)
924 { 958 {
959 linep = line;
925 tp = line->t + screen.cur.col - 1; 960 tp = line->t + screen.cur.col - 1;
926 rp = line->r + screen.cur.col - 1; 961 rp = line->r + screen.cur.col - 1;
927
928 while (*tp == NOCHAR && tp > line->t)
929 tp--, rp--;
930 } 962 }
931 else if (screen.cur.row > 0 963 else if (screen.cur.row > 0
932 && ROW(screen.cur.row - 1).is_longer ()) 964 && ROW(screen.cur.row - 1).is_longer ())
933 { 965 {
934 line_t *line = &ROW(screen.cur.row - 1); 966 linep = &ROW(screen.cur.row - 1);
935
936 tp = line->t + last_col - 1; 967 tp = line->t + ncol - 1;
937 rp = line->r + last_col - 1; 968 rp = line->r + ncol - 1;
938
939 while (*tp == NOCHAR && tp > line->t)
940 tp--, rp--;
941 } 969 }
942 else 970 else
943 continue; 971 continue;
972
973 linep->touch ();
974
975 while (*tp == NOCHAR && tp > linep->t)
976 tp--, rp--;
944 977
945 // first try to find a precomposed character 978 // first try to find a precomposed character
946 unicode_t n = rxvt_compose (*tp, c); 979 unicode_t n = rxvt_compose (*tp, c);
947 if (n == NOCHAR) 980 if (n == NOCHAR)
948 n = rxvt_composite.compose (*tp, c); 981 n = rxvt_composite.compose (*tp, c);
… …
951 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); 984 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
952#endif 985#endif
953 } 986 }
954 } 987 }
955 988
956 if (!line->is_longer ()) /* XXX: think about this */
957 max_it (line->l, screen.cur.col); 989 max_it (line->l, screen.cur.col);
958 990
959#ifdef DEBUG_STRICT 991#ifdef DEBUG_STRICT
960 assert (screen.cur.row >= 0); 992 assert (screen.cur.row >= 0);
961#endif 993#endif
962} 994}
… …
965/* 997/*
966 * Process Backspace. Move back the cursor back a position, wrap if have to 998 * Process Backspace. Move back the cursor back a position, wrap if have to
967 * XTERM_SEQ: CTRL-H 999 * XTERM_SEQ: CTRL-H
968 */ 1000 */
969void 1001void
970rxvt_term::scr_backspace () 1002rxvt_term::scr_backspace () NOTHROW
971{ 1003{
972 want_refresh = 1; 1004 want_refresh = 1;
973 1005
974 if (screen.cur.col == 0) 1006 if (screen.cur.col == 0)
975 { 1007 {
… …
993 * Process Horizontal Tab 1025 * Process Horizontal Tab
994 * count: +ve = forward; -ve = backwards 1026 * count: +ve = forward; -ve = backwards
995 * XTERM_SEQ: CTRL-I 1027 * XTERM_SEQ: CTRL-I
996 */ 1028 */
997void 1029void
998rxvt_term::scr_tab (int count, bool ht) 1030rxvt_term::scr_tab (int count, bool ht) NOTHROW
999{ 1031{
1000 int i, x; 1032 int i, x;
1001 1033
1002 want_refresh = 1; 1034 want_refresh = 1;
1003 i = x = screen.cur.col; 1035 i = x = screen.cur.col;
… …
1012 1044
1013 for (; ++i < ncol; ) 1045 for (; ++i < ncol; )
1014 if (tabs[i]) 1046 if (tabs[i])
1015 { 1047 {
1016 x = i; 1048 x = i;
1049
1017 if (!--count) 1050 if (!--count)
1018 break; 1051 break;
1019 } 1052 }
1020 else 1053 else
1021 ht &= l.t[i] == ' ' 1054 ht &= l.t[i] == ' '
… …
1028 // buffer so they can be selected and pasted. 1061 // buffer so they can be selected and pasted.
1029 if (ht && OPTION (Opt_pastableTabs)) 1062 if (ht && OPTION (Opt_pastableTabs))
1030 { 1063 {
1031 base_rend = SET_FONT (base_rend, 0); 1064 base_rend = SET_FONT (base_rend, 0);
1032 1065
1033 if (!l.is_longer ()) /* XXX: think about this */ 1066 l.touch (x);
1034 max_it (l.l, x);
1035 1067
1036 i = screen.cur.col; 1068 i = screen.cur.col;
1037 1069
1038 l.t[i] = '\t'; 1070 l.t[i] = '\t';
1039 l.r[i] = base_rend; 1071 l.r[i] = base_rend;
… …
1070 * Move cursor left in row. If we're at the left boundary, shift everything 1102 * Move cursor left in row. If we're at the left boundary, shift everything
1071 * in that row right. Clear left column. 1103 * in that row right. Clear left column.
1072 */ 1104 */
1073#if ENABLE_FRILLS 1105#if ENABLE_FRILLS
1074void 1106void
1075rxvt_term::scr_backindex () 1107rxvt_term::scr_backindex () NOTHROW
1076{ 1108{
1077 if (screen.cur.col > 0) 1109 if (screen.cur.col > 0)
1078 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1110 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1079 else 1111 else
1080 scr_insdel_chars (1, INSERT); 1112 scr_insdel_chars (1, INSERT);
… …
1087 * Move cursor right in row. If we're at the right boundary, shift everything 1119 * Move cursor right in row. If we're at the right boundary, shift everything
1088 * in that row left. Clear right column. 1120 * in that row left. Clear right column.
1089 */ 1121 */
1090#if ENABLE_FRILLS 1122#if ENABLE_FRILLS
1091void 1123void
1092rxvt_term::scr_forwardindex () 1124rxvt_term::scr_forwardindex () NOTHROW
1093{ 1125{
1094 if (screen.cur.col < ncol - 1) 1126 if (screen.cur.col < ncol - 1)
1095 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1127 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1096 else 1128 else
1097 { 1129 {
1098 if (ROW(screen.cur.row).is_longer ()) //TODO//FIXME//LEN 1130 line_t &l = ROW(screen.cur.row);
1099 ROW(screen.cur.row).l = ncol; 1131
1132 l.touch ();
1133 l.is_longer (0);
1100 1134
1101 scr_gotorc (0, 0, R_RELATIVE); 1135 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1136 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, ncol - 1, R_RELATIVE); 1137 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1138 }
… …
1108/* ------------------------------------------------------------------------- */ 1142/* ------------------------------------------------------------------------- */
1109/* 1143/*
1110 * Goto Row/Column 1144 * Goto Row/Column
1111 */ 1145 */
1112void 1146void
1113rxvt_term::scr_gotorc (int row, int col, int relative) 1147rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1114{ 1148{
1115 want_refresh = 1; 1149 want_refresh = 1;
1116 ZERO_SCROLLBACK (); 1150 ZERO_SCROLLBACK ();
1117 1151
1118 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1152 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1156/* ------------------------------------------------------------------------- */ 1190/* ------------------------------------------------------------------------- */
1157/* 1191/*
1158 * direction should be UP or DN 1192 * direction should be UP or DN
1159 */ 1193 */
1160void 1194void
1161rxvt_term::scr_index (enum page_dirn direction) 1195rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1162{ 1196{
1163 int dirn; 1197 int dirn;
1164 1198
1165 want_refresh = 1; 1199 want_refresh = 1;
1166 ZERO_SCROLLBACK (); 1200 ZERO_SCROLLBACK ();
… …
1185 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1219 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1186 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1220 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1187 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1221 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1188 */ 1222 */
1189void 1223void
1190rxvt_term::scr_erase_line (int mode) 1224rxvt_term::scr_erase_line (int mode) NOTHROW
1191{ 1225{
1192 unsigned int col, num; 1226 unsigned int col, num;
1193 1227
1194 want_refresh = 1; 1228 want_refresh = 1;
1195 ZERO_SCROLLBACK (); 1229 ZERO_SCROLLBACK ();
1196 1230
1197 selection_check (1); 1231 selection_check (1);
1198 1232
1199 line_t &line = ROW(screen.cur.row); 1233 line_t &line = ROW(screen.cur.row);
1234
1235 line.touch ();
1236 line.is_longer (0);
1200 1237
1201 switch (mode) 1238 switch (mode)
1202 { 1239 {
1203 case 0: /* erase to end of line */ 1240 case 0: /* erase to end of line */
1204 col = screen.cur.col; 1241 col = screen.cur.col;
… …
1236 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1273 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1237 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1274 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1238 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1275 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1239 */ 1276 */
1240void 1277void
1241rxvt_term::scr_erase_screen (int mode) 1278rxvt_term::scr_erase_screen (int mode) NOTHROW
1242{ 1279{
1243 int num; 1280 int num;
1244 int32_t row; 1281 int32_t row;
1245 rend_t ren; 1282 rend_t ren;
1246 XGCValues gcvalue; 1283 XGCValues gcvalue;
… …
1299 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1336 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1300 } 1337 }
1301 1338
1302 for (; num--; row++) 1339 for (; num--; row++)
1303 { 1340 {
1304 ROW (row).l = 0;
1305 scr_blank_screen_mem (ROW (row), rstyle); 1341 scr_blank_screen_mem (ROW(row), rstyle);
1306 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1342 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1307 } 1343 }
1308} 1344}
1309 1345
1310#if ENABLE_FRILLS 1346#if ENABLE_FRILLS
1311void 1347void
1312rxvt_term::scr_erase_savelines () 1348rxvt_term::scr_erase_savelines () NOTHROW
1313{ 1349{
1314 want_refresh = 1; 1350 want_refresh = 1;
1315 ZERO_SCROLLBACK (); 1351 ZERO_SCROLLBACK ();
1316 1352
1317 nsaved = 0; 1353 top_row = 0;
1318} 1354}
1319#endif 1355#endif
1320 1356
1321/* ------------------------------------------------------------------------- */ 1357/* ------------------------------------------------------------------------- */
1322/* 1358/*
1323 * Fill the screen with `E's 1359 * Fill the screen with `E's
1324 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1360 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1325 */ 1361 */
1326void 1362void
1327rxvt_term::scr_E () 1363rxvt_term::scr_E () NOTHROW
1328{ 1364{
1329 rend_t fs; 1365 rend_t fs;
1330 1366
1331 want_refresh = 1; 1367 want_refresh = 1;
1332 ZERO_SCROLLBACK (); 1368 ZERO_SCROLLBACK ();
… …
1343 rend_t *r1 = line.r; 1379 rend_t *r1 = line.r;
1344 1380
1345 for (int j = ncol; j--; ) 1381 for (int j = ncol; j--; )
1346 *r1++ = fs; 1382 *r1++ = fs;
1347 1383
1348 line.l = ncol; /* make the `E's selectable */ 1384 line.is_longer (0);
1385 line.touch (ncol);
1349 } 1386 }
1350} 1387}
1351 1388
1352/* ------------------------------------------------------------------------- */ 1389/* ------------------------------------------------------------------------- */
1353/* 1390/*
1354 * Insert/Delete <count> lines 1391 * Insert/Delete <count> lines
1355 */ 1392 */
1356void 1393void
1357rxvt_term::scr_insdel_lines (int count, int insdel) 1394rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1358{ 1395{
1359 int end; 1396 int end;
1360 1397
1361 ZERO_SCROLLBACK (); 1398 ZERO_SCROLLBACK ();
1362 1399
… …
1382/* ------------------------------------------------------------------------- */ 1419/* ------------------------------------------------------------------------- */
1383/* 1420/*
1384 * Insert/Delete <count> characters from the current position 1421 * Insert/Delete <count> characters from the current position
1385 */ 1422 */
1386void 1423void
1387rxvt_term::scr_insdel_chars (int count, int insdel) 1424rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1388{ 1425{
1389 int col, row; 1426 int col, row;
1390 rend_t tr; 1427 rend_t tr;
1391 1428
1392 want_refresh = 1; 1429 want_refresh = 1;
… …
1401 min_it (count, ncol - screen.cur.col); 1438 min_it (count, ncol - screen.cur.col);
1402 1439
1403 row = screen.cur.row; 1440 row = screen.cur.row;
1404 1441
1405 line_t *line = &ROW(row); 1442 line_t *line = &ROW(row);
1443
1444 line->touch ();
1445 line->is_longer (0);
1406 1446
1407 switch (insdel) 1447 switch (insdel)
1408 { 1448 {
1409 case INSERT: 1449 case INSERT:
1410 for (col = ncol - 1; (col - count) >= screen.cur.col; col--) 1450 for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
1411 { 1451 {
1412 line->t[col] = line->t[col - count]; 1452 line->t[col] = line->t[col - count];
1413 line->r[col] = line->r[col - count]; 1453 line->r[col] = line->r[col - count];
1414 } 1454 }
1415 1455
1416 if (!line->is_longer ()) 1456 line->l = min (line->l + count, ncol);
1417 {
1418 line->l += count;
1419 min_it (line->l, ncol);
1420 }
1421 1457
1422 if (selection.op && current_screen == selection.screen 1458 if (selection.op && current_screen == selection.screen
1423 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1424 { 1460 {
1425 if (selection.end.row != screen.cur.row 1461 if (selection.end.row != screen.cur.row
… …
1438 1474
1439 case ERASE: 1475 case ERASE:
1440 screen.cur.col += count; /* don't worry if > ncol */ 1476 screen.cur.col += count; /* don't worry if > ncol */
1441 selection_check (1); 1477 selection_check (1);
1442 screen.cur.col -= count; 1478 screen.cur.col -= count;
1479
1480 line->l = max (line->l - count, 0);
1443 scr_blank_line (*line, screen.cur.col, count, rstyle); 1481 scr_blank_line (*line, screen.cur.col, count, rstyle);
1444 break; 1482 break;
1445 1483
1446 case DELETE: 1484 case DELETE:
1447 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1485 tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
… …
1450 { 1488 {
1451 line->t[col] = line->t[col + count]; 1489 line->t[col] = line->t[col + count];
1452 line->r[col] = line->r[col + count]; 1490 line->r[col] = line->r[col + count];
1453 } 1491 }
1454 1492
1493 line->l = max (line->l - count, 0);
1455 scr_blank_line (*line, ncol - count, count, tr); 1494 scr_blank_line (*line, ncol - count, count, tr);
1456
1457 if (line->is_longer ()) /* break line continuation */
1458 line->l = ncol;
1459
1460 line->l = max (line->l - count, 0);
1461 1495
1462 if (selection.op && current_screen == selection.screen 1496 if (selection.op && current_screen == selection.screen
1463 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1497 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1464 { 1498 {
1465 if (selection.end.row != screen.cur.row 1499 if (selection.end.row != screen.cur.row
… …
1483/* 1517/*
1484 * Set the scrolling region 1518 * Set the scrolling region
1485 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1519 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1486 */ 1520 */
1487void 1521void
1488rxvt_term::scr_scroll_region (int top, int bot) 1522rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1489{ 1523{
1490 max_it (top, 0); 1524 max_it (top, 0);
1491 min_it (bot, nrow - 1); 1525 min_it (bot, nrow - 1);
1492 1526
1493 if (top > bot) 1527 if (top > bot)
… …
1503 * Make the cursor visible/invisible 1537 * Make the cursor visible/invisible
1504 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1538 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1505 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1539 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1506 */ 1540 */
1507void 1541void
1508rxvt_term::scr_cursor_visible (int mode) 1542rxvt_term::scr_cursor_visible (int mode) NOTHROW
1509{ 1543{
1510 want_refresh = 1; 1544 want_refresh = 1;
1511 1545
1512 if (mode) 1546 if (mode)
1513 screen.flags |= Screen_VisibleCursor; 1547 screen.flags |= Screen_VisibleCursor;
… …
1520 * Set/unset automatic wrapping 1554 * Set/unset automatic wrapping
1521 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1555 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1522 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1556 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1523 */ 1557 */
1524void 1558void
1525rxvt_term::scr_autowrap (int mode) 1559rxvt_term::scr_autowrap (int mode) NOTHROW
1526{ 1560{
1527 if (mode) 1561 if (mode)
1528 screen.flags |= Screen_Autowrap; 1562 screen.flags |= Screen_Autowrap;
1529 else 1563 else
1530 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1564 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1539 * and the cursor cannot be moved outside. 1573 * and the cursor cannot be moved outside.
1540 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1574 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1541 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1575 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1542 */ 1576 */
1543void 1577void
1544rxvt_term::scr_relative_origin (int mode) 1578rxvt_term::scr_relative_origin (int mode) NOTHROW
1545{ 1579{
1546 if (mode) 1580 if (mode)
1547 screen.flags |= Screen_Relative; 1581 screen.flags |= Screen_Relative;
1548 else 1582 else
1549 screen.flags &= ~Screen_Relative; 1583 screen.flags &= ~Screen_Relative;
… …
1556 * Set insert/replace mode 1590 * Set insert/replace mode
1557 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1591 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1558 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1592 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1559 */ 1593 */
1560void 1594void
1561rxvt_term::scr_insert_mode (int mode) 1595rxvt_term::scr_insert_mode (int mode) NOTHROW
1562{ 1596{
1563 if (mode) 1597 if (mode)
1564 screen.flags |= Screen_Insert; 1598 screen.flags |= Screen_Insert;
1565 else 1599 else
1566 screen.flags &= ~Screen_Insert; 1600 screen.flags &= ~Screen_Insert;
… …
1572 * XTERM_SEQ: Set tab at current column : ESC H 1606 * XTERM_SEQ: Set tab at current column : ESC H
1573 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1607 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1574 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1608 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1575 */ 1609 */
1576void 1610void
1577rxvt_term::scr_set_tab (int mode) 1611rxvt_term::scr_set_tab (int mode) NOTHROW
1578{ 1612{
1579 if (mode < 0) 1613 if (mode < 0)
1580 memset (tabs, 0, ncol * sizeof (char)); 1614 memset (tabs, 0, ncol * sizeof (char));
1581 else if (screen.cur.col < ncol) 1615 else if (screen.cur.col < ncol)
1582 tabs[screen.cur.col] = (mode ? 1 : 0); 1616 tabs [screen.cur.col] = !!mode;
1583} 1617}
1584 1618
1585/* ------------------------------------------------------------------------- */ 1619/* ------------------------------------------------------------------------- */
1586/* 1620/*
1587 * Set reverse/normal video 1621 * Set reverse/normal video
1588 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1622 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1589 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1623 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1590 */ 1624 */
1591void 1625void
1592rxvt_term::scr_rvideo_mode (int mode) 1626rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1593{ 1627{
1594 XGCValues gcvalue; 1628 rvideo_mode = on;
1595 1629
1630#ifndef NO_BELL
1631 on ^= rvideo_bell;
1632#endif
1633
1596 if (rvideo != mode) 1634 if (rvideo_state != on)
1597 { 1635 {
1598 rvideo = mode; 1636 rvideo_state = on;
1637
1599 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1638 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1600#if XPM_BACKGROUND 1639#if XPM_BACKGROUND
1601 if (bgPixmap.pixmap == None) 1640 if (bgPixmap.pixmap == None)
1602#endif 1641#endif
1603#if TRANSPARENT 1642#if TRANSPARENT
1604 if (! OPTION (Opt_transparent) || am_transparent == 0) 1643 if (!OPTION (Opt_transparent) || am_transparent == 0)
1605#endif 1644#endif
1606 XSetWindowBackground (display->display, vt, 1645 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1607 pix_colors[Color_bg]);
1608 1646
1647 XGCValues gcvalue;
1609 gcvalue.foreground = pix_colors[Color_fg]; 1648 gcvalue.foreground = pix_colors[Color_fg];
1610 gcvalue.background = pix_colors[Color_bg]; 1649 gcvalue.background = pix_colors[Color_bg];
1611 XChangeGC (display->display, gc, GCBackground | GCForeground, 1650 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1612 &gcvalue); 1651
1613 scr_clear (); 1652 scr_clear ();
1614 scr_touch (true); 1653 scr_touch (true);
1615 } 1654 }
1616} 1655}
1617 1656
… …
1619/* 1658/*
1620 * Report current cursor position 1659 * Report current cursor position
1621 * XTERM_SEQ: Report position: ESC [ 6 n 1660 * XTERM_SEQ: Report position: ESC [ 6 n
1622 */ 1661 */
1623void 1662void
1624rxvt_term::scr_report_position () 1663rxvt_term::scr_report_position () NOTHROW
1625{ 1664{
1626 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1665 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1627} 1666}
1628 1667
1629/* ------------------------------------------------------------------------- * 1668/* ------------------------------------------------------------------------- *
… …
1632 1671
1633/* 1672/*
1634 * Set font style 1673 * Set font style
1635 */ 1674 */
1636void 1675void
1637rxvt_term::set_font_style () 1676rxvt_term::set_font_style () NOTHROW
1638{ 1677{
1678#if 0
1639 switch (charsets[screen.charset]) 1679 switch (charsets [screen.charset])
1640 { 1680 {
1641 case '0': /* DEC Special Character & Line Drawing Set */ 1681 case '0': /* DEC Special Character & Line Drawing Set */
1642 break; 1682 break;
1643 case 'A': /* United Kingdom (UK) */ 1683 case 'A': /* United Kingdom (UK) */
1644 break; 1684 break;
… …
1651 case 'C': /* Finnish character set */ 1691 case 'C': /* Finnish character set */
1652 break; 1692 break;
1653 case 'K': /* German character set */ 1693 case 'K': /* German character set */
1654 break; 1694 break;
1655 } 1695 }
1696#endif
1656} 1697}
1657 1698
1658/* ------------------------------------------------------------------------- */ 1699/* ------------------------------------------------------------------------- */
1659/* 1700/*
1660 * Choose a font 1701 * Choose a font
… …
1662 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1703 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1663 * XTERM_SEQ: Invoke G2 character set: ESC N 1704 * XTERM_SEQ: Invoke G2 character set: ESC N
1664 * XTERM_SEQ: Invoke G3 character set: ESC O 1705 * XTERM_SEQ: Invoke G3 character set: ESC O
1665 */ 1706 */
1666void 1707void
1667rxvt_term::scr_charset_choose (int set) 1708rxvt_term::scr_charset_choose (int set) NOTHROW
1668{ 1709{
1669 screen.charset = set; 1710 screen.charset = set;
1670 set_font_style (); 1711 set_font_style ();
1671} 1712}
1672 1713
… …
1678 * XTERM_SEQ: Set G2 character set: ESC * <C> 1719 * XTERM_SEQ: Set G2 character set: ESC * <C>
1679 * XTERM_SEQ: Set G3 character set: ESC + <C> 1720 * XTERM_SEQ: Set G3 character set: ESC + <C>
1680 * See set_font_style for possible values for <C> 1721 * See set_font_style for possible values for <C>
1681 */ 1722 */
1682void 1723void
1683rxvt_term::scr_charset_set (int set, unsigned int ch) 1724rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1684{ 1725{
1685 charsets[set] = (unsigned char)ch; 1726 charsets[set] = (unsigned char)ch;
1686 set_font_style (); 1727 set_font_style ();
1687} 1728}
1688 1729
… …
1693 1734
1694/* 1735/*
1695 * refresh matching text. 1736 * refresh matching text.
1696 */ 1737 */
1697bool 1738bool
1698rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1739rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1699{ 1740{
1700 bool found = false; 1741 bool found = false;
1701 1742
1702 for (int i = 0; i < nrow; i++) 1743 for (int i = 0; i < nrow; i++)
1703 { 1744 {
… …
1723 PART_END, 1764 PART_END,
1724 RC_COUNT 1765 RC_COUNT
1725}; 1766};
1726 1767
1727void 1768void
1728rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1769rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1729{ 1770{
1730 int i; 1771 int i;
1731 row_col_t rc[RC_COUNT]; 1772 row_col_t rc[RC_COUNT];
1732 1773
1733 if (!drawn_buf) /* sanity check */ 1774 if (!drawn_buf) /* sanity check */
… …
1756 } 1797 }
1757 1798
1758 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1799 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1759 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1800 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1760 1801
1802 num_scr_allow = 0;
1803
1761 if (refresh) 1804 if (refresh)
1762 scr_refresh (SLOW_REFRESH); 1805 scr_refresh ();
1763} 1806}
1764 1807
1765/* ------------------------------------------------------------------------- */ 1808/* ------------------------------------------------------------------------- */
1766/* 1809/*
1767 * Refresh the entire screen 1810 * Refresh the entire screen
1768 */ 1811 */
1769void 1812void
1770rxvt_term::scr_touch (bool refresh) 1813rxvt_term::scr_touch (bool refresh) NOTHROW
1771{ 1814{
1772 scr_expose (0, 0, width, height, refresh); 1815 scr_expose (0, 0, width, height, refresh);
1773} 1816}
1774 1817
1775/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1776/* 1819/*
1777 * Move the display so that the line represented by scrollbar value Y is at 1820 * Move the display so that the line represented by scrollbar value Y is at
1778 * the top of the screen 1821 * the top of the screen
1779 */ 1822 */
1780int 1823void
1781rxvt_term::scr_move_to (int y, int len) 1824rxvt_term::scr_move_to (int y, int len) NOTHROW
1782{ 1825{
1783 long p = 0; 1826 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1784 unsigned int oldviewstart;
1785
1786 oldviewstart = view_start;
1787
1788 if (y < len)
1789 {
1790 p = (nrow + nsaved) * (len - y) / len;
1791 p -= (long) (nrow - 1);
1792 p = max (p, 0);
1793 }
1794
1795 view_start = (unsigned int)min (p, nsaved);
1796
1797 return scr_changeview (oldviewstart);
1798} 1827}
1799 1828
1800/* ------------------------------------------------------------------------- */ 1829/* ------------------------------------------------------------------------- */
1801/* 1830/*
1802 * Page the screen up/down nlines 1831 * Page the screen up/down nlines
1803 * direction should be UP or DN 1832 * direction should be UP or DN
1804 */ 1833 */
1805int 1834bool
1806rxvt_term::scr_page (enum page_dirn direction, int nlines) 1835rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1807{ 1836{
1808 int n; 1837 int new_view_start =
1809 unsigned int oldviewstart;
1810
1811 oldviewstart = view_start;
1812
1813 if (direction == UP)
1814 {
1815 n = view_start + nlines;
1816 view_start = min (n, nsaved);
1817 }
1818 else
1819 {
1820 n = view_start - nlines; 1838 direction == UP ? view_start - nlines
1821 view_start = max (n, 0); 1839 : view_start + nlines;
1822 }
1823 1840
1824 return scr_changeview (oldviewstart); 1841 return scr_changeview (new_view_start);
1825} 1842}
1826 1843
1827int 1844bool
1828rxvt_term::scr_changeview (unsigned int oldviewstart) 1845rxvt_term::scr_changeview (int new_view_start) NOTHROW
1829{ 1846{
1847 clamp_it (new_view_start, top_row, 0);
1848
1849 if (new_view_start == view_start)
1850 return false;
1851
1852 num_scr += new_view_start - view_start;
1853 view_start = new_view_start;
1854 want_refresh = 1;
1855
1830 PERL_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1856 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1831 1857
1832 if (view_start != oldviewstart) 1858 return true;
1833 {
1834 want_refresh = 1;
1835 num_scr -= (view_start - oldviewstart);
1836 }
1837
1838 return (int) (view_start - oldviewstart);
1839} 1859}
1840 1860
1841/* ------------------------------------------------------------------------- */ 1861#ifndef NO_BELL
1842void 1862void
1863rxvt_term::bell_cb (time_watcher &w)
1864{
1865 rvideo_bell = false;
1866 scr_rvideo_mode (rvideo_mode);
1867}
1868#endif
1869
1870/* ------------------------------------------------------------------------- */
1871void
1843rxvt_term::scr_bell () 1872rxvt_term::scr_bell () NOTHROW
1844{ 1873{
1845#ifndef NO_BELL 1874#ifndef NO_BELL
1846 1875
1847# ifndef NO_MAPALERT 1876# ifndef NO_MAPALERT
1848# ifdef MAPALERT_OPTION 1877# ifdef MAPALERT_OPTION
… …
1851 XMapWindow (display->display, parent[0]); 1880 XMapWindow (display->display, parent[0]);
1852# endif 1881# endif
1853 1882
1854 if (OPTION (Opt_visualBell)) 1883 if (OPTION (Opt_visualBell))
1855 { 1884 {
1856 scr_rvideo_mode (!rvideo); /* refresh also done */ 1885 rvideo_bell = true;
1857 rxvt_usleep (VISUAL_BELL_DURATION); 1886 scr_rvideo_mode (rvideo_mode);
1858 scr_rvideo_mode (!rvideo); /* refresh also done */ 1887 display->flush ();
1888
1889 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1859 } 1890 }
1860 else 1891 else
1861 XBell (display->display, 0); 1892 XBell (display->display, 0);
1862 1893
1863#endif 1894#endif
1864} 1895}
1865 1896
1866/* ------------------------------------------------------------------------- */ 1897/* ------------------------------------------------------------------------- */
1867/* ARGSUSED */ 1898/* ARGSUSED */
1868void 1899void
1869rxvt_term::scr_printscreen (int fullhist) 1900rxvt_term::scr_printscreen (int fullhist) NOTHROW
1870{ 1901{
1871#ifdef PRINTPIPE 1902#ifdef PRINTPIPE
1872 int nrows, row_start; 1903 int nrows, row_start;
1873 FILE *fd; 1904 FILE *fd;
1874 1905
1875 if ((fd = popen_printer ()) == NULL) 1906 if ((fd = popen_printer ()) == NULL)
1876 return; 1907 return;
1877 1908
1878 if (fullhist) 1909 if (fullhist)
1879 { 1910 {
1880 nrows = nrow + nsaved; 1911 nrows = nrow - top_row;
1881 row_start = -nsaved; 1912 row_start = top_row;
1882 } 1913 }
1883 else 1914 else
1884 { 1915 {
1885 nrows = nrow; 1916 nrows = nrow;
1886 row_start = -view_start; 1917 row_start = view_start;
1887 } 1918 }
1888 1919
1889 wctomb (0, 0); 1920 wctomb (0, 0);
1890 1921
1891 for (int r1 = 0; r1 < nrows; r1++) 1922 for (int r1 = 0; r1 < nrows; r1++)
… …
1923 * Refresh the screen 1954 * Refresh the screen
1924 * drawn_text/drawn_rend contain the screen information before the update. 1955 * drawn_text/drawn_rend contain the screen information before the update.
1925 * screen.text/screen.rend contain what the screen will change to. 1956 * screen.text/screen.rend contain what the screen will change to.
1926 */ 1957 */
1927void 1958void
1928rxvt_term::scr_refresh (unsigned char refresh_type) 1959rxvt_term::scr_refresh () NOTHROW
1929{ 1960{
1930 unsigned char must_clear, /* use draw_string not draw_image_string */ 1961 unsigned char must_clear, /* use draw_string not draw_image_string */
1931 showcursor; /* show the cursor */ 1962 showcursor; /* show the cursor */
1932 int16_t col, row, /* column/row we're processing */ 1963 int16_t col, row, /* column/row we're processing */
1933 ocrow; /* old cursor row */ 1964 ocrow; /* old cursor row */
… …
2019 2050
2020 /* make sure no outline cursor is left around */ 2051 /* make sure no outline cursor is left around */
2021 setoldcursor = 0; 2052 setoldcursor = 0;
2022 if (ocrow != -1) 2053 if (ocrow != -1)
2023 { 2054 {
2024 if (screen.cur.row + view_start != ocrow 2055 if (screen.cur.row - view_start != ocrow
2025 || screen.cur.col != oldcursor.col) 2056 || screen.cur.col != oldcursor.col)
2026 { 2057 {
2027 if (ocrow < nrow 2058 if (ocrow < nrow
2028 && oldcursor.col < ncol) 2059 && oldcursor.col < ncol)
2029 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2060 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2037 else if (!focus) 2068 else if (!focus)
2038 setoldcursor = 1; 2069 setoldcursor = 1;
2039 2070
2040 if (setoldcursor) 2071 if (setoldcursor)
2041 { 2072 {
2042 if (screen.cur.row + view_start >= nrow) 2073 if (screen.cur.row - view_start >= nrow)
2043 oldcursor.row = -1; 2074 oldcursor.row = -1;
2044 else 2075 else
2045 { 2076 {
2046 oldcursor.row = screen.cur.row + view_start; 2077 oldcursor.row = screen.cur.row - view_start;
2047 oldcursor.col = screen.cur.col; 2078 oldcursor.col = screen.cur.col;
2048 } 2079 }
2049 } 2080 }
2050 } 2081 }
2051 2082
2052 PERL_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); 2083 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2053#if ENABLE_OVERLAY 2084#if ENABLE_OVERLAY
2054 scr_swap_overlay (); 2085 scr_swap_overlay ();
2055#endif 2086#endif
2056 2087
2057#ifndef NO_SLOW_LINK_SUPPORT 2088#ifndef NO_SLOW_LINK_SUPPORT
2058 /* 2089 /*
2059 * D: CopyArea pass - very useful for slower links 2090 * D: CopyArea pass - very useful for slower links
2060 * This has been deliberately kept simple. 2091 * This has been deliberately kept simple.
2061 */ 2092 */
2062 i = num_scr;
2063 if (!display->is_local 2093 if (!display->is_local
2064 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2094 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2065 && abs (num_scr) < nrow && !must_clear) 2095 && abs (num_scr) < nrow && !must_clear)
2066 { 2096 {
2067 int16_t nits; 2097 int16_t nits;
2068 int j; 2098 int j;
2069 int len, wlen; 2099 int len, wlen;
2100 dLocal (int, num_scr);
2070 2101
2071 j = nrow; 2102 j = nrow;
2072 wlen = len = -1; 2103 wlen = len = -1;
2073 row = i > 0 ? 0 : j - 1; 2104 row = i > 0 ? 0 : j - 1;
2074 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2105 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2075 { 2106 {
2076 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2107 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2077 { 2108 {
2078 line_t s = ROW(row - view_start); 2109 line_t s = ROW(view_start + row);
2079 line_t d = drawn_buf[row]; 2110 line_t d = drawn_buf[row];
2080 line_t d2 = drawn_buf[row + i]; 2111 line_t d2 = drawn_buf[row + i];
2081 2112
2082 for (nits = 0, col = ncol; col--; ) 2113 for (nits = 0, col = ncol; col--; )
2083 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2114 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2107 if (wlen < len) 2138 if (wlen < len)
2108 ::swap (wlen, len); 2139 ::swap (wlen, len);
2109 2140
2110 XCopyArea (display->display, vt, vt, 2141 XCopyArea (display->display, vt, vt,
2111 gc, 0, Row2Pixel (len + i), 2142 gc, 0, Row2Pixel (len + i),
2112 (unsigned int)TermWin_TotalWidth (), 2143 (unsigned int)this->width,
2113 (unsigned int)Height2Pixel (wlen - len + 1), 2144 (unsigned int)Height2Pixel (wlen - len + 1),
2114 0, Row2Pixel (len)); 2145 0, Row2Pixel (len));
2115 len = -1; 2146 len = -1;
2116 } 2147 }
2117 } 2148 }
… …
2121 /* 2152 /*
2122 * E: main pass across every character 2153 * E: main pass across every character
2123 */ 2154 */
2124 for (row = 0; row < nrow; row++) 2155 for (row = 0; row < nrow; row++)
2125 { 2156 {
2126 text_t *stp = ROW(row - view_start).t; 2157 text_t *stp = ROW(view_start + row).t;
2127 rend_t *srp = ROW(row - view_start).r; 2158 rend_t *srp = ROW(view_start + row).r;
2128 text_t *dtp = drawn_buf[row].t; 2159 text_t *dtp = drawn_buf[row].t;
2129 rend_t *drp = drawn_buf[row].r; 2160 rend_t *drp = drawn_buf[row].r;
2130 2161
2131 /* 2162 /*
2132 * E2: OK, now the real pass 2163 * E2: OK, now the real pass
… …
2320 } /* for (row....) */ 2351 } /* for (row....) */
2321 2352
2322#if ENABLE_OVERLAY 2353#if ENABLE_OVERLAY
2323 scr_swap_overlay (); 2354 scr_swap_overlay ();
2324#endif 2355#endif
2325 PERL_INVOKE ((this, HOOK_REFRESH_END, DT_END)); 2356 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2326 2357
2327 /* 2358 /*
2328 * G: cleanup cursor and display outline cursor if necessary 2359 * G: cleanup cursor and display outline cursor if necessary
2329 */ 2360 */
2330 if (showcursor) 2361 if (showcursor)
… …
2369 /* 2400 /*
2370 * H: cleanup selection 2401 * H: cleanup selection
2371 */ 2402 */
2372 scr_reverse_selection (); 2403 scr_reverse_selection ();
2373 2404
2374 if (refresh_type & SMOOTH_REFRESH)
2375 XFlush (display->display);
2376
2377 num_scr = 0; 2405 num_scr = 0;
2378 num_scr_allow = 1; 2406 num_scr_allow = 1;
2379} 2407}
2380 2408
2381void 2409void
2382rxvt_term::scr_remap_chars (const line_t &l) 2410rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2383{ 2411{
2384 if (!l.t) 2412 if (!l.t)
2385 return; 2413 return;
2386 2414
2415 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2416
2387 for (int i = ncol; i--; ) 2417 for (int i = ncol; i--; )
2388 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2418 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2389} 2419}
2390 2420
2391void 2421void
2392rxvt_term::scr_remap_chars () 2422rxvt_term::scr_remap_chars () NOTHROW
2393{ 2423{
2394 for (int i = total_rows; i--; ) 2424 for (int i = total_rows; i--; )
2395 scr_remap_chars (row_buf [i]); 2425 scr_remap_chars (row_buf [i]);
2396 2426
2397 for (int i = nrow; i--; ) 2427 for (int i = nrow; i--; )
… …
2400 scr_remap_chars (swap_buf [i]); 2430 scr_remap_chars (swap_buf [i]);
2401 } 2431 }
2402} 2432}
2403 2433
2404void 2434void
2405rxvt_term::scr_recolour () 2435rxvt_term::scr_recolour () NOTHROW
2406{ 2436{
2407 if (1 2437 if (1
2408#if TRANSPARENT 2438#if TRANSPARENT
2409 && !am_transparent 2439 && !am_transparent
2410#endif 2440#endif
… …
2431 want_refresh = 1; 2461 want_refresh = 1;
2432} 2462}
2433 2463
2434/* ------------------------------------------------------------------------- */ 2464/* ------------------------------------------------------------------------- */
2435void 2465void
2436rxvt_term::scr_clear (bool really) 2466rxvt_term::scr_clear (bool really) NOTHROW
2437{ 2467{
2438 if (!mapped) 2468 if (!mapped)
2439 return; 2469 return;
2440 2470
2441 num_scr_allow = 0; 2471 num_scr_allow = 0;
… …
2443 2473
2444 if (really) 2474 if (really)
2445 XClearWindow (display->display, vt); 2475 XClearWindow (display->display, vt);
2446} 2476}
2447 2477
2448/* ------------------------------------------------------------------------- */
2449void 2478void
2479rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2480{
2481 int view_end = view_start + nrow;
2482 int row, col;
2483
2484 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2485 {
2486 text_t *stp = ROW(row).t;
2487 rend_t *srp = ROW(row).r;
2488
2489 for (col = beg_col; col < end_col; col++)
2490 srp[col] ^= rstyle1;
2491
2492 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2493 srp[col] ^= rstyle2;
2494
2495 if (++col < end_col)
2496 srp[col] ^= rstyle2;
2497 }
2498}
2499
2500void
2501rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2502{
2503 int view_end = view_start + nrow;
2504 int row, col;
2505
2506 if (beg_row >= view_start)
2507 {
2508 col = beg_col;
2509 row = beg_row;
2510 }
2511 else
2512 {
2513 col = 0;
2514 row = view_start;
2515 }
2516
2517 for (; row < min (end_row, view_end); row++, col = 0)
2518 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2519 srp[col] ^= rstyle;
2520
2521 if (row == end_row)
2522 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2523 srp[col] ^= rstyle;
2524}
2525
2526/* ------------------------------------------------------------------------- */
2527void
2450rxvt_term::scr_reverse_selection () 2528rxvt_term::scr_reverse_selection () NOTHROW
2451{ 2529{
2452 if (selection.op 2530 if (selection.op
2453 && current_screen == selection.screen 2531 && current_screen == selection.screen
2454 && selection.end.row >= -view_start) 2532 && selection.end.row >= view_start)
2455 { 2533 {
2456 int view_end = -view_start + nrow;
2457 int row, col;
2458
2459#if ENABLE_FRILLS 2534#if ENABLE_FRILLS
2460 if (selection.rect) 2535 if (selection.rect)
2461 { 2536 scr_xor_rect (selection.beg.row, selection.beg.col,
2462 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2537 selection.end.row, selection.end.col,
2463 { 2538 RS_RVid, RS_RVid | RS_Uline);
2464 text_t *stp = ROW(row).t;
2465 rend_t *srp = ROW(row).r;
2466
2467 for (col = selection.beg.col; col < selection.end.col; col++)
2468 srp[col] ^= RS_RVid;
2469
2470 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2471 srp[col] ^= RS_RVid | RS_Uline;
2472
2473 if (++col < selection.end.col)
2474 srp[col] ^= RS_RVid | RS_Uline;
2475 }
2476 }
2477 else 2539 else
2478#endif 2540#endif
2479 { 2541 scr_xor_span (selection.beg.row, selection.beg.col,
2480 if (selection.beg.row >= -view_start) 2542 selection.end.row, selection.end.col,
2481 { 2543 RS_RVid);
2482 col = selection.beg.col;
2483 row = selection.beg.row;
2484 }
2485 else
2486 {
2487 col = 0;
2488 row = -view_start;
2489 }
2490
2491 for (; row < min (selection.end.row, view_end); row++, col = 0)
2492 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2493 srp[col] ^= RS_RVid;
2494
2495 if (row == selection.end.row)
2496 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2497 srp[col] ^= RS_RVid;
2498 }
2499 } 2544 }
2500} 2545}
2501 2546
2502/* ------------------------------------------------------------------------- */ 2547/* ------------------------------------------------------------------------- */
2503/* 2548/*
2504 * Dump the whole scrollback and screen to the passed filedescriptor. The 2549 * Dump the whole scrollback and screen to the passed filedescriptor. The
2505 * invoking routine must close the fd. 2550 * invoking routine must close the fd.
2506 */ 2551 */
2507#if 0 2552#if 0
2508void 2553void
2509rxvt_term::scr_dump (int fd) 2554rxvt_term::scr_dump (int fd) NOTHROW
2510{ 2555{
2511 int row, wrote; 2556 int row, wrote;
2512 unsigned int width, towrite; 2557 unsigned int width, towrite;
2513 char r1[] = "\n"; 2558 char r1[] = "\n";
2514 2559
… …
2533 2578
2534/* ------------------------------------------------------------------------- * 2579/* ------------------------------------------------------------------------- *
2535 * CHARACTER SELECTION * 2580 * CHARACTER SELECTION *
2536 * ------------------------------------------------------------------------- */ 2581 * ------------------------------------------------------------------------- */
2537void 2582void
2538rxvt_term::selection_check (int check_more) 2583rxvt_term::selection_check (int check_more) NOTHROW
2539{ 2584{
2540 row_col_t pos; 2585 row_col_t pos;
2541 2586
2542 if (!selection.op) 2587 if (!selection.op)
2543 return; 2588 return;
2544 2589
2545 pos.row = pos.col = 0; 2590 pos.row = pos.col = 0;
2546 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2591 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2547 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2592 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2548 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2593 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2549 || (check_more == 1 2594 || (check_more == 1
2550 && current_screen == selection.screen 2595 && current_screen == selection.screen
2551 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2596 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2552 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2597 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2553 || (check_more == 2 2598 || (check_more == 2
… …
2564/* ------------------------------------------------------------------------- */ 2609/* ------------------------------------------------------------------------- */
2565/* 2610/*
2566 * Paste a selection direct to the command fd 2611 * Paste a selection direct to the command fd
2567 */ 2612 */
2568void 2613void
2569rxvt_term::paste (unsigned char *data, unsigned int len) 2614rxvt_term::paste (char *data, unsigned int len) NOTHROW
2570{ 2615{
2571 /* convert normal newline chars into common keyboard Return key sequence */ 2616 /* convert normal newline chars into common keyboard Return key sequence */
2572 for (unsigned int i = 0; i < len; i++) 2617 for (unsigned int i = 0; i < len; i++)
2573 if (data[i] == C0_LF) 2618 if (data[i] == C0_LF)
2574 data[i] = C0_CR; 2619 data[i] = C0_CR;
… …
2580/* 2625/*
2581 * Respond to a notification that a primary selection has been sent 2626 * Respond to a notification that a primary selection has been sent
2582 * EXT: SelectionNotify 2627 * EXT: SelectionNotify
2583 */ 2628 */
2584void 2629void
2585rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2630rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2586{ 2631{
2587 if (prop == None) /* check for failed XConvertSelection */ 2632 if (prop == None) /* check for failed XConvertSelection */
2588 { 2633 {
2589 if ((selection_type & Sel_CompoundText)) 2634 if ((selection_type & Sel_CompoundText))
2590 { 2635 {
… …
2718 { 2763 {
2719 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); 2764 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2720 char *s = rxvt_wcstombs (w); 2765 char *s = rxvt_wcstombs (w);
2721 free (w); 2766 free (w);
2722 // TODO: strlen == only the first element will be converted. well... 2767 // TODO: strlen == only the first element will be converted. well...
2723 paste ((unsigned char *)s, strlen (s)); 2768 paste (s, strlen (s));
2724 free (s); 2769 free (s);
2725 } 2770 }
2726 else 2771 else
2727#endif 2772#endif
2728 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 2773 if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0
2729 && cl) 2774 && cl)
2730 { 2775 {
2731 for (int i = 0; i < cr; i++) 2776 for (int i = 0; i < cr; i++)
2732 paste ((unsigned char *)cl[i], strlen (cl[i])); 2777 paste (cl[i], strlen (cl[i]));
2733 2778
2734 XFreeStringList (cl); 2779 XFreeStringList (cl);
2735 } 2780 }
2736 else 2781 else
2737 paste (ct.value, ct.nitems); // paste raw 2782 paste ((char *)ct.value, ct.nitems); // paste raw
2738 2783
2739bailout: 2784bailout:
2740 XFree (ct.value); 2785 XFree (ct.value);
2741 2786
2742 if (selection_wait == Sel_normal) 2787 if (selection_wait == Sel_normal)
2743 selection_wait = Sel_none; 2788 selection_wait = Sel_none;
2744} 2789}
2745 2790
2746void 2791void
2747rxvt_term::incr_cb (time_watcher &w) 2792rxvt_term::incr_cb (time_watcher &w) NOTHROW
2748{ 2793{
2749 selection_wait = Sel_none; 2794 selection_wait = Sel_none;
2750 2795
2751 incr_buf_size = 0; 2796 incr_buf_size = 0;
2752 free (incr_buf); 2797 free (incr_buf);
2753 2798
2754 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2799 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2755} 2800}
2756 2801
2757void 2802void
2758rxvt_term::selection_property (Window win, Atom prop) 2803rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2759{ 2804{
2760 if (prop == None || selection_wait != Sel_incr) 2805 if (prop == None || selection_wait != Sel_incr)
2761 return; 2806 return;
2762 2807
2763 selection_paste (win, prop, true); 2808 selection_paste (win, prop, true);
… …
2772 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2817 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2773 * will auto fallback to CUT_BUFFER0 2818 * will auto fallback to CUT_BUFFER0
2774 * EXT: button 2 release 2819 * EXT: button 2 release
2775 */ 2820 */
2776void 2821void
2777rxvt_term::selection_request (Time tm, int x, int y) 2822rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2778{ 2823{
2779 if (x < 0 || x >= width || y < 0 || y >= height) 2824 if (selection.text && selnum == Sel_Primary)
2780 return; /* outside window */
2781
2782 if (selection.text)
2783 { /* internal selection */ 2825 { /* internal selection */
2784 char *str = rxvt_wcstombs (selection.text, selection.len); 2826 char *str = rxvt_wcstombs (selection.text, selection.len);
2785 paste ((unsigned char *)str, strlen (str)); 2827 paste (str, strlen (str));
2786 free (str); 2828 free (str);
2787 return; 2829 return;
2788 } 2830 }
2789 else 2831 else
2790 { 2832 {
2791 int i;
2792
2793 selection_request_time = tm; 2833 selection_request_time = tm;
2794 selection_wait = Sel_normal; 2834 selection_wait = Sel_normal;
2795 2835
2796 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2797 {
2798#if X_HAVE_UTF8_STRING 2836#if X_HAVE_UTF8_STRING
2799 selection_type = Sel_UTF8String; 2837 selection_type = Sel_UTF8String;
2800 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2838 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2801 return; 2839 return;
2802#else 2840#else
2803 selection_type = Sel_CompoundText; 2841 selection_type = Sel_CompoundText;
2804 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2842 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2805 return; 2843 return;
2806#endif 2844#endif
2807 }
2808 } 2845 }
2809 2846
2810 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2847 selection_wait = Sel_none; /* don't loop in selection_paste () */
2811 selection_paste (display->root, XA_CUT_BUFFER0, false); 2848 selection_paste (display->root, XA_CUT_BUFFER0, false);
2812} 2849}
2813 2850
2814int 2851int
2815rxvt_term::selection_request_other (Atom target, int selnum) 2852rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2816{ 2853{
2817 Atom sel; 2854 Atom sel;
2818 2855
2819 selection_type |= selnum; 2856 selection_type |= selnum;
2820 2857
… …
2839/* 2876/*
2840 * Clear all selected text 2877 * Clear all selected text
2841 * EXT: SelectionClear 2878 * EXT: SelectionClear
2842 */ 2879 */
2843void 2880void
2844rxvt_term::selection_clear () 2881rxvt_term::selection_clear () NOTHROW
2845{ 2882{
2846 want_refresh = 1; 2883 want_refresh = 1;
2847 free (selection.text); 2884 free (selection.text);
2848 selection.text = NULL; 2885 selection.text = NULL;
2849 selection.len = 0; 2886 selection.len = 0;
… …
2882 selection.op = SELECTION_DONE; 2919 selection.op = SELECTION_DONE;
2883 2920
2884 if (selection.clicks == 4) 2921 if (selection.clicks == 4)
2885 return; /* nothing selected, go away */ 2922 return; /* nothing selected, go away */
2886 2923
2887 if (PERL_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) 2924 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2888 return; 2925 return;
2889 2926
2890 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); 2927 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2891 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 2928 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2892 2929
… …
2906 col = selection.beg.col; 2943 col = selection.beg.col;
2907 end_col = ncol + 1; 2944 end_col = ncol + 1;
2908 } 2945 }
2909 else 2946 else
2910#endif 2947#endif
2911 end_col = ROW(row).is_longer () ? ncol : ROW(row).l; //TODO//FIXME//LEN 2948 end_col = ROW(row).l;
2912 2949
2913 col = max (col, 0); 2950 col = max (col, 0);
2914 2951
2915 if (row == selection.end.row 2952 if (row == selection.end.row
2916#if ENABLE_FRILLS 2953#if ENABLE_FRILLS
… …
2918#endif 2955#endif
2919 ) 2956 )
2920 min_it (end_col, selection.end.col); 2957 min_it (end_col, selection.end.col);
2921 2958
2922 t = ROW(row).t + col; 2959 t = ROW(row).t + col;
2960
2923 for (; col < end_col; col++) 2961 for (; col < end_col; col++)
2924 { 2962 {
2925 if (*t == NOCHAR) 2963 if (*t == NOCHAR)
2926 t++; 2964 t++;
2927#if ENABLE_COMBINING 2965#if ENABLE_COMBINING
… …
2976 3014
2977 // we usually allocate much more than necessary, so realloc it smaller again 3015 // we usually allocate much more than necessary, so realloc it smaller again
2978 selection.len = ofs; 3016 selection.len = ofs;
2979 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3017 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2980 3018
2981 if (PERL_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END))) 3019 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2982 return; 3020 return;
2983 3021
2984 selection_grab (tm); 3022 selection_grab (tm);
2985} 3023}
2986 3024
2987bool 3025bool
2988rxvt_term::selection_grab (Time tm) 3026rxvt_term::selection_grab (Time tm) NOTHROW
2989{ 3027{
2990 selection_time = tm; 3028 selection_time = tm;
2991 3029
2992 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3030 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
2993 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3031 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
2994 { 3032 {
2995 display->set_selection_owner (this); 3033 display->set_selection_owner (this);
2996 return true; 3034 return true;
2997 } 3035 }
2998 else 3036 else
3037 {
3038 selection_clear ();
2999 return false; 3039 return false;
3040 }
3000 3041
3001#if 0 3042#if 0
3002 XTextProperty ct; 3043 XTextProperty ct;
3003 3044
3004 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3045 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3013/* 3054/*
3014 * Mark or select text based upon number of clicks: 1, 2, or 3 3055 * Mark or select text based upon number of clicks: 1, 2, or 3
3015 * EXT: button 1 press 3056 * EXT: button 1 press
3016 */ 3057 */
3017void 3058void
3018rxvt_term::selection_click (int clicks, int x, int y) 3059rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3019{ 3060{
3020 clicks = ((clicks - 1) % 3) + 1; 3061 clicks = ((clicks - 1) % 3) + 1;
3021 selection.clicks = clicks; /* save clicks so extend will work */ 3062 selection.clicks = clicks; /* save clicks so extend will work */
3022 3063
3064 if (clicks == 2 && !selection.rect
3065 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3066 {
3067 MEvent.clicks = 1; // what a mess
3068 selection.screen = current_screen;
3069 selection.op = SELECTION_CONT;
3070 return;
3071 }
3072
3023 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3073 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3024 3074
3025 if (clicks == 2 || clicks == 3) 3075 if (clicks == 2 || clicks == 3)
3026 selection_extend_colrow (selection.mark.col, 3076 selection_extend_colrow (selection.mark.col,
3027 selection.mark.row + view_start, 3077 selection.mark.row - view_start,
3028 0, /* button 3 */ 3078 0, /* button 3 */
3029 1, /* button press */ 3079 1, /* button press */
3030 0); /* click change */ 3080 0); /* click change */
3031} 3081}
3032 3082
3033/* ------------------------------------------------------------------------- */ 3083/* ------------------------------------------------------------------------- */
3034/* 3084/*
3035 * Mark a selection at the specified col/row 3085 * Mark a selection at the specified col/row
3036 */ 3086 */
3037void 3087void
3038rxvt_term::selection_start_colrow (int col, int row) 3088rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3039{ 3089{
3040 want_refresh = 1; 3090 want_refresh = 1;
3041 3091
3042 selection.mark.row = row - view_start; 3092 selection.mark.row = row + view_start;
3043 selection.mark.col = col; 3093 selection.mark.col = col;
3044 3094
3045 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3095 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3046 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3096 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3047 3097
3048 while (selection.mark.col > 0 3098 while (selection.mark.col > 0
3049 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3099 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3050 --selection.mark.col; 3100 --selection.mark.col;
… …
3069#define DELIMIT_TEXT(x) \ 3119#define DELIMIT_TEXT(x) \
3070 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3120 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3071#define DELIMIT_REND(x) 1 3121#define DELIMIT_REND(x) 1
3072 3122
3073void 3123void
3074rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3124rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3075{ 3125{
3076 int col, row, dirnadd, tcol, trow, w1, w2; 3126 int col, row, dirnadd, tcol, trow, w1, w2;
3077 row_col_t bound; 3127 row_col_t bound;
3078 text_t *stp; 3128 text_t *stp;
3079 rend_t *srp; 3129 rend_t *srp;
3080 3130
3081 if (dirn == UP) 3131 if (dirn == UP)
3082 { 3132 {
3083 bound.row = - nsaved - 1; 3133 bound.row = top_row - 1;
3084 bound.col = 0; 3134 bound.col = 0;
3085 dirnadd = -1; 3135 dirnadd = -1;
3086 } 3136 }
3087 else 3137 else
3088 { 3138 {
… …
3136 } 3186 }
3137 } 3187 }
3138 break; 3188 break;
3139 } 3189 }
3140 3190
3141Old_Word_Selection_You_Die:
3142 if (dirn == DN) 3191 if (dirn == DN)
3143 col++; /* put us on one past the end */ 3192 col++; /* put us on one past the end */
3144 3193
3145 /* Poke the values back in */ 3194 /* Poke the values back in */
3146 ret->row = row; 3195 ret->row = row;
… …
3154 * flag == 0 ==> button 1 3203 * flag == 0 ==> button 1
3155 * flag == 1 ==> button 3 press 3204 * flag == 1 ==> button 3 press
3156 * flag == 2 ==> button 3 motion 3205 * flag == 2 ==> button 3 motion
3157 */ 3206 */
3158void 3207void
3159rxvt_term::selection_extend (int x, int y, int flag) 3208rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3160{ 3209{
3161 int col = clamp (Pixel2Col (x), 0, ncol); 3210 int col = clamp (Pixel2Col (x), 0, ncol);
3162 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3211 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3163 3212
3164 /* 3213 /*
… …
3167 * select nothing. Otherwise, if we're to the right of the mark, you have to 3216 * select nothing. Otherwise, if we're to the right of the mark, you have to
3168 * be _past_ a character for it to be selected. 3217 * be _past_ a character for it to be selected.
3169 */ 3218 */
3170 if (((selection.clicks % 3) == 1) && !flag 3219 if (((selection.clicks % 3) == 1) && !flag
3171 && (col == selection.mark.col 3220 && (col == selection.mark.col
3172 && (row == selection.mark.row + view_start))) 3221 && (row == selection.mark.row - view_start)))
3173 { 3222 {
3174 /* select nothing */ 3223 /* select nothing */
3175 selection.beg.row = selection.end.row = 0; 3224 selection.beg.row = selection.end.row = 0;
3176 selection.beg.col = selection.end.col = 0; 3225 selection.beg.col = selection.end.col = 0;
3177 selection.clicks = 4; 3226 selection.clicks = 4;
… …
3190/* ------------------------------------------------------------------------- */ 3239/* ------------------------------------------------------------------------- */
3191/* 3240/*
3192 * Extend the selection to the specified col/row 3241 * Extend the selection to the specified col/row
3193 */ 3242 */
3194void 3243void
3195rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3244rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3196{ 3245{
3197 row_col_t pos; 3246 row_col_t pos;
3198 enum { 3247 enum {
3199 LEFT, RIGHT 3248 LEFT, RIGHT
3200 } closeto = RIGHT; 3249 } closeto = RIGHT;
… …
3232 selection.beg.col = selection.end.col = selection.mark.col; 3281 selection.beg.col = selection.end.col = selection.mark.col;
3233 selection.beg.row = selection.end.row = selection.mark.row; 3282 selection.beg.row = selection.end.row = selection.mark.row;
3234 } 3283 }
3235 3284
3236 pos.col = col; 3285 pos.col = col;
3237 pos.row = row - view_start; 3286 pos.row = view_start + row;
3238 3287
3239 /* 3288 /*
3240 * This is mainly xterm style selection with a couple of differences, mainly 3289 * This is mainly xterm style selection with a couple of differences, mainly
3241 * in the way button3 drag extension works. 3290 * in the way button3 drag extension works.
3242 * We're either doing: button1 drag; button3 press; or button3 drag 3291 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3323 else if (selection.clicks == 2) 3372 else if (selection.clicks == 2)
3324 { 3373 {
3325 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3374 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3326 selection.end.col--; 3375 selection.end.col--;
3327 3376
3328 if (!PERL_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3329 {
3330 selection_delimit_word (UP, &selection.beg, &selection.beg); 3377 selection_delimit_word (UP, &selection.beg, &selection.beg);
3331 selection_delimit_word (DN, &selection.end, &selection.end); 3378 selection_delimit_word (DN, &selection.end, &selection.end);
3332 }
3333 } 3379 }
3334 else if (selection.clicks == 3) 3380 else if (selection.clicks == 3)
3335 { 3381 {
3336#if ENABLE_FRILLS 3382#if ENABLE_FRILLS
3337 if (OPTION (Opt_tripleclickwords)) 3383 if (OPTION (Opt_tripleclickwords))
… …
3389#endif 3435#endif
3390} 3436}
3391 3437
3392#if ENABLE_FRILLS 3438#if ENABLE_FRILLS
3393void 3439void
3394rxvt_term::selection_remove_trailing_spaces () 3440rxvt_term::selection_remove_trailing_spaces () NOTHROW
3395{ 3441{
3396 int32_t end_col, end_row; 3442 int32_t end_col, end_row;
3397 text_t *stp; 3443 text_t *stp;
3398 3444
3399 end_col = selection.end.col; 3445 end_col = selection.end.col;
… …
3437/* 3483/*
3438 * Double click on button 3 when already selected 3484 * Double click on button 3 when already selected
3439 * EXT: button 3 double click 3485 * EXT: button 3 double click
3440 */ 3486 */
3441void 3487void
3442rxvt_term::selection_rotate (int x, int y) 3488rxvt_term::selection_rotate (int x, int y) NOTHROW
3443{ 3489{
3444 selection.clicks = selection.clicks % 3 + 1; 3490 selection.clicks = selection.clicks % 3 + 1;
3445 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3491 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3446} 3492}
3447 3493
… …
3449/* 3495/*
3450 * Respond to a request for our current selection 3496 * Respond to a request for our current selection
3451 * EXT: SelectionRequest 3497 * EXT: SelectionRequest
3452 */ 3498 */
3453void 3499void
3454rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3500rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3455{ 3501{
3456 XSelectionEvent ev; 3502 XSelectionEvent ev;
3457 dDisp; 3503 dDisp;
3458 3504
3459 ev.type = SelectionNotify; 3505 ev.type = SelectionNotify;
… …
3587 3633
3588/* 3634/*
3589 * return col/row values corresponding to x/y pixel values 3635 * return col/row values corresponding to x/y pixel values
3590 */ 3636 */
3591void 3637void
3592rxvt_term::pixel_position (int *x, int *y) 3638rxvt_term::pixel_position (int *x, int *y) NOTHROW
3593{ 3639{
3594 *x = Pixel2Col (*x); 3640 *x = Pixel2Col (*x);
3595 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3641 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3596 *y = Pixel2Row (*y); 3642 *y = Pixel2Row (*y);
3597 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3643 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3598} 3644}
3599 3645
3600/* ------------------------------------------------------------------------- */ 3646/* ------------------------------------------------------------------------- */
3601#ifdef USE_XIM 3647#ifdef USE_XIM
3602void 3648void
3603rxvt_term::im_set_position (XPoint &pos) 3649rxvt_term::im_set_position (XPoint &pos) NOTHROW
3604{ 3650{
3605 XWindowAttributes xwa; 3651 XWindowAttributes xwa;
3606 3652
3607 XGetWindowAttributes (display->display, vt, &xwa); 3653 XGetWindowAttributes (display->display, vt, &xwa);
3608 3654
… …
3611} 3657}
3612#endif 3658#endif
3613 3659
3614#if ENABLE_OVERLAY 3660#if ENABLE_OVERLAY
3615void 3661void
3616rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3662rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3617{ 3663{
3618 if (nrow < 1 || ncol < 1) 3664 if (nrow < 1 || ncol < 1)
3619 return; 3665 return;
3620 3666
3621 want_refresh = 1; 3667 want_refresh = 1;
… …
3666 *rp = r; 3712 *rp = r;
3667 } 3713 }
3668} 3714}
3669 3715
3670void 3716void
3671rxvt_term::scr_overlay_off () 3717rxvt_term::scr_overlay_off () NOTHROW
3672{ 3718{
3673 if (!ov_text) 3719 if (!ov_text)
3674 return; 3720 return;
3675 3721
3676 want_refresh = 1; 3722 want_refresh = 1;
… …
3684 delete [] ov_text; ov_text = 0; 3730 delete [] ov_text; ov_text = 0;
3685 delete [] ov_rend; ov_rend = 0; 3731 delete [] ov_rend; ov_rend = 0;
3686} 3732}
3687 3733
3688void 3734void
3689rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3735rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3690{ 3736{
3691 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3737 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3692 return; 3738 return;
3693 3739
3694 x++, y++; 3740 x++, y++;
… …
3696 ov_text[y][x] = text; 3742 ov_text[y][x] = text;
3697 ov_rend[y][x] = rend; 3743 ov_rend[y][x] = rend;
3698} 3744}
3699 3745
3700void 3746void
3701rxvt_term::scr_overlay_set (int x, int y, const char *s) 3747rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3702{ 3748{
3703 while (*s) 3749 while (*s)
3704 scr_overlay_set (x++, y, *s++); 3750 scr_overlay_set (x++, y, *s++);
3705} 3751}
3706 3752
3707void 3753void
3708rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3754rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3709{ 3755{
3710 while (*s) 3756 while (*s)
3711 { 3757 {
3712 text_t t = *s++; 3758 text_t t = *s++;
3713 int width = wcwidth (t); 3759 int width = wcwidth (t);
… …
3719 } 3765 }
3720 } 3766 }
3721} 3767}
3722 3768
3723void 3769void
3724rxvt_term::scr_swap_overlay () 3770rxvt_term::scr_swap_overlay () NOTHROW
3725{ 3771{
3726 if (!ov_text) 3772 if (!ov_text)
3727 return; 3773 return;
3728 3774
3729 // swap screen mem with overlay 3775 // swap screen mem with overlay
3730 for (int y = ov_h; y--; ) 3776 for (int y = ov_h; y--; )
3731 { 3777 {
3732 text_t *t1 = ov_text[y]; 3778 text_t *t1 = ov_text[y];
3733 rend_t *r1 = ov_rend[y]; 3779 rend_t *r1 = ov_rend[y];
3734 3780
3735 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3781 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3736 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3782 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3737 3783
3738 for (int x = ov_w; x--; ) 3784 for (int x = ov_w; x--; )
3739 { 3785 {
3740 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3786 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3741 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3787 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