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.216 by root, Mon Jan 9 18:51:19 2006 UTC vs.
Revision 1.247 by root, Sun Jan 22 20:39:47 2006 UTC

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;
142} 142}
143 143
144/* ------------------------------------------------------------------------- */ 144/* ------------------------------------------------------------------------- */
145/* 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 */
146void 146void
147rxvt_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
148{ 148{
149 scr_blank_line (l, 0, ncol, efs); 149 scr_blank_line (l, 0, ncol, efs);
150 150
151 l.l = 0; 151 l.l = 0;
152 l.f = 0; 152 l.f = 0;
173 nrow = 24; 173 nrow = 24;
174 174
175 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
176 return; 176 return;
177 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
178 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
179 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
180 { 183 {
181 //TODO//FIXME 184 //TODO//FIXME
182 saveLines++; 185 saveLines++;
183 prev_nrow--; 186 prev_nrow--;
184 nsaved++; 187 top_row--;
185 } 188 }
186 189
187 want_refresh = 1; 190 want_refresh = 1;
188 191
189 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
194 197
195 if (!row_buf) 198 if (!row_buf)
196 { 199 {
197 /* 200 /*
198 * first time called so just malloc everything: don't rely on realloc 201 * first time called so just malloc everything: don't rely on realloc
199 * Note: this is still needed so that all the scrollback lines are NULL
200 */ 202 */
201 nsaved = 0; /* no saved lines */ 203 top_row = 0;
202 term_start = 0; 204 term_start = 0;
203 205
204 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
205 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
206 208
207 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
208 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
209 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
210 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
211 212
212 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
213 { 214 {
214 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
215 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
236 selection.text = NULL; 237 selection.text = NULL;
237 selection.len = 0; 238 selection.len = 0;
238 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
239 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
240 selection.clicks = 0; 241 selection.clicks = 0;
241 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
242 rvideo = 0;
243 } 243 }
244 else 244 else
245 { 245 {
246 /* 246 /*
247 * add or delete rows as appropriate 247 * add or delete rows as appropriate
260 } 260 }
261 } 261 }
262#endif 262#endif
263 263
264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); 264 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
265 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
266 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); 265 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
267 266
268 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
269 { 268 {
270 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
275 { 274 {
276 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 275 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
277 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); 276 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
278 } 277 }
279 278
279 line_t *old_buf = row_buf;
280 line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 280 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
281 281
282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row 282 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
283 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
284 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
285 285
286 if (nsaved) 286 if (top_row)
287 { 287 {
288 // re-wrap lines, this is rather ugly, possibly because I am too dumb 288 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
289 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
290 290
291 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
292 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
293 293
327 qline->l = ncol; 327 qline->l = ncol;
328 qline->is_longer (1); 328 qline->is_longer (1);
329 329
330 int qcol = 0; 330 int qcol = 0;
331 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
332 // fill a single destination line 336 // fill a single destination line
333 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
334 { 338 {
335 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
336 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
346 350
347 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
348 352
349 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
350 354
351 assert (len);
352 assert (pline.t);
353
354 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
355 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
356 357
357 lofs += len; 358 lofs += len;
358 qcol += len; 359 qcol += len;
364 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
365 } 366 }
366 while (p != pend && q > 0); 367 while (p != pend && q > 0);
367 368
368 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
369 nsaved = term_start - q; 370 top_row = q - term_start;
370 371
371 // make sure all terminal lines exist 372 // make sure all terminal lines exist
372 while (nsaved < 0) 373 while (top_row > 0)
373 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
374 } 375 }
375 else 376 else
376 { 377 {
377 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
378 379
391 } 392 }
392 393
393 term_start = 0; 394 term_start = 0;
394 } 395 }
395 396
396#ifdef DEBUG_STRICT //TODO: remove
397 for (int i = -nsaved; i < nrow; i++)
398 assert (ROW (i).t);
399#endif
400
401 free (old_buf); 397 free (old_buf);
402 delete old_ta; 398 delete old_ta;
403 delete old_ra; 399 delete old_ra;
404 400
405 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
406 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
407 403
408 if (tabs)
409 free (tabs); 404 free (tabs);
410 } 405 }
406
407 CLEAR_ALL_SELECTION ();
411 408
412 prev_nrow = nrow; 409 prev_nrow = nrow;
413 prev_ncol = ncol; 410 prev_ncol = ncol;
414 411
415 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
416 413
417 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
418 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
419 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
420 tt_winch (); 420 tt_winch ();
421 421
422 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
423} 423}
424 424
425/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
426/* 426/*
427 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
428 */ 428 */
429void 429void
430rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
431{ 431{
432 if (row_buf)
433 {
432 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
433 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
434 436
435 free (row_buf); 437 free (row_buf);
436 free (swap_buf); 438 free (swap_buf);
437 free (drawn_buf); 439 free (drawn_buf);
438 free (temp_buf);
439 free (tabs); 440 free (tabs);
440 441
441 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
442} 444}
443 445
444/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
445/* 447/*
446 * Hard reset 448 * Hard reset
451 scr_release (); 453 scr_release ();
452 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
453 scr_reset (); 455 scr_reset ();
454 456
455 scr_clear (true); 457 scr_clear (true);
456 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
457} 459}
458 460
459/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
460 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
461 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
463 * Save and Restore cursor 465 * Save and Restore cursor
464 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
465 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
466 */ 468 */
467void 469void
468rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
469{ 471{
470 screen_t *s; 472 screen_t *s;
471 473
472#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
473 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
505 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
506 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
507#endif 509#endif
508} 510}
509 511
512void
513rxvt_term::scr_swap_screen ()
514{
515 if (!OPTION (Opt_secondaryScreen))
516 return;
517
518 for (int i = prev_nrow; i--; )
519 ::swap (ROW(i), swap_buf [i]);
520
521 ::swap (screen.cur, swap.cur);
522
523 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
524 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
525}
526
510/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
511/* 528/*
512 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
513 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
514 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
515 */ 532 */
516int 533void
517rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
518{ 535{
536 if (scrn == current_screen)
537 return;
538
519 want_refresh = 1; 539 want_refresh = 1;
520 view_start = 0; 540 view_start = 0;
521 541
522 if (current_screen == scrn)
523 return scrn;
524
525 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
526 543
527 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
528
529 ::swap (screen.cur.row, swap.cur.row);
530 ::swap (screen.cur.col, swap.cur.col);
531
532 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
533 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
534 545
535#if NSCREENS 546#if NSCREENS
536 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
537 { 548 {
538 num_scr = 0; 549 num_scr = 0;
539 550
540 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
541 ::swap (ROW(i), swap_buf [i]);
542 552
543 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
544 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
545 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
546 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
547 } 557 }
548 else 558 else
549#endif 559#endif
550 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
551 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
552
553 return scrn;
554} 562}
555 563
556// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
557void 565void
558rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
559{ 567{
560 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
561 return; 569 return;
562 570
563 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
573/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
574/* 582/*
575 * Change the colour for following text 583 * Change the colour for following text
576 */ 584 */
577void 585void
578rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
579{ 587{
580 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
581 color = fgbg; 589 color = fgbg;
582 590
583 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
584 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
585 else 593 else
589/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
590/* 598/*
591 * Change the rendition style for following text 599 * Change the rendition style for following text
592 */ 600 */
593void 601void
594rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
595 { 603 {
596 if (set) 604 if (set)
597 rstyle |= style; 605 rstyle |= style;
598 else if (style == ~RS_None) 606 else if (style == ~RS_None)
599 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
606 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
607 * count positive ==> scroll up 615 * count positive ==> scroll up
608 * count negative ==> scroll down 616 * count negative ==> scroll down
609 */ 617 */
610int 618int
611rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
612{ 620{
613 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
614 return 0; 622 return 0;
615 623
616 want_refresh = 1; 624 want_refresh = 1;
617 num_scr += count; 625 num_scr += count;
618 626
619 if (count > 0 627 if (count > 0
620 && row1 == 0 628 && row1 == 0
621 && row2 == nrow - 1
622 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
623 { 630 {
624 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
625 632
626 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); 633 // scroll everything up 'count' lines
634 term_start = (term_start + count) % total_rows;
635
636 // sever bottommost line
637 {
638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
640 l.touch ();
641 }
642
643 // erase newly scrolled-in lines
644 for (int i = count; i--; )
645 {
646 // basically this is a slightly optimized scr_blank_screen_mem
647 // it is worth the effort on slower machines
648 line_t &l = ROW(nrow - 1 - i);
649
650 scr_blank_line (l, 0, l.l, rstyle);
651
652 l.l = 0;
653 l.f = 0;
654 }
655
656 // now copy lines below the scroll region bottom to the
657 // bottom of the screen again, so they look as if they
658 // hadn't moved.
659 for (int i = nrow; --i > row2; )
660 {
661 line_t &l1 = ROW(i - count);
662 line_t &l2 = ROW(i);
663
664 ::swap (l1, l2);
665 l2.touch ();
666 }
627 667
628 term_start = (term_start + count) % total_rows; 668 // move and/or clear selection, if any
629
630 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
631 { 670 {
632 selection.beg.row -= count; 671 selection.beg.row -= count;
633 selection.end.row -= count; 672 selection.end.row -= count;
634 selection.mark.row -= count; 673 selection.mark.row -= count;
635 674
636 if (selection.beg.row < -nsaved 675 if (selection.beg.row < top_row
637 || selection.end.row < -nsaved 676 || selection.end.row < top_row
638 || selection.mark.row < -nsaved) 677 || selection.mark.row < top_row)
639 { 678 {
640 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
641 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
642 } 681 }
643 } 682 }
644 683
645 for (int i = count; i--; ) 684 // finally move the view window, if desired
646 {
647 // basically thi is a slightly optimized scr_blank_screen_mem
648 // it is worth the effort on slower machines
649 line_t &l = ROW(row2 - i);
650
651 scr_blank_line (l, 0, l.l, rstyle);
652
653 l.l = 0;
654 l.f = 0;
655 }
656
657 if (OPTION (Opt_scrollWithBuffer) 685 if (OPTION (Opt_scrollWithBuffer)
658 && view_start != 0 686 && view_start != 0
659 && view_start != saveLines) 687 && view_start != -saveLines)
660 scr_page (UP, count); 688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
661 } 692 }
662 else 693 else
663 { 694 {
664 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen)
665 { 696 {
689 720
690 int rows = row2 - row1 + 1; 721 int rows = row2 - row1 + 1;
691 722
692 min_it (count, rows); 723 min_it (count, rows);
693 724
725 line_t *temp_buf = row_buf + total_rows;
726
694 for (int row = 0; row < rows; row++) 727 for (int row = 0; row < rows; row++)
695 { 728 {
696 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
697 730
698 if (!IN_RANGE_EXC (row + count, 0, rows)) 731 if (!IN_RANGE_EXC (row + count, 0, rows))
709/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
710/* 743/*
711 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
712 */ 745 */
713void 746void
714rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
715{ 748{
716 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
717 return; 750 return;
718 751
719 unsigned char checksel; 752 unsigned char checksel;
739 } 772 }
740 773
741#ifdef DEBUG_STRICT 774#ifdef DEBUG_STRICT
742 assert (screen.cur.col < ncol); 775 assert (screen.cur.col < ncol);
743 assert (screen.cur.row < nrow 776 assert (screen.cur.row < nrow
744 && screen.cur.row >= -nsaved); 777 && screen.cur.row >= top_row);
745#endif 778#endif
746 int row = screen.cur.row; 779 int row = screen.cur.row;
747 780
748 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 781 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
749 782
795 CLEAR_SELECTION (); 828 CLEAR_SELECTION ();
796 } 829 }
797 830
798 if (screen.flags & Screen_WrapNext) 831 if (screen.flags & Screen_WrapNext)
799 { 832 {
800 max_it (line->l, ncol);
801 line->is_longer (1);
802
803 scr_do_wrap (); 833 scr_do_wrap ();
804 834
835 line->l = ncol;
836 line->is_longer (1);
837
805 row = screen.cur.row; 838 row = screen.cur.row;
806 line = &ROW(row); /* _must_ refresh */ 839 line = &ROW(row); /* _must_ refresh */
807 } 840 }
808 841
809 // some utf-8 decoders "decode" surrogate characters: let's fix this. 842 // some utf-8 decoders "decode" surrogate characters: let's fix this.
973/* 1006/*
974 * Process Backspace. Move back the cursor back a position, wrap if have to 1007 * Process Backspace. Move back the cursor back a position, wrap if have to
975 * XTERM_SEQ: CTRL-H 1008 * XTERM_SEQ: CTRL-H
976 */ 1009 */
977void 1010void
978rxvt_term::scr_backspace () 1011rxvt_term::scr_backspace () NOTHROW
979{ 1012{
980 want_refresh = 1; 1013 want_refresh = 1;
981 1014
982 if (screen.cur.col == 0) 1015 if (screen.cur.col == 0)
983 { 1016 {
1001 * Process Horizontal Tab 1034 * Process Horizontal Tab
1002 * count: +ve = forward; -ve = backwards 1035 * count: +ve = forward; -ve = backwards
1003 * XTERM_SEQ: CTRL-I 1036 * XTERM_SEQ: CTRL-I
1004 */ 1037 */
1005void 1038void
1006rxvt_term::scr_tab (int count, bool ht) 1039rxvt_term::scr_tab (int count, bool ht) NOTHROW
1007{ 1040{
1008 int i, x; 1041 int i, x;
1009 1042
1010 want_refresh = 1; 1043 want_refresh = 1;
1011 i = x = screen.cur.col; 1044 i = x = screen.cur.col;
1078 * Move cursor left in row. If we're at the left boundary, shift everything 1111 * Move cursor left in row. If we're at the left boundary, shift everything
1079 * in that row right. Clear left column. 1112 * in that row right. Clear left column.
1080 */ 1113 */
1081#if ENABLE_FRILLS 1114#if ENABLE_FRILLS
1082void 1115void
1083rxvt_term::scr_backindex () 1116rxvt_term::scr_backindex () NOTHROW
1084{ 1117{
1085 if (screen.cur.col > 0) 1118 if (screen.cur.col > 0)
1086 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1119 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1087 else 1120 else
1088 scr_insdel_chars (1, INSERT); 1121 scr_insdel_chars (1, INSERT);
1095 * Move cursor right in row. If we're at the right boundary, shift everything 1128 * Move cursor right in row. If we're at the right boundary, shift everything
1096 * in that row left. Clear right column. 1129 * in that row left. Clear right column.
1097 */ 1130 */
1098#if ENABLE_FRILLS 1131#if ENABLE_FRILLS
1099void 1132void
1100rxvt_term::scr_forwardindex () 1133rxvt_term::scr_forwardindex () NOTHROW
1101{ 1134{
1102 if (screen.cur.col < ncol - 1) 1135 if (screen.cur.col < ncol - 1)
1103 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1136 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1104 else 1137 else
1105 { 1138 {
1118/* ------------------------------------------------------------------------- */ 1151/* ------------------------------------------------------------------------- */
1119/* 1152/*
1120 * Goto Row/Column 1153 * Goto Row/Column
1121 */ 1154 */
1122void 1155void
1123rxvt_term::scr_gotorc (int row, int col, int relative) 1156rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1124{ 1157{
1125 want_refresh = 1; 1158 want_refresh = 1;
1126 ZERO_SCROLLBACK (); 1159 ZERO_SCROLLBACK ();
1127 1160
1128 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1161 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1166/* ------------------------------------------------------------------------- */ 1199/* ------------------------------------------------------------------------- */
1167/* 1200/*
1168 * direction should be UP or DN 1201 * direction should be UP or DN
1169 */ 1202 */
1170void 1203void
1171rxvt_term::scr_index (enum page_dirn direction) 1204rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1172{ 1205{
1173 int dirn; 1206 int dirn;
1174 1207
1175 want_refresh = 1; 1208 want_refresh = 1;
1176 ZERO_SCROLLBACK (); 1209 ZERO_SCROLLBACK ();
1195 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1228 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1196 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1229 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1197 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1230 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1198 */ 1231 */
1199void 1232void
1200rxvt_term::scr_erase_line (int mode) 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1201{ 1234{
1202 unsigned int col, num; 1235 unsigned int col, num;
1203 1236
1204 want_refresh = 1; 1237 want_refresh = 1;
1205 ZERO_SCROLLBACK (); 1238 ZERO_SCROLLBACK ();
1249 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1282 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1250 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1283 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1284 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1252 */ 1285 */
1253void 1286void
1254rxvt_term::scr_erase_screen (int mode) 1287rxvt_term::scr_erase_screen (int mode) NOTHROW
1255{ 1288{
1256 int num; 1289 int num;
1257 int32_t row; 1290 int32_t row;
1258 rend_t ren; 1291 rend_t ren;
1259 XGCValues gcvalue; 1292 XGCValues gcvalue;
1319 } 1352 }
1320} 1353}
1321 1354
1322#if ENABLE_FRILLS 1355#if ENABLE_FRILLS
1323void 1356void
1324rxvt_term::scr_erase_savelines () 1357rxvt_term::scr_erase_savelines () NOTHROW
1325{ 1358{
1326 want_refresh = 1; 1359 want_refresh = 1;
1327 ZERO_SCROLLBACK (); 1360 ZERO_SCROLLBACK ();
1328 1361
1329 nsaved = 0; 1362 top_row = 0;
1330} 1363}
1331#endif 1364#endif
1332 1365
1333/* ------------------------------------------------------------------------- */ 1366/* ------------------------------------------------------------------------- */
1334/* 1367/*
1335 * Fill the screen with `E's 1368 * Fill the screen with `E's
1336 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1369 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1337 */ 1370 */
1338void 1371void
1339rxvt_term::scr_E () 1372rxvt_term::scr_E () NOTHROW
1340{ 1373{
1341 rend_t fs; 1374 rend_t fs;
1342 1375
1343 want_refresh = 1; 1376 want_refresh = 1;
1344 ZERO_SCROLLBACK (); 1377 ZERO_SCROLLBACK ();
1365/* ------------------------------------------------------------------------- */ 1398/* ------------------------------------------------------------------------- */
1366/* 1399/*
1367 * Insert/Delete <count> lines 1400 * Insert/Delete <count> lines
1368 */ 1401 */
1369void 1402void
1370rxvt_term::scr_insdel_lines (int count, int insdel) 1403rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1371{ 1404{
1372 int end; 1405 int end;
1373 1406
1374 ZERO_SCROLLBACK (); 1407 ZERO_SCROLLBACK ();
1375 1408
1395/* ------------------------------------------------------------------------- */ 1428/* ------------------------------------------------------------------------- */
1396/* 1429/*
1397 * Insert/Delete <count> characters from the current position 1430 * Insert/Delete <count> characters from the current position
1398 */ 1431 */
1399void 1432void
1400rxvt_term::scr_insdel_chars (int count, int insdel) 1433rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1401{ 1434{
1402 int col, row; 1435 int col, row;
1403 rend_t tr; 1436 rend_t tr;
1404 1437
1405 want_refresh = 1; 1438 want_refresh = 1;
1493/* 1526/*
1494 * Set the scrolling region 1527 * Set the scrolling region
1495 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1528 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1496 */ 1529 */
1497void 1530void
1498rxvt_term::scr_scroll_region (int top, int bot) 1531rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1499{ 1532{
1500 max_it (top, 0); 1533 max_it (top, 0);
1501 min_it (bot, nrow - 1); 1534 min_it (bot, nrow - 1);
1502 1535
1503 if (top > bot) 1536 if (top > bot)
1513 * Make the cursor visible/invisible 1546 * Make the cursor visible/invisible
1514 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1547 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1515 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1548 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1516 */ 1549 */
1517void 1550void
1518rxvt_term::scr_cursor_visible (int mode) 1551rxvt_term::scr_cursor_visible (int mode) NOTHROW
1519{ 1552{
1520 want_refresh = 1; 1553 want_refresh = 1;
1521 1554
1522 if (mode) 1555 if (mode)
1523 screen.flags |= Screen_VisibleCursor; 1556 screen.flags |= Screen_VisibleCursor;
1530 * Set/unset automatic wrapping 1563 * Set/unset automatic wrapping
1531 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1564 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1532 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1565 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1533 */ 1566 */
1534void 1567void
1535rxvt_term::scr_autowrap (int mode) 1568rxvt_term::scr_autowrap (int mode) NOTHROW
1536{ 1569{
1537 if (mode) 1570 if (mode)
1538 screen.flags |= Screen_Autowrap; 1571 screen.flags |= Screen_Autowrap;
1539 else 1572 else
1540 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1573 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1549 * and the cursor cannot be moved outside. 1582 * and the cursor cannot be moved outside.
1550 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1583 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1551 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1584 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1552 */ 1585 */
1553void 1586void
1554rxvt_term::scr_relative_origin (int mode) 1587rxvt_term::scr_relative_origin (int mode) NOTHROW
1555{ 1588{
1556 if (mode) 1589 if (mode)
1557 screen.flags |= Screen_Relative; 1590 screen.flags |= Screen_Relative;
1558 else 1591 else
1559 screen.flags &= ~Screen_Relative; 1592 screen.flags &= ~Screen_Relative;
1566 * Set insert/replace mode 1599 * Set insert/replace mode
1567 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1600 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1568 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1601 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1569 */ 1602 */
1570void 1603void
1571rxvt_term::scr_insert_mode (int mode) 1604rxvt_term::scr_insert_mode (int mode) NOTHROW
1572{ 1605{
1573 if (mode) 1606 if (mode)
1574 screen.flags |= Screen_Insert; 1607 screen.flags |= Screen_Insert;
1575 else 1608 else
1576 screen.flags &= ~Screen_Insert; 1609 screen.flags &= ~Screen_Insert;
1582 * XTERM_SEQ: Set tab at current column : ESC H 1615 * XTERM_SEQ: Set tab at current column : ESC H
1583 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1616 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1584 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1617 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1585 */ 1618 */
1586void 1619void
1587rxvt_term::scr_set_tab (int mode) 1620rxvt_term::scr_set_tab (int mode) NOTHROW
1588{ 1621{
1589 if (mode < 0) 1622 if (mode < 0)
1590 memset (tabs, 0, ncol * sizeof (char)); 1623 memset (tabs, 0, ncol * sizeof (char));
1591 else if (screen.cur.col < ncol) 1624 else if (screen.cur.col < ncol)
1592 tabs [screen.cur.col] = !!mode; 1625 tabs [screen.cur.col] = !!mode;
1597 * Set reverse/normal video 1630 * Set reverse/normal video
1598 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1631 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1599 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1632 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1600 */ 1633 */
1601void 1634void
1602rxvt_term::scr_rvideo_mode (int mode) 1635rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1603{ 1636{
1604 XGCValues gcvalue; 1637 rvideo_mode = on;
1605 1638
1639#ifndef NO_BELL
1640 on ^= rvideo_bell;
1641#endif
1642
1606 if (rvideo != mode) 1643 if (rvideo_state != on)
1607 { 1644 {
1608 rvideo = mode; 1645 rvideo_state = on;
1646
1609 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1647 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1610#if XPM_BACKGROUND 1648#if XPM_BACKGROUND
1611 if (bgPixmap.pixmap == None) 1649 if (bgPixmap.pixmap == None)
1612#endif 1650#endif
1613#if TRANSPARENT 1651#if TRANSPARENT
1614 if (! OPTION (Opt_transparent) || am_transparent == 0) 1652 if (!OPTION (Opt_transparent) || am_transparent == 0)
1615#endif 1653#endif
1616 XSetWindowBackground (display->display, vt, 1654 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1617 pix_colors[Color_bg]);
1618 1655
1656 XGCValues gcvalue;
1619 gcvalue.foreground = pix_colors[Color_fg]; 1657 gcvalue.foreground = pix_colors[Color_fg];
1620 gcvalue.background = pix_colors[Color_bg]; 1658 gcvalue.background = pix_colors[Color_bg];
1621 XChangeGC (display->display, gc, GCBackground | GCForeground, 1659 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1622 &gcvalue); 1660
1623 scr_clear (); 1661 scr_clear ();
1624 scr_touch (true); 1662 scr_touch (true);
1625 } 1663 }
1626} 1664}
1627 1665
1629/* 1667/*
1630 * Report current cursor position 1668 * Report current cursor position
1631 * XTERM_SEQ: Report position: ESC [ 6 n 1669 * XTERM_SEQ: Report position: ESC [ 6 n
1632 */ 1670 */
1633void 1671void
1634rxvt_term::scr_report_position () 1672rxvt_term::scr_report_position () NOTHROW
1635{ 1673{
1636 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1674 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1637} 1675}
1638 1676
1639/* ------------------------------------------------------------------------- * 1677/* ------------------------------------------------------------------------- *
1642 1680
1643/* 1681/*
1644 * Set font style 1682 * Set font style
1645 */ 1683 */
1646void 1684void
1647rxvt_term::set_font_style () 1685rxvt_term::set_font_style () NOTHROW
1648{ 1686{
1649#if 0 1687#if 0
1650 switch (charsets [screen.charset]) 1688 switch (charsets [screen.charset])
1651 { 1689 {
1652 case '0': /* DEC Special Character & Line Drawing Set */ 1690 case '0': /* DEC Special Character & Line Drawing Set */
1674 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1712 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1675 * XTERM_SEQ: Invoke G2 character set: ESC N 1713 * XTERM_SEQ: Invoke G2 character set: ESC N
1676 * XTERM_SEQ: Invoke G3 character set: ESC O 1714 * XTERM_SEQ: Invoke G3 character set: ESC O
1677 */ 1715 */
1678void 1716void
1679rxvt_term::scr_charset_choose (int set) 1717rxvt_term::scr_charset_choose (int set) NOTHROW
1680{ 1718{
1681 screen.charset = set; 1719 screen.charset = set;
1682 set_font_style (); 1720 set_font_style ();
1683} 1721}
1684 1722
1690 * XTERM_SEQ: Set G2 character set: ESC * <C> 1728 * XTERM_SEQ: Set G2 character set: ESC * <C>
1691 * XTERM_SEQ: Set G3 character set: ESC + <C> 1729 * XTERM_SEQ: Set G3 character set: ESC + <C>
1692 * See set_font_style for possible values for <C> 1730 * See set_font_style for possible values for <C>
1693 */ 1731 */
1694void 1732void
1695rxvt_term::scr_charset_set (int set, unsigned int ch) 1733rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1696{ 1734{
1697 charsets[set] = (unsigned char)ch; 1735 charsets[set] = (unsigned char)ch;
1698 set_font_style (); 1736 set_font_style ();
1699} 1737}
1700 1738
1705 1743
1706/* 1744/*
1707 * refresh matching text. 1745 * refresh matching text.
1708 */ 1746 */
1709bool 1747bool
1710rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1748rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1711{ 1749{
1712 bool found = false; 1750 bool found = false;
1713 1751
1714 for (int i = 0; i < nrow; i++) 1752 for (int i = 0; i < nrow; i++)
1715 { 1753 {
1735 PART_END, 1773 PART_END,
1736 RC_COUNT 1774 RC_COUNT
1737}; 1775};
1738 1776
1739void 1777void
1740rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1778rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1741{ 1779{
1742 int i; 1780 int i;
1743 row_col_t rc[RC_COUNT]; 1781 row_col_t rc[RC_COUNT];
1744 1782
1745 if (!drawn_buf) /* sanity check */ 1783 if (!drawn_buf) /* sanity check */
1768 } 1806 }
1769 1807
1770 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1808 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1771 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1809 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1772 1810
1811 num_scr_allow = 0;
1812
1773 if (refresh) 1813 if (refresh)
1774 scr_refresh (SLOW_REFRESH); 1814 scr_refresh ();
1775} 1815}
1776 1816
1777/* ------------------------------------------------------------------------- */ 1817/* ------------------------------------------------------------------------- */
1778/* 1818/*
1779 * Refresh the entire screen 1819 * Refresh the entire screen
1780 */ 1820 */
1781void 1821void
1782rxvt_term::scr_touch (bool refresh) 1822rxvt_term::scr_touch (bool refresh) NOTHROW
1783{ 1823{
1784 scr_expose (0, 0, width, height, refresh); 1824 scr_expose (0, 0, width, height, refresh);
1785} 1825}
1786 1826
1787/* ------------------------------------------------------------------------- */ 1827/* ------------------------------------------------------------------------- */
1788/* 1828/*
1789 * Move the display so that the line represented by scrollbar value Y is at 1829 * Move the display so that the line represented by scrollbar value Y is at
1790 * the top of the screen 1830 * the top of the screen
1791 */ 1831 */
1792int 1832void
1793rxvt_term::scr_move_to (int y, int len) 1833rxvt_term::scr_move_to (int y, int len) NOTHROW
1794{ 1834{
1795 long p = 0; 1835 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1796 unsigned int oldviewstart;
1797
1798 oldviewstart = view_start;
1799
1800 if (y < len)
1801 {
1802 p = (nrow + nsaved) * (len - y) / len;
1803 p -= (long) (nrow - 1);
1804 p = max (p, 0);
1805 }
1806
1807 view_start = (unsigned int)min (p, nsaved);
1808
1809 return scr_changeview (oldviewstart);
1810} 1836}
1811 1837
1812/* ------------------------------------------------------------------------- */ 1838/* ------------------------------------------------------------------------- */
1813/* 1839/*
1814 * Page the screen up/down nlines 1840 * Page the screen up/down nlines
1815 * direction should be UP or DN 1841 * direction should be UP or DN
1816 */ 1842 */
1817int 1843bool
1818rxvt_term::scr_page (enum page_dirn direction, int nlines) 1844rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1819{ 1845{
1820 int n; 1846 int new_view_start =
1821 unsigned int oldviewstart;
1822
1823 oldviewstart = view_start;
1824
1825 if (direction == UP)
1826 {
1827 n = view_start + nlines;
1828 view_start = min (n, nsaved);
1829 }
1830 else
1831 {
1832 n = view_start - nlines; 1847 direction == UP ? view_start - nlines
1833 view_start = max (n, 0); 1848 : view_start + nlines;
1834 }
1835 1849
1836 return scr_changeview (oldviewstart); 1850 return scr_changeview (new_view_start);
1837} 1851}
1838 1852
1839int 1853bool
1840rxvt_term::scr_changeview (unsigned int oldviewstart) 1854rxvt_term::scr_changeview (int new_view_start) NOTHROW
1841{ 1855{
1856 clamp_it (new_view_start, top_row, 0);
1857
1842 if (view_start != oldviewstart) 1858 if (new_view_start == view_start)
1843 { 1859 return false;
1860
1861 num_scr += new_view_start - view_start;
1862 view_start = new_view_start;
1863 want_refresh = 1;
1864
1844 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1865 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1845 1866
1846 want_refresh = 1; 1867 return true;
1847 num_scr -= (view_start - oldviewstart);
1848 }
1849
1850 return (int)view_start - (int)oldviewstart;
1851} 1868}
1852 1869
1853/* ------------------------------------------------------------------------- */ 1870#ifndef NO_BELL
1854void 1871void
1872rxvt_term::bell_cb (time_watcher &w)
1873{
1874 rvideo_bell = false;
1875 scr_rvideo_mode (rvideo_mode);
1876}
1877#endif
1878
1879/* ------------------------------------------------------------------------- */
1880void
1855rxvt_term::scr_bell () 1881rxvt_term::scr_bell () NOTHROW
1856{ 1882{
1857#ifndef NO_BELL 1883#ifndef NO_BELL
1858 1884
1859# ifndef NO_MAPALERT 1885# ifndef NO_MAPALERT
1860# ifdef MAPALERT_OPTION 1886# ifdef MAPALERT_OPTION
1863 XMapWindow (display->display, parent[0]); 1889 XMapWindow (display->display, parent[0]);
1864# endif 1890# endif
1865 1891
1866 if (OPTION (Opt_visualBell)) 1892 if (OPTION (Opt_visualBell))
1867 { 1893 {
1868 scr_rvideo_mode (!rvideo); /* refresh also done */ 1894 rvideo_bell = true;
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1895 scr_rvideo_mode (rvideo_mode);
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1896 display->flush ();
1897
1898 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1871 } 1899 }
1872 else 1900 else
1873 XBell (display->display, 0); 1901 XBell (display->display, 0);
1874 1902
1875#endif 1903#endif
1876} 1904}
1877 1905
1878/* ------------------------------------------------------------------------- */ 1906/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1907/* ARGSUSED */
1880void 1908void
1881rxvt_term::scr_printscreen (int fullhist) 1909rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1910{
1883#ifdef PRINTPIPE 1911#ifdef PRINTPIPE
1884 int nrows, row_start; 1912 int nrows, row_start;
1885 FILE *fd; 1913 FILE *fd;
1886 1914
1887 if ((fd = popen_printer ()) == NULL) 1915 if ((fd = popen_printer ()) == NULL)
1888 return; 1916 return;
1889 1917
1890 if (fullhist) 1918 if (fullhist)
1891 { 1919 {
1892 nrows = nrow + nsaved; 1920 nrows = nrow - top_row;
1893 row_start = -nsaved; 1921 row_start = top_row;
1894 } 1922 }
1895 else 1923 else
1896 { 1924 {
1897 nrows = nrow; 1925 nrows = nrow;
1898 row_start = -view_start; 1926 row_start = view_start;
1899 } 1927 }
1900 1928
1901 wctomb (0, 0); 1929 wctomb (0, 0);
1902 1930
1903 for (int r1 = 0; r1 < nrows; r1++) 1931 for (int r1 = 0; r1 < nrows; r1++)
1935 * Refresh the screen 1963 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 1964 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 1965 * screen.text/screen.rend contain what the screen will change to.
1938 */ 1966 */
1939void 1967void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1968rxvt_term::scr_refresh () NOTHROW
1941{ 1969{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 1970 unsigned char must_clear, /* use draw_string not draw_image_string */
1943 showcursor; /* show the cursor */ 1971 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 1972 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 1973 ocrow; /* old cursor row */
2031 2059
2032 /* make sure no outline cursor is left around */ 2060 /* make sure no outline cursor is left around */
2033 setoldcursor = 0; 2061 setoldcursor = 0;
2034 if (ocrow != -1) 2062 if (ocrow != -1)
2035 { 2063 {
2036 if (screen.cur.row + view_start != ocrow 2064 if (screen.cur.row - view_start != ocrow
2037 || screen.cur.col != oldcursor.col) 2065 || screen.cur.col != oldcursor.col)
2038 { 2066 {
2039 if (ocrow < nrow 2067 if (ocrow < nrow
2040 && oldcursor.col < ncol) 2068 && oldcursor.col < ncol)
2041 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2069 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2049 else if (!focus) 2077 else if (!focus)
2050 setoldcursor = 1; 2078 setoldcursor = 1;
2051 2079
2052 if (setoldcursor) 2080 if (setoldcursor)
2053 { 2081 {
2054 if (screen.cur.row + view_start >= nrow) 2082 if (screen.cur.row - view_start >= nrow)
2055 oldcursor.row = -1; 2083 oldcursor.row = -1;
2056 else 2084 else
2057 { 2085 {
2058 oldcursor.row = screen.cur.row + view_start; 2086 oldcursor.row = screen.cur.row - view_start;
2059 oldcursor.col = screen.cur.col; 2087 oldcursor.col = screen.cur.col;
2060 } 2088 }
2061 } 2089 }
2062 } 2090 }
2063 2091
2069#ifndef NO_SLOW_LINK_SUPPORT 2097#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2098 /*
2071 * D: CopyArea pass - very useful for slower links 2099 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2100 * This has been deliberately kept simple.
2073 */ 2101 */
2074 i = num_scr;
2075 if (!display->is_local 2102 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2103 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2104 && abs (num_scr) < nrow && !must_clear)
2078 { 2105 {
2079 int16_t nits; 2106 int16_t nits;
2080 int j; 2107 int j;
2081 int len, wlen; 2108 int len, wlen;
2109 dLocal (int, num_scr);
2082 2110
2083 j = nrow; 2111 j = nrow;
2084 wlen = len = -1; 2112 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2113 row = i > 0 ? 0 : j - 1;
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2114 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2087 { 2115 {
2088 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2116 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2089 { 2117 {
2090 line_t s = ROW(row - view_start); 2118 line_t s = ROW(view_start + row);
2091 line_t d = drawn_buf[row]; 2119 line_t d = drawn_buf[row];
2092 line_t d2 = drawn_buf[row + i]; 2120 line_t d2 = drawn_buf[row + i];
2093 2121
2094 for (nits = 0, col = ncol; col--; ) 2122 for (nits = 0, col = ncol; col--; )
2095 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2123 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2133 /* 2161 /*
2134 * E: main pass across every character 2162 * E: main pass across every character
2135 */ 2163 */
2136 for (row = 0; row < nrow; row++) 2164 for (row = 0; row < nrow; row++)
2137 { 2165 {
2138 text_t *stp = ROW(row - view_start).t; 2166 text_t *stp = ROW(view_start + row).t;
2139 rend_t *srp = ROW(row - view_start).r; 2167 rend_t *srp = ROW(view_start + row).r;
2140 text_t *dtp = drawn_buf[row].t; 2168 text_t *dtp = drawn_buf[row].t;
2141 rend_t *drp = drawn_buf[row].r; 2169 rend_t *drp = drawn_buf[row].r;
2142 2170
2143 /* 2171 /*
2144 * E2: OK, now the real pass 2172 * E2: OK, now the real pass
2381 /* 2409 /*
2382 * H: cleanup selection 2410 * H: cleanup selection
2383 */ 2411 */
2384 scr_reverse_selection (); 2412 scr_reverse_selection ();
2385 2413
2386 if (refresh_type & SMOOTH_REFRESH)
2387 XFlush (display->display);
2388
2389 num_scr = 0; 2414 num_scr = 0;
2390 num_scr_allow = 1; 2415 num_scr_allow = 1;
2391} 2416}
2392 2417
2393void 2418void
2394rxvt_term::scr_remap_chars (line_t &l) 2419rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2395{ 2420{
2396 if (!l.t) 2421 if (!l.t)
2397 return; 2422 return;
2398 2423
2399 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2424 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2401 for (int i = ncol; i--; ) 2426 for (int i = ncol; i--; )
2402 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2427 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2403} 2428}
2404 2429
2405void 2430void
2406rxvt_term::scr_remap_chars () 2431rxvt_term::scr_remap_chars () NOTHROW
2407{ 2432{
2408 for (int i = total_rows; i--; ) 2433 for (int i = total_rows; i--; )
2409 scr_remap_chars (row_buf [i]); 2434 scr_remap_chars (row_buf [i]);
2410 2435
2411 for (int i = nrow; i--; ) 2436 for (int i = nrow; i--; )
2414 scr_remap_chars (swap_buf [i]); 2439 scr_remap_chars (swap_buf [i]);
2415 } 2440 }
2416} 2441}
2417 2442
2418void 2443void
2419rxvt_term::scr_recolour () 2444rxvt_term::scr_recolour () NOTHROW
2420{ 2445{
2421 if (1 2446 if (1
2422#if TRANSPARENT 2447#if TRANSPARENT
2423 && !am_transparent 2448 && !am_transparent
2424#endif 2449#endif
2445 want_refresh = 1; 2470 want_refresh = 1;
2446} 2471}
2447 2472
2448/* ------------------------------------------------------------------------- */ 2473/* ------------------------------------------------------------------------- */
2449void 2474void
2450rxvt_term::scr_clear (bool really) 2475rxvt_term::scr_clear (bool really) NOTHROW
2451{ 2476{
2452 if (!mapped) 2477 if (!mapped)
2453 return; 2478 return;
2454 2479
2455 num_scr_allow = 0; 2480 num_scr_allow = 0;
2457 2482
2458 if (really) 2483 if (really)
2459 XClearWindow (display->display, vt); 2484 XClearWindow (display->display, vt);
2460} 2485}
2461 2486
2462/* ------------------------------------------------------------------------- */
2463void 2487void
2488rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2489{
2490 int view_end = view_start + nrow;
2491 int row, col;
2492
2493 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2494 {
2495 text_t *stp = ROW(row).t;
2496 rend_t *srp = ROW(row).r;
2497
2498 for (col = beg_col; col < end_col; col++)
2499 srp[col] ^= rstyle1;
2500
2501 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2502 srp[col] ^= rstyle2;
2503
2504 if (++col < end_col)
2505 srp[col] ^= rstyle2;
2506 }
2507}
2508
2509void
2510rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2511{
2512 int view_end = view_start + nrow;
2513 int row, col;
2514
2515 if (beg_row >= view_start)
2516 {
2517 col = beg_col;
2518 row = beg_row;
2519 }
2520 else
2521 {
2522 col = 0;
2523 row = view_start;
2524 }
2525
2526 for (; row < min (end_row, view_end); row++, col = 0)
2527 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2528 srp[col] ^= rstyle;
2529
2530 if (row == end_row)
2531 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2532 srp[col] ^= rstyle;
2533}
2534
2535/* ------------------------------------------------------------------------- */
2536void
2464rxvt_term::scr_reverse_selection () 2537rxvt_term::scr_reverse_selection () NOTHROW
2465{ 2538{
2466 if (selection.op 2539 if (selection.op
2467 && current_screen == selection.screen 2540 && current_screen == selection.screen
2468 && selection.end.row >= -view_start) 2541 && selection.end.row >= view_start)
2469 { 2542 {
2470 int view_end = -view_start + nrow;
2471 int row, col;
2472
2473#if ENABLE_FRILLS 2543#if ENABLE_FRILLS
2474 if (selection.rect) 2544 if (selection.rect)
2475 { 2545 scr_xor_rect (selection.beg.row, selection.beg.col,
2476 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2546 selection.end.row, selection.end.col,
2477 { 2547 RS_RVid, RS_RVid | RS_Uline);
2478 text_t *stp = ROW(row).t;
2479 rend_t *srp = ROW(row).r;
2480
2481 for (col = selection.beg.col; col < selection.end.col; col++)
2482 srp[col] ^= RS_RVid;
2483
2484 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2485 srp[col] ^= RS_RVid | RS_Uline;
2486
2487 if (++col < selection.end.col)
2488 srp[col] ^= RS_RVid | RS_Uline;
2489 }
2490 }
2491 else 2548 else
2492#endif 2549#endif
2493 { 2550 scr_xor_span (selection.beg.row, selection.beg.col,
2494 if (selection.beg.row >= -view_start) 2551 selection.end.row, selection.end.col,
2495 { 2552 RS_RVid);
2496 col = selection.beg.col;
2497 row = selection.beg.row;
2498 }
2499 else
2500 {
2501 col = 0;
2502 row = -view_start;
2503 }
2504
2505 for (; row < min (selection.end.row, view_end); row++, col = 0)
2506 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2507 srp[col] ^= RS_RVid;
2508
2509 if (row == selection.end.row)
2510 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2511 srp[col] ^= RS_RVid;
2512 }
2513 } 2553 }
2514} 2554}
2515 2555
2516/* ------------------------------------------------------------------------- */ 2556/* ------------------------------------------------------------------------- */
2517/* 2557/*
2518 * Dump the whole scrollback and screen to the passed filedescriptor. The 2558 * Dump the whole scrollback and screen to the passed filedescriptor. The
2519 * invoking routine must close the fd. 2559 * invoking routine must close the fd.
2520 */ 2560 */
2521#if 0 2561#if 0
2522void 2562void
2523rxvt_term::scr_dump (int fd) 2563rxvt_term::scr_dump (int fd) NOTHROW
2524{ 2564{
2525 int row, wrote; 2565 int row, wrote;
2526 unsigned int width, towrite; 2566 unsigned int width, towrite;
2527 char r1[] = "\n"; 2567 char r1[] = "\n";
2528 2568
2547 2587
2548/* ------------------------------------------------------------------------- * 2588/* ------------------------------------------------------------------------- *
2549 * CHARACTER SELECTION * 2589 * CHARACTER SELECTION *
2550 * ------------------------------------------------------------------------- */ 2590 * ------------------------------------------------------------------------- */
2551void 2591void
2552rxvt_term::selection_check (int check_more) 2592rxvt_term::selection_check (int check_more) NOTHROW
2553{ 2593{
2554 row_col_t pos; 2594 row_col_t pos;
2555 2595
2556 if (!selection.op) 2596 if (!selection.op)
2557 return; 2597 return;
2558 2598
2559 pos.row = pos.col = 0; 2599 pos.row = pos.col = 0;
2560 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2600 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2561 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2601 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2562 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2602 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2563 || (check_more == 1 2603 || (check_more == 1
2564 && current_screen == selection.screen 2604 && current_screen == selection.screen
2565 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2605 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2566 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2606 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2567 || (check_more == 2 2607 || (check_more == 2
2578/* ------------------------------------------------------------------------- */ 2618/* ------------------------------------------------------------------------- */
2579/* 2619/*
2580 * Paste a selection direct to the command fd 2620 * Paste a selection direct to the command fd
2581 */ 2621 */
2582void 2622void
2583rxvt_term::paste (char *data, unsigned int len) 2623rxvt_term::paste (char *data, unsigned int len) NOTHROW
2584{ 2624{
2585 /* convert normal newline chars into common keyboard Return key sequence */ 2625 /* convert normal newline chars into common keyboard Return key sequence */
2586 for (unsigned int i = 0; i < len; i++) 2626 for (unsigned int i = 0; i < len; i++)
2587 if (data[i] == C0_LF) 2627 if (data[i] == C0_LF)
2588 data[i] = C0_CR; 2628 data[i] = C0_CR;
2594/* 2634/*
2595 * Respond to a notification that a primary selection has been sent 2635 * Respond to a notification that a primary selection has been sent
2596 * EXT: SelectionNotify 2636 * EXT: SelectionNotify
2597 */ 2637 */
2598void 2638void
2599rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2639rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2600{ 2640{
2601 if (prop == None) /* check for failed XConvertSelection */ 2641 if (prop == None) /* check for failed XConvertSelection */
2602 { 2642 {
2603 if ((selection_type & Sel_CompoundText)) 2643 if ((selection_type & Sel_CompoundText))
2604 { 2644 {
2756 if (selection_wait == Sel_normal) 2796 if (selection_wait == Sel_normal)
2757 selection_wait = Sel_none; 2797 selection_wait = Sel_none;
2758} 2798}
2759 2799
2760void 2800void
2761rxvt_term::incr_cb (time_watcher &w) 2801rxvt_term::incr_cb (time_watcher &w) NOTHROW
2762{ 2802{
2763 selection_wait = Sel_none; 2803 selection_wait = Sel_none;
2764 2804
2765 incr_buf_size = 0; 2805 incr_buf_size = 0;
2766 free (incr_buf); 2806 free (incr_buf);
2767 2807
2768 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2808 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2769} 2809}
2770 2810
2771void 2811void
2772rxvt_term::selection_property (Window win, Atom prop) 2812rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2773{ 2813{
2774 if (prop == None || selection_wait != Sel_incr) 2814 if (prop == None || selection_wait != Sel_incr)
2775 return; 2815 return;
2776 2816
2777 selection_paste (win, prop, true); 2817 selection_paste (win, prop, true);
2786 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2826 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2787 * will auto fallback to CUT_BUFFER0 2827 * will auto fallback to CUT_BUFFER0
2788 * EXT: button 2 release 2828 * EXT: button 2 release
2789 */ 2829 */
2790void 2830void
2791rxvt_term::selection_request (Time tm, int x, int y) 2831rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2792{ 2832{
2793 if (x < 0 || x >= width || y < 0 || y >= height) 2833 if (selection.text && selnum == Sel_Primary)
2794 return; /* outside window */
2795
2796 if (selection.text)
2797 { /* internal selection */ 2834 { /* internal selection */
2798 char *str = rxvt_wcstombs (selection.text, selection.len); 2835 char *str = rxvt_wcstombs (selection.text, selection.len);
2799 paste (str, strlen (str)); 2836 paste (str, strlen (str));
2800 free (str); 2837 free (str);
2801 return; 2838 return;
2802 } 2839 }
2803 else 2840 else
2804 { 2841 {
2805 int i;
2806
2807 selection_request_time = tm; 2842 selection_request_time = tm;
2808 selection_wait = Sel_normal; 2843 selection_wait = Sel_normal;
2809 2844
2810 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2811 {
2812#if X_HAVE_UTF8_STRING 2845#if X_HAVE_UTF8_STRING
2813 selection_type = Sel_UTF8String; 2846 selection_type = Sel_UTF8String;
2814 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2847 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2815 return; 2848 return;
2816#else 2849#else
2817 selection_type = Sel_CompoundText; 2850 selection_type = Sel_CompoundText;
2818 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2851 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2819 return; 2852 return;
2820#endif 2853#endif
2821 }
2822 } 2854 }
2823 2855
2824 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2856 selection_wait = Sel_none; /* don't loop in selection_paste () */
2825 selection_paste (display->root, XA_CUT_BUFFER0, false); 2857 selection_paste (display->root, XA_CUT_BUFFER0, false);
2826} 2858}
2827 2859
2828int 2860int
2829rxvt_term::selection_request_other (Atom target, int selnum) 2861rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2830{ 2862{
2831 Atom sel; 2863 Atom sel;
2832 2864
2833 selection_type |= selnum; 2865 selection_type |= selnum;
2834 2866
2853/* 2885/*
2854 * Clear all selected text 2886 * Clear all selected text
2855 * EXT: SelectionClear 2887 * EXT: SelectionClear
2856 */ 2888 */
2857void 2889void
2858rxvt_term::selection_clear () 2890rxvt_term::selection_clear () NOTHROW
2859{ 2891{
2860 want_refresh = 1; 2892 want_refresh = 1;
2861 free (selection.text); 2893 free (selection.text);
2862 selection.text = NULL; 2894 selection.text = NULL;
2863 selection.len = 0; 2895 selection.len = 0;
2998 3030
2999 selection_grab (tm); 3031 selection_grab (tm);
3000} 3032}
3001 3033
3002bool 3034bool
3003rxvt_term::selection_grab (Time tm) 3035rxvt_term::selection_grab (Time tm) NOTHROW
3004{ 3036{
3005 selection_time = tm; 3037 selection_time = tm;
3006 3038
3007 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3039 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3008 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3040 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3009 { 3041 {
3010 display->set_selection_owner (this); 3042 display->set_selection_owner (this);
3011 return true; 3043 return true;
3012 } 3044 }
3013 else 3045 else
3046 {
3047 selection_clear ();
3014 return false; 3048 return false;
3049 }
3015 3050
3016#if 0 3051#if 0
3017 XTextProperty ct; 3052 XTextProperty ct;
3018 3053
3019 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3054 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
3028/* 3063/*
3029 * Mark or select text based upon number of clicks: 1, 2, or 3 3064 * Mark or select text based upon number of clicks: 1, 2, or 3
3030 * EXT: button 1 press 3065 * EXT: button 1 press
3031 */ 3066 */
3032void 3067void
3033rxvt_term::selection_click (int clicks, int x, int y) 3068rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3034{ 3069{
3035 clicks = ((clicks - 1) % 3) + 1; 3070 clicks = ((clicks - 1) % 3) + 1;
3036 selection.clicks = clicks; /* save clicks so extend will work */ 3071 selection.clicks = clicks; /* save clicks so extend will work */
3037 3072
3073 if (clicks == 2 && !selection.rect
3074 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3075 {
3076 MEvent.clicks = 1; // what a mess
3077 selection.screen = current_screen;
3078 selection.op = SELECTION_CONT;
3079 return;
3080 }
3081
3038 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3082 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3039 3083
3040 if (clicks == 2 || clicks == 3) 3084 if (clicks == 2 || clicks == 3)
3041 selection_extend_colrow (selection.mark.col, 3085 selection_extend_colrow (selection.mark.col,
3042 selection.mark.row + view_start, 3086 selection.mark.row - view_start,
3043 0, /* button 3 */ 3087 0, /* button 3 */
3044 1, /* button press */ 3088 1, /* button press */
3045 0); /* click change */ 3089 0); /* click change */
3046} 3090}
3047 3091
3048/* ------------------------------------------------------------------------- */ 3092/* ------------------------------------------------------------------------- */
3049/* 3093/*
3050 * Mark a selection at the specified col/row 3094 * Mark a selection at the specified col/row
3051 */ 3095 */
3052void 3096void
3053rxvt_term::selection_start_colrow (int col, int row) 3097rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3054{ 3098{
3055 want_refresh = 1; 3099 want_refresh = 1;
3056 3100
3057 selection.mark.row = row - view_start; 3101 selection.mark.row = row + view_start;
3058 selection.mark.col = col; 3102 selection.mark.col = col;
3059 3103
3060 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3104 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3061 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3105 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3062 3106
3063 while (selection.mark.col > 0 3107 while (selection.mark.col > 0
3064 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3108 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3065 --selection.mark.col; 3109 --selection.mark.col;
3084#define DELIMIT_TEXT(x) \ 3128#define DELIMIT_TEXT(x) \
3085 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3129 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3086#define DELIMIT_REND(x) 1 3130#define DELIMIT_REND(x) 1
3087 3131
3088void 3132void
3089rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3133rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3090{ 3134{
3091 int col, row, dirnadd, tcol, trow, w1, w2; 3135 int col, row, dirnadd, tcol, trow, w1, w2;
3092 row_col_t bound; 3136 row_col_t bound;
3093 text_t *stp; 3137 text_t *stp;
3094 rend_t *srp; 3138 rend_t *srp;
3095 3139
3096 if (dirn == UP) 3140 if (dirn == UP)
3097 { 3141 {
3098 bound.row = - nsaved - 1; 3142 bound.row = top_row - 1;
3099 bound.col = 0; 3143 bound.col = 0;
3100 dirnadd = -1; 3144 dirnadd = -1;
3101 } 3145 }
3102 else 3146 else
3103 { 3147 {
3168 * flag == 0 ==> button 1 3212 * flag == 0 ==> button 1
3169 * flag == 1 ==> button 3 press 3213 * flag == 1 ==> button 3 press
3170 * flag == 2 ==> button 3 motion 3214 * flag == 2 ==> button 3 motion
3171 */ 3215 */
3172void 3216void
3173rxvt_term::selection_extend (int x, int y, int flag) 3217rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3174{ 3218{
3175 int col = clamp (Pixel2Col (x), 0, ncol); 3219 int col = clamp (Pixel2Col (x), 0, ncol);
3176 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3220 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3177 3221
3178 /* 3222 /*
3181 * select nothing. Otherwise, if we're to the right of the mark, you have to 3225 * select nothing. Otherwise, if we're to the right of the mark, you have to
3182 * be _past_ a character for it to be selected. 3226 * be _past_ a character for it to be selected.
3183 */ 3227 */
3184 if (((selection.clicks % 3) == 1) && !flag 3228 if (((selection.clicks % 3) == 1) && !flag
3185 && (col == selection.mark.col 3229 && (col == selection.mark.col
3186 && (row == selection.mark.row + view_start))) 3230 && (row == selection.mark.row - view_start)))
3187 { 3231 {
3188 /* select nothing */ 3232 /* select nothing */
3189 selection.beg.row = selection.end.row = 0; 3233 selection.beg.row = selection.end.row = 0;
3190 selection.beg.col = selection.end.col = 0; 3234 selection.beg.col = selection.end.col = 0;
3191 selection.clicks = 4; 3235 selection.clicks = 4;
3204/* ------------------------------------------------------------------------- */ 3248/* ------------------------------------------------------------------------- */
3205/* 3249/*
3206 * Extend the selection to the specified col/row 3250 * Extend the selection to the specified col/row
3207 */ 3251 */
3208void 3252void
3209rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3253rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3210{ 3254{
3211 row_col_t pos; 3255 row_col_t pos;
3212 enum { 3256 enum {
3213 LEFT, RIGHT 3257 LEFT, RIGHT
3214 } closeto = RIGHT; 3258 } closeto = RIGHT;
3246 selection.beg.col = selection.end.col = selection.mark.col; 3290 selection.beg.col = selection.end.col = selection.mark.col;
3247 selection.beg.row = selection.end.row = selection.mark.row; 3291 selection.beg.row = selection.end.row = selection.mark.row;
3248 } 3292 }
3249 3293
3250 pos.col = col; 3294 pos.col = col;
3251 pos.row = row - view_start; 3295 pos.row = view_start + row;
3252 3296
3253 /* 3297 /*
3254 * This is mainly xterm style selection with a couple of differences, mainly 3298 * This is mainly xterm style selection with a couple of differences, mainly
3255 * in the way button3 drag extension works. 3299 * in the way button3 drag extension works.
3256 * We're either doing: button1 drag; button3 press; or button3 drag 3300 * We're either doing: button1 drag; button3 press; or button3 drag
3337 else if (selection.clicks == 2) 3381 else if (selection.clicks == 2)
3338 { 3382 {
3339 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3383 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3340 selection.end.col--; 3384 selection.end.col--;
3341 3385
3342 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3343 {
3344 selection_delimit_word (UP, &selection.beg, &selection.beg); 3386 selection_delimit_word (UP, &selection.beg, &selection.beg);
3345 selection_delimit_word (DN, &selection.end, &selection.end); 3387 selection_delimit_word (DN, &selection.end, &selection.end);
3346 }
3347 } 3388 }
3348 else if (selection.clicks == 3) 3389 else if (selection.clicks == 3)
3349 { 3390 {
3350#if ENABLE_FRILLS 3391#if ENABLE_FRILLS
3351 if (OPTION (Opt_tripleclickwords)) 3392 if (OPTION (Opt_tripleclickwords))
3403#endif 3444#endif
3404} 3445}
3405 3446
3406#if ENABLE_FRILLS 3447#if ENABLE_FRILLS
3407void 3448void
3408rxvt_term::selection_remove_trailing_spaces () 3449rxvt_term::selection_remove_trailing_spaces () NOTHROW
3409{ 3450{
3410 int32_t end_col, end_row; 3451 int32_t end_col, end_row;
3411 text_t *stp; 3452 text_t *stp;
3412 3453
3413 end_col = selection.end.col; 3454 end_col = selection.end.col;
3451/* 3492/*
3452 * Double click on button 3 when already selected 3493 * Double click on button 3 when already selected
3453 * EXT: button 3 double click 3494 * EXT: button 3 double click
3454 */ 3495 */
3455void 3496void
3456rxvt_term::selection_rotate (int x, int y) 3497rxvt_term::selection_rotate (int x, int y) NOTHROW
3457{ 3498{
3458 selection.clicks = selection.clicks % 3 + 1; 3499 selection.clicks = selection.clicks % 3 + 1;
3459 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3500 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3460} 3501}
3461 3502
3463/* 3504/*
3464 * Respond to a request for our current selection 3505 * Respond to a request for our current selection
3465 * EXT: SelectionRequest 3506 * EXT: SelectionRequest
3466 */ 3507 */
3467void 3508void
3468rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3509rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3469{ 3510{
3470 XSelectionEvent ev; 3511 XSelectionEvent ev;
3471 dDisp; 3512 dDisp;
3472 3513
3473 ev.type = SelectionNotify; 3514 ev.type = SelectionNotify;
3601 3642
3602/* 3643/*
3603 * return col/row values corresponding to x/y pixel values 3644 * return col/row values corresponding to x/y pixel values
3604 */ 3645 */
3605void 3646void
3606rxvt_term::pixel_position (int *x, int *y) 3647rxvt_term::pixel_position (int *x, int *y) NOTHROW
3607{ 3648{
3608 *x = Pixel2Col (*x); 3649 *x = Pixel2Col (*x);
3609 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3650 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3610 *y = Pixel2Row (*y); 3651 *y = Pixel2Row (*y);
3611 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3652 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3612} 3653}
3613 3654
3614/* ------------------------------------------------------------------------- */ 3655/* ------------------------------------------------------------------------- */
3615#ifdef USE_XIM 3656#ifdef USE_XIM
3616void 3657void
3617rxvt_term::im_set_position (XPoint &pos) 3658rxvt_term::im_set_position (XPoint &pos) NOTHROW
3618{ 3659{
3619 XWindowAttributes xwa; 3660 XWindowAttributes xwa;
3620 3661
3621 XGetWindowAttributes (display->display, vt, &xwa); 3662 XGetWindowAttributes (display->display, vt, &xwa);
3622 3663
3625} 3666}
3626#endif 3667#endif
3627 3668
3628#if ENABLE_OVERLAY 3669#if ENABLE_OVERLAY
3629void 3670void
3630rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3671rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3631{ 3672{
3632 if (nrow < 1 || ncol < 1) 3673 if (nrow < 1 || ncol < 1)
3633 return; 3674 return;
3634 3675
3635 want_refresh = 1; 3676 want_refresh = 1;
3680 *rp = r; 3721 *rp = r;
3681 } 3722 }
3682} 3723}
3683 3724
3684void 3725void
3685rxvt_term::scr_overlay_off () 3726rxvt_term::scr_overlay_off () NOTHROW
3686{ 3727{
3687 if (!ov_text) 3728 if (!ov_text)
3688 return; 3729 return;
3689 3730
3690 want_refresh = 1; 3731 want_refresh = 1;
3698 delete [] ov_text; ov_text = 0; 3739 delete [] ov_text; ov_text = 0;
3699 delete [] ov_rend; ov_rend = 0; 3740 delete [] ov_rend; ov_rend = 0;
3700} 3741}
3701 3742
3702void 3743void
3703rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3744rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3704{ 3745{
3705 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3746 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3706 return; 3747 return;
3707 3748
3708 x++, y++; 3749 x++, y++;
3710 ov_text[y][x] = text; 3751 ov_text[y][x] = text;
3711 ov_rend[y][x] = rend; 3752 ov_rend[y][x] = rend;
3712} 3753}
3713 3754
3714void 3755void
3715rxvt_term::scr_overlay_set (int x, int y, const char *s) 3756rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3716{ 3757{
3717 while (*s) 3758 while (*s)
3718 scr_overlay_set (x++, y, *s++); 3759 scr_overlay_set (x++, y, *s++);
3719} 3760}
3720 3761
3721void 3762void
3722rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3763rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3723{ 3764{
3724 while (*s) 3765 while (*s)
3725 { 3766 {
3726 text_t t = *s++; 3767 text_t t = *s++;
3727 int width = wcwidth (t); 3768 int width = wcwidth (t);
3733 } 3774 }
3734 } 3775 }
3735} 3776}
3736 3777
3737void 3778void
3738rxvt_term::scr_swap_overlay () 3779rxvt_term::scr_swap_overlay () NOTHROW
3739{ 3780{
3740 if (!ov_text) 3781 if (!ov_text)
3741 return; 3782 return;
3742 3783
3743 // swap screen mem with overlay 3784 // swap screen mem with overlay
3744 for (int y = ov_h; y--; ) 3785 for (int y = ov_h; y--; )
3745 { 3786 {
3746 text_t *t1 = ov_text[y]; 3787 text_t *t1 = ov_text[y];
3747 rend_t *r1 = ov_rend[y]; 3788 rend_t *r1 = ov_rend[y];
3748 3789
3749 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3790 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3750 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3791 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3751 3792
3752 for (int x = ov_w; x--; ) 3793 for (int x = ov_w; x--; )
3753 { 3794 {
3754 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3795 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3755 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3796 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