… | |
… | |
23 | /* |
23 | /* |
24 | * This file handles _all_ screen updates and selections |
24 | * This file handles _all_ screen updates and selections |
25 | */ |
25 | */ |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #define INTERN_SCREEN |
|
|
29 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
30 | #include "screen.intpro" /* PROTOS for internal routines */ |
|
|
31 | |
29 | |
32 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
30 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
33 | |
31 | |
34 | #include <inttypes.h> |
32 | #include <inttypes.h> |
35 | #include <wchar.h> |
|
|
36 | |
33 | |
37 | #include "salloc.C" // HACK, should be a seperate compile! |
34 | #include "salloc.C" // HACK, should be a seperate compile! |
38 | |
35 | |
39 | inline void fill_text (text_t *start, text_t value, int len) |
36 | inline void fill_text (text_t *start, text_t value, int len) |
40 | { |
37 | { |
41 | while (len--) |
38 | while (len--) |
42 | *start++ = value; |
39 | *start++ = value; |
43 | } |
40 | } |
44 | |
41 | |
45 | /* ------------------------------------------------------------------------- */ |
42 | /* ------------------------------------------------------------------------- */ |
46 | #define PROP_SIZE 16384 |
43 | #define PROP_SIZE 256*1024 |
|
|
44 | #define PASTE_SIZE 32768 |
47 | #define TABSIZE 8 /* default tab size */ |
45 | #define TABSIZE 8 /* default tab size */ |
48 | |
46 | |
49 | /* ------------------------------------------------------------------------- * |
47 | /* ------------------------------------------------------------------------- * |
50 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
51 | * ------------------------------------------------------------------------- */ |
49 | * ------------------------------------------------------------------------- */ |
52 | #define ZERO_SCROLLBACK() \ |
50 | #define ZERO_SCROLLBACK() \ |
53 | if (Options & Opt_scrollTtyOutput) \ |
51 | if (options & Opt_scrollTtyOutput) \ |
54 | TermWin.view_start = 0 |
52 | TermWin.view_start = 0 |
55 | #define CLEAR_SELECTION() \ |
53 | #define CLEAR_SELECTION() \ |
56 | selection.beg.row = selection.beg.col \ |
54 | selection.beg.row = selection.beg.col \ |
57 | = selection.end.row = selection.end.col = 0 |
55 | = selection.end.row = selection.end.col = 0 |
58 | #define CLEAR_ALL_SELECTION() \ |
56 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
113 | (unsigned int)Height2Pixel (num)) |
111 | (unsigned int)Height2Pixel (num)) |
114 | |
112 | |
115 | /* ------------------------------------------------------------------------- * |
113 | /* ------------------------------------------------------------------------- * |
116 | * SCREEN `COMMON' ROUTINES * |
114 | * SCREEN `COMMON' ROUTINES * |
117 | * ------------------------------------------------------------------------- */ |
115 | * ------------------------------------------------------------------------- */ |
|
|
116 | |
118 | /* Fill part/all of a line with blanks. */ |
117 | /* Fill part/all of a line with blanks. */ |
119 | void |
118 | void |
120 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
119 | rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) |
121 | { |
120 | { |
122 | efs &= ~RS_baseattrMask; |
121 | efs &= ~RS_baseattrMask; |
123 | efs = SET_FONT (efs, TermWin.ascii_map [' ' - 0x20]); |
122 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
124 | |
123 | |
125 | while (width--) |
124 | while (width--) |
126 | { |
125 | { |
127 | *et++ = ' '; |
126 | *et++ = ' '; |
128 | *er++ = efs; |
127 | *er++ = efs; |
… | |
… | |
155 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
154 | unsigned int ncol, nrow, total_rows, prev_total_rows; |
156 | unsigned int p, q; |
155 | unsigned int p, q; |
157 | int k; |
156 | int k; |
158 | rend_t setrstyle; |
157 | rend_t setrstyle; |
159 | |
158 | |
160 | D_SCREEN ((stderr, "rxvt_scr_reset ()")); |
159 | #if ENABLE_OVERLAY |
|
|
160 | scr_overlay_off (); |
|
|
161 | #endif |
161 | |
162 | |
162 | TermWin.view_start = 0; |
163 | TermWin.view_start = 0; |
163 | num_scr = 0; |
164 | num_scr = 0; |
164 | |
165 | |
165 | if (TermWin.ncol == 0) |
166 | if (TermWin.ncol == 0) |
… | |
… | |
201 | /* |
202 | /* |
202 | * first time called so just malloc everything: don't rely on realloc |
203 | * first time called so just malloc everything: don't rely on realloc |
203 | * Note: this is still needed so that all the scrollback lines are NULL |
204 | * Note: this is still needed so that all the scrollback lines are NULL |
204 | */ |
205 | */ |
205 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
206 | screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
206 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
207 | buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *)); |
207 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
208 | drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
208 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
209 | swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *)); |
209 | |
210 | |
210 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
211 | screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); |
211 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
212 | swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t)); |
212 | |
213 | |
213 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
214 | screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
214 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
215 | buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *)); |
215 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
216 | drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
216 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
217 | swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *)); |
217 | |
218 | |
218 | for (p = 0; p < nrow; p++) |
219 | for (p = 0; p < nrow; p++) |
219 | { |
220 | { |
220 | q = p + TermWin.saveLines; |
221 | q = p + TermWin.saveLines; |
221 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
222 | scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE); |
222 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
223 | scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE); |
223 | screen.tlen[q] = swap.tlen[p] = 0; |
224 | screen.tlen[q] = swap.tlen[p] = 0; |
224 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
225 | scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE); |
225 | } |
226 | } |
226 | |
227 | |
227 | MEMSET (charsets, 'B', sizeof (charsets)); |
228 | memset (charsets, 'B', sizeof (charsets)); |
228 | TermWin.nscrolled = 0; /* no saved lines */ |
229 | TermWin.nscrolled = 0; /* no saved lines */ |
229 | rstyle = DEFAULT_RSTYLE; |
230 | rstyle = DEFAULT_RSTYLE; |
230 | screen.flags = Screen_DefaultFlags; |
231 | screen.flags = Screen_DefaultFlags; |
231 | screen.cur.row = screen.cur.col = 0; |
232 | screen.cur.row = screen.cur.col = 0; |
232 | screen.charset = 0; |
233 | screen.charset = 0; |
… | |
… | |
292 | ralloc->free (drawn_rend[p]); |
293 | ralloc->free (drawn_rend[p]); |
293 | } |
294 | } |
294 | |
295 | |
295 | /* we have fewer rows so fix up cursor position */ |
296 | /* we have fewer rows so fix up cursor position */ |
296 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
297 | MIN_IT (screen.cur.row, (int32_t)nrow - 1); |
297 | MIN_IT (swap.cur.row, (int32_t)nrow - 1); |
|
|
298 | |
298 | |
299 | scr_reset_realloc (); /* realloc _last_ */ |
299 | scr_reset_realloc (); /* realloc _last_ */ |
300 | } |
300 | } |
301 | else if (nrow > prev_nrow) |
301 | else if (nrow > prev_nrow) |
302 | { |
302 | { |
… | |
… | |
333 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
333 | scr_scroll_text (0, (int)nrow - 1, -k, 1); |
334 | screen.cur.row += k; |
334 | screen.cur.row += k; |
335 | screen.s_cur.row += k; |
335 | screen.s_cur.row += k; |
336 | TermWin.nscrolled -= k; |
336 | TermWin.nscrolled -= k; |
337 | } |
337 | } |
|
|
338 | |
338 | #ifdef DEBUG_STRICT |
339 | #ifdef DEBUG_STRICT |
339 | assert (screen.cur.row < TermWin.nrow); |
340 | assert (screen.cur.row < TermWin.nrow); |
340 | assert (swap.cur.row < TermWin.nrow); |
|
|
341 | #else /* drive with your eyes closed */ |
341 | #else /* drive with your eyes closed */ |
342 | |
|
|
343 | MIN_IT (screen.cur.row, nrow - 1); |
342 | MIN_IT (screen.cur.row, nrow - 1); |
344 | MIN_IT (swap.cur.row, nrow - 1); |
|
|
345 | #endif |
343 | #endif |
346 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
344 | TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this |
347 | } |
345 | } |
348 | |
346 | |
349 | /* resize columns */ |
347 | /* resize columns */ |
… | |
… | |
392 | } |
390 | } |
393 | |
391 | |
394 | } |
392 | } |
395 | |
393 | |
396 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
394 | MIN_IT (screen.cur.col, (int16_t)ncol - 1); |
397 | MIN_IT (swap.cur.col, (int16_t)ncol - 1); |
|
|
398 | |
395 | |
399 | delete talloc; talloc = ta; |
396 | delete talloc; talloc = ta; |
400 | delete ralloc; ralloc = ra; |
397 | delete ralloc; ralloc = ra; |
401 | } |
398 | } |
402 | |
399 | |
… | |
… | |
416 | } |
413 | } |
417 | |
414 | |
418 | void |
415 | void |
419 | rxvt_term::scr_reset_realloc () |
416 | rxvt_term::scr_reset_realloc () |
420 | { |
417 | { |
421 | uint16_t total_rows, nrow; |
418 | unsigned int total_rows, nrow; |
422 | |
419 | |
423 | nrow = TermWin.nrow; |
420 | nrow = TermWin.nrow; |
424 | total_rows = nrow + TermWin.saveLines; |
421 | total_rows = nrow + TermWin.saveLines; |
425 | /* *INDENT-OFF* */ |
422 | /* *INDENT-OFF* */ |
426 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
423 | screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *)); |
… | |
… | |
443 | * Free everything. That way malloc debugging can find leakage. |
440 | * Free everything. That way malloc debugging can find leakage. |
444 | */ |
441 | */ |
445 | void |
442 | void |
446 | rxvt_term::scr_release () |
443 | rxvt_term::scr_release () |
447 | { |
444 | { |
448 | uint16_t total_rows; |
445 | unsigned int total_rows; |
449 | int i; |
446 | int i; |
450 | |
447 | |
451 | total_rows = TermWin.nrow + TermWin.saveLines; |
448 | total_rows = TermWin.nrow + TermWin.saveLines; |
452 | |
449 | |
453 | delete talloc; talloc = 0; |
450 | delete talloc; talloc = 0; |
… | |
… | |
479 | * Hard reset |
476 | * Hard reset |
480 | */ |
477 | */ |
481 | void |
478 | void |
482 | rxvt_term::scr_poweron () |
479 | rxvt_term::scr_poweron () |
483 | { |
480 | { |
484 | D_SCREEN ((stderr, "rxvt_scr_poweron ()")); |
|
|
485 | |
|
|
486 | scr_release (); |
481 | scr_release (); |
487 | prev_nrow = prev_ncol = 0; |
482 | prev_nrow = prev_ncol = 0; |
488 | scr_reset (); |
483 | scr_reset (); |
489 | |
484 | |
490 | scr_clear (true); |
485 | scr_clear (true); |
… | |
… | |
501 | */ |
496 | */ |
502 | void |
497 | void |
503 | rxvt_term::scr_cursor (int mode) |
498 | rxvt_term::scr_cursor (int mode) |
504 | { |
499 | { |
505 | screen_t *s; |
500 | screen_t *s; |
506 | |
|
|
507 | D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode)); |
|
|
508 | |
501 | |
509 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
502 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
510 | if (current_screen == SECONDARY) |
503 | if (current_screen == SECONDARY) |
511 | s = &swap; |
504 | s = &swap; |
512 | else |
505 | else |
… | |
… | |
514 | s = &screen; |
507 | s = &screen; |
515 | |
508 | |
516 | switch (mode) |
509 | switch (mode) |
517 | { |
510 | { |
518 | case SAVE: |
511 | case SAVE: |
519 | s->s_cur.row = s->cur.row; |
512 | s->s_cur.row = screen.cur.row; |
520 | s->s_cur.col = s->cur.col; |
513 | s->s_cur.col = screen.cur.col; |
521 | s->s_rstyle = rstyle; |
514 | s->s_rstyle = rstyle; |
522 | s->s_charset = s->charset; |
515 | s->s_charset = screen.charset; |
523 | s->s_charset_char = charsets[s->charset]; |
516 | s->s_charset_char = charsets[screen.charset]; |
524 | break; |
517 | break; |
525 | |
518 | |
526 | case RESTORE: |
519 | case RESTORE: |
527 | want_refresh = 1; |
520 | want_refresh = 1; |
528 | s->cur.row = s->s_cur.row; |
521 | screen.cur.row = s->s_cur.row; |
529 | s->cur.col = s->s_cur.col; |
522 | screen.cur.col = s->s_cur.col; |
530 | s->flags &= ~Screen_WrapNext; |
523 | screen.flags &= ~Screen_WrapNext; |
531 | rstyle = s->s_rstyle; |
524 | rstyle = s->s_rstyle; |
532 | s->charset = s->s_charset; |
525 | screen.charset = s->s_charset; |
533 | charsets[s->charset] = s->s_charset_char; |
526 | charsets[screen.charset] = s->s_charset_char; |
534 | set_font_style (); |
527 | set_font_style (); |
535 | break; |
528 | break; |
536 | } |
529 | } |
537 | |
530 | |
538 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
531 | /* boundary check in case screen size changed between SAVE and RESTORE */ |
… | |
… | |
561 | int offset; |
554 | int offset; |
562 | #endif |
555 | #endif |
563 | |
556 | |
564 | want_refresh = 1; |
557 | want_refresh = 1; |
565 | |
558 | |
566 | D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn)); |
|
|
567 | |
|
|
568 | TermWin.view_start = 0; |
559 | TermWin.view_start = 0; |
569 | |
560 | |
570 | if (current_screen == scrn) |
561 | if (current_screen == scrn) |
571 | return scrn; |
562 | return scrn; |
572 | |
563 | |
573 | selection_check (2); /* check for boundary cross */ |
564 | selection_check (2); /* check for boundary cross */ |
574 | |
565 | |
575 | SWAP_IT (current_screen, scrn, int); |
566 | i = current_screen; current_screen = scrn; scrn = i; |
|
|
567 | |
|
|
568 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
|
|
569 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
570 | MAX_IT (screen.cur.row, 0); |
|
|
571 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
572 | MAX_IT (screen.cur.col, 0); |
|
|
573 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
574 | |
576 | #if NSCREENS |
575 | #if NSCREENS |
577 | if (Options & Opt_secondaryScreen) |
576 | if (options & Opt_secondaryScreen) |
578 | { |
577 | { |
579 | num_scr = 0; |
578 | num_scr = 0; |
580 | offset = TermWin.saveLines; |
579 | offset = TermWin.saveLines; |
|
|
580 | |
581 | for (i = prev_nrow; i--;) |
581 | for (i = prev_nrow; i--;) |
582 | { |
582 | { |
583 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
583 | SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); |
584 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
584 | SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); |
585 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
585 | SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *); |
586 | } |
586 | } |
587 | SWAP_IT (screen.cur.row, swap.cur.row, int16_t); |
587 | |
588 | SWAP_IT (screen.cur.col, swap.cur.col, int16_t); |
|
|
589 | # ifdef DEBUG_STRICT |
|
|
590 | assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow)); |
|
|
591 | assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol)); |
|
|
592 | # else /* drive with your eyes closed */ |
|
|
593 | MAX_IT (screen.cur.row, 0); |
|
|
594 | MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1); |
|
|
595 | MAX_IT (screen.cur.col, 0); |
|
|
596 | MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1); |
|
|
597 | # endif |
|
|
598 | SWAP_IT (screen.charset, swap.charset, int16_t); |
588 | SWAP_IT (screen.charset, swap.charset, int16_t); |
599 | SWAP_IT (screen.flags, swap.flags, int); |
589 | SWAP_IT (screen.flags, swap.flags, int); |
600 | screen.flags |= Screen_VisibleCursor; |
590 | screen.flags |= Screen_VisibleCursor; |
601 | swap.flags |= Screen_VisibleCursor; |
591 | swap.flags |= Screen_VisibleCursor; |
602 | } |
592 | } |
603 | else |
593 | else |
604 | #endif |
594 | #endif |
605 | if (Options & Opt_secondaryScroll) |
595 | if (options & Opt_secondaryScroll) |
606 | //if (current_screen == PRIMARY) |
|
|
607 | scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); |
596 | scr_scroll_text (0, prev_nrow - 1, prev_nrow, 0); |
|
|
597 | |
608 | return scrn; |
598 | return scrn; |
609 | } |
599 | } |
610 | |
600 | |
|
|
601 | // clear WrapNext indicator, solidifying position on next line |
|
|
602 | void |
|
|
603 | rxvt_term::scr_do_wrap () |
|
|
604 | { |
|
|
605 | if (!(screen.flags & Screen_WrapNext)) |
|
|
606 | return; |
|
|
607 | |
|
|
608 | screen.flags &= ~Screen_WrapNext; |
|
|
609 | |
|
|
610 | screen.cur.col = 0; |
|
|
611 | |
|
|
612 | if (screen.cur.row == screen.bscroll) |
|
|
613 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
614 | else if (screen.cur.row < TermWin.nrow - 1) |
|
|
615 | screen.cur.row++; |
|
|
616 | } |
|
|
617 | |
611 | /* ------------------------------------------------------------------------- */ |
618 | /* ------------------------------------------------------------------------- */ |
612 | /* |
619 | /* |
613 | * Change the colour for following text |
620 | * Change the colour for following text |
614 | */ |
621 | */ |
615 | void |
622 | void |
616 | rxvt_term::scr_color (unsigned int color, int fgbg) |
623 | rxvt_term::scr_color (unsigned int color, int fgbg) |
617 | { |
624 | { |
618 | color &= RS_fgMask; |
625 | if (color > maxTermCOLOR) |
|
|
626 | color = fgbg; |
|
|
627 | |
619 | if (fgbg == Color_fg) |
628 | if (fgbg == Color_fg) |
620 | rstyle = SET_FGCOLOR (rstyle, color); |
629 | rstyle = SET_FGCOLOR (rstyle, color); |
621 | else |
630 | else |
622 | rstyle = SET_BGCOLOR (rstyle, color); |
631 | rstyle = SET_BGCOLOR (rstyle, color); |
623 | } |
632 | } |
… | |
… | |
652 | |
661 | |
653 | if (count == 0 || (row1 > row2)) |
662 | if (count == 0 || (row1 > row2)) |
654 | return 0; |
663 | return 0; |
655 | |
664 | |
656 | want_refresh = 1; |
665 | want_refresh = 1; |
657 | D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); |
|
|
658 | |
666 | |
659 | if (row1 == 0 && count > 0 |
667 | if (row1 == 0 && count > 0 |
660 | && (current_screen == PRIMARY || Options & Opt_secondaryScroll)) |
668 | && (current_screen == PRIMARY || options & Opt_secondaryScroll)) |
661 | { |
669 | { |
662 | nscrolled = (long)TermWin.nscrolled + (long)count; |
670 | nscrolled = (long)TermWin.nscrolled + (long)count; |
663 | |
671 | |
664 | if (nscrolled > (long)TermWin.saveLines) |
672 | if (nscrolled > (long)TermWin.saveLines) |
665 | TermWin.nscrolled = TermWin.saveLines; |
673 | TermWin.nscrolled = TermWin.saveLines; |
666 | else |
674 | else |
667 | TermWin.nscrolled = (uint16_t)nscrolled; |
675 | TermWin.nscrolled = (unsigned int)nscrolled; |
668 | |
676 | |
669 | if ((Options & Opt_scrollWithBuffer) |
677 | if ((options & Opt_scrollWithBuffer) |
670 | && TermWin.view_start != 0 |
678 | && TermWin.view_start != 0 |
671 | && TermWin.view_start != TermWin.saveLines) |
679 | && TermWin.view_start != TermWin.saveLines) |
672 | scr_page (UP, count); |
680 | scr_page (UP, count); |
673 | } |
681 | } |
674 | else if (!spec) |
682 | else if (!spec) |
… | |
… | |
691 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
699 | selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ |
692 | } |
700 | } |
693 | else if (j >= row1 && j <= row2) |
701 | else if (j >= row1 && j <= row2) |
694 | { |
702 | { |
695 | /* move selected region too */ |
703 | /* move selected region too */ |
696 | selection.beg.row -= count; |
704 | selection.beg.row -= count; |
697 | selection.end.row -= count; |
705 | selection.end.row -= count; |
698 | selection.mark.row -= count; |
706 | selection.mark.row -= count; |
699 | } |
707 | } |
700 | } |
708 | } |
701 | |
709 | |
702 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
710 | selection_check (0); /* _after_ TermWin.nscrolled update */ |
… | |
… | |
710 | i = row2 - row1 + 1; |
718 | i = row2 - row1 + 1; |
711 | MIN_IT (count, i); |
719 | MIN_IT (count, i); |
712 | |
720 | |
713 | if (j > 0) |
721 | if (j > 0) |
714 | { |
722 | { |
715 | /* A: scroll up */ |
723 | /* scroll up */ |
716 | |
724 | |
717 | /* A1: Copy lines that will get clobbered by the rotation */ |
725 | /* Copy lines that will get clobbered by the rotation */ |
718 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
726 | memcpy (buf_text, screen.text + row1, count * sizeof (text_t *)); |
719 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
727 | memcpy (buf_rend, screen.rend + row1, count * sizeof (rend_t *)); |
720 | |
728 | |
721 | /* A2: Rotate lines */ |
729 | /* Rotate lines */ |
722 | i = row2 - row1 - count + 1; |
730 | i = row2 - row1 - count + 1; |
723 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
731 | memmove (screen.tlen + row1, screen.tlen + row1 + count, i * sizeof (int16_t)); |
724 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
732 | memmove (screen.text + row1, screen.text + row1 + count, i * sizeof (text_t *)); |
725 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
733 | memmove (screen.rend + row1, screen.rend + row1 + count, i * sizeof (rend_t *)); |
726 | |
734 | |
727 | j = row2 - count + 1, i = count; |
735 | j = row2 - count + 1, i = count; |
728 | } |
736 | } |
729 | else /* if (j < 0) */ |
737 | else /* if (j < 0) */ |
730 | { |
738 | { |
731 | /* B: scroll down */ |
739 | /* scroll down */ |
732 | |
740 | |
733 | /* B1: Copy lines that will get clobbered by the rotation */ |
741 | /* Copy lines that will get clobbered by the rotation */ |
734 | for (i = 0, j = row2; i < count; i++, j--) |
742 | for (i = 0, j = row2; i < count; i++, j--) |
735 | { |
743 | { |
736 | buf_text[i] = screen.text[j]; |
744 | buf_text[i] = screen.text[j]; |
737 | buf_rend[i] = screen.rend[j]; |
745 | buf_rend[i] = screen.rend[j]; |
738 | } |
746 | } |
739 | |
747 | |
740 | /* B2: Rotate lines */ |
748 | /* Rotate lines */ |
741 | for (j = row2, i = j - count; i >= row1; i--, j--) |
749 | for (j = row2, i = j - count; i >= row1; i--, j--) |
742 | { |
750 | { |
743 | screen.tlen[j] = screen.tlen[i]; |
751 | screen.tlen[j] = screen.tlen[i]; |
744 | screen.text[j] = screen.text[i]; |
752 | screen.text[j] = screen.text[i]; |
745 | screen.rend[j] = screen.rend[i]; |
753 | screen.rend[j] = screen.rend[i]; |
… | |
… | |
747 | |
755 | |
748 | j = row1, i = count; |
756 | j = row1, i = count; |
749 | count = -count; |
757 | count = -count; |
750 | } |
758 | } |
751 | |
759 | |
752 | /* C: Resurrect lines */ |
760 | /* Resurrect lines */ |
753 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
761 | memset (screen.tlen + j, 0, i * sizeof (int16_t)); |
754 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
762 | memcpy (screen.text + j, buf_text, i * sizeof (text_t *)); |
755 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
763 | memcpy (screen.rend + j, buf_rend, i * sizeof (text_t *)); |
756 | if (!spec) /* line length may not equal TermWin.ncol */ |
764 | if (!spec) /* line length may not equal TermWin.ncol */ |
757 | for (; i--; j++) |
765 | for (; i--; j++) |
… | |
… | |
765 | * Add text given in <str> of length <len> to screen struct |
773 | * Add text given in <str> of length <len> to screen struct |
766 | */ |
774 | */ |
767 | void |
775 | void |
768 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
776 | rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) |
769 | { |
777 | { |
770 | unsigned char checksel, clearsel; |
778 | unsigned char checksel; |
771 | unicode_t c; |
779 | unicode_t c; |
772 | int i, row, last_col; |
780 | int i, row, last_col; |
773 | text_t *stp; |
781 | text_t *stp; |
774 | rend_t *srp; |
782 | rend_t *srp; |
775 | |
783 | |
776 | if (len <= 0) /* sanity */ |
784 | if (len <= 0) /* sanity */ |
777 | return; |
785 | return; |
778 | |
786 | |
779 | want_refresh = 1; |
787 | want_refresh = 1; |
|
|
788 | ZERO_SCROLLBACK (); |
780 | last_col = TermWin.ncol; |
789 | last_col = TermWin.ncol; |
781 | |
790 | |
782 | D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len)); |
|
|
783 | ZERO_SCROLLBACK (); |
|
|
784 | if (nlines > 0) |
791 | if (nlines > 0) |
785 | { |
792 | { |
786 | nlines += screen.cur.row - screen.bscroll; |
793 | nlines += screen.cur.row - screen.bscroll; |
787 | if ((nlines > 0) |
794 | if ((nlines > 0) |
788 | && (screen.tscroll == 0) |
795 | && (screen.tscroll == 0) |
… | |
… | |
804 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
811 | MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled); |
805 | #endif |
812 | #endif |
806 | row = screen.cur.row + TermWin.saveLines; |
813 | row = screen.cur.row + TermWin.saveLines; |
807 | |
814 | |
808 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
815 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
809 | clearsel = 0; |
|
|
810 | |
816 | |
811 | stp = screen.text[row]; |
817 | stp = screen.text[row]; |
812 | srp = screen.rend[row]; |
818 | srp = screen.rend[row]; |
813 | |
819 | |
814 | while (len--) |
820 | while (len--) |
… | |
… | |
817 | |
823 | |
818 | if (c < 0x20) |
824 | if (c < 0x20) |
819 | switch (c) |
825 | switch (c) |
820 | { |
826 | { |
821 | case C0_HT: |
827 | case C0_HT: |
822 | scr_tab (1); |
828 | scr_tab (1, true); |
823 | continue; |
829 | continue; |
824 | |
830 | |
825 | case C0_LF: |
831 | case C0_LF: |
826 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
832 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
827 | MAX_IT (screen.tlen[row], screen.cur.col); |
833 | MAX_IT (screen.tlen[row], screen.cur.col); |
… | |
… | |
849 | if (checksel /* see if we're writing within selection */ |
855 | if (checksel /* see if we're writing within selection */ |
850 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
856 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
851 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
857 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
852 | { |
858 | { |
853 | checksel = 0; |
859 | checksel = 0; |
854 | clearsel = 1; |
860 | /* |
|
|
861 | * If we wrote anywhere in the selected area, kill the selection |
|
|
862 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
863 | * should be a similar check. |
|
|
864 | */ |
|
|
865 | CLEAR_SELECTION (); |
855 | } |
866 | } |
856 | |
867 | |
857 | if (screen.flags & Screen_WrapNext) |
868 | if (screen.flags & Screen_WrapNext) |
858 | { |
869 | { |
859 | screen.tlen[row] = -1; |
870 | screen.tlen[row] = -1; |
860 | if (screen.cur.row == screen.bscroll) |
871 | |
861 | scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0); |
|
|
862 | else if (screen.cur.row < (TermWin.nrow - 1)) |
|
|
863 | row = (++screen.cur.row) + TermWin.saveLines; |
872 | scr_do_wrap (); row = screen.cur.row + TermWin.saveLines; |
864 | |
873 | |
865 | stp = screen.text[row]; /* _must_ refresh */ |
874 | stp = screen.text[row]; /* _must_ refresh */ |
866 | srp = screen.rend[row]; /* _must_ refresh */ |
875 | srp = screen.rend[row]; /* _must_ refresh */ |
867 | screen.cur.col = 0; |
|
|
868 | screen.flags &= ~Screen_WrapNext; |
|
|
869 | } |
876 | } |
870 | |
|
|
871 | if (screen.flags & Screen_Insert) |
|
|
872 | scr_insdel_chars (1, INSERT); |
|
|
873 | |
877 | |
874 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
878 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
875 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
879 | // do wcwidth before further replacements, as wcwidth says that line-drawing |
876 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
880 | // characters have width -1 (DOH!) on GNU/Linux sometimes. |
877 | int width = c < 0x100 ? 1 : wcwidth (c); |
881 | int width = c < 0x100 ? 1 : wcwidth (c); |
878 | |
882 | |
879 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
883 | if (charsets[screen.charset] == '0') // DEC SPECIAL |
880 | { |
884 | { |
881 | // vt100 special graphics and line drawing |
885 | // vt100 special graphics and line drawing |
|
|
886 | // 5f-7e standard vt100 |
|
|
887 | // 40-5e rxvt extension for extra curses acs chars |
882 | static uint16_t vt100_0[32] = { // 5f .. 7e |
888 | static uint16_t vt100_0[63] = { // 40 .. 7e |
|
|
889 | 0x0000, 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 40-47 hi mr. snowman! |
|
|
890 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 48-4f |
|
|
891 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 50-57 |
|
|
892 | 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0020, // 58-5f |
883 | 0x0020, 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, |
893 | 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67 |
884 | 0x00b1, 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, |
894 | 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f |
885 | 0x23ba, 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, |
895 | 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77 |
886 | 0x252c, 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, |
896 | 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e |
887 | }; |
897 | }; |
888 | |
898 | |
889 | if (c >= 0x5f && c <= 0x7e) |
899 | if (c >= 0x40 && c <= 0x7e && vt100_0[c - 0x40]) |
890 | { |
900 | { |
891 | c = vt100_0[c - 0x5f]; |
901 | c = vt100_0[c - 0x40]; |
892 | width = 1; |
902 | width = 1; |
893 | } |
903 | } |
894 | } |
904 | } |
895 | |
905 | |
|
|
906 | if (screen.flags & Screen_Insert) |
|
|
907 | scr_insdel_chars (width, INSERT); |
|
|
908 | |
896 | if (width != 0) |
909 | if (width != 0) |
897 | { |
910 | { |
898 | #if !UNICODE_3 && ENABLE_COMBINING |
911 | // some utf-8 decoders decode surrogate characters. |
|
|
912 | if (0xd800 <= c && c <= 0xdfff) |
|
|
913 | c = 0xfffd; |
|
|
914 | |
|
|
915 | #if !UNICODE_3 |
899 | // trim characters we can't store directly :( |
916 | // trim characters we can't store directly :( |
900 | if (c >= 0x10000) |
917 | if (c >= 0x10000) |
|
|
918 | # if ENABLE_COMBINING |
901 | c = rxvt_composite.compose (c); // map to lower 16 bits |
919 | c = rxvt_composite.compose (c); // map to lower 16 bits |
|
|
920 | # else |
|
|
921 | c = 0xfffd; |
902 | #endif |
922 | # endif |
903 | bool bold = (Options & Opt_realBold) && ((rstyle & RS_Bold) != 0); |
923 | #endif |
904 | rend_t rend = SET_FONT (rstyle, |
924 | |
905 | c > 0x7f || bold || c < 0x20 |
925 | // nuke the character at this position, if required |
906 | ? TermWin.fontset->find_font (c, bold) |
926 | if (stp[screen.cur.col] == NOCHAR |
907 | : TermWin.ascii_map [c - 0x20]); |
927 | || (screen.cur.col < TermWin.ncol - 1 |
|
|
928 | && stp[screen.cur.col + 1] == NOCHAR)) |
|
|
929 | { |
|
|
930 | int col = screen.cur.col; |
|
|
931 | |
|
|
932 | // find begin |
|
|
933 | while (col > 0 && stp[col] == NOCHAR) |
|
|
934 | col--; |
|
|
935 | |
|
|
936 | rend_t rend = SET_FONT (srp[col], FONTSET (srp[col])->find_font (' ')); |
|
|
937 | |
|
|
938 | // found begin, nuke |
|
|
939 | do { |
|
|
940 | stp[col] = ' '; |
|
|
941 | srp[col] = rend; |
|
|
942 | col++; |
|
|
943 | } while (col < TermWin.ncol && stp[col] == NOCHAR); |
|
|
944 | } |
|
|
945 | |
|
|
946 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
908 | |
947 | |
909 | do |
948 | do |
910 | { |
949 | { |
911 | stp[screen.cur.col] = c; |
950 | stp[screen.cur.col] = c; |
912 | srp[screen.cur.col] = rend; |
951 | srp[screen.cur.col] = rend; |
… | |
… | |
924 | c = NOCHAR; |
963 | c = NOCHAR; |
925 | } |
964 | } |
926 | while (--width > 0); |
965 | while (--width > 0); |
927 | |
966 | |
928 | // pad with spaces when overwriting wide character with smaller one |
967 | // pad with spaces when overwriting wide character with smaller one |
|
|
968 | if (!width) |
929 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
969 | for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) |
930 | { |
970 | { |
931 | stp[c] = ' '; |
971 | stp[c] = ' '; |
932 | srp[c] = rend; |
972 | srp[c] = rend; |
933 | } |
973 | } |
934 | } |
974 | } |
935 | else if (width == 0) |
975 | else if (width == 0) |
936 | { |
976 | { |
937 | #if ENABLE_COMBINING |
977 | #if ENABLE_COMBINING |
938 | // handle combining characters |
978 | // handle combining characters |
… | |
… | |
945 | |
985 | |
946 | if (screen.cur.col > 0) |
986 | if (screen.cur.col > 0) |
947 | { |
987 | { |
948 | tp = stp + screen.cur.col - 1; |
988 | tp = stp + screen.cur.col - 1; |
949 | rp = srp + screen.cur.col - 1; |
989 | rp = srp + screen.cur.col - 1; |
|
|
990 | |
|
|
991 | while (*tp == NOCHAR && tp > stp) |
|
|
992 | tp--, rp--; |
950 | } |
993 | } |
951 | else if (screen.cur.row > 0 |
994 | else if (screen.cur.row > 0 |
952 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
995 | && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1) |
953 | { |
996 | { |
954 | tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
997 | int line = screen.cur.row - 1 + TermWin.saveLines; |
955 | rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1; |
998 | |
|
|
999 | tp = screen.text[line] + last_col - 1; |
|
|
1000 | rp = screen.rend[line] + last_col - 1; |
|
|
1001 | |
|
|
1002 | while (*tp == NOCHAR && tp > screen.text[line]) |
|
|
1003 | tp--, rp--; |
956 | } |
1004 | } |
957 | else |
1005 | else |
958 | continue; |
1006 | continue; |
959 | |
|
|
960 | // handle double-width-chars by making them look extremely ugly |
|
|
961 | if (*tp == NOCHAR) |
|
|
962 | *tp = ' '; // hack //D //TODO //--tp, --rp; |
|
|
963 | |
1007 | |
964 | // first try to find a precomposed character |
1008 | // first try to find a precomposed character |
965 | unicode_t n = rxvt_compose (*tp, c); |
1009 | unicode_t n = rxvt_compose (*tp, c); |
966 | if (n == NOCHAR) |
1010 | if (n == NOCHAR) |
967 | n = rxvt_composite.compose (*tp, c); |
1011 | n = rxvt_composite.compose (*tp, c); |
968 | |
1012 | |
969 | *tp = n; |
1013 | *tp = n; |
970 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
1014 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
971 | #endif |
1015 | #endif |
972 | } |
1016 | } |
973 | } |
1017 | } |
974 | |
1018 | |
975 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
1019 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
976 | MAX_IT (screen.tlen[row], screen.cur.col); |
1020 | MAX_IT (screen.tlen[row], screen.cur.col); |
977 | |
|
|
978 | /* |
|
|
979 | * If we wrote anywhere in the selected area, kill the selection |
|
|
980 | * XXX: should we kill the mark too? Possibly, but maybe that |
|
|
981 | * should be a similar check. |
|
|
982 | */ |
|
|
983 | if (clearsel) |
|
|
984 | CLEAR_SELECTION (); |
|
|
985 | |
1021 | |
986 | #ifdef DEBUG_STRICT |
1022 | #ifdef DEBUG_STRICT |
987 | assert (screen.cur.row >= 0); |
1023 | assert (screen.cur.row >= 0); |
988 | #else /* drive with your eyes closed */ |
1024 | #else /* drive with your eyes closed */ |
989 | MAX_IT (screen.cur.row, 0); |
1025 | MAX_IT (screen.cur.row, 0); |
… | |
… | |
1007 | #ifdef TERMCAP_HAS_BW |
1043 | #ifdef TERMCAP_HAS_BW |
1008 | screen.cur.col = TermWin.ncol - 1; |
1044 | screen.cur.col = TermWin.ncol - 1; |
1009 | screen.cur.row--; |
1045 | screen.cur.row--; |
1010 | return; |
1046 | return; |
1011 | #endif |
1047 | #endif |
1012 | |
|
|
1013 | } |
1048 | } |
1014 | } |
1049 | } |
1015 | else if ((screen.flags & Screen_WrapNext) == 0) |
1050 | else if (!(screen.flags & Screen_WrapNext)) |
1016 | scr_gotorc (0, -1, RELATIVE); |
1051 | scr_gotorc (0, -1, RELATIVE); |
1017 | |
1052 | |
1018 | screen.flags &= ~Screen_WrapNext; |
1053 | screen.flags &= ~Screen_WrapNext; |
1019 | } |
1054 | } |
1020 | |
1055 | |
… | |
… | |
1023 | * Process Horizontal Tab |
1058 | * Process Horizontal Tab |
1024 | * count: +ve = forward; -ve = backwards |
1059 | * count: +ve = forward; -ve = backwards |
1025 | * XTERM_SEQ: CTRL-I |
1060 | * XTERM_SEQ: CTRL-I |
1026 | */ |
1061 | */ |
1027 | void |
1062 | void |
1028 | rxvt_term::scr_tab (int count) |
1063 | rxvt_term::scr_tab (int count, bool ht) |
1029 | { |
1064 | { |
1030 | int i, x; |
1065 | int i, x; |
1031 | |
1066 | |
1032 | D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count)); |
|
|
1033 | want_refresh = 1; |
1067 | want_refresh = 1; |
1034 | i = x = screen.cur.col; |
1068 | i = x = screen.cur.col; |
1035 | |
1069 | |
1036 | if (count == 0) |
1070 | if (count == 0) |
1037 | return; |
1071 | return; |
1038 | else if (count > 0) |
1072 | else if (count > 0) |
1039 | { |
1073 | { |
|
|
1074 | int row = TermWin.saveLines + screen.cur.row; |
|
|
1075 | text_t *tp = screen.text[row]; |
|
|
1076 | rend_t *rp = screen.rend[row]; |
|
|
1077 | rend_t base_rend = rp[i]; |
|
|
1078 | ht &= tp[i] == ' '; |
|
|
1079 | |
1040 | for (; ++i < TermWin.ncol; ) |
1080 | for (; ++i < TermWin.ncol; ) |
1041 | if (tabs[i]) |
1081 | if (tabs[i]) |
1042 | { |
1082 | { |
1043 | x = i; |
1083 | x = i; |
1044 | if (!--count) |
1084 | if (!--count) |
1045 | break; |
1085 | break; |
1046 | } |
1086 | } |
|
|
1087 | else |
|
|
1088 | ht &= tp[i] == ' ' |
|
|
1089 | && RS_SAME (rp[i], base_rend); |
1047 | |
1090 | |
1048 | if (count) |
1091 | if (count) |
1049 | x = TermWin.ncol - 1; |
1092 | x = TermWin.ncol - 1; |
|
|
1093 | |
|
|
1094 | // store horizontal tab commands as characters inside the text |
|
|
1095 | // buffer so they can be selected and pasted. |
|
|
1096 | if (ht && options & Opt_pastableTabs) |
|
|
1097 | { |
|
|
1098 | base_rend = SET_FONT (base_rend, 0); |
|
|
1099 | |
|
|
1100 | if (screen.tlen[row] != -1) /* XXX: think about this */ |
|
|
1101 | MAX_IT (screen.tlen[row], x); |
|
|
1102 | |
|
|
1103 | i = screen.cur.col; |
|
|
1104 | |
|
|
1105 | tp[i] = '\t'; |
|
|
1106 | rp[i] = base_rend; |
|
|
1107 | |
|
|
1108 | while (++i < x) |
|
|
1109 | { |
|
|
1110 | tp[i] = NOCHAR; |
|
|
1111 | rp[i] = base_rend; |
|
|
1112 | } |
|
|
1113 | } |
1050 | } |
1114 | } |
1051 | else /* if (count < 0) */ |
1115 | else /* if (count < 0) */ |
1052 | { |
1116 | { |
1053 | for (; --i >= 0; ) |
1117 | for (; --i >= 0; ) |
1054 | if (tabs[i]) |
1118 | if (tabs[i]) |
… | |
… | |
1071 | * Process DEC Back Index |
1135 | * Process DEC Back Index |
1072 | * XTERM_SEQ: ESC 6 |
1136 | * XTERM_SEQ: ESC 6 |
1073 | * Move cursor left in row. If we're at the left boundary, shift everything |
1137 | * Move cursor left in row. If we're at the left boundary, shift everything |
1074 | * in that row right. Clear left column. |
1138 | * in that row right. Clear left column. |
1075 | */ |
1139 | */ |
1076 | #ifndef NO_FRILLS |
1140 | #if ENABLE_FRILLS |
1077 | void |
1141 | void |
1078 | rxvt_term::scr_backindex () |
1142 | rxvt_term::scr_backindex () |
1079 | { |
1143 | { |
1080 | if (screen.cur.col > 0) |
1144 | if (screen.cur.col > 0) |
1081 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1145 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1082 | else |
1146 | else |
1083 | { |
1147 | { |
1084 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1148 | if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0) |
1085 | return; /* um, yeah? */ |
1149 | return; /* um, yeah? */ |
|
|
1150 | |
1086 | scr_insdel_chars (1, INSERT); |
1151 | scr_insdel_chars (1, INSERT); |
1087 | } |
1152 | } |
1088 | } |
1153 | } |
1089 | #endif |
1154 | #endif |
1090 | /* ------------------------------------------------------------------------- */ |
1155 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1092 | * Process DEC Forward Index |
1157 | * Process DEC Forward Index |
1093 | * XTERM_SEQ: ESC 9 |
1158 | * XTERM_SEQ: ESC 9 |
1094 | * Move cursor right in row. If we're at the right boundary, shift everything |
1159 | * Move cursor right in row. If we're at the right boundary, shift everything |
1095 | * in that row left. Clear right column. |
1160 | * in that row left. Clear right column. |
1096 | */ |
1161 | */ |
1097 | #ifndef NO_FRILLS |
1162 | #if ENABLE_FRILLS |
1098 | void |
1163 | void |
1099 | rxvt_term::scr_forwardindex () |
1164 | rxvt_term::scr_forwardindex () |
1100 | { |
1165 | { |
1101 | int row; |
1166 | int row; |
1102 | |
1167 | |
1103 | if (screen.cur.col < TermWin.ncol - 1) |
1168 | if (screen.cur.col < TermWin.ncol - 1) |
1104 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1169 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1105 | else |
1170 | else |
1106 | { |
1171 | { |
1107 | row = screen.cur.row + TermWin.saveLines; |
1172 | row = screen.cur.row + TermWin.saveLines; |
|
|
1173 | |
1108 | if (screen.tlen[row] == 0) |
1174 | if (screen.tlen[row] == 0) |
1109 | return; /* um, yeah? */ |
1175 | return; /* um, yeah? */ |
1110 | else if (screen.tlen[row] == -1) |
1176 | else if (screen.tlen[row] == -1) |
1111 | screen.tlen[row] = TermWin.ncol; |
1177 | screen.tlen[row] = TermWin.ncol; |
|
|
1178 | |
1112 | scr_gotorc (0, 0, R_RELATIVE); |
1179 | scr_gotorc (0, 0, R_RELATIVE); |
1113 | scr_insdel_chars (1, DELETE); |
1180 | scr_insdel_chars (1, DELETE); |
1114 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1181 | scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); |
1115 | } |
1182 | } |
1116 | } |
1183 | } |
… | |
… | |
1124 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1191 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1125 | { |
1192 | { |
1126 | want_refresh = 1; |
1193 | want_refresh = 1; |
1127 | ZERO_SCROLLBACK (); |
1194 | ZERO_SCROLLBACK (); |
1128 | |
1195 | |
1129 | D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); |
|
|
1130 | |
|
|
1131 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1196 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1132 | MAX_IT (screen.cur.col, 0); |
1197 | MAX_IT (screen.cur.col, 0); |
1133 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1198 | MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); |
1134 | |
1199 | |
1135 | screen.flags &= ~Screen_WrapNext; |
1200 | screen.flags &= ~Screen_WrapNext; |
|
|
1201 | |
1136 | if (relative & R_RELATIVE) |
1202 | if (relative & R_RELATIVE) |
1137 | { |
1203 | { |
1138 | if (row > 0) |
1204 | if (row > 0) |
1139 | { |
1205 | { |
1140 | if (screen.cur.row <= screen.bscroll |
1206 | if (screen.cur.row <= screen.bscroll |
… | |
… | |
1160 | MIN_IT (screen.cur.row, screen.bscroll); |
1226 | MIN_IT (screen.cur.row, screen.bscroll); |
1161 | } |
1227 | } |
1162 | else |
1228 | else |
1163 | screen.cur.row = row; |
1229 | screen.cur.row = row; |
1164 | } |
1230 | } |
|
|
1231 | |
1165 | MAX_IT (screen.cur.row, 0); |
1232 | MAX_IT (screen.cur.row, 0); |
1166 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1233 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1167 | |
|
|
1168 | while (screen.cur.col > 0 |
|
|
1169 | && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR) |
|
|
1170 | screen.cur.col--; |
|
|
1171 | } |
1234 | } |
1172 | |
1235 | |
1173 | /* ------------------------------------------------------------------------- */ |
1236 | /* ------------------------------------------------------------------------- */ |
1174 | /* |
1237 | /* |
1175 | * direction should be UP or DN |
1238 | * direction should be UP or DN |
1176 | */ |
1239 | */ |
1177 | void |
1240 | void |
1178 | rxvt_term::scr_index (enum page_dirn direction) |
1241 | rxvt_term::scr_index (enum page_dirn direction) |
1179 | { |
1242 | { |
1180 | int dirn; |
1243 | int dirn; |
1181 | |
1244 | |
1182 | want_refresh = 1; |
1245 | want_refresh = 1; |
|
|
1246 | ZERO_SCROLLBACK (); |
|
|
1247 | |
1183 | dirn = ((direction == UP) ? 1 : -1); |
1248 | dirn = ((direction == UP) ? 1 : -1); |
1184 | D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn)); |
|
|
1185 | |
|
|
1186 | ZERO_SCROLLBACK (); |
|
|
1187 | |
1249 | |
1188 | screen.flags &= ~Screen_WrapNext; |
1250 | screen.flags &= ~Screen_WrapNext; |
|
|
1251 | |
1189 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1252 | if ((screen.cur.row == screen.bscroll && direction == UP) |
1190 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1253 | || (screen.cur.row == screen.tscroll && direction == DN)) |
1191 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1254 | scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); |
1192 | else |
1255 | else |
1193 | screen.cur.row += dirn; |
1256 | screen.cur.row += dirn; |
|
|
1257 | |
1194 | MAX_IT (screen.cur.row, 0); |
1258 | MAX_IT (screen.cur.row, 0); |
1195 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1259 | MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); |
1196 | selection_check (0); |
1260 | selection_check (0); |
1197 | } |
1261 | } |
1198 | |
1262 | |
… | |
… | |
1207 | rxvt_term::scr_erase_line (int mode) |
1271 | rxvt_term::scr_erase_line (int mode) |
1208 | { |
1272 | { |
1209 | unsigned int row, col, num; |
1273 | unsigned int row, col, num; |
1210 | |
1274 | |
1211 | want_refresh = 1; |
1275 | want_refresh = 1; |
1212 | D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1213 | ZERO_SCROLLBACK (); |
1276 | ZERO_SCROLLBACK (); |
1214 | |
1277 | |
1215 | selection_check (1); |
1278 | selection_check (1); |
1216 | |
|
|
1217 | screen.flags &= ~Screen_WrapNext; |
|
|
1218 | |
1279 | |
1219 | row = TermWin.saveLines + screen.cur.row; |
1280 | row = TermWin.saveLines + screen.cur.row; |
1220 | switch (mode) |
1281 | switch (mode) |
1221 | { |
1282 | { |
1222 | case 0: /* erase to end of line */ |
1283 | case 0: /* erase to end of line */ |
… | |
… | |
1266 | int32_t row, row_offset; |
1327 | int32_t row, row_offset; |
1267 | rend_t ren; |
1328 | rend_t ren; |
1268 | XGCValues gcvalue; |
1329 | XGCValues gcvalue; |
1269 | |
1330 | |
1270 | want_refresh = 1; |
1331 | want_refresh = 1; |
1271 | D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row)); |
|
|
1272 | ZERO_SCROLLBACK (); |
1332 | ZERO_SCROLLBACK (); |
|
|
1333 | |
1273 | row_offset = (int32_t)TermWin.saveLines; |
1334 | row_offset = (int32_t)TermWin.saveLines; |
1274 | |
1335 | |
1275 | switch (mode) |
1336 | switch (mode) |
1276 | { |
1337 | { |
1277 | case 0: /* erase to end of screen */ |
1338 | case 0: /* erase to end of screen */ |
… | |
… | |
1313 | ren = DEFAULT_RSTYLE; |
1374 | ren = DEFAULT_RSTYLE; |
1314 | CLEAR_ROWS (row, num); |
1375 | CLEAR_ROWS (row, num); |
1315 | } |
1376 | } |
1316 | else |
1377 | else |
1317 | { |
1378 | { |
1318 | ren = (rstyle & (RS_fgMask | RS_bgMask)); |
1379 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1319 | gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; |
1380 | gcvalue.foreground = pix_colors[GET_BGCOLOR (rstyle)]; |
1320 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1381 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1321 | ERASE_ROWS (row, num); |
1382 | ERASE_ROWS (row, num); |
1322 | gcvalue.foreground = PixColors[Color_fg]; |
1383 | gcvalue.foreground = pix_colors[Color_fg]; |
1323 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1384 | XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); |
1324 | } |
1385 | } |
1325 | |
1386 | |
1326 | for (; num--; row++) |
1387 | for (; num--; row++) |
1327 | { |
1388 | { |
1328 | scr_blank_screen_mem (screen.text, screen.rend, |
1389 | scr_blank_screen_mem (screen.text, screen.rend, (unsigned int) (row + row_offset), rstyle); |
1329 | (unsigned int) (row + row_offset), rstyle); |
|
|
1330 | screen.tlen[row + row_offset] = 0; |
1390 | screen.tlen[row + row_offset] = 0; |
1331 | scr_blank_line (drawn_text[row], drawn_rend[row], |
1391 | scr_blank_line (drawn_text[row], drawn_rend[row], (unsigned int)TermWin.ncol, ren); |
1332 | (unsigned int)TermWin.ncol, ren); |
|
|
1333 | } |
1392 | } |
1334 | } |
1393 | } |
|
|
1394 | |
|
|
1395 | #if ENABLE_FRILLS |
|
|
1396 | void |
|
|
1397 | rxvt_term::scr_erase_savelines () |
|
|
1398 | { |
|
|
1399 | want_refresh = 1; |
|
|
1400 | ZERO_SCROLLBACK (); |
|
|
1401 | |
|
|
1402 | TermWin.nscrolled = 0; |
|
|
1403 | } |
|
|
1404 | #endif |
1335 | |
1405 | |
1336 | /* ------------------------------------------------------------------------- */ |
1406 | /* ------------------------------------------------------------------------- */ |
1337 | /* |
1407 | /* |
1338 | * Fill the screen with `E's |
1408 | * Fill the screen with `E's |
1339 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1409 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1340 | */ |
1410 | */ |
1341 | void |
1411 | void |
1342 | rxvt_term::scr_E () |
1412 | rxvt_term::scr_E () |
1343 | { |
1413 | { |
1344 | int i, j, k; |
1414 | int i, j, k; |
1345 | rend_t *r1, fs; |
1415 | rend_t *r1, fs; |
1346 | |
1416 | |
1347 | want_refresh = 1; |
1417 | want_refresh = 1; |
|
|
1418 | ZERO_SCROLLBACK (); |
|
|
1419 | |
1348 | num_scr_allow = 0; |
1420 | num_scr_allow = 0; |
1349 | ZERO_SCROLLBACK (); |
|
|
1350 | selection_check (3); |
1421 | selection_check (3); |
1351 | |
1422 | |
1352 | fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); |
1423 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1353 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1424 | for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) |
1354 | { |
1425 | { |
1355 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1426 | screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ |
1356 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1427 | fill_text (screen.text[k], 'E', TermWin.ncol); |
1357 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
1428 | for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) |
… | |
… | |
1381 | if (insdel == DELETE) |
1452 | if (insdel == DELETE) |
1382 | return; |
1453 | return; |
1383 | else if (insdel == INSERT) |
1454 | else if (insdel == INSERT) |
1384 | count = end; |
1455 | count = end; |
1385 | } |
1456 | } |
1386 | screen.flags &= ~Screen_WrapNext; |
1457 | |
|
|
1458 | scr_do_wrap (); |
1387 | |
1459 | |
1388 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1460 | scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); |
1389 | } |
1461 | } |
1390 | |
1462 | |
1391 | /* ------------------------------------------------------------------------- */ |
1463 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1405 | ZERO_SCROLLBACK (); |
1477 | ZERO_SCROLLBACK (); |
1406 | |
1478 | |
1407 | if (count <= 0) |
1479 | if (count <= 0) |
1408 | return; |
1480 | return; |
1409 | |
1481 | |
|
|
1482 | scr_do_wrap (); |
|
|
1483 | |
1410 | selection_check (1); |
1484 | selection_check (1); |
1411 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1485 | MIN_IT (count, (TermWin.ncol - screen.cur.col)); |
1412 | |
1486 | |
1413 | row = screen.cur.row + TermWin.saveLines; |
1487 | row = screen.cur.row + TermWin.saveLines; |
1414 | screen.flags &= ~Screen_WrapNext; |
|
|
1415 | |
1488 | |
1416 | stp = screen.text[row]; |
1489 | stp = screen.text[row]; |
1417 | srp = screen.rend[row]; |
1490 | srp = screen.rend[row]; |
1418 | slp = & (screen.tlen[row]); |
1491 | slp = &screen.tlen[row]; |
1419 | |
1492 | |
1420 | switch (insdel) |
1493 | switch (insdel) |
1421 | { |
1494 | { |
1422 | case INSERT: |
1495 | case INSERT: |
1423 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; |
1496 | for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; col--) |
1424 | col--) |
|
|
1425 | { |
1497 | { |
1426 | stp[col] = stp[col - count]; |
1498 | stp[col] = stp[col - count]; |
1427 | srp[col] = srp[col - count]; |
1499 | srp[col] = srp[col - count]; |
1428 | } |
1500 | } |
1429 | |
1501 | |
… | |
… | |
1439 | if (selection.end.row != screen.cur.row |
1511 | if (selection.end.row != screen.cur.row |
1440 | || (selection.end.col + count >= TermWin.ncol)) |
1512 | || (selection.end.col + count >= TermWin.ncol)) |
1441 | CLEAR_SELECTION (); |
1513 | CLEAR_SELECTION (); |
1442 | else |
1514 | else |
1443 | { /* shift selection */ |
1515 | { /* shift selection */ |
1444 | selection.beg.col += count; |
1516 | selection.beg.col += count; |
1445 | selection.mark.col += count; /* XXX: yes? */ |
1517 | selection.mark.col += count; /* XXX: yes? */ |
1446 | selection.end.col += count; |
1518 | selection.end.col += count; |
1447 | } |
1519 | } |
1448 | } |
1520 | } |
1449 | |
1521 | |
1450 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1522 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1451 | (unsigned int)count, rstyle); |
1523 | (unsigned int)count, rstyle); |
1452 | break; |
1524 | break; |
1453 | |
1525 | |
1454 | case ERASE: |
1526 | case ERASE: |
1455 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1527 | screen.cur.col += count; /* don't worry if > TermWin.ncol */ |
1456 | selection_check (1); |
1528 | selection_check (1); |
1457 | screen.cur.col -= count; |
1529 | screen.cur.col -= count; |
1458 | scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), |
1530 | scr_blank_line (&stp[screen.cur.col], &srp[screen.cur.col], |
1459 | (unsigned int)count, rstyle); |
1531 | (unsigned int)count, rstyle); |
1460 | break; |
1532 | break; |
1461 | |
1533 | |
1462 | case DELETE: |
1534 | case DELETE: |
1463 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1535 | tr = srp[TermWin.ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1466 | { |
1538 | { |
1467 | stp[col] = stp[col + count]; |
1539 | stp[col] = stp[col + count]; |
1468 | srp[col] = srp[col + count]; |
1540 | srp[col] = srp[col + count]; |
1469 | } |
1541 | } |
1470 | |
1542 | |
1471 | scr_blank_line (& (stp[TermWin.ncol - count]), |
1543 | scr_blank_line (&stp[TermWin.ncol - count], &srp[TermWin.ncol - count], |
1472 | & (srp[TermWin.ncol - count]), |
|
|
1473 | (unsigned int)count, tr); |
1544 | (unsigned int)count, tr); |
1474 | |
1545 | |
1475 | if (*slp == -1) /* break line continuation */ |
1546 | if (*slp == -1) /* break line continuation */ |
1476 | *slp = TermWin.ncol; |
1547 | *slp = TermWin.ncol; |
1477 | |
1548 | |
… | |
… | |
1486 | || selection.end.col >= TermWin.ncol) |
1557 | || selection.end.col >= TermWin.ncol) |
1487 | CLEAR_SELECTION (); |
1558 | CLEAR_SELECTION (); |
1488 | else |
1559 | else |
1489 | { |
1560 | { |
1490 | /* shift selection */ |
1561 | /* shift selection */ |
1491 | selection.beg.col -= count; |
1562 | selection.beg.col -= count; |
1492 | selection.mark.col -= count; /* XXX: yes? */ |
1563 | selection.mark.col -= count; /* XXX: yes? */ |
1493 | selection.end.col -= count; |
1564 | selection.end.col -= count; |
1494 | } |
1565 | } |
1495 | } |
1566 | } |
1496 | |
1567 | |
1497 | break; |
1568 | break; |
1498 | } |
1569 | } |
… | |
… | |
1544 | rxvt_term::scr_autowrap (int mode) |
1615 | rxvt_term::scr_autowrap (int mode) |
1545 | { |
1616 | { |
1546 | if (mode) |
1617 | if (mode) |
1547 | screen.flags |= Screen_Autowrap; |
1618 | screen.flags |= Screen_Autowrap; |
1548 | else |
1619 | else |
1549 | screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); |
1620 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1550 | } |
1621 | } |
1551 | |
1622 | |
1552 | /* ------------------------------------------------------------------------- */ |
1623 | /* ------------------------------------------------------------------------- */ |
1553 | /* |
1624 | /* |
1554 | * Set/unset margin origin mode |
1625 | * Set/unset margin origin mode |
… | |
… | |
1564 | { |
1635 | { |
1565 | if (mode) |
1636 | if (mode) |
1566 | screen.flags |= Screen_Relative; |
1637 | screen.flags |= Screen_Relative; |
1567 | else |
1638 | else |
1568 | screen.flags &= ~Screen_Relative; |
1639 | screen.flags &= ~Screen_Relative; |
|
|
1640 | |
1569 | scr_gotorc (0, 0, 0); |
1641 | scr_gotorc (0, 0, 0); |
1570 | } |
1642 | } |
1571 | |
1643 | |
1572 | /* ------------------------------------------------------------------------- */ |
1644 | /* ------------------------------------------------------------------------- */ |
1573 | /* |
1645 | /* |
… | |
… | |
1593 | */ |
1665 | */ |
1594 | void |
1666 | void |
1595 | rxvt_term::scr_set_tab (int mode) |
1667 | rxvt_term::scr_set_tab (int mode) |
1596 | { |
1668 | { |
1597 | if (mode < 0) |
1669 | if (mode < 0) |
1598 | MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); |
1670 | memset (tabs, 0, TermWin.ncol * sizeof (char)); |
1599 | else if (screen.cur.col < TermWin.ncol) |
1671 | else if (screen.cur.col < TermWin.ncol) |
1600 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1672 | tabs[screen.cur.col] = (mode ? 1 : 0); |
1601 | } |
1673 | } |
1602 | |
1674 | |
1603 | /* ------------------------------------------------------------------------- */ |
1675 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1607 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1679 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1608 | */ |
1680 | */ |
1609 | void |
1681 | void |
1610 | rxvt_term::scr_rvideo_mode (int mode) |
1682 | rxvt_term::scr_rvideo_mode (int mode) |
1611 | { |
1683 | { |
1612 | XGCValues gcvalue; |
1684 | XGCValues gcvalue; |
1613 | |
1685 | |
1614 | if (rvideo != mode) |
1686 | if (rvideo != mode) |
1615 | { |
1687 | { |
1616 | rvideo = mode; |
1688 | rvideo = mode; |
1617 | SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); |
1689 | SWAP_IT (pix_colors[Color_fg], pix_colors[Color_bg], rxvt_color); |
1618 | #if defined(XPM_BACKGROUND) |
1690 | #if XPM_BACKGROUND |
1619 | if (bgPixmap.pixmap == None) |
1691 | if (bgPixmap.pixmap == None) |
1620 | #endif |
1692 | #endif |
1621 | #if defined(TRANSPARENT) |
1693 | #if TRANSPARENT |
1622 | if (! (Options & Opt_transparent) || am_transparent == 0) |
1694 | if (! (options & Opt_transparent) || am_transparent == 0) |
1623 | #endif |
1695 | #endif |
1624 | XSetWindowBackground (display->display, TermWin.vt, |
1696 | XSetWindowBackground (display->display, TermWin.vt, |
1625 | PixColors[Color_bg]); |
1697 | pix_colors[Color_bg]); |
1626 | |
1698 | |
1627 | gcvalue.foreground = PixColors[Color_fg]; |
1699 | gcvalue.foreground = pix_colors[Color_fg]; |
1628 | gcvalue.background = PixColors[Color_bg]; |
1700 | gcvalue.background = pix_colors[Color_bg]; |
1629 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1701 | XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, |
1630 | &gcvalue); |
1702 | &gcvalue); |
1631 | scr_clear (); |
1703 | scr_clear (); |
1632 | scr_touch (true); |
1704 | scr_touch (true); |
1633 | } |
1705 | } |
… | |
… | |
1681 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1753 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1682 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1754 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1683 | */ |
1755 | */ |
1684 | void |
1756 | void |
1685 | rxvt_term::scr_charset_choose (int set) |
1757 | rxvt_term::scr_charset_choose (int set) |
1686 | { |
1758 | { |
1687 | screen.charset = set; |
1759 | screen.charset = set; |
1688 | set_font_style (); |
1760 | set_font_style (); |
1689 | } |
1761 | } |
1690 | |
1762 | |
1691 | /* ------------------------------------------------------------------------- */ |
1763 | /* ------------------------------------------------------------------------- */ |
1692 | /* |
1764 | /* |
1693 | * Set a font |
1765 | * Set a font |
1694 | * XTERM_SEQ: Set G0 character set: ESC ( <C> |
1766 | * XTERM_SEQ: Set G0 character set: ESC ( <C> |
… | |
… | |
1697 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1769 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1698 | * See set_font_style for possible values for <C> |
1770 | * See set_font_style for possible values for <C> |
1699 | */ |
1771 | */ |
1700 | void |
1772 | void |
1701 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1773 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1702 | { |
1774 | { |
1703 | charsets[set] = (unsigned char)ch; |
1775 | charsets[set] = (unsigned char)ch; |
1704 | set_font_style (); |
1776 | set_font_style (); |
1705 | } |
1777 | } |
1706 | |
1778 | |
1707 | |
1779 | |
1708 | /* ------------------------------------------------------------------------- * |
1780 | /* ------------------------------------------------------------------------- * |
1709 | * MAJOR SCREEN MANIPULATION * |
1781 | * MAJOR SCREEN MANIPULATION * |
1710 | * ------------------------------------------------------------------------- */ |
1782 | * ------------------------------------------------------------------------- */ |
… | |
… | |
1778 | { |
1850 | { |
1779 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1851 | MIN_IT (rc[i].col, TermWin.ncol - 1); |
1780 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1852 | MIN_IT (rc[i].row, TermWin.nrow - 1); |
1781 | } |
1853 | } |
1782 | |
1854 | |
1783 | D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row)); |
|
|
1784 | |
|
|
1785 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1855 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1786 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1856 | fill_text (&drawn_text[i][rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1787 | |
1857 | |
1788 | if (refresh) |
1858 | if (refresh) |
1789 | scr_refresh (SLOW_REFRESH); |
1859 | scr_refresh (SLOW_REFRESH); |
… | |
… | |
1806 | */ |
1876 | */ |
1807 | int |
1877 | int |
1808 | rxvt_term::scr_move_to (int y, int len) |
1878 | rxvt_term::scr_move_to (int y, int len) |
1809 | { |
1879 | { |
1810 | long p = 0; |
1880 | long p = 0; |
1811 | uint16_t oldviewstart; |
1881 | unsigned int oldviewstart; |
1812 | |
1882 | |
1813 | oldviewstart = TermWin.view_start; |
1883 | oldviewstart = TermWin.view_start; |
|
|
1884 | |
1814 | if (y < len) |
1885 | if (y < len) |
1815 | { |
1886 | { |
1816 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1887 | p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len; |
1817 | p -= (long) (TermWin.nrow - 1); |
1888 | p -= (long) (TermWin.nrow - 1); |
1818 | p = max (p, 0); |
1889 | p = max (p, 0); |
1819 | } |
1890 | } |
|
|
1891 | |
1820 | TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled); |
1892 | TermWin.view_start = (unsigned int)min (p, TermWin.nscrolled); |
1821 | D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start)); |
|
|
1822 | |
1893 | |
1823 | return scr_changeview (oldviewstart); |
1894 | return scr_changeview (oldviewstart); |
1824 | } |
1895 | } |
1825 | |
1896 | |
1826 | /* ------------------------------------------------------------------------- */ |
1897 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1830 | */ |
1901 | */ |
1831 | int |
1902 | int |
1832 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1903 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1833 | { |
1904 | { |
1834 | int n; |
1905 | int n; |
1835 | uint16_t oldviewstart; |
1906 | unsigned int oldviewstart; |
1836 | |
1907 | |
1837 | D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start)); |
|
|
1838 | #ifdef DEBUG_STRICT |
|
|
1839 | assert ((nlines >= 0) && (nlines <= TermWin.nrow)); |
|
|
1840 | #endif |
|
|
1841 | oldviewstart = TermWin.view_start; |
1908 | oldviewstart = TermWin.view_start; |
|
|
1909 | |
1842 | if (direction == UP) |
1910 | if (direction == UP) |
1843 | { |
1911 | { |
1844 | n = TermWin.view_start + nlines; |
1912 | n = TermWin.view_start + nlines; |
1845 | TermWin.view_start = min (n, TermWin.nscrolled); |
1913 | TermWin.view_start = min (n, TermWin.nscrolled); |
1846 | } |
1914 | } |
1847 | else |
1915 | else |
1848 | { |
1916 | { |
1849 | n = TermWin.view_start - nlines; |
1917 | n = TermWin.view_start - nlines; |
1850 | TermWin.view_start = max (n, 0); |
1918 | TermWin.view_start = max (n, 0); |
1851 | } |
1919 | } |
|
|
1920 | |
1852 | return scr_changeview (oldviewstart); |
1921 | return scr_changeview (oldviewstart); |
1853 | } |
1922 | } |
1854 | |
1923 | |
1855 | int |
1924 | int |
1856 | rxvt_term::scr_changeview (uint16_t oldviewstart) |
1925 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1857 | { |
1926 | { |
1858 | if (TermWin.view_start != oldviewstart) |
1927 | if (TermWin.view_start != oldviewstart) |
1859 | { |
1928 | { |
1860 | want_refresh = 1; |
1929 | want_refresh = 1; |
1861 | num_scr -= (TermWin.view_start - oldviewstart); |
1930 | num_scr -= (TermWin.view_start - oldviewstart); |
… | |
… | |
1869 | rxvt_term::scr_bell () |
1938 | rxvt_term::scr_bell () |
1870 | { |
1939 | { |
1871 | #ifndef NO_BELL |
1940 | #ifndef NO_BELL |
1872 | # ifndef NO_MAPALERT |
1941 | # ifndef NO_MAPALERT |
1873 | # ifdef MAPALERT_OPTION |
1942 | # ifdef MAPALERT_OPTION |
1874 | if (Options & Opt_mapAlert) |
1943 | if (options & Opt_mapAlert) |
1875 | # endif |
1944 | # endif |
1876 | XMapWindow (display->display, TermWin.parent[0]); |
1945 | XMapWindow (display->display, TermWin.parent[0]); |
1877 | # endif |
1946 | # endif |
1878 | if (Options & Opt_visualBell) |
1947 | if (options & Opt_visualBell) |
1879 | { |
1948 | { |
1880 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1949 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1881 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1950 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1882 | } |
1951 | } |
1883 | else |
1952 | else |
… | |
… | |
1889 | /* ARGSUSED */ |
1958 | /* ARGSUSED */ |
1890 | void |
1959 | void |
1891 | rxvt_term::scr_printscreen (int fullhist) |
1960 | rxvt_term::scr_printscreen (int fullhist) |
1892 | { |
1961 | { |
1893 | #ifdef PRINTPIPE |
1962 | #ifdef PRINTPIPE |
1894 | int i, r1, nrows, row_offset; |
1963 | int i, r1, nrows, row_offset; |
1895 | text_t *t; |
1964 | FILE *fd; |
1896 | FILE *fd; |
|
|
1897 | |
1965 | |
1898 | if ((fd = popen_printer ()) == NULL) |
1966 | if ((fd = popen_printer ()) == NULL) |
1899 | return; |
1967 | return; |
|
|
1968 | |
1900 | nrows = TermWin.nrow; |
1969 | nrows = TermWin.nrow; |
1901 | row_offset = TermWin.saveLines; |
1970 | row_offset = TermWin.saveLines; |
|
|
1971 | |
1902 | if (!fullhist) |
1972 | if (!fullhist) |
1903 | row_offset -= TermWin.view_start; |
1973 | row_offset -= TermWin.view_start; |
1904 | else |
1974 | else |
1905 | { |
1975 | { |
1906 | nrows += TermWin.nscrolled; |
1976 | nrows += TermWin.nscrolled; |
1907 | row_offset -= TermWin.nscrolled; |
1977 | row_offset -= TermWin.nscrolled; |
1908 | } |
1978 | } |
1909 | |
1979 | |
|
|
1980 | wctomb (0, 0); |
|
|
1981 | |
1910 | for (r1 = 0; r1 < nrows; r1++) |
1982 | for (r1 = 0; r1 < nrows; r1++) |
1911 | { |
1983 | { |
1912 | t = screen.text[r1 + row_offset]; |
1984 | text_t *tp = screen.text[r1 + row_offset]; |
1913 | for (i = TermWin.ncol - 1; i >= 0; i--) |
1985 | int len = screen.tlen[r1 + row_offset]; |
1914 | if (!isspace (t[i])) |
1986 | |
1915 | break; |
1987 | for (i = len >= 0 ? len : TermWin.ncol - 1; i--; ) |
1916 | fprintf (fd, "%.*s\n", (i + 1), t); |
1988 | { |
|
|
1989 | char mb[MB_LEN_MAX]; |
|
|
1990 | text_t t = *tp++; |
|
|
1991 | if (t == NOCHAR) |
|
|
1992 | continue; |
|
|
1993 | |
|
|
1994 | len = wctomb (mb, t); |
|
|
1995 | |
|
|
1996 | if (len <= 0) |
|
|
1997 | { |
|
|
1998 | mb[0] = ' '; |
|
|
1999 | len = 1; |
|
|
2000 | } |
|
|
2001 | |
|
|
2002 | fwrite (mb, 1, len, fd); |
|
|
2003 | } |
|
|
2004 | |
|
|
2005 | fputc ('\n', fd); |
1917 | } |
2006 | } |
|
|
2007 | |
1918 | pclose_printer (fd); |
2008 | pclose_printer (fd); |
1919 | #endif |
2009 | #endif |
1920 | } |
2010 | } |
1921 | |
2011 | |
1922 | /* ------------------------------------------------------------------------- */ |
2012 | /* ------------------------------------------------------------------------- */ |
1923 | /* |
2013 | /* |
1924 | * Refresh the screen |
2014 | * Refresh the screen |
1925 | * drawn_text/drawn_rend contain the screen information before the update. |
2015 | * drawn_text/drawn_rend contain the screen information before the update. |
1926 | * screen.text/screen.rend contain what the screen will change to. |
2016 | * screen.text/screen.rend contain what the screen will change to. |
1927 | */ |
2017 | */ |
1928 | |
|
|
1929 | #define FONT_WIDTH(X, Y) \ |
|
|
1930 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].width |
|
|
1931 | #define FONT_RBEAR(X, Y) \ |
|
|
1932 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing |
|
|
1933 | #define FONT_LBEAR(X, Y) \ |
|
|
1934 | (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing |
|
|
1935 | #define IS_FONT_CHAR(X, Y) \ |
|
|
1936 | ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2) |
|
|
1937 | |
|
|
1938 | void |
2018 | void |
1939 | rxvt_term::scr_refresh (unsigned char refresh_type) |
2019 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1940 | { |
2020 | { |
1941 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
2021 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1942 | rvid, /* reverse video this position */ |
|
|
1943 | showcursor; /* show the cursor */ |
2022 | showcursor; /* show the cursor */ |
1944 | int16_t col, row, /* column/row we're processing */ |
2023 | int16_t col, row, /* column/row we're processing */ |
1945 | ocrow; /* old cursor row */ |
2024 | ocrow; /* old cursor row */ |
1946 | int i, /* tmp */ |
2025 | int i, /* tmp */ |
1947 | row_offset; /* basic offset in screen structure */ |
2026 | row_offset; /* basic offset in screen structure */ |
1948 | #ifndef NO_CURSORCOLOR |
2027 | #ifndef NO_CURSORCOLOR |
1949 | rend_t cc1; /* store colours at cursor position (s) */ |
2028 | rend_t cc1; /* store colours at cursor position (s) */ |
1950 | #endif |
2029 | #endif |
1951 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
2030 | rend_t *crp; // cursor rendition pointer |
1952 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
2031 | |
|
|
2032 | want_refresh = 0; /* screen is current */ |
1953 | |
2033 | |
1954 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
2034 | if (refresh_type == NO_REFRESH || !TermWin.mapped) |
1955 | return; |
2035 | return; |
1956 | |
2036 | |
1957 | /* |
2037 | /* |
1958 | * A: set up vars |
2038 | * A: set up vars |
1959 | */ |
2039 | */ |
1960 | must_clear = 0; |
2040 | must_clear = 0; |
1961 | |
|
|
1962 | refresh_count = 0; |
2041 | refresh_count = 0; |
1963 | |
2042 | |
1964 | row_offset = TermWin.saveLines - TermWin.view_start; |
2043 | row_offset = TermWin.saveLines - TermWin.view_start; |
1965 | |
2044 | |
1966 | #ifdef XPM_BACKGROUND |
2045 | #if XPM_BACKGROUND |
1967 | must_clear |= (bgPixmap.pixmap != None); |
2046 | must_clear |= bgPixmap.pixmap != None; |
1968 | #endif |
2047 | #endif |
1969 | #ifdef TRANSPARENT |
2048 | #if TRANSPARENT |
1970 | must_clear |= ((Options & Opt_transparent) && am_transparent); |
2049 | must_clear |= (options & Opt_transparent) && am_transparent; |
1971 | #endif |
2050 | #endif |
1972 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2051 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1973 | |
2052 | |
1974 | /* |
2053 | /* |
1975 | * B: reverse any characters which are selected |
2054 | * B: reverse any characters which are selected |
… | |
… | |
1990 | showcursor = 0; |
2069 | showcursor = 0; |
1991 | #endif |
2070 | #endif |
1992 | |
2071 | |
1993 | if (showcursor) |
2072 | if (showcursor) |
1994 | { |
2073 | { |
|
|
2074 | int col = screen.cur.col; |
|
|
2075 | |
|
|
2076 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2077 | col--; |
|
|
2078 | |
1995 | srp = &(screen.rend[screen.cur.row + TermWin.saveLines][screen.cur.col]); |
2079 | crp = &screen.rend[screen.cur.row + TermWin.saveLines][col]; |
1996 | |
2080 | |
1997 | if (showcursor && TermWin.focus) |
2081 | if (showcursor && TermWin.focus) |
1998 | { |
2082 | { |
|
|
2083 | if (options & Opt_cursorUnderline) |
|
|
2084 | *crp ^= RS_Uline; |
|
|
2085 | else |
|
|
2086 | { |
1999 | *srp ^= RS_RVid; |
2087 | *crp ^= RS_RVid; |
|
|
2088 | |
2000 | #ifndef NO_CURSORCOLOR |
2089 | #ifndef NO_CURSORCOLOR |
2001 | cc1 = *srp & (RS_fgMask | RS_bgMask); |
2090 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
2002 | if (ISSET_PIXCOLOR (Color_cursor)) |
2091 | if (ISSET_PIXCOLOR (Color_cursor)) |
2003 | ccol1 = Color_cursor; |
2092 | ccol1 = Color_cursor; |
2004 | else |
2093 | else |
2005 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2094 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2006 | ccol1 = GET_FGCOLOR (rstyle); |
2095 | ccol1 = GET_FGCOLOR (rstyle); |
2007 | #else |
2096 | #else |
2008 | ccol1 = Color_fg; |
2097 | ccol1 = Color_fg; |
2009 | #endif |
2098 | #endif |
2010 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2099 | if (ISSET_PIXCOLOR (Color_cursor2)) |
2011 | ccol2 = Color_cursor2; |
2100 | ccol2 = Color_cursor2; |
2012 | else |
2101 | else |
2013 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2102 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
2014 | ccol2 = GET_BGCOLOR (rstyle); |
2103 | ccol2 = GET_BGCOLOR (rstyle); |
2015 | #else |
2104 | #else |
2016 | ccol2 = Color_bg; |
2105 | ccol2 = Color_bg; |
2017 | #endif |
2106 | #endif |
2018 | *srp = SET_FGCOLOR (*srp, ccol1); |
2107 | *crp = SET_FGCOLOR (*crp, ccol1); |
2019 | *srp = SET_BGCOLOR (*srp, ccol2); |
2108 | *crp = SET_BGCOLOR (*crp, ccol2); |
2020 | #endif |
2109 | #endif |
|
|
2110 | } |
2021 | } |
2111 | } |
2022 | } |
2112 | } |
2023 | |
2113 | |
2024 | /* make sure no outline cursor is left around */ |
2114 | /* make sure no outline cursor is left around */ |
2025 | setoldcursor = 0; |
2115 | setoldcursor = 0; |
… | |
… | |
2051 | oldcursor.col = screen.cur.col; |
2141 | oldcursor.col = screen.cur.col; |
2052 | } |
2142 | } |
2053 | } |
2143 | } |
2054 | } |
2144 | } |
2055 | |
2145 | |
|
|
2146 | #if ENABLE_OVERLAY |
|
|
2147 | scr_swap_overlay (); |
|
|
2148 | #endif |
|
|
2149 | |
|
|
2150 | rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ |
|
|
2151 | text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ |
|
|
2152 | |
2056 | #ifndef NO_SLOW_LINK_SUPPORT |
2153 | #ifndef NO_SLOW_LINK_SUPPORT |
2057 | /* |
2154 | /* |
2058 | * D: CopyArea pass - very useful for slower links |
2155 | * D: CopyArea pass - very useful for slower links |
2059 | * This has been deliberately kept simple. |
2156 | * This has been deliberately kept simple. |
2060 | */ |
2157 | */ |
… | |
… | |
2063 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2160 | && refresh_type == FAST_REFRESH && num_scr_allow && i |
2064 | && abs (i) < TermWin.nrow && !must_clear) |
2161 | && abs (i) < TermWin.nrow && !must_clear) |
2065 | { |
2162 | { |
2066 | int16_t nits; |
2163 | int16_t nits; |
2067 | int j; |
2164 | int j; |
2068 | rend_t *drp2; |
|
|
2069 | text_t *dtp2; |
|
|
2070 | int len, wlen; |
2165 | int len, wlen; |
2071 | |
2166 | |
2072 | j = TermWin.nrow; |
2167 | j = TermWin.nrow; |
2073 | wlen = len = -1; |
2168 | wlen = len = -1; |
2074 | row = i > 0 ? 0 : j - 1; |
2169 | row = i > 0 ? 0 : j - 1; |
2075 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2170 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2076 | { |
2171 | { |
2077 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2172 | if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) |
2078 | { |
2173 | { |
2079 | stp = screen.text[row + row_offset]; |
2174 | text_t *stp = screen.text[row + row_offset]; |
2080 | srp = screen.rend[row + row_offset]; |
2175 | rend_t *srp = screen.rend[row + row_offset]; |
2081 | dtp = drawn_text[row]; |
2176 | text_t *dtp = drawn_text[row]; |
2082 | dtp2 = drawn_text[row + i]; |
2177 | text_t *dtp2 = drawn_text[row + i]; |
2083 | drp = drawn_rend[row]; |
2178 | rend_t *drp = drawn_rend[row]; |
2084 | drp2 = drawn_rend[row + i]; |
2179 | rend_t *drp2 = drawn_rend[row + i]; |
2085 | |
2180 | |
2086 | for (nits = 0, col = TermWin.ncol; col--; ) |
2181 | for (nits = 0, col = TermWin.ncol; col--; ) |
2087 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2182 | if (stp[col] != dtp2[col] || srp[col] != drp2[col]) |
2088 | nits--; |
2183 | nits--; |
2089 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
2184 | else if (stp[col] != dtp[col] || srp[col] != drp[col]) |
… | |
… | |
2109 | { |
2204 | { |
2110 | /* also comes here at end if needed because of >= above */ |
2205 | /* also comes here at end if needed because of >= above */ |
2111 | if (wlen < len) |
2206 | if (wlen < len) |
2112 | SWAP_IT (wlen, len, int); |
2207 | SWAP_IT (wlen, len, int); |
2113 | |
2208 | |
2114 | D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); |
|
|
2115 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2209 | XCopyArea (display->display, TermWin.vt, TermWin.vt, |
2116 | TermWin.gc, 0, Row2Pixel (len + i), |
2210 | TermWin.gc, 0, Row2Pixel (len + i), |
2117 | (unsigned int)TermWin_TotalWidth (), |
2211 | (unsigned int)TermWin_TotalWidth (), |
2118 | (unsigned int)Height2Pixel (wlen - len + 1), |
2212 | (unsigned int)Height2Pixel (wlen - len + 1), |
2119 | 0, Row2Pixel (len)); |
2213 | 0, Row2Pixel (len)); |
… | |
… | |
2126 | /* |
2220 | /* |
2127 | * E: main pass across every character |
2221 | * E: main pass across every character |
2128 | */ |
2222 | */ |
2129 | for (row = 0; row < TermWin.nrow; row++) |
2223 | for (row = 0; row < TermWin.nrow; row++) |
2130 | { |
2224 | { |
2131 | stp = screen.text[row + row_offset]; |
2225 | text_t *stp = screen.text[row + row_offset]; |
2132 | srp = screen.rend[row + row_offset]; |
2226 | rend_t *srp = screen.rend[row + row_offset]; |
2133 | dtp = drawn_text[row]; |
2227 | text_t *dtp = drawn_text[row]; |
2134 | drp = drawn_rend[row]; |
2228 | rend_t *drp = drawn_rend[row]; |
2135 | |
2229 | |
2136 | /* |
2230 | /* |
2137 | * E2: OK, now the real pass |
2231 | * E2: OK, now the real pass |
2138 | */ |
2232 | */ |
2139 | int ypixel = (int)Row2Pixel (row); |
2233 | int ypixel = (int)Row2Pixel (row); |
2140 | |
2234 | |
2141 | for (col = 0; col < TermWin.ncol; col++) |
2235 | for (col = 0; col < TermWin.ncol; col++) |
2142 | { |
2236 | { |
2143 | /* compare new text with old - if exactly the same then continue */ |
2237 | /* compare new text with old - if exactly the same then continue */ |
2144 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2238 | if (stp[col] == dtp[col] /* Must match characters to skip. */ |
2145 | && (srp[col] == drp[col] /* Either rendition the same or */ |
2239 | && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */ |
2146 | || (stp[col] == ' ' /* space w/ no background change */ |
2240 | || (stp[col] == ' ' /* space w/ no background change */ |
2147 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2241 | && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) |
2148 | continue; |
2242 | continue; |
2149 | |
2243 | |
2150 | // redraw one or more characters |
2244 | // redraw one or more characters |
2151 | |
2245 | |
2152 | // seek to the beginning if wide characters |
2246 | // seek to the beginning of wide characters |
2153 | while (stp[col] == NOCHAR && col > 0) |
2247 | while (stp[col] == NOCHAR && col > 0) |
2154 | --col; |
2248 | --col; |
2155 | |
2249 | |
2156 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2250 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2157 | text_t *text = stp + col; |
2251 | text_t *text = stp + col; |
… | |
… | |
2160 | dtp[col] = stp[col]; |
2254 | dtp[col] = stp[col]; |
2161 | drp[col] = rend; |
2255 | drp[col] = rend; |
2162 | |
2256 | |
2163 | int xpixel = Col2Pixel (col); |
2257 | int xpixel = Col2Pixel (col); |
2164 | |
2258 | |
2165 | // this loop looks very messy, it can probably be optimized |
|
|
2166 | // and cleaned a bit by you? |
|
|
2167 | for (i = 0; ++col < TermWin.ncol; ) |
2259 | for (i = 0; ++col < TermWin.ncol; ) |
2168 | { |
2260 | { |
2169 | if (stp[col] == NOCHAR) |
2261 | if (stp[col] == NOCHAR) |
2170 | { |
2262 | { |
2171 | dtp[col] = stp[col]; |
2263 | dtp[col] = stp[col]; |
2172 | drp[col] = rend; |
2264 | drp[col] = rend; |
2173 | count++; |
2265 | count++; |
2174 | |
|
|
2175 | if (i) // only possible skip if char unchanged |
|
|
2176 | i++; |
2266 | i++; |
2177 | |
2267 | |
2178 | continue; |
2268 | continue; |
2179 | } |
2269 | } |
2180 | |
2270 | |
2181 | if (rend != srp[col]) |
2271 | if (!RS_SAME (rend, srp[col])) |
2182 | break; |
2272 | break; |
2183 | |
2273 | |
2184 | count++; |
2274 | count++; |
2185 | |
2275 | |
2186 | if (stp[col] != dtp[col] |
2276 | if (stp[col] != dtp[col] |
2187 | || srp[col] != drp[col]) |
2277 | || !RS_SAME (srp[col], drp[col])) |
2188 | { |
2278 | { |
2189 | if (must_clear && (i++ > (count / 2))) |
2279 | if (must_clear && (i++ > count / 2)) |
2190 | break; |
2280 | break; |
2191 | |
2281 | |
2192 | dtp[col] = stp[col]; |
2282 | dtp[col] = stp[col]; |
2193 | drp[col] = rend; |
2283 | drp[col] = rend; |
2194 | i = 0; |
2284 | i = 0; |
2195 | } |
2285 | } |
2196 | else if (must_clear || (stp[col] != ' ' && ++i >= 32)) |
2286 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2197 | break; |
2287 | break; |
2198 | } |
2288 | } |
2199 | |
2289 | |
2200 | col--; /* went one too far. move back */ |
2290 | col--; /* went one too far. move back */ |
2201 | count -= i; /* dump any matching trailing chars */ |
2291 | count -= i; /* dump any matching trailing chars */ |
|
|
2292 | |
|
|
2293 | // sometimes we optimize away the trailing NOCHAR's, add them back |
|
|
2294 | while (i && text[count] == NOCHAR) |
|
|
2295 | count++, i--; |
|
|
2296 | |
|
|
2297 | #if ENABLE_STYLES |
|
|
2298 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2299 | if (srp[col] & RS_Careful && col < TermWin.ncol - 1 && 0) |
|
|
2300 | drp[col + 1] = ~srp[col + 1]; |
|
|
2301 | |
|
|
2302 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2303 | while (text > stp |
|
|
2304 | && srp[text - stp - 1] & RS_Careful |
|
|
2305 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2306 | text--, count++, xpixel -= TermWin.fwidth; |
|
|
2307 | #endif |
2202 | |
2308 | |
2203 | /* |
2309 | /* |
2204 | * Determine the attributes for the string |
2310 | * Determine the attributes for the string |
2205 | */ |
2311 | */ |
2206 | int fid = GET_FONT (rend); |
|
|
2207 | int fore = GET_FGCOLOR (rend); // desired foreground |
2312 | int fore = GET_FGCOLOR (rend); // desired foreground |
2208 | int back = GET_BGCOLOR (rend); // desired background |
2313 | int back = GET_BGCOLOR (rend); // desired background |
2209 | |
2314 | |
2210 | rend = GET_ATTR (rend); |
2315 | // only do special processing if ana attributes are set, which is rare |
2211 | |
2316 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink)) |
2212 | rvid = !!(rend & RS_RVid); |
2317 | { |
|
|
2318 | bool invert = rend & RS_RVid; |
2213 | |
2319 | |
2214 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2320 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2215 | if (rend & RS_Bold && fore == Color_fg && !(Options & Opt_realBold)) |
2321 | if (rend & RS_Bold |
|
|
2322 | && fore == Color_fg) |
2216 | { |
2323 | { |
2217 | if (ISSET_PIXCOLOR (Color_BD)) |
2324 | if (ISSET_PIXCOLOR (Color_BD)) |
2218 | fore = Color_BD; |
2325 | fore = Color_BD; |
|
|
2326 | # if !ENABLE_STYLES |
2219 | else |
2327 | else |
2220 | rvid = !rvid; |
2328 | invert = !invert; |
|
|
2329 | # endif |
|
|
2330 | } |
|
|
2331 | |
|
|
2332 | if (rend & RS_Italic |
|
|
2333 | && fore == Color_fg) |
|
|
2334 | { |
|
|
2335 | if (ISSET_PIXCOLOR (Color_IT)) |
|
|
2336 | fore = Color_IT; |
|
|
2337 | # if !ENABLE_STYLES |
|
|
2338 | else |
|
|
2339 | invert = !invert; |
|
|
2340 | # endif |
|
|
2341 | } |
|
|
2342 | |
|
|
2343 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
|
|
2344 | fore = Color_UL; |
|
|
2345 | #endif |
|
|
2346 | |
|
|
2347 | if (invert) |
|
|
2348 | { |
|
|
2349 | SWAP_IT (fore, back, int); |
|
|
2350 | |
|
|
2351 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2352 | if (ISSET_PIXCOLOR (Color_RV)) |
|
|
2353 | back = Color_RV; |
|
|
2354 | #endif |
|
|
2355 | } |
|
|
2356 | |
|
|
2357 | #ifdef TEXT_BLINK |
|
|
2358 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
|
|
2359 | { |
|
|
2360 | if (!text_blink_ev.active) |
|
|
2361 | { |
|
|
2362 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
2363 | hidden_text = 0; |
|
|
2364 | } |
|
|
2365 | else if (hidden_text) |
|
|
2366 | fore = back; |
|
|
2367 | } |
|
|
2368 | #endif |
2221 | } |
2369 | } |
2222 | |
|
|
2223 | if (rend & RS_Uline) |
|
|
2224 | if (ISSET_PIXCOLOR (Color_UL)) |
|
|
2225 | fore = Color_UL; |
|
|
2226 | #endif |
|
|
2227 | |
|
|
2228 | if (rvid) |
|
|
2229 | { |
|
|
2230 | SWAP_IT (fore, back, int); |
|
|
2231 | |
|
|
2232 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2233 | if (ISSET_PIXCOLOR (Color_RV) |
|
|
2234 | # ifndef NO_CURSORCOLOR |
|
|
2235 | && !ISSET_PIXCOLOR (Color_cursor) |
|
|
2236 | # endif |
|
|
2237 | ) |
|
|
2238 | back = Color_RV; |
|
|
2239 | #endif |
|
|
2240 | } |
|
|
2241 | |
|
|
2242 | #ifdef TEXT_BLINK |
|
|
2243 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
|
|
2244 | { |
|
|
2245 | if (!text_blink_ev.active) |
|
|
2246 | { |
|
|
2247 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
2248 | hidden_text = 0; |
|
|
2249 | } |
|
|
2250 | else if (hidden_text) |
|
|
2251 | fore = back; |
|
|
2252 | } |
|
|
2253 | #endif |
|
|
2254 | |
2370 | |
2255 | /* |
2371 | /* |
2256 | * Actually do the drawing of the string here |
2372 | * Actually do the drawing of the string here |
2257 | */ |
2373 | */ |
2258 | rxvt_font *font = (*TermWin.fontset)[fid]; |
2374 | rxvt_font *font = (*TermWin.fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2259 | |
2375 | |
2260 | if (back == fore) |
2376 | if (back == fore) |
2261 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2377 | font->clear_rect (*TermWin.drawable, xpixel, ypixel, |
2262 | TermWin.fwidth * count, TermWin.fheight, |
2378 | TermWin.fwidth * count, TermWin.fheight, |
2263 | back); |
2379 | back); |
… | |
… | |
2279 | } |
2395 | } |
2280 | else |
2396 | else |
2281 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2397 | font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); |
2282 | |
2398 | |
2283 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2399 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
|
|
2400 | { |
|
|
2401 | #if ENABLE_FRILLS |
|
|
2402 | if (ISSET_PIXCOLOR (Color_underline)) |
|
|
2403 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_underline]); |
|
|
2404 | else |
|
|
2405 | #endif |
|
|
2406 | XSetForeground (display->display, TermWin.gc, pix_colors[fore]); |
|
|
2407 | |
2284 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2408 | XDrawLine (display->display, drawBuffer, TermWin.gc, |
2285 | xpixel, ypixel + font->ascent + 1, |
2409 | xpixel, ypixel + font->ascent + 1, |
2286 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2410 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
|
|
2411 | } |
2287 | } /* for (col....) */ |
2412 | } /* for (col....) */ |
2288 | } /* for (row....) */ |
2413 | } /* for (row....) */ |
|
|
2414 | |
|
|
2415 | #if ENABLE_OVERLAY |
|
|
2416 | scr_swap_overlay (); |
|
|
2417 | #endif |
2289 | |
2418 | |
2290 | /* |
2419 | /* |
2291 | * G: cleanup cursor and display outline cursor if necessary |
2420 | * G: cleanup cursor and display outline cursor if necessary |
2292 | */ |
2421 | */ |
2293 | if (showcursor) |
2422 | if (showcursor) |
2294 | { |
2423 | { |
2295 | if (TermWin.focus) |
2424 | if (TermWin.focus) |
2296 | { |
2425 | { |
2297 | srp = & (screen.rend[screen.cur.row + TermWin.saveLines] |
2426 | if (options & Opt_cursorUnderline) |
2298 | [screen.cur.col]); |
2427 | *crp ^= RS_Uline; |
|
|
2428 | else |
|
|
2429 | { |
2299 | *srp ^= RS_RVid; |
2430 | *crp ^= RS_RVid; |
2300 | #ifndef NO_CURSORCOLOR |
2431 | #ifndef NO_CURSORCOLOR |
2301 | *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2432 | *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1; |
2302 | #endif |
2433 | #endif |
|
|
2434 | } |
2303 | } |
2435 | } |
2304 | else if (oldcursor.row >= 0) |
2436 | else if (oldcursor.row >= 0) |
2305 | { |
2437 | { |
|
|
2438 | int cursorwidth = 1; |
|
|
2439 | int col = oldcursor.col; |
|
|
2440 | |
|
|
2441 | while (col && screen.text[screen.cur.row + TermWin.saveLines][col] == NOCHAR) |
|
|
2442 | col--; |
|
|
2443 | |
|
|
2444 | while (col + cursorwidth < TermWin.ncol |
|
|
2445 | && drawn_text[oldcursor.row][col + cursorwidth] == NOCHAR) |
|
|
2446 | cursorwidth++; |
|
|
2447 | |
2306 | #ifndef NO_CURSORCOLOR |
2448 | #ifndef NO_CURSORCOLOR |
2307 | if (ISSET_PIXCOLOR (Color_cursor)) |
2449 | if (ISSET_PIXCOLOR (Color_cursor)) |
2308 | XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); |
2450 | XSetForeground (display->display, TermWin.gc, pix_colors[Color_cursor]); |
2309 | #endif |
2451 | #endif |
2310 | int cursorwidth = 1; |
|
|
2311 | while (oldcursor.col + cursorwidth < TermWin.ncol |
|
|
2312 | && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR) |
|
|
2313 | cursorwidth++; |
|
|
2314 | |
2452 | |
2315 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2453 | XDrawRectangle (display->display, drawBuffer, TermWin.gc, |
2316 | Col2Pixel (oldcursor.col), |
2454 | Col2Pixel (col), |
2317 | Row2Pixel (oldcursor.row), |
2455 | Row2Pixel (oldcursor.row), |
2318 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2456 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2319 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2457 | (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); |
2320 | } |
2458 | } |
2321 | } |
2459 | } |
… | |
… | |
2328 | if (refresh_type & SMOOTH_REFRESH) |
2466 | if (refresh_type & SMOOTH_REFRESH) |
2329 | XFlush (display->display); |
2467 | XFlush (display->display); |
2330 | |
2468 | |
2331 | num_scr = 0; |
2469 | num_scr = 0; |
2332 | num_scr_allow = 1; |
2470 | num_scr_allow = 1; |
2333 | want_refresh = 0; /* screen is current */ |
|
|
2334 | } |
2471 | } |
2335 | |
2472 | |
2336 | void |
2473 | void |
2337 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2474 | rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) |
2338 | { |
2475 | { |
2339 | if (!rp || !tp) |
2476 | if (!rp || !tp) |
2340 | return; |
2477 | return; |
2341 | |
2478 | |
2342 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2479 | for (int i = TermWin.ncol; i; i--, rp++, tp++) |
2343 | *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp)); |
2480 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
2344 | } |
2481 | } |
2345 | |
2482 | |
2346 | void |
2483 | void |
2347 | rxvt_term::scr_remap_chars () |
2484 | rxvt_term::scr_remap_chars () |
2348 | { |
2485 | { |
… | |
… | |
2354 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2491 | scr_remap_chars (drawn_text[i], drawn_rend[i]); |
2355 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2492 | scr_remap_chars (swap.text[i], swap.rend[i]); |
2356 | } |
2493 | } |
2357 | } |
2494 | } |
2358 | |
2495 | |
|
|
2496 | void |
|
|
2497 | rxvt_term::scr_recolour () |
|
|
2498 | { |
|
|
2499 | if (1 |
|
|
2500 | #if TRANSPARENT |
|
|
2501 | && !am_transparent |
|
|
2502 | #endif |
|
|
2503 | #if XPM_BACKGROUND |
|
|
2504 | && !bgPixmap.pixmap |
|
|
2505 | #endif |
|
|
2506 | ) |
|
|
2507 | { |
|
|
2508 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors[Color_border]); |
|
|
2509 | XClearWindow (display->display, TermWin.parent[0]); |
|
|
2510 | XSetWindowBackground (display->display, TermWin.vt, pix_colors[Color_bg]); |
|
|
2511 | #if HAVE_SCROLLBARS |
|
|
2512 | if (scrollBar.win) |
|
|
2513 | { |
|
|
2514 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
|
|
2515 | scrollBar.setIdle (); |
|
|
2516 | scrollbar_show (0); |
|
|
2517 | } |
|
|
2518 | #endif |
|
|
2519 | } |
|
|
2520 | |
|
|
2521 | scr_clear (); |
|
|
2522 | scr_touch (true); |
|
|
2523 | want_refresh = 1; |
|
|
2524 | } |
|
|
2525 | |
2359 | /* ------------------------------------------------------------------------- */ |
2526 | /* ------------------------------------------------------------------------- */ |
2360 | void |
2527 | void |
2361 | rxvt_term::scr_clear (bool really) |
2528 | rxvt_term::scr_clear (bool really) |
2362 | { |
2529 | { |
2363 | if (!TermWin.mapped) |
2530 | if (!TermWin.mapped) |
2364 | return; |
2531 | return; |
2365 | |
2532 | |
2366 | num_scr_allow = 0; |
2533 | num_scr_allow = 0; |
2367 | want_refresh = 1; |
2534 | want_refresh = 1; |
2368 | |
2535 | |
2369 | #ifdef TRANSPARENT |
2536 | #if TRANSPARENT |
2370 | if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) |
2537 | if ((options & Opt_transparent) && (am_pixmap_trans == 0)) |
2371 | { |
2538 | { |
2372 | int i; |
2539 | int i; |
2373 | |
2540 | |
2374 | if (! (Options & Opt_transparent_all)) |
2541 | if (!(options & Opt_transparent_all)) |
2375 | i = 0; |
2542 | i = 0; |
2376 | else |
2543 | else |
2377 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2544 | i = (int) (sizeof (TermWin.parent) / sizeof (Window)); |
2378 | |
2545 | |
2379 | while (i--) |
2546 | while (i--) |
… | |
… | |
2395 | int end_row = TermWin.saveLines - TermWin.view_start; |
2562 | int end_row = TermWin.saveLines - TermWin.view_start; |
2396 | int i = selection.beg.row + TermWin.saveLines; |
2563 | int i = selection.beg.row + TermWin.saveLines; |
2397 | int col, row = selection.end.row + TermWin.saveLines; |
2564 | int col, row = selection.end.row + TermWin.saveLines; |
2398 | rend_t *srp; |
2565 | rend_t *srp; |
2399 | |
2566 | |
2400 | if (i >= end_row) |
2567 | #if ENABLE_FRILLS |
2401 | col = selection.beg.col; |
2568 | if (selection.rect) |
|
|
2569 | { |
|
|
2570 | end_row += TermWin.nrow; |
|
|
2571 | |
|
|
2572 | for (; i <= row && i <= end_row; i++) |
|
|
2573 | for (srp = screen.rend[i], col = selection.beg.col; col < selection.end.col; col++) |
|
|
2574 | srp[col] ^= RS_RVid; |
|
|
2575 | } |
2402 | else |
2576 | else |
|
|
2577 | #endif |
|
|
2578 | { |
|
|
2579 | if (i >= end_row) |
|
|
2580 | col = selection.beg.col; |
|
|
2581 | else |
2403 | { |
2582 | { |
2404 | col = 0; |
2583 | col = 0; |
2405 | i = end_row; |
2584 | i = end_row; |
2406 | } |
2585 | } |
2407 | |
2586 | |
2408 | end_row += TermWin.nrow; |
2587 | end_row += TermWin.nrow; |
|
|
2588 | |
2409 | for (; i < row && i < end_row; i++, col = 0) |
2589 | for (; i < row && i < end_row; i++, col = 0) |
2410 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2590 | for (srp = screen.rend[i]; col < TermWin.ncol; col++) |
2411 | srp[col] ^= RS_RVid; |
2591 | srp[col] ^= RS_RVid; |
2412 | |
2592 | |
2413 | if (i == row && i < end_row) |
2593 | if (i == row && i < end_row) |
2414 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2594 | for (srp = screen.rend[i]; col < selection.end.col; col++) |
2415 | srp[col] ^= RS_RVid; |
2595 | srp[col] ^= RS_RVid; |
|
|
2596 | } |
2416 | } |
2597 | } |
2417 | } |
2598 | } |
2418 | |
2599 | |
2419 | /* ------------------------------------------------------------------------- */ |
2600 | /* ------------------------------------------------------------------------- */ |
2420 | /* |
2601 | /* |
… | |
… | |
2456 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2637 | * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1 |
2457 | */ |
2638 | */ |
2458 | void |
2639 | void |
2459 | rxvt_term::selection_check (int check_more) |
2640 | rxvt_term::selection_check (int check_more) |
2460 | { |
2641 | { |
2461 | row_col_t pos; |
2642 | row_col_t pos; |
2462 | |
2643 | |
2463 | if (!selection.op) |
2644 | if (!selection.op) |
2464 | return; |
2645 | return; |
2465 | |
2646 | |
2466 | pos.row = pos.col = 0; |
2647 | pos.row = pos.col = 0; |
… | |
… | |
2488 | /* ------------------------------------------------------------------------- */ |
2669 | /* ------------------------------------------------------------------------- */ |
2489 | /* |
2670 | /* |
2490 | * Paste a selection direct to the command fd |
2671 | * Paste a selection direct to the command fd |
2491 | */ |
2672 | */ |
2492 | void |
2673 | void |
2493 | rxvt_term::paste (const unsigned char *data, unsigned int len) |
2674 | rxvt_term::paste (unsigned char *data, unsigned int len) |
2494 | { |
2675 | { |
2495 | unsigned int i, j, n; |
|
|
2496 | unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE); |
|
|
2497 | |
|
|
2498 | #if 0 |
|
|
2499 | /* a paste should act like the user is typing, so check scrollTtyKeypress */ |
|
|
2500 | ZERO_SCROLLBACK (r); |
|
|
2501 | #endif |
|
|
2502 | |
|
|
2503 | /* convert normal newline chars into common keyboard Return key sequence */ |
2676 | /* convert normal newline chars into common keyboard Return key sequence */ |
2504 | for (i = 0; i < len; i += PROP_SIZE) |
2677 | for (unsigned int i = 0; i < len; i++) |
2505 | { |
|
|
2506 | n = min (len - i, PROP_SIZE); |
|
|
2507 | MEMCPY (ds, data + i, n); |
|
|
2508 | |
|
|
2509 | for (j = 0; j < n; j++) |
|
|
2510 | if (ds[j] == C0_LF) |
2678 | if (data[i] == C0_LF) |
2511 | ds[j] = C0_CR; |
2679 | data[i] = C0_CR; |
2512 | |
2680 | |
2513 | tt_write (ds, (int)n); |
2681 | tt_write (data, len); |
2514 | } |
|
|
2515 | |
|
|
2516 | free (ds); |
|
|
2517 | } |
2682 | } |
2518 | |
2683 | |
2519 | /* ------------------------------------------------------------------------- */ |
2684 | /* ------------------------------------------------------------------------- */ |
2520 | /* |
2685 | /* |
2521 | * Respond to a notification that a primary selection has been sent |
2686 | * Respond to a notification that a primary selection has been sent |
2522 | * EXT: SelectionNotify |
2687 | * EXT: SelectionNotify |
2523 | */ |
2688 | */ |
2524 | int |
2689 | void |
2525 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2690 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2526 | { |
2691 | { |
2527 | long nread = 0; |
|
|
2528 | unsigned long bytes_after; |
|
|
2529 | XTextProperty ct; |
|
|
2530 | |
|
|
2531 | D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait)); |
|
|
2532 | |
|
|
2533 | if (prop == None) /* check for failed XConvertSelection */ |
2692 | if (prop == None) /* check for failed XConvertSelection */ |
2534 | { |
2693 | { |
2535 | if ((selection_type & Sel_CompoundText)) |
2694 | if ((selection_type & Sel_CompoundText)) |
2536 | { |
2695 | { |
2537 | int selnum = selection_type & Sel_whereMask; |
2696 | int selnum = selection_type & Sel_whereMask; |
… | |
… | |
2550 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2709 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
2551 | else |
2710 | else |
2552 | selection_type = 0; |
2711 | selection_type = 0; |
2553 | } |
2712 | } |
2554 | |
2713 | |
2555 | return 0; |
2714 | return; |
2556 | } |
|
|
2557 | |
|
|
2558 | for (;;) |
|
|
2559 | { |
2715 | } |
|
|
2716 | |
|
|
2717 | unsigned long bytes_after; |
|
|
2718 | XTextProperty ct; |
|
|
2719 | |
|
|
2720 | if (XGetWindowProperty (display->display, win, prop, |
|
|
2721 | 0, PROP_SIZE / 4, |
|
|
2722 | delete_prop, AnyPropertyType, |
|
|
2723 | &ct.encoding, &ct.format, |
|
|
2724 | &ct.nitems, &bytes_after, |
|
|
2725 | &ct.value) != Success) |
|
|
2726 | { |
|
|
2727 | ct.value = 0; |
|
|
2728 | goto bailout; |
|
|
2729 | } |
|
|
2730 | |
|
|
2731 | if (ct.encoding == None) |
|
|
2732 | goto bailout; |
|
|
2733 | |
|
|
2734 | if (bytes_after) |
|
|
2735 | { |
|
|
2736 | // fetch and append remaining data |
|
|
2737 | XTextProperty ct2; |
|
|
2738 | |
2560 | if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), |
2739 | if (XGetWindowProperty (display->display, win, prop, |
2561 | (long) (PROP_SIZE / 4), delete_prop, |
2740 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2741 | delete_prop, AnyPropertyType, |
2562 | AnyPropertyType, &ct.encoding, &ct.format, |
2742 | &ct2.encoding, &ct2.format, |
2563 | &ct.nitems, &bytes_after, |
2743 | &ct2.nitems, &bytes_after, |
2564 | &ct.value) != Success) |
2744 | &ct2.value) != Success) |
2565 | break; |
2745 | goto bailout; |
2566 | |
2746 | |
2567 | if (ct.encoding == 0) |
2747 | // realloc should be compatible to XFree, here, and elsewhere, too |
2568 | { |
2748 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
2569 | D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); |
2749 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
2570 | break; |
2750 | ct.nitems += ct2.nitems; |
2571 | } |
2751 | |
|
|
2752 | XFree (ct2.value); |
|
|
2753 | } |
|
|
2754 | |
|
|
2755 | if (ct.value == 0) |
|
|
2756 | goto bailout; |
|
|
2757 | |
2572 | else if (ct.encoding == xa[XA_INCR]) |
2758 | if (ct.encoding == xa[XA_INCR]) |
2573 | { |
2759 | { |
2574 | // INCR selection, start handshake |
2760 | // INCR selection, start handshake |
|
|
2761 | if (!delete_prop) |
2575 | XDeleteProperty (display->display, win, prop); |
2762 | XDeleteProperty (display->display, win, prop); |
|
|
2763 | |
2576 | selection_wait = Sel_incr; |
2764 | selection_wait = Sel_incr; |
|
|
2765 | incr_buf_fill = 0; |
2577 | incr_ev.start (NOW + 10); |
2766 | incr_ev.start (NOW + 10); |
2578 | break; |
|
|
2579 | } |
|
|
2580 | |
2767 | |
2581 | if (ct.value == NULL) |
2768 | goto bailout; |
2582 | { |
2769 | } |
2583 | D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!")); |
|
|
2584 | continue; |
|
|
2585 | } |
|
|
2586 | |
2770 | |
2587 | if (ct.nitems == 0) |
2771 | if (ct.nitems == 0) |
|
|
2772 | { |
|
|
2773 | if (selection_wait == Sel_incr) |
|
|
2774 | { |
|
|
2775 | XFree (ct.value); |
|
|
2776 | |
|
|
2777 | // finally complete, now paste the whole thing |
|
|
2778 | selection_wait = Sel_normal; |
|
|
2779 | ct.value = (unsigned char *)incr_buf; |
|
|
2780 | ct.nitems = incr_buf_fill; |
|
|
2781 | incr_buf = 0; |
|
|
2782 | incr_buf_size = 0; |
|
|
2783 | incr_ev.stop (); |
2588 | { |
2784 | } |
2589 | D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); |
2785 | else |
2590 | |
2786 | { |
2591 | if (selection_wait == Sel_normal && nread == 0 |
2787 | if (selection_wait == Sel_normal |
2592 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2788 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2593 | { |
2789 | { |
2594 | /* |
2790 | /* |
2595 | * pass through again trying CUT_BUFFER0 if we've come from |
2791 | * pass through again trying CUT_BUFFER0 if we've come from |
2596 | * XConvertSelection () but nothing was presented |
2792 | * XConvertSelection () but nothing was presented |
2597 | */ |
2793 | */ |
2598 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2599 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2794 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2600 | } |
2795 | } |
2601 | |
2796 | |
2602 | nread = -1; /* discount any previous stuff */ |
2797 | goto bailout; |
2603 | break; |
2798 | } |
|
|
2799 | } |
|
|
2800 | else if (selection_wait == Sel_incr) |
|
|
2801 | { |
|
|
2802 | incr_ev.start (NOW + 10); |
|
|
2803 | |
|
|
2804 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2604 | } |
2805 | { |
|
|
2806 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2807 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2808 | } |
2605 | |
2809 | |
|
|
2810 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
2606 | nread += ct.nitems; |
2811 | incr_buf_fill += ct.nitems; |
2607 | |
2812 | |
|
|
2813 | goto bailout; |
|
|
2814 | } |
|
|
2815 | |
2608 | char **cl; |
2816 | char **cl; |
2609 | int cr; |
2817 | int cr; |
|
|
2818 | |
|
|
2819 | #if ENABLE_FRILLS |
|
|
2820 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2821 | // so recode it manually |
|
|
2822 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2823 | { |
|
|
2824 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2825 | char *s = rxvt_wcstombs (w); |
|
|
2826 | free (w); |
|
|
2827 | // TODO: strlen == only the first element will be converted. well... |
|
|
2828 | paste ((unsigned char *)s, strlen (s)); |
|
|
2829 | free (s); |
|
|
2830 | } |
|
|
2831 | else |
|
|
2832 | #endif |
2610 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 && cl) |
2833 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2611 | { |
2834 | && cl) |
|
|
2835 | { |
2612 | for (int i = 0; i < cr; i++) |
2836 | for (int i = 0; i < cr; i++) |
2613 | paste ((unsigned char *)cl[i], STRLEN (cl[i])); |
2837 | paste ((unsigned char *)cl[i], strlen (cl[i])); |
2614 | |
2838 | |
2615 | XFreeStringList (cl); |
2839 | XFreeStringList (cl); |
2616 | } |
2840 | } |
2617 | else |
2841 | else |
2618 | paste (ct.value, ct.nitems); |
2842 | paste (ct.value, ct.nitems); // paste raw |
2619 | |
2843 | |
2620 | if (bytes_after == 0) |
2844 | bailout: |
2621 | break; |
|
|
2622 | |
|
|
2623 | XFree (ct.value); |
|
|
2624 | } |
|
|
2625 | |
|
|
2626 | if (ct.value) |
|
|
2627 | XFree (ct.value); |
2845 | XFree (ct.value); |
2628 | |
2846 | |
2629 | if (selection_wait == Sel_normal) |
2847 | if (selection_wait == Sel_normal) |
2630 | selection_wait = Sel_none; |
2848 | selection_wait = Sel_none; |
2631 | |
|
|
2632 | D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread)); |
|
|
2633 | return (int)nread; |
|
|
2634 | } |
2849 | } |
2635 | |
2850 | |
2636 | void |
2851 | void |
2637 | rxvt_term::incr_cb (time_watcher &w) |
2852 | rxvt_term::incr_cb (time_watcher &w) |
2638 | { |
2853 | { |
2639 | selection_wait = Sel_none; |
2854 | selection_wait = Sel_none; |
2640 | |
2855 | |
|
|
2856 | incr_buf_size = 0; |
|
|
2857 | free (incr_buf); |
|
|
2858 | |
2641 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2859 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2642 | } |
2860 | } |
2643 | |
2861 | |
2644 | /* |
|
|
2645 | * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za> |
|
|
2646 | */ |
|
|
2647 | void |
2862 | void |
2648 | rxvt_term::selection_property (Window win, Atom prop) |
2863 | rxvt_term::selection_property (Window win, Atom prop) |
2649 | { |
2864 | { |
2650 | if (prop == None || selection_wait != Sel_incr) |
2865 | if (prop == None || selection_wait != Sel_incr) |
2651 | return; |
2866 | return; |
2652 | |
2867 | |
2653 | if (selection_paste (win, prop, 1) > 0) |
2868 | selection_paste (win, prop, true); |
2654 | incr_ev.start (NOW + 10); |
|
|
2655 | else |
|
|
2656 | { |
|
|
2657 | selection_wait = Sel_none; |
|
|
2658 | incr_ev.stop (); |
|
|
2659 | } |
|
|
2660 | } |
2869 | } |
2661 | |
2870 | |
2662 | /* ------------------------------------------------------------------------- */ |
2871 | /* ------------------------------------------------------------------------- */ |
2663 | /* |
2872 | /* |
2664 | * Request the current selection: |
2873 | * Request the current selection: |
… | |
… | |
2670 | * EXT: button 2 release |
2879 | * EXT: button 2 release |
2671 | */ |
2880 | */ |
2672 | void |
2881 | void |
2673 | rxvt_term::selection_request (Time tm, int x, int y) |
2882 | rxvt_term::selection_request (Time tm, int x, int y) |
2674 | { |
2883 | { |
2675 | D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); |
|
|
2676 | |
|
|
2677 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2884 | if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) |
2678 | return; /* outside window */ |
2885 | return; /* outside window */ |
2679 | |
2886 | |
2680 | if (selection.text) |
2887 | if (selection.text) |
2681 | { /* internal selection */ |
2888 | { /* internal selection */ |
2682 | D_SELECT ((stderr, "rxvt_selection_request: pasting internal")); |
|
|
2683 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2889 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2684 | paste ((unsigned char *)str, strlen (str)); |
2890 | paste ((unsigned char *)str, strlen (str)); |
2685 | free (str); |
2891 | free (str); |
2686 | return; |
2892 | return; |
2687 | } |
2893 | } |
… | |
… | |
2701 | #else |
2907 | #else |
2702 | selection_type = Sel_CompoundText; |
2908 | selection_type = Sel_CompoundText; |
2703 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2909 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2704 | return; |
2910 | return; |
2705 | #endif |
2911 | #endif |
2706 | |
|
|
2707 | } |
2912 | } |
2708 | } |
2913 | } |
2709 | |
2914 | |
2710 | selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ |
2915 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2711 | D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); |
|
|
2712 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
2916 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2713 | } |
2917 | } |
2714 | |
2918 | |
2715 | int |
2919 | int |
2716 | rxvt_term::selection_request_other (Atom target, int selnum) |
2920 | rxvt_term::selection_request_other (Atom target, int selnum) |
2717 | { |
2921 | { |
2718 | Atom sel; |
2922 | Atom sel; |
2719 | #ifdef DEBUG_SELECT |
|
|
2720 | char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" }; |
|
|
2721 | #endif |
|
|
2722 | |
2923 | |
2723 | selection_type |= selnum; |
2924 | selection_type |= selnum; |
2724 | |
2925 | |
2725 | if (selnum == Sel_Primary) |
2926 | if (selnum == Sel_Primary) |
2726 | sel = XA_PRIMARY; |
2927 | sel = XA_PRIMARY; |
… | |
… | |
2729 | else |
2930 | else |
2730 | sel = xa[XA_CLIPBOARD]; |
2931 | sel = xa[XA_CLIPBOARD]; |
2731 | |
2932 | |
2732 | if (XGetSelectionOwner (display->display, sel) != None) |
2933 | if (XGetSelectionOwner (display->display, sel) != None) |
2733 | { |
2934 | { |
2734 | D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum])); |
|
|
2735 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2935 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2736 | TermWin.vt, selection_request_time); |
2936 | TermWin.vt, selection_request_time); |
2737 | return 1; |
2937 | return 1; |
2738 | } |
2938 | } |
2739 | |
2939 | |
… | |
… | |
2746 | * EXT: SelectionClear |
2946 | * EXT: SelectionClear |
2747 | */ |
2947 | */ |
2748 | void |
2948 | void |
2749 | rxvt_term::selection_clear () |
2949 | rxvt_term::selection_clear () |
2750 | { |
2950 | { |
2751 | D_SELECT ((stderr, "rxvt_selection_clear ()")); |
|
|
2752 | |
|
|
2753 | want_refresh = 1; |
2951 | want_refresh = 1; |
2754 | free (selection.text); |
2952 | free (selection.text); |
2755 | selection.text = NULL; |
2953 | selection.text = NULL; |
2756 | selection.len = 0; |
2954 | selection.len = 0; |
2757 | CLEAR_SELECTION (); |
2955 | CLEAR_SELECTION (); |
… | |
… | |
2770 | { |
2968 | { |
2771 | int i, col, end_col, row, end_row; |
2969 | int i, col, end_col, row, end_row; |
2772 | wchar_t *new_selection_text; |
2970 | wchar_t *new_selection_text; |
2773 | text_t *t; |
2971 | text_t *t; |
2774 | |
2972 | |
2775 | D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks)); |
|
|
2776 | switch (selection.op) |
2973 | switch (selection.op) |
2777 | { |
2974 | { |
2778 | case SELECTION_CONT: |
2975 | case SELECTION_CONT: |
2779 | break; |
2976 | break; |
2780 | case SELECTION_INIT: |
2977 | case SELECTION_INIT: |
… | |
… | |
2794 | |
2991 | |
2795 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2992 | i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); |
2796 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2993 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2797 | |
2994 | |
2798 | col = selection.beg.col; |
2995 | col = selection.beg.col; |
2799 | MAX_IT (col, 0); |
|
|
2800 | row = selection.beg.row + TermWin.saveLines; |
2996 | row = selection.beg.row + TermWin.saveLines; |
2801 | end_row = selection.end.row + TermWin.saveLines; |
2997 | end_row = selection.end.row + TermWin.saveLines; |
2802 | int ofs = 0; |
2998 | int ofs = 0; |
2803 | int extra = 0; |
2999 | int extra = 0; |
2804 | |
3000 | |
2805 | for (; row <= end_row; row++, col = 0) |
3001 | for (; row <= end_row; row++, col = 0) |
2806 | { |
3002 | { |
2807 | t = &(screen.text[row][col]); |
|
|
2808 | |
|
|
2809 | end_col = screen.tlen[row]; |
3003 | end_col = screen.tlen[row]; |
|
|
3004 | |
|
|
3005 | #if ENABLE_FRILLS |
|
|
3006 | if (selection.rect) |
|
|
3007 | { |
|
|
3008 | col = selection.beg.col; |
|
|
3009 | end_col = TermWin.ncol + 1; |
|
|
3010 | } |
|
|
3011 | #endif |
|
|
3012 | |
|
|
3013 | MAX_IT (col, 0); |
2810 | |
3014 | |
2811 | if (end_col == -1) |
3015 | if (end_col == -1) |
2812 | end_col = TermWin.ncol; |
3016 | end_col = TermWin.ncol; |
2813 | |
3017 | |
2814 | if (row == end_row) |
3018 | if (row == end_row || selection.rect) |
2815 | MIN_IT (end_col, selection.end.col); |
3019 | MIN_IT (end_col, selection.end.col); |
2816 | |
3020 | |
|
|
3021 | t = &screen.text[row][col]; |
2817 | for (; col < end_col; col++) |
3022 | for (; col < end_col; col++) |
2818 | { |
3023 | { |
2819 | if (*t == NOCHAR) |
3024 | if (*t == NOCHAR) |
2820 | t++; |
3025 | t++; |
2821 | #if ENABLE_COMBINING |
3026 | #if ENABLE_COMBINING |
… | |
… | |
2869 | #if 0 |
3074 | #if 0 |
2870 | XTextProperty ct; |
3075 | XTextProperty ct; |
2871 | |
3076 | |
2872 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3077 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
2873 | { |
3078 | { |
2874 | XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, |
3079 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
2875 | PropModeReplace, ct.value, ct.nitems); |
|
|
2876 | XFree (ct.value); |
3080 | XFree (ct.value); |
2877 | } |
3081 | } |
2878 | #endif |
3082 | #endif |
2879 | |
3083 | |
2880 | selection_time = tm; |
3084 | selection_time = tm; |
2881 | D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len)); |
|
|
2882 | } |
3085 | } |
2883 | |
3086 | |
2884 | /* ------------------------------------------------------------------------- */ |
3087 | /* ------------------------------------------------------------------------- */ |
2885 | /* |
3088 | /* |
2886 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3089 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2887 | * EXT: button 1 press |
3090 | * EXT: button 1 press |
2888 | */ |
3091 | */ |
2889 | void |
3092 | void |
2890 | rxvt_term::selection_click (int clicks, int x, int y) |
3093 | rxvt_term::selection_click (int clicks, int x, int y) |
2891 | { |
3094 | { |
2892 | D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y)); |
|
|
2893 | |
|
|
2894 | clicks = ((clicks - 1) % 3) + 1; |
3095 | clicks = ((clicks - 1) % 3) + 1; |
2895 | selection.clicks = clicks; /* save clicks so extend will work */ |
3096 | selection.clicks = clicks; /* save clicks so extend will work */ |
2896 | |
3097 | |
2897 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3098 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
2898 | |
3099 | |
… | |
… | |
2940 | * We now only find out the boundary in one direction |
3141 | * We now only find out the boundary in one direction |
2941 | */ |
3142 | */ |
2942 | |
3143 | |
2943 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3144 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
2944 | #define DELIMIT_TEXT(x) \ |
3145 | #define DELIMIT_TEXT(x) \ |
2945 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!STRCHR (rs[Rs_cutchars], (x))) |
3146 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
2946 | #define DELIMIT_REND(x) 1 |
3147 | #define DELIMIT_REND(x) 1 |
2947 | |
3148 | |
2948 | void |
3149 | void |
2949 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3150 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
2950 | { |
3151 | { |
… | |
… | |
2968 | |
3169 | |
2969 | row = mark->row + TermWin.saveLines; |
3170 | row = mark->row + TermWin.saveLines; |
2970 | col = mark->col; |
3171 | col = mark->col; |
2971 | MAX_IT (col, 0); |
3172 | MAX_IT (col, 0); |
2972 | /* find the edge of a word */ |
3173 | /* find the edge of a word */ |
2973 | stp = & (screen.text[row][col]); |
3174 | stp = &screen.text[row][col]; |
2974 | w1 = DELIMIT_TEXT (*stp); |
3175 | w1 = DELIMIT_TEXT (*stp); |
2975 | |
3176 | |
2976 | srp = (&screen.rend[row][col]); |
3177 | srp = &screen.rend[row][col]; |
2977 | w2 = DELIMIT_REND (*srp); |
3178 | w2 = DELIMIT_REND (*srp); |
2978 | |
3179 | |
2979 | for (;;) |
3180 | for (;;) |
2980 | { |
3181 | { |
2981 | for (; col != bound.col; col += dirnadd) |
3182 | for (; col != bound.col; col += dirnadd) |
… | |
… | |
3015 | } |
3216 | } |
3016 | break; |
3217 | break; |
3017 | } |
3218 | } |
3018 | |
3219 | |
3019 | Old_Word_Selection_You_Die: |
3220 | Old_Word_Selection_You_Die: |
3020 | D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col)); |
|
|
3021 | |
|
|
3022 | if (dirn == DN) |
3221 | if (dirn == DN) |
3023 | col++; /* put us on one past the end */ |
3222 | col++; /* put us on one past the end */ |
3024 | |
3223 | |
3025 | /* Poke the values back in */ |
3224 | /* Poke the values back in */ |
3026 | ret->row = row - TermWin.saveLines; |
3225 | ret->row = row - TermWin.saveLines; |
… | |
… | |
3060 | /* select nothing */ |
3259 | /* select nothing */ |
3061 | selection.beg.row = selection.end.row = 0; |
3260 | selection.beg.row = selection.end.row = 0; |
3062 | selection.beg.col = selection.end.col = 0; |
3261 | selection.beg.col = selection.end.col = 0; |
3063 | selection.clicks = 4; |
3262 | selection.clicks = 4; |
3064 | want_refresh = 1; |
3263 | want_refresh = 1; |
3065 | D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4")); |
|
|
3066 | return; |
3264 | return; |
3067 | } |
3265 | } |
3068 | |
3266 | |
3069 | if (selection.clicks == 4) |
3267 | if (selection.clicks == 4) |
3070 | selection.clicks = 1; |
3268 | selection.clicks = 1; |
… | |
… | |
3086 | row_col_t pos; |
3284 | row_col_t pos; |
3087 | enum { |
3285 | enum { |
3088 | LEFT, RIGHT |
3286 | LEFT, RIGHT |
3089 | } closeto = RIGHT; |
3287 | } closeto = RIGHT; |
3090 | |
3288 | |
3091 | D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op)); |
|
|
3092 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3093 | |
|
|
3094 | want_refresh = 1; |
3289 | want_refresh = 1; |
|
|
3290 | |
3095 | switch (selection.op) |
3291 | switch (selection.op) |
3096 | { |
3292 | { |
3097 | case SELECTION_INIT: |
3293 | case SELECTION_INIT: |
3098 | CLEAR_SELECTION (); |
3294 | CLEAR_SELECTION (); |
3099 | selection.op = SELECTION_BEGIN; |
3295 | selection.op = SELECTION_BEGIN; |
… | |
… | |
3112 | selection_start_colrow (col, row); |
3308 | selection_start_colrow (col, row); |
3113 | /* FALLTHROUGH */ |
3309 | /* FALLTHROUGH */ |
3114 | default: |
3310 | default: |
3115 | return; |
3311 | return; |
3116 | } |
3312 | } |
|
|
3313 | |
3117 | if (selection.beg.col == selection.end.col |
3314 | if (selection.beg.col == selection.end.col |
3118 | && selection.beg.col != selection.mark.col |
3315 | && selection.beg.col != selection.mark.col |
3119 | && selection.beg.row == selection.end.row |
3316 | && selection.beg.row == selection.end.row |
3120 | && selection.beg.row != selection.mark.row) |
3317 | && selection.beg.row != selection.mark.row) |
3121 | { |
3318 | { |
3122 | selection.beg.col = selection.end.col = selection.mark.col; |
3319 | selection.beg.col = selection.end.col = selection.mark.col; |
3123 | selection.beg.row = selection.end.row = selection.mark.row; |
3320 | selection.beg.row = selection.end.row = selection.mark.row; |
3124 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3125 | } |
3321 | } |
3126 | |
3322 | |
3127 | pos.col = col; |
3323 | pos.col = col; |
3128 | pos.row = row; |
3324 | pos.row = row; |
3129 | |
3325 | |
… | |
… | |
3172 | } |
3368 | } |
3173 | else |
3369 | else |
3174 | { /* button1 drag or button3 drag */ |
3370 | { /* button1 drag or button3 drag */ |
3175 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3371 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3176 | { |
3372 | { |
3177 | if ((selection.mark.row == selection.end.row) |
3373 | if (selection.mark.row == selection.end.row |
3178 | && (selection.mark.col == selection.end.col) |
3374 | && selection.mark.col == selection.end.col |
|
|
3375 | && clickchange |
3179 | && clickchange && selection.clicks == 2) |
3376 | && selection.clicks == 2) |
3180 | selection.mark.col--; |
3377 | selection.mark.col--; |
3181 | |
3378 | |
3182 | selection.beg.row = pos.row; |
3379 | selection.beg.row = pos.row; |
3183 | selection.beg.col = pos.col; |
3380 | selection.beg.col = pos.col; |
3184 | selection.end.row = selection.mark.row; |
3381 | selection.end.row = selection.mark.row; |
… | |
… | |
3195 | |
3392 | |
3196 | if (selection.clicks == 1) |
3393 | if (selection.clicks == 1) |
3197 | { |
3394 | { |
3198 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3395 | end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; |
3199 | |
3396 | |
3200 | if (end_col != -1 && selection.beg.col > end_col) |
3397 | if (selection.beg.col > end_col |
|
|
3398 | && end_col != -1 |
|
|
3399 | #if ENABLE_FRILLS |
|
|
3400 | && !selection.rect |
|
|
3401 | #endif |
3201 | { |
3402 | ) |
3202 | #if 1 |
|
|
3203 | selection.beg.col = ncol; |
3403 | selection.beg.col = ncol; |
3204 | #else |
|
|
3205 | if (selection.beg.row != selection.end.row) |
|
|
3206 | selection.beg.col = ncol; |
|
|
3207 | else |
|
|
3208 | selection.beg.col = selection.mark.col; |
|
|
3209 | #endif |
|
|
3210 | } |
|
|
3211 | |
3404 | |
3212 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3405 | end_col = screen.tlen[selection.end.row + TermWin.saveLines]; |
3213 | |
3406 | |
3214 | if (end_col != -1 && selection.end.col > end_col) |
3407 | if ( |
|
|
3408 | selection.end.col > end_col |
|
|
3409 | && end_col != -1 |
|
|
3410 | #if ENABLE_FRILLS |
|
|
3411 | && !selection.rect |
|
|
3412 | #endif |
|
|
3413 | ) |
3215 | selection.end.col = ncol; |
3414 | selection.end.col = ncol; |
3216 | } |
3415 | } |
3217 | else if (selection.clicks == 2) |
3416 | else if (selection.clicks == 2) |
3218 | { |
3417 | { |
3219 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3418 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3220 | selection.end.col--; |
3419 | selection.end.col--; |
3221 | |
3420 | |
3222 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
|
|
3223 | selection_delimit_word (DN, & (selection.end), & (selection.end)); |
3421 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
|
|
3422 | selection_delimit_word (DN, &selection.end, &selection.end); |
3224 | } |
3423 | } |
3225 | else if (selection.clicks == 3) |
3424 | else if (selection.clicks == 3) |
3226 | { |
3425 | { |
3227 | #ifndef NO_FRILLS |
3426 | #if ENABLE_FRILLS |
3228 | if ((Options & Opt_tripleclickwords)) |
3427 | if (options & Opt_tripleclickwords) |
3229 | { |
3428 | { |
3230 | int end_row; |
3429 | int end_row; |
3231 | |
3430 | |
3232 | selection_delimit_word (UP, & (selection.beg), & (selection.beg)); |
3431 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3233 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3432 | end_row = screen.tlen[selection.mark.row + TermWin.saveLines]; |
3234 | |
3433 | |
3235 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3434 | for (end_row = selection.mark.row; end_row < TermWin.nrow; end_row++) |
3236 | { |
3435 | { |
3237 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
3436 | end_col = screen.tlen[end_row + TermWin.saveLines]; |
… | |
… | |
3248 | else |
3447 | else |
3249 | #endif |
3448 | #endif |
3250 | { |
3449 | { |
3251 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3450 | if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) |
3252 | selection.mark.col++; |
3451 | selection.mark.col++; |
|
|
3452 | |
3253 | selection.beg.col = 0; |
3453 | selection.beg.col = 0; |
3254 | selection.end.col = ncol; |
3454 | selection.end.col = ncol; |
|
|
3455 | |
|
|
3456 | // select a complete logical line |
|
|
3457 | while (selection.beg.row > -TermWin.saveLines |
|
|
3458 | && screen.tlen[selection.beg.row - 1 + TermWin.saveLines] == -1) |
|
|
3459 | selection.beg.row--; |
|
|
3460 | |
|
|
3461 | while (selection.end.row < TermWin.nrow |
|
|
3462 | && screen.tlen[selection.end.row + TermWin.saveLines] == -1) |
|
|
3463 | selection.end.row++; |
3255 | } |
3464 | } |
3256 | } |
3465 | } |
3257 | |
3466 | |
3258 | if (button3 && buttonpress) |
3467 | if (button3 && buttonpress) |
3259 | { /* mark may need to be changed */ |
3468 | { /* mark may need to be changed */ |
3260 | if (closeto == LEFT) |
3469 | if (closeto == LEFT) |
3261 | { |
3470 | { |
3262 | selection.mark.row = selection.end.row; |
3471 | selection.mark.row = selection.end.row; |
3263 | selection.mark.col = selection.end.col |
3472 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3264 | - (selection.clicks == 2); |
|
|
3265 | } |
3473 | } |
3266 | else |
3474 | else |
3267 | { |
3475 | { |
3268 | selection.mark.row = selection.beg.row; |
3476 | selection.mark.row = selection.beg.row; |
3269 | selection.mark.col = selection.beg.col; |
3477 | selection.mark.col = selection.beg.col; |
3270 | } |
3478 | } |
3271 | } |
3479 | } |
3272 | D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col)); |
|
|
3273 | } |
|
|
3274 | |
3480 | |
3275 | #ifndef NO_FRILLS |
3481 | #if ENABLE_FRILLS |
|
|
3482 | if (selection.rect && selection.beg.col > selection.end.col) |
|
|
3483 | SWAP_IT (selection.beg.col, selection.end.col, int); |
|
|
3484 | #endif |
|
|
3485 | } |
|
|
3486 | |
|
|
3487 | #if ENABLE_FRILLS |
3276 | void |
3488 | void |
3277 | rxvt_term::selection_remove_trailing_spaces () |
3489 | rxvt_term::selection_remove_trailing_spaces () |
3278 | { |
3490 | { |
3279 | int32_t end_col, end_row; |
3491 | int32_t end_col, end_row; |
3280 | text_t *stp; |
3492 | text_t *stp; |
3281 | |
3493 | |
3282 | end_col = selection.end.col; |
3494 | end_col = selection.end.col; |
3283 | end_row = selection.end.row; |
3495 | end_row = selection.end.row; |
|
|
3496 | |
3284 | for ( ; end_row >= selection.beg.row; ) |
3497 | for ( ; end_row >= selection.beg.row; ) |
3285 | { |
3498 | { |
3286 | stp = screen.text[end_row + TermWin.saveLines]; |
3499 | stp = screen.text[end_row + TermWin.saveLines]; |
|
|
3500 | |
3287 | while (--end_col >= 0) |
3501 | while (--end_col >= 0) |
3288 | { |
3502 | { |
3289 | if (stp[end_col] != ' ' && stp[end_col] != '\t') |
3503 | if (stp[end_col] != ' ' |
|
|
3504 | && stp[end_col] != '\t' |
|
|
3505 | && stp[end_col] != NOCHAR) |
3290 | break; |
3506 | break; |
3291 | } |
3507 | } |
|
|
3508 | |
3292 | if (end_col >= 0 |
3509 | if (end_col >= 0 |
3293 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3510 | || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) |
3294 | { |
3511 | { |
3295 | selection.end.col = end_col + 1; |
3512 | selection.end.col = end_col + 1; |
3296 | selection.end.row = end_row; |
3513 | selection.end.row = end_row; |
3297 | break; |
3514 | break; |
3298 | } |
3515 | } |
|
|
3516 | |
3299 | end_row--; |
3517 | end_row--; |
3300 | end_col = TermWin.ncol; |
3518 | end_col = TermWin.ncol; |
3301 | } |
3519 | } |
|
|
3520 | |
3302 | if (selection.mark.row > selection.end.row) |
3521 | if (selection.mark.row > selection.end.row) |
3303 | { |
3522 | { |
3304 | selection.mark.row = selection.end.row; |
3523 | selection.mark.row = selection.end.row; |
3305 | selection.mark.col = selection.end.col; |
3524 | selection.mark.col = selection.end.col; |
3306 | } |
3525 | } |
… | |
… | |
3322 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3541 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3323 | } |
3542 | } |
3324 | |
3543 | |
3325 | /* ------------------------------------------------------------------------- */ |
3544 | /* ------------------------------------------------------------------------- */ |
3326 | /* |
3545 | /* |
3327 | * On some systems, the Atom typedef is 64 bits wide. We need to have a type |
|
|
3328 | * that is exactly 32 bits wide, because a format of 64 is not allowed by |
|
|
3329 | * the X11 protocol. |
|
|
3330 | */ |
|
|
3331 | typedef CARD32 Atom32; |
|
|
3332 | |
|
|
3333 | /* ------------------------------------------------------------------------- */ |
|
|
3334 | /* |
|
|
3335 | * Respond to a request for our current selection |
3546 | * Respond to a request for our current selection |
3336 | * EXT: SelectionRequest |
3547 | * EXT: SelectionRequest |
3337 | */ |
3548 | */ |
3338 | void |
3549 | void |
3339 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3550 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3340 | { |
3551 | { |
3341 | XSelectionEvent ev; |
3552 | XSelectionEvent ev; |
3342 | XTextProperty ct; |
3553 | dDisp; |
3343 | XICCEncodingStyle style; |
|
|
3344 | Atom target; |
|
|
3345 | |
3554 | |
3346 | ev.type = SelectionNotify; |
3555 | ev.type = SelectionNotify; |
3347 | ev.property = None; |
3556 | ev.property = None; |
3348 | ev.display = rq.display; |
3557 | ev.display = rq.display; |
3349 | ev.requestor = rq.requestor; |
3558 | ev.requestor = rq.requestor; |
… | |
… | |
3351 | ev.target = rq.target; |
3560 | ev.target = rq.target; |
3352 | ev.time = rq.time; |
3561 | ev.time = rq.time; |
3353 | |
3562 | |
3354 | if (rq.target == xa[XA_TARGETS]) |
3563 | if (rq.target == xa[XA_TARGETS]) |
3355 | { |
3564 | { |
3356 | Atom32 target_list[6]; |
3565 | Atom target_list[6]; |
3357 | Atom32 *target = target_list; |
3566 | Atom *target = target_list; |
3358 | |
3567 | |
3359 | *target++ = (Atom32) xa[XA_TARGETS]; |
3568 | *target++ = xa[XA_TARGETS]; |
3360 | *target++ = (Atom32) xa[XA_TIMESTAMP]; |
3569 | *target++ = xa[XA_TIMESTAMP]; |
3361 | *target++ = (Atom32) XA_STRING; |
3570 | *target++ = XA_STRING; |
3362 | *target++ = (Atom32) xa[XA_TEXT]; |
3571 | *target++ = xa[XA_TEXT]; |
3363 | *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; |
3572 | *target++ = xa[XA_COMPOUND_TEXT]; |
3364 | #if X_HAVE_UTF8_STRING |
3573 | #if X_HAVE_UTF8_STRING |
3365 | *target++ = (Atom32) xa[XA_UTF8_STRING]; |
3574 | *target++ = xa[XA_UTF8_STRING]; |
3366 | #endif |
3575 | #endif |
3367 | |
3576 | |
3368 | XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, |
3577 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3369 | (8 * sizeof (target_list[0])), PropModeReplace, |
3578 | 32, PropModeReplace, |
3370 | (unsigned char *)target_list, |
3579 | (unsigned char *)target_list, target - target_list); |
3371 | target - target_list); |
|
|
3372 | ev.property = rq.property; |
3580 | ev.property = rq.property; |
3373 | } |
3581 | } |
3374 | #if TODO // TODO |
3582 | #if TODO // TODO |
3375 | else if (rq.target == xa[XA_MULTIPLE]) |
3583 | else if (rq.target == xa[XA_MULTIPLE]) |
3376 | { |
3584 | { |
3377 | /* TODO: Handle MULTIPLE */ |
3585 | /* TODO: Handle MULTIPLE */ |
3378 | } |
3586 | } |
3379 | #endif |
3587 | #endif |
3380 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3588 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3381 | { |
3589 | { |
3382 | XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, |
3590 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3383 | (8 * sizeof (Time)), PropModeReplace, |
|
|
3384 | (unsigned char *)&selection_time, 1); |
3591 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3385 | ev.property = rq.property; |
3592 | ev.property = rq.property; |
3386 | } |
3593 | } |
3387 | else if (rq.target == XA_STRING |
3594 | else if (rq.target == XA_STRING |
3388 | || rq.target == xa[XA_TEXT] |
3595 | || rq.target == xa[XA_TEXT] |
3389 | || rq.target == xa[XA_COMPOUND_TEXT] |
3596 | || rq.target == xa[XA_COMPOUND_TEXT] |
3390 | || rq.target == xa[XA_UTF8_STRING] |
3597 | || rq.target == xa[XA_UTF8_STRING] |
3391 | ) |
3598 | ) |
3392 | { |
3599 | { |
|
|
3600 | XTextProperty ct; |
|
|
3601 | Atom target = rq.target; |
3393 | short freect = 0; |
3602 | short freect = 0; |
3394 | int selectlen; |
3603 | int selectlen; |
3395 | wchar_t *cl; |
3604 | wchar_t *cl; |
3396 | |
3605 | enum { |
3397 | target = rq.target; |
3606 | enc_string = XStringStyle, |
|
|
3607 | enc_text = XStdICCTextStyle, |
|
|
3608 | enc_compound_text = XCompoundTextStyle, |
|
|
3609 | #ifdef X_HAVE_UTF8_STRING |
|
|
3610 | enc_utf8 = XUTF8StringStyle, |
|
|
3611 | #else |
|
|
3612 | enc_utf8 = -1, |
|
|
3613 | #endif |
|
|
3614 | } style; |
3398 | |
3615 | |
3399 | if (target == XA_STRING) |
3616 | if (target == XA_STRING) |
3400 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3617 | // we actually don't do XA_STRING, but who cares, as i18n clients |
3401 | // will ask for another format anyways. |
3618 | // will ask for another format anyways. |
3402 | style = XStringStyle; |
3619 | style = enc_string; |
3403 | else if (target == xa[XA_TEXT]) |
3620 | else if (target == xa[XA_TEXT]) |
3404 | style = XStdICCTextStyle; |
3621 | style = enc_text; |
3405 | else if (target == xa[XA_COMPOUND_TEXT]) |
3622 | else if (target == xa[XA_COMPOUND_TEXT]) |
3406 | style = XCompoundTextStyle; |
3623 | style = enc_compound_text; |
3407 | #if X_HAVE_UTF8_STRING |
3624 | #if ENABLE_FRILLS |
3408 | else if (target == xa[XA_UTF8_STRING]) |
3625 | else if (target == xa[XA_UTF8_STRING]) |
3409 | style = XUTF8StringStyle; |
3626 | style = enc_utf8; |
3410 | #endif |
3627 | #endif |
3411 | else |
3628 | else |
3412 | { |
3629 | { |
3413 | target = xa[XA_COMPOUND_TEXT]; |
3630 | target = xa[XA_COMPOUND_TEXT]; |
3414 | style = XCompoundTextStyle; |
3631 | style = enc_compound_text; |
3415 | } |
3632 | } |
3416 | |
3633 | |
3417 | if (selection.text) |
3634 | if (selection.text) |
3418 | { |
3635 | { |
3419 | cl = selection.text; |
3636 | cl = selection.text; |
… | |
… | |
3423 | { |
3640 | { |
3424 | cl = L""; |
3641 | cl = L""; |
3425 | selectlen = 0; |
3642 | selectlen = 0; |
3426 | } |
3643 | } |
3427 | |
3644 | |
3428 | // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it |
3645 | #if ENABLE_FRILLS |
3429 | // manually for XUTF8StringStyle. |
3646 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
3647 | // so recode it manually |
|
|
3648 | if (style == enc_utf8) |
|
|
3649 | { |
|
|
3650 | freect = 1; |
|
|
3651 | ct.encoding = target; |
|
|
3652 | ct.format = 8; |
|
|
3653 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
|
|
3654 | ct.nitems = strlen ((char *)ct.value); |
|
|
3655 | } |
|
|
3656 | else |
|
|
3657 | #endif |
3430 | if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) |
3658 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3431 | freect = 1; |
3659 | freect = 1; |
3432 | else |
3660 | else |
3433 | { |
3661 | { |
3434 | /* if we failed to convert then send it raw */ |
3662 | /* if we failed to convert then send it raw */ |
3435 | ct.value = (unsigned char *)cl; |
3663 | ct.value = (unsigned char *)cl; |
3436 | ct.nitems = selectlen; |
3664 | ct.nitems = selectlen; |
|
|
3665 | ct.encoding = target; |
3437 | } |
3666 | } |
3438 | |
3667 | |
3439 | XChangeProperty (display->display, rq.requestor, rq.property, |
3668 | XChangeProperty (disp, rq.requestor, rq.property, |
3440 | target, 8, PropModeReplace, |
3669 | ct.encoding, 8, PropModeReplace, |
3441 | ct.value, (int)ct.nitems); |
3670 | ct.value, (int)ct.nitems); |
3442 | ev.property = rq.property; |
3671 | ev.property = rq.property; |
3443 | |
3672 | |
3444 | if (freect) |
3673 | if (freect) |
3445 | XFree (ct.value); |
3674 | XFree (ct.value); |
3446 | } |
3675 | } |
3447 | |
3676 | |
3448 | XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); |
3677 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3449 | } |
3678 | } |
3450 | |
3679 | |
3451 | /* ------------------------------------------------------------------------- * |
3680 | /* ------------------------------------------------------------------------- * |
3452 | * MOUSE ROUTINES * |
3681 | * MOUSE ROUTINES * |
3453 | * ------------------------------------------------------------------------- */ |
3682 | * ------------------------------------------------------------------------- */ |
… | |
… | |
3465 | } |
3694 | } |
3466 | |
3695 | |
3467 | /* ------------------------------------------------------------------------- */ |
3696 | /* ------------------------------------------------------------------------- */ |
3468 | #ifdef USE_XIM |
3697 | #ifdef USE_XIM |
3469 | void |
3698 | void |
3470 | rxvt_term::im_set_position (XPoint *pos) |
3699 | rxvt_term::im_set_position (XPoint &pos) |
3471 | { |
3700 | { |
3472 | XWindowAttributes xwa; |
3701 | XWindowAttributes xwa; |
3473 | |
3702 | |
3474 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
3703 | XGetWindowAttributes (display->display, TermWin.vt, &xwa); |
|
|
3704 | |
3475 | pos->x = Col2Pixel (screen.cur.col) + xwa.x; |
3705 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3476 | pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; |
3706 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + TermWin.fbase; |
3477 | } |
3707 | } |
3478 | |
|
|
3479 | #endif |
3708 | #endif |
|
|
3709 | |
|
|
3710 | #if ENABLE_OVERLAY |
|
|
3711 | void |
|
|
3712 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
|
|
3713 | { |
|
|
3714 | if (TermWin.nrow < 3 || TermWin.ncol < 3) |
|
|
3715 | return; |
|
|
3716 | |
|
|
3717 | want_refresh = 1; |
|
|
3718 | |
|
|
3719 | scr_overlay_off (); |
|
|
3720 | |
|
|
3721 | if (x < 0) x = TermWin.ncol - w; |
|
|
3722 | if (y < 0) y = TermWin.nrow - h; |
|
|
3723 | |
|
|
3724 | // make space for border |
|
|
3725 | w += 2; MIN_IT (w, TermWin.ncol); |
|
|
3726 | h += 2; MIN_IT (h, TermWin.nrow); |
|
|
3727 | |
|
|
3728 | x -= 1; MAX_IT (x, 0); |
|
|
3729 | y -= 1; MAX_IT (y, 0); |
|
|
3730 | |
|
|
3731 | MIN_IT (x, TermWin.ncol - w); |
|
|
3732 | MIN_IT (y, TermWin.nrow - h); |
|
|
3733 | |
|
|
3734 | ov_x = x; ov_y = y; |
|
|
3735 | ov_w = w; ov_h = h; |
|
|
3736 | |
|
|
3737 | ov_text = new text_t *[h]; |
|
|
3738 | ov_rend = new rend_t *[h]; |
|
|
3739 | |
|
|
3740 | for (y = 0; y < h; y++) |
|
|
3741 | { |
|
|
3742 | text_t *tp = ov_text[y] = new text_t[w]; |
|
|
3743 | rend_t *rp = ov_rend[y] = new rend_t[w]; |
|
|
3744 | |
|
|
3745 | text_t t0, t1, t2; |
|
|
3746 | rend_t r = OVERLAY_RSTYLE; |
|
|
3747 | |
|
|
3748 | if (y == 0) |
|
|
3749 | t0 = 0x2554, t1 = 0x2550, t2 = 0x2557; |
|
|
3750 | else if (y < h - 1) |
|
|
3751 | t0 = 0x2551, t1 = 0x0020, t2 = 0x2551; |
|
|
3752 | else |
|
|
3753 | t0 = 0x255a, t1 = 0x2550, t2 = 0x255d; |
|
|
3754 | |
|
|
3755 | *tp++ = t0; |
|
|
3756 | *rp++ = r; |
|
|
3757 | |
|
|
3758 | for (x = w - 2; x > 0; --x) |
|
|
3759 | { |
|
|
3760 | *tp++ = t1; |
|
|
3761 | *rp++ = r; |
|
|
3762 | } |
|
|
3763 | |
|
|
3764 | *tp = t2; |
|
|
3765 | *rp = r; |
|
|
3766 | } |
|
|
3767 | } |
|
|
3768 | |
|
|
3769 | void |
|
|
3770 | rxvt_term::scr_overlay_off () |
|
|
3771 | { |
|
|
3772 | if (!ov_text) |
|
|
3773 | return; |
|
|
3774 | |
|
|
3775 | want_refresh = 1; |
|
|
3776 | |
|
|
3777 | for (int y = 0; y < ov_h; y++) |
|
|
3778 | { |
|
|
3779 | delete [] ov_text[y]; |
|
|
3780 | delete [] ov_rend[y]; |
|
|
3781 | } |
|
|
3782 | |
|
|
3783 | delete [] ov_text; ov_text = 0; |
|
|
3784 | delete [] ov_rend; ov_rend = 0; |
|
|
3785 | } |
|
|
3786 | |
|
|
3787 | void |
|
|
3788 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
|
|
3789 | { |
|
|
3790 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
|
|
3791 | return; |
|
|
3792 | |
|
|
3793 | x++, y++; |
|
|
3794 | |
|
|
3795 | ov_text[y][x] = text; |
|
|
3796 | ov_rend[y][x] = rend; |
|
|
3797 | } |
|
|
3798 | |
|
|
3799 | void |
|
|
3800 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
|
|
3801 | { |
|
|
3802 | while (*s) |
|
|
3803 | scr_overlay_set (x++, y, *s++); |
|
|
3804 | } |
|
|
3805 | |
|
|
3806 | void |
|
|
3807 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
|
|
3808 | { |
|
|
3809 | while (*s) |
|
|
3810 | { |
|
|
3811 | text_t t = *s++; |
|
|
3812 | int width = wcwidth (t); |
|
|
3813 | |
|
|
3814 | while (width--) |
|
|
3815 | { |
|
|
3816 | scr_overlay_set (x++, y, t); |
|
|
3817 | t = NOCHAR; |
|
|
3818 | } |
|
|
3819 | } |
|
|
3820 | } |
|
|
3821 | |
|
|
3822 | void |
|
|
3823 | rxvt_term::scr_swap_overlay () |
|
|
3824 | { |
|
|
3825 | if (!ov_text) |
|
|
3826 | return; |
|
|
3827 | |
|
|
3828 | int row_offset = ov_y + TermWin.saveLines - TermWin.view_start; |
|
|
3829 | |
|
|
3830 | // swap screen mem with overlay |
|
|
3831 | for (int y = ov_h; y--; ) |
|
|
3832 | { |
|
|
3833 | text_t *t1 = ov_text[y]; |
|
|
3834 | rend_t *r1 = ov_rend[y]; |
|
|
3835 | |
|
|
3836 | text_t *t2 = screen.text[y + row_offset] + ov_x; |
|
|
3837 | rend_t *r2 = screen.rend[y + row_offset] + ov_x; |
|
|
3838 | |
|
|
3839 | for (int x = ov_w; x--; ) |
|
|
3840 | { |
|
|
3841 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
|
|
3842 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
|
|
3843 | } |
|
|
3844 | } |
|
|
3845 | } |
|
|
3846 | |
|
|
3847 | #endif |
3480 | /* ------------------------------------------------------------------------- */ |
3848 | /* ------------------------------------------------------------------------- */ |