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.213 by root, Fri Jan 6 18:33:30 2006 UTC vs.
Revision 1.250 by root, Wed Jan 25 13:24:45 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
151 l.l = 0;
152 l.f = 0;
150} 153}
151 154
152/* ------------------------------------------------------------------------- * 155/* ------------------------------------------------------------------------- *
153 * SCREEN INITIALISATION * 156 * SCREEN INITIALISATION *
154 * ------------------------------------------------------------------------- */ 157 * ------------------------------------------------------------------------- */
… …
170 nrow = 24; 173 nrow = 24;
171 174
172 if (ncol == prev_ncol && nrow == prev_nrow) 175 if (ncol == prev_ncol && nrow == prev_nrow)
173 return; 176 return;
174 177
178 if (current_screen != PRIMARY)
179 scr_swap_screen ();
180
175 // we need at least two lines for wrapping to work correctly 181 // we need at least two lines for wrapping to work correctly
176 if (nrow + saveLines < 2) 182 while (nrow + saveLines < 2)
177 { 183 {
178 //TODO//FIXME 184 //TODO//FIXME
179 saveLines++; 185 saveLines++;
180 prev_nrow--; 186 prev_nrow--;
181 nsaved++; 187 top_row--;
182 } 188 }
183 189
184 want_refresh = 1; 190 want_refresh = 1;
185 191
186 int prev_total_rows = prev_nrow + saveLines; 192 int prev_total_rows = prev_nrow + saveLines;
… …
191 197
192 if (!row_buf) 198 if (!row_buf)
193 { 199 {
194 /* 200 /*
195 * 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
196 * Note: this is still needed so that all the scrollback lines are NULL
197 */ 202 */
198 nsaved = 0; /* no saved lines */ 203 top_row = 0;
199 term_start = 0; 204 term_start = 0;
200 205
201 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
203 208
204 row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); 209 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
205 temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t));
206 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 210 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
207 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); 211 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
208 212
209 for (int row = nrow; row--; ) 213 for (int row = nrow; row--; )
210 { 214 {
211 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); 215 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
212 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); 216 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
… …
233 selection.text = NULL; 237 selection.text = NULL;
234 selection.len = 0; 238 selection.len = 0;
235 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
236 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
237 selection.clicks = 0; 241 selection.clicks = 0;
238 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
239 rvideo = 0;
240 } 243 }
241 else 244 else
242 { 245 {
243 /* 246 /*
244 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
257 } 260 }
258 } 261 }
259#endif 262#endif
260 263
261 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));
262 temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t));
263 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));
264 266
265 for (int row = min (nrow, prev_nrow); row--; ) 267 for (int row = min (nrow, prev_nrow); row--; )
266 { 268 {
267 lresize (drawn_buf[row]); 269 lresize (drawn_buf[row]);
… …
272 { 274 {
273 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);
274 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);
275 } 277 }
276 278
279 line_t *old_buf = row_buf;
277 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));
278 281
279 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
280 int pend = MOD (term_start - nsaved , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
281 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
282 285
283 if (nsaved) 286 if (top_row)
284 { 287 {
285 // 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
286 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
287 290
288 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290 293
… …
324 qline->l = ncol; 327 qline->l = ncol;
325 qline->is_longer (1); 328 qline->is_longer (1);
326 329
327 int qcol = 0; 330 int qcol = 0;
328 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
329 // fill a single destination line 336 // fill a single destination line
330 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
331 { 338 {
332 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
333 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
343 350
344 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
345 352
346 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
347 354
348 assert (len);
349 assert (pline.t);
350
351 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
352 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
353 357
354 lofs += len; 358 lofs += len;
355 qcol += len; 359 qcol += len;
… …
361 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); 365 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
362 } 366 }
363 while (p != pend && q > 0); 367 while (p != pend && q > 0);
364 368
365 term_start = total_rows - nrow; 369 term_start = total_rows - nrow;
366 nsaved = term_start - q; 370 top_row = q - term_start;
367 371
368 // make sure all terminal lines exist 372 // make sure all terminal lines exist
369 while (nsaved < 0) 373 while (top_row > 0)
370 scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); 374 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
371 } 375 }
372 else 376 else
373 { 377 {
374 // if no scrollback exists (yet), wing, instead of wrap 378 // if no scrollback exists (yet), wing, instead of wrap
375 379
… …
388 } 392 }
389 393
390 term_start = 0; 394 term_start = 0;
391 } 395 }
392 396
393#ifdef DEBUG_STRICT //TODO: remove
394 for (int i = -nsaved; i < nrow; i++)
395 assert (ROW (i).t);
396#endif
397
398 free (old_buf); 397 free (old_buf);
399 delete old_ta; 398 delete old_ta;
400 delete old_ra; 399 delete old_ra;
401 400
402 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
403 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
404 403
405 if (tabs)
406 free (tabs); 404 free (tabs);
407 } 405 }
406
407 CLEAR_ALL_SELECTION ();
408 408
409 prev_nrow = nrow; 409 prev_nrow = nrow;
410 prev_ncol = ncol; 410 prev_ncol = ncol;
411 411
412 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
413 413
414 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
415 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
416 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
417 tt_winch (); 420 tt_winch ();
418 421
419 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
420} 423}
421 424
422/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
423/* 426/*
424 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
425 */ 428 */
426void 429void
427rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
428{ 431{
432 if (row_buf)
433 {
429 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
430 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
431 436
432 free (row_buf); 437 free (row_buf);
433 free (swap_buf); 438 free (swap_buf);
434 free (drawn_buf); 439 free (drawn_buf);
435 free (temp_buf);
436 free (tabs); 440 free (tabs);
437 441
438 row_buf = 0; // signal that we freed all the arrays 442 row_buf = 0; // signal that we freed all the arrays
443 }
439} 444}
440 445
441/* ------------------------------------------------------------------------- */ 446/* ------------------------------------------------------------------------- */
442/* 447/*
443 * Hard reset 448 * Hard reset
… …
448 scr_release (); 453 scr_release ();
449 prev_nrow = prev_ncol = 0; 454 prev_nrow = prev_ncol = 0;
450 scr_reset (); 455 scr_reset ();
451 456
452 scr_clear (true); 457 scr_clear (true);
453 scr_refresh (SLOW_REFRESH); 458 scr_refresh ();
454} 459}
455 460
456/* ------------------------------------------------------------------------- * 461/* ------------------------------------------------------------------------- *
457 * PROCESS SCREEN COMMANDS * 462 * PROCESS SCREEN COMMANDS *
458 * ------------------------------------------------------------------------- */ 463 * ------------------------------------------------------------------------- */
… …
460 * Save and Restore cursor 465 * Save and Restore cursor
461 * XTERM_SEQ: Save cursor : ESC 7 466 * XTERM_SEQ: Save cursor : ESC 7
462 * XTERM_SEQ: Restore cursor: ESC 8 467 * XTERM_SEQ: Restore cursor: ESC 8
463 */ 468 */
464void 469void
465rxvt_term::scr_cursor (int mode) 470rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
466{ 471{
467 screen_t *s; 472 screen_t *s;
468 473
469#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 474#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
470 if (current_screen == SECONDARY) 475 if (current_screen == SECONDARY)
… …
502 assert (s->cur.row >= 0); 507 assert (s->cur.row >= 0);
503 assert (s->cur.col >= 0); 508 assert (s->cur.col >= 0);
504#endif 509#endif
505} 510}
506 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
507/* ------------------------------------------------------------------------- */ 527/* ------------------------------------------------------------------------- */
508/* 528/*
509 * Swap between primary and secondary screens 529 * Swap between primary and secondary screens
510 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 530 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
511 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 531 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
512 */ 532 */
513int 533void
514rxvt_term::scr_change_screen (int scrn) 534rxvt_term::scr_change_screen (int scrn)
515{ 535{
536 if (scrn == current_screen)
537 return;
538
516 want_refresh = 1; 539 want_refresh = 1;
517 view_start = 0; 540 view_start = 0;
518 541
519 if (current_screen == scrn)
520 return scrn;
521
522 selection_check (2); /* check for boundary cross */ 542 selection_check (2); /* check for boundary cross */
523 543
524 int i = current_screen; current_screen = scrn; scrn = i; 544 int i = current_screen; current_screen = scrn; scrn = i;
525
526 ::swap (screen.cur.row, swap.cur.row);
527 ::swap (screen.cur.col, swap.cur.col);
528
529 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
530 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
531 545
532#if NSCREENS 546#if NSCREENS
533 if (OPTION (Opt_secondaryScreen)) 547 if (OPTION (Opt_secondaryScreen))
534 { 548 {
535 num_scr = 0; 549 num_scr = 0;
536 550
537 for (int i = prev_nrow; i--; ) 551 scr_swap_screen ();
538 ::swap (ROW(i), swap_buf [i]);
539 552
540 ::swap (screen.charset, swap.charset); 553 ::swap (screen.charset, swap.charset);
541 ::swap (screen.flags, swap.flags); 554 ::swap (screen.flags, swap.flags);
542 screen.flags |= Screen_VisibleCursor; 555 screen.flags |= Screen_VisibleCursor;
543 swap.flags |= Screen_VisibleCursor; 556 swap.flags |= Screen_VisibleCursor;
544 } 557 }
545 else 558 else
546#endif 559#endif
547 if (OPTION (Opt_secondaryScroll)) 560 if (OPTION (Opt_secondaryScroll))
548 scr_scroll_text (0, prev_nrow - 1, prev_nrow); 561 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
549
550 return scrn;
551} 562}
552 563
553// clear WrapNext indicator, solidifying position on next line 564// clear WrapNext indicator, solidifying position on next line
554void 565void
555rxvt_term::scr_do_wrap () 566rxvt_term::scr_do_wrap () NOTHROW
556{ 567{
557 if (!(screen.flags & Screen_WrapNext)) 568 if (!(screen.flags & Screen_WrapNext))
558 return; 569 return;
559 570
560 screen.flags &= ~Screen_WrapNext; 571 screen.flags &= ~Screen_WrapNext;
… …
570/* ------------------------------------------------------------------------- */ 581/* ------------------------------------------------------------------------- */
571/* 582/*
572 * Change the colour for following text 583 * Change the colour for following text
573 */ 584 */
574void 585void
575rxvt_term::scr_color (unsigned int color, int fgbg) 586rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
576{ 587{
577 if (color > maxTermCOLOR) 588 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
578 color = fgbg; 589 color = fgbg;
579 590
580 if (fgbg == Color_fg) 591 if (fgbg == Color_fg)
581 rstyle = SET_FGCOLOR (rstyle, color); 592 rstyle = SET_FGCOLOR (rstyle, color);
582 else 593 else
… …
586/* ------------------------------------------------------------------------- */ 597/* ------------------------------------------------------------------------- */
587/* 598/*
588 * Change the rendition style for following text 599 * Change the rendition style for following text
589 */ 600 */
590void 601void
591rxvt_term::scr_rendition (int set, int style) 602rxvt_term::scr_rendition (int set, int style) NOTHROW
592 { 603 {
593 if (set) 604 if (set)
594 rstyle |= style; 605 rstyle |= style;
595 else if (style == ~RS_None) 606 else if (style == ~RS_None)
596 rstyle = DEFAULT_RSTYLE; 607 rstyle = DEFAULT_RSTYLE;
… …
603 * Scroll text between <row1> and <row2> inclusive, by <count> lines 614 * Scroll text between <row1> and <row2> inclusive, by <count> lines
604 * count positive ==> scroll up 615 * count positive ==> scroll up
605 * count negative ==> scroll down 616 * count negative ==> scroll down
606 */ 617 */
607int 618int
608rxvt_term::scr_scroll_text (int row1, int row2, int count) 619rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
609{ 620{
610 if (count == 0 || (row1 > row2)) 621 if (count == 0 || (row1 > row2))
611 return 0; 622 return 0;
612 623
613 want_refresh = 1; 624 want_refresh = 1;
614 num_scr += count; 625 num_scr += count;
615 626
616 if (count > 0 627 if (count > 0
617 && row1 == 0 628 && row1 == 0
618 && row2 == nrow - 1
619 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) 629 && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll)))
620 { 630 {
621 nsaved = min (nsaved + count, saveLines); 631 top_row = max (top_row - count, -saveLines);
622 632
623 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 }
624 667
625 term_start = (term_start + count) % total_rows; 668 // move and/or clear selection, if any
626
627 if (selection.op && current_screen == selection.screen) 669 if (selection.op && current_screen == selection.screen)
628 { 670 {
629 selection.beg.row -= count; 671 selection.beg.row -= count;
630 selection.end.row -= count; 672 selection.end.row -= count;
631 selection.mark.row -= count; 673 selection.mark.row -= count;
632 674
633 if (selection.beg.row < -nsaved 675 if (selection.beg.row < top_row
634 || selection.end.row < -nsaved 676 || selection.end.row < top_row
635 || selection.mark.row < -nsaved) 677 || selection.mark.row < top_row)
636 { 678 {
637 CLEAR_ALL_SELECTION (); 679 CLEAR_ALL_SELECTION ();
638 selection.op = SELECTION_CLEAR; 680 selection.op = SELECTION_CLEAR;
639 } 681 }
640 } 682 }
641 683
642 for (int i = count; i--; ) 684 // finally move the view window, if desired
643 {
644 ROW(row2 - i).l = 0;
645 scr_blank_screen_mem (ROW(row2 - i), rstyle);
646 }
647
648 if (OPTION (Opt_scrollWithBuffer) 685 if (OPTION (Opt_scrollWithBuffer)
649 && view_start != 0 686 && view_start != 0
650 && view_start != saveLines) 687 && view_start != -saveLines)
651 scr_page (UP, count); 688 scr_page (UP, count);
689
690 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
691 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
652 } 692 }
653 else 693 else
654 { 694 {
655 if (selection.op && current_screen == selection.screen) 695 if (selection.op && current_screen == selection.screen)
656 { 696 {
… …
680 720
681 int rows = row2 - row1 + 1; 721 int rows = row2 - row1 + 1;
682 722
683 min_it (count, rows); 723 min_it (count, rows);
684 724
725 line_t *temp_buf = row_buf + total_rows;
726
685 for (int row = 0; row < rows; row++) 727 for (int row = 0; row < rows; row++)
686 { 728 {
687 temp_buf [row] = ROW(row1 + (row + count + rows) % rows); 729 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
688 730
689 if (!IN_RANGE_EXC (row + count, 0, rows)) 731 if (!IN_RANGE_EXC (row + count, 0, rows))
… …
700/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
701/* 743/*
702 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
703 */ 745 */
704void 746void
705rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) 747rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
706{ 748{
707 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
708 return; 750 return;
709 751
710 unsigned char checksel; 752 unsigned char checksel;
… …
716 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
717 759
718 if (minlines > 0) 760 if (minlines > 0)
719 { 761 {
720 minlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
721 764
722 if (minlines > 0 765 if (minlines > 0
723 && screen.tscroll == 0 766 && screen.tscroll == 0
724 && screen.bscroll == nrow - 1) 767 && screen.bscroll == nrow - 1)
725 { 768 {
… …
730 } 773 }
731 774
732#ifdef DEBUG_STRICT 775#ifdef DEBUG_STRICT
733 assert (screen.cur.col < ncol); 776 assert (screen.cur.col < ncol);
734 assert (screen.cur.row < nrow 777 assert (screen.cur.row < nrow
735 && screen.cur.row >= -nsaved); 778 && screen.cur.row >= top_row);
736#endif 779#endif
737 int row = screen.cur.row; 780 int row = screen.cur.row;
738 781
739 checksel = selection.op && current_screen == selection.screen ? 1 : 0; 782 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
740 783
… …
786 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
787 } 830 }
788 831
789 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
790 { 833 {
791 max_it (line->l, ncol);
792 line->is_longer (1);
793
794 scr_do_wrap (); 834 scr_do_wrap ();
795 835
836 line->l = ncol;
837 line->is_longer (1);
838
796 row = screen.cur.row; 839 row = screen.cur.row;
797 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
798 } 841 }
799 842
800 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
801 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
802 c = 0xfffd; 845 c = 0xfffd;
803 846
804 // rely on wcwidth to tell us the character width, at least for non-latin1 847 // rely on wcwidth to tell us the character width, do wcwidth before
805 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
806 // for the line drawing characters below as they might be invalid in the current 849 // drawing characters below as they might be invalid in the current
807 // locale. 850 // locale.
808 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
809 852
810 if (charsets [screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
811 { 854 {
812 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
813 // 5f-7e standard vt100 856 // 5f-7e standard vt100
… …
964/* 1007/*
965 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
966 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
967 */ 1010 */
968void 1011void
969rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
970{ 1013{
971 want_refresh = 1; 1014 want_refresh = 1;
972 1015
973 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
974 { 1017 {
… …
992 * Process Horizontal Tab 1035 * Process Horizontal Tab
993 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
994 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
995 */ 1038 */
996void 1039void
997rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
998{ 1041{
999 int i, x; 1042 int i, x;
1000 1043
1001 want_refresh = 1; 1044 want_refresh = 1;
1002 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
… …
1069 * Move cursor left in row. If we're at the left boundary, shift everything 1112 * Move cursor left in row. If we're at the left boundary, shift everything
1070 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1071 */ 1114 */
1072#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1073void 1116void
1074rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1075{ 1118{
1076 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1077 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1078 else 1121 else
1079 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
… …
1086 * Move cursor right in row. If we're at the right boundary, shift everything 1129 * Move cursor right in row. If we're at the right boundary, shift everything
1087 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1088 */ 1131 */
1089#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1090void 1133void
1091rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1092{ 1135{
1093 if (screen.cur.col < ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1094 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1095 else 1138 else
1096 { 1139 {
… …
1109/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1110/* 1153/*
1111 * Goto Row/Column 1154 * Goto Row/Column
1112 */ 1155 */
1113void 1156void
1114rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1115{ 1158{
1116 want_refresh = 1; 1159 want_refresh = 1;
1117 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1118 1161
1119 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1157/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1158/* 1201/*
1159 * direction should be UP or DN 1202 * direction should be UP or DN
1160 */ 1203 */
1161void 1204void
1162rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1163{ 1206{
1164 int dirn; 1207 int dirn;
1165 1208
1166 want_refresh = 1; 1209 want_refresh = 1;
1167 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1186 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1187 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1188 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1189 */ 1232 */
1190void 1233void
1191rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1192{ 1235{
1193 unsigned int col, num; 1236 unsigned int col, num;
1194 1237
1195 want_refresh = 1; 1238 want_refresh = 1;
1196 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
… …
1240 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1241 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1242 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1243 */ 1286 */
1244void 1287void
1245rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1246{ 1289{
1247 int num; 1290 int num;
1248 int32_t row; 1291 int32_t row;
1249 rend_t ren; 1292 rend_t ren;
1250 XGCValues gcvalue; 1293 XGCValues gcvalue;
… …
1303 XChangeGC (display->display, gc, GCForeground, &gcvalue); 1346 XChangeGC (display->display, gc, GCForeground, &gcvalue);
1304 } 1347 }
1305 1348
1306 for (; num--; row++) 1349 for (; num--; row++)
1307 { 1350 {
1308 line_t &l = ROW(row);
1309 l.l = 0;
1310 l.is_longer (0);
1311 scr_blank_screen_mem (l, rstyle); 1351 scr_blank_screen_mem (ROW(row), rstyle);
1312 scr_blank_line (drawn_buf [row], 0, ncol, ren); 1352 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1313 } 1353 }
1314} 1354}
1315 1355
1316#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1317void 1357void
1318rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1319{ 1359{
1320 want_refresh = 1; 1360 want_refresh = 1;
1321 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1322 1362
1323 nsaved = 0; 1363 top_row = 0;
1324} 1364}
1325#endif 1365#endif
1326 1366
1327/* ------------------------------------------------------------------------- */ 1367/* ------------------------------------------------------------------------- */
1328/* 1368/*
1329 * Fill the screen with `E's 1369 * Fill the screen with `E's
1330 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1331 */ 1371 */
1332void 1372void
1333rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1334{ 1374{
1335 rend_t fs; 1375 rend_t fs;
1336 1376
1337 want_refresh = 1; 1377 want_refresh = 1;
1338 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
… …
1359/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1360/* 1400/*
1361 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1362 */ 1402 */
1363void 1403void
1364rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1365{ 1405{
1366 int end; 1406 int end;
1367 1407
1368 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1369 1409
… …
1389/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1390/* 1430/*
1391 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1392 */ 1432 */
1393void 1433void
1394rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1395{ 1435{
1396 int col, row; 1436 int col, row;
1397 rend_t tr; 1437 rend_t tr;
1398 1438
1399 want_refresh = 1; 1439 want_refresh = 1;
… …
1487/* 1527/*
1488 * Set the scrolling region 1528 * Set the scrolling region
1489 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1490 */ 1530 */
1491void 1531void
1492rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1493{ 1533{
1494 max_it (top, 0); 1534 max_it (top, 0);
1495 min_it (bot, nrow - 1); 1535 min_it (bot, nrow - 1);
1496 1536
1497 if (top > bot) 1537 if (top > bot)
… …
1507 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1508 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1509 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1510 */ 1550 */
1511void 1551void
1512rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1513{ 1553{
1514 want_refresh = 1; 1554 want_refresh = 1;
1515 1555
1516 if (mode) 1556 if (mode)
1517 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1524 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1525 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1526 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1527 */ 1567 */
1528void 1568void
1529rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1530{ 1570{
1531 if (mode) 1571 if (mode)
1532 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1533 else 1573 else
1534 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1543 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1544 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1545 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1546 */ 1586 */
1547void 1587void
1548rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1549{ 1589{
1550 if (mode) 1590 if (mode)
1551 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1552 else 1592 else
1553 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1560 * Set insert/replace mode 1600 * Set insert/replace mode
1561 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1562 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1563 */ 1603 */
1564void 1604void
1565rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1566{ 1606{
1567 if (mode) 1607 if (mode)
1568 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1569 else 1609 else
1570 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1576 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1577 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1578 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1579 */ 1619 */
1580void 1620void
1581rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1582{ 1622{
1583 if (mode < 0) 1623 if (mode < 0)
1584 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1585 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1586 tabs [screen.cur.col] = !!mode; 1626 tabs [screen.cur.col] = !!mode;
… …
1591 * Set reverse/normal video 1631 * Set reverse/normal video
1592 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1593 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1594 */ 1634 */
1595void 1635void
1596rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1597{ 1637{
1598 XGCValues gcvalue; 1638 rvideo_mode = on;
1599 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1600 if (rvideo != mode) 1644 if (rvideo_state != on)
1601 { 1645 {
1602 rvideo = mode; 1646 rvideo_state = on;
1647
1603 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1604#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1605 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1606#endif 1651#endif
1607#if TRANSPARENT 1652#if TRANSPARENT
1608 if (! OPTION (Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1609#endif 1654#endif
1610 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1611 pix_colors[Color_bg]);
1612 1656
1657 XGCValues gcvalue;
1613 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1614 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1615 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1616 &gcvalue); 1661
1617 scr_clear (); 1662 scr_clear ();
1618 scr_touch (true); 1663 scr_touch (true);
1619 } 1664 }
1620} 1665}
1621 1666
… …
1623/* 1668/*
1624 * Report current cursor position 1669 * Report current cursor position
1625 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1626 */ 1671 */
1627void 1672void
1628rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1629{ 1674{
1630 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1675 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1631} 1676}
1632 1677
1633/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1636 1681
1637/* 1682/*
1638 * Set font style 1683 * Set font style
1639 */ 1684 */
1640void 1685void
1641rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1642{ 1687{
1643#if 0 1688#if 0
1644 switch (charsets [screen.charset]) 1689 switch (charsets [screen.charset])
1645 { 1690 {
1646 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
… …
1668 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1669 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1670 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1671 */ 1716 */
1672void 1717void
1673rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1674{ 1719{
1675 screen.charset = set; 1720 screen.charset = set;
1676 set_font_style (); 1721 set_font_style ();
1677} 1722}
1678 1723
… …
1684 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1685 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1686 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1687 */ 1732 */
1688void 1733void
1689rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1690{ 1735{
1691 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1692 set_font_style (); 1737 set_font_style ();
1693} 1738}
1694 1739
… …
1699 1744
1700/* 1745/*
1701 * refresh matching text. 1746 * refresh matching text.
1702 */ 1747 */
1703bool 1748bool
1704rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1705{ 1750{
1706 bool found = false; 1751 bool found = false;
1707 1752
1708 for (int i = 0; i < nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1709 { 1754 {
… …
1729 PART_END, 1774 PART_END,
1730 RC_COUNT 1775 RC_COUNT
1731}; 1776};
1732 1777
1733void 1778void
1734rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) 1779rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1735{ 1780{
1736 int i; 1781 int i;
1737 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1738 1783
1739 if (!drawn_buf) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
… …
1762 } 1807 }
1763 1808
1764 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1809 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1765 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); 1810 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1766 1811
1812 num_scr_allow = 0;
1813
1767 if (refresh) 1814 if (refresh)
1768 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1769} 1816}
1770 1817
1771/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1772/* 1819/*
1773 * Refresh the entire screen 1820 * Refresh the entire screen
1774 */ 1821 */
1775void 1822void
1776rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1777{ 1824{
1778 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1779} 1826}
1780 1827
1781/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1782/* 1829/*
1783 * Move the display so that the line represented by scrollbar value Y is at 1830 * Move the display so that the line represented by scrollbar value Y is at
1784 * the top of the screen 1831 * the top of the screen
1785 */ 1832 */
1786int 1833void
1787rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1788{ 1835{
1789 long p = 0; 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1790 unsigned int oldviewstart;
1791
1792 oldviewstart = view_start;
1793
1794 if (y < len)
1795 {
1796 p = (nrow + nsaved) * (len - y) / len;
1797 p -= (long) (nrow - 1);
1798 p = max (p, 0);
1799 }
1800
1801 view_start = (unsigned int)min (p, nsaved);
1802
1803 return scr_changeview (oldviewstart);
1804} 1837}
1805 1838
1806/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1807/* 1840/*
1808 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1809 * direction should be UP or DN 1842 * direction should be UP or DN
1810 */ 1843 */
1811int 1844bool
1812rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1813{ 1846{
1814 int n; 1847 int new_view_start =
1815 unsigned int oldviewstart;
1816
1817 oldviewstart = view_start;
1818
1819 if (direction == UP)
1820 {
1821 n = view_start + nlines;
1822 view_start = min (n, nsaved);
1823 }
1824 else
1825 {
1826 n = view_start - nlines; 1848 direction == UP ? view_start - nlines
1827 view_start = max (n, 0); 1849 : view_start + nlines;
1828 }
1829 1850
1830 return scr_changeview (oldviewstart); 1851 return scr_changeview (new_view_start);
1831} 1852}
1832 1853
1833int 1854bool
1834rxvt_term::scr_changeview (unsigned int oldviewstart) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1835{ 1856{
1857 clamp_it (new_view_start, top_row, 0);
1858
1836 if (view_start != oldviewstart) 1859 if (new_view_start == view_start)
1837 { 1860 return false;
1861
1862 num_scr += new_view_start - view_start;
1863 view_start = new_view_start;
1864 want_refresh = 1;
1865
1838 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); 1866 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1839 1867
1840 want_refresh = 1; 1868 return true;
1841 num_scr -= (view_start - oldviewstart);
1842 }
1843
1844 return (int)view_start - (int)oldviewstart;
1845} 1869}
1846 1870
1847/* ------------------------------------------------------------------------- */ 1871#ifndef NO_BELL
1848void 1872void
1873rxvt_term::bell_cb (time_watcher &w)
1874{
1875 rvideo_bell = false;
1876 scr_rvideo_mode (rvideo_mode);
1877}
1878#endif
1879
1880/* ------------------------------------------------------------------------- */
1881void
1849rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1850{ 1883{
1851#ifndef NO_BELL 1884#ifndef NO_BELL
1852 1885
1853# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1854# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
… …
1857 XMapWindow (display->display, parent[0]); 1890 XMapWindow (display->display, parent[0]);
1858# endif 1891# endif
1859 1892
1860 if (OPTION (Opt_visualBell)) 1893 if (OPTION (Opt_visualBell))
1861 { 1894 {
1862 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1863 rxvt_usleep (VISUAL_BELL_DURATION); 1896 scr_rvideo_mode (rvideo_mode);
1864 scr_rvideo_mode (!rvideo); /* refresh also done */ 1897 display->flush ();
1898
1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1865 } 1900 }
1866 else 1901 else
1867 XBell (display->display, 0); 1902 XBell (display->display, 0);
1868 1903
1869#endif 1904#endif
1870} 1905}
1871 1906
1872/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1873/* ARGSUSED */ 1908/* ARGSUSED */
1874void 1909void
1875rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1876{ 1911{
1877#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1878 int nrows, row_start; 1913 int nrows, row_start;
1879 FILE *fd; 1914 FILE *fd;
1880 1915
1881 if ((fd = popen_printer ()) == NULL) 1916 if ((fd = popen_printer ()) == NULL)
1882 return; 1917 return;
1883 1918
1884 if (fullhist) 1919 if (fullhist)
1885 { 1920 {
1886 nrows = nrow + nsaved; 1921 nrows = nrow - top_row;
1887 row_start = -nsaved; 1922 row_start = top_row;
1888 } 1923 }
1889 else 1924 else
1890 { 1925 {
1891 nrows = nrow; 1926 nrows = nrow;
1892 row_start = -view_start; 1927 row_start = view_start;
1893 } 1928 }
1894 1929
1895 wctomb (0, 0); 1930 wctomb (0, 0);
1896 1931
1897 for (int r1 = 0; r1 < nrows; r1++) 1932 for (int r1 = 0; r1 < nrows; r1++)
… …
1929 * Refresh the screen 1964 * Refresh the screen
1930 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
1931 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
1932 */ 1967 */
1933void 1968void
1934rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
1935{ 1970{
1936 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1937 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
1938 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
1939 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
… …
2025 2060
2026 /* make sure no outline cursor is left around */ 2061 /* make sure no outline cursor is left around */
2027 setoldcursor = 0; 2062 setoldcursor = 0;
2028 if (ocrow != -1) 2063 if (ocrow != -1)
2029 { 2064 {
2030 if (screen.cur.row + view_start != ocrow 2065 if (screen.cur.row - view_start != ocrow
2031 || screen.cur.col != oldcursor.col) 2066 || screen.cur.col != oldcursor.col)
2032 { 2067 {
2033 if (ocrow < nrow 2068 if (ocrow < nrow
2034 && oldcursor.col < ncol) 2069 && oldcursor.col < ncol)
2035 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); 2070 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
… …
2043 else if (!focus) 2078 else if (!focus)
2044 setoldcursor = 1; 2079 setoldcursor = 1;
2045 2080
2046 if (setoldcursor) 2081 if (setoldcursor)
2047 { 2082 {
2048 if (screen.cur.row + view_start >= nrow) 2083 if (screen.cur.row - view_start >= nrow)
2049 oldcursor.row = -1; 2084 oldcursor.row = -1;
2050 else 2085 else
2051 { 2086 {
2052 oldcursor.row = screen.cur.row + view_start; 2087 oldcursor.row = screen.cur.row - view_start;
2053 oldcursor.col = screen.cur.col; 2088 oldcursor.col = screen.cur.col;
2054 } 2089 }
2055 } 2090 }
2056 } 2091 }
2057 2092
… …
2063#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2064 /* 2099 /*
2065 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2066 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2067 */ 2102 */
2068 i = num_scr;
2069 if (!display->is_local 2103 if (!display->is_local
2070 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2071 && abs (num_scr) < nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2072 { 2106 {
2073 int16_t nits; 2107 int16_t nits;
2074 int j; 2108 int j;
2075 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2076 2111
2077 j = nrow; 2112 j = nrow;
2078 wlen = len = -1; 2113 wlen = len = -1;
2079 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2080 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2081 { 2116 {
2082 if (row + i >= 0 && row + i < nrow && row + i != ocrow) 2117 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2083 { 2118 {
2084 line_t s = ROW(row - view_start); 2119 line_t s = ROW(view_start + row);
2085 line_t d = drawn_buf[row]; 2120 line_t d = drawn_buf[row];
2086 line_t d2 = drawn_buf[row + i]; 2121 line_t d2 = drawn_buf[row + i];
2087 2122
2088 for (nits = 0, col = ncol; col--; ) 2123 for (nits = 0, col = ncol; col--; )
2089 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) 2124 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
… …
2127 /* 2162 /*
2128 * E: main pass across every character 2163 * E: main pass across every character
2129 */ 2164 */
2130 for (row = 0; row < nrow; row++) 2165 for (row = 0; row < nrow; row++)
2131 { 2166 {
2132 text_t *stp = ROW(row - view_start).t; 2167 text_t *stp = ROW(view_start + row).t;
2133 rend_t *srp = ROW(row - view_start).r; 2168 rend_t *srp = ROW(view_start + row).r;
2134 text_t *dtp = drawn_buf[row].t; 2169 text_t *dtp = drawn_buf[row].t;
2135 rend_t *drp = drawn_buf[row].r; 2170 rend_t *drp = drawn_buf[row].r;
2136 2171
2137 /* 2172 /*
2138 * E2: OK, now the real pass 2173 * E2: OK, now the real pass
… …
2209 2244
2210 // only do special processing if any attributes are set, which is unlikely 2245 // only do special processing if any attributes are set, which is unlikely
2211 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) 2246 if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))
2212 { 2247 {
2213#if ENABLE_STYLES 2248#if ENABLE_STYLES
2214 // force redraw after "careful" characters to avoid pixel droppings 2249 // "careful" (too wide) character handling
2215 if (srp[col] & RS_Careful && col < ncol - 1 && 0)
2216 drp[col + 1] = ~srp[col + 1];
2217 2250
2218 // include previous careful character(s) if possible, looks nicer (best effort...) 2251 // include previous careful character(s) if possible, looks nicer (best effort...)
2219 while (text > stp 2252 while (text > stp
2220 && srp[text - stp - 1] & RS_Careful 2253 && srp[text - stp - 1] & RS_Careful
2221 && RS_SAME (rend, srp[text - stp - 1])) 2254 && RS_SAME (rend, srp[text - stp - 1]))
2222 text--, count++, xpixel -= fwidth; 2255 text--, count++, xpixel -= fwidth;
2256
2257 // force redraw after "careful" characters to avoid pixel droppings
2258 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2259 drp[col + i + 1] = ~srp[col + i + 1];
2260
2261 // force redraw before "careful" characters to avoid pixel droppings
2262 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2263 drp[text - stp - i - 1] = ~srp[text - stp - i - 1];
2223#endif 2264#endif
2224 2265
2225 bool invert = rend & RS_RVid; 2266 bool invert = rend & RS_RVid;
2226 2267
2227#ifndef NO_BOLD_UNDERLINE_REVERSE 2268#ifndef NO_BOLD_UNDERLINE_REVERSE
… …
2375 /* 2416 /*
2376 * H: cleanup selection 2417 * H: cleanup selection
2377 */ 2418 */
2378 scr_reverse_selection (); 2419 scr_reverse_selection ();
2379 2420
2380 if (refresh_type & SMOOTH_REFRESH)
2381 XFlush (display->display);
2382
2383 num_scr = 0; 2421 num_scr = 0;
2384 num_scr_allow = 1; 2422 num_scr_allow = 1;
2385} 2423}
2386 2424
2387void 2425void
2388rxvt_term::scr_remap_chars (line_t &l) 2426rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2389{ 2427{
2390 if (!l.t) 2428 if (!l.t)
2391 return; 2429 return;
2392 2430
2393 l.touch (); // maybe a bit of an overkill, but its not performance-relevant 2431 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2394 2432
2395 for (int i = ncol; i--; ) 2433 for (int i = ncol; i--; )
2396 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2434 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2397} 2435}
2398 2436
2399void 2437void
2400rxvt_term::scr_remap_chars () 2438rxvt_term::scr_remap_chars () NOTHROW
2401{ 2439{
2402 for (int i = total_rows; i--; ) 2440 for (int i = total_rows; i--; )
2403 scr_remap_chars (row_buf [i]); 2441 scr_remap_chars (row_buf [i]);
2404 2442
2405 for (int i = nrow; i--; ) 2443 for (int i = nrow; i--; )
… …
2408 scr_remap_chars (swap_buf [i]); 2446 scr_remap_chars (swap_buf [i]);
2409 } 2447 }
2410} 2448}
2411 2449
2412void 2450void
2413rxvt_term::scr_recolour () 2451rxvt_term::scr_recolour () NOTHROW
2414{ 2452{
2415 if (1 2453 if (1
2416#if TRANSPARENT 2454#if TRANSPARENT
2417 && !am_transparent 2455 && !am_transparent
2418#endif 2456#endif
… …
2439 want_refresh = 1; 2477 want_refresh = 1;
2440} 2478}
2441 2479
2442/* ------------------------------------------------------------------------- */ 2480/* ------------------------------------------------------------------------- */
2443void 2481void
2444rxvt_term::scr_clear (bool really) 2482rxvt_term::scr_clear (bool really) NOTHROW
2445{ 2483{
2446 if (!mapped) 2484 if (!mapped)
2447 return; 2485 return;
2448 2486
2449 num_scr_allow = 0; 2487 num_scr_allow = 0;
… …
2451 2489
2452 if (really) 2490 if (really)
2453 XClearWindow (display->display, vt); 2491 XClearWindow (display->display, vt);
2454} 2492}
2455 2493
2456/* ------------------------------------------------------------------------- */
2457void 2494void
2495rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2496{
2497 int view_end = view_start + nrow;
2498 int row, col;
2499
2500 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2501 {
2502 text_t *stp = ROW(row).t;
2503 rend_t *srp = ROW(row).r;
2504
2505 for (col = beg_col; col < end_col; col++)
2506 srp[col] ^= rstyle1;
2507
2508 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2509 srp[col] ^= rstyle2;
2510
2511 if (++col < end_col)
2512 srp[col] ^= rstyle2;
2513 }
2514}
2515
2516void
2517rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2518{
2519 int view_end = view_start + nrow;
2520 int row, col;
2521
2522 if (beg_row >= view_start)
2523 {
2524 col = beg_col;
2525 row = beg_row;
2526 }
2527 else
2528 {
2529 col = 0;
2530 row = view_start;
2531 }
2532
2533 for (; row < min (end_row, view_end); row++, col = 0)
2534 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2535 srp[col] ^= rstyle;
2536
2537 if (row == end_row)
2538 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2539 srp[col] ^= rstyle;
2540}
2541
2542/* ------------------------------------------------------------------------- */
2543void
2458rxvt_term::scr_reverse_selection () 2544rxvt_term::scr_reverse_selection () NOTHROW
2459{ 2545{
2460 if (selection.op 2546 if (selection.op
2461 && current_screen == selection.screen 2547 && current_screen == selection.screen
2462 && selection.end.row >= -view_start) 2548 && selection.end.row >= view_start)
2463 { 2549 {
2464 int view_end = -view_start + nrow;
2465 int row, col;
2466
2467#if ENABLE_FRILLS 2550#if ENABLE_FRILLS
2468 if (selection.rect) 2551 if (selection.rect)
2469 { 2552 scr_xor_rect (selection.beg.row, selection.beg.col,
2470 for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) 2553 selection.end.row, selection.end.col,
2471 { 2554 RS_RVid, RS_RVid | RS_Uline);
2472 text_t *stp = ROW(row).t;
2473 rend_t *srp = ROW(row).r;
2474
2475 for (col = selection.beg.col; col < selection.end.col; col++)
2476 srp[col] ^= RS_RVid;
2477
2478 while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2479 srp[col] ^= RS_RVid | RS_Uline;
2480
2481 if (++col < selection.end.col)
2482 srp[col] ^= RS_RVid | RS_Uline;
2483 }
2484 }
2485 else 2555 else
2486#endif 2556#endif
2487 { 2557 scr_xor_span (selection.beg.row, selection.beg.col,
2488 if (selection.beg.row >= -view_start) 2558 selection.end.row, selection.end.col,
2489 { 2559 RS_RVid);
2490 col = selection.beg.col;
2491 row = selection.beg.row;
2492 }
2493 else
2494 {
2495 col = 0;
2496 row = -view_start;
2497 }
2498
2499 for (; row < min (selection.end.row, view_end); row++, col = 0)
2500 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2501 srp[col] ^= RS_RVid;
2502
2503 if (row == selection.end.row)
2504 for (rend_t *srp = ROW(row).r; col < selection.end.col; col++)
2505 srp[col] ^= RS_RVid;
2506 }
2507 } 2560 }
2508} 2561}
2509 2562
2510/* ------------------------------------------------------------------------- */ 2563/* ------------------------------------------------------------------------- */
2511/* 2564/*
2512 * Dump the whole scrollback and screen to the passed filedescriptor. The 2565 * Dump the whole scrollback and screen to the passed filedescriptor. The
2513 * invoking routine must close the fd. 2566 * invoking routine must close the fd.
2514 */ 2567 */
2515#if 0 2568#if 0
2516void 2569void
2517rxvt_term::scr_dump (int fd) 2570rxvt_term::scr_dump (int fd) NOTHROW
2518{ 2571{
2519 int row, wrote; 2572 int row, wrote;
2520 unsigned int width, towrite; 2573 unsigned int width, towrite;
2521 char r1[] = "\n"; 2574 char r1[] = "\n";
2522 2575
… …
2541 2594
2542/* ------------------------------------------------------------------------- * 2595/* ------------------------------------------------------------------------- *
2543 * CHARACTER SELECTION * 2596 * CHARACTER SELECTION *
2544 * ------------------------------------------------------------------------- */ 2597 * ------------------------------------------------------------------------- */
2545void 2598void
2546rxvt_term::selection_check (int check_more) 2599rxvt_term::selection_check (int check_more) NOTHROW
2547{ 2600{
2548 row_col_t pos; 2601 row_col_t pos;
2549 2602
2550 if (!selection.op) 2603 if (!selection.op)
2551 return; 2604 return;
2552 2605
2553 pos.row = pos.col = 0; 2606 pos.row = pos.col = 0;
2554 if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) 2607 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2555 || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) 2608 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2556 || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) 2609 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2557 || (check_more == 1 2610 || (check_more == 1
2558 && current_screen == selection.screen 2611 && current_screen == selection.screen
2559 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2612 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2560 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2613 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2561 || (check_more == 2 2614 || (check_more == 2
… …
2572/* ------------------------------------------------------------------------- */ 2625/* ------------------------------------------------------------------------- */
2573/* 2626/*
2574 * Paste a selection direct to the command fd 2627 * Paste a selection direct to the command fd
2575 */ 2628 */
2576void 2629void
2577rxvt_term::paste (char *data, unsigned int len) 2630rxvt_term::paste (char *data, unsigned int len) NOTHROW
2578{ 2631{
2579 /* convert normal newline chars into common keyboard Return key sequence */ 2632 /* convert normal newline chars into common keyboard Return key sequence */
2580 for (unsigned int i = 0; i < len; i++) 2633 for (unsigned int i = 0; i < len; i++)
2581 if (data[i] == C0_LF) 2634 if (data[i] == C0_LF)
2582 data[i] = C0_CR; 2635 data[i] = C0_CR;
… …
2588/* 2641/*
2589 * Respond to a notification that a primary selection has been sent 2642 * Respond to a notification that a primary selection has been sent
2590 * EXT: SelectionNotify 2643 * EXT: SelectionNotify
2591 */ 2644 */
2592void 2645void
2593rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2646rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2594{ 2647{
2595 if (prop == None) /* check for failed XConvertSelection */ 2648 if (prop == None) /* check for failed XConvertSelection */
2596 { 2649 {
2597 if ((selection_type & Sel_CompoundText)) 2650 if ((selection_type & Sel_CompoundText))
2598 { 2651 {
… …
2750 if (selection_wait == Sel_normal) 2803 if (selection_wait == Sel_normal)
2751 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2752} 2805}
2753 2806
2754void 2807void
2755rxvt_term::incr_cb (time_watcher &w) 2808rxvt_term::incr_cb (time_watcher &w) NOTHROW
2756{ 2809{
2757 selection_wait = Sel_none; 2810 selection_wait = Sel_none;
2758 2811
2759 incr_buf_size = 0; 2812 incr_buf_size = 0;
2760 free (incr_buf); 2813 free (incr_buf);
2761 2814
2762 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2815 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2763} 2816}
2764 2817
2765void 2818void
2766rxvt_term::selection_property (Window win, Atom prop) 2819rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2767{ 2820{
2768 if (prop == None || selection_wait != Sel_incr) 2821 if (prop == None || selection_wait != Sel_incr)
2769 return; 2822 return;
2770 2823
2771 selection_paste (win, prop, true); 2824 selection_paste (win, prop, true);
… …
2780 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2833 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2781 * will auto fallback to CUT_BUFFER0 2834 * will auto fallback to CUT_BUFFER0
2782 * EXT: button 2 release 2835 * EXT: button 2 release
2783 */ 2836 */
2784void 2837void
2785rxvt_term::selection_request (Time tm, int x, int y) 2838rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2786{ 2839{
2787 if (x < 0 || x >= width || y < 0 || y >= height) 2840 if (selection.text && selnum == Sel_Primary)
2788 return; /* outside window */
2789
2790 if (selection.text)
2791 { /* internal selection */ 2841 { /* internal selection */
2792 char *str = rxvt_wcstombs (selection.text, selection.len); 2842 char *str = rxvt_wcstombs (selection.text, selection.len);
2793 paste (str, strlen (str)); 2843 paste (str, strlen (str));
2794 free (str); 2844 free (str);
2795 return; 2845 return;
2796 } 2846 }
2797 else 2847 else
2798 { 2848 {
2799 int i;
2800
2801 selection_request_time = tm; 2849 selection_request_time = tm;
2802 selection_wait = Sel_normal; 2850 selection_wait = Sel_normal;
2803 2851
2804 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2805 {
2806#if X_HAVE_UTF8_STRING 2852#if X_HAVE_UTF8_STRING
2807 selection_type = Sel_UTF8String; 2853 selection_type = Sel_UTF8String;
2808 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2854 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2809 return; 2855 return;
2810#else 2856#else
2811 selection_type = Sel_CompoundText; 2857 selection_type = Sel_CompoundText;
2812 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2858 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2813 return; 2859 return;
2814#endif 2860#endif
2815 }
2816 } 2861 }
2817 2862
2818 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2863 selection_wait = Sel_none; /* don't loop in selection_paste () */
2819 selection_paste (display->root, XA_CUT_BUFFER0, false); 2864 selection_paste (display->root, XA_CUT_BUFFER0, false);
2820} 2865}
2821 2866
2822int 2867int
2823rxvt_term::selection_request_other (Atom target, int selnum) 2868rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2824{ 2869{
2825 Atom sel; 2870 Atom sel;
2826 2871
2827 selection_type |= selnum; 2872 selection_type |= selnum;
2828 2873
… …
2847/* 2892/*
2848 * Clear all selected text 2893 * Clear all selected text
2849 * EXT: SelectionClear 2894 * EXT: SelectionClear
2850 */ 2895 */
2851void 2896void
2852rxvt_term::selection_clear () 2897rxvt_term::selection_clear () NOTHROW
2853{ 2898{
2854 want_refresh = 1; 2899 want_refresh = 1;
2855 free (selection.text); 2900 free (selection.text);
2856 selection.text = NULL; 2901 selection.text = NULL;
2857 selection.len = 0; 2902 selection.len = 0;
… …
2992 3037
2993 selection_grab (tm); 3038 selection_grab (tm);
2994} 3039}
2995 3040
2996bool 3041bool
2997rxvt_term::selection_grab (Time tm) 3042rxvt_term::selection_grab (Time tm) NOTHROW
2998{ 3043{
2999 selection_time = tm; 3044 selection_time = tm;
3000 3045
3001 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3046 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3002 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3047 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
3003 { 3048 {
3004 display->set_selection_owner (this); 3049 display->set_selection_owner (this);
3005 return true; 3050 return true;
3006 } 3051 }
3007 else 3052 else
3053 {
3054 selection_clear ();
3008 return false; 3055 return false;
3056 }
3009 3057
3010#if 0 3058#if 0
3011 XTextProperty ct; 3059 XTextProperty ct;
3012 3060
3013 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3061 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0)
… …
3022/* 3070/*
3023 * Mark or select text based upon number of clicks: 1, 2, or 3 3071 * Mark or select text based upon number of clicks: 1, 2, or 3
3024 * EXT: button 1 press 3072 * EXT: button 1 press
3025 */ 3073 */
3026void 3074void
3027rxvt_term::selection_click (int clicks, int x, int y) 3075rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3028{ 3076{
3029 clicks = ((clicks - 1) % 3) + 1; 3077 clicks = ((clicks - 1) % 3) + 1;
3030 selection.clicks = clicks; /* save clicks so extend will work */ 3078 selection.clicks = clicks; /* save clicks so extend will work */
3031 3079
3080 if (clicks == 2 && !selection.rect
3081 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3082 {
3083 MEvent.clicks = 1; // what a mess
3084 selection.screen = current_screen;
3085 selection.op = SELECTION_CONT;
3086 return;
3087 }
3088
3032 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3089 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
3033 3090
3034 if (clicks == 2 || clicks == 3) 3091 if (clicks == 2 || clicks == 3)
3035 selection_extend_colrow (selection.mark.col, 3092 selection_extend_colrow (selection.mark.col,
3036 selection.mark.row + view_start, 3093 selection.mark.row - view_start,
3037 0, /* button 3 */ 3094 0, /* button 3 */
3038 1, /* button press */ 3095 1, /* button press */
3039 0); /* click change */ 3096 0); /* click change */
3040} 3097}
3041 3098
3042/* ------------------------------------------------------------------------- */ 3099/* ------------------------------------------------------------------------- */
3043/* 3100/*
3044 * Mark a selection at the specified col/row 3101 * Mark a selection at the specified col/row
3045 */ 3102 */
3046void 3103void
3047rxvt_term::selection_start_colrow (int col, int row) 3104rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3048{ 3105{
3049 want_refresh = 1; 3106 want_refresh = 1;
3050 3107
3051 selection.mark.row = row - view_start; 3108 selection.mark.row = row + view_start;
3052 selection.mark.col = col; 3109 selection.mark.col = col;
3053 3110
3054 selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); 3111 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
3055 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); 3112 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3056 3113
3057 while (selection.mark.col > 0 3114 while (selection.mark.col > 0
3058 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) 3115 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3059 --selection.mark.col; 3116 --selection.mark.col;
… …
3078#define DELIMIT_TEXT(x) \ 3135#define DELIMIT_TEXT(x) \
3079 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3136 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3080#define DELIMIT_REND(x) 1 3137#define DELIMIT_REND(x) 1
3081 3138
3082void 3139void
3083rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3140rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3084{ 3141{
3085 int col, row, dirnadd, tcol, trow, w1, w2; 3142 int col, row, dirnadd, tcol, trow, w1, w2;
3086 row_col_t bound; 3143 row_col_t bound;
3087 text_t *stp; 3144 text_t *stp;
3088 rend_t *srp; 3145 rend_t *srp;
3089 3146
3090 if (dirn == UP) 3147 if (dirn == UP)
3091 { 3148 {
3092 bound.row = - nsaved - 1; 3149 bound.row = top_row - 1;
3093 bound.col = 0; 3150 bound.col = 0;
3094 dirnadd = -1; 3151 dirnadd = -1;
3095 } 3152 }
3096 else 3153 else
3097 { 3154 {
… …
3162 * flag == 0 ==> button 1 3219 * flag == 0 ==> button 1
3163 * flag == 1 ==> button 3 press 3220 * flag == 1 ==> button 3 press
3164 * flag == 2 ==> button 3 motion 3221 * flag == 2 ==> button 3 motion
3165 */ 3222 */
3166void 3223void
3167rxvt_term::selection_extend (int x, int y, int flag) 3224rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3168{ 3225{
3169 int col = clamp (Pixel2Col (x), 0, ncol); 3226 int col = clamp (Pixel2Col (x), 0, ncol);
3170 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3227 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3171 3228
3172 /* 3229 /*
… …
3175 * select nothing. Otherwise, if we're to the right of the mark, you have to 3232 * select nothing. Otherwise, if we're to the right of the mark, you have to
3176 * be _past_ a character for it to be selected. 3233 * be _past_ a character for it to be selected.
3177 */ 3234 */
3178 if (((selection.clicks % 3) == 1) && !flag 3235 if (((selection.clicks % 3) == 1) && !flag
3179 && (col == selection.mark.col 3236 && (col == selection.mark.col
3180 && (row == selection.mark.row + view_start))) 3237 && (row == selection.mark.row - view_start)))
3181 { 3238 {
3182 /* select nothing */ 3239 /* select nothing */
3183 selection.beg.row = selection.end.row = 0; 3240 selection.beg.row = selection.end.row = 0;
3184 selection.beg.col = selection.end.col = 0; 3241 selection.beg.col = selection.end.col = 0;
3185 selection.clicks = 4; 3242 selection.clicks = 4;
… …
3198/* ------------------------------------------------------------------------- */ 3255/* ------------------------------------------------------------------------- */
3199/* 3256/*
3200 * Extend the selection to the specified col/row 3257 * Extend the selection to the specified col/row
3201 */ 3258 */
3202void 3259void
3203rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3260rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3204{ 3261{
3205 row_col_t pos; 3262 row_col_t pos;
3206 enum { 3263 enum {
3207 LEFT, RIGHT 3264 LEFT, RIGHT
3208 } closeto = RIGHT; 3265 } closeto = RIGHT;
… …
3240 selection.beg.col = selection.end.col = selection.mark.col; 3297 selection.beg.col = selection.end.col = selection.mark.col;
3241 selection.beg.row = selection.end.row = selection.mark.row; 3298 selection.beg.row = selection.end.row = selection.mark.row;
3242 } 3299 }
3243 3300
3244 pos.col = col; 3301 pos.col = col;
3245 pos.row = row - view_start; 3302 pos.row = view_start + row;
3246 3303
3247 /* 3304 /*
3248 * This is mainly xterm style selection with a couple of differences, mainly 3305 * This is mainly xterm style selection with a couple of differences, mainly
3249 * in the way button3 drag extension works. 3306 * in the way button3 drag extension works.
3250 * We're either doing: button1 drag; button3 press; or button3 drag 3307 * We're either doing: button1 drag; button3 press; or button3 drag
… …
3331 else if (selection.clicks == 2) 3388 else if (selection.clicks == 2)
3332 { 3389 {
3333 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3390 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3334 selection.end.col--; 3391 selection.end.col--;
3335 3392
3336 if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3337 {
3338 selection_delimit_word (UP, &selection.beg, &selection.beg); 3393 selection_delimit_word (UP, &selection.beg, &selection.beg);
3339 selection_delimit_word (DN, &selection.end, &selection.end); 3394 selection_delimit_word (DN, &selection.end, &selection.end);
3340 }
3341 } 3395 }
3342 else if (selection.clicks == 3) 3396 else if (selection.clicks == 3)
3343 { 3397 {
3344#if ENABLE_FRILLS 3398#if ENABLE_FRILLS
3345 if (OPTION (Opt_tripleclickwords)) 3399 if (OPTION (Opt_tripleclickwords))
… …
3397#endif 3451#endif
3398} 3452}
3399 3453
3400#if ENABLE_FRILLS 3454#if ENABLE_FRILLS
3401void 3455void
3402rxvt_term::selection_remove_trailing_spaces () 3456rxvt_term::selection_remove_trailing_spaces () NOTHROW
3403{ 3457{
3404 int32_t end_col, end_row; 3458 int32_t end_col, end_row;
3405 text_t *stp; 3459 text_t *stp;
3406 3460
3407 end_col = selection.end.col; 3461 end_col = selection.end.col;
… …
3445/* 3499/*
3446 * Double click on button 3 when already selected 3500 * Double click on button 3 when already selected
3447 * EXT: button 3 double click 3501 * EXT: button 3 double click
3448 */ 3502 */
3449void 3503void
3450rxvt_term::selection_rotate (int x, int y) 3504rxvt_term::selection_rotate (int x, int y) NOTHROW
3451{ 3505{
3452 selection.clicks = selection.clicks % 3 + 1; 3506 selection.clicks = selection.clicks % 3 + 1;
3453 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3507 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3454} 3508}
3455 3509
… …
3457/* 3511/*
3458 * Respond to a request for our current selection 3512 * Respond to a request for our current selection
3459 * EXT: SelectionRequest 3513 * EXT: SelectionRequest
3460 */ 3514 */
3461void 3515void
3462rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3516rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3463{ 3517{
3464 XSelectionEvent ev; 3518 XSelectionEvent ev;
3465 dDisp; 3519 dDisp;
3466 3520
3467 ev.type = SelectionNotify; 3521 ev.type = SelectionNotify;
… …
3595 3649
3596/* 3650/*
3597 * return col/row values corresponding to x/y pixel values 3651 * return col/row values corresponding to x/y pixel values
3598 */ 3652 */
3599void 3653void
3600rxvt_term::pixel_position (int *x, int *y) 3654rxvt_term::pixel_position (int *x, int *y) NOTHROW
3601{ 3655{
3602 *x = Pixel2Col (*x); 3656 *x = Pixel2Col (*x);
3603 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3657 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3604 *y = Pixel2Row (*y); 3658 *y = Pixel2Row (*y);
3605 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3659 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3606} 3660}
3607 3661
3608/* ------------------------------------------------------------------------- */ 3662/* ------------------------------------------------------------------------- */
3609#ifdef USE_XIM 3663#ifdef USE_XIM
3610void 3664void
3611rxvt_term::im_set_position (XPoint &pos) 3665rxvt_term::im_set_position (XPoint &pos) NOTHROW
3612{ 3666{
3613 XWindowAttributes xwa; 3667 XWindowAttributes xwa;
3614 3668
3615 XGetWindowAttributes (display->display, vt, &xwa); 3669 XGetWindowAttributes (display->display, vt, &xwa);
3616 3670
… …
3619} 3673}
3620#endif 3674#endif
3621 3675
3622#if ENABLE_OVERLAY 3676#if ENABLE_OVERLAY
3623void 3677void
3624rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3678rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3625{ 3679{
3626 if (nrow < 1 || ncol < 1) 3680 if (nrow < 1 || ncol < 1)
3627 return; 3681 return;
3628 3682
3629 want_refresh = 1; 3683 want_refresh = 1;
… …
3674 *rp = r; 3728 *rp = r;
3675 } 3729 }
3676} 3730}
3677 3731
3678void 3732void
3679rxvt_term::scr_overlay_off () 3733rxvt_term::scr_overlay_off () NOTHROW
3680{ 3734{
3681 if (!ov_text) 3735 if (!ov_text)
3682 return; 3736 return;
3683 3737
3684 want_refresh = 1; 3738 want_refresh = 1;
… …
3692 delete [] ov_text; ov_text = 0; 3746 delete [] ov_text; ov_text = 0;
3693 delete [] ov_rend; ov_rend = 0; 3747 delete [] ov_rend; ov_rend = 0;
3694} 3748}
3695 3749
3696void 3750void
3697rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3751rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3698{ 3752{
3699 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3753 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3700 return; 3754 return;
3701 3755
3702 x++, y++; 3756 x++, y++;
… …
3704 ov_text[y][x] = text; 3758 ov_text[y][x] = text;
3705 ov_rend[y][x] = rend; 3759 ov_rend[y][x] = rend;
3706} 3760}
3707 3761
3708void 3762void
3709rxvt_term::scr_overlay_set (int x, int y, const char *s) 3763rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3710{ 3764{
3711 while (*s) 3765 while (*s)
3712 scr_overlay_set (x++, y, *s++); 3766 scr_overlay_set (x++, y, *s++);
3713} 3767}
3714 3768
3715void 3769void
3716rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3770rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3717{ 3771{
3718 while (*s) 3772 while (*s)
3719 { 3773 {
3720 text_t t = *s++; 3774 text_t t = *s++;
3721 int width = wcwidth (t); 3775 int width = WCWIDTH (t);
3722 3776
3723 while (width--) 3777 while (width--)
3724 { 3778 {
3725 scr_overlay_set (x++, y, t); 3779 scr_overlay_set (x++, y, t);
3726 t = NOCHAR; 3780 t = NOCHAR;
3727 } 3781 }
3728 } 3782 }
3729} 3783}
3730 3784
3731void 3785void
3732rxvt_term::scr_swap_overlay () 3786rxvt_term::scr_swap_overlay () NOTHROW
3733{ 3787{
3734 if (!ov_text) 3788 if (!ov_text)
3735 return; 3789 return;
3736 3790
3737 // swap screen mem with overlay 3791 // swap screen mem with overlay
3738 for (int y = ov_h; y--; ) 3792 for (int y = ov_h; y--; )
3739 { 3793 {
3740 text_t *t1 = ov_text[y]; 3794 text_t *t1 = ov_text[y];
3741 rend_t *r1 = ov_rend[y]; 3795 rend_t *r1 = ov_rend[y];
3742 3796
3743 text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; 3797 text_t *t2 = ROW(y + ov_y + view_start).t + ov_x;
3744 rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; 3798 rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x;
3745 3799
3746 for (int x = ov_w; x--; ) 3800 for (int x = ov_w; x--; )
3747 { 3801 {
3748 text_t t = *t1; *t1++ = *t2; *t2++ = t; 3802 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3749 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); 3803 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines