… | |
… | |
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 (xdisp, 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 (xdisp, 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 (xdisp, 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; |
… | |
… | |
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 | |
… | |
… | |
325 | qline->l = ncol; |
327 | qline->l = ncol; |
326 | qline->is_longer (1); |
328 | qline->is_longer (1); |
327 | |
329 | |
328 | int qcol = 0; |
330 | int qcol = 0; |
329 | |
331 | |
|
|
332 | // see below for cursor adjustment rationale |
|
|
333 | if (p == ocur.row) |
|
|
334 | screen.cur.row = q - (total_rows - nrow); |
|
|
335 | |
330 | // fill a single destination line |
336 | // fill a single destination line |
331 | while (lofs < llen && qcol < ncol) |
337 | while (lofs < llen && qcol < ncol) |
332 | { |
338 | { |
333 | int prow = lofs / prev_ncol; |
339 | int prow = lofs / prev_ncol; |
334 | int pcol = lofs % prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
… | |
… | |
344 | |
350 | |
345 | line_t &pline = old_buf [prow]; |
351 | line_t &pline = old_buf [prow]; |
346 | |
352 | |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
348 | |
354 | |
349 | assert (len); |
|
|
350 | assert (pline.t); |
|
|
351 | |
|
|
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
356 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
354 | |
357 | |
355 | lofs += len; |
358 | lofs += len; |
356 | qcol += len; |
359 | qcol += len; |
… | |
… | |
389 | } |
392 | } |
390 | |
393 | |
391 | term_start = 0; |
394 | term_start = 0; |
392 | } |
395 | } |
393 | |
396 | |
394 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
395 | for (int i = top_row; i < nrow; i++) |
|
|
396 | assert (ROW (i).t); |
|
|
397 | #endif |
|
|
398 | |
|
|
399 | free (old_buf); |
397 | free (old_buf); |
400 | delete old_ta; |
398 | delete old_ta; |
401 | delete old_ra; |
399 | delete old_ra; |
402 | |
400 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
401 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
402 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
403 | |
406 | if (tabs) |
|
|
407 | free (tabs); |
404 | free (tabs); |
408 | } |
405 | } |
|
|
406 | |
|
|
407 | CLEAR_ALL_SELECTION (); |
409 | |
408 | |
410 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
410 | prev_ncol = ncol; |
412 | |
411 | |
413 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
414 | |
413 | |
415 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; col--; ) |
416 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
417 | |
416 | |
|
|
417 | if (current_screen != PRIMARY) |
|
|
418 | scr_swap_screen (); |
|
|
419 | |
418 | tt_winch (); |
420 | tt_winch (); |
419 | |
421 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
423 | } |
422 | |
424 | |
423 | /* ------------------------------------------------------------------------- */ |
425 | /* ------------------------------------------------------------------------- */ |
424 | /* |
426 | /* |
425 | * Free everything. That way malloc debugging can find leakage. |
427 | * Free everything. That way malloc debugging can find leakage. |
426 | */ |
428 | */ |
427 | void |
429 | void |
428 | rxvt_term::scr_release () |
430 | rxvt_term::scr_release () NOTHROW |
429 | { |
431 | { |
|
|
432 | if (row_buf) |
|
|
433 | { |
430 | delete talloc; talloc = 0; |
434 | delete talloc; talloc = 0; |
431 | delete ralloc; ralloc = 0; |
435 | delete ralloc; ralloc = 0; |
432 | |
436 | |
433 | free (row_buf); |
437 | free (row_buf); |
434 | free (swap_buf); |
438 | free (swap_buf); |
435 | free (drawn_buf); |
439 | free (drawn_buf); |
436 | free (tabs); |
440 | free (tabs); |
437 | |
441 | |
438 | row_buf = 0; // signal that we freed all the arrays |
442 | row_buf = 0; // signal that we freed all the arrays |
|
|
443 | } |
439 | } |
444 | } |
440 | |
445 | |
441 | /* ------------------------------------------------------------------------- */ |
446 | /* ------------------------------------------------------------------------- */ |
442 | /* |
447 | /* |
443 | * Hard reset |
448 | * Hard reset |
… | |
… | |
460 | * Save and Restore cursor |
465 | * Save and Restore cursor |
461 | * XTERM_SEQ: Save cursor : ESC 7 |
466 | * XTERM_SEQ: Save cursor : ESC 7 |
462 | * XTERM_SEQ: Restore cursor: ESC 8 |
467 | * XTERM_SEQ: Restore cursor: ESC 8 |
463 | */ |
468 | */ |
464 | void |
469 | void |
465 | rxvt_term::scr_cursor (int mode) |
470 | rxvt_term::scr_cursor (cursor_mode mode) NOTHROW |
466 | { |
471 | { |
467 | screen_t *s; |
472 | screen_t *s; |
468 | |
473 | |
469 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
474 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
470 | if (current_screen == SECONDARY) |
475 | if (current_screen == SECONDARY) |
… | |
… | |
502 | assert (s->cur.row >= 0); |
507 | assert (s->cur.row >= 0); |
503 | assert (s->cur.col >= 0); |
508 | assert (s->cur.col >= 0); |
504 | #endif |
509 | #endif |
505 | } |
510 | } |
506 | |
511 | |
|
|
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 | |
507 | /* ------------------------------------------------------------------------- */ |
527 | /* ------------------------------------------------------------------------- */ |
508 | /* |
528 | /* |
509 | * Swap between primary and secondary screens |
529 | * Swap between primary and secondary screens |
510 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
530 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
511 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
531 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
512 | */ |
532 | */ |
513 | int |
533 | void |
514 | rxvt_term::scr_change_screen (int scrn) |
534 | rxvt_term::scr_change_screen (int scrn) |
515 | { |
535 | { |
|
|
536 | if (scrn == current_screen) |
|
|
537 | return; |
|
|
538 | |
516 | want_refresh = 1; |
539 | want_refresh = 1; |
517 | view_start = 0; |
540 | view_start = 0; |
518 | |
541 | |
519 | if (current_screen == scrn) |
|
|
520 | return scrn; |
|
|
521 | |
|
|
522 | selection_check (2); /* check for boundary cross */ |
542 | selection_check (2); /* check for boundary cross */ |
523 | |
543 | |
524 | int i = current_screen; current_screen = scrn; scrn = i; |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
525 | |
|
|
526 | ::swap (screen.cur.row, swap.cur.row); |
|
|
527 | ::swap (screen.cur.col, swap.cur.col); |
|
|
528 | |
|
|
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
531 | |
545 | |
532 | #if NSCREENS |
546 | #if NSCREENS |
533 | if (OPTION (Opt_secondaryScreen)) |
547 | if (OPTION (Opt_secondaryScreen)) |
534 | { |
548 | { |
535 | num_scr = 0; |
549 | num_scr = 0; |
536 | |
550 | |
537 | for (int i = prev_nrow; i--; ) |
551 | scr_swap_screen (); |
538 | ::swap (ROW(i), swap_buf [i]); |
|
|
539 | |
552 | |
540 | ::swap (screen.charset, swap.charset); |
553 | ::swap (screen.charset, swap.charset); |
541 | ::swap (screen.flags, swap.flags); |
554 | ::swap (screen.flags, swap.flags); |
542 | screen.flags |= Screen_VisibleCursor; |
555 | screen.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
544 | } |
557 | } |
545 | else |
558 | else |
546 | #endif |
559 | #endif |
547 | if (OPTION (Opt_secondaryScroll)) |
560 | if (OPTION (Opt_secondaryScroll)) |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
549 | |
|
|
550 | return scrn; |
|
|
551 | } |
562 | } |
552 | |
563 | |
553 | // clear WrapNext indicator, solidifying position on next line |
564 | // clear WrapNext indicator, solidifying position on next line |
554 | void |
565 | void |
555 | rxvt_term::scr_do_wrap () |
566 | rxvt_term::scr_do_wrap () NOTHROW |
556 | { |
567 | { |
557 | if (!(screen.flags & Screen_WrapNext)) |
568 | if (!(screen.flags & Screen_WrapNext)) |
558 | return; |
569 | return; |
559 | |
570 | |
560 | screen.flags &= ~Screen_WrapNext; |
571 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
570 | /* ------------------------------------------------------------------------- */ |
581 | /* ------------------------------------------------------------------------- */ |
571 | /* |
582 | /* |
572 | * Change the colour for following text |
583 | * Change the colour for following text |
573 | */ |
584 | */ |
574 | void |
585 | void |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
586 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
576 | { |
587 | { |
577 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
588 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
578 | color = fgbg; |
589 | color = fgbg; |
579 | |
590 | |
580 | if (fgbg == Color_fg) |
591 | if (fgbg == Color_fg) |
… | |
… | |
586 | /* ------------------------------------------------------------------------- */ |
597 | /* ------------------------------------------------------------------------- */ |
587 | /* |
598 | /* |
588 | * Change the rendition style for following text |
599 | * Change the rendition style for following text |
589 | */ |
600 | */ |
590 | void |
601 | void |
591 | rxvt_term::scr_rendition (int set, int style) |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
592 | { |
603 | { |
593 | if (set) |
604 | if (set) |
594 | rstyle |= style; |
605 | rstyle |= style; |
595 | else if (style == ~RS_None) |
606 | else if (style == ~RS_None) |
596 | rstyle = DEFAULT_RSTYLE; |
607 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
603 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
604 | * count positive ==> scroll up |
615 | * count positive ==> scroll up |
605 | * count negative ==> scroll down |
616 | * count negative ==> scroll down |
606 | */ |
617 | */ |
607 | int |
618 | int |
608 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
619 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
609 | { |
620 | { |
610 | if (count == 0 || (row1 > row2)) |
621 | if (count == 0 || (row1 > row2)) |
611 | return 0; |
622 | return 0; |
612 | |
623 | |
613 | want_refresh = 1; |
624 | want_refresh = 1; |
… | |
… | |
731 | /* ------------------------------------------------------------------------- */ |
742 | /* ------------------------------------------------------------------------- */ |
732 | /* |
743 | /* |
733 | * Add text given in <str> of length <len> to screen struct |
744 | * Add text given in <str> of length <len> to screen struct |
734 | */ |
745 | */ |
735 | void |
746 | void |
736 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
747 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
737 | { |
748 | { |
738 | if (len <= 0) /* sanity */ |
749 | if (len <= 0) /* sanity */ |
739 | return; |
750 | return; |
740 | |
751 | |
741 | unsigned char checksel; |
752 | unsigned char checksel; |
… | |
… | |
747 | ZERO_SCROLLBACK (); |
758 | ZERO_SCROLLBACK (); |
748 | |
759 | |
749 | if (minlines > 0) |
760 | if (minlines > 0) |
750 | { |
761 | { |
751 | minlines += screen.cur.row - screen.bscroll; |
762 | minlines += screen.cur.row - screen.bscroll; |
|
|
763 | min_it (minlines, screen.cur.row - top_row); |
752 | |
764 | |
753 | if (minlines > 0 |
765 | if (minlines > 0 |
754 | && screen.tscroll == 0 |
766 | && screen.tscroll == 0 |
755 | && screen.bscroll == nrow - 1) |
767 | && screen.bscroll == nrow - 1) |
756 | { |
768 | { |
… | |
… | |
830 | |
842 | |
831 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
843 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
832 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
844 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
833 | c = 0xfffd; |
845 | c = 0xfffd; |
834 | |
846 | |
835 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
847 | // rely on wcwidth to tell us the character width, do wcwidth before |
836 | // do wcwidth before further replacements, as wcwidth might return -1 |
848 | // further replacements, as wcwidth might return -1 for the line |
837 | // for the line drawing characters below as they might be invalid in the current |
849 | // drawing characters below as they might be invalid in the current |
838 | // locale. |
850 | // locale. |
839 | int width = c < 0x100 ? 1 : wcwidth (c); |
851 | int width = WCWIDTH (c); |
840 | |
852 | |
841 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
853 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
842 | { |
854 | { |
843 | // vt100 special graphics and line drawing |
855 | // vt100 special graphics and line drawing |
844 | // 5f-7e standard vt100 |
856 | // 5f-7e standard vt100 |
… | |
… | |
995 | /* |
1007 | /* |
996 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1008 | * Process Backspace. Move back the cursor back a position, wrap if have to |
997 | * XTERM_SEQ: CTRL-H |
1009 | * XTERM_SEQ: CTRL-H |
998 | */ |
1010 | */ |
999 | void |
1011 | void |
1000 | rxvt_term::scr_backspace () |
1012 | rxvt_term::scr_backspace () NOTHROW |
1001 | { |
1013 | { |
1002 | want_refresh = 1; |
1014 | want_refresh = 1; |
1003 | |
1015 | |
1004 | if (screen.cur.col == 0) |
1016 | if (screen.cur.col == 0) |
1005 | { |
1017 | { |
… | |
… | |
1023 | * Process Horizontal Tab |
1035 | * Process Horizontal Tab |
1024 | * count: +ve = forward; -ve = backwards |
1036 | * count: +ve = forward; -ve = backwards |
1025 | * XTERM_SEQ: CTRL-I |
1037 | * XTERM_SEQ: CTRL-I |
1026 | */ |
1038 | */ |
1027 | void |
1039 | void |
1028 | rxvt_term::scr_tab (int count, bool ht) |
1040 | rxvt_term::scr_tab (int count, bool ht) NOTHROW |
1029 | { |
1041 | { |
1030 | int i, x; |
1042 | int i, x; |
1031 | |
1043 | |
1032 | want_refresh = 1; |
1044 | want_refresh = 1; |
1033 | i = x = screen.cur.col; |
1045 | i = x = screen.cur.col; |
… | |
… | |
1100 | * Move cursor left in row. If we're at the left boundary, shift everything |
1112 | * Move cursor left in row. If we're at the left boundary, shift everything |
1101 | * in that row right. Clear left column. |
1113 | * in that row right. Clear left column. |
1102 | */ |
1114 | */ |
1103 | #if ENABLE_FRILLS |
1115 | #if ENABLE_FRILLS |
1104 | void |
1116 | void |
1105 | rxvt_term::scr_backindex () |
1117 | rxvt_term::scr_backindex () NOTHROW |
1106 | { |
1118 | { |
1107 | if (screen.cur.col > 0) |
1119 | if (screen.cur.col > 0) |
1108 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1120 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1109 | else |
1121 | else |
1110 | scr_insdel_chars (1, INSERT); |
1122 | scr_insdel_chars (1, INSERT); |
… | |
… | |
1117 | * Move cursor right in row. If we're at the right boundary, shift everything |
1129 | * Move cursor right in row. If we're at the right boundary, shift everything |
1118 | * in that row left. Clear right column. |
1130 | * in that row left. Clear right column. |
1119 | */ |
1131 | */ |
1120 | #if ENABLE_FRILLS |
1132 | #if ENABLE_FRILLS |
1121 | void |
1133 | void |
1122 | rxvt_term::scr_forwardindex () |
1134 | rxvt_term::scr_forwardindex () NOTHROW |
1123 | { |
1135 | { |
1124 | if (screen.cur.col < ncol - 1) |
1136 | if (screen.cur.col < ncol - 1) |
1125 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1137 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1126 | else |
1138 | else |
1127 | { |
1139 | { |
… | |
… | |
1140 | /* ------------------------------------------------------------------------- */ |
1152 | /* ------------------------------------------------------------------------- */ |
1141 | /* |
1153 | /* |
1142 | * Goto Row/Column |
1154 | * Goto Row/Column |
1143 | */ |
1155 | */ |
1144 | void |
1156 | void |
1145 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1157 | rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW |
1146 | { |
1158 | { |
1147 | want_refresh = 1; |
1159 | want_refresh = 1; |
1148 | ZERO_SCROLLBACK (); |
1160 | ZERO_SCROLLBACK (); |
1149 | |
1161 | |
1150 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1162 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
… | |
… | |
1188 | /* ------------------------------------------------------------------------- */ |
1200 | /* ------------------------------------------------------------------------- */ |
1189 | /* |
1201 | /* |
1190 | * direction should be UP or DN |
1202 | * direction should be UP or DN |
1191 | */ |
1203 | */ |
1192 | void |
1204 | void |
1193 | rxvt_term::scr_index (enum page_dirn direction) |
1205 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1194 | { |
1206 | { |
1195 | int dirn; |
1207 | int dirn; |
1196 | |
1208 | |
1197 | want_refresh = 1; |
1209 | want_refresh = 1; |
1198 | ZERO_SCROLLBACK (); |
1210 | ZERO_SCROLLBACK (); |
… | |
… | |
1217 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1229 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1218 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1230 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1219 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1231 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1220 | */ |
1232 | */ |
1221 | void |
1233 | void |
1222 | rxvt_term::scr_erase_line (int mode) |
1234 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1223 | { |
1235 | { |
1224 | unsigned int col, num; |
1236 | unsigned int col, num; |
1225 | |
1237 | |
1226 | want_refresh = 1; |
1238 | want_refresh = 1; |
1227 | ZERO_SCROLLBACK (); |
1239 | ZERO_SCROLLBACK (); |
… | |
… | |
1271 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1283 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1272 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1284 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1273 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1285 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1274 | */ |
1286 | */ |
1275 | void |
1287 | void |
1276 | rxvt_term::scr_erase_screen (int mode) |
1288 | rxvt_term::scr_erase_screen (int mode) NOTHROW |
1277 | { |
1289 | { |
1278 | int num; |
1290 | int num; |
1279 | int32_t row; |
1291 | int32_t row; |
1280 | rend_t ren; |
1292 | rend_t ren; |
1281 | XGCValues gcvalue; |
1293 | XGCValues gcvalue; |
… | |
… | |
1326 | } |
1338 | } |
1327 | else |
1339 | else |
1328 | { |
1340 | { |
1329 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1341 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1330 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1342 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1331 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1343 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1332 | ERASE_ROWS (row, num); |
1344 | ERASE_ROWS (row, num); |
1333 | gcvalue.foreground = pix_colors[Color_fg]; |
1345 | gcvalue.foreground = pix_colors[Color_fg]; |
1334 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1346 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1335 | } |
1347 | } |
1336 | |
1348 | |
1337 | for (; num--; row++) |
1349 | for (; num--; row++) |
1338 | { |
1350 | { |
1339 | scr_blank_screen_mem (ROW(row), rstyle); |
1351 | scr_blank_screen_mem (ROW(row), rstyle); |
… | |
… | |
1341 | } |
1353 | } |
1342 | } |
1354 | } |
1343 | |
1355 | |
1344 | #if ENABLE_FRILLS |
1356 | #if ENABLE_FRILLS |
1345 | void |
1357 | void |
1346 | rxvt_term::scr_erase_savelines () |
1358 | rxvt_term::scr_erase_savelines () NOTHROW |
1347 | { |
1359 | { |
1348 | want_refresh = 1; |
1360 | want_refresh = 1; |
1349 | ZERO_SCROLLBACK (); |
1361 | ZERO_SCROLLBACK (); |
1350 | |
1362 | |
1351 | top_row = 0; |
1363 | top_row = 0; |
… | |
… | |
1356 | /* |
1368 | /* |
1357 | * Fill the screen with `E's |
1369 | * Fill the screen with `E's |
1358 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1370 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1359 | */ |
1371 | */ |
1360 | void |
1372 | void |
1361 | rxvt_term::scr_E () |
1373 | rxvt_term::scr_E () NOTHROW |
1362 | { |
1374 | { |
1363 | rend_t fs; |
1375 | rend_t fs; |
1364 | |
1376 | |
1365 | want_refresh = 1; |
1377 | want_refresh = 1; |
1366 | ZERO_SCROLLBACK (); |
1378 | ZERO_SCROLLBACK (); |
… | |
… | |
1387 | /* ------------------------------------------------------------------------- */ |
1399 | /* ------------------------------------------------------------------------- */ |
1388 | /* |
1400 | /* |
1389 | * Insert/Delete <count> lines |
1401 | * Insert/Delete <count> lines |
1390 | */ |
1402 | */ |
1391 | void |
1403 | void |
1392 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1404 | rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW |
1393 | { |
1405 | { |
1394 | int end; |
1406 | int end; |
1395 | |
1407 | |
1396 | ZERO_SCROLLBACK (); |
1408 | ZERO_SCROLLBACK (); |
1397 | |
1409 | |
… | |
… | |
1417 | /* ------------------------------------------------------------------------- */ |
1429 | /* ------------------------------------------------------------------------- */ |
1418 | /* |
1430 | /* |
1419 | * Insert/Delete <count> characters from the current position |
1431 | * Insert/Delete <count> characters from the current position |
1420 | */ |
1432 | */ |
1421 | void |
1433 | void |
1422 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1434 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1423 | { |
1435 | { |
1424 | int col, row; |
1436 | int col, row; |
1425 | rend_t tr; |
1437 | rend_t tr; |
1426 | |
1438 | |
1427 | want_refresh = 1; |
1439 | want_refresh = 1; |
… | |
… | |
1515 | /* |
1527 | /* |
1516 | * Set the scrolling region |
1528 | * Set the scrolling region |
1517 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1529 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1518 | */ |
1530 | */ |
1519 | void |
1531 | void |
1520 | rxvt_term::scr_scroll_region (int top, int bot) |
1532 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1521 | { |
1533 | { |
1522 | max_it (top, 0); |
1534 | max_it (top, 0); |
1523 | min_it (bot, nrow - 1); |
1535 | min_it (bot, nrow - 1); |
1524 | |
1536 | |
1525 | if (top > bot) |
1537 | if (top > bot) |
… | |
… | |
1535 | * Make the cursor visible/invisible |
1547 | * Make the cursor visible/invisible |
1536 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1548 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1537 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1549 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1538 | */ |
1550 | */ |
1539 | void |
1551 | void |
1540 | rxvt_term::scr_cursor_visible (int mode) |
1552 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1541 | { |
1553 | { |
1542 | want_refresh = 1; |
1554 | want_refresh = 1; |
1543 | |
1555 | |
1544 | if (mode) |
1556 | if (mode) |
1545 | screen.flags |= Screen_VisibleCursor; |
1557 | screen.flags |= Screen_VisibleCursor; |
… | |
… | |
1552 | * Set/unset automatic wrapping |
1564 | * Set/unset automatic wrapping |
1553 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1565 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1554 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1566 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1555 | */ |
1567 | */ |
1556 | void |
1568 | void |
1557 | rxvt_term::scr_autowrap (int mode) |
1569 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1558 | { |
1570 | { |
1559 | if (mode) |
1571 | if (mode) |
1560 | screen.flags |= Screen_Autowrap; |
1572 | screen.flags |= Screen_Autowrap; |
1561 | else |
1573 | else |
1562 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1574 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
… | |
… | |
1571 | * and the cursor cannot be moved outside. |
1583 | * and the cursor cannot be moved outside. |
1572 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1584 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1573 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1585 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1574 | */ |
1586 | */ |
1575 | void |
1587 | void |
1576 | rxvt_term::scr_relative_origin (int mode) |
1588 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1577 | { |
1589 | { |
1578 | if (mode) |
1590 | if (mode) |
1579 | screen.flags |= Screen_Relative; |
1591 | screen.flags |= Screen_Relative; |
1580 | else |
1592 | else |
1581 | screen.flags &= ~Screen_Relative; |
1593 | screen.flags &= ~Screen_Relative; |
… | |
… | |
1588 | * Set insert/replace mode |
1600 | * Set insert/replace mode |
1589 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1601 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1590 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1602 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1591 | */ |
1603 | */ |
1592 | void |
1604 | void |
1593 | rxvt_term::scr_insert_mode (int mode) |
1605 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1594 | { |
1606 | { |
1595 | if (mode) |
1607 | if (mode) |
1596 | screen.flags |= Screen_Insert; |
1608 | screen.flags |= Screen_Insert; |
1597 | else |
1609 | else |
1598 | screen.flags &= ~Screen_Insert; |
1610 | screen.flags &= ~Screen_Insert; |
… | |
… | |
1604 | * XTERM_SEQ: Set tab at current column : ESC H |
1616 | * XTERM_SEQ: Set tab at current column : ESC H |
1605 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1617 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1606 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1618 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1607 | */ |
1619 | */ |
1608 | void |
1620 | void |
1609 | rxvt_term::scr_set_tab (int mode) |
1621 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1610 | { |
1622 | { |
1611 | if (mode < 0) |
1623 | if (mode < 0) |
1612 | memset (tabs, 0, ncol * sizeof (char)); |
1624 | memset (tabs, 0, ncol * sizeof (char)); |
1613 | else if (screen.cur.col < ncol) |
1625 | else if (screen.cur.col < ncol) |
1614 | tabs [screen.cur.col] = !!mode; |
1626 | tabs [screen.cur.col] = !!mode; |
… | |
… | |
1619 | * Set reverse/normal video |
1631 | * Set reverse/normal video |
1620 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1632 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1621 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1633 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1622 | */ |
1634 | */ |
1623 | void |
1635 | void |
1624 | rxvt_term::scr_rvideo_mode (int mode) |
1636 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1625 | { |
1637 | { |
1626 | XGCValues gcvalue; |
1638 | rvideo_mode = on; |
1627 | |
1639 | |
|
|
1640 | #ifndef NO_BELL |
|
|
1641 | on ^= rvideo_bell; |
|
|
1642 | #endif |
|
|
1643 | |
1628 | if (rvideo != mode) |
1644 | if (rvideo_state != on) |
1629 | { |
1645 | { |
1630 | rvideo = mode; |
1646 | rvideo_state = on; |
|
|
1647 | |
1631 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1648 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1632 | #if XPM_BACKGROUND |
1649 | #if XPM_BACKGROUND |
1633 | if (bgPixmap.pixmap == None) |
1650 | if (bgPixmap.pixmap == None) |
1634 | #endif |
1651 | #endif |
1635 | #if TRANSPARENT |
1652 | #if TRANSPARENT |
1636 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1653 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1637 | #endif |
1654 | #endif |
1638 | XSetWindowBackground (display->display, vt, |
1655 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1639 | pix_colors[Color_bg]); |
|
|
1640 | |
1656 | |
|
|
1657 | XGCValues gcvalue; |
1641 | gcvalue.foreground = pix_colors[Color_fg]; |
1658 | gcvalue.foreground = pix_colors[Color_fg]; |
1642 | gcvalue.background = pix_colors[Color_bg]; |
1659 | gcvalue.background = pix_colors[Color_bg]; |
1643 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1660 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1644 | &gcvalue); |
1661 | |
1645 | scr_clear (); |
1662 | scr_clear (); |
1646 | scr_touch (true); |
1663 | scr_touch (true); |
1647 | } |
1664 | } |
1648 | } |
1665 | } |
1649 | |
1666 | |
… | |
… | |
1651 | /* |
1668 | /* |
1652 | * Report current cursor position |
1669 | * Report current cursor position |
1653 | * XTERM_SEQ: Report position: ESC [ 6 n |
1670 | * XTERM_SEQ: Report position: ESC [ 6 n |
1654 | */ |
1671 | */ |
1655 | void |
1672 | void |
1656 | rxvt_term::scr_report_position () |
1673 | rxvt_term::scr_report_position () NOTHROW |
1657 | { |
1674 | { |
1658 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1675 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1659 | } |
1676 | } |
1660 | |
1677 | |
1661 | /* ------------------------------------------------------------------------- * |
1678 | /* ------------------------------------------------------------------------- * |
… | |
… | |
1664 | |
1681 | |
1665 | /* |
1682 | /* |
1666 | * Set font style |
1683 | * Set font style |
1667 | */ |
1684 | */ |
1668 | void |
1685 | void |
1669 | rxvt_term::set_font_style () |
1686 | rxvt_term::set_font_style () NOTHROW |
1670 | { |
1687 | { |
1671 | #if 0 |
1688 | #if 0 |
1672 | switch (charsets [screen.charset]) |
1689 | switch (charsets [screen.charset]) |
1673 | { |
1690 | { |
1674 | case '0': /* DEC Special Character & Line Drawing Set */ |
1691 | case '0': /* DEC Special Character & Line Drawing Set */ |
… | |
… | |
1696 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1713 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1697 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1714 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1698 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1715 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1699 | */ |
1716 | */ |
1700 | void |
1717 | void |
1701 | rxvt_term::scr_charset_choose (int set) |
1718 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1702 | { |
1719 | { |
1703 | screen.charset = set; |
1720 | screen.charset = set; |
1704 | set_font_style (); |
1721 | set_font_style (); |
1705 | } |
1722 | } |
1706 | |
1723 | |
… | |
… | |
1712 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1729 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1713 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1730 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1714 | * See set_font_style for possible values for <C> |
1731 | * See set_font_style for possible values for <C> |
1715 | */ |
1732 | */ |
1716 | void |
1733 | void |
1717 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1734 | rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW |
1718 | { |
1735 | { |
1719 | charsets[set] = (unsigned char)ch; |
1736 | charsets[set] = (unsigned char)ch; |
1720 | set_font_style (); |
1737 | set_font_style (); |
1721 | } |
1738 | } |
1722 | |
1739 | |
… | |
… | |
1727 | |
1744 | |
1728 | /* |
1745 | /* |
1729 | * refresh matching text. |
1746 | * refresh matching text. |
1730 | */ |
1747 | */ |
1731 | bool |
1748 | bool |
1732 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1749 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1733 | { |
1750 | { |
1734 | bool found = false; |
1751 | bool found = false; |
1735 | |
1752 | |
1736 | for (int i = 0; i < nrow; i++) |
1753 | for (int i = 0; i < nrow; i++) |
1737 | { |
1754 | { |
… | |
… | |
1757 | PART_END, |
1774 | PART_END, |
1758 | RC_COUNT |
1775 | RC_COUNT |
1759 | }; |
1776 | }; |
1760 | |
1777 | |
1761 | void |
1778 | void |
1762 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1779 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1763 | { |
1780 | { |
1764 | int i; |
1781 | int i; |
1765 | row_col_t rc[RC_COUNT]; |
1782 | row_col_t rc[RC_COUNT]; |
1766 | |
1783 | |
1767 | if (!drawn_buf) /* sanity check */ |
1784 | if (!drawn_buf) /* sanity check */ |
… | |
… | |
1801 | /* ------------------------------------------------------------------------- */ |
1818 | /* ------------------------------------------------------------------------- */ |
1802 | /* |
1819 | /* |
1803 | * Refresh the entire screen |
1820 | * Refresh the entire screen |
1804 | */ |
1821 | */ |
1805 | void |
1822 | void |
1806 | rxvt_term::scr_touch (bool refresh) |
1823 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1807 | { |
1824 | { |
1808 | scr_expose (0, 0, width, height, refresh); |
1825 | scr_expose (0, 0, width, height, refresh); |
1809 | } |
1826 | } |
1810 | |
1827 | |
1811 | /* ------------------------------------------------------------------------- */ |
1828 | /* ------------------------------------------------------------------------- */ |
1812 | /* |
1829 | /* |
1813 | * Move the display so that the line represented by scrollbar value Y is at |
1830 | * Move the display so that the line represented by scrollbar value Y is at |
1814 | * the top of the screen |
1831 | * the top of the screen |
1815 | */ |
1832 | */ |
1816 | void |
1833 | void |
1817 | rxvt_term::scr_move_to (int y, int len) |
1834 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1818 | { |
1835 | { |
1819 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1836 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1820 | } |
1837 | } |
1821 | |
1838 | |
1822 | /* ------------------------------------------------------------------------- */ |
1839 | /* ------------------------------------------------------------------------- */ |
1823 | /* |
1840 | /* |
1824 | * Page the screen up/down nlines |
1841 | * Page the screen up/down nlines |
1825 | * direction should be UP or DN |
1842 | * direction should be UP or DN |
1826 | */ |
1843 | */ |
1827 | bool |
1844 | bool |
1828 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1845 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1829 | { |
1846 | { |
1830 | int new_view_start = |
1847 | int new_view_start = |
1831 | direction == UP ? view_start - nlines |
1848 | direction == UP ? view_start - nlines |
1832 | : view_start + nlines; |
1849 | : view_start + nlines; |
1833 | |
1850 | |
1834 | return scr_changeview (new_view_start); |
1851 | return scr_changeview (new_view_start); |
1835 | } |
1852 | } |
1836 | |
1853 | |
1837 | bool |
1854 | bool |
1838 | rxvt_term::scr_changeview (int new_view_start) |
1855 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1839 | { |
1856 | { |
1840 | clamp_it (new_view_start, top_row, 0); |
1857 | clamp_it (new_view_start, top_row, 0); |
1841 | |
1858 | |
1842 | if (new_view_start == view_start) |
1859 | if (new_view_start == view_start) |
1843 | return false; |
1860 | return false; |
… | |
… | |
1849 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1866 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1850 | |
1867 | |
1851 | return true; |
1868 | return true; |
1852 | } |
1869 | } |
1853 | |
1870 | |
1854 | /* ------------------------------------------------------------------------- */ |
1871 | #ifndef NO_BELL |
1855 | void |
1872 | void |
|
|
1873 | rxvt_term::bell_cb (time_watcher &w) |
|
|
1874 | { |
|
|
1875 | rvideo_bell = false; |
|
|
1876 | scr_rvideo_mode (rvideo_mode); |
|
|
1877 | } |
|
|
1878 | #endif |
|
|
1879 | |
|
|
1880 | /* ------------------------------------------------------------------------- */ |
|
|
1881 | void |
1856 | rxvt_term::scr_bell () |
1882 | rxvt_term::scr_bell () NOTHROW |
1857 | { |
1883 | { |
1858 | #ifndef NO_BELL |
1884 | #ifndef NO_BELL |
1859 | |
1885 | |
1860 | # ifndef NO_MAPALERT |
1886 | # ifndef NO_MAPALERT |
1861 | # ifdef MAPALERT_OPTION |
1887 | # ifdef MAPALERT_OPTION |
1862 | if (OPTION (Opt_mapAlert)) |
1888 | if (OPTION (Opt_mapAlert)) |
1863 | # endif |
1889 | # endif |
1864 | XMapWindow (display->display, parent[0]); |
1890 | XMapWindow (xdisp, parent[0]); |
1865 | # endif |
1891 | # endif |
1866 | |
1892 | |
1867 | if (OPTION (Opt_visualBell)) |
1893 | if (OPTION (Opt_visualBell)) |
1868 | { |
1894 | { |
1869 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1895 | rvideo_bell = true; |
|
|
1896 | scr_rvideo_mode (rvideo_mode); |
1870 | display->flush (); |
1897 | display->flush (); |
1871 | rxvt_usleep (VISUAL_BELL_DURATION); |
1898 | |
1872 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1899 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1873 | } |
1900 | } |
1874 | else |
1901 | else |
1875 | XBell (display->display, 0); |
1902 | XBell (xdisp, 0); |
1876 | |
1903 | |
1877 | #endif |
1904 | #endif |
1878 | } |
1905 | } |
1879 | |
1906 | |
1880 | /* ------------------------------------------------------------------------- */ |
1907 | /* ------------------------------------------------------------------------- */ |
1881 | /* ARGSUSED */ |
1908 | /* ARGSUSED */ |
1882 | void |
1909 | void |
1883 | rxvt_term::scr_printscreen (int fullhist) |
1910 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1884 | { |
1911 | { |
1885 | #ifdef PRINTPIPE |
1912 | #ifdef PRINTPIPE |
1886 | int nrows, row_start; |
1913 | int nrows, row_start; |
1887 | FILE *fd; |
1914 | FILE *fd; |
1888 | |
1915 | |
… | |
… | |
1937 | * Refresh the screen |
1964 | * Refresh the screen |
1938 | * drawn_text/drawn_rend contain the screen information before the update. |
1965 | * drawn_text/drawn_rend contain the screen information before the update. |
1939 | * screen.text/screen.rend contain what the screen will change to. |
1966 | * screen.text/screen.rend contain what the screen will change to. |
1940 | */ |
1967 | */ |
1941 | void |
1968 | void |
1942 | rxvt_term::scr_refresh () |
1969 | rxvt_term::scr_refresh () NOTHROW |
1943 | { |
1970 | { |
1944 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1971 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1945 | showcursor; /* show the cursor */ |
1972 | showcursor; /* show the cursor */ |
1946 | int16_t col, row, /* column/row we're processing */ |
1973 | int16_t col, row, /* column/row we're processing */ |
1947 | ocrow; /* old cursor row */ |
1974 | ocrow; /* old cursor row */ |
… | |
… | |
2119 | { |
2146 | { |
2120 | /* also comes here at end if needed because of >= above */ |
2147 | /* also comes here at end if needed because of >= above */ |
2121 | if (wlen < len) |
2148 | if (wlen < len) |
2122 | ::swap (wlen, len); |
2149 | ::swap (wlen, len); |
2123 | |
2150 | |
2124 | XCopyArea (display->display, vt, vt, |
2151 | XCopyArea (xdisp, vt, vt, |
2125 | gc, 0, Row2Pixel (len + i), |
2152 | gc, 0, Row2Pixel (len + i), |
2126 | (unsigned int)this->width, |
2153 | (unsigned int)this->width, |
2127 | (unsigned int)Height2Pixel (wlen - len + 1), |
2154 | (unsigned int)Height2Pixel (wlen - len + 1), |
2128 | 0, Row2Pixel (len)); |
2155 | 0, Row2Pixel (len)); |
2129 | len = -1; |
2156 | len = -1; |
… | |
… | |
2217 | |
2244 | |
2218 | // only do special processing if any attributes are set, which is unlikely |
2245 | // only do special processing if any attributes are set, which is unlikely |
2219 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2246 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2220 | { |
2247 | { |
2221 | #if ENABLE_STYLES |
2248 | #if ENABLE_STYLES |
2222 | // force redraw after "careful" characters to avoid pixel droppings |
2249 | // "careful" (too wide) character handling |
2223 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2224 | drp[col + 1] = ~srp[col + 1]; |
|
|
2225 | |
2250 | |
2226 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2251 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2227 | while (text > stp |
2252 | while (text > stp |
2228 | && srp[text - stp - 1] & RS_Careful |
2253 | && srp[text - stp - 1] & RS_Careful |
2229 | && RS_SAME (rend, srp[text - stp - 1])) |
2254 | && RS_SAME (rend, srp[text - stp - 1])) |
2230 | text--, count++, xpixel -= fwidth; |
2255 | text--, count++, xpixel -= fwidth; |
|
|
2256 | |
|
|
2257 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2258 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2259 | drp[col + i + 1] = ~srp[col + i + 1]; |
|
|
2260 | |
|
|
2261 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2262 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2263 | drp[text - stp - i - 1] = ~srp[text - stp - i - 1]; |
2231 | #endif |
2264 | #endif |
2232 | |
2265 | |
2233 | bool invert = rend & RS_RVid; |
2266 | bool invert = rend & RS_RVid; |
2234 | |
2267 | |
2235 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2268 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2319 | |
2352 | |
2320 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2353 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2321 | { |
2354 | { |
2322 | #if ENABLE_FRILLS |
2355 | #if ENABLE_FRILLS |
2323 | if (ISSET_PIXCOLOR (Color_underline)) |
2356 | if (ISSET_PIXCOLOR (Color_underline)) |
2324 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2357 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2325 | else |
2358 | else |
2326 | #endif |
2359 | #endif |
2327 | XSetForeground (display->display, gc, pix_colors[fore]); |
2360 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2328 | |
2361 | |
2329 | XDrawLine (display->display, drawBuffer, gc, |
2362 | XDrawLine (xdisp, drawBuffer, gc, |
2330 | xpixel, ypixel + font->ascent + 1, |
2363 | xpixel, ypixel + font->ascent + 1, |
2331 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2364 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2332 | } |
2365 | } |
2333 | } /* for (col....) */ |
2366 | } /* for (col....) */ |
2334 | } /* for (row....) */ |
2367 | } /* for (row....) */ |
… | |
… | |
2367 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2400 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2368 | cursorwidth++; |
2401 | cursorwidth++; |
2369 | |
2402 | |
2370 | #ifndef NO_CURSORCOLOR |
2403 | #ifndef NO_CURSORCOLOR |
2371 | if (ISSET_PIXCOLOR (Color_cursor)) |
2404 | if (ISSET_PIXCOLOR (Color_cursor)) |
2372 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2405 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2373 | #endif |
2406 | #endif |
2374 | |
2407 | |
2375 | XDrawRectangle (display->display, drawBuffer, gc, |
2408 | XDrawRectangle (xdisp, drawBuffer, gc, |
2376 | Col2Pixel (col), |
2409 | Col2Pixel (col), |
2377 | Row2Pixel (oldcursor.row), |
2410 | Row2Pixel (oldcursor.row), |
2378 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2411 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2379 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2412 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2380 | } |
2413 | } |
… | |
… | |
2388 | num_scr = 0; |
2421 | num_scr = 0; |
2389 | num_scr_allow = 1; |
2422 | num_scr_allow = 1; |
2390 | } |
2423 | } |
2391 | |
2424 | |
2392 | void |
2425 | void |
2393 | rxvt_term::scr_remap_chars (line_t &l) |
2426 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2394 | { |
2427 | { |
2395 | if (!l.t) |
2428 | if (!l.t) |
2396 | return; |
2429 | return; |
2397 | |
2430 | |
2398 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2431 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
… | |
… | |
2400 | for (int i = ncol; i--; ) |
2433 | for (int i = ncol; i--; ) |
2401 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2434 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2402 | } |
2435 | } |
2403 | |
2436 | |
2404 | void |
2437 | void |
2405 | rxvt_term::scr_remap_chars () |
2438 | rxvt_term::scr_remap_chars () NOTHROW |
2406 | { |
2439 | { |
2407 | for (int i = total_rows; i--; ) |
2440 | for (int i = total_rows; i--; ) |
2408 | scr_remap_chars (row_buf [i]); |
2441 | scr_remap_chars (row_buf [i]); |
2409 | |
2442 | |
2410 | for (int i = nrow; i--; ) |
2443 | for (int i = nrow; i--; ) |
… | |
… | |
2413 | scr_remap_chars (swap_buf [i]); |
2446 | scr_remap_chars (swap_buf [i]); |
2414 | } |
2447 | } |
2415 | } |
2448 | } |
2416 | |
2449 | |
2417 | void |
2450 | void |
2418 | rxvt_term::scr_recolour () |
2451 | rxvt_term::scr_recolour () NOTHROW |
2419 | { |
2452 | { |
2420 | if (1 |
2453 | if (1 |
2421 | #if TRANSPARENT |
2454 | #if TRANSPARENT |
2422 | && !am_transparent |
2455 | && !am_transparent |
2423 | #endif |
2456 | #endif |
2424 | #if XPM_BACKGROUND |
2457 | #if XPM_BACKGROUND |
2425 | && !bgPixmap.pixmap |
2458 | && !bgPixmap.pixmap |
2426 | #endif |
2459 | #endif |
2427 | ) |
2460 | ) |
2428 | { |
2461 | { |
2429 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2462 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2430 | XClearWindow (display->display, parent[0]); |
2463 | XClearWindow (xdisp, parent[0]); |
2431 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2464 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2432 | #if HAVE_SCROLLBARS |
2465 | #if HAVE_SCROLLBARS |
2433 | if (scrollBar.win) |
2466 | if (scrollBar.win) |
2434 | { |
2467 | { |
2435 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2468 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2436 | scrollBar.setIdle (); |
2469 | scrollBar.setIdle (); |
2437 | scrollbar_show (0); |
2470 | scrollbar_show (0); |
2438 | } |
2471 | } |
2439 | #endif |
2472 | #endif |
2440 | } |
2473 | } |
… | |
… | |
2444 | want_refresh = 1; |
2477 | want_refresh = 1; |
2445 | } |
2478 | } |
2446 | |
2479 | |
2447 | /* ------------------------------------------------------------------------- */ |
2480 | /* ------------------------------------------------------------------------- */ |
2448 | void |
2481 | void |
2449 | rxvt_term::scr_clear (bool really) |
2482 | rxvt_term::scr_clear (bool really) NOTHROW |
2450 | { |
2483 | { |
2451 | if (!mapped) |
2484 | if (!mapped) |
2452 | return; |
2485 | return; |
2453 | |
2486 | |
2454 | num_scr_allow = 0; |
2487 | num_scr_allow = 0; |
2455 | want_refresh = 1; |
2488 | want_refresh = 1; |
2456 | |
2489 | |
2457 | if (really) |
2490 | if (really) |
2458 | XClearWindow (display->display, vt); |
2491 | XClearWindow (xdisp, vt); |
2459 | } |
2492 | } |
2460 | |
2493 | |
2461 | void |
2494 | void |
2462 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
2495 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2463 | { |
2496 | { |
2464 | int view_end = view_start + nrow; |
2497 | int view_end = view_start + nrow; |
2465 | int row, col; |
2498 | int row, col; |
2466 | |
2499 | |
2467 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
2500 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
… | |
… | |
2479 | srp[col] ^= rstyle2; |
2512 | srp[col] ^= rstyle2; |
2480 | } |
2513 | } |
2481 | } |
2514 | } |
2482 | |
2515 | |
2483 | void |
2516 | void |
2484 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
2517 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW |
2485 | { |
2518 | { |
2486 | int view_end = view_start + nrow; |
2519 | int view_end = view_start + nrow; |
2487 | int row, col; |
2520 | int row, col; |
2488 | |
2521 | |
2489 | if (beg_row >= view_start) |
2522 | if (beg_row >= view_start) |
… | |
… | |
2506 | srp[col] ^= rstyle; |
2539 | srp[col] ^= rstyle; |
2507 | } |
2540 | } |
2508 | |
2541 | |
2509 | /* ------------------------------------------------------------------------- */ |
2542 | /* ------------------------------------------------------------------------- */ |
2510 | void |
2543 | void |
2511 | rxvt_term::scr_reverse_selection () |
2544 | rxvt_term::scr_reverse_selection () NOTHROW |
2512 | { |
2545 | { |
2513 | if (selection.op |
2546 | if (selection.op |
2514 | && current_screen == selection.screen |
2547 | && current_screen == selection.screen |
2515 | && selection.end.row >= view_start) |
2548 | && selection.end.row >= view_start) |
2516 | { |
2549 | { |
… | |
… | |
2532 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2565 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2533 | * invoking routine must close the fd. |
2566 | * invoking routine must close the fd. |
2534 | */ |
2567 | */ |
2535 | #if 0 |
2568 | #if 0 |
2536 | void |
2569 | void |
2537 | rxvt_term::scr_dump (int fd) |
2570 | rxvt_term::scr_dump (int fd) NOTHROW |
2538 | { |
2571 | { |
2539 | int row, wrote; |
2572 | int row, wrote; |
2540 | unsigned int width, towrite; |
2573 | unsigned int width, towrite; |
2541 | char r1[] = "\n"; |
2574 | char r1[] = "\n"; |
2542 | |
2575 | |
… | |
… | |
2561 | |
2594 | |
2562 | /* ------------------------------------------------------------------------- * |
2595 | /* ------------------------------------------------------------------------- * |
2563 | * CHARACTER SELECTION * |
2596 | * CHARACTER SELECTION * |
2564 | * ------------------------------------------------------------------------- */ |
2597 | * ------------------------------------------------------------------------- */ |
2565 | void |
2598 | void |
2566 | rxvt_term::selection_check (int check_more) |
2599 | rxvt_term::selection_check (int check_more) NOTHROW |
2567 | { |
2600 | { |
2568 | row_col_t pos; |
2601 | row_col_t pos; |
2569 | |
2602 | |
2570 | if (!selection.op) |
2603 | if (!selection.op) |
2571 | return; |
2604 | return; |
… | |
… | |
2592 | /* ------------------------------------------------------------------------- */ |
2625 | /* ------------------------------------------------------------------------- */ |
2593 | /* |
2626 | /* |
2594 | * Paste a selection direct to the command fd |
2627 | * Paste a selection direct to the command fd |
2595 | */ |
2628 | */ |
2596 | void |
2629 | void |
2597 | rxvt_term::paste (char *data, unsigned int len) |
2630 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2598 | { |
2631 | { |
2599 | /* convert normal newline chars into common keyboard Return key sequence */ |
2632 | /* convert normal newline chars into common keyboard Return key sequence */ |
2600 | for (unsigned int i = 0; i < len; i++) |
2633 | for (unsigned int i = 0; i < len; i++) |
2601 | if (data[i] == C0_LF) |
2634 | if (data[i] == C0_LF) |
2602 | data[i] = C0_CR; |
2635 | data[i] = C0_CR; |
… | |
… | |
2608 | /* |
2641 | /* |
2609 | * Respond to a notification that a primary selection has been sent |
2642 | * Respond to a notification that a primary selection has been sent |
2610 | * EXT: SelectionNotify |
2643 | * EXT: SelectionNotify |
2611 | */ |
2644 | */ |
2612 | void |
2645 | void |
2613 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2646 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2614 | { |
2647 | { |
2615 | if (prop == None) /* check for failed XConvertSelection */ |
2648 | if (prop == None) /* check for failed XConvertSelection */ |
2616 | { |
2649 | { |
2617 | if ((selection_type & Sel_CompoundText)) |
2650 | if ((selection_type & Sel_CompoundText)) |
2618 | { |
2651 | { |
… | |
… | |
2638 | } |
2671 | } |
2639 | |
2672 | |
2640 | unsigned long bytes_after; |
2673 | unsigned long bytes_after; |
2641 | XTextProperty ct; |
2674 | XTextProperty ct; |
2642 | |
2675 | |
2643 | if (XGetWindowProperty (display->display, win, prop, |
2676 | if (XGetWindowProperty (xdisp, win, prop, |
2644 | 0, PROP_SIZE / 4, |
2677 | 0, PROP_SIZE / 4, |
2645 | delete_prop, AnyPropertyType, |
2678 | delete_prop, AnyPropertyType, |
2646 | &ct.encoding, &ct.format, |
2679 | &ct.encoding, &ct.format, |
2647 | &ct.nitems, &bytes_after, |
2680 | &ct.nitems, &bytes_after, |
2648 | &ct.value) != Success) |
2681 | &ct.value) != Success) |
… | |
… | |
2657 | if (bytes_after) |
2690 | if (bytes_after) |
2658 | { |
2691 | { |
2659 | // fetch and append remaining data |
2692 | // fetch and append remaining data |
2660 | XTextProperty ct2; |
2693 | XTextProperty ct2; |
2661 | |
2694 | |
2662 | if (XGetWindowProperty (display->display, win, prop, |
2695 | if (XGetWindowProperty (xdisp, win, prop, |
2663 | ct.nitems / 4, (bytes_after + 3) / 4, |
2696 | ct.nitems / 4, (bytes_after + 3) / 4, |
2664 | delete_prop, AnyPropertyType, |
2697 | delete_prop, AnyPropertyType, |
2665 | &ct2.encoding, &ct2.format, |
2698 | &ct2.encoding, &ct2.format, |
2666 | &ct2.nitems, &bytes_after, |
2699 | &ct2.nitems, &bytes_after, |
2667 | &ct2.value) != Success) |
2700 | &ct2.value) != Success) |
… | |
… | |
2680 | |
2713 | |
2681 | if (ct.encoding == xa[XA_INCR]) |
2714 | if (ct.encoding == xa[XA_INCR]) |
2682 | { |
2715 | { |
2683 | // INCR selection, start handshake |
2716 | // INCR selection, start handshake |
2684 | if (!delete_prop) |
2717 | if (!delete_prop) |
2685 | XDeleteProperty (display->display, win, prop); |
2718 | XDeleteProperty (xdisp, win, prop); |
2686 | |
2719 | |
2687 | selection_wait = Sel_incr; |
2720 | selection_wait = Sel_incr; |
2688 | incr_buf_fill = 0; |
2721 | incr_buf_fill = 0; |
2689 | incr_ev.start (NOW + 10); |
2722 | incr_ev.start (NOW + 10); |
2690 | |
2723 | |
… | |
… | |
2751 | paste (s, strlen (s)); |
2784 | paste (s, strlen (s)); |
2752 | free (s); |
2785 | free (s); |
2753 | } |
2786 | } |
2754 | else |
2787 | else |
2755 | #endif |
2788 | #endif |
2756 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2789 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2757 | && cl) |
2790 | && cl) |
2758 | { |
2791 | { |
2759 | for (int i = 0; i < cr; i++) |
2792 | for (int i = 0; i < cr; i++) |
2760 | paste (cl[i], strlen (cl[i])); |
2793 | paste (cl[i], strlen (cl[i])); |
2761 | |
2794 | |
… | |
… | |
2770 | if (selection_wait == Sel_normal) |
2803 | if (selection_wait == Sel_normal) |
2771 | selection_wait = Sel_none; |
2804 | selection_wait = Sel_none; |
2772 | } |
2805 | } |
2773 | |
2806 | |
2774 | void |
2807 | void |
2775 | rxvt_term::incr_cb (time_watcher &w) |
2808 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2776 | { |
2809 | { |
2777 | selection_wait = Sel_none; |
2810 | selection_wait = Sel_none; |
2778 | |
2811 | |
2779 | incr_buf_size = 0; |
2812 | incr_buf_size = 0; |
2780 | free (incr_buf); |
2813 | free (incr_buf); |
2781 | |
2814 | |
2782 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2815 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2783 | } |
2816 | } |
2784 | |
2817 | |
2785 | void |
2818 | void |
2786 | rxvt_term::selection_property (Window win, Atom prop) |
2819 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
2787 | { |
2820 | { |
2788 | if (prop == None || selection_wait != Sel_incr) |
2821 | if (prop == None || selection_wait != Sel_incr) |
2789 | return; |
2822 | return; |
2790 | |
2823 | |
2791 | selection_paste (win, prop, true); |
2824 | selection_paste (win, prop, true); |
… | |
… | |
2800 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2833 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2801 | * will auto fallback to CUT_BUFFER0 |
2834 | * will auto fallback to CUT_BUFFER0 |
2802 | * EXT: button 2 release |
2835 | * EXT: button 2 release |
2803 | */ |
2836 | */ |
2804 | void |
2837 | void |
2805 | rxvt_term::selection_request (Time tm) |
2838 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2806 | { |
2839 | { |
2807 | if (selection.text) |
2840 | if (selection.text && selnum == Sel_Primary) |
2808 | { /* internal selection */ |
2841 | { /* internal selection */ |
2809 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2842 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2810 | paste (str, strlen (str)); |
2843 | paste (str, strlen (str)); |
2811 | free (str); |
2844 | free (str); |
2812 | return; |
2845 | return; |
2813 | } |
2846 | } |
2814 | else |
2847 | else |
2815 | { |
2848 | { |
2816 | int i; |
|
|
2817 | |
|
|
2818 | selection_request_time = tm; |
2849 | selection_request_time = tm; |
2819 | selection_wait = Sel_normal; |
2850 | selection_wait = Sel_normal; |
2820 | |
2851 | |
2821 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
|
|
2822 | { |
|
|
2823 | #if X_HAVE_UTF8_STRING |
2852 | #if X_HAVE_UTF8_STRING |
2824 | selection_type = Sel_UTF8String; |
2853 | selection_type = Sel_UTF8String; |
2825 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2854 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2826 | return; |
2855 | return; |
2827 | #else |
2856 | #else |
2828 | selection_type = Sel_CompoundText; |
2857 | selection_type = Sel_CompoundText; |
2829 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2858 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2830 | return; |
2859 | return; |
2831 | #endif |
2860 | #endif |
2832 | } |
|
|
2833 | } |
2861 | } |
2834 | |
2862 | |
2835 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2863 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2836 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2864 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2837 | } |
2865 | } |
2838 | |
2866 | |
2839 | int |
2867 | int |
2840 | rxvt_term::selection_request_other (Atom target, int selnum) |
2868 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
2841 | { |
2869 | { |
2842 | Atom sel; |
2870 | Atom sel; |
2843 | |
2871 | |
2844 | selection_type |= selnum; |
2872 | selection_type |= selnum; |
2845 | |
2873 | |
… | |
… | |
2848 | else if (selnum == Sel_Secondary) |
2876 | else if (selnum == Sel_Secondary) |
2849 | sel = XA_SECONDARY; |
2877 | sel = XA_SECONDARY; |
2850 | else |
2878 | else |
2851 | sel = xa[XA_CLIPBOARD]; |
2879 | sel = xa[XA_CLIPBOARD]; |
2852 | |
2880 | |
2853 | if (XGetSelectionOwner (display->display, sel) != None) |
2881 | if (XGetSelectionOwner (xdisp, sel) != None) |
2854 | { |
2882 | { |
2855 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2883 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2856 | vt, selection_request_time); |
2884 | vt, selection_request_time); |
2857 | return 1; |
2885 | return 1; |
2858 | } |
2886 | } |
2859 | |
2887 | |
2860 | return 0; |
2888 | return 0; |
… | |
… | |
2864 | /* |
2892 | /* |
2865 | * Clear all selected text |
2893 | * Clear all selected text |
2866 | * EXT: SelectionClear |
2894 | * EXT: SelectionClear |
2867 | */ |
2895 | */ |
2868 | void |
2896 | void |
2869 | rxvt_term::selection_clear () |
2897 | rxvt_term::selection_clear () NOTHROW |
2870 | { |
2898 | { |
2871 | want_refresh = 1; |
2899 | want_refresh = 1; |
2872 | free (selection.text); |
2900 | free (selection.text); |
2873 | selection.text = NULL; |
2901 | selection.text = NULL; |
2874 | selection.len = 0; |
2902 | selection.len = 0; |
… | |
… | |
3009 | |
3037 | |
3010 | selection_grab (tm); |
3038 | selection_grab (tm); |
3011 | } |
3039 | } |
3012 | |
3040 | |
3013 | bool |
3041 | bool |
3014 | rxvt_term::selection_grab (Time tm) |
3042 | rxvt_term::selection_grab (Time tm) NOTHROW |
3015 | { |
3043 | { |
3016 | selection_time = tm; |
3044 | selection_time = tm; |
3017 | |
3045 | |
3018 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3046 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3019 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3047 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3020 | { |
3048 | { |
3021 | display->set_selection_owner (this); |
3049 | display->set_selection_owner (this); |
3022 | return true; |
3050 | return true; |
3023 | } |
3051 | } |
3024 | else |
3052 | else |
… | |
… | |
3028 | } |
3056 | } |
3029 | |
3057 | |
3030 | #if 0 |
3058 | #if 0 |
3031 | XTextProperty ct; |
3059 | XTextProperty ct; |
3032 | |
3060 | |
3033 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3061 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3034 | { |
3062 | { |
3035 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3063 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3036 | XFree (ct.value); |
3064 | XFree (ct.value); |
3037 | } |
3065 | } |
3038 | #endif |
3066 | #endif |
… | |
… | |
3042 | /* |
3070 | /* |
3043 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3071 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3044 | * EXT: button 1 press |
3072 | * EXT: button 1 press |
3045 | */ |
3073 | */ |
3046 | void |
3074 | void |
3047 | rxvt_term::selection_click (int clicks, int x, int y) |
3075 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3048 | { |
3076 | { |
3049 | clicks = ((clicks - 1) % 3) + 1; |
3077 | clicks = ((clicks - 1) % 3) + 1; |
3050 | selection.clicks = clicks; /* save clicks so extend will work */ |
3078 | selection.clicks = clicks; /* save clicks so extend will work */ |
3051 | |
3079 | |
3052 | if (clicks == 2 && !selection.rect |
3080 | if (clicks == 2 && !selection.rect |
… | |
… | |
3071 | /* ------------------------------------------------------------------------- */ |
3099 | /* ------------------------------------------------------------------------- */ |
3072 | /* |
3100 | /* |
3073 | * Mark a selection at the specified col/row |
3101 | * Mark a selection at the specified col/row |
3074 | */ |
3102 | */ |
3075 | void |
3103 | void |
3076 | rxvt_term::selection_start_colrow (int col, int row) |
3104 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3077 | { |
3105 | { |
3078 | want_refresh = 1; |
3106 | want_refresh = 1; |
3079 | |
3107 | |
3080 | selection.mark.row = row + view_start; |
3108 | selection.mark.row = row + view_start; |
3081 | selection.mark.col = col; |
3109 | selection.mark.col = col; |
… | |
… | |
3107 | #define DELIMIT_TEXT(x) \ |
3135 | #define DELIMIT_TEXT(x) \ |
3108 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3136 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3109 | #define DELIMIT_REND(x) 1 |
3137 | #define DELIMIT_REND(x) 1 |
3110 | |
3138 | |
3111 | void |
3139 | void |
3112 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3140 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3113 | { |
3141 | { |
3114 | int col, row, dirnadd, tcol, trow, w1, w2; |
3142 | int col, row, dirnadd, tcol, trow, w1, w2; |
3115 | row_col_t bound; |
3143 | row_col_t bound; |
3116 | text_t *stp; |
3144 | text_t *stp; |
3117 | rend_t *srp; |
3145 | rend_t *srp; |
… | |
… | |
3191 | * flag == 0 ==> button 1 |
3219 | * flag == 0 ==> button 1 |
3192 | * flag == 1 ==> button 3 press |
3220 | * flag == 1 ==> button 3 press |
3193 | * flag == 2 ==> button 3 motion |
3221 | * flag == 2 ==> button 3 motion |
3194 | */ |
3222 | */ |
3195 | void |
3223 | void |
3196 | rxvt_term::selection_extend (int x, int y, int flag) |
3224 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3197 | { |
3225 | { |
3198 | int col = clamp (Pixel2Col (x), 0, ncol); |
3226 | int col = clamp (Pixel2Col (x), 0, ncol); |
3199 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3227 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3200 | |
3228 | |
3201 | /* |
3229 | /* |
… | |
… | |
3227 | /* ------------------------------------------------------------------------- */ |
3255 | /* ------------------------------------------------------------------------- */ |
3228 | /* |
3256 | /* |
3229 | * Extend the selection to the specified col/row |
3257 | * Extend the selection to the specified col/row |
3230 | */ |
3258 | */ |
3231 | void |
3259 | void |
3232 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3260 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3233 | { |
3261 | { |
3234 | row_col_t pos; |
3262 | row_col_t pos; |
3235 | enum { |
3263 | enum { |
3236 | LEFT, RIGHT |
3264 | LEFT, RIGHT |
3237 | } closeto = RIGHT; |
3265 | } closeto = RIGHT; |
… | |
… | |
3423 | #endif |
3451 | #endif |
3424 | } |
3452 | } |
3425 | |
3453 | |
3426 | #if ENABLE_FRILLS |
3454 | #if ENABLE_FRILLS |
3427 | void |
3455 | void |
3428 | rxvt_term::selection_remove_trailing_spaces () |
3456 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3429 | { |
3457 | { |
3430 | int32_t end_col, end_row; |
3458 | int32_t end_col, end_row; |
3431 | text_t *stp; |
3459 | text_t *stp; |
3432 | |
3460 | |
3433 | end_col = selection.end.col; |
3461 | end_col = selection.end.col; |
… | |
… | |
3471 | /* |
3499 | /* |
3472 | * Double click on button 3 when already selected |
3500 | * Double click on button 3 when already selected |
3473 | * EXT: button 3 double click |
3501 | * EXT: button 3 double click |
3474 | */ |
3502 | */ |
3475 | void |
3503 | void |
3476 | rxvt_term::selection_rotate (int x, int y) |
3504 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3477 | { |
3505 | { |
3478 | selection.clicks = selection.clicks % 3 + 1; |
3506 | selection.clicks = selection.clicks % 3 + 1; |
3479 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3507 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3480 | } |
3508 | } |
3481 | |
3509 | |
… | |
… | |
3483 | /* |
3511 | /* |
3484 | * Respond to a request for our current selection |
3512 | * Respond to a request for our current selection |
3485 | * EXT: SelectionRequest |
3513 | * EXT: SelectionRequest |
3486 | */ |
3514 | */ |
3487 | void |
3515 | void |
3488 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3516 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3489 | { |
3517 | { |
3490 | XSelectionEvent ev; |
3518 | XSelectionEvent ev; |
3491 | dDisp; |
|
|
3492 | |
3519 | |
3493 | ev.type = SelectionNotify; |
3520 | ev.type = SelectionNotify; |
3494 | ev.property = None; |
3521 | ev.property = None; |
3495 | ev.display = rq.display; |
3522 | ev.display = rq.display; |
3496 | ev.requestor = rq.requestor; |
3523 | ev.requestor = rq.requestor; |
… | |
… | |
3510 | *target++ = xa[XA_COMPOUND_TEXT]; |
3537 | *target++ = xa[XA_COMPOUND_TEXT]; |
3511 | #if X_HAVE_UTF8_STRING |
3538 | #if X_HAVE_UTF8_STRING |
3512 | *target++ = xa[XA_UTF8_STRING]; |
3539 | *target++ = xa[XA_UTF8_STRING]; |
3513 | #endif |
3540 | #endif |
3514 | |
3541 | |
3515 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3542 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3516 | 32, PropModeReplace, |
3543 | 32, PropModeReplace, |
3517 | (unsigned char *)target_list, target - target_list); |
3544 | (unsigned char *)target_list, target - target_list); |
3518 | ev.property = rq.property; |
3545 | ev.property = rq.property; |
3519 | } |
3546 | } |
3520 | #if TODO // TODO |
3547 | #if TODO // TODO |
… | |
… | |
3523 | /* TODO: Handle MULTIPLE */ |
3550 | /* TODO: Handle MULTIPLE */ |
3524 | } |
3551 | } |
3525 | #endif |
3552 | #endif |
3526 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3553 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3527 | { |
3554 | { |
3528 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3555 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3529 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3556 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3530 | ev.property = rq.property; |
3557 | ev.property = rq.property; |
3531 | } |
3558 | } |
3532 | else if (rq.target == XA_STRING |
3559 | else if (rq.target == XA_STRING |
3533 | || rq.target == xa[XA_TEXT] |
3560 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3591 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3618 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3592 | ct.nitems = strlen ((char *)ct.value); |
3619 | ct.nitems = strlen ((char *)ct.value); |
3593 | } |
3620 | } |
3594 | else |
3621 | else |
3595 | #endif |
3622 | #endif |
3596 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3623 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3597 | freect = 1; |
3624 | freect = 1; |
3598 | else |
3625 | else |
3599 | { |
3626 | { |
3600 | /* if we failed to convert then send it raw */ |
3627 | /* if we failed to convert then send it raw */ |
3601 | ct.value = (unsigned char *)cl; |
3628 | ct.value = (unsigned char *)cl; |
3602 | ct.nitems = selectlen; |
3629 | ct.nitems = selectlen; |
3603 | ct.encoding = target; |
3630 | ct.encoding = target; |
3604 | } |
3631 | } |
3605 | |
3632 | |
3606 | XChangeProperty (disp, rq.requestor, rq.property, |
3633 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3607 | ct.encoding, 8, PropModeReplace, |
3634 | ct.encoding, 8, PropModeReplace, |
3608 | ct.value, (int)ct.nitems); |
3635 | ct.value, (int)ct.nitems); |
3609 | ev.property = rq.property; |
3636 | ev.property = rq.property; |
3610 | |
3637 | |
3611 | if (freect) |
3638 | if (freect) |
3612 | XFree (ct.value); |
3639 | XFree (ct.value); |
3613 | } |
3640 | } |
3614 | |
3641 | |
3615 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3642 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3616 | } |
3643 | } |
3617 | |
3644 | |
3618 | /* ------------------------------------------------------------------------- * |
3645 | /* ------------------------------------------------------------------------- * |
3619 | * MOUSE ROUTINES * |
3646 | * MOUSE ROUTINES * |
3620 | * ------------------------------------------------------------------------- */ |
3647 | * ------------------------------------------------------------------------- */ |
3621 | |
3648 | |
3622 | /* |
3649 | /* |
3623 | * return col/row values corresponding to x/y pixel values |
3650 | * return col/row values corresponding to x/y pixel values |
3624 | */ |
3651 | */ |
3625 | void |
3652 | void |
3626 | rxvt_term::pixel_position (int *x, int *y) |
3653 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
3627 | { |
3654 | { |
3628 | *x = Pixel2Col (*x); |
3655 | *x = Pixel2Col (*x); |
3629 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3656 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3630 | *y = Pixel2Row (*y); |
3657 | *y = Pixel2Row (*y); |
3631 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3658 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3632 | } |
3659 | } |
3633 | |
3660 | |
3634 | /* ------------------------------------------------------------------------- */ |
3661 | /* ------------------------------------------------------------------------- */ |
3635 | #ifdef USE_XIM |
3662 | #ifdef USE_XIM |
3636 | void |
3663 | void |
3637 | rxvt_term::im_set_position (XPoint &pos) |
3664 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3638 | { |
3665 | { |
3639 | XWindowAttributes xwa; |
3666 | XWindowAttributes xwa; |
3640 | |
3667 | |
3641 | XGetWindowAttributes (display->display, vt, &xwa); |
3668 | XGetWindowAttributes (xdisp, vt, &xwa); |
3642 | |
3669 | |
3643 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3670 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3644 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3671 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3645 | } |
3672 | } |
3646 | #endif |
3673 | #endif |
3647 | |
3674 | |
3648 | #if ENABLE_OVERLAY |
3675 | #if ENABLE_OVERLAY |
3649 | void |
3676 | void |
3650 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3677 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW |
3651 | { |
3678 | { |
3652 | if (nrow < 1 || ncol < 1) |
3679 | if (nrow < 1 || ncol < 1) |
3653 | return; |
3680 | return; |
3654 | |
3681 | |
3655 | want_refresh = 1; |
3682 | want_refresh = 1; |
… | |
… | |
3700 | *rp = r; |
3727 | *rp = r; |
3701 | } |
3728 | } |
3702 | } |
3729 | } |
3703 | |
3730 | |
3704 | void |
3731 | void |
3705 | rxvt_term::scr_overlay_off () |
3732 | rxvt_term::scr_overlay_off () NOTHROW |
3706 | { |
3733 | { |
3707 | if (!ov_text) |
3734 | if (!ov_text) |
3708 | return; |
3735 | return; |
3709 | |
3736 | |
3710 | want_refresh = 1; |
3737 | want_refresh = 1; |
… | |
… | |
3718 | delete [] ov_text; ov_text = 0; |
3745 | delete [] ov_text; ov_text = 0; |
3719 | delete [] ov_rend; ov_rend = 0; |
3746 | delete [] ov_rend; ov_rend = 0; |
3720 | } |
3747 | } |
3721 | |
3748 | |
3722 | void |
3749 | void |
3723 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3750 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3724 | { |
3751 | { |
3725 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3752 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3726 | return; |
3753 | return; |
3727 | |
3754 | |
3728 | x++, y++; |
3755 | x++, y++; |
… | |
… | |
3730 | ov_text[y][x] = text; |
3757 | ov_text[y][x] = text; |
3731 | ov_rend[y][x] = rend; |
3758 | ov_rend[y][x] = rend; |
3732 | } |
3759 | } |
3733 | |
3760 | |
3734 | void |
3761 | void |
3735 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
3762 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3736 | { |
3763 | { |
3737 | while (*s) |
3764 | while (*s) |
3738 | scr_overlay_set (x++, y, *s++); |
3765 | scr_overlay_set (x++, y, *s++); |
3739 | } |
3766 | } |
3740 | |
3767 | |
3741 | void |
3768 | void |
3742 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
3769 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3743 | { |
3770 | { |
3744 | while (*s) |
3771 | while (*s) |
3745 | { |
3772 | { |
3746 | text_t t = *s++; |
3773 | text_t t = *s++; |
3747 | int width = wcwidth (t); |
3774 | int width = WCWIDTH (t); |
3748 | |
3775 | |
3749 | while (width--) |
3776 | while (width--) |
3750 | { |
3777 | { |
3751 | scr_overlay_set (x++, y, t); |
3778 | scr_overlay_set (x++, y, t); |
3752 | t = NOCHAR; |
3779 | t = NOCHAR; |
3753 | } |
3780 | } |
3754 | } |
3781 | } |
3755 | } |
3782 | } |
3756 | |
3783 | |
3757 | void |
3784 | void |
3758 | rxvt_term::scr_swap_overlay () |
3785 | rxvt_term::scr_swap_overlay () NOTHROW |
3759 | { |
3786 | { |
3760 | if (!ov_text) |
3787 | if (!ov_text) |
3761 | return; |
3788 | return; |
3762 | |
3789 | |
3763 | // swap screen mem with overlay |
3790 | // swap screen mem with overlay |