… | |
… | |
49 | #include "rxvt.h" |
49 | #include "rxvt.h" |
50 | #include "rxvtperl.h" |
50 | #include "rxvtperl.h" |
51 | #include "version.h" |
51 | #include "version.h" |
52 | #include "command.h" |
52 | #include "command.h" |
53 | |
53 | |
54 | #if HAVE_SCHED_YIELD |
|
|
55 | #undef HAVE_SCHED_YIELD // disabled for the time being |
|
|
56 | //# include <sched.h> |
|
|
57 | #endif |
|
|
58 | |
|
|
59 | #ifdef KEYSYM_RESOURCE |
54 | #ifdef KEYSYM_RESOURCE |
60 | # include "keyboard.h" |
55 | # include "keyboard.h" |
61 | #endif |
56 | #endif |
62 | |
57 | |
63 | #include <csignal> |
58 | #include <csignal> |
… | |
… | |
227 | # if !UNICODE3 |
222 | # if !UNICODE3 |
228 | if (ch >= 0x10000) |
223 | if (ch >= 0x10000) |
229 | ch = 0xfffd; |
224 | ch = 0xfffd; |
230 | # endif |
225 | # endif |
231 | scr_overlay_set (11, y, ch, r); |
226 | scr_overlay_set (11, y, ch, r); |
|
|
227 | |
|
|
228 | if (WCWIDTH (ch) >= 2) |
232 | scr_overlay_set (12, y, NOCHAR, r); |
229 | scr_overlay_set (12, y, NOCHAR, r); |
233 | } |
230 | } |
234 | |
231 | |
|
|
232 | // { |
|
|
233 | // char buf[4+4+3+1]; |
|
|
234 | // snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); |
|
|
235 | // scr_overlay_set (0, 0, buf); |
|
|
236 | // } |
235 | scr_overlay_set (0, len , attr); |
237 | scr_overlay_set (0, len , attr); |
236 | scr_overlay_set (0, len + 1, fname); |
238 | scr_overlay_set (0, len + 1, fname); |
237 | |
239 | |
238 | free (fname); |
240 | free (fname); |
239 | |
241 | |
… | |
… | |
1088 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1090 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1089 | } |
1091 | } |
1090 | } |
1092 | } |
1091 | #endif |
1093 | #endif |
1092 | |
1094 | |
1093 | #if HAVE_SCHED_YIELD |
1095 | #if LINUX_YIELD_HACK |
1094 | static struct event_handler |
1096 | static struct event_handler |
1095 | { |
1097 | { |
1096 | check_watcher cw_yield; |
1098 | check_watcher yield_ev; |
1097 | |
1099 | |
1098 | void yield (check_watcher &w) |
1100 | void yield_cb (check_watcher &w) |
1099 | { |
1101 | { |
1100 | sched_yield (); |
1102 | usleep (0); |
1101 | w.stop (); |
1103 | w.stop (); |
1102 | } |
1104 | } |
1103 | |
1105 | |
1104 | event_handler () |
1106 | event_handler () |
1105 | : cw_yield (this, &event_handler::yield) |
1107 | : yield_ev (this, &event_handler::yield_cb) |
1106 | { |
1108 | { |
1107 | } |
1109 | } |
1108 | } event_handler; |
1110 | } event_handler; |
1109 | #endif |
1111 | #endif |
1110 | |
1112 | |
… | |
… | |
1130 | cmdbuf_endp += r; |
1132 | cmdbuf_endp += r; |
1131 | return true; |
1133 | return true; |
1132 | } |
1134 | } |
1133 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1135 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1134 | { |
1136 | { |
1135 | #if HAVE_SCHED_YIELD |
1137 | #if LINUX_YIELD_HACK |
1136 | if (display->is_local) |
1138 | if (display->is_local) |
1137 | event_handler.cw_yield.start (); |
1139 | event_handler.yield_ev.start (); |
1138 | #endif |
1140 | #endif |
1139 | } |
1141 | } |
1140 | else |
1142 | else |
1141 | { |
1143 | { |
1142 | pty_ev.stop (); |
1144 | pty_ev.stop (); |
… | |
… | |
2455 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2457 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2456 | &nitems, &bytes_after, &prop) == Success); |
2458 | &nitems, &bytes_after, &prop) == Success); |
2457 | |
2459 | |
2458 | if (!i || prop == NULL |
2460 | if (!i || prop == NULL |
2459 | #if TINTING |
2461 | #if TINTING |
2460 | || !rs[Rs_color + Color_tint] |
2462 | || !ISSET_PIXCOLOR (Color_tint) |
2461 | #endif |
2463 | #endif |
2462 | ) |
2464 | ) |
2463 | have_pixmap = 0; |
2465 | have_pixmap = 0; |
2464 | else |
2466 | else |
2465 | { |
2467 | { |
… | |
… | |
2531 | XFreePixmap (xdisp, pixmap); |
2533 | XFreePixmap (xdisp, pixmap); |
2532 | |
2534 | |
2533 | #if TINTING |
2535 | #if TINTING |
2534 | if (ISSET_PIXCOLOR (Color_tint)) |
2536 | if (ISSET_PIXCOLOR (Color_tint)) |
2535 | { |
2537 | { |
2536 | unsigned short rm, gm, bm; |
|
|
2537 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2538 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2538 | |
2539 | |
|
|
2540 | rgba c; |
2539 | pix_colors_focused[Color_tint].get (this, rm, gm, bm); |
2541 | pix_colors_focused [Color_tint].get (c); |
2540 | |
2542 | |
2541 | ShadeXImage (this, image, shade, rm, gm, bm); |
2543 | ShadeXImage (this, image, shade, c.r, c.g, c.b); |
2542 | } |
2544 | } |
2543 | #endif |
2545 | #endif |
2544 | |
2546 | |
2545 | pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); |
2547 | pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth); |
2546 | gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); |
2548 | gc = XCreateGC (xdisp, vt, 0UL, &gcvalue); |
… | |
… | |
2567 | * InheritPixmap transparency |
2569 | * InheritPixmap transparency |
2568 | */ |
2570 | */ |
2569 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2571 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2570 | { |
2572 | { |
2571 | oldp = parent[i]; |
2573 | oldp = parent[i]; |
2572 | XQueryTree (xdisp, parent[i - 1], &root, |
2574 | XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n); |
2573 | &parent[i], &list, &n); |
|
|
2574 | XFree (list); |
2575 | XFree (list); |
2575 | |
2576 | |
2576 | if (parent[i] == display->root) |
2577 | if (parent[i] == display->root) |
2577 | { |
2578 | { |
2578 | if (oldp != None) |
2579 | if (oldp != None) |
… | |
… | |
2586 | } |
2587 | } |
2587 | |
2588 | |
2588 | n = 0; |
2589 | n = 0; |
2589 | |
2590 | |
2590 | if (pchanged) |
2591 | if (pchanged) |
2591 | { |
|
|
2592 | for (; n < (unsigned int)i; n++) |
2592 | for (; n < (unsigned int)i; n++) |
2593 | { |
2593 | { |
2594 | XGetWindowAttributes (xdisp, parent[n], &wattr); |
2594 | XGetWindowAttributes (xdisp, parent[n], &wattr); |
|
|
2595 | |
2595 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2596 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2596 | { |
2597 | { |
2597 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2598 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2598 | break; |
2599 | break; |
2599 | } |
2600 | } |
2600 | } |
2601 | } |
2601 | } |
|
|
2602 | |
2602 | |
2603 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2603 | if (n > (sizeof (parent) / sizeof (parent[0]))) |
2604 | { |
2604 | { |
2605 | XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); |
2605 | XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]); |
2606 | XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); |
2606 | XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]); |
2607 | am_transparent = 0; |
2607 | am_transparent = 0; |
2608 | /* XXX: also turn off Opt_transparent? */ |
2608 | /* XXX: also turn off Opt_transparent? */ |
… | |
… | |
3084 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3084 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3085 | break; |
3085 | break; |
3086 | case '+': |
3086 | case '+': |
3087 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3087 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3088 | break; |
3088 | break; |
3089 | #if ENABLE_FRILLS |
3089 | #if !ENABLE_MINIMAL |
3090 | case '6': |
3090 | case '6': |
3091 | scr_backindex (); |
3091 | scr_backindex (); |
3092 | break; |
3092 | break; |
3093 | #endif |
3093 | #endif |
3094 | case '7': |
3094 | case '7': |
3095 | scr_cursor (SAVE); |
3095 | scr_cursor (SAVE); |
3096 | break; |
3096 | break; |
3097 | case '8': |
3097 | case '8': |
3098 | scr_cursor (RESTORE); |
3098 | scr_cursor (RESTORE); |
3099 | break; |
3099 | break; |
3100 | #if ENABLE_FRILLS |
3100 | #if !ENABLE_MINIMAL |
3101 | case '9': |
3101 | case '9': |
3102 | scr_forwardindex (); |
3102 | scr_forwardindex (); |
3103 | break; |
3103 | break; |
3104 | #endif |
3104 | #endif |
3105 | case '=': |
3105 | case '=': |
… | |
… | |
3278 | { |
3278 | { |
3279 | case '>': |
3279 | case '>': |
3280 | if (ch == CSI_DA) /* secondary device attributes */ |
3280 | if (ch == CSI_DA) /* secondary device attributes */ |
3281 | { |
3281 | { |
3282 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
3282 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
3283 | // 'U' for rxvt-unicode <= 7.2. |
3283 | // 'U' for rxvt-unicode != 7.[34] (where it was broken). |
3284 | // |
3284 | // |
3285 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
3285 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
3286 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
3286 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
3287 | // that we do not support xterm mouse reporting (should be 95 when we do). |
3287 | // that we do not support xterm mouse reporting (should be 95 when we do). |
3288 | // |
3288 | // |
3289 | tt_printf ("\033[>0;94;0c"); |
3289 | tt_printf ("\033[>%d;94;0c", 'U'); |
3290 | } |
3290 | } |
3291 | break; |
3291 | break; |
3292 | case '?': |
3292 | case '?': |
3293 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3293 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3294 | process_terminal_mode (ch, priv, nargs, arg); |
3294 | process_terminal_mode (ch, priv, nargs, arg); |
… | |
… | |
3498 | break; |
3498 | break; |
3499 | case CSI_75: |
3499 | case CSI_75: |
3500 | scr_cursor (RESTORE); |
3500 | scr_cursor (RESTORE); |
3501 | break; |
3501 | break; |
3502 | |
3502 | |
3503 | #if ENABLE_FRILLS |
3503 | #if !ENABLE_MINIMAL |
3504 | case CSI_74: |
3504 | case CSI_74: |
3505 | process_window_ops (arg, nargs); |
3505 | process_window_ops (arg, nargs); |
3506 | break; |
3506 | break; |
3507 | #endif |
3507 | #endif |
3508 | |
3508 | |
… | |
… | |
3515 | break; |
3515 | break; |
3516 | } |
3516 | } |
3517 | } |
3517 | } |
3518 | /*}}} */ |
3518 | /*}}} */ |
3519 | |
3519 | |
3520 | #if ENABLE_FRILLS |
3520 | #if !ENABLE_MINIMAL |
3521 | /* ARGSUSED */ |
3521 | /* ARGSUSED */ |
3522 | void |
3522 | void |
3523 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3523 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3524 | { |
3524 | { |
3525 | int x, y; |
3525 | int x, y; |
… | |
… | |
3566 | default: |
3566 | default: |
3567 | if (args[0] >= 24) /* set height (chars) */ |
3567 | if (args[0] >= 24) /* set height (chars) */ |
3568 | set_widthheight ((unsigned int)width, |
3568 | set_widthheight ((unsigned int)width, |
3569 | (unsigned int) (args[1] * fheight)); |
3569 | (unsigned int) (args[1] * fheight)); |
3570 | break; |
3570 | break; |
3571 | |
|
|
3572 | |
3571 | |
3573 | /* |
3572 | /* |
3574 | * reports - some output format copied from XTerm |
3573 | * reports - some output format copied from XTerm |
3575 | */ |
3574 | */ |
3576 | case 11: /* report window state */ |
3575 | case 11: /* report window state */ |
… | |
… | |
3714 | void |
3713 | void |
3715 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3714 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3716 | { |
3715 | { |
3717 | if (str[0] == '?' && !str[1]) |
3716 | if (str[0] == '?' && !str[1]) |
3718 | { |
3717 | { |
3719 | unsigned short r, g, b; |
3718 | rgba c; |
3720 | pix_colors_focused[color].get (this, r, g, b); |
3719 | pix_colors_focused[color].get (c); |
|
|
3720 | |
|
|
3721 | #if XFT |
|
|
3722 | if (c.a != rgba::MAX_CC) |
|
|
3723 | tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); |
|
|
3724 | else |
|
|
3725 | #endif |
3721 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3726 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); |
3722 | } |
3727 | } |
3723 | else |
3728 | else |
3724 | set_window_color (color, str); |
3729 | set_window_color (color, str); |
3725 | } |
3730 | } |
3726 | |
3731 | |
… | |
… | |
3767 | &nitems, &bytes_after, &value) == Success |
3772 | &nitems, &bytes_after, &value) == Success |
3768 | && actual_type != None |
3773 | && actual_type != None |
3769 | && actual_format == 8) |
3774 | && actual_format == 8) |
3770 | str = (const char *)(value); |
3775 | str = (const char *)(value); |
3771 | |
3776 | |
3772 | tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); |
3777 | tt_printf ("\033]%d;%s%c", op, str, resp); |
3773 | |
3778 | |
3774 | XFree (value); |
3779 | XFree (value); |
3775 | } |
3780 | } |
3776 | else |
3781 | else |
3777 | { |
3782 | { |
… | |
… | |
3801 | break; |
3806 | break; |
3802 | |
3807 | |
3803 | if ((buf = strchr (name, ';')) != NULL) |
3808 | if ((buf = strchr (name, ';')) != NULL) |
3804 | *buf++ = '\0'; |
3809 | *buf++ = '\0'; |
3805 | |
3810 | |
3806 | if (name[0] == '?' && !name[1]) |
3811 | process_color_seq (op, color, name, resp); |
3807 | { |
|
|
3808 | unsigned short r, g, b; |
|
|
3809 | pix_colors_focused[color].get (this, r, g, b); |
|
|
3810 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
|
|
3811 | } |
|
|
3812 | else |
|
|
3813 | set_window_color (color, name); |
|
|
3814 | } |
3812 | } |
3815 | break; |
3813 | break; |
3816 | case XTerm_Color00: |
3814 | case XTerm_Color00: |
3817 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3815 | process_color_seq (op, Color_fg, str, resp); |
3818 | break; |
3816 | break; |
3819 | case XTerm_Color01: |
3817 | case XTerm_Color01: |
3820 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3818 | process_color_seq (op, Color_bg, str, resp); |
3821 | break; |
3819 | break; |
3822 | #ifndef NO_CURSORCOLOR |
3820 | #ifndef NO_CURSORCOLOR |
3823 | case XTerm_Color_cursor: |
3821 | case XTerm_Color_cursor: |
3824 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3822 | process_color_seq (op, Color_cursor, str, resp); |
3825 | break; |
3823 | break; |
3826 | #endif |
3824 | #endif |
3827 | case XTerm_Color_pointer_fg: |
3825 | case XTerm_Color_pointer_fg: |
3828 | process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); |
3826 | process_color_seq (op, Color_pointer_fg, str, resp); |
3829 | break; |
3827 | break; |
3830 | case XTerm_Color_pointer_bg: |
3828 | case XTerm_Color_pointer_bg: |
3831 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3829 | process_color_seq (op, Color_pointer_bg, str, resp); |
3832 | break; |
3830 | break; |
3833 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3831 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3834 | case XTerm_Color_RV: |
3832 | case XTerm_Color_RV: |
3835 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3833 | process_color_seq (op, Color_RV, str, resp); |
3836 | break; |
3834 | break; |
3837 | case Rxvt_Color_BD: |
3835 | case Rxvt_Color_BD: |
3838 | case URxvt_Color_BD: |
3836 | case URxvt_Color_BD: |
3839 | process_color_seq (op, Color_BD, str, resp); |
3837 | process_color_seq (op, Color_BD, str, resp); |
3840 | break; |
3838 | break; |
3841 | case Rxvt_Color_UL: |
3839 | case Rxvt_Color_UL: |
3842 | case URxvt_Color_UL: |
3840 | case URxvt_Color_UL: |
3843 | process_color_seq (op, Color_UL, str, resp); |
3841 | process_color_seq (op, Color_UL, str, resp); |
3844 | break; |
3842 | break; |
3845 | case URxvt_Color_IT: |
3843 | case URxvt_Color_IT: |
3846 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3844 | process_color_seq (op, Color_IT, str, resp); |
3847 | break; |
3845 | break; |
3848 | #endif |
3846 | #endif |
3849 | #if TRANSPARENT && TINTING |
3847 | #if TRANSPARENT && TINTING |
3850 | case URxvt_Color_tint: |
3848 | case URxvt_Color_tint: |
3851 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3849 | process_color_seq (op, Color_tint, str, resp); |
|
|
3850 | |
3852 | check_our_parents (); |
3851 | check_our_parents (); |
|
|
3852 | |
3853 | if (am_transparent) |
3853 | if (am_transparent) |
3854 | want_full_refresh = want_refresh = 1; |
3854 | want_full_refresh = want_refresh = 1; |
|
|
3855 | |
3855 | break; |
3856 | break; |
3856 | #endif |
3857 | #endif |
3857 | |
3858 | |
3858 | case Rxvt_Pixmap: |
3859 | case Rxvt_Pixmap: |
3859 | { |
3860 | { |
… | |
… | |
3933 | break; |
3934 | break; |
3934 | |
3935 | |
3935 | case URxvt_version: |
3936 | case URxvt_version: |
3936 | if (query) |
3937 | if (query) |
3937 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", |
3938 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", |
3938 | URxvt_version, |
3939 | op, |
3939 | rs[Rs_name], |
|
|
3940 | VERSION[0], VERSION[2], |
3940 | rs[Rs_name], VERSION[0], VERSION[2], |
3941 | resp); |
3941 | resp); |
3942 | break; |
3942 | break; |
3943 | |
3943 | |
3944 | #if ENABLE_FRILLS |
3944 | #if !ENABLE_MINIMAL |
3945 | case URxvt_locale: |
3945 | case URxvt_locale: |
3946 | if (query) |
3946 | if (query) |
3947 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3947 | tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); |
3948 | else |
3948 | else |
3949 | { |
3949 | { |
3950 | set_locale (str); |
3950 | set_locale (str); |
3951 | pty->set_utf8_mode (enc_utf8); |
3951 | pty->set_utf8_mode (enc_utf8); |
3952 | init_xlocale (); |
3952 | init_xlocale (); |
… | |
… | |
4313 | scr_color (Color_bg, Color_bg); |
4313 | scr_color (Color_bg, Color_bg); |
4314 | break; |
4314 | break; |
4315 | |
4315 | |
4316 | //case 50: // not variable spacing |
4316 | //case 50: // not variable spacing |
4317 | |
4317 | |
4318 | #if ENABLE_FRILLS |
4318 | #if !ENABLE_MINIMAL |
4319 | case 90: |
4319 | case 90: |
4320 | case 91: /* set bright fg color */ |
4320 | case 91: /* set bright fg color */ |
4321 | case 92: |
4321 | case 92: |
4322 | case 93: |
4322 | case 93: |
4323 | case 94: |
4323 | case 94: |