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.234 by root, Mon Jan 16 08:57:02 2006 UTC vs.
Revision 1.249 by root, Wed Jan 25 00:42:21 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) const 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) const 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 top_row--; 187 top_row--;
… …
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 */ 202 */
200 top_row = 0; /* no saved lines */ 203 top_row = 0;
201 term_start = 0; 204 term_start = 0;
202 205
203 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 206 talloc = new rxvt_salloc (ncol * sizeof (text_t));
204 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 207 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
205 208
… …
234 selection.text = NULL; 237 selection.text = NULL;
235 selection.len = 0; 238 selection.len = 0;
236 selection.op = SELECTION_CLEAR; 239 selection.op = SELECTION_CLEAR;
237 selection.screen = PRIMARY; 240 selection.screen = PRIMARY;
238 selection.clicks = 0; 241 selection.clicks = 0;
239 CLEAR_ALL_SELECTION (); 242 rvideo_state = rvideo_mode = false;
240 rvideo = 0;
241 } 243 }
242 else 244 else
243 { 245 {
244 /* 246 /*
245 * add or delete rows as appropriate 247 * add or delete rows as appropriate
… …
281 int pend = MOD (term_start + top_row , prev_total_rows); 283 int pend = MOD (term_start + top_row , prev_total_rows);
282 int q = total_rows; // rewrapped row 284 int q = total_rows; // rewrapped row
283 285
284 if (top_row) 286 if (top_row)
285 { 287 {
286 // 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
287 // to come up with a lean and mean algorithm. 289 // to come up with a lean and mean algorithm.
288 290
289 row_col_t ocur = screen.cur; 291 row_col_t ocur = screen.cur;
290 ocur.row = MOD (term_start + ocur.row, prev_total_rows); 292 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
291 293
… …
325 qline->l = ncol; 327 qline->l = ncol;
326 qline->is_longer (1); 328 qline->is_longer (1);
327 329
328 int qcol = 0; 330 int qcol = 0;
329 331
332 // see below for cursor adjustment rationale
333 if (p == ocur.row)
334 screen.cur.row = q - (total_rows - nrow);
335
330 // fill a single destination line 336 // fill a single destination line
331 while (lofs < llen && qcol < ncol) 337 while (lofs < llen && qcol < ncol)
332 { 338 {
333 int prow = lofs / prev_ncol; 339 int prow = lofs / prev_ncol;
334 int pcol = lofs % prev_ncol; 340 int pcol = lofs % prev_ncol;
… …
344 350
345 line_t &pline = old_buf [prow]; 351 line_t &pline = old_buf [prow];
346 352
347 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); 353 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
348 354
349 assert (len);
350 assert (pline.t);
351
352 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); 355 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
353 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); 356 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
354 357
355 lofs += len; 358 lofs += len;
356 qcol += len; 359 qcol += len;
… …
389 } 392 }
390 393
391 term_start = 0; 394 term_start = 0;
392 } 395 }
393 396
394#ifdef DEBUG_STRICT //TODO: remove
395 for (int i = top_row; i < nrow; i++)
396 assert (ROW (i).t);
397#endif
398
399 free (old_buf); 397 free (old_buf);
400 delete old_ta; 398 delete old_ta;
401 delete old_ra; 399 delete old_ra;
402 400
403 clamp_it (screen.cur.row, 0, nrow - 1); 401 clamp_it (screen.cur.row, 0, nrow - 1);
404 clamp_it (screen.cur.col, 0, ncol - 1); 402 clamp_it (screen.cur.col, 0, ncol - 1);
405 403
406 if (tabs)
407 free (tabs); 404 free (tabs);
408 } 405 }
406
407 CLEAR_ALL_SELECTION ();
409 408
410 prev_nrow = nrow; 409 prev_nrow = nrow;
411 prev_ncol = ncol; 410 prev_ncol = ncol;
412 411
413 tabs = (char *)rxvt_malloc (ncol * sizeof (char)); 412 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
414 413
415 for (int col = ncol; col--; ) 414 for (int col = ncol; col--; )
416 tabs [col] = col % TABSIZE == 0; 415 tabs [col] = col % TABSIZE == 0;
417 416
417 if (current_screen != PRIMARY)
418 scr_swap_screen ();
419
418 tt_winch (); 420 tt_winch ();
419 421
420 HOOK_INVOKE ((this, HOOK_RESET, DT_END)); 422 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
421} 423}
422 424
423/* ------------------------------------------------------------------------- */ 425/* ------------------------------------------------------------------------- */
424/* 426/*
425 * Free everything. That way malloc debugging can find leakage. 427 * Free everything. That way malloc debugging can find leakage.
426 */ 428 */
427void 429void
428rxvt_term::scr_release () 430rxvt_term::scr_release () NOTHROW
429{ 431{
432 if (row_buf)
433 {
430 delete talloc; talloc = 0; 434 delete talloc; talloc = 0;
431 delete ralloc; ralloc = 0; 435 delete ralloc; ralloc = 0;
432 436
433 free (row_buf); 437 free (row_buf);
434 free (swap_buf); 438 free (swap_buf);
435 free (drawn_buf); 439 free (drawn_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 (!IN_RANGE_INC (color, minCOLOR, 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)
… …
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;
… …
620 top_row = max (top_row - count, -saveLines); 631 top_row = max (top_row - count, -saveLines);
621 632
622 // scroll everything up 'count' lines 633 // scroll everything up 'count' lines
623 term_start = (term_start + count) % total_rows; 634 term_start = (term_start + count) % total_rows;
624 635
636 // sever bottommost line
625 { 637 {
626 // severe bottommost scrolled line
627 line_t &l = ROW(row2 - count); 638 line_t &l = ROW(row2 - count);
639 l.is_longer (0);
628 l.touch (); 640 l.touch ();
629 l.is_longer (0);
630 } 641 }
631 642
632 // erase newly scorlled-in lines 643 // erase newly scrolled-in lines
633 for (int i = count; i; --i ) 644 for (int i = count; i--; )
634 { 645 {
635 // basically this is a slightly optimized scr_blank_screen_mem 646 // basically this is a slightly optimized scr_blank_screen_mem
636 // it is worth the effort on slower machines 647 // it is worth the effort on slower machines
637 line_t &l = ROW(nrow - i); 648 line_t &l = ROW(nrow - 1 - i);
638 649
639 scr_blank_line (l, 0, l.l, rstyle); 650 scr_blank_line (l, 0, l.l, rstyle);
640 651
641 l.l = 0; 652 l.l = 0;
642 l.f = 0; 653 l.f = 0;
… …
731/* ------------------------------------------------------------------------- */ 742/* ------------------------------------------------------------------------- */
732/* 743/*
733 * Add text given in <str> of length <len> to screen struct 744 * Add text given in <str> of length <len> to screen struct
734 */ 745 */
735void 746void
736rxvt_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
737{ 748{
738 if (len <= 0) /* sanity */ 749 if (len <= 0) /* sanity */
739 return; 750 return;
740 751
741 unsigned char checksel; 752 unsigned char checksel;
… …
747 ZERO_SCROLLBACK (); 758 ZERO_SCROLLBACK ();
748 759
749 if (minlines > 0) 760 if (minlines > 0)
750 { 761 {
751 minlines += screen.cur.row - screen.bscroll; 762 minlines += screen.cur.row - screen.bscroll;
763 min_it (minlines, screen.cur.row - top_row);
752 764
753 if (minlines > 0 765 if (minlines > 0
754 && screen.tscroll == 0 766 && screen.tscroll == 0
755 && screen.bscroll == nrow - 1) 767 && screen.bscroll == nrow - 1)
756 { 768 {
… …
817 CLEAR_SELECTION (); 829 CLEAR_SELECTION ();
818 } 830 }
819 831
820 if (screen.flags & Screen_WrapNext) 832 if (screen.flags & Screen_WrapNext)
821 { 833 {
822 max_it (line->l, ncol);
823 line->is_longer (1);
824
825 scr_do_wrap (); 834 scr_do_wrap ();
826 835
836 line->l = ncol;
837 line->is_longer (1);
838
827 row = screen.cur.row; 839 row = screen.cur.row;
828 line = &ROW(row); /* _must_ refresh */ 840 line = &ROW(row); /* _must_ refresh */
829 } 841 }
830 842
831 // some utf-8 decoders "decode" surrogate characters: let's fix this. 843 // some utf-8 decoders "decode" surrogate characters: let's fix this.
832 if (IN_RANGE_INC (c, 0xd800, 0xdfff)) 844 if (IN_RANGE_INC (c, 0xd800, 0xdfff))
833 c = 0xfffd; 845 c = 0xfffd;
834 846
835 // 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
836 // do wcwidth before further replacements, as wcwidth might return -1 848 // further replacements, as wcwidth might return -1 for the line
837 // 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
838 // locale. 850 // locale.
839 int width = c < 0x100 ? 1 : wcwidth (c); 851 int width = WCWIDTH (c);
840 852
841 if (charsets [screen.charset] == '0') // DEC SPECIAL 853 if (charsets [screen.charset] == '0') // DEC SPECIAL
842 { 854 {
843 // vt100 special graphics and line drawing 855 // vt100 special graphics and line drawing
844 // 5f-7e standard vt100 856 // 5f-7e standard vt100
… …
995/* 1007/*
996 * 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
997 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
998 */ 1010 */
999void 1011void
1000rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
1001{ 1013{
1002 want_refresh = 1; 1014 want_refresh = 1;
1003 1015
1004 if (screen.cur.col == 0) 1016 if (screen.cur.col == 0)
1005 { 1017 {
… …
1023 * Process Horizontal Tab 1035 * Process Horizontal Tab
1024 * count: +ve = forward; -ve = backwards 1036 * count: +ve = forward; -ve = backwards
1025 * XTERM_SEQ: CTRL-I 1037 * XTERM_SEQ: CTRL-I
1026 */ 1038 */
1027void 1039void
1028rxvt_term::scr_tab (int count, bool ht) 1040rxvt_term::scr_tab (int count, bool ht) NOTHROW
1029{ 1041{
1030 int i, x; 1042 int i, x;
1031 1043
1032 want_refresh = 1; 1044 want_refresh = 1;
1033 i = x = screen.cur.col; 1045 i = x = screen.cur.col;
… …
1100 * 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
1101 * in that row right. Clear left column. 1113 * in that row right. Clear left column.
1102 */ 1114 */
1103#if ENABLE_FRILLS 1115#if ENABLE_FRILLS
1104void 1116void
1105rxvt_term::scr_backindex () 1117rxvt_term::scr_backindex () NOTHROW
1106{ 1118{
1107 if (screen.cur.col > 0) 1119 if (screen.cur.col > 0)
1108 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1120 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1109 else 1121 else
1110 scr_insdel_chars (1, INSERT); 1122 scr_insdel_chars (1, INSERT);
… …
1117 * 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
1118 * in that row left. Clear right column. 1130 * in that row left. Clear right column.
1119 */ 1131 */
1120#if ENABLE_FRILLS 1132#if ENABLE_FRILLS
1121void 1133void
1122rxvt_term::scr_forwardindex () 1134rxvt_term::scr_forwardindex () NOTHROW
1123{ 1135{
1124 if (screen.cur.col < ncol - 1) 1136 if (screen.cur.col < ncol - 1)
1125 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1137 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1126 else 1138 else
1127 { 1139 {
… …
1140/* ------------------------------------------------------------------------- */ 1152/* ------------------------------------------------------------------------- */
1141/* 1153/*
1142 * Goto Row/Column 1154 * Goto Row/Column
1143 */ 1155 */
1144void 1156void
1145rxvt_term::scr_gotorc (int row, int col, int relative) 1157rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1146{ 1158{
1147 want_refresh = 1; 1159 want_refresh = 1;
1148 ZERO_SCROLLBACK (); 1160 ZERO_SCROLLBACK ();
1149 1161
1150 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; 1162 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
… …
1188/* ------------------------------------------------------------------------- */ 1200/* ------------------------------------------------------------------------- */
1189/* 1201/*
1190 * direction should be UP or DN 1202 * direction should be UP or DN
1191 */ 1203 */
1192void 1204void
1193rxvt_term::scr_index (enum page_dirn direction) 1205rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1194{ 1206{
1195 int dirn; 1207 int dirn;
1196 1208
1197 want_refresh = 1; 1209 want_refresh = 1;
1198 ZERO_SCROLLBACK (); 1210 ZERO_SCROLLBACK ();
… …
1217 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1229 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1218 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1230 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1219 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1231 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1220 */ 1232 */
1221void 1233void
1222rxvt_term::scr_erase_line (int mode) 1234rxvt_term::scr_erase_line (int mode) NOTHROW
1223{ 1235{
1224 unsigned int col, num; 1236 unsigned int col, num;
1225 1237
1226 want_refresh = 1; 1238 want_refresh = 1;
1227 ZERO_SCROLLBACK (); 1239 ZERO_SCROLLBACK ();
… …
1271 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1283 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1272 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1284 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1273 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1285 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1274 */ 1286 */
1275void 1287void
1276rxvt_term::scr_erase_screen (int mode) 1288rxvt_term::scr_erase_screen (int mode) NOTHROW
1277{ 1289{
1278 int num; 1290 int num;
1279 int32_t row; 1291 int32_t row;
1280 rend_t ren; 1292 rend_t ren;
1281 XGCValues gcvalue; 1293 XGCValues gcvalue;
… …
1341 } 1353 }
1342} 1354}
1343 1355
1344#if ENABLE_FRILLS 1356#if ENABLE_FRILLS
1345void 1357void
1346rxvt_term::scr_erase_savelines () 1358rxvt_term::scr_erase_savelines () NOTHROW
1347{ 1359{
1348 want_refresh = 1; 1360 want_refresh = 1;
1349 ZERO_SCROLLBACK (); 1361 ZERO_SCROLLBACK ();
1350 1362
1351 top_row = 0; 1363 top_row = 0;
… …
1356/* 1368/*
1357 * Fill the screen with `E's 1369 * Fill the screen with `E's
1358 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1370 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1359 */ 1371 */
1360void 1372void
1361rxvt_term::scr_E () 1373rxvt_term::scr_E () NOTHROW
1362{ 1374{
1363 rend_t fs; 1375 rend_t fs;
1364 1376
1365 want_refresh = 1; 1377 want_refresh = 1;
1366 ZERO_SCROLLBACK (); 1378 ZERO_SCROLLBACK ();
… …
1387/* ------------------------------------------------------------------------- */ 1399/* ------------------------------------------------------------------------- */
1388/* 1400/*
1389 * Insert/Delete <count> lines 1401 * Insert/Delete <count> lines
1390 */ 1402 */
1391void 1403void
1392rxvt_term::scr_insdel_lines (int count, int insdel) 1404rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1393{ 1405{
1394 int end; 1406 int end;
1395 1407
1396 ZERO_SCROLLBACK (); 1408 ZERO_SCROLLBACK ();
1397 1409
… …
1417/* ------------------------------------------------------------------------- */ 1429/* ------------------------------------------------------------------------- */
1418/* 1430/*
1419 * Insert/Delete <count> characters from the current position 1431 * Insert/Delete <count> characters from the current position
1420 */ 1432 */
1421void 1433void
1422rxvt_term::scr_insdel_chars (int count, int insdel) 1434rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1423{ 1435{
1424 int col, row; 1436 int col, row;
1425 rend_t tr; 1437 rend_t tr;
1426 1438
1427 want_refresh = 1; 1439 want_refresh = 1;
… …
1515/* 1527/*
1516 * Set the scrolling region 1528 * Set the scrolling region
1517 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1529 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1518 */ 1530 */
1519void 1531void
1520rxvt_term::scr_scroll_region (int top, int bot) 1532rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1521{ 1533{
1522 max_it (top, 0); 1534 max_it (top, 0);
1523 min_it (bot, nrow - 1); 1535 min_it (bot, nrow - 1);
1524 1536
1525 if (top > bot) 1537 if (top > bot)
… …
1535 * Make the cursor visible/invisible 1547 * Make the cursor visible/invisible
1536 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1548 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1537 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1549 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1538 */ 1550 */
1539void 1551void
1540rxvt_term::scr_cursor_visible (int mode) 1552rxvt_term::scr_cursor_visible (int mode) NOTHROW
1541{ 1553{
1542 want_refresh = 1; 1554 want_refresh = 1;
1543 1555
1544 if (mode) 1556 if (mode)
1545 screen.flags |= Screen_VisibleCursor; 1557 screen.flags |= Screen_VisibleCursor;
… …
1552 * Set/unset automatic wrapping 1564 * Set/unset automatic wrapping
1553 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1565 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1554 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1566 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1555 */ 1567 */
1556void 1568void
1557rxvt_term::scr_autowrap (int mode) 1569rxvt_term::scr_autowrap (int mode) NOTHROW
1558{ 1570{
1559 if (mode) 1571 if (mode)
1560 screen.flags |= Screen_Autowrap; 1572 screen.flags |= Screen_Autowrap;
1561 else 1573 else
1562 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); 1574 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
… …
1571 * and the cursor cannot be moved outside. 1583 * and the cursor cannot be moved outside.
1572 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1584 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1573 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1585 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1574 */ 1586 */
1575void 1587void
1576rxvt_term::scr_relative_origin (int mode) 1588rxvt_term::scr_relative_origin (int mode) NOTHROW
1577{ 1589{
1578 if (mode) 1590 if (mode)
1579 screen.flags |= Screen_Relative; 1591 screen.flags |= Screen_Relative;
1580 else 1592 else
1581 screen.flags &= ~Screen_Relative; 1593 screen.flags &= ~Screen_Relative;
… …
1588 * Set insert/replace mode 1600 * Set insert/replace mode
1589 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1601 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1590 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1602 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1591 */ 1603 */
1592void 1604void
1593rxvt_term::scr_insert_mode (int mode) 1605rxvt_term::scr_insert_mode (int mode) NOTHROW
1594{ 1606{
1595 if (mode) 1607 if (mode)
1596 screen.flags |= Screen_Insert; 1608 screen.flags |= Screen_Insert;
1597 else 1609 else
1598 screen.flags &= ~Screen_Insert; 1610 screen.flags &= ~Screen_Insert;
… …
1604 * XTERM_SEQ: Set tab at current column : ESC H 1616 * XTERM_SEQ: Set tab at current column : ESC H
1605 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1617 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1606 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1618 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1607 */ 1619 */
1608void 1620void
1609rxvt_term::scr_set_tab (int mode) 1621rxvt_term::scr_set_tab (int mode) NOTHROW
1610{ 1622{
1611 if (mode < 0) 1623 if (mode < 0)
1612 memset (tabs, 0, ncol * sizeof (char)); 1624 memset (tabs, 0, ncol * sizeof (char));
1613 else if (screen.cur.col < ncol) 1625 else if (screen.cur.col < ncol)
1614 tabs [screen.cur.col] = !!mode; 1626 tabs [screen.cur.col] = !!mode;
… …
1619 * Set reverse/normal video 1631 * Set reverse/normal video
1620 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1632 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1621 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1633 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1622 */ 1634 */
1623void 1635void
1624rxvt_term::scr_rvideo_mode (int mode) 1636rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1625{ 1637{
1626 XGCValues gcvalue; 1638 rvideo_mode = on;
1627 1639
1640#ifndef NO_BELL
1641 on ^= rvideo_bell;
1642#endif
1643
1628 if (rvideo != mode) 1644 if (rvideo_state != on)
1629 { 1645 {
1630 rvideo = mode; 1646 rvideo_state = on;
1647
1631 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); 1648 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1632#if XPM_BACKGROUND 1649#if XPM_BACKGROUND
1633 if (bgPixmap.pixmap == None) 1650 if (bgPixmap.pixmap == None)
1634#endif 1651#endif
1635#if TRANSPARENT 1652#if TRANSPARENT
1636 if (! OPTION (Opt_transparent) || am_transparent == 0) 1653 if (!OPTION (Opt_transparent) || am_transparent == 0)
1637#endif 1654#endif
1638 XSetWindowBackground (display->display, vt, 1655 XSetWindowBackground (display->display, vt, pix_colors[Color_bg]);
1639 pix_colors[Color_bg]);
1640 1656
1657 XGCValues gcvalue;
1641 gcvalue.foreground = pix_colors[Color_fg]; 1658 gcvalue.foreground = pix_colors[Color_fg];
1642 gcvalue.background = pix_colors[Color_bg]; 1659 gcvalue.background = pix_colors[Color_bg];
1643 XChangeGC (display->display, gc, GCBackground | GCForeground, 1660 XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue);
1644 &gcvalue); 1661
1645 scr_clear (); 1662 scr_clear ();
1646 scr_touch (true); 1663 scr_touch (true);
1647 } 1664 }
1648} 1665}
1649 1666
… …
1651/* 1668/*
1652 * Report current cursor position 1669 * Report current cursor position
1653 * XTERM_SEQ: Report position: ESC [ 6 n 1670 * XTERM_SEQ: Report position: ESC [ 6 n
1654 */ 1671 */
1655void 1672void
1656rxvt_term::scr_report_position () 1673rxvt_term::scr_report_position () NOTHROW
1657{ 1674{
1658 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);
1659} 1676}
1660 1677
1661/* ------------------------------------------------------------------------- * 1678/* ------------------------------------------------------------------------- *
… …
1664 1681
1665/* 1682/*
1666 * Set font style 1683 * Set font style
1667 */ 1684 */
1668void 1685void
1669rxvt_term::set_font_style () 1686rxvt_term::set_font_style () NOTHROW
1670{ 1687{
1671#if 0 1688#if 0
1672 switch (charsets [screen.charset]) 1689 switch (charsets [screen.charset])
1673 { 1690 {
1674 case '0': /* DEC Special Character & Line Drawing Set */ 1691 case '0': /* DEC Special Character & Line Drawing Set */
… …
1696 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1713 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1697 * XTERM_SEQ: Invoke G2 character set: ESC N 1714 * XTERM_SEQ: Invoke G2 character set: ESC N
1698 * XTERM_SEQ: Invoke G3 character set: ESC O 1715 * XTERM_SEQ: Invoke G3 character set: ESC O
1699 */ 1716 */
1700void 1717void
1701rxvt_term::scr_charset_choose (int set) 1718rxvt_term::scr_charset_choose (int set) NOTHROW
1702{ 1719{
1703 screen.charset = set; 1720 screen.charset = set;
1704 set_font_style (); 1721 set_font_style ();
1705} 1722}
1706 1723
… …
1712 * XTERM_SEQ: Set G2 character set: ESC * <C> 1729 * XTERM_SEQ: Set G2 character set: ESC * <C>
1713 * XTERM_SEQ: Set G3 character set: ESC + <C> 1730 * XTERM_SEQ: Set G3 character set: ESC + <C>
1714 * See set_font_style for possible values for <C> 1731 * See set_font_style for possible values for <C>
1715 */ 1732 */
1716void 1733void
1717rxvt_term::scr_charset_set (int set, unsigned int ch) 1734rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1718{ 1735{
1719 charsets[set] = (unsigned char)ch; 1736 charsets[set] = (unsigned char)ch;
1720 set_font_style (); 1737 set_font_style ();
1721} 1738}
1722 1739
… …
1727 1744
1728/* 1745/*
1729 * refresh matching text. 1746 * refresh matching text.
1730 */ 1747 */
1731bool 1748bool
1732rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1749rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1733{ 1750{
1734 bool found = false; 1751 bool found = false;
1735 1752
1736 for (int i = 0; i < nrow; i++) 1753 for (int i = 0; i < nrow; i++)
1737 { 1754 {
… …
1757 PART_END, 1774 PART_END,
1758 RC_COUNT 1775 RC_COUNT
1759}; 1776};
1760 1777
1761void 1778void
1762rxvt_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
1763{ 1780{
1764 int i; 1781 int i;
1765 row_col_t rc[RC_COUNT]; 1782 row_col_t rc[RC_COUNT];
1766 1783
1767 if (!drawn_buf) /* sanity check */ 1784 if (!drawn_buf) /* sanity check */
… …
1790 } 1807 }
1791 1808
1792 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++)
1793 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);
1794 1811
1812 num_scr_allow = 0;
1813
1795 if (refresh) 1814 if (refresh)
1796 scr_refresh (SLOW_REFRESH); 1815 scr_refresh ();
1797} 1816}
1798 1817
1799/* ------------------------------------------------------------------------- */ 1818/* ------------------------------------------------------------------------- */
1800/* 1819/*
1801 * Refresh the entire screen 1820 * Refresh the entire screen
1802 */ 1821 */
1803void 1822void
1804rxvt_term::scr_touch (bool refresh) 1823rxvt_term::scr_touch (bool refresh) NOTHROW
1805{ 1824{
1806 scr_expose (0, 0, width, height, refresh); 1825 scr_expose (0, 0, width, height, refresh);
1807} 1826}
1808 1827
1809/* ------------------------------------------------------------------------- */ 1828/* ------------------------------------------------------------------------- */
1810/* 1829/*
1811 * 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
1812 * the top of the screen 1831 * the top of the screen
1813 */ 1832 */
1814void 1833void
1815rxvt_term::scr_move_to (int y, int len) 1834rxvt_term::scr_move_to (int y, int len) NOTHROW
1816{ 1835{
1817 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); 1836 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1818} 1837}
1819 1838
1820/* ------------------------------------------------------------------------- */ 1839/* ------------------------------------------------------------------------- */
1821/* 1840/*
1822 * Page the screen up/down nlines 1841 * Page the screen up/down nlines
1823 * direction should be UP or DN 1842 * direction should be UP or DN
1824 */ 1843 */
1825bool 1844bool
1826rxvt_term::scr_page (enum page_dirn direction, int nlines) 1845rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1827{ 1846{
1828 int new_view_start = 1847 int new_view_start =
1829 direction == UP ? view_start - nlines 1848 direction == UP ? view_start - nlines
1830 : view_start + nlines; 1849 : view_start + nlines;
1831 1850
1832 return scr_changeview (new_view_start); 1851 return scr_changeview (new_view_start);
1833} 1852}
1834 1853
1835bool 1854bool
1836rxvt_term::scr_changeview (int new_view_start) 1855rxvt_term::scr_changeview (int new_view_start) NOTHROW
1837{ 1856{
1838 clamp_it (new_view_start, top_row, 0); 1857 clamp_it (new_view_start, top_row, 0);
1839 1858
1840 if (new_view_start == view_start) 1859 if (new_view_start == view_start)
1841 return false; 1860 return false;
… …
1847 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));
1848 1867
1849 return true; 1868 return true;
1850} 1869}
1851 1870
1852/* ------------------------------------------------------------------------- */ 1871#ifndef NO_BELL
1853void 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
1854rxvt_term::scr_bell () 1882rxvt_term::scr_bell () NOTHROW
1855{ 1883{
1856#ifndef NO_BELL 1884#ifndef NO_BELL
1857 1885
1858# ifndef NO_MAPALERT 1886# ifndef NO_MAPALERT
1859# ifdef MAPALERT_OPTION 1887# ifdef MAPALERT_OPTION
… …
1862 XMapWindow (display->display, parent[0]); 1890 XMapWindow (display->display, parent[0]);
1863# endif 1891# endif
1864 1892
1865 if (OPTION (Opt_visualBell)) 1893 if (OPTION (Opt_visualBell))
1866 { 1894 {
1867 scr_rvideo_mode (!rvideo); /* refresh also done */ 1895 rvideo_bell = true;
1896 scr_rvideo_mode (rvideo_mode);
1868 display->flush (); 1897 display->flush ();
1869 rxvt_usleep (VISUAL_BELL_DURATION); 1898
1870 scr_rvideo_mode (!rvideo); /* refresh also done */ 1899 bell_ev.start (NOW + VISUAL_BELL_DURATION);
1871 } 1900 }
1872 else 1901 else
1873 XBell (display->display, 0); 1902 XBell (display->display, 0);
1874 1903
1875#endif 1904#endif
1876} 1905}
1877 1906
1878/* ------------------------------------------------------------------------- */ 1907/* ------------------------------------------------------------------------- */
1879/* ARGSUSED */ 1908/* ARGSUSED */
1880void 1909void
1881rxvt_term::scr_printscreen (int fullhist) 1910rxvt_term::scr_printscreen (int fullhist) NOTHROW
1882{ 1911{
1883#ifdef PRINTPIPE 1912#ifdef PRINTPIPE
1884 int nrows, row_start; 1913 int nrows, row_start;
1885 FILE *fd; 1914 FILE *fd;
1886 1915
… …
1935 * Refresh the screen 1964 * Refresh the screen
1936 * drawn_text/drawn_rend contain the screen information before the update. 1965 * drawn_text/drawn_rend contain the screen information before the update.
1937 * screen.text/screen.rend contain what the screen will change to. 1966 * screen.text/screen.rend contain what the screen will change to.
1938 */ 1967 */
1939void 1968void
1940rxvt_term::scr_refresh (unsigned char refresh_type) 1969rxvt_term::scr_refresh () NOTHROW
1941{ 1970{
1942 unsigned char must_clear, /* use draw_string not draw_image_string */ 1971 unsigned char must_clear, /* use draw_string not draw_image_string */
1943 showcursor; /* show the cursor */ 1972 showcursor; /* show the cursor */
1944 int16_t col, row, /* column/row we're processing */ 1973 int16_t col, row, /* column/row we're processing */
1945 ocrow; /* old cursor row */ 1974 ocrow; /* old cursor row */
… …
2069#ifndef NO_SLOW_LINK_SUPPORT 2098#ifndef NO_SLOW_LINK_SUPPORT
2070 /* 2099 /*
2071 * D: CopyArea pass - very useful for slower links 2100 * D: CopyArea pass - very useful for slower links
2072 * This has been deliberately kept simple. 2101 * This has been deliberately kept simple.
2073 */ 2102 */
2074 i = num_scr;
2075 if (!display->is_local 2103 if (!display->is_local
2076 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr 2104 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2077 && abs (num_scr) < nrow && !must_clear) 2105 && abs (num_scr) < nrow && !must_clear)
2078 { 2106 {
2079 int16_t nits; 2107 int16_t nits;
2080 int j; 2108 int j;
2081 int len, wlen; 2109 int len, wlen;
2110 dLocal (int, num_scr);
2082 2111
2083 j = nrow; 2112 j = nrow;
2084 wlen = len = -1; 2113 wlen = len = -1;
2085 row = i > 0 ? 0 : j - 1; 2114 row = i > 0 ? 0 : j - 1;
2086 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2115 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
… …
2386 num_scr = 0; 2415 num_scr = 0;
2387 num_scr_allow = 1; 2416 num_scr_allow = 1;
2388} 2417}
2389 2418
2390void 2419void
2391rxvt_term::scr_remap_chars (line_t &l) 2420rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2392{ 2421{
2393 if (!l.t) 2422 if (!l.t)
2394 return; 2423 return;
2395 2424
2396 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant 2425 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
… …
2398 for (int i = ncol; i--; ) 2427 for (int i = ncol; i--; )
2399 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); 2428 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2400} 2429}
2401 2430
2402void 2431void
2403rxvt_term::scr_remap_chars () 2432rxvt_term::scr_remap_chars () NOTHROW
2404{ 2433{
2405 for (int i = total_rows; i--; ) 2434 for (int i = total_rows; i--; )
2406 scr_remap_chars (row_buf [i]); 2435 scr_remap_chars (row_buf [i]);
2407 2436
2408 for (int i = nrow; i--; ) 2437 for (int i = nrow; i--; )
… …
2411 scr_remap_chars (swap_buf [i]); 2440 scr_remap_chars (swap_buf [i]);
2412 } 2441 }
2413} 2442}
2414 2443
2415void 2444void
2416rxvt_term::scr_recolour () 2445rxvt_term::scr_recolour () NOTHROW
2417{ 2446{
2418 if (1 2447 if (1
2419#if TRANSPARENT 2448#if TRANSPARENT
2420 && !am_transparent 2449 && !am_transparent
2421#endif 2450#endif
… …
2442 want_refresh = 1; 2471 want_refresh = 1;
2443} 2472}
2444 2473
2445/* ------------------------------------------------------------------------- */ 2474/* ------------------------------------------------------------------------- */
2446void 2475void
2447rxvt_term::scr_clear (bool really) 2476rxvt_term::scr_clear (bool really) NOTHROW
2448{ 2477{
2449 if (!mapped) 2478 if (!mapped)
2450 return; 2479 return;
2451 2480
2452 num_scr_allow = 0; 2481 num_scr_allow = 0;
… …
2455 if (really) 2484 if (really)
2456 XClearWindow (display->display, vt); 2485 XClearWindow (display->display, vt);
2457} 2486}
2458 2487
2459void 2488void
2460rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) 2489rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2461{ 2490{
2462 int view_end = view_start + nrow; 2491 int view_end = view_start + nrow;
2463 int row, col; 2492 int row, col;
2464 2493
2465 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) 2494 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
… …
2477 srp[col] ^= rstyle2; 2506 srp[col] ^= rstyle2;
2478 } 2507 }
2479} 2508}
2480 2509
2481void 2510void
2482rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) 2511rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2483{ 2512{
2484 int view_end = view_start + nrow; 2513 int view_end = view_start + nrow;
2485 int row, col; 2514 int row, col;
2486 2515
2487 if (beg_row >= view_start) 2516 if (beg_row >= view_start)
… …
2504 srp[col] ^= rstyle; 2533 srp[col] ^= rstyle;
2505} 2534}
2506 2535
2507/* ------------------------------------------------------------------------- */ 2536/* ------------------------------------------------------------------------- */
2508void 2537void
2509rxvt_term::scr_reverse_selection () 2538rxvt_term::scr_reverse_selection () NOTHROW
2510{ 2539{
2511 if (selection.op 2540 if (selection.op
2512 && current_screen == selection.screen 2541 && current_screen == selection.screen
2513 && selection.end.row >= view_start) 2542 && selection.end.row >= view_start)
2514 { 2543 {
… …
2530 * Dump the whole scrollback and screen to the passed filedescriptor. The 2559 * Dump the whole scrollback and screen to the passed filedescriptor. The
2531 * invoking routine must close the fd. 2560 * invoking routine must close the fd.
2532 */ 2561 */
2533#if 0 2562#if 0
2534void 2563void
2535rxvt_term::scr_dump (int fd) 2564rxvt_term::scr_dump (int fd) NOTHROW
2536{ 2565{
2537 int row, wrote; 2566 int row, wrote;
2538 unsigned int width, towrite; 2567 unsigned int width, towrite;
2539 char r1[] = "\n"; 2568 char r1[] = "\n";
2540 2569
… …
2559 2588
2560/* ------------------------------------------------------------------------- * 2589/* ------------------------------------------------------------------------- *
2561 * CHARACTER SELECTION * 2590 * CHARACTER SELECTION *
2562 * ------------------------------------------------------------------------- */ 2591 * ------------------------------------------------------------------------- */
2563void 2592void
2564rxvt_term::selection_check (int check_more) 2593rxvt_term::selection_check (int check_more) NOTHROW
2565{ 2594{
2566 row_col_t pos; 2595 row_col_t pos;
2567 2596
2568 if (!selection.op) 2597 if (!selection.op)
2569 return; 2598 return;
… …
2590/* ------------------------------------------------------------------------- */ 2619/* ------------------------------------------------------------------------- */
2591/* 2620/*
2592 * Paste a selection direct to the command fd 2621 * Paste a selection direct to the command fd
2593 */ 2622 */
2594void 2623void
2595rxvt_term::paste (char *data, unsigned int len) 2624rxvt_term::paste (char *data, unsigned int len) NOTHROW
2596{ 2625{
2597 /* convert normal newline chars into common keyboard Return key sequence */ 2626 /* convert normal newline chars into common keyboard Return key sequence */
2598 for (unsigned int i = 0; i < len; i++) 2627 for (unsigned int i = 0; i < len; i++)
2599 if (data[i] == C0_LF) 2628 if (data[i] == C0_LF)
2600 data[i] = C0_CR; 2629 data[i] = C0_CR;
… …
2606/* 2635/*
2607 * Respond to a notification that a primary selection has been sent 2636 * Respond to a notification that a primary selection has been sent
2608 * EXT: SelectionNotify 2637 * EXT: SelectionNotify
2609 */ 2638 */
2610void 2639void
2611rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2640rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2612{ 2641{
2613 if (prop == None) /* check for failed XConvertSelection */ 2642 if (prop == None) /* check for failed XConvertSelection */
2614 { 2643 {
2615 if ((selection_type & Sel_CompoundText)) 2644 if ((selection_type & Sel_CompoundText))
2616 { 2645 {
… …
2768 if (selection_wait == Sel_normal) 2797 if (selection_wait == Sel_normal)
2769 selection_wait = Sel_none; 2798 selection_wait = Sel_none;
2770} 2799}
2771 2800
2772void 2801void
2773rxvt_term::incr_cb (time_watcher &w) 2802rxvt_term::incr_cb (time_watcher &w) NOTHROW
2774{ 2803{
2775 selection_wait = Sel_none; 2804 selection_wait = Sel_none;
2776 2805
2777 incr_buf_size = 0; 2806 incr_buf_size = 0;
2778 free (incr_buf); 2807 free (incr_buf);
2779 2808
2780 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); 2809 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2781} 2810}
2782 2811
2783void 2812void
2784rxvt_term::selection_property (Window win, Atom prop) 2813rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2785{ 2814{
2786 if (prop == None || selection_wait != Sel_incr) 2815 if (prop == None || selection_wait != Sel_incr)
2787 return; 2816 return;
2788 2817
2789 selection_paste (win, prop, true); 2818 selection_paste (win, prop, true);
… …
2798 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2827 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2799 * will auto fallback to CUT_BUFFER0 2828 * will auto fallback to CUT_BUFFER0
2800 * EXT: button 2 release 2829 * EXT: button 2 release
2801 */ 2830 */
2802void 2831void
2803rxvt_term::selection_request (Time tm, int x, int y) 2832rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2804{ 2833{
2805 if (x < 0 || x >= width || y < 0 || y >= height) 2834 if (selection.text && selnum == Sel_Primary)
2806 return; /* outside window */
2807
2808 if (selection.text)
2809 { /* internal selection */ 2835 { /* internal selection */
2810 char *str = rxvt_wcstombs (selection.text, selection.len); 2836 char *str = rxvt_wcstombs (selection.text, selection.len);
2811 paste (str, strlen (str)); 2837 paste (str, strlen (str));
2812 free (str); 2838 free (str);
2813 return; 2839 return;
2814 } 2840 }
2815 else 2841 else
2816 { 2842 {
2817 int i;
2818
2819 selection_request_time = tm; 2843 selection_request_time = tm;
2820 selection_wait = Sel_normal; 2844 selection_wait = Sel_normal;
2821 2845
2822 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2823 {
2824#if X_HAVE_UTF8_STRING 2846#if X_HAVE_UTF8_STRING
2825 selection_type = Sel_UTF8String; 2847 selection_type = Sel_UTF8String;
2826 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2848 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2827 return; 2849 return;
2828#else 2850#else
2829 selection_type = Sel_CompoundText; 2851 selection_type = Sel_CompoundText;
2830 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2852 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2831 return; 2853 return;
2832#endif 2854#endif
2833 }
2834 } 2855 }
2835 2856
2836 selection_wait = Sel_none; /* don't loop in selection_paste () */ 2857 selection_wait = Sel_none; /* don't loop in selection_paste () */
2837 selection_paste (display->root, XA_CUT_BUFFER0, false); 2858 selection_paste (display->root, XA_CUT_BUFFER0, false);
2838} 2859}
2839 2860
2840int 2861int
2841rxvt_term::selection_request_other (Atom target, int selnum) 2862rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2842{ 2863{
2843 Atom sel; 2864 Atom sel;
2844 2865
2845 selection_type |= selnum; 2866 selection_type |= selnum;
2846 2867
… …
2865/* 2886/*
2866 * Clear all selected text 2887 * Clear all selected text
2867 * EXT: SelectionClear 2888 * EXT: SelectionClear
2868 */ 2889 */
2869void 2890void
2870rxvt_term::selection_clear () 2891rxvt_term::selection_clear () NOTHROW
2871{ 2892{
2872 want_refresh = 1; 2893 want_refresh = 1;
2873 free (selection.text); 2894 free (selection.text);
2874 selection.text = NULL; 2895 selection.text = NULL;
2875 selection.len = 0; 2896 selection.len = 0;
… …
3010 3031
3011 selection_grab (tm); 3032 selection_grab (tm);
3012} 3033}
3013 3034
3014bool 3035bool
3015rxvt_term::selection_grab (Time tm) 3036rxvt_term::selection_grab (Time tm) NOTHROW
3016{ 3037{
3017 selection_time = tm; 3038 selection_time = tm;
3018 3039
3019 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); 3040 XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm);
3020 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) 3041 if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt)
… …
3043/* 3064/*
3044 * Mark or select text based upon number of clicks: 1, 2, or 3 3065 * Mark or select text based upon number of clicks: 1, 2, or 3
3045 * EXT: button 1 press 3066 * EXT: button 1 press
3046 */ 3067 */
3047void 3068void
3048rxvt_term::selection_click (int clicks, int x, int y) 3069rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
3049{ 3070{
3050 clicks = ((clicks - 1) % 3) + 1; 3071 clicks = ((clicks - 1) % 3) + 1;
3051 selection.clicks = clicks; /* save clicks so extend will work */ 3072 selection.clicks = clicks; /* save clicks so extend will work */
3052 3073
3053 if (clicks == 2 && !selection.rect 3074 if (clicks == 2 && !selection.rect
… …
3072/* ------------------------------------------------------------------------- */ 3093/* ------------------------------------------------------------------------- */
3073/* 3094/*
3074 * Mark a selection at the specified col/row 3095 * Mark a selection at the specified col/row
3075 */ 3096 */
3076void 3097void
3077rxvt_term::selection_start_colrow (int col, int row) 3098rxvt_term::selection_start_colrow (int col, int row) NOTHROW
3078{ 3099{
3079 want_refresh = 1; 3100 want_refresh = 1;
3080 3101
3081 selection.mark.row = row + view_start; 3102 selection.mark.row = row + view_start;
3082 selection.mark.col = col; 3103 selection.mark.col = col;
… …
3108#define DELIMIT_TEXT(x) \ 3129#define DELIMIT_TEXT(x) \
3109 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) 3130 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
3110#define DELIMIT_REND(x) 1 3131#define DELIMIT_REND(x) 1
3111 3132
3112void 3133void
3113rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3134rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
3114{ 3135{
3115 int col, row, dirnadd, tcol, trow, w1, w2; 3136 int col, row, dirnadd, tcol, trow, w1, w2;
3116 row_col_t bound; 3137 row_col_t bound;
3117 text_t *stp; 3138 text_t *stp;
3118 rend_t *srp; 3139 rend_t *srp;
… …
3192 * flag == 0 ==> button 1 3213 * flag == 0 ==> button 1
3193 * flag == 1 ==> button 3 press 3214 * flag == 1 ==> button 3 press
3194 * flag == 2 ==> button 3 motion 3215 * flag == 2 ==> button 3 motion
3195 */ 3216 */
3196void 3217void
3197rxvt_term::selection_extend (int x, int y, int flag) 3218rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3198{ 3219{
3199 int col = clamp (Pixel2Col (x), 0, ncol); 3220 int col = clamp (Pixel2Col (x), 0, ncol);
3200 int row = clamp (Pixel2Row (y), 0, nrow - 1); 3221 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3201 3222
3202 /* 3223 /*
… …
3228/* ------------------------------------------------------------------------- */ 3249/* ------------------------------------------------------------------------- */
3229/* 3250/*
3230 * Extend the selection to the specified col/row 3251 * Extend the selection to the specified col/row
3231 */ 3252 */
3232void 3253void
3233rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3254rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3234{ 3255{
3235 row_col_t pos; 3256 row_col_t pos;
3236 enum { 3257 enum {
3237 LEFT, RIGHT 3258 LEFT, RIGHT
3238 } closeto = RIGHT; 3259 } closeto = RIGHT;
… …
3424#endif 3445#endif
3425} 3446}
3426 3447
3427#if ENABLE_FRILLS 3448#if ENABLE_FRILLS
3428void 3449void
3429rxvt_term::selection_remove_trailing_spaces () 3450rxvt_term::selection_remove_trailing_spaces () NOTHROW
3430{ 3451{
3431 int32_t end_col, end_row; 3452 int32_t end_col, end_row;
3432 text_t *stp; 3453 text_t *stp;
3433 3454
3434 end_col = selection.end.col; 3455 end_col = selection.end.col;
… …
3472/* 3493/*
3473 * Double click on button 3 when already selected 3494 * Double click on button 3 when already selected
3474 * EXT: button 3 double click 3495 * EXT: button 3 double click
3475 */ 3496 */
3476void 3497void
3477rxvt_term::selection_rotate (int x, int y) 3498rxvt_term::selection_rotate (int x, int y) NOTHROW
3478{ 3499{
3479 selection.clicks = selection.clicks % 3 + 1; 3500 selection.clicks = selection.clicks % 3 + 1;
3480 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3501 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3481} 3502}
3482 3503
… …
3484/* 3505/*
3485 * Respond to a request for our current selection 3506 * Respond to a request for our current selection
3486 * EXT: SelectionRequest 3507 * EXT: SelectionRequest
3487 */ 3508 */
3488void 3509void
3489rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3510rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3490{ 3511{
3491 XSelectionEvent ev; 3512 XSelectionEvent ev;
3492 dDisp; 3513 dDisp;
3493 3514
3494 ev.type = SelectionNotify; 3515 ev.type = SelectionNotify;
… …
3622 3643
3623/* 3644/*
3624 * return col/row values corresponding to x/y pixel values 3645 * return col/row values corresponding to x/y pixel values
3625 */ 3646 */
3626void 3647void
3627rxvt_term::pixel_position (int *x, int *y) 3648rxvt_term::pixel_position (int *x, int *y) NOTHROW
3628{ 3649{
3629 *x = Pixel2Col (*x); 3650 *x = Pixel2Col (*x);
3630 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ 3651 /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
3631 *y = Pixel2Row (*y); 3652 *y = Pixel2Row (*y);
3632 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ 3653 /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
3633} 3654}
3634 3655
3635/* ------------------------------------------------------------------------- */ 3656/* ------------------------------------------------------------------------- */
3636#ifdef USE_XIM 3657#ifdef USE_XIM
3637void 3658void
3638rxvt_term::im_set_position (XPoint &pos) 3659rxvt_term::im_set_position (XPoint &pos) NOTHROW
3639{ 3660{
3640 XWindowAttributes xwa; 3661 XWindowAttributes xwa;
3641 3662
3642 XGetWindowAttributes (display->display, vt, &xwa); 3663 XGetWindowAttributes (display->display, vt, &xwa);
3643 3664
… …
3646} 3667}
3647#endif 3668#endif
3648 3669
3649#if ENABLE_OVERLAY 3670#if ENABLE_OVERLAY
3650void 3671void
3651rxvt_term::scr_overlay_new (int x, int y, int w, int h) 3672rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3652{ 3673{
3653 if (nrow < 1 || ncol < 1) 3674 if (nrow < 1 || ncol < 1)
3654 return; 3675 return;
3655 3676
3656 want_refresh = 1; 3677 want_refresh = 1;
… …
3701 *rp = r; 3722 *rp = r;
3702 } 3723 }
3703} 3724}
3704 3725
3705void 3726void
3706rxvt_term::scr_overlay_off () 3727rxvt_term::scr_overlay_off () NOTHROW
3707{ 3728{
3708 if (!ov_text) 3729 if (!ov_text)
3709 return; 3730 return;
3710 3731
3711 want_refresh = 1; 3732 want_refresh = 1;
… …
3719 delete [] ov_text; ov_text = 0; 3740 delete [] ov_text; ov_text = 0;
3720 delete [] ov_rend; ov_rend = 0; 3741 delete [] ov_rend; ov_rend = 0;
3721} 3742}
3722 3743
3723void 3744void
3724rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) 3745rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3725{ 3746{
3726 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) 3747 if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2)
3727 return; 3748 return;
3728 3749
3729 x++, y++; 3750 x++, y++;
… …
3731 ov_text[y][x] = text; 3752 ov_text[y][x] = text;
3732 ov_rend[y][x] = rend; 3753 ov_rend[y][x] = rend;
3733} 3754}
3734 3755
3735void 3756void
3736rxvt_term::scr_overlay_set (int x, int y, const char *s) 3757rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3737{ 3758{
3738 while (*s) 3759 while (*s)
3739 scr_overlay_set (x++, y, *s++); 3760 scr_overlay_set (x++, y, *s++);
3740} 3761}
3741 3762
3742void 3763void
3743rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) 3764rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3744{ 3765{
3745 while (*s) 3766 while (*s)
3746 { 3767 {
3747 text_t t = *s++; 3768 text_t t = *s++;
3748 int width = wcwidth (t); 3769 int width = wcwidth (t);
… …
3754 } 3775 }
3755 } 3776 }
3756} 3777}
3757 3778
3758void 3779void
3759rxvt_term::scr_swap_overlay () 3780rxvt_term::scr_swap_overlay () NOTHROW
3760{ 3781{
3761 if (!ov_text) 3782 if (!ov_text)
3762 return; 3783 return;
3763 3784
3764 // swap screen mem with overlay 3785 // swap screen mem with overlay

Diff Legend

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