… | |
… | |
464 | { |
464 | { |
465 | switch (keysym) |
465 | switch (keysym) |
466 | { |
466 | { |
467 | /* normal XTerm key bindings */ |
467 | /* normal XTerm key bindings */ |
468 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
468 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
469 | selection_request (ev.time, 0, 0); |
469 | selection_request (ev.time); |
470 | return; |
470 | return; |
471 | #if TODO |
471 | #if TODO |
472 | /* rxvt extras */ |
472 | /* rxvt extras */ |
473 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
473 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
474 | change_font (FONT_UP); |
474 | change_font (FONT_UP); |
… | |
… | |
1137 | |
1137 | |
1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1139 | cmdbuf_ptr = cmdbuf_base; |
1139 | cmdbuf_ptr = cmdbuf_base; |
1140 | cmdbuf_endp = cmdbuf_ptr + n; |
1140 | cmdbuf_endp = cmdbuf_ptr + n; |
1141 | |
1141 | |
1142 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1142 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1143 | |
1143 | |
1144 | if (r > 0) |
1144 | if (r > 0) |
1145 | { |
1145 | { |
1146 | cmdbuf_endp += r; |
1146 | cmdbuf_endp += r; |
1147 | return true; |
1147 | return true; |
… | |
… | |
1501 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1501 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1502 | { |
1502 | { |
1503 | seen_resize = 1; |
1503 | seen_resize = 1; |
1504 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1504 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1505 | } |
1505 | } |
|
|
1506 | |
|
|
1507 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1506 | |
1508 | |
1507 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1509 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1508 | if (OPTION (Opt_transparent)) |
1510 | if (OPTION (Opt_transparent)) |
1509 | check_our_parents (); |
1511 | check_our_parents (); |
1510 | #endif |
1512 | #endif |
… | |
… | |
2153 | { |
2155 | { |
2154 | case Button1: |
2156 | case Button1: |
2155 | case Button3: |
2157 | case Button3: |
2156 | selection_make (ev.time); |
2158 | selection_make (ev.time); |
2157 | break; |
2159 | break; |
|
|
2160 | |
2158 | case Button2: |
2161 | case Button2: |
|
|
2162 | if (IN_RANGE_EXC (ev.x, 0, width) |
|
|
2163 | && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
2159 | selection_request (ev.time, ev.x, ev.y); |
2164 | selection_request (ev.time); |
|
|
2165 | |
2160 | break; |
2166 | break; |
|
|
2167 | |
2161 | #ifdef MOUSE_WHEEL |
2168 | #ifdef MOUSE_WHEEL |
2162 | case Button4: |
2169 | case Button4: |
2163 | case Button5: |
2170 | case Button5: |
2164 | { |
2171 | { |
2165 | int i; |
2172 | int i; |
… | |
… | |
3764 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3771 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3765 | */ |
3772 | */ |
3766 | void |
3773 | void |
3767 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3774 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3768 | { |
3775 | { |
3769 | int changed = 0; |
|
|
3770 | int color; |
3776 | int color; |
3771 | char *buf, *name; |
3777 | char *buf, *name; |
3772 | bool query = str[0] == '?' && !str[1]; |
3778 | bool query = str[0] == '?' && !str[1]; |
3773 | int saveop = op; |
3779 | int saveop = op; |
3774 | dDisp; |
3780 | dDisp; |
… | |
… | |
3890 | want_full_refresh = want_refresh = 1; |
3896 | want_full_refresh = want_refresh = 1; |
3891 | break; |
3897 | break; |
3892 | #endif |
3898 | #endif |
3893 | |
3899 | |
3894 | case Rxvt_Pixmap: |
3900 | case Rxvt_Pixmap: |
|
|
3901 | { |
3895 | if (*str != ';') |
3902 | if (*str != ';') |
3896 | { |
3903 | { |
3897 | #if XPM_BACKGROUND |
3904 | #if XPM_BACKGROUND |
3898 | scale_pixmap (""); /* reset to default scaling */ |
3905 | scale_pixmap (""); /* reset to default scaling */ |
3899 | set_bgPixmap (str); /* change pixmap */ |
3906 | set_bgPixmap (str); /* change pixmap */ |
3900 | scr_touch (true); |
3907 | scr_touch (true); |
3901 | #endif |
3908 | #endif |
3902 | } |
3909 | } |
3903 | |
3910 | |
|
|
3911 | int changed = 0; |
|
|
3912 | |
3904 | while ((str = strchr (str, ';')) != NULL) |
3913 | while ((str = strchr (str, ';')) != NULL) |
3905 | { |
3914 | { |
3906 | str++; |
3915 | str++; |
3907 | #if XPM_BACKGROUND |
3916 | #if XPM_BACKGROUND |
3908 | changed += scale_pixmap (str); |
3917 | changed += scale_pixmap (str); |
3909 | #endif |
3918 | #endif |
3910 | } |
3919 | } |
3911 | |
3920 | |
3912 | if (changed) |
3921 | if (changed) |
3913 | { |
3922 | { |
3914 | #ifdef XPM_BACKGROUND |
3923 | #ifdef XPM_BACKGROUND |
3915 | resize_pixmap (); |
3924 | resize_pixmap (); |
3916 | scr_touch (true); |
3925 | scr_touch (true); |
3917 | #endif |
3926 | #endif |
3918 | } |
3927 | } |
|
|
3928 | } |
3919 | break; |
3929 | break; |
3920 | |
3930 | |
3921 | case Rxvt_restoreFG: |
3931 | case Rxvt_restoreFG: |
3922 | set_window_color (Color_fg, str); |
3932 | set_window_color (Color_fg, str); |
3923 | break; |
3933 | break; |
… | |
… | |
3969 | if (query) |
3979 | if (query) |
3970 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3980 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3971 | else |
3981 | else |
3972 | { |
3982 | { |
3973 | set_locale (str); |
3983 | set_locale (str); |
3974 | pty.set_utf8_mode (enc_utf8); |
3984 | pty->set_utf8_mode (enc_utf8); |
3975 | init_xlocale (); |
3985 | init_xlocale (); |
3976 | } |
3986 | } |
3977 | break; |
3987 | break; |
3978 | |
3988 | |
3979 | case URxvt_view_up: |
3989 | case URxvt_view_up: |
… | |
… | |
4411 | rxvt_term::tt_write (const char *data, unsigned int len) |
4421 | rxvt_term::tt_write (const char *data, unsigned int len) |
4412 | { |
4422 | { |
4413 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4423 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
4414 | return; |
4424 | return; |
4415 | |
4425 | |
4416 | if (pty.pty < 0) |
4426 | if (pty->pty < 0) |
4417 | return; |
4427 | return; |
4418 | |
4428 | |
4419 | if (v_buflen == 0) |
4429 | if (v_buflen == 0) |
4420 | { |
4430 | { |
4421 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4431 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4422 | |
4432 | |
4423 | if ((unsigned int)written == len) |
4433 | if ((unsigned int)written == len) |
4424 | return; |
4434 | return; |
4425 | |
4435 | |
4426 | data += written; |
4436 | data += written; |
… | |
… | |
4435 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4445 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4436 | } |
4446 | } |
4437 | |
4447 | |
4438 | void rxvt_term::pty_write () |
4448 | void rxvt_term::pty_write () |
4439 | { |
4449 | { |
4440 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4450 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4441 | |
4451 | |
4442 | if (written > 0) |
4452 | if (written > 0) |
4443 | { |
4453 | { |
4444 | v_buflen -= written; |
4454 | v_buflen -= written; |
4445 | |
4455 | |