1 | /*--------------------------------*-C-*--------------------------------------* |
1 | /*---------------------------------------------------------------------------* |
2 | * File: screen.C |
2 | * File: screen.C |
3 | *---------------------------------------------------------------------------* |
3 | *---------------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
5 | * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
… | |
… | |
47 | |
47 | |
48 | /* ------------------------------------------------------------------------- * |
48 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
50 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
51 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
52 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
53 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
54 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
55 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
56 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
57 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
93 | */ |
93 | */ |
94 | #define drawBuffer vt |
94 | #define drawBuffer vt |
95 | |
95 | |
96 | #define CLEAR_ROWS(row, num) \ |
96 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
97 | if (mapped) \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
98 | XClearArea (dpy, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
100 | (unsigned int)Height2Pixel (num), False) |
101 | |
101 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
102 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
103 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | XClearArea (dpy, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
106 | (unsigned int)Height2Pixel (1), False) |
107 | |
107 | |
108 | #define ERASE_ROWS(row, num) \ |
108 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | XFillRectangle (dpy, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
110 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
111 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
112 | (unsigned int)Height2Pixel (num)) |
113 | |
113 | |
114 | /* ------------------------------------------------------------------------- * |
114 | /* ------------------------------------------------------------------------- * |
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. */ |
119 | void |
119 | void |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
121 | { |
121 | { |
122 | if (!l.t) |
122 | if (!l.t) |
123 | { |
123 | { |
124 | lalloc (l); |
124 | lalloc (l); |
125 | col = 0; |
125 | col = 0; |
126 | width = ncol; |
126 | width = ncol; |
127 | } |
127 | } |
128 | |
128 | |
129 | l.touch (); |
129 | l.touch (); |
130 | |
130 | |
131 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
133 | |
134 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
136 | |
136 | |
… | |
… | |
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 */ |
146 | void |
146 | void |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const |
147 | rxvt_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 | |
… | |
… | |
348 | |
350 | |
349 | line_t &pline = old_buf [prow]; |
351 | line_t &pline = old_buf [prow]; |
350 | |
352 | |
351 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
352 | |
354 | |
353 | assert (len); |
|
|
354 | assert (pline.t); |
|
|
355 | |
|
|
356 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
357 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
356 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
358 | |
357 | |
359 | lofs += len; |
358 | lofs += len; |
360 | qcol += len; |
359 | qcol += len; |
… | |
… | |
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 | */ |
426 | void |
429 | void |
427 | rxvt_term::scr_release () |
430 | rxvt_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 (tabs); |
440 | free (tabs); |
436 | |
441 | |
437 | row_buf = 0; // signal that we freed all the arrays |
442 | row_buf = 0; // signal that we freed all the arrays |
|
|
443 | } |
438 | } |
444 | } |
439 | |
445 | |
440 | /* ------------------------------------------------------------------------- */ |
446 | /* ------------------------------------------------------------------------- */ |
441 | /* |
447 | /* |
442 | * Hard reset |
448 | * Hard reset |
… | |
… | |
459 | * Save and Restore cursor |
465 | * Save and Restore cursor |
460 | * XTERM_SEQ: Save cursor : ESC 7 |
466 | * XTERM_SEQ: Save cursor : ESC 7 |
461 | * XTERM_SEQ: Restore cursor: ESC 8 |
467 | * XTERM_SEQ: Restore cursor: ESC 8 |
462 | */ |
468 | */ |
463 | void |
469 | void |
464 | rxvt_term::scr_cursor (int mode) |
470 | rxvt_term::scr_cursor (cursor_mode mode) NOTHROW |
465 | { |
471 | { |
466 | screen_t *s; |
472 | screen_t *s; |
467 | |
473 | |
468 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
474 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
469 | if (current_screen == SECONDARY) |
475 | if (current_screen == SECONDARY) |
… | |
… | |
501 | assert (s->cur.row >= 0); |
507 | assert (s->cur.row >= 0); |
502 | assert (s->cur.col >= 0); |
508 | assert (s->cur.col >= 0); |
503 | #endif |
509 | #endif |
504 | } |
510 | } |
505 | |
511 | |
|
|
512 | void |
|
|
513 | rxvt_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 | |
506 | /* ------------------------------------------------------------------------- */ |
527 | /* ------------------------------------------------------------------------- */ |
507 | /* |
528 | /* |
508 | * Swap between primary and secondary screens |
529 | * Swap between primary and secondary screens |
509 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
530 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
510 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
531 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
511 | */ |
532 | */ |
512 | int |
533 | void |
513 | rxvt_term::scr_change_screen (int scrn) |
534 | rxvt_term::scr_change_screen (int scrn) |
514 | { |
535 | { |
|
|
536 | if (scrn == current_screen) |
|
|
537 | return; |
|
|
538 | |
515 | want_refresh = 1; |
539 | want_refresh = 1; |
516 | view_start = 0; |
540 | view_start = 0; |
517 | |
541 | |
518 | if (current_screen == scrn) |
|
|
519 | return scrn; |
|
|
520 | |
|
|
521 | selection_check (2); /* check for boundary cross */ |
542 | selection_check (2); /* check for boundary cross */ |
522 | |
543 | |
523 | int i = current_screen; current_screen = scrn; scrn = i; |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
524 | |
545 | |
525 | ::swap (screen.cur.row, swap.cur.row); |
|
|
526 | ::swap (screen.cur.col, swap.cur.col); |
|
|
527 | |
|
|
528 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
529 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
530 | |
|
|
531 | #if NSCREENS |
546 | #if NSCREENS |
532 | if (OPTION (Opt_secondaryScreen)) |
547 | if (option (Opt_secondaryScreen)) |
533 | { |
548 | { |
534 | num_scr = 0; |
549 | num_scr = 0; |
535 | |
550 | |
536 | for (int i = prev_nrow; i--; ) |
551 | scr_swap_screen (); |
537 | ::swap (ROW(i), swap_buf [i]); |
|
|
538 | |
552 | |
539 | ::swap (screen.charset, swap.charset); |
553 | ::swap (screen.charset, swap.charset); |
540 | ::swap (screen.flags, swap.flags); |
554 | ::swap (screen.flags, swap.flags); |
541 | screen.flags |= Screen_VisibleCursor; |
555 | screen.flags |= Screen_VisibleCursor; |
542 | swap.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
543 | } |
557 | } |
544 | else |
558 | else |
545 | #endif |
559 | #endif |
546 | if (OPTION (Opt_secondaryScroll)) |
560 | if (option (Opt_secondaryScroll)) |
547 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
548 | |
|
|
549 | return scrn; |
|
|
550 | } |
562 | } |
551 | |
563 | |
552 | // clear WrapNext indicator, solidifying position on next line |
564 | // clear WrapNext indicator, solidifying position on next line |
553 | void |
565 | void |
554 | rxvt_term::scr_do_wrap () |
566 | rxvt_term::scr_do_wrap () NOTHROW |
555 | { |
567 | { |
556 | if (!(screen.flags & Screen_WrapNext)) |
568 | if (!(screen.flags & Screen_WrapNext)) |
557 | return; |
569 | return; |
558 | |
570 | |
559 | screen.flags &= ~Screen_WrapNext; |
571 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
569 | /* ------------------------------------------------------------------------- */ |
581 | /* ------------------------------------------------------------------------- */ |
570 | /* |
582 | /* |
571 | * Change the colour for following text |
583 | * Change the colour for following text |
572 | */ |
584 | */ |
573 | void |
585 | void |
574 | rxvt_term::scr_color (unsigned int color, int fgbg) |
586 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
575 | { |
587 | { |
576 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
588 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
577 | color = fgbg; |
589 | color = fgbg; |
578 | |
590 | |
579 | if (fgbg == Color_fg) |
591 | if (fgbg == Color_fg) |
… | |
… | |
585 | /* ------------------------------------------------------------------------- */ |
597 | /* ------------------------------------------------------------------------- */ |
586 | /* |
598 | /* |
587 | * Change the rendition style for following text |
599 | * Change the rendition style for following text |
588 | */ |
600 | */ |
589 | void |
601 | void |
590 | rxvt_term::scr_rendition (int set, int style) |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
591 | { |
603 | { |
592 | if (set) |
604 | if (set) |
593 | rstyle |= style; |
605 | rstyle |= style; |
594 | else if (style == ~RS_None) |
606 | else if (style == ~RS_None) |
595 | rstyle = DEFAULT_RSTYLE; |
607 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
602 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
603 | * count positive ==> scroll up |
615 | * count positive ==> scroll up |
604 | * count negative ==> scroll down |
616 | * count negative ==> scroll down |
605 | */ |
617 | */ |
606 | int |
618 | int |
607 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
619 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
608 | { |
620 | { |
609 | if (count == 0 || (row1 > row2)) |
621 | if (count == 0 || (row1 > row2)) |
610 | return 0; |
622 | return 0; |
611 | |
623 | |
612 | want_refresh = 1; |
624 | want_refresh = 1; |
613 | num_scr += count; |
625 | num_scr += count; |
614 | |
626 | |
615 | if (count > 0 |
627 | if (count > 0 |
616 | && row1 == 0 |
628 | && row1 == 0 |
617 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
629 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
618 | { |
630 | { |
619 | top_row = max (top_row - count, -saveLines); |
631 | top_row = max (top_row - count, -saveLines); |
620 | |
632 | |
621 | // scroll everything up 'count' lines |
633 | // scroll everything up 'count' lines |
622 | term_start = (term_start + count) % total_rows; |
634 | term_start = (term_start + count) % total_rows; |
… | |
… | |
629 | } |
641 | } |
630 | |
642 | |
631 | // erase newly scrolled-in lines |
643 | // erase newly scrolled-in lines |
632 | for (int i = count; i--; ) |
644 | for (int i = count; i--; ) |
633 | { |
645 | { |
634 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
635 | // it is worth the effort on slower machines |
|
|
636 | line_t &l = ROW(nrow - 1 - i); |
646 | line_t &l = ROW(nrow - 1 - i); |
637 | |
647 | |
|
|
648 | // optimize if already cleared, can be significant on slow machines |
|
|
649 | // could be rolled into scr_blank_screen_mem |
|
|
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
651 | { |
638 | scr_blank_line (l, 0, l.l, rstyle); |
652 | scr_blank_line (l, 0, l.l, rstyle); |
639 | |
|
|
640 | l.l = 0; |
653 | l.l = 0; |
641 | l.f = 0; |
654 | l.f = 0; |
|
|
655 | } |
|
|
656 | else |
|
|
657 | scr_blank_screen_mem (l, rstyle); |
642 | } |
658 | } |
643 | |
659 | |
644 | // now copy lines below the scroll region bottom to the |
660 | // now copy lines below the scroll region bottom to the |
645 | // bottom of the screen again, so they look as if they |
661 | // bottom of the screen again, so they look as if they |
646 | // hadn't moved. |
662 | // hadn't moved. |
… | |
… | |
668 | selection.op = SELECTION_CLEAR; |
684 | selection.op = SELECTION_CLEAR; |
669 | } |
685 | } |
670 | } |
686 | } |
671 | |
687 | |
672 | // finally move the view window, if desired |
688 | // finally move the view window, if desired |
673 | if (OPTION (Opt_scrollWithBuffer) |
689 | if (option (Opt_scrollWithBuffer) |
674 | && view_start != 0 |
690 | && view_start != 0 |
675 | && view_start != -saveLines) |
691 | && view_start != -saveLines) |
676 | scr_page (UP, count); |
692 | scr_page (UP, count); |
677 | |
693 | |
678 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
730 | /* ------------------------------------------------------------------------- */ |
746 | /* ------------------------------------------------------------------------- */ |
731 | /* |
747 | /* |
732 | * Add text given in <str> of length <len> to screen struct |
748 | * Add text given in <str> of length <len> to screen struct |
733 | */ |
749 | */ |
734 | void |
750 | void |
735 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
751 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
736 | { |
752 | { |
737 | if (len <= 0) /* sanity */ |
753 | if (len <= 0) /* sanity */ |
738 | return; |
754 | return; |
739 | |
755 | |
740 | unsigned char checksel; |
756 | unsigned char checksel; |
… | |
… | |
746 | ZERO_SCROLLBACK (); |
762 | ZERO_SCROLLBACK (); |
747 | |
763 | |
748 | if (minlines > 0) |
764 | if (minlines > 0) |
749 | { |
765 | { |
750 | minlines += screen.cur.row - screen.bscroll; |
766 | minlines += screen.cur.row - screen.bscroll; |
|
|
767 | min_it (minlines, screen.cur.row - top_row); |
751 | |
768 | |
752 | if (minlines > 0 |
769 | if (minlines > 0 |
753 | && screen.tscroll == 0 |
770 | && screen.tscroll == 0 |
754 | && screen.bscroll == nrow - 1) |
771 | && screen.bscroll == nrow - 1) |
755 | { |
772 | { |
… | |
… | |
829 | |
846 | |
830 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
831 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
832 | c = 0xfffd; |
849 | c = 0xfffd; |
833 | |
850 | |
834 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
851 | // rely on wcwidth to tell us the character width, do wcwidth before |
835 | // do wcwidth before further replacements, as wcwidth might return -1 |
852 | // further replacements, as wcwidth might return -1 for the line |
836 | // for the line drawing characters below as they might be invalid in the current |
853 | // drawing characters below as they might be invalid in the current |
837 | // locale. |
854 | // locale. |
838 | int width = c < 0x100 ? 1 : wcwidth (c); |
855 | int width = WCWIDTH (c); |
839 | |
856 | |
840 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
841 | { |
858 | { |
842 | // vt100 special graphics and line drawing |
859 | // vt100 special graphics and line drawing |
843 | // 5f-7e standard vt100 |
860 | // 5f-7e standard vt100 |
… | |
… | |
994 | /* |
1011 | /* |
995 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1012 | * Process Backspace. Move back the cursor back a position, wrap if have to |
996 | * XTERM_SEQ: CTRL-H |
1013 | * XTERM_SEQ: CTRL-H |
997 | */ |
1014 | */ |
998 | void |
1015 | void |
999 | rxvt_term::scr_backspace () |
1016 | rxvt_term::scr_backspace () NOTHROW |
1000 | { |
1017 | { |
1001 | want_refresh = 1; |
1018 | want_refresh = 1; |
1002 | |
1019 | |
1003 | if (screen.cur.col == 0) |
1020 | if (screen.cur.col == 0) |
1004 | { |
1021 | { |
… | |
… | |
1022 | * Process Horizontal Tab |
1039 | * Process Horizontal Tab |
1023 | * count: +ve = forward; -ve = backwards |
1040 | * count: +ve = forward; -ve = backwards |
1024 | * XTERM_SEQ: CTRL-I |
1041 | * XTERM_SEQ: CTRL-I |
1025 | */ |
1042 | */ |
1026 | void |
1043 | void |
1027 | rxvt_term::scr_tab (int count, bool ht) |
1044 | rxvt_term::scr_tab (int count, bool ht) NOTHROW |
1028 | { |
1045 | { |
1029 | int i, x; |
1046 | int i, x; |
1030 | |
1047 | |
1031 | want_refresh = 1; |
1048 | want_refresh = 1; |
1032 | i = x = screen.cur.col; |
1049 | i = x = screen.cur.col; |
… | |
… | |
1054 | if (count) |
1071 | if (count) |
1055 | x = ncol - 1; |
1072 | x = ncol - 1; |
1056 | |
1073 | |
1057 | // store horizontal tab commands as characters inside the text |
1074 | // store horizontal tab commands as characters inside the text |
1058 | // buffer so they can be selected and pasted. |
1075 | // buffer so they can be selected and pasted. |
1059 | if (ht && OPTION (Opt_pastableTabs)) |
1076 | if (ht && option (Opt_pastableTabs)) |
1060 | { |
1077 | { |
1061 | base_rend = SET_FONT (base_rend, 0); |
1078 | base_rend = SET_FONT (base_rend, 0); |
1062 | |
1079 | |
1063 | l.touch (x); |
1080 | l.touch (x); |
1064 | |
1081 | |
… | |
… | |
1097 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1098 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1099 | * Move cursor left in row. If we're at the left boundary, shift everything |
1116 | * Move cursor left in row. If we're at the left boundary, shift everything |
1100 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1101 | */ |
1118 | */ |
1102 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1103 | void |
1120 | void |
1104 | rxvt_term::scr_backindex () |
1121 | rxvt_term::scr_backindex () NOTHROW |
1105 | { |
1122 | { |
1106 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1107 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1108 | else |
1125 | else |
1109 | scr_insdel_chars (1, INSERT); |
1126 | scr_insdel_chars (1, INSERT); |
… | |
… | |
1114 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1115 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1116 | * Move cursor right in row. If we're at the right boundary, shift everything |
1133 | * Move cursor right in row. If we're at the right boundary, shift everything |
1117 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1118 | */ |
1135 | */ |
1119 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1120 | void |
1137 | void |
1121 | rxvt_term::scr_forwardindex () |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1122 | { |
1139 | { |
1123 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1124 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1125 | else |
1142 | else |
1126 | { |
1143 | { |
… | |
… | |
1139 | /* ------------------------------------------------------------------------- */ |
1156 | /* ------------------------------------------------------------------------- */ |
1140 | /* |
1157 | /* |
1141 | * Goto Row/Column |
1158 | * Goto Row/Column |
1142 | */ |
1159 | */ |
1143 | void |
1160 | void |
1144 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1161 | rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW |
1145 | { |
1162 | { |
1146 | want_refresh = 1; |
1163 | want_refresh = 1; |
1147 | ZERO_SCROLLBACK (); |
1164 | ZERO_SCROLLBACK (); |
1148 | |
1165 | |
1149 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1166 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
… | |
… | |
1187 | /* ------------------------------------------------------------------------- */ |
1204 | /* ------------------------------------------------------------------------- */ |
1188 | /* |
1205 | /* |
1189 | * direction should be UP or DN |
1206 | * direction should be UP or DN |
1190 | */ |
1207 | */ |
1191 | void |
1208 | void |
1192 | rxvt_term::scr_index (enum page_dirn direction) |
1209 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1193 | { |
1210 | { |
1194 | int dirn; |
1211 | int dirn; |
1195 | |
1212 | |
1196 | want_refresh = 1; |
1213 | want_refresh = 1; |
1197 | ZERO_SCROLLBACK (); |
1214 | ZERO_SCROLLBACK (); |
… | |
… | |
1216 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1233 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1217 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1234 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1218 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1235 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1219 | */ |
1236 | */ |
1220 | void |
1237 | void |
1221 | rxvt_term::scr_erase_line (int mode) |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1222 | { |
1239 | { |
1223 | unsigned int col, num; |
1240 | unsigned int col, num; |
1224 | |
1241 | |
1225 | want_refresh = 1; |
1242 | want_refresh = 1; |
1226 | ZERO_SCROLLBACK (); |
1243 | ZERO_SCROLLBACK (); |
… | |
… | |
1270 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1287 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1271 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1288 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1272 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1289 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1273 | */ |
1290 | */ |
1274 | void |
1291 | void |
1275 | rxvt_term::scr_erase_screen (int mode) |
1292 | rxvt_term::scr_erase_screen (int mode) NOTHROW |
1276 | { |
1293 | { |
1277 | int num; |
1294 | int num; |
1278 | int32_t row; |
1295 | int32_t row; |
1279 | rend_t ren; |
1296 | rend_t ren; |
1280 | XGCValues gcvalue; |
1297 | XGCValues gcvalue; |
… | |
… | |
1325 | } |
1342 | } |
1326 | else |
1343 | else |
1327 | { |
1344 | { |
1328 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1329 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1330 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1331 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1332 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1333 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1334 | } |
1351 | } |
1335 | |
1352 | |
1336 | for (; num--; row++) |
1353 | for (; num--; row++) |
1337 | { |
1354 | { |
1338 | scr_blank_screen_mem (ROW(row), rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1339 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1340 | } |
1357 | } |
1341 | } |
1358 | } |
1342 | |
1359 | |
1343 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1344 | void |
1361 | void |
1345 | rxvt_term::scr_erase_savelines () |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1346 | { |
1363 | { |
1347 | want_refresh = 1; |
1364 | want_refresh = 1; |
1348 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
1349 | |
1366 | |
1350 | top_row = 0; |
1367 | top_row = 0; |
… | |
… | |
1355 | /* |
1372 | /* |
1356 | * Fill the screen with `E's |
1373 | * Fill the screen with `E's |
1357 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1374 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1358 | */ |
1375 | */ |
1359 | void |
1376 | void |
1360 | rxvt_term::scr_E () |
1377 | rxvt_term::scr_E () NOTHROW |
1361 | { |
1378 | { |
1362 | rend_t fs; |
1379 | rend_t fs; |
1363 | |
1380 | |
1364 | want_refresh = 1; |
1381 | want_refresh = 1; |
1365 | ZERO_SCROLLBACK (); |
1382 | ZERO_SCROLLBACK (); |
… | |
… | |
1386 | /* ------------------------------------------------------------------------- */ |
1403 | /* ------------------------------------------------------------------------- */ |
1387 | /* |
1404 | /* |
1388 | * Insert/Delete <count> lines |
1405 | * Insert/Delete <count> lines |
1389 | */ |
1406 | */ |
1390 | void |
1407 | void |
1391 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1408 | rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW |
1392 | { |
1409 | { |
1393 | int end; |
1410 | int end; |
1394 | |
1411 | |
1395 | ZERO_SCROLLBACK (); |
1412 | ZERO_SCROLLBACK (); |
1396 | |
1413 | |
… | |
… | |
1416 | /* ------------------------------------------------------------------------- */ |
1433 | /* ------------------------------------------------------------------------- */ |
1417 | /* |
1434 | /* |
1418 | * Insert/Delete <count> characters from the current position |
1435 | * Insert/Delete <count> characters from the current position |
1419 | */ |
1436 | */ |
1420 | void |
1437 | void |
1421 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1438 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1422 | { |
1439 | { |
1423 | int col, row; |
1440 | int col, row; |
1424 | rend_t tr; |
1441 | rend_t tr; |
1425 | |
1442 | |
1426 | want_refresh = 1; |
1443 | want_refresh = 1; |
… | |
… | |
1514 | /* |
1531 | /* |
1515 | * Set the scrolling region |
1532 | * Set the scrolling region |
1516 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1533 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1517 | */ |
1534 | */ |
1518 | void |
1535 | void |
1519 | rxvt_term::scr_scroll_region (int top, int bot) |
1536 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1520 | { |
1537 | { |
1521 | max_it (top, 0); |
1538 | max_it (top, 0); |
1522 | min_it (bot, nrow - 1); |
1539 | min_it (bot, nrow - 1); |
1523 | |
1540 | |
1524 | if (top > bot) |
1541 | if (top > bot) |
… | |
… | |
1534 | * Make the cursor visible/invisible |
1551 | * Make the cursor visible/invisible |
1535 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1552 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1536 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1553 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1537 | */ |
1554 | */ |
1538 | void |
1555 | void |
1539 | rxvt_term::scr_cursor_visible (int mode) |
1556 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1540 | { |
1557 | { |
1541 | want_refresh = 1; |
1558 | want_refresh = 1; |
1542 | |
1559 | |
1543 | if (mode) |
1560 | if (mode) |
1544 | screen.flags |= Screen_VisibleCursor; |
1561 | screen.flags |= Screen_VisibleCursor; |
… | |
… | |
1551 | * Set/unset automatic wrapping |
1568 | * Set/unset automatic wrapping |
1552 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1569 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1553 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1570 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1554 | */ |
1571 | */ |
1555 | void |
1572 | void |
1556 | rxvt_term::scr_autowrap (int mode) |
1573 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1557 | { |
1574 | { |
1558 | if (mode) |
1575 | if (mode) |
1559 | screen.flags |= Screen_Autowrap; |
1576 | screen.flags |= Screen_Autowrap; |
1560 | else |
1577 | else |
1561 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1578 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
… | |
… | |
1570 | * and the cursor cannot be moved outside. |
1587 | * and the cursor cannot be moved outside. |
1571 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1588 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1572 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1589 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1573 | */ |
1590 | */ |
1574 | void |
1591 | void |
1575 | rxvt_term::scr_relative_origin (int mode) |
1592 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1576 | { |
1593 | { |
1577 | if (mode) |
1594 | if (mode) |
1578 | screen.flags |= Screen_Relative; |
1595 | screen.flags |= Screen_Relative; |
1579 | else |
1596 | else |
1580 | screen.flags &= ~Screen_Relative; |
1597 | screen.flags &= ~Screen_Relative; |
… | |
… | |
1587 | * Set insert/replace mode |
1604 | * Set insert/replace mode |
1588 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1605 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1589 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1606 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1590 | */ |
1607 | */ |
1591 | void |
1608 | void |
1592 | rxvt_term::scr_insert_mode (int mode) |
1609 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1593 | { |
1610 | { |
1594 | if (mode) |
1611 | if (mode) |
1595 | screen.flags |= Screen_Insert; |
1612 | screen.flags |= Screen_Insert; |
1596 | else |
1613 | else |
1597 | screen.flags &= ~Screen_Insert; |
1614 | screen.flags &= ~Screen_Insert; |
… | |
… | |
1603 | * XTERM_SEQ: Set tab at current column : ESC H |
1620 | * XTERM_SEQ: Set tab at current column : ESC H |
1604 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1621 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1605 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1622 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1606 | */ |
1623 | */ |
1607 | void |
1624 | void |
1608 | rxvt_term::scr_set_tab (int mode) |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1609 | { |
1626 | { |
1610 | if (mode < 0) |
1627 | if (mode < 0) |
1611 | memset (tabs, 0, ncol * sizeof (char)); |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1612 | else if (screen.cur.col < ncol) |
1629 | else if (screen.cur.col < ncol) |
1613 | tabs [screen.cur.col] = !!mode; |
1630 | tabs [screen.cur.col] = !!mode; |
… | |
… | |
1618 | * Set reverse/normal video |
1635 | * Set reverse/normal video |
1619 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1636 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1620 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1637 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1621 | */ |
1638 | */ |
1622 | void |
1639 | void |
1623 | rxvt_term::scr_rvideo_mode (int mode) |
1640 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1624 | { |
1641 | { |
1625 | XGCValues gcvalue; |
1642 | rvideo_mode = on; |
1626 | |
1643 | |
|
|
1644 | #ifndef NO_BELL |
|
|
1645 | on ^= rvideo_bell; |
|
|
1646 | #endif |
|
|
1647 | |
1627 | if (rvideo != mode) |
1648 | if (rvideo_state != on) |
1628 | { |
1649 | { |
1629 | rvideo = mode; |
1650 | rvideo_state = on; |
|
|
1651 | |
1630 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1631 | #if XPM_BACKGROUND |
1653 | #if XPM_BACKGROUND |
1632 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1633 | #endif |
1655 | #endif |
1634 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1635 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!option (Opt_transparent) || am_transparent == 0) |
1636 | #endif |
1658 | #endif |
1637 | XSetWindowBackground (display->display, vt, |
1659 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1638 | pix_colors[Color_bg]); |
|
|
1639 | |
1660 | |
|
|
1661 | XGCValues gcvalue; |
1640 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1641 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1642 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1664 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1643 | &gcvalue); |
1665 | |
1644 | scr_clear (); |
1666 | scr_clear (); |
1645 | scr_touch (true); |
1667 | scr_touch (true); |
1646 | } |
1668 | } |
1647 | } |
1669 | } |
1648 | |
1670 | |
… | |
… | |
1650 | /* |
1672 | /* |
1651 | * Report current cursor position |
1673 | * Report current cursor position |
1652 | * XTERM_SEQ: Report position: ESC [ 6 n |
1674 | * XTERM_SEQ: Report position: ESC [ 6 n |
1653 | */ |
1675 | */ |
1654 | void |
1676 | void |
1655 | rxvt_term::scr_report_position () |
1677 | rxvt_term::scr_report_position () NOTHROW |
1656 | { |
1678 | { |
1657 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1679 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1658 | } |
1680 | } |
1659 | |
1681 | |
1660 | /* ------------------------------------------------------------------------- * |
1682 | /* ------------------------------------------------------------------------- * |
… | |
… | |
1663 | |
1685 | |
1664 | /* |
1686 | /* |
1665 | * Set font style |
1687 | * Set font style |
1666 | */ |
1688 | */ |
1667 | void |
1689 | void |
1668 | rxvt_term::set_font_style () |
1690 | rxvt_term::set_font_style () NOTHROW |
1669 | { |
1691 | { |
1670 | #if 0 |
1692 | #if 0 |
1671 | switch (charsets [screen.charset]) |
1693 | switch (charsets [screen.charset]) |
1672 | { |
1694 | { |
1673 | case '0': /* DEC Special Character & Line Drawing Set */ |
1695 | case '0': /* DEC Special Character & Line Drawing Set */ |
… | |
… | |
1695 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1717 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1696 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1718 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1697 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1719 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1698 | */ |
1720 | */ |
1699 | void |
1721 | void |
1700 | rxvt_term::scr_charset_choose (int set) |
1722 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1701 | { |
1723 | { |
1702 | screen.charset = set; |
1724 | screen.charset = set; |
1703 | set_font_style (); |
1725 | set_font_style (); |
1704 | } |
1726 | } |
1705 | |
1727 | |
… | |
… | |
1711 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1733 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1712 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1734 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1713 | * See set_font_style for possible values for <C> |
1735 | * See set_font_style for possible values for <C> |
1714 | */ |
1736 | */ |
1715 | void |
1737 | void |
1716 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1738 | rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW |
1717 | { |
1739 | { |
1718 | charsets[set] = (unsigned char)ch; |
1740 | charsets[set] = (unsigned char)ch; |
1719 | set_font_style (); |
1741 | set_font_style (); |
1720 | } |
1742 | } |
1721 | |
1743 | |
… | |
… | |
1726 | |
1748 | |
1727 | /* |
1749 | /* |
1728 | * refresh matching text. |
1750 | * refresh matching text. |
1729 | */ |
1751 | */ |
1730 | bool |
1752 | bool |
1731 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1753 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1732 | { |
1754 | { |
1733 | bool found = false; |
1755 | bool found = false; |
1734 | |
1756 | |
1735 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1736 | { |
1758 | { |
1737 | int col = 0; |
|
|
1738 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1739 | |
1760 | |
1740 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1741 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1742 | { |
1763 | { |
1743 | found = true; |
1764 | found = true; |
1744 | *drp = ~value; |
1765 | *drp = ~value; |
1745 | } |
1766 | } |
… | |
… | |
1756 | PART_END, |
1777 | PART_END, |
1757 | RC_COUNT |
1778 | RC_COUNT |
1758 | }; |
1779 | }; |
1759 | |
1780 | |
1760 | void |
1781 | void |
1761 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1782 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1762 | { |
1783 | { |
1763 | int i; |
1784 | int i; |
1764 | row_col_t rc[RC_COUNT]; |
1785 | row_col_t rc[RC_COUNT]; |
1765 | |
1786 | |
1766 | if (!drawn_buf) /* sanity check */ |
1787 | if (!drawn_buf) /* sanity check */ |
… | |
… | |
1800 | /* ------------------------------------------------------------------------- */ |
1821 | /* ------------------------------------------------------------------------- */ |
1801 | /* |
1822 | /* |
1802 | * Refresh the entire screen |
1823 | * Refresh the entire screen |
1803 | */ |
1824 | */ |
1804 | void |
1825 | void |
1805 | rxvt_term::scr_touch (bool refresh) |
1826 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1806 | { |
1827 | { |
1807 | scr_expose (0, 0, width, height, refresh); |
1828 | scr_expose (0, 0, width, height, refresh); |
1808 | } |
1829 | } |
1809 | |
1830 | |
1810 | /* ------------------------------------------------------------------------- */ |
1831 | /* ------------------------------------------------------------------------- */ |
1811 | /* |
1832 | /* |
1812 | * Move the display so that the line represented by scrollbar value Y is at |
1833 | * Move the display so that the line represented by scrollbar value Y is at |
1813 | * the top of the screen |
1834 | * the top of the screen |
1814 | */ |
1835 | */ |
1815 | void |
1836 | void |
1816 | rxvt_term::scr_move_to (int y, int len) |
1837 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1817 | { |
1838 | { |
1818 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1839 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1819 | } |
1840 | } |
1820 | |
1841 | |
1821 | /* ------------------------------------------------------------------------- */ |
1842 | /* ------------------------------------------------------------------------- */ |
1822 | /* |
1843 | /* |
1823 | * Page the screen up/down nlines |
1844 | * Page the screen up/down nlines |
1824 | * direction should be UP or DN |
1845 | * direction should be UP or DN |
1825 | */ |
1846 | */ |
1826 | bool |
1847 | bool |
1827 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1848 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1828 | { |
1849 | { |
1829 | int new_view_start = |
1850 | int new_view_start = |
1830 | direction == UP ? view_start - nlines |
1851 | direction == UP ? view_start - nlines |
1831 | : view_start + nlines; |
1852 | : view_start + nlines; |
1832 | |
1853 | |
1833 | return scr_changeview (new_view_start); |
1854 | return scr_changeview (new_view_start); |
1834 | } |
1855 | } |
1835 | |
1856 | |
1836 | bool |
1857 | bool |
1837 | rxvt_term::scr_changeview (int new_view_start) |
1858 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1838 | { |
1859 | { |
1839 | clamp_it (new_view_start, top_row, 0); |
1860 | clamp_it (new_view_start, top_row, 0); |
1840 | |
1861 | |
1841 | if (new_view_start == view_start) |
1862 | if (new_view_start == view_start) |
1842 | return false; |
1863 | return false; |
… | |
… | |
1848 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1869 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1849 | |
1870 | |
1850 | return true; |
1871 | return true; |
1851 | } |
1872 | } |
1852 | |
1873 | |
1853 | /* ------------------------------------------------------------------------- */ |
1874 | #ifndef NO_BELL |
1854 | void |
1875 | void |
|
|
1876 | rxvt_term::bell_cb (time_watcher &w) |
|
|
1877 | { |
|
|
1878 | rvideo_bell = false; |
|
|
1879 | scr_rvideo_mode (rvideo_mode); |
|
|
1880 | } |
|
|
1881 | #endif |
|
|
1882 | |
|
|
1883 | /* ------------------------------------------------------------------------- */ |
|
|
1884 | void |
1855 | rxvt_term::scr_bell () |
1885 | rxvt_term::scr_bell () NOTHROW |
1856 | { |
1886 | { |
1857 | #ifndef NO_BELL |
1887 | #ifndef NO_BELL |
1858 | |
1888 | |
1859 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1860 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1861 | if (OPTION (Opt_mapAlert)) |
1891 | if (option (Opt_mapAlert)) |
1862 | # endif |
1892 | # endif |
1863 | XMapWindow (display->display, parent[0]); |
1893 | XMapWindow (dpy, parent[0]); |
1864 | # endif |
1894 | # endif |
|
|
1895 | # if ENABLE_FRILLS |
|
|
1896 | if (option (Opt_urgentOnBell)) |
|
|
1897 | { |
|
|
1898 | XWMHints *h; |
1865 | |
1899 | |
1866 | if (OPTION (Opt_visualBell)) |
1900 | h = XGetWMHints(dpy, parent[0]); |
|
|
1901 | if (h != NULL) |
|
|
1902 | { |
|
|
1903 | h->flags |= XUrgencyHint; |
|
|
1904 | XSetWMHints(dpy, parent[0], h); |
|
|
1905 | } |
1867 | { |
1906 | } |
1868 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1907 | # endif |
|
|
1908 | |
|
|
1909 | if (option (Opt_visualBell)) |
|
|
1910 | { |
|
|
1911 | rvideo_bell = true; |
|
|
1912 | scr_rvideo_mode (rvideo_mode); |
1869 | display->flush (); |
1913 | display->flush (); |
1870 | rxvt_usleep (VISUAL_BELL_DURATION); |
1914 | |
1871 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1915 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1872 | } |
1916 | } |
1873 | else |
1917 | else |
1874 | XBell (display->display, 0); |
1918 | XBell (dpy, 0); |
1875 | |
1919 | |
1876 | #endif |
1920 | #endif |
1877 | } |
1921 | } |
1878 | |
1922 | |
1879 | /* ------------------------------------------------------------------------- */ |
1923 | /* ------------------------------------------------------------------------- */ |
1880 | /* ARGSUSED */ |
1924 | /* ARGSUSED */ |
1881 | void |
1925 | void |
1882 | rxvt_term::scr_printscreen (int fullhist) |
1926 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1883 | { |
1927 | { |
1884 | #ifdef PRINTPIPE |
1928 | #ifdef PRINTPIPE |
1885 | int nrows, row_start; |
1929 | int nrows, row_start; |
1886 | FILE *fd; |
1930 | FILE *fd; |
1887 | |
1931 | |
… | |
… | |
1936 | * Refresh the screen |
1980 | * Refresh the screen |
1937 | * drawn_text/drawn_rend contain the screen information before the update. |
1981 | * drawn_text/drawn_rend contain the screen information before the update. |
1938 | * screen.text/screen.rend contain what the screen will change to. |
1982 | * screen.text/screen.rend contain what the screen will change to. |
1939 | */ |
1983 | */ |
1940 | void |
1984 | void |
1941 | rxvt_term::scr_refresh () |
1985 | rxvt_term::scr_refresh () NOTHROW |
1942 | { |
1986 | { |
1943 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1987 | unsigned char have_bg, |
1944 | showcursor; /* show the cursor */ |
1988 | showcursor; /* show the cursor */ |
1945 | int16_t col, row, /* column/row we're processing */ |
1989 | int16_t col, row, /* column/row we're processing */ |
1946 | ocrow; /* old cursor row */ |
1990 | ocrow; /* old cursor row */ |
1947 | int i; /* tmp */ |
1991 | int i; /* tmp */ |
1948 | #ifndef NO_CURSORCOLOR |
1992 | #ifndef NO_CURSORCOLOR |
1949 | rend_t cc1; /* store colours at cursor position (s) */ |
1993 | rend_t cc1; /* store colours at cursor position (s) */ |
1950 | #endif |
1994 | #endif |
1951 | rend_t *crp; // cursor rendition pointer |
1995 | rend_t *crp; // cursor rendition pointer |
|
|
1996 | rend_t ccol1, /* Cursor colour */ |
|
|
1997 | ccol2; /* Cursor colour2 */ |
1952 | |
1998 | |
1953 | want_refresh = 0; /* screen is current */ |
1999 | want_refresh = 0; /* screen is current */ |
1954 | |
2000 | |
1955 | if (refresh_type == NO_REFRESH || !mapped) |
2001 | if (refresh_type == NO_REFRESH || !mapped) |
1956 | return; |
2002 | return; |
1957 | |
2003 | |
1958 | /* |
2004 | /* |
1959 | * A: set up vars |
2005 | * A: set up vars |
1960 | */ |
2006 | */ |
1961 | must_clear = 0; |
2007 | have_bg = 0; |
1962 | refresh_count = 0; |
2008 | refresh_count = 0; |
1963 | |
2009 | |
1964 | #if XPM_BACKGROUND |
2010 | #if XPM_BACKGROUND |
1965 | must_clear |= bgPixmap.pixmap != None; |
2011 | have_bg |= bgPixmap.pixmap != None; |
1966 | #endif |
2012 | #endif |
1967 | #if TRANSPARENT |
2013 | #if TRANSPARENT |
1968 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
2014 | have_bg |= option (Opt_transparent) && am_transparent; |
1969 | #endif |
2015 | #endif |
1970 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2016 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1971 | |
2017 | |
1972 | /* |
2018 | /* |
1973 | * B: reverse any characters which are selected |
2019 | * B: reverse any characters which are selected |
… | |
… | |
1977 | /* |
2023 | /* |
1978 | * C: set the cursor character (s) |
2024 | * C: set the cursor character (s) |
1979 | */ |
2025 | */ |
1980 | { |
2026 | { |
1981 | unsigned char setoldcursor; |
2027 | unsigned char setoldcursor; |
1982 | rend_t ccol1, /* Cursor colour */ |
|
|
1983 | ccol2; /* Cursor colour2 */ |
|
|
1984 | |
2028 | |
1985 | showcursor = (screen.flags & Screen_VisibleCursor); |
2029 | showcursor = (screen.flags & Screen_VisibleCursor); |
1986 | #ifdef CURSOR_BLINK |
2030 | #ifdef CURSOR_BLINK |
1987 | if (hidden_cursor) |
2031 | if (hidden_cursor) |
1988 | showcursor = 0; |
2032 | showcursor = 0; |
… | |
… | |
1995 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2039 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
1996 | col--; |
2040 | col--; |
1997 | |
2041 | |
1998 | crp = &ROW(screen.cur.row).r[col]; |
2042 | crp = &ROW(screen.cur.row).r[col]; |
1999 | |
2043 | |
|
|
2044 | #ifndef NO_CURSORCOLOR |
|
|
2045 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2046 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2047 | ccol1 = Color_cursor; |
|
|
2048 | else |
|
|
2049 | #endif |
|
|
2050 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2051 | ccol1 = fgcolor_of (rstyle); |
|
|
2052 | #else |
|
|
2053 | ccol1 = Color_fg; |
|
|
2054 | #endif |
|
|
2055 | |
|
|
2056 | #ifndef NO_CURSORCOLOR |
|
|
2057 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2058 | ccol2 = Color_cursor2; |
|
|
2059 | else |
|
|
2060 | #endif |
|
|
2061 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2062 | ccol2 = bgcolor_of (rstyle); |
|
|
2063 | #else |
|
|
2064 | ccol2 = Color_bg; |
|
|
2065 | #endif |
|
|
2066 | |
2000 | if (showcursor && focus) |
2067 | if (showcursor && focus) |
2001 | { |
2068 | { |
2002 | if (OPTION (Opt_cursorUnderline)) |
2069 | if (option (Opt_cursorUnderline)) |
2003 | *crp ^= RS_Uline; |
2070 | *crp ^= RS_Uline; |
2004 | else |
2071 | else |
2005 | { |
2072 | { |
2006 | *crp ^= RS_RVid; |
2073 | *crp ^= RS_RVid; |
2007 | |
|
|
2008 | #ifndef NO_CURSORCOLOR |
|
|
2009 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2010 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2011 | ccol1 = Color_cursor; |
|
|
2012 | else |
|
|
2013 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2014 | ccol1 = fgcolor_of (rstyle); |
|
|
2015 | #else |
|
|
2016 | ccol1 = Color_fg; |
|
|
2017 | #endif |
|
|
2018 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2019 | ccol2 = Color_cursor2; |
|
|
2020 | else |
|
|
2021 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2022 | ccol2 = bgcolor_of (rstyle); |
|
|
2023 | #else |
|
|
2024 | ccol2 = Color_bg; |
|
|
2025 | #endif |
|
|
2026 | *crp = SET_FGCOLOR (*crp, ccol1); |
2074 | *crp = SET_FGCOLOR (*crp, ccol1); |
2027 | *crp = SET_BGCOLOR (*crp, ccol2); |
2075 | *crp = SET_BGCOLOR (*crp, ccol2); |
2028 | #endif |
|
|
2029 | } |
2076 | } |
2030 | } |
2077 | } |
2031 | } |
2078 | } |
2032 | |
2079 | |
2033 | /* make sure no outline cursor is left around */ |
2080 | /* make sure no outline cursor is left around */ |
… | |
… | |
2072 | * D: CopyArea pass - very useful for slower links |
2119 | * D: CopyArea pass - very useful for slower links |
2073 | * This has been deliberately kept simple. |
2120 | * This has been deliberately kept simple. |
2074 | */ |
2121 | */ |
2075 | if (!display->is_local |
2122 | if (!display->is_local |
2076 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2123 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2077 | && abs (num_scr) < nrow && !must_clear) |
2124 | && abs (num_scr) < nrow && !have_bg) |
2078 | { |
2125 | { |
2079 | int16_t nits; |
2126 | int16_t nits; |
|
|
2127 | int i = num_scr; |
2080 | int j; |
2128 | int j; |
2081 | int len, wlen; |
2129 | int len, wlen; |
2082 | dLocal (int, num_scr); |
2130 | dLocal (int, num_scr); |
2083 | |
2131 | |
2084 | j = nrow; |
2132 | j = nrow; |
2085 | wlen = len = -1; |
2133 | wlen = len = -1; |
2086 | row = i > 0 ? 0 : j - 1; |
2134 | row = i > 0 ? 0 : j - 1; |
|
|
2135 | |
2087 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2136 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2088 | { |
2137 | { |
2089 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2138 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2090 | { |
2139 | { |
2091 | line_t s = ROW(view_start + row); |
2140 | line_t s = ROW(view_start + row); |
… | |
… | |
2112 | wlen = row; |
2161 | wlen = row; |
2113 | continue; |
2162 | continue; |
2114 | } |
2163 | } |
2115 | } |
2164 | } |
2116 | |
2165 | |
2117 | if (len != -1) |
2166 | if (len >= 0) |
2118 | { |
2167 | { |
2119 | /* also comes here at end if needed because of >= above */ |
2168 | /* also comes here at end if needed because of >= above */ |
2120 | if (wlen < len) |
2169 | if (wlen < len) |
2121 | ::swap (wlen, len); |
2170 | ::swap (wlen, len); |
2122 | |
2171 | |
|
|
2172 | XGCValues gcv; |
|
|
2173 | |
|
|
2174 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2123 | XCopyArea (display->display, vt, vt, |
2175 | XCopyArea (dpy, vt, vt, |
2124 | gc, 0, Row2Pixel (len + i), |
2176 | gc, 0, Row2Pixel (len + i), |
2125 | (unsigned int)this->width, |
2177 | (unsigned int)this->width, |
2126 | (unsigned int)Height2Pixel (wlen - len + 1), |
2178 | (unsigned int)Height2Pixel (wlen - len + 1), |
2127 | 0, Row2Pixel (len)); |
2179 | 0, Row2Pixel (len)); |
|
|
2180 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2181 | |
2128 | len = -1; |
2182 | len = -1; |
2129 | } |
2183 | } |
2130 | } |
2184 | } |
2131 | } |
2185 | } |
2132 | #endif |
2186 | #endif |
… | |
… | |
2188 | count++; |
2242 | count++; |
2189 | |
2243 | |
2190 | if (stp[col] != dtp[col] |
2244 | if (stp[col] != dtp[col] |
2191 | || !RS_SAME (srp[col], drp[col])) |
2245 | || !RS_SAME (srp[col], drp[col])) |
2192 | { |
2246 | { |
2193 | if (must_clear && (i++ > count / 2)) |
2247 | if (have_bg && (i++ > count / 2)) |
2194 | break; |
2248 | break; |
2195 | |
2249 | |
2196 | dtp[col] = stp[col]; |
2250 | dtp[col] = stp[col]; |
2197 | drp[col] = rend; |
2251 | drp[col] = rend; |
2198 | i = 0; |
2252 | i = 0; |
2199 | } |
2253 | } |
2200 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2254 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2201 | break; |
2255 | break; |
2202 | } |
2256 | } |
2203 | |
2257 | |
2204 | col--; /* went one too far. move back */ |
2258 | col--; /* went one too far. move back */ |
2205 | count -= i; /* dump any matching trailing chars */ |
2259 | count -= i; /* dump any matching trailing chars */ |
… | |
… | |
2215 | int back = bgcolor_of (rend); // desired background |
2269 | int back = bgcolor_of (rend); // desired background |
2216 | |
2270 | |
2217 | // only do special processing if any attributes are set, which is unlikely |
2271 | // only do special processing if any attributes are set, which is unlikely |
2218 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2272 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2219 | { |
2273 | { |
2220 | #if ENABLE_STYLES |
|
|
2221 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2222 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2223 | drp[col + 1] = ~srp[col + 1]; |
|
|
2224 | |
|
|
2225 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2226 | while (text > stp |
|
|
2227 | && srp[text - stp - 1] & RS_Careful |
|
|
2228 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2229 | text--, count++, xpixel -= fwidth; |
|
|
2230 | #endif |
|
|
2231 | |
|
|
2232 | bool invert = rend & RS_RVid; |
2274 | bool invert = rend & RS_RVid; |
2233 | |
2275 | |
2234 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2276 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2235 | if (rend & RS_Bold |
2277 | if (rend & RS_Bold |
2236 | && fore == Color_fg) |
2278 | && fore == Color_fg) |
… | |
… | |
2252 | else |
2294 | else |
2253 | invert = !invert; |
2295 | invert = !invert; |
2254 | # endif |
2296 | # endif |
2255 | } |
2297 | } |
2256 | |
2298 | |
2257 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2299 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2258 | fore = Color_UL; |
2300 | fore = Color_UL; |
2259 | #endif |
2301 | #endif |
2260 | |
2302 | |
2261 | if (invert) |
2303 | if (invert) |
2262 | { |
2304 | { |
|
|
2305 | #ifdef OPTION_HC |
|
|
2306 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2307 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2308 | #endif |
|
|
2309 | /* invert the column if no highlightColor is set or it is the |
|
|
2310 | * current cursor column */ |
2263 | ::swap (fore, back); |
2311 | ::swap (fore, back); |
|
|
2312 | #ifdef OPTION_HC |
|
|
2313 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2314 | back = Color_HC; |
|
|
2315 | #endif |
2264 | |
2316 | |
2265 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2317 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2318 | # ifndef OPTION_HC |
2266 | if (ISSET_PIXCOLOR (Color_RV)) |
2319 | if (ISSET_PIXCOLOR (Color_RV)) |
2267 | back = Color_RV; |
2320 | back = Color_RV; |
2268 | |
2321 | # endif |
2269 | if (fore == back) |
2322 | if (fore == back) |
2270 | { |
2323 | { |
2271 | fore = Color_bg; |
2324 | fore = Color_bg; |
2272 | back = Color_fg; |
2325 | back = Color_fg; |
2273 | } |
2326 | } |
… | |
… | |
2284 | } |
2337 | } |
2285 | else if (hidden_text) |
2338 | else if (hidden_text) |
2286 | fore = back; |
2339 | fore = back; |
2287 | } |
2340 | } |
2288 | #endif |
2341 | #endif |
|
|
2342 | |
|
|
2343 | #if ENABLE_STYLES |
|
|
2344 | // "careful" (too wide) character handling |
|
|
2345 | |
|
|
2346 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2347 | while (text > stp |
|
|
2348 | && srp[text - stp - 1] & RS_Careful |
|
|
2349 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2350 | text--, count++, xpixel -= fwidth; |
|
|
2351 | |
|
|
2352 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2353 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2354 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2355 | |
|
|
2356 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2357 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2358 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2359 | #endif |
2289 | } |
2360 | } |
2290 | |
2361 | |
2291 | /* |
2362 | /* |
2292 | * Actually do the drawing of the string here |
2363 | * Actually do the drawing of the string here |
2293 | */ |
2364 | */ |
2294 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2365 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2295 | |
2366 | |
2296 | if (back == fore) |
|
|
2297 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2298 | fwidth * count, fheight, |
|
|
2299 | back); |
|
|
2300 | else if (back == Color_bg) |
2367 | if (have_bg && back == Color_bg) |
2301 | { |
2368 | { |
2302 | if (must_clear) |
2369 | // this is very ugly, maybe push it into ->draw? |
2303 | { |
|
|
2304 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2305 | |
2370 | |
2306 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2371 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2307 | if (text[i] != ' ') |
2372 | if (text[i] != ' ') |
2308 | { |
2373 | { |
2309 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2374 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2310 | break; |
2375 | goto did_clear; |
2311 | } |
|
|
2312 | } |
2376 | } |
2313 | else |
2377 | |
2314 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2378 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2379 | did_clear: ; |
2315 | } |
2380 | } |
2316 | else |
2381 | else |
2317 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2382 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2318 | |
2383 | |
2319 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2384 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2320 | { |
2385 | { |
2321 | #if ENABLE_FRILLS |
2386 | #if ENABLE_FRILLS |
2322 | if (ISSET_PIXCOLOR (Color_underline)) |
2387 | if (ISSET_PIXCOLOR (Color_underline)) |
2323 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2388 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2324 | else |
2389 | else |
2325 | #endif |
2390 | #endif |
2326 | XSetForeground (display->display, gc, pix_colors[fore]); |
2391 | XSetForeground (dpy, gc, pix_colors[fore]); |
2327 | |
2392 | |
2328 | XDrawLine (display->display, drawBuffer, gc, |
2393 | XDrawLine (dpy, drawBuffer, gc, |
2329 | xpixel, ypixel + font->ascent + 1, |
2394 | xpixel, ypixel + font->ascent + 1, |
2330 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2395 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2331 | } |
2396 | } |
2332 | } /* for (col....) */ |
2397 | } /* for (col....) */ |
2333 | } /* for (row....) */ |
2398 | } /* for (row....) */ |
… | |
… | |
2342 | */ |
2407 | */ |
2343 | if (showcursor) |
2408 | if (showcursor) |
2344 | { |
2409 | { |
2345 | if (focus) |
2410 | if (focus) |
2346 | { |
2411 | { |
2347 | if (OPTION (Opt_cursorUnderline)) |
2412 | if (option (Opt_cursorUnderline)) |
2348 | *crp ^= RS_Uline; |
2413 | *crp ^= RS_Uline; |
2349 | else |
2414 | else |
2350 | { |
2415 | { |
2351 | *crp ^= RS_RVid; |
2416 | *crp ^= RS_RVid; |
2352 | #ifndef NO_CURSORCOLOR |
2417 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2366 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2431 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2367 | cursorwidth++; |
2432 | cursorwidth++; |
2368 | |
2433 | |
2369 | #ifndef NO_CURSORCOLOR |
2434 | #ifndef NO_CURSORCOLOR |
2370 | if (ISSET_PIXCOLOR (Color_cursor)) |
2435 | if (ISSET_PIXCOLOR (Color_cursor)) |
2371 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2436 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2437 | else |
2372 | #endif |
2438 | #endif |
|
|
2439 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2373 | |
2440 | |
2374 | XDrawRectangle (display->display, drawBuffer, gc, |
2441 | XDrawRectangle (dpy, drawBuffer, gc, |
2375 | Col2Pixel (col), |
2442 | Col2Pixel (col), |
2376 | Row2Pixel (oldcursor.row), |
2443 | Row2Pixel (oldcursor.row), |
2377 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2444 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2378 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2445 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2379 | } |
2446 | } |
… | |
… | |
2387 | num_scr = 0; |
2454 | num_scr = 0; |
2388 | num_scr_allow = 1; |
2455 | num_scr_allow = 1; |
2389 | } |
2456 | } |
2390 | |
2457 | |
2391 | void |
2458 | void |
2392 | rxvt_term::scr_remap_chars (line_t &l) |
2459 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2393 | { |
2460 | { |
2394 | if (!l.t) |
2461 | if (!l.t) |
2395 | return; |
2462 | return; |
2396 | |
2463 | |
2397 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2464 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
… | |
… | |
2399 | for (int i = ncol; i--; ) |
2466 | for (int i = ncol; i--; ) |
2400 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2467 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2401 | } |
2468 | } |
2402 | |
2469 | |
2403 | void |
2470 | void |
2404 | rxvt_term::scr_remap_chars () |
2471 | rxvt_term::scr_remap_chars () NOTHROW |
2405 | { |
2472 | { |
2406 | for (int i = total_rows; i--; ) |
2473 | for (int i = total_rows; i--; ) |
2407 | scr_remap_chars (row_buf [i]); |
2474 | scr_remap_chars (row_buf [i]); |
2408 | |
2475 | |
2409 | for (int i = nrow; i--; ) |
2476 | for (int i = nrow; i--; ) |
… | |
… | |
2412 | scr_remap_chars (swap_buf [i]); |
2479 | scr_remap_chars (swap_buf [i]); |
2413 | } |
2480 | } |
2414 | } |
2481 | } |
2415 | |
2482 | |
2416 | void |
2483 | void |
2417 | rxvt_term::scr_recolour () |
2484 | rxvt_term::scr_recolour () NOTHROW |
2418 | { |
2485 | { |
2419 | if (1 |
2486 | if (1 |
2420 | #if TRANSPARENT |
2487 | #if TRANSPARENT |
2421 | && !am_transparent |
2488 | && !am_transparent |
2422 | #endif |
2489 | #endif |
2423 | #if XPM_BACKGROUND |
2490 | #if XPM_BACKGROUND |
2424 | && !bgPixmap.pixmap |
2491 | && !bgPixmap.pixmap |
2425 | #endif |
2492 | #endif |
2426 | ) |
2493 | ) |
2427 | { |
2494 | { |
2428 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2495 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2429 | XClearWindow (display->display, parent[0]); |
2496 | XClearWindow (dpy, parent[0]); |
2430 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2497 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2431 | #if HAVE_SCROLLBARS |
2498 | #if HAVE_SCROLLBARS |
2432 | if (scrollBar.win) |
2499 | if (scrollBar.win) |
2433 | { |
2500 | { |
2434 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2501 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2435 | scrollBar.setIdle (); |
2502 | scrollBar.setIdle (); |
2436 | scrollbar_show (0); |
2503 | scrollbar_show (0); |
2437 | } |
2504 | } |
2438 | #endif |
2505 | #endif |
2439 | } |
2506 | } |
… | |
… | |
2443 | want_refresh = 1; |
2510 | want_refresh = 1; |
2444 | } |
2511 | } |
2445 | |
2512 | |
2446 | /* ------------------------------------------------------------------------- */ |
2513 | /* ------------------------------------------------------------------------- */ |
2447 | void |
2514 | void |
2448 | rxvt_term::scr_clear (bool really) |
2515 | rxvt_term::scr_clear (bool really) NOTHROW |
2449 | { |
2516 | { |
2450 | if (!mapped) |
2517 | if (!mapped) |
2451 | return; |
2518 | return; |
2452 | |
2519 | |
2453 | num_scr_allow = 0; |
2520 | num_scr_allow = 0; |
2454 | want_refresh = 1; |
2521 | want_refresh = 1; |
2455 | |
2522 | |
2456 | if (really) |
2523 | if (really) |
2457 | XClearWindow (display->display, vt); |
2524 | XClearWindow (dpy, vt); |
2458 | } |
2525 | } |
2459 | |
2526 | |
2460 | void |
2527 | void |
2461 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
2528 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2462 | { |
2529 | { |
2463 | int view_end = view_start + nrow; |
2530 | int view_end = view_start + nrow; |
2464 | int row, col; |
2531 | int row, col; |
2465 | |
2532 | |
2466 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
2533 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
… | |
… | |
2478 | srp[col] ^= rstyle2; |
2545 | srp[col] ^= rstyle2; |
2479 | } |
2546 | } |
2480 | } |
2547 | } |
2481 | |
2548 | |
2482 | void |
2549 | void |
2483 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
2550 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW |
2484 | { |
2551 | { |
2485 | int view_end = view_start + nrow; |
2552 | int view_end = view_start + nrow; |
2486 | int row, col; |
2553 | int row, col; |
2487 | |
2554 | |
2488 | if (beg_row >= view_start) |
2555 | if (beg_row >= view_start) |
… | |
… | |
2505 | srp[col] ^= rstyle; |
2572 | srp[col] ^= rstyle; |
2506 | } |
2573 | } |
2507 | |
2574 | |
2508 | /* ------------------------------------------------------------------------- */ |
2575 | /* ------------------------------------------------------------------------- */ |
2509 | void |
2576 | void |
2510 | rxvt_term::scr_reverse_selection () |
2577 | rxvt_term::scr_reverse_selection () NOTHROW |
2511 | { |
2578 | { |
2512 | if (selection.op |
2579 | if (selection.op |
2513 | && current_screen == selection.screen |
2580 | && current_screen == selection.screen |
2514 | && selection.end.row >= view_start) |
2581 | && selection.end.row >= view_start) |
2515 | { |
2582 | { |
2516 | #if ENABLE_FRILLS |
2583 | #if !ENABLE_MINIMAL |
2517 | if (selection.rect) |
2584 | if (selection.rect) |
2518 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2585 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2519 | selection.end.row, selection.end.col, |
2586 | selection.end.row, selection.end.col, |
2520 | RS_RVid, RS_RVid | RS_Uline); |
2587 | RS_RVid, RS_RVid | RS_Uline); |
2521 | else |
2588 | else |
… | |
… | |
2531 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2598 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2532 | * invoking routine must close the fd. |
2599 | * invoking routine must close the fd. |
2533 | */ |
2600 | */ |
2534 | #if 0 |
2601 | #if 0 |
2535 | void |
2602 | void |
2536 | rxvt_term::scr_dump (int fd) |
2603 | rxvt_term::scr_dump (int fd) NOTHROW |
2537 | { |
2604 | { |
2538 | int row, wrote; |
2605 | int row, wrote; |
2539 | unsigned int width, towrite; |
2606 | unsigned int width, towrite; |
2540 | char r1[] = "\n"; |
2607 | char r1[] = "\n"; |
2541 | |
2608 | |
… | |
… | |
2560 | |
2627 | |
2561 | /* ------------------------------------------------------------------------- * |
2628 | /* ------------------------------------------------------------------------- * |
2562 | * CHARACTER SELECTION * |
2629 | * CHARACTER SELECTION * |
2563 | * ------------------------------------------------------------------------- */ |
2630 | * ------------------------------------------------------------------------- */ |
2564 | void |
2631 | void |
2565 | rxvt_term::selection_check (int check_more) |
2632 | rxvt_term::selection_check (int check_more) NOTHROW |
2566 | { |
2633 | { |
2567 | row_col_t pos; |
2634 | row_col_t pos; |
2568 | |
2635 | |
2569 | if (!selection.op) |
2636 | if (!selection.op) |
2570 | return; |
2637 | return; |
… | |
… | |
2591 | /* ------------------------------------------------------------------------- */ |
2658 | /* ------------------------------------------------------------------------- */ |
2592 | /* |
2659 | /* |
2593 | * Paste a selection direct to the command fd |
2660 | * Paste a selection direct to the command fd |
2594 | */ |
2661 | */ |
2595 | void |
2662 | void |
2596 | rxvt_term::paste (char *data, unsigned int len) |
2663 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2597 | { |
2664 | { |
2598 | /* convert normal newline chars into common keyboard Return key sequence */ |
2665 | /* convert normal newline chars into common keyboard Return key sequence */ |
2599 | for (unsigned int i = 0; i < len; i++) |
2666 | for (unsigned int i = 0; i < len; i++) |
2600 | if (data[i] == C0_LF) |
2667 | if (data[i] == C0_LF) |
2601 | data[i] = C0_CR; |
2668 | data[i] = C0_CR; |
… | |
… | |
2607 | /* |
2674 | /* |
2608 | * Respond to a notification that a primary selection has been sent |
2675 | * Respond to a notification that a primary selection has been sent |
2609 | * EXT: SelectionNotify |
2676 | * EXT: SelectionNotify |
2610 | */ |
2677 | */ |
2611 | void |
2678 | void |
2612 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2679 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2613 | { |
2680 | { |
2614 | if (prop == None) /* check for failed XConvertSelection */ |
2681 | if (prop == None) /* check for failed XConvertSelection */ |
2615 | { |
2682 | { |
2616 | if ((selection_type & Sel_CompoundText)) |
2683 | if ((selection_type & Sel_CompoundText)) |
2617 | { |
2684 | { |
… | |
… | |
2637 | } |
2704 | } |
2638 | |
2705 | |
2639 | unsigned long bytes_after; |
2706 | unsigned long bytes_after; |
2640 | XTextProperty ct; |
2707 | XTextProperty ct; |
2641 | |
2708 | |
2642 | if (XGetWindowProperty (display->display, win, prop, |
2709 | if (XGetWindowProperty (dpy, win, prop, |
2643 | 0, PROP_SIZE / 4, |
2710 | 0, PROP_SIZE / 4, |
2644 | delete_prop, AnyPropertyType, |
2711 | delete_prop, AnyPropertyType, |
2645 | &ct.encoding, &ct.format, |
2712 | &ct.encoding, &ct.format, |
2646 | &ct.nitems, &bytes_after, |
2713 | &ct.nitems, &bytes_after, |
2647 | &ct.value) != Success) |
2714 | &ct.value) != Success) |
… | |
… | |
2656 | if (bytes_after) |
2723 | if (bytes_after) |
2657 | { |
2724 | { |
2658 | // fetch and append remaining data |
2725 | // fetch and append remaining data |
2659 | XTextProperty ct2; |
2726 | XTextProperty ct2; |
2660 | |
2727 | |
2661 | if (XGetWindowProperty (display->display, win, prop, |
2728 | if (XGetWindowProperty (dpy, win, prop, |
2662 | ct.nitems / 4, (bytes_after + 3) / 4, |
2729 | ct.nitems / 4, (bytes_after + 3) / 4, |
2663 | delete_prop, AnyPropertyType, |
2730 | delete_prop, AnyPropertyType, |
2664 | &ct2.encoding, &ct2.format, |
2731 | &ct2.encoding, &ct2.format, |
2665 | &ct2.nitems, &bytes_after, |
2732 | &ct2.nitems, &bytes_after, |
2666 | &ct2.value) != Success) |
2733 | &ct2.value) != Success) |
… | |
… | |
2679 | |
2746 | |
2680 | if (ct.encoding == xa[XA_INCR]) |
2747 | if (ct.encoding == xa[XA_INCR]) |
2681 | { |
2748 | { |
2682 | // INCR selection, start handshake |
2749 | // INCR selection, start handshake |
2683 | if (!delete_prop) |
2750 | if (!delete_prop) |
2684 | XDeleteProperty (display->display, win, prop); |
2751 | XDeleteProperty (dpy, win, prop); |
2685 | |
2752 | |
2686 | selection_wait = Sel_incr; |
2753 | selection_wait = Sel_incr; |
2687 | incr_buf_fill = 0; |
2754 | incr_buf_fill = 0; |
2688 | incr_ev.start (NOW + 10); |
2755 | incr_ev.start (NOW + 10); |
2689 | |
2756 | |
… | |
… | |
2736 | } |
2803 | } |
2737 | |
2804 | |
2738 | char **cl; |
2805 | char **cl; |
2739 | int cr; |
2806 | int cr; |
2740 | |
2807 | |
2741 | #if ENABLE_FRILLS |
2808 | #if !ENABLE_MINIMAL |
2742 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2809 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2743 | // so recode it manually |
2810 | // so recode it manually |
2744 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2811 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2745 | { |
2812 | { |
2746 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2813 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2750 | paste (s, strlen (s)); |
2817 | paste (s, strlen (s)); |
2751 | free (s); |
2818 | free (s); |
2752 | } |
2819 | } |
2753 | else |
2820 | else |
2754 | #endif |
2821 | #endif |
2755 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2822 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2756 | && cl) |
2823 | && cl) |
2757 | { |
2824 | { |
2758 | for (int i = 0; i < cr; i++) |
2825 | for (int i = 0; i < cr; i++) |
2759 | paste (cl[i], strlen (cl[i])); |
2826 | paste (cl[i], strlen (cl[i])); |
2760 | |
2827 | |
… | |
… | |
2769 | if (selection_wait == Sel_normal) |
2836 | if (selection_wait == Sel_normal) |
2770 | selection_wait = Sel_none; |
2837 | selection_wait = Sel_none; |
2771 | } |
2838 | } |
2772 | |
2839 | |
2773 | void |
2840 | void |
2774 | rxvt_term::incr_cb (time_watcher &w) |
2841 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2775 | { |
2842 | { |
2776 | selection_wait = Sel_none; |
2843 | selection_wait = Sel_none; |
2777 | |
2844 | |
2778 | incr_buf_size = 0; |
2845 | incr_buf_size = 0; |
2779 | free (incr_buf); |
2846 | free (incr_buf); |
2780 | |
2847 | |
2781 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2848 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2782 | } |
2849 | } |
2783 | |
2850 | |
2784 | void |
2851 | void |
2785 | rxvt_term::selection_property (Window win, Atom prop) |
2852 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
2786 | { |
2853 | { |
2787 | if (prop == None || selection_wait != Sel_incr) |
2854 | if (prop == None || selection_wait != Sel_incr) |
2788 | return; |
2855 | return; |
2789 | |
2856 | |
2790 | selection_paste (win, prop, true); |
2857 | selection_paste (win, prop, true); |
… | |
… | |
2799 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2866 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2800 | * will auto fallback to CUT_BUFFER0 |
2867 | * will auto fallback to CUT_BUFFER0 |
2801 | * EXT: button 2 release |
2868 | * EXT: button 2 release |
2802 | */ |
2869 | */ |
2803 | void |
2870 | void |
2804 | rxvt_term::selection_request (Time tm) |
2871 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2805 | { |
2872 | { |
2806 | if (selection.text) |
2873 | if (selection.text && selnum == Sel_Primary) |
2807 | { /* internal selection */ |
2874 | { /* internal selection */ |
2808 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2875 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2809 | paste (str, strlen (str)); |
2876 | paste (str, strlen (str)); |
2810 | free (str); |
2877 | free (str); |
2811 | return; |
2878 | return; |
2812 | } |
2879 | } |
2813 | else |
2880 | else |
2814 | { |
2881 | { |
2815 | int i; |
|
|
2816 | |
|
|
2817 | selection_request_time = tm; |
2882 | selection_request_time = tm; |
2818 | selection_wait = Sel_normal; |
2883 | selection_wait = Sel_normal; |
2819 | |
2884 | |
2820 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
|
|
2821 | { |
|
|
2822 | #if X_HAVE_UTF8_STRING |
2885 | #if X_HAVE_UTF8_STRING |
2823 | selection_type = Sel_UTF8String; |
2886 | selection_type = Sel_UTF8String; |
2824 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2887 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2825 | return; |
2888 | return; |
2826 | #else |
2889 | #else |
2827 | selection_type = Sel_CompoundText; |
2890 | selection_type = Sel_CompoundText; |
2828 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2891 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2829 | return; |
2892 | return; |
2830 | #endif |
2893 | #endif |
2831 | } |
|
|
2832 | } |
2894 | } |
2833 | |
2895 | |
2834 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2896 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2835 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2897 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2836 | } |
2898 | } |
2837 | |
2899 | |
2838 | int |
2900 | int |
2839 | rxvt_term::selection_request_other (Atom target, int selnum) |
2901 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
2840 | { |
2902 | { |
2841 | Atom sel; |
2903 | Atom sel; |
2842 | |
2904 | |
2843 | selection_type |= selnum; |
2905 | selection_type |= selnum; |
2844 | |
2906 | |
… | |
… | |
2847 | else if (selnum == Sel_Secondary) |
2909 | else if (selnum == Sel_Secondary) |
2848 | sel = XA_SECONDARY; |
2910 | sel = XA_SECONDARY; |
2849 | else |
2911 | else |
2850 | sel = xa[XA_CLIPBOARD]; |
2912 | sel = xa[XA_CLIPBOARD]; |
2851 | |
2913 | |
2852 | if (XGetSelectionOwner (display->display, sel) != None) |
2914 | if (XGetSelectionOwner (dpy, sel) != None) |
2853 | { |
2915 | { |
2854 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2916 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2855 | vt, selection_request_time); |
2917 | vt, selection_request_time); |
2856 | return 1; |
2918 | return 1; |
2857 | } |
2919 | } |
2858 | |
2920 | |
2859 | return 0; |
2921 | return 0; |
… | |
… | |
2863 | /* |
2925 | /* |
2864 | * Clear all selected text |
2926 | * Clear all selected text |
2865 | * EXT: SelectionClear |
2927 | * EXT: SelectionClear |
2866 | */ |
2928 | */ |
2867 | void |
2929 | void |
2868 | rxvt_term::selection_clear () |
2930 | rxvt_term::selection_clear () NOTHROW |
2869 | { |
2931 | { |
2870 | want_refresh = 1; |
2932 | want_refresh = 1; |
2871 | free (selection.text); |
2933 | free (selection.text); |
2872 | selection.text = NULL; |
2934 | selection.text = NULL; |
2873 | selection.len = 0; |
2935 | selection.len = 0; |
… | |
… | |
2922 | |
2984 | |
2923 | int end_col; |
2985 | int end_col; |
2924 | |
2986 | |
2925 | for (; row <= selection.end.row; row++, col = 0) |
2987 | for (; row <= selection.end.row; row++, col = 0) |
2926 | { |
2988 | { |
2927 | #if ENABLE_FRILLS |
2989 | #if !ENABLE_MINIMAL |
2928 | if (selection.rect) |
2990 | if (selection.rect) |
2929 | { |
2991 | { |
2930 | col = selection.beg.col; |
2992 | col = selection.beg.col; |
2931 | end_col = ncol + 1; |
2993 | end_col = ncol + 1; |
2932 | } |
2994 | } |
… | |
… | |
2935 | end_col = ROW(row).l; |
2997 | end_col = ROW(row).l; |
2936 | |
2998 | |
2937 | col = max (col, 0); |
2999 | col = max (col, 0); |
2938 | |
3000 | |
2939 | if (row == selection.end.row |
3001 | if (row == selection.end.row |
2940 | #if ENABLE_FRILLS |
3002 | #if !ENABLE_MINIMAL |
2941 | || selection.rect |
3003 | || selection.rect |
2942 | #endif |
3004 | #endif |
2943 | ) |
3005 | ) |
2944 | min_it (end_col, selection.end.col); |
3006 | min_it (end_col, selection.end.col); |
2945 | |
3007 | |
… | |
… | |
2968 | #endif |
3030 | #endif |
2969 | else |
3031 | else |
2970 | new_selection_text[ofs++] = *t++; |
3032 | new_selection_text[ofs++] = *t++; |
2971 | } |
3033 | } |
2972 | |
3034 | |
2973 | #if ENABLE_FRILLS |
3035 | #if !ENABLE_MINIMAL |
2974 | if (selection.rect) |
3036 | if (selection.rect) |
2975 | { |
3037 | { |
2976 | while (ofs |
3038 | while (ofs |
2977 | && new_selection_text[ofs - 1] != C0_LF |
3039 | && new_selection_text[ofs - 1] != C0_LF |
2978 | && unicode::is_space (new_selection_text[ofs - 1])) |
3040 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3008 | |
3070 | |
3009 | selection_grab (tm); |
3071 | selection_grab (tm); |
3010 | } |
3072 | } |
3011 | |
3073 | |
3012 | bool |
3074 | bool |
3013 | rxvt_term::selection_grab (Time tm) |
3075 | rxvt_term::selection_grab (Time tm) NOTHROW |
3014 | { |
3076 | { |
3015 | selection_time = tm; |
3077 | selection_time = tm; |
3016 | |
3078 | |
3017 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3079 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3018 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3080 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3019 | { |
3081 | { |
3020 | display->set_selection_owner (this); |
3082 | display->set_selection_owner (this); |
3021 | return true; |
3083 | return true; |
3022 | } |
3084 | } |
3023 | else |
3085 | else |
… | |
… | |
3027 | } |
3089 | } |
3028 | |
3090 | |
3029 | #if 0 |
3091 | #if 0 |
3030 | XTextProperty ct; |
3092 | XTextProperty ct; |
3031 | |
3093 | |
3032 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3094 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3033 | { |
3095 | { |
3034 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3096 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3035 | XFree (ct.value); |
3097 | XFree (ct.value); |
3036 | } |
3098 | } |
3037 | #endif |
3099 | #endif |
… | |
… | |
3041 | /* |
3103 | /* |
3042 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3104 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3043 | * EXT: button 1 press |
3105 | * EXT: button 1 press |
3044 | */ |
3106 | */ |
3045 | void |
3107 | void |
3046 | rxvt_term::selection_click (int clicks, int x, int y) |
3108 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3047 | { |
3109 | { |
3048 | clicks = ((clicks - 1) % 3) + 1; |
3110 | clicks = ((clicks - 1) % 3) + 1; |
3049 | selection.clicks = clicks; /* save clicks so extend will work */ |
3111 | selection.clicks = clicks; /* save clicks so extend will work */ |
3050 | |
3112 | |
3051 | if (clicks == 2 && !selection.rect |
3113 | if (clicks == 2 && !selection.rect |
… | |
… | |
3070 | /* ------------------------------------------------------------------------- */ |
3132 | /* ------------------------------------------------------------------------- */ |
3071 | /* |
3133 | /* |
3072 | * Mark a selection at the specified col/row |
3134 | * Mark a selection at the specified col/row |
3073 | */ |
3135 | */ |
3074 | void |
3136 | void |
3075 | rxvt_term::selection_start_colrow (int col, int row) |
3137 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3076 | { |
3138 | { |
3077 | want_refresh = 1; |
3139 | want_refresh = 1; |
3078 | |
3140 | |
3079 | selection.mark.row = row + view_start; |
3141 | selection.mark.row = row + view_start; |
3080 | selection.mark.col = col; |
3142 | selection.mark.col = col; |
… | |
… | |
3106 | #define DELIMIT_TEXT(x) \ |
3168 | #define DELIMIT_TEXT(x) \ |
3107 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3169 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3108 | #define DELIMIT_REND(x) 1 |
3170 | #define DELIMIT_REND(x) 1 |
3109 | |
3171 | |
3110 | void |
3172 | void |
3111 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3173 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3112 | { |
3174 | { |
3113 | int col, row, dirnadd, tcol, trow, w1, w2; |
3175 | int col, row, dirnadd, tcol, trow, w1, w2; |
3114 | row_col_t bound; |
3176 | row_col_t bound; |
3115 | text_t *stp; |
3177 | text_t *stp; |
3116 | rend_t *srp; |
3178 | rend_t *srp; |
… | |
… | |
3190 | * flag == 0 ==> button 1 |
3252 | * flag == 0 ==> button 1 |
3191 | * flag == 1 ==> button 3 press |
3253 | * flag == 1 ==> button 3 press |
3192 | * flag == 2 ==> button 3 motion |
3254 | * flag == 2 ==> button 3 motion |
3193 | */ |
3255 | */ |
3194 | void |
3256 | void |
3195 | rxvt_term::selection_extend (int x, int y, int flag) |
3257 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3196 | { |
3258 | { |
3197 | int col = clamp (Pixel2Col (x), 0, ncol); |
3259 | int col = clamp (Pixel2Col (x), 0, ncol); |
3198 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3260 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3199 | |
3261 | |
3200 | /* |
3262 | /* |
… | |
… | |
3226 | /* ------------------------------------------------------------------------- */ |
3288 | /* ------------------------------------------------------------------------- */ |
3227 | /* |
3289 | /* |
3228 | * Extend the selection to the specified col/row |
3290 | * Extend the selection to the specified col/row |
3229 | */ |
3291 | */ |
3230 | void |
3292 | void |
3231 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3293 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3232 | { |
3294 | { |
3233 | row_col_t pos; |
3295 | row_col_t pos; |
3234 | enum { |
3296 | enum { |
3235 | LEFT, RIGHT |
3297 | LEFT, RIGHT |
3236 | } closeto = RIGHT; |
3298 | } closeto = RIGHT; |
… | |
… | |
3339 | |
3401 | |
3340 | if (selection.clicks == 1) |
3402 | if (selection.clicks == 1) |
3341 | { |
3403 | { |
3342 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3404 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3343 | && !ROW(selection.beg.row).is_longer () |
3405 | && !ROW(selection.beg.row).is_longer () |
3344 | #if ENABLE_FRILLS |
3406 | #if !ENABLE_MINIMAL |
3345 | && !selection.rect |
3407 | && !selection.rect |
3346 | #endif |
3408 | #endif |
3347 | ) |
3409 | ) |
3348 | selection.beg.col = ncol; |
3410 | selection.beg.col = ncol; |
3349 | |
3411 | |
3350 | if ( |
3412 | if ( |
3351 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3413 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3352 | && !ROW(selection.end.row).is_longer () |
3414 | && !ROW(selection.end.row).is_longer () |
3353 | #if ENABLE_FRILLS |
3415 | #if !ENABLE_MINIMAL |
3354 | && !selection.rect |
3416 | && !selection.rect |
3355 | #endif |
3417 | #endif |
3356 | ) |
3418 | ) |
3357 | selection.end.col = ncol; |
3419 | selection.end.col = ncol; |
3358 | } |
3420 | } |
… | |
… | |
3365 | selection_delimit_word (DN, &selection.end, &selection.end); |
3427 | selection_delimit_word (DN, &selection.end, &selection.end); |
3366 | } |
3428 | } |
3367 | else if (selection.clicks == 3) |
3429 | else if (selection.clicks == 3) |
3368 | { |
3430 | { |
3369 | #if ENABLE_FRILLS |
3431 | #if ENABLE_FRILLS |
3370 | if (OPTION (Opt_tripleclickwords)) |
3432 | if (option (Opt_tripleclickwords)) |
3371 | { |
3433 | { |
3372 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3434 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3373 | |
3435 | |
3374 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3436 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3375 | { |
3437 | { |
3376 | if (!ROW(end_row).is_longer ()) |
3438 | if (!ROW(end_row).is_longer ()) |
3377 | { |
3439 | { |
3378 | selection.end.row = end_row; |
3440 | selection.end.row = end_row; |
3379 | selection.end.col = ROW(end_row).l; |
3441 | selection.end.col = ROW(end_row).l; |
|
|
3442 | # if !ENABLE_MINIMAL |
3380 | selection_remove_trailing_spaces (); |
3443 | selection_remove_trailing_spaces (); |
|
|
3444 | # endif |
3381 | break; |
3445 | break; |
3382 | } |
3446 | } |
3383 | } |
3447 | } |
3384 | } |
3448 | } |
3385 | else |
3449 | else |
… | |
… | |
3414 | selection.mark.row = selection.beg.row; |
3478 | selection.mark.row = selection.beg.row; |
3415 | selection.mark.col = selection.beg.col; |
3479 | selection.mark.col = selection.beg.col; |
3416 | } |
3480 | } |
3417 | } |
3481 | } |
3418 | |
3482 | |
3419 | #if ENABLE_FRILLS |
3483 | #if !ENABLE_MINIMAL |
3420 | if (selection.rect && selection.beg.col > selection.end.col) |
3484 | if (selection.rect && selection.beg.col > selection.end.col) |
3421 | ::swap (selection.beg.col, selection.end.col); |
3485 | ::swap (selection.beg.col, selection.end.col); |
3422 | #endif |
3486 | #endif |
3423 | } |
3487 | } |
3424 | |
3488 | |
3425 | #if ENABLE_FRILLS |
3489 | #if !ENABLE_MINIMAL |
3426 | void |
3490 | void |
3427 | rxvt_term::selection_remove_trailing_spaces () |
3491 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3428 | { |
3492 | { |
3429 | int32_t end_col, end_row; |
3493 | int32_t end_col, end_row; |
3430 | text_t *stp; |
3494 | text_t *stp; |
3431 | |
3495 | |
3432 | end_col = selection.end.col; |
3496 | end_col = selection.end.col; |
… | |
… | |
3470 | /* |
3534 | /* |
3471 | * Double click on button 3 when already selected |
3535 | * Double click on button 3 when already selected |
3472 | * EXT: button 3 double click |
3536 | * EXT: button 3 double click |
3473 | */ |
3537 | */ |
3474 | void |
3538 | void |
3475 | rxvt_term::selection_rotate (int x, int y) |
3539 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3476 | { |
3540 | { |
3477 | selection.clicks = selection.clicks % 3 + 1; |
3541 | selection.clicks = selection.clicks % 3 + 1; |
3478 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3542 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3479 | } |
3543 | } |
3480 | |
3544 | |
… | |
… | |
3482 | /* |
3546 | /* |
3483 | * Respond to a request for our current selection |
3547 | * Respond to a request for our current selection |
3484 | * EXT: SelectionRequest |
3548 | * EXT: SelectionRequest |
3485 | */ |
3549 | */ |
3486 | void |
3550 | void |
3487 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3551 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3488 | { |
3552 | { |
3489 | XSelectionEvent ev; |
3553 | XSelectionEvent ev; |
3490 | dDisp; |
|
|
3491 | |
3554 | |
3492 | ev.type = SelectionNotify; |
3555 | ev.type = SelectionNotify; |
3493 | ev.property = None; |
3556 | ev.property = None; |
3494 | ev.display = rq.display; |
3557 | ev.display = rq.display; |
3495 | ev.requestor = rq.requestor; |
3558 | ev.requestor = rq.requestor; |
… | |
… | |
3509 | *target++ = xa[XA_COMPOUND_TEXT]; |
3572 | *target++ = xa[XA_COMPOUND_TEXT]; |
3510 | #if X_HAVE_UTF8_STRING |
3573 | #if X_HAVE_UTF8_STRING |
3511 | *target++ = xa[XA_UTF8_STRING]; |
3574 | *target++ = xa[XA_UTF8_STRING]; |
3512 | #endif |
3575 | #endif |
3513 | |
3576 | |
3514 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3577 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3515 | 32, PropModeReplace, |
3578 | 32, PropModeReplace, |
3516 | (unsigned char *)target_list, target - target_list); |
3579 | (unsigned char *)target_list, target - target_list); |
3517 | ev.property = rq.property; |
3580 | ev.property = rq.property; |
3518 | } |
3581 | } |
3519 | #if TODO // TODO |
3582 | #if TODO // TODO |
… | |
… | |
3522 | /* TODO: Handle MULTIPLE */ |
3585 | /* TODO: Handle MULTIPLE */ |
3523 | } |
3586 | } |
3524 | #endif |
3587 | #endif |
3525 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3588 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3526 | { |
3589 | { |
3527 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3590 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3528 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3591 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3529 | ev.property = rq.property; |
3592 | ev.property = rq.property; |
3530 | } |
3593 | } |
3531 | else if (rq.target == XA_STRING |
3594 | else if (rq.target == XA_STRING |
3532 | || rq.target == xa[XA_TEXT] |
3595 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3556 | style = enc_string; |
3619 | style = enc_string; |
3557 | else if (target == xa[XA_TEXT]) |
3620 | else if (target == xa[XA_TEXT]) |
3558 | style = enc_text; |
3621 | style = enc_text; |
3559 | else if (target == xa[XA_COMPOUND_TEXT]) |
3622 | else if (target == xa[XA_COMPOUND_TEXT]) |
3560 | style = enc_compound_text; |
3623 | style = enc_compound_text; |
3561 | #if ENABLE_FRILLS |
3624 | #if !ENABLE_MINIMAL |
3562 | else if (target == xa[XA_UTF8_STRING]) |
3625 | else if (target == xa[XA_UTF8_STRING]) |
3563 | style = enc_utf8; |
3626 | style = enc_utf8; |
3564 | #endif |
3627 | #endif |
3565 | else |
3628 | else |
3566 | { |
3629 | { |
… | |
… | |
3577 | { |
3640 | { |
3578 | cl = L""; |
3641 | cl = L""; |
3579 | selectlen = 0; |
3642 | selectlen = 0; |
3580 | } |
3643 | } |
3581 | |
3644 | |
3582 | #if ENABLE_FRILLS |
3645 | #if !ENABLE_MINIMAL |
3583 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3646 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3584 | // so recode it manually |
3647 | // so recode it manually |
3585 | if (style == enc_utf8) |
3648 | if (style == enc_utf8) |
3586 | { |
3649 | { |
3587 | freect = 1; |
3650 | freect = 1; |
… | |
… | |
3590 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3653 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3591 | ct.nitems = strlen ((char *)ct.value); |
3654 | ct.nitems = strlen ((char *)ct.value); |
3592 | } |
3655 | } |
3593 | else |
3656 | else |
3594 | #endif |
3657 | #endif |
3595 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3658 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3596 | freect = 1; |
3659 | freect = 1; |
3597 | else |
3660 | else |
3598 | { |
3661 | { |
3599 | /* if we failed to convert then send it raw */ |
3662 | /* if we failed to convert then send it raw */ |
3600 | ct.value = (unsigned char *)cl; |
3663 | ct.value = (unsigned char *)cl; |
3601 | ct.nitems = selectlen; |
3664 | ct.nitems = selectlen; |
3602 | ct.encoding = target; |
3665 | ct.encoding = target; |
3603 | } |
3666 | } |
3604 | |
3667 | |
3605 | XChangeProperty (disp, rq.requestor, rq.property, |
3668 | XChangeProperty (dpy, rq.requestor, rq.property, |
3606 | ct.encoding, 8, PropModeReplace, |
3669 | ct.encoding, 8, PropModeReplace, |
3607 | ct.value, (int)ct.nitems); |
3670 | ct.value, (int)ct.nitems); |
3608 | ev.property = rq.property; |
3671 | ev.property = rq.property; |
3609 | |
3672 | |
3610 | if (freect) |
3673 | if (freect) |
3611 | XFree (ct.value); |
3674 | XFree (ct.value); |
3612 | } |
3675 | } |
3613 | |
3676 | |
3614 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3677 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3615 | } |
3678 | } |
3616 | |
3679 | |
3617 | /* ------------------------------------------------------------------------- * |
3680 | /* ------------------------------------------------------------------------- * |
3618 | * MOUSE ROUTINES * |
3681 | * MOUSE ROUTINES * |
3619 | * ------------------------------------------------------------------------- */ |
3682 | * ------------------------------------------------------------------------- */ |
3620 | |
3683 | |
3621 | /* |
3684 | /* |
3622 | * return col/row values corresponding to x/y pixel values |
3685 | * return col/row values corresponding to x/y pixel values |
3623 | */ |
3686 | */ |
3624 | void |
3687 | void |
3625 | rxvt_term::pixel_position (int *x, int *y) |
3688 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
3626 | { |
3689 | { |
3627 | *x = Pixel2Col (*x); |
3690 | *x = Pixel2Col (*x); |
3628 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3691 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3629 | *y = Pixel2Row (*y); |
3692 | *y = Pixel2Row (*y); |
3630 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3693 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3631 | } |
3694 | } |
3632 | |
3695 | |
3633 | /* ------------------------------------------------------------------------- */ |
3696 | /* ------------------------------------------------------------------------- */ |
3634 | #ifdef USE_XIM |
3697 | #ifdef USE_XIM |
3635 | void |
3698 | void |
3636 | rxvt_term::im_set_position (XPoint &pos) |
3699 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3637 | { |
3700 | { |
3638 | XWindowAttributes xwa; |
3701 | XWindowAttributes xwa; |
3639 | |
3702 | |
3640 | XGetWindowAttributes (display->display, vt, &xwa); |
3703 | XGetWindowAttributes (dpy, vt, &xwa); |
3641 | |
3704 | |
3642 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3705 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3643 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3706 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3644 | } |
3707 | } |
3645 | #endif |
3708 | #endif |
3646 | |
3709 | |
3647 | #if ENABLE_OVERLAY |
3710 | #if ENABLE_OVERLAY |
3648 | void |
3711 | void |
3649 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3712 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW |
3650 | { |
3713 | { |
3651 | if (nrow < 1 || ncol < 1) |
3714 | if (nrow < 1 || ncol < 1) |
3652 | return; |
3715 | return; |
3653 | |
3716 | |
3654 | want_refresh = 1; |
3717 | want_refresh = 1; |
… | |
… | |
3699 | *rp = r; |
3762 | *rp = r; |
3700 | } |
3763 | } |
3701 | } |
3764 | } |
3702 | |
3765 | |
3703 | void |
3766 | void |
3704 | rxvt_term::scr_overlay_off () |
3767 | rxvt_term::scr_overlay_off () NOTHROW |
3705 | { |
3768 | { |
3706 | if (!ov_text) |
3769 | if (!ov_text) |
3707 | return; |
3770 | return; |
3708 | |
3771 | |
3709 | want_refresh = 1; |
3772 | want_refresh = 1; |
… | |
… | |
3717 | delete [] ov_text; ov_text = 0; |
3780 | delete [] ov_text; ov_text = 0; |
3718 | delete [] ov_rend; ov_rend = 0; |
3781 | delete [] ov_rend; ov_rend = 0; |
3719 | } |
3782 | } |
3720 | |
3783 | |
3721 | void |
3784 | void |
3722 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3785 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3723 | { |
3786 | { |
3724 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3787 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3725 | return; |
3788 | return; |
3726 | |
3789 | |
3727 | x++, y++; |
3790 | x++, y++; |
… | |
… | |
3729 | ov_text[y][x] = text; |
3792 | ov_text[y][x] = text; |
3730 | ov_rend[y][x] = rend; |
3793 | ov_rend[y][x] = rend; |
3731 | } |
3794 | } |
3732 | |
3795 | |
3733 | void |
3796 | void |
3734 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
3797 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3735 | { |
3798 | { |
3736 | while (*s) |
3799 | while (*s) |
3737 | scr_overlay_set (x++, y, *s++); |
3800 | scr_overlay_set (x++, y, *s++); |
3738 | } |
3801 | } |
3739 | |
3802 | |
3740 | void |
3803 | void |
3741 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
3804 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3742 | { |
3805 | { |
3743 | while (*s) |
3806 | while (*s) |
3744 | { |
3807 | { |
3745 | text_t t = *s++; |
3808 | text_t t = *s++; |
3746 | int width = wcwidth (t); |
3809 | int width = WCWIDTH (t); |
3747 | |
3810 | |
3748 | while (width--) |
3811 | while (width--) |
3749 | { |
3812 | { |
3750 | scr_overlay_set (x++, y, t); |
3813 | scr_overlay_set (x++, y, t); |
3751 | t = NOCHAR; |
3814 | t = NOCHAR; |
3752 | } |
3815 | } |
3753 | } |
3816 | } |
3754 | } |
3817 | } |
3755 | |
3818 | |
3756 | void |
3819 | void |
3757 | rxvt_term::scr_swap_overlay () |
3820 | rxvt_term::scr_swap_overlay () NOTHROW |
3758 | { |
3821 | { |
3759 | if (!ov_text) |
3822 | if (!ov_text) |
3760 | return; |
3823 | return; |
3761 | |
3824 | |
3762 | // swap screen mem with overlay |
3825 | // swap screen mem with overlay |