… | |
… | |
25 | * - extensive modifications |
25 | * - extensive modifications |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
27 | * Copyright (c) 2001 Marius Gedminas |
27 | * Copyright (c) 2001 Marius Gedminas |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
30 | * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> |
30 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
31 | * |
31 | * |
32 | * This program is free software; you can redistribute it and/or modify |
32 | * This program is free software; you can redistribute it and/or modify |
33 | * it under the terms of the GNU General Public License as published by |
33 | * it under the terms of the GNU General Public License as published by |
34 | * the Free Software Foundation; either version 2 of the License, or |
34 | * the Free Software Foundation; either version 2 of the License, or |
35 | * (at your option) any later version. |
35 | * (at your option) any later version. |
… | |
… | |
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 | # include <sched.h> |
|
|
56 | #endif |
|
|
57 | |
|
|
58 | #ifdef KEYSYM_RESOURCE |
54 | #ifdef KEYSYM_RESOURCE |
59 | # include "keyboard.h" |
55 | # include "keyboard.h" |
60 | #endif |
56 | #endif |
61 | |
57 | |
62 | #include <csignal> |
58 | #include <csignal> |
63 | |
59 | |
|
|
60 | #if LINUX_YIELD_HACK |
|
|
61 | # include <ctime> |
|
|
62 | #endif |
|
|
63 | |
64 | /*----------------------------------------------------------------------*/ |
64 | /*----------------------------------------------------------------------*/ |
65 | |
65 | |
66 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
66 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
67 | |
|
|
68 | // exception thrown when the command parser runs out of input data |
|
|
69 | class out_of_input { } out_of_input; |
|
|
70 | |
67 | |
71 | #if ENABLE_FRILLS || ISO_14755 |
68 | #if ENABLE_FRILLS || ISO_14755 |
72 | |
69 | |
73 | #define ISO_14755_STARTED 0x80000000UL |
70 | #define ISO_14755_STARTED 0x80000000UL |
74 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
71 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
… | |
… | |
146 | || !IN_RANGE_EXC (y, 0, nrow)) |
143 | || !IN_RANGE_EXC (y, 0, nrow)) |
147 | return; |
144 | return; |
148 | |
145 | |
149 | for (;;) |
146 | for (;;) |
150 | { |
147 | { |
151 | const line_t &l = ROW(y - view_start); |
148 | const line_t &l = ROW(y + view_start); |
152 | |
149 | |
153 | text_t t = l.t[x]; |
150 | text_t t = l.t[x]; |
154 | |
151 | |
155 | if (t != NOCHAR || !x) |
152 | if (t != NOCHAR || !x) |
156 | { |
153 | { |
… | |
… | |
229 | # if !UNICODE3 |
226 | # if !UNICODE3 |
230 | if (ch >= 0x10000) |
227 | if (ch >= 0x10000) |
231 | ch = 0xfffd; |
228 | ch = 0xfffd; |
232 | # endif |
229 | # endif |
233 | scr_overlay_set (11, y, ch, r); |
230 | scr_overlay_set (11, y, ch, r); |
|
|
231 | |
|
|
232 | if (WCWIDTH (ch) >= 2) |
234 | scr_overlay_set (12, y, NOCHAR, r); |
233 | scr_overlay_set (12, y, NOCHAR, r); |
235 | } |
234 | } |
236 | |
235 | |
|
|
236 | // { |
|
|
237 | // char buf[4+4+3+1]; |
|
|
238 | // snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); |
|
|
239 | // scr_overlay_set (0, 0, buf); |
|
|
240 | // } |
237 | scr_overlay_set (0, len , attr); |
241 | scr_overlay_set (0, len , attr); |
238 | scr_overlay_set (0, len + 1, fname); |
242 | scr_overlay_set (0, len + 1, fname); |
239 | |
243 | |
240 | free (fname); |
244 | free (fname); |
241 | |
245 | |
… | |
… | |
267 | mb[0] = ch[0]; |
271 | mb[0] = ch[0]; |
268 | len = 1; |
272 | len = 1; |
269 | } |
273 | } |
270 | |
274 | |
271 | if (len > 0) |
275 | if (len > 0) |
272 | tt_write ((unsigned char *)mb, len); |
276 | tt_write (mb, len); |
273 | else |
277 | else |
274 | scr_bell (); |
278 | scr_bell (); |
275 | } |
279 | } |
276 | |
280 | |
277 | iso14755buf = 0; |
281 | iso14755buf = 0; |
… | |
… | |
294 | |
298 | |
295 | return -1; |
299 | return -1; |
296 | } |
300 | } |
297 | #endif |
301 | #endif |
298 | |
302 | |
299 | /*{{{ Convert the keypress event into a string */ |
|
|
300 | void |
303 | void |
301 | rxvt_term::lookup_key (XKeyEvent &ev) |
304 | rxvt_term::key_press (XKeyEvent &ev) |
302 | { |
305 | { |
303 | int ctrl, meta, shft, len; |
306 | int ctrl, meta, shft, len; |
304 | unsigned int newlen; |
307 | unsigned int newlen; |
305 | KeySym keysym; |
308 | KeySym keysym; |
306 | #ifdef DEBUG_CMD |
|
|
307 | static int debug_key = 1; /* accessible by a debugger only */ |
|
|
308 | #endif |
|
|
309 | int valid_keysym; |
309 | int valid_keysym; |
310 | unsigned char kbuf[KBUFSZ]; |
310 | char kbuf[KBUFSZ]; |
|
|
311 | |
|
|
312 | #if ISO_14755 |
|
|
313 | if (iso14755buf & ISO_14755_52) |
|
|
314 | return; |
|
|
315 | #endif |
311 | |
316 | |
312 | /* |
317 | /* |
313 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
318 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
314 | * escape sequence to toggle the Keypad. |
319 | * escape sequence to toggle the Keypad. |
315 | * |
320 | * |
… | |
… | |
333 | Status status_return; |
338 | Status status_return; |
334 | |
339 | |
335 | #if 0 |
340 | #if 0 |
336 | #ifdef X_HAVE_UTF8_STRING |
341 | #ifdef X_HAVE_UTF8_STRING |
337 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
342 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
338 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
343 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
339 | KBUFSZ, &keysym, &status_return); |
344 | KBUFSZ, &keysym, &status_return); |
340 | else |
345 | else |
341 | #endif |
346 | #endif |
342 | #endif |
347 | #endif |
343 | { |
348 | { |
… | |
… | |
380 | || status_return == XLookupBoth; |
385 | || status_return == XLookupBoth; |
381 | } |
386 | } |
382 | else |
387 | else |
383 | #endif |
388 | #endif |
384 | { |
389 | { |
385 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
390 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
386 | valid_keysym = keysym != NoSymbol; |
391 | valid_keysym = keysym != NoSymbol; |
387 | } |
392 | } |
388 | |
393 | |
389 | if (valid_keysym) |
394 | if (valid_keysym) |
390 | { |
395 | { |
… | |
… | |
442 | scr_move_to (0, 1); |
447 | scr_move_to (0, 1); |
443 | return; |
448 | return; |
444 | } |
449 | } |
445 | else if (keysym == XK_End) |
450 | else if (keysym == XK_End) |
446 | { |
451 | { |
447 | scr_move_to (1, 0); |
452 | scr_move_to (1, 1); |
448 | return; |
453 | return; |
449 | } |
454 | } |
450 | } |
455 | } |
451 | #endif |
456 | #endif |
452 | } |
457 | } |
… | |
… | |
463 | { |
468 | { |
464 | switch (keysym) |
469 | switch (keysym) |
465 | { |
470 | { |
466 | /* normal XTerm key bindings */ |
471 | /* normal XTerm key bindings */ |
467 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
472 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
468 | selection_request (ev.time, 0, 0); |
473 | selection_request (ev.time); |
469 | return; |
474 | return; |
470 | #if TODO |
475 | #if TODO |
471 | /* rxvt extras */ |
476 | /* rxvt extras */ |
472 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
477 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
473 | change_font (FONT_UP); |
478 | change_font (FONT_UP); |
… | |
… | |
854 | { |
859 | { |
855 | #ifdef META8_OPTION |
860 | #ifdef META8_OPTION |
856 | /* set 8-bit on */ |
861 | /* set 8-bit on */ |
857 | if (meta && (meta_char == 0x80)) |
862 | if (meta && (meta_char == 0x80)) |
858 | { |
863 | { |
859 | unsigned char *ch; |
864 | char *ch; |
860 | |
865 | |
861 | for (ch = kbuf; ch < kbuf + len; ch++) |
866 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | *ch |= 0x80; |
867 | *ch |= 0x80; |
863 | |
868 | |
864 | meta = 0; |
869 | meta = 0; |
865 | } |
870 | } |
866 | #endif |
871 | #endif |
867 | /* nil */ ; |
872 | /* nil */ ; |
868 | } |
873 | } |
869 | } |
874 | } |
|
|
875 | |
|
|
876 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
|
|
877 | return; |
870 | |
878 | |
871 | if (len <= 0) |
879 | if (len <= 0) |
872 | return; /* not mapped */ |
880 | return; /* not mapped */ |
873 | |
881 | |
874 | if (OPTION (Opt_scrollTtyKeypress)) |
882 | if (OPTION (Opt_scrollTtyKeypress)) |
… | |
… | |
897 | #ifdef META8_OPTION |
905 | #ifdef META8_OPTION |
898 | && meta_char == C0_ESC |
906 | && meta_char == C0_ESC |
899 | #endif |
907 | #endif |
900 | ) |
908 | ) |
901 | { |
909 | { |
902 | const unsigned char ch = C0_ESC; |
910 | const char ch = C0_ESC; |
903 | tt_write (&ch, 1); |
911 | tt_write (&ch, 1); |
904 | } |
912 | } |
905 | |
913 | |
906 | #if defined(DEBUG_CMD) |
|
|
907 | /* Display keyboard buffer contents */ |
|
|
908 | unsigned char *p; |
|
|
909 | int i; |
|
|
910 | |
|
|
911 | fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); |
|
|
912 | for (i = 0, p = kbuf; i < len; i++, p++) |
|
|
913 | fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
|
|
914 | fprintf (stderr, "'\n"); |
|
|
915 | #endif /* DEBUG_CMD */ |
|
|
916 | tt_write (kbuf, (unsigned int)len); |
914 | tt_write (kbuf, (unsigned int)len); |
917 | } |
915 | } |
918 | /*}}} */ |
|
|
919 | |
916 | |
|
|
917 | void |
|
|
918 | rxvt_term::key_release (XKeyEvent &ev) |
|
|
919 | { |
|
|
920 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
|
|
921 | KeySym keysym; |
|
|
922 | |
|
|
923 | keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
|
|
924 | #endif |
|
|
925 | |
|
|
926 | #if ENABLE_FRILLS || ISO_14755 |
|
|
927 | // ISO 14755 support |
|
|
928 | if (iso14755buf) |
|
|
929 | if (iso14755buf & ISO_14755_52) |
|
|
930 | { |
|
|
931 | # if ENABLE_OVERLAY |
|
|
932 | scr_overlay_off (); |
|
|
933 | # endif |
|
|
934 | # if ISO_14755 |
|
|
935 | // iso14755 part 5.2 handling: release time |
|
|
936 | // first: controls |
|
|
937 | if ((ev.state & ControlMask) |
|
|
938 | && ((keysym >= 0x40 && keysym <= 0x5f) |
|
|
939 | || (keysym >= 0x61 && keysym <= 0x7f))) |
|
|
940 | { |
|
|
941 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
|
|
942 | commit_iso14755 (); |
|
|
943 | |
|
|
944 | return; |
|
|
945 | } |
|
|
946 | |
|
|
947 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
|
|
948 | if (i[0] == keysym) |
|
|
949 | { |
|
|
950 | iso14755buf = ISO_14755_51 | i[1]; |
|
|
951 | commit_iso14755 (); |
|
|
952 | |
|
|
953 | return; |
|
|
954 | } |
|
|
955 | |
|
|
956 | scr_bell (); |
|
|
957 | # endif |
|
|
958 | iso14755buf = 0; |
|
|
959 | |
|
|
960 | return; |
|
|
961 | } |
|
|
962 | else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
|
|
963 | { |
|
|
964 | # if ENABLE_OVERLAY |
|
|
965 | scr_overlay_off (); |
|
|
966 | # endif |
|
|
967 | if (iso14755buf & ISO_14755_51) |
|
|
968 | commit_iso14755 (); |
|
|
969 | #if ISO_14755 |
|
|
970 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
971 | { |
|
|
972 | iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair |
|
|
973 | |
|
|
974 | scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); |
|
|
975 | scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); |
|
|
976 | } |
|
|
977 | # endif |
|
|
978 | else |
|
|
979 | iso14755buf = 0; |
|
|
980 | } |
|
|
981 | #endif |
|
|
982 | |
|
|
983 | if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
984 | return; |
|
|
985 | |
|
|
986 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
987 | if (!(ev.state & ControlMask)) |
|
|
988 | slip_wheel_ev.stop (); |
|
|
989 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
|
|
990 | mouse_slip_wheel_speed = 0; |
|
|
991 | #endif |
|
|
992 | } |
|
|
993 | |
920 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
994 | #if defined (KEYSYM_RESOURCE) |
921 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
|
|
922 | /* attempt to `write' count to the input buffer */ |
|
|
923 | unsigned int |
995 | unsigned int |
924 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
996 | rxvt_term::cmd_write (const char *str, unsigned int count) |
925 | { |
997 | { |
926 | unsigned int n, s; |
998 | unsigned int n, s; |
927 | |
999 | |
928 | n = cmdbuf_ptr - cmdbuf_base; |
1000 | n = cmdbuf_ptr - cmdbuf_base; |
929 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
1001 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
966 | } |
1038 | } |
967 | #endif |
1039 | #endif |
968 | |
1040 | |
969 | if (want_refresh) |
1041 | if (want_refresh) |
970 | { |
1042 | { |
|
|
1043 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
|
|
1044 | { |
|
|
1045 | int row = view_start; |
|
|
1046 | int end_row = row + nrow; |
|
|
1047 | |
|
|
1048 | while (row > top_row && ROW (row - 1).is_longer ()) |
|
|
1049 | --row; |
|
|
1050 | |
|
|
1051 | do |
|
|
1052 | { |
|
|
1053 | int start_row = row; |
|
|
1054 | line_t *l; |
|
|
1055 | |
|
|
1056 | do |
|
|
1057 | { |
|
|
1058 | l = &ROW (row++); |
|
|
1059 | |
|
|
1060 | if (!(l->f & LINE_FILTERED)) |
|
|
1061 | { |
|
|
1062 | // line not filtered, mark it as filtered |
|
|
1063 | l->f |= LINE_FILTERED; |
|
|
1064 | while (l->is_longer ()) |
|
|
1065 | { |
|
|
1066 | l = &ROW (row++); |
|
|
1067 | l->f |= LINE_FILTERED; |
|
|
1068 | } |
|
|
1069 | |
|
|
1070 | // and filter it |
|
|
1071 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1072 | |
|
|
1073 | break; |
|
|
1074 | } |
|
|
1075 | } |
|
|
1076 | while (l->is_longer () && row < end_row); |
|
|
1077 | } |
|
|
1078 | while (row < end_row); |
|
|
1079 | } |
|
|
1080 | |
971 | scr_refresh (refresh_type); |
1081 | scr_refresh (); |
972 | scrollbar_show (1); |
1082 | scrollbar_show (1); |
973 | #ifdef USE_XIM |
1083 | #ifdef USE_XIM |
974 | IMSendSpot (); |
1084 | IMSendSpot (); |
975 | #endif |
1085 | #endif |
976 | } |
1086 | } |
… | |
… | |
979 | } |
1089 | } |
980 | |
1090 | |
981 | void |
1091 | void |
982 | rxvt_term::check_cb (check_watcher &w) |
1092 | rxvt_term::check_cb (check_watcher &w) |
983 | { |
1093 | { |
984 | SET_R (this); |
1094 | make_current (); |
985 | SET_LOCALE (locale); |
|
|
986 | |
1095 | |
987 | display->flush (); |
1096 | display->flush (); |
988 | |
1097 | |
989 | if (want_refresh && !flush_ev.active) |
1098 | if (want_refresh && !flush_ev.active) |
990 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
1099 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
991 | } |
1100 | } |
992 | |
1101 | |
993 | void |
1102 | void |
994 | rxvt_term::flush_cb (time_watcher &w) |
1103 | rxvt_term::flush_cb (time_watcher &w) |
995 | { |
1104 | { |
996 | SET_R (this); |
1105 | make_current (); |
997 | SET_LOCALE (locale); |
|
|
998 | |
1106 | |
999 | refresh_limit = 1; |
1107 | refresh_limit = 1; |
1000 | refresh_count = 0; |
1108 | refresh_count = 0; |
1001 | flush (); |
1109 | flush (); |
1002 | } |
1110 | } |
… | |
… | |
1006 | rxvt_term::cursor_blink_cb (time_watcher &w) |
1114 | rxvt_term::cursor_blink_cb (time_watcher &w) |
1007 | { |
1115 | { |
1008 | hidden_cursor = !hidden_cursor; |
1116 | hidden_cursor = !hidden_cursor; |
1009 | want_refresh = 1; |
1117 | want_refresh = 1; |
1010 | |
1118 | |
1011 | w.start (w.at + BLINK_INTERVAL); |
1119 | w.start (w.at + CURSOR_BLINK_INTERVAL); |
1012 | } |
1120 | } |
1013 | #endif |
1121 | #endif |
1014 | |
1122 | |
1015 | #ifdef TEXT_BLINK |
1123 | #ifdef TEXT_BLINK |
1016 | void |
1124 | void |
… | |
… | |
1030 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1138 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1031 | { |
1139 | { |
1032 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1140 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1033 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1141 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1034 | { |
1142 | { |
1035 | refresh_type |= SMOOTH_REFRESH; |
|
|
1036 | want_refresh = 1; |
1143 | want_refresh = 1; |
1037 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1144 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1038 | } |
1145 | } |
1039 | } |
1146 | } |
1040 | #endif |
1147 | #endif |
… | |
… | |
1044 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1151 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1045 | { |
1152 | { |
1046 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1153 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1047 | { |
1154 | { |
1048 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1155 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1049 | refresh_type |= SMOOTH_REFRESH; |
|
|
1050 | want_refresh = 1; |
1156 | want_refresh = 1; |
1051 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1157 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1052 | } |
1158 | } |
1053 | } |
1159 | } |
1054 | #endif |
1160 | #endif |
… | |
… | |
1059 | { |
1165 | { |
1060 | if (mouse_slip_wheel_speed == 0 |
1166 | if (mouse_slip_wheel_speed == 0 |
1061 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1167 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1062 | : scr_page (UP, mouse_slip_wheel_speed)) |
1168 | : scr_page (UP, mouse_slip_wheel_speed)) |
1063 | { |
1169 | { |
1064 | if (view_start == nsaved || |
1170 | if (view_start == top_row || view_start == 0) |
1065 | view_start == 0) |
|
|
1066 | mouse_slip_wheel_speed = 0; |
1171 | mouse_slip_wheel_speed = 0; |
1067 | |
1172 | |
1068 | refresh_type |= SMOOTH_REFRESH; |
|
|
1069 | want_refresh = 1; |
1173 | want_refresh = 1; |
1070 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1174 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1071 | } |
1175 | } |
1072 | } |
1176 | } |
1073 | #endif |
1177 | #endif |
1074 | |
1178 | |
1075 | #if HAVE_SCHED_YIELD |
1179 | #if LINUX_YIELD_HACK |
1076 | static struct event_handler |
1180 | static struct event_handler |
1077 | { |
1181 | { |
1078 | check_watcher cw_yield; |
1182 | check_watcher yield_ev; |
1079 | |
1183 | |
1080 | void yield (check_watcher &w) |
1184 | void yield_cb (check_watcher &w) |
1081 | { |
1185 | { |
1082 | sched_yield (); |
1186 | // this should really be sched_yield(), but the linux guys thought |
|
|
1187 | // that giving a process calling sched_yield () less cpu time than |
|
|
1188 | // ones with high nice levels is a useful thing to do. It surely is is |
|
|
1189 | // allowed by the sus... as is returning ENOSYS. |
|
|
1190 | |
|
|
1191 | struct timespec ts = { 0, 0 }; |
|
|
1192 | nanosleep (&ts, 0); |
|
|
1193 | |
1083 | w.stop (); |
1194 | w.stop (); |
1084 | } |
1195 | } |
1085 | |
1196 | |
1086 | event_handler () |
1197 | event_handler () |
1087 | : cw_yield (this, &event_handler::yield) |
1198 | : yield_ev (this, &event_handler::yield_cb) |
1088 | { |
1199 | { |
1089 | } |
1200 | } |
1090 | } event_handler; |
1201 | } event_handler; |
1091 | #endif |
1202 | #endif |
1092 | |
1203 | |
… | |
… | |
1095 | { |
1206 | { |
1096 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1207 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1097 | |
1208 | |
1098 | if (CBUFSIZ == n) |
1209 | if (CBUFSIZ == n) |
1099 | { |
1210 | { |
1100 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1211 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1101 | n = 0; |
1212 | n = 0; |
1102 | } |
1213 | } |
1103 | |
1214 | |
1104 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1215 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1105 | cmdbuf_ptr = cmdbuf_base; |
1216 | cmdbuf_ptr = cmdbuf_base; |
1106 | cmdbuf_endp = cmdbuf_ptr + n; |
1217 | cmdbuf_endp = cmdbuf_ptr + n; |
1107 | |
1218 | |
1108 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1219 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1109 | |
1220 | |
1110 | if (r > 0) |
1221 | if (r > 0) |
1111 | { |
1222 | { |
1112 | cmdbuf_endp += r; |
1223 | cmdbuf_endp += r; |
1113 | return true; |
1224 | return true; |
1114 | } |
1225 | } |
1115 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1226 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1116 | { |
1227 | { |
1117 | #if HAVE_SCHED_YIELD |
1228 | #if LINUX_YIELD_HACK |
1118 | if (display->is_local) |
1229 | if (display->is_local) |
1119 | event_handler.cw_yield.start (); |
1230 | event_handler.yield_ev.start (); |
1120 | #endif |
1231 | #endif |
1121 | } |
1232 | } |
1122 | else |
1233 | else |
1123 | { |
1234 | { |
1124 | pty_ev.stop (); |
1235 | pty_ev.stop (); |
… | |
… | |
1131 | } |
1242 | } |
1132 | |
1243 | |
1133 | void |
1244 | void |
1134 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1245 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1135 | { |
1246 | { |
1136 | SET_R (this); |
1247 | make_current (); |
1137 | SET_LOCALE (locale); |
|
|
1138 | |
1248 | |
1139 | if (revents & EVENT_READ) |
1249 | if (revents & EVENT_READ) |
1140 | // loop, but don't allow a single term to monopolize us |
1250 | // loop, but don't allow a single term to monopolize us |
1141 | while (pty_fill ()) |
1251 | while (pty_fill ()) |
1142 | if (cmd_parse ()) |
1252 | if (cmd_parse ()) |
… | |
… | |
1147 | } |
1257 | } |
1148 | |
1258 | |
1149 | void |
1259 | void |
1150 | rxvt_term::pointer_unblank () |
1260 | rxvt_term::pointer_unblank () |
1151 | { |
1261 | { |
1152 | XDefineCursor (display->display, vt, TermWin_cursor); |
1262 | XDefineCursor (dpy, vt, TermWin_cursor); |
1153 | recolour_cursor (); |
1263 | recolour_cursor (); |
1154 | |
1264 | |
1155 | #ifdef POINTER_BLANK |
1265 | #ifdef POINTER_BLANK |
1156 | hidden_pointer = 0; |
1266 | hidden_pointer = 0; |
1157 | |
1267 | |
… | |
… | |
1162 | |
1272 | |
1163 | #ifdef POINTER_BLANK |
1273 | #ifdef POINTER_BLANK |
1164 | void |
1274 | void |
1165 | rxvt_term::pointer_blank () |
1275 | rxvt_term::pointer_blank () |
1166 | { |
1276 | { |
1167 | if (! OPTION (Opt_pointerBlank)) |
1277 | if (!OPTION (Opt_pointerBlank)) |
1168 | return; |
1278 | return; |
1169 | |
1279 | |
1170 | XDefineCursor (display->display, vt, display->blank_cursor); |
1280 | XDefineCursor (dpy, vt, display->blank_cursor); |
1171 | XFlush (display->display); |
1281 | XFlush (dpy); |
1172 | |
1282 | |
1173 | hidden_pointer = 1; |
1283 | hidden_pointer = 1; |
1174 | } |
1284 | } |
1175 | |
1285 | |
1176 | void |
1286 | void |
1177 | rxvt_term::pointer_cb (time_watcher &w) |
1287 | rxvt_term::pointer_cb (time_watcher &w) |
1178 | { |
1288 | { |
1179 | SET_R (this); |
1289 | make_current (); |
1180 | SET_LOCALE (locale); |
|
|
1181 | |
1290 | |
1182 | pointer_blank (); |
1291 | pointer_blank (); |
1183 | } |
1292 | } |
1184 | #endif |
1293 | #endif |
1185 | |
1294 | |
… | |
… | |
1250 | (32 + button_number + key_state), |
1359 | (32 + button_number + key_state), |
1251 | (32 + x + 1), |
1360 | (32 + x + 1), |
1252 | (32 + y + 1)); |
1361 | (32 + y + 1)); |
1253 | } |
1362 | } |
1254 | |
1363 | |
1255 | #ifdef USING_W11LIB |
|
|
1256 | void |
|
|
1257 | rxvt_W11_process_x_event (XEvent *ev) |
|
|
1258 | { |
|
|
1259 | rxvt_t *r = rxvt_get_r (); |
|
|
1260 | |
|
|
1261 | x_cb (*ev); |
|
|
1262 | } |
|
|
1263 | #endif |
|
|
1264 | |
|
|
1265 | /*{{{ process an X event */ |
1364 | /*{{{ process an X event */ |
1266 | void |
1365 | void |
1267 | rxvt_term::x_cb (XEvent &ev) |
1366 | rxvt_term::x_cb (XEvent &ev) |
1268 | { |
1367 | { |
1269 | dDisp; |
1368 | make_current (); |
1270 | |
1369 | |
1271 | SET_R (this); |
1370 | dLocal (Display *, dpy); |
1272 | SET_LOCALE (locale); |
|
|
1273 | |
1371 | |
1274 | #if defined(CURSOR_BLINK) |
1372 | if (ev.xany.window == vt |
1275 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1373 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1276 | { |
1374 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1277 | if (hidden_cursor) |
1375 | return; |
1278 | { |
|
|
1279 | hidden_cursor = 0; |
|
|
1280 | want_refresh = 1; |
|
|
1281 | } |
|
|
1282 | |
1376 | |
1283 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1377 | // for XQueryPointer |
1284 | } |
|
|
1285 | #endif |
|
|
1286 | |
|
|
1287 | #if defined(POINTER_BLANK) |
|
|
1288 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1289 | { |
|
|
1290 | if (ev.type == MotionNotify |
|
|
1291 | || ev.type == ButtonPress |
|
|
1292 | || ev.type == ButtonRelease) |
|
|
1293 | if (hidden_pointer) |
|
|
1294 | pointer_unblank (); |
|
|
1295 | |
|
|
1296 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1297 | pointer_blank (); |
|
|
1298 | } |
|
|
1299 | #endif |
|
|
1300 | |
|
|
1301 | Window unused_root, unused_child; |
1378 | Window unused_root, unused_child; |
1302 | int unused_root_x, unused_root_y; |
1379 | int unused_root_x, unused_root_y; |
1303 | unsigned int unused_mask; |
1380 | unsigned int unused_mask; |
1304 | |
1381 | |
1305 | switch (ev.type) |
1382 | switch (ev.type) |
1306 | { |
1383 | { |
1307 | case KeyPress: |
1384 | case KeyPress: |
1308 | #if ISO_14755 |
1385 | key_press (ev.xkey); |
1309 | if (!(iso14755buf & ISO_14755_52)) |
|
|
1310 | #endif |
|
|
1311 | lookup_key (ev.xkey); |
|
|
1312 | |
|
|
1313 | break; |
1386 | break; |
1314 | |
1387 | |
1315 | case KeyRelease: |
1388 | case KeyRelease: |
1316 | { |
1389 | key_release (ev.xkey); |
1317 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
|
|
1318 | KeySym ks; |
|
|
1319 | |
|
|
1320 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
|
|
1321 | #endif |
|
|
1322 | |
|
|
1323 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1324 | // ISO 14755 support |
|
|
1325 | if (iso14755buf) |
|
|
1326 | if (iso14755buf & ISO_14755_52) |
|
|
1327 | { |
|
|
1328 | # if ENABLE_OVERLAY |
|
|
1329 | scr_overlay_off (); |
|
|
1330 | # endif |
|
|
1331 | # if ISO_14755 |
|
|
1332 | // iso14755 part 5.2 handling: release time |
|
|
1333 | // first: controls |
|
|
1334 | if ((ev.xkey.state & ControlMask) |
|
|
1335 | && ((ks >= 0x40 && ks <= 0x5f) |
|
|
1336 | || (ks >= 0x61 && ks <= 0x7f))) |
|
|
1337 | { |
|
|
1338 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
|
|
1339 | commit_iso14755 (); |
|
|
1340 | return; // case-break; |
|
|
1341 | } |
|
|
1342 | |
|
|
1343 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
|
|
1344 | if (i[0] == ks) |
|
|
1345 | { |
|
|
1346 | iso14755buf = ISO_14755_51 | i[1]; |
|
|
1347 | commit_iso14755 (); |
|
|
1348 | return; // case-break; |
|
|
1349 | } |
|
|
1350 | |
|
|
1351 | scr_bell (); |
|
|
1352 | # endif |
|
|
1353 | iso14755buf = 0; |
|
|
1354 | break; |
|
|
1355 | } |
|
|
1356 | else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
|
|
1357 | { |
|
|
1358 | # if ENABLE_OVERLAY |
|
|
1359 | scr_overlay_off (); |
|
|
1360 | # endif |
|
|
1361 | if (iso14755buf & ISO_14755_51) |
|
|
1362 | commit_iso14755 (); |
|
|
1363 | #if ISO_14755 |
|
|
1364 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
1365 | { |
|
|
1366 | iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair |
|
|
1367 | |
|
|
1368 | scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); |
|
|
1369 | scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); |
|
|
1370 | } |
|
|
1371 | # endif |
|
|
1372 | else |
|
|
1373 | iso14755buf = 0; |
|
|
1374 | } |
|
|
1375 | #endif |
|
|
1376 | |
|
|
1377 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
1378 | if (!(ev.xkey.state & ControlMask)) |
|
|
1379 | slip_wheel_ev.stop (); |
|
|
1380 | else if (ks == XK_Control_L || ks == XK_Control_R) |
|
|
1381 | mouse_slip_wheel_speed = 0; |
|
|
1382 | #endif |
|
|
1383 | break; |
1390 | break; |
1384 | } |
|
|
1385 | |
1391 | |
1386 | case ButtonPress: |
1392 | case ButtonPress: |
1387 | button_press (ev.xbutton); |
1393 | button_press (ev.xbutton); |
1388 | break; |
1394 | break; |
1389 | |
1395 | |
… | |
… | |
1391 | button_release (ev.xbutton); |
1397 | button_release (ev.xbutton); |
1392 | break; |
1398 | break; |
1393 | |
1399 | |
1394 | case ClientMessage: |
1400 | case ClientMessage: |
1395 | if (ev.xclient.format == 32 |
1401 | if (ev.xclient.format == 32 |
1396 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
1402 | && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END))) |
1397 | { |
1403 | { |
|
|
1404 | if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1405 | { |
|
|
1406 | if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END))) |
|
|
1407 | { |
1398 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1408 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
|
|
1409 | { |
|
|
1410 | if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) |
1399 | destroy (); |
1411 | destroy (); |
|
|
1412 | } |
1400 | #if ENABLE_EWMH |
1413 | #if ENABLE_EWMH |
1401 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1414 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1402 | XSendEvent (disp, ev.xclient.window = display->root, |
1415 | XSendEvent (dpy, ev.xclient.window = display->root, |
1403 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1416 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1404 | &ev); |
1417 | &ev); |
|
|
1418 | #endif |
|
|
1419 | } |
|
|
1420 | } |
|
|
1421 | #if ENABLE_XEMBED |
|
|
1422 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1423 | { |
|
|
1424 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1425 | focus_in (); |
|
|
1426 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1427 | focus_out (); |
|
|
1428 | } |
1405 | #endif |
1429 | #endif |
1406 | } |
1430 | } |
1407 | #if ENABLE_XEMBED |
|
|
1408 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1409 | { |
|
|
1410 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1411 | focus_in (); |
|
|
1412 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1413 | focus_out (); |
|
|
1414 | } |
|
|
1415 | #endif |
|
|
1416 | #ifdef OFFIX_DND |
|
|
1417 | /* OffiX Dnd (drag 'n' drop) protocol */ |
|
|
1418 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
|
|
1419 | && (ev.xclient.data.l[0] == DndFile |
|
|
1420 | || ev.xclient.data.l[0] == DndDir |
|
|
1421 | || ev.xclient.data.l[0] == DndLink)) |
|
|
1422 | { |
|
|
1423 | /* Get Dnd data */ |
|
|
1424 | Atom ActualType; |
|
|
1425 | int ActualFormat; |
|
|
1426 | unsigned char *data; |
|
|
1427 | unsigned long Size, RemainingBytes; |
|
|
1428 | |
|
|
1429 | XGetWindowProperty (disp, display->root, |
|
|
1430 | xa[XA_DNDSELECTION], |
|
|
1431 | 0L, 1000000L, |
|
|
1432 | False, AnyPropertyType, |
|
|
1433 | &ActualType, &ActualFormat, |
|
|
1434 | &Size, &RemainingBytes, |
|
|
1435 | &data); |
|
|
1436 | set_string_property (XA_CUT_BUFFER0, data); |
|
|
1437 | XFree (data); |
|
|
1438 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
|
|
1439 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
|
|
1440 | } |
|
|
1441 | #endif /* OFFIX_DND */ |
|
|
1442 | break; |
1431 | break; |
1443 | |
1432 | |
1444 | case MappingNotify: |
1433 | case MappingNotify: |
1445 | XRefreshKeyboardMapping (&ev.xmapping); |
1434 | XRefreshKeyboardMapping (&ev.xmapping); |
1446 | break; |
1435 | break; |
… | |
… | |
1479 | break; |
1468 | break; |
1480 | |
1469 | |
1481 | case ConfigureNotify: |
1470 | case ConfigureNotify: |
1482 | if (ev.xconfigure.window == parent[0]) |
1471 | if (ev.xconfigure.window == parent[0]) |
1483 | { |
1472 | { |
1484 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
1473 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
1485 | ; |
1474 | ; |
1486 | |
1475 | |
1487 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1476 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1488 | { |
1477 | { |
1489 | seen_resize = 1; |
1478 | seen_resize = 1; |
1490 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1479 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1491 | } |
1480 | } |
1492 | |
1481 | |
|
|
1482 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1483 | |
1493 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1484 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1494 | if (OPTION (Opt_transparent)) |
1485 | if (OPTION (Opt_transparent)) |
1495 | check_our_parents (); |
1486 | check_our_parents (); |
1496 | #endif |
1487 | #endif |
1497 | } |
1488 | } |
1498 | break; |
1489 | break; |
1499 | |
1490 | |
1500 | case PropertyNotify: |
1491 | case PropertyNotify: |
|
|
1492 | if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1501 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1493 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1502 | && ev.xproperty.state == PropertyNewValue) |
1494 | && ev.xproperty.state == PropertyNewValue) |
1503 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1495 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1504 | |
1496 | |
1505 | break; |
1497 | break; |
1506 | |
1498 | |
1507 | case SelectionClear: |
1499 | case SelectionClear: |
1508 | selection_clear (); |
1500 | selection_clear (); |
… | |
… | |
1513 | selection_paste (ev.xselection.requestor, ev.xselection.property, true); |
1505 | selection_paste (ev.xselection.requestor, ev.xselection.property, true); |
1514 | break; |
1506 | break; |
1515 | |
1507 | |
1516 | case SelectionRequest: |
1508 | case SelectionRequest: |
1517 | selection_send (ev.xselectionrequest); |
1509 | selection_send (ev.xselectionrequest); |
|
|
1510 | break; |
|
|
1511 | |
|
|
1512 | case MapNotify: |
|
|
1513 | mapped = 1; |
|
|
1514 | #ifdef TEXT_BLINK |
|
|
1515 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1516 | #endif |
|
|
1517 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1518 | break; |
1518 | break; |
1519 | |
1519 | |
1520 | case UnmapNotify: |
1520 | case UnmapNotify: |
1521 | mapped = 0; |
1521 | mapped = 0; |
1522 | #ifdef TEXT_BLINK |
1522 | #ifdef TEXT_BLINK |
1523 | text_blink_ev.stop (); |
1523 | text_blink_ev.stop (); |
1524 | #endif |
1524 | #endif |
1525 | break; |
1525 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1526 | |
|
|
1527 | case MapNotify: |
|
|
1528 | mapped = 1; |
|
|
1529 | #ifdef TEXT_BLINK |
|
|
1530 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1531 | #endif |
|
|
1532 | break; |
1526 | break; |
1533 | |
1527 | |
1534 | #ifdef TRANSPARENT |
1528 | #ifdef TRANSPARENT |
1535 | case ReparentNotify: |
1529 | case ReparentNotify: |
1536 | rootwin_cb (ev); |
1530 | rootwin_cb (ev); |
… | |
… | |
1542 | if (ev.xany.window == vt) |
1536 | if (ev.xany.window == vt) |
1543 | { |
1537 | { |
1544 | do |
1538 | do |
1545 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1539 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1546 | ev.xexpose.width, ev.xexpose.height, False); |
1540 | ev.xexpose.width, ev.xexpose.height, False); |
1547 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1541 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); |
1548 | |
1542 | |
1549 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1543 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1550 | |
1544 | |
1551 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1545 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) |
1552 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1546 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1553 | ev.xexpose.width, ev.xexpose.height, False); |
1547 | ev.xexpose.width, ev.xexpose.height, False); |
1554 | |
1548 | |
1555 | scr_refresh (refresh_type); |
1549 | want_refresh = 1; |
1556 | } |
1550 | } |
1557 | else |
1551 | else |
1558 | { |
1552 | { |
1559 | XEvent unused_event; |
1553 | XEvent unused_event; |
1560 | |
1554 | |
1561 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1555 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) |
1562 | ; |
1556 | ; |
1563 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1557 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1564 | ; |
1558 | ; |
1565 | |
1559 | |
1566 | if (isScrollbarWindow (ev.xany.window)) |
1560 | if (isScrollbarWindow (ev.xany.window)) |
1567 | { |
1561 | { |
1568 | scrollBar.setIdle (); |
1562 | scrollBar.setIdle (); |
1569 | scrollbar_show (0); |
1563 | scrollbar_show (0); |
1570 | } |
1564 | } |
1571 | #ifdef MENUBAR |
|
|
1572 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1573 | menubar_expose (); |
|
|
1574 | #endif |
|
|
1575 | |
1565 | |
1576 | #ifdef TRANSPARENT |
1566 | #ifdef TRANSPARENT |
1577 | if (am_transparent && ev.xany.window == parent[0]) |
1567 | if (am_transparent && ev.xany.window == parent[0]) |
1578 | XClearWindow (disp, ev.xany.window); |
1568 | XClearWindow (dpy, ev.xany.window); |
1579 | #endif |
1569 | #endif |
1580 | } |
1570 | } |
1581 | break; |
1571 | break; |
1582 | |
1572 | |
1583 | case MotionNotify: |
1573 | case MotionNotify: |
1584 | #ifdef POINTER_BLANK |
1574 | #ifdef POINTER_BLANK |
1585 | if (hidden_pointer) |
1575 | if (hidden_pointer) |
1586 | pointer_unblank (); |
1576 | pointer_unblank (); |
1587 | #endif |
1577 | #endif |
1588 | #if MENUBAR |
|
|
1589 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1590 | { |
|
|
1591 | menubar_control (ev.xbutton); |
|
|
1592 | break; |
|
|
1593 | } |
|
|
1594 | #endif |
|
|
1595 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1578 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1596 | break; |
1579 | break; |
1597 | |
1580 | |
1598 | if (ev.xany.window == vt) |
1581 | if (ev.xany.window == vt) |
1599 | { |
1582 | { |
|
|
1583 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
|
|
1584 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1585 | ; // nop |
1600 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1586 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1601 | { |
1587 | { |
1602 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1588 | while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev)) |
1603 | ; |
1589 | ; |
1604 | |
1590 | |
1605 | XQueryPointer (disp, vt, |
1591 | XQueryPointer (dpy, vt, |
1606 | &unused_root, &unused_child, |
1592 | &unused_root, &unused_child, |
1607 | &unused_root_x, &unused_root_y, |
1593 | &unused_root_x, &unused_root_y, |
1608 | &ev.xbutton.x, &ev.xbutton.y, |
1594 | &ev.xbutton.x, &ev.xbutton.y, |
1609 | &ev.xbutton.state); |
1595 | &ev.xbutton.state); |
1610 | #ifdef MOUSE_THRESHOLD |
1596 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1674 | #endif |
1660 | #endif |
1675 | } |
1661 | } |
1676 | } |
1662 | } |
1677 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1663 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1678 | { |
1664 | { |
1679 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1665 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1680 | MotionNotify, &ev)) |
1666 | MotionNotify, &ev)) |
1681 | ; |
1667 | ; |
1682 | |
1668 | |
1683 | XQueryPointer (disp, scrollBar.win, |
1669 | XQueryPointer (dpy, scrollBar.win, |
1684 | &unused_root, &unused_child, |
1670 | &unused_root, &unused_child, |
1685 | &unused_root_x, &unused_root_y, |
1671 | &unused_root_x, &unused_root_y, |
1686 | &ev.xbutton.x, &ev.xbutton.y, |
1672 | &ev.xbutton.x, &ev.xbutton.y, |
1687 | &unused_mask); |
1673 | &unused_mask); |
1688 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1674 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1689 | scrollbar_size ()); |
1675 | scrollbar_size ()); |
1690 | scr_refresh (refresh_type); |
1676 | want_refresh = 1; |
1691 | refresh_limit = 0; |
1677 | refresh_limit = 0; |
1692 | scrollbar_show (1); |
1678 | scrollbar_show (1); |
1693 | } |
1679 | } |
1694 | break; |
1680 | break; |
1695 | } |
1681 | } |
|
|
1682 | |
|
|
1683 | #if defined(CURSOR_BLINK) |
|
|
1684 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1685 | { |
|
|
1686 | if (hidden_cursor) |
|
|
1687 | { |
|
|
1688 | hidden_cursor = 0; |
|
|
1689 | want_refresh = 1; |
|
|
1690 | } |
|
|
1691 | |
|
|
1692 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
|
|
1693 | } |
|
|
1694 | #endif |
|
|
1695 | |
|
|
1696 | #if defined(POINTER_BLANK) |
|
|
1697 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1698 | { |
|
|
1699 | if (ev.type == MotionNotify |
|
|
1700 | || ev.type == ButtonPress |
|
|
1701 | || ev.type == ButtonRelease) |
|
|
1702 | if (hidden_pointer) |
|
|
1703 | pointer_unblank (); |
|
|
1704 | |
|
|
1705 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1706 | pointer_blank (); |
|
|
1707 | } |
|
|
1708 | #endif |
1696 | } |
1709 | } |
1697 | |
1710 | |
1698 | void |
1711 | void |
1699 | rxvt_term::focus_in () |
1712 | rxvt_term::focus_in () |
1700 | { |
1713 | { |
1701 | if (!focus) |
1714 | if (!focus) |
1702 | { |
1715 | { |
1703 | focus = 1; |
1716 | focus = 1; |
1704 | want_refresh = 1; |
1717 | want_refresh = 1; |
1705 | |
1718 | |
1706 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1719 | HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); |
1707 | |
1720 | |
1708 | #if USE_XIM |
1721 | #if USE_XIM |
1709 | if (Input_Context != NULL) |
1722 | if (Input_Context != NULL) |
1710 | { |
1723 | { |
1711 | IMSetStatusPosition (); |
1724 | IMSetPosition (); |
1712 | XSetICFocus (Input_Context); |
1725 | XSetICFocus (Input_Context); |
1713 | } |
1726 | } |
1714 | #endif |
1727 | #endif |
1715 | #if CURSOR_BLINK |
1728 | #if CURSOR_BLINK |
1716 | if (OPTION (Opt_cursorBlink)) |
1729 | if (OPTION (Opt_cursorBlink)) |
1717 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1730 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
1718 | #endif |
1731 | #endif |
1719 | #if OFF_FOCUS_FADING |
1732 | #if OFF_FOCUS_FADING |
1720 | if (rs[Rs_fade]) |
1733 | if (rs[Rs_fade]) |
1721 | { |
1734 | { |
1722 | pix_colors = pix_colors_focused; |
1735 | pix_colors = pix_colors_focused; |
… | |
… | |
1732 | if (focus) |
1745 | if (focus) |
1733 | { |
1746 | { |
1734 | focus = 0; |
1747 | focus = 0; |
1735 | want_refresh = 1; |
1748 | want_refresh = 1; |
1736 | |
1749 | |
1737 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1750 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1738 | |
1751 | |
1739 | #if ENABLE_FRILLS || ISO_14755 |
1752 | #if ENABLE_FRILLS || ISO_14755 |
1740 | if (iso14755buf) |
1753 | if (iso14755buf) |
1741 | { |
1754 | { |
1742 | iso14755buf = 0; |
1755 | iso14755buf = 0; |
… | |
… | |
1766 | |
1779 | |
1767 | #if TRANSPARENT |
1780 | #if TRANSPARENT |
1768 | void |
1781 | void |
1769 | rxvt_term::rootwin_cb (XEvent &ev) |
1782 | rxvt_term::rootwin_cb (XEvent &ev) |
1770 | { |
1783 | { |
1771 | SET_R (this); |
1784 | make_current (); |
1772 | SET_LOCALE (locale); |
|
|
1773 | |
1785 | |
1774 | switch (ev.type) |
1786 | switch (ev.type) |
1775 | { |
1787 | { |
1776 | case PropertyNotify: |
1788 | case PropertyNotify: |
1777 | /* |
1789 | /* |
… | |
… | |
1804 | /* |
1816 | /* |
1805 | * VT window processing of button press |
1817 | * VT window processing of button press |
1806 | */ |
1818 | */ |
1807 | if (ev.window == vt) |
1819 | if (ev.window == vt) |
1808 | { |
1820 | { |
|
|
1821 | if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
|
|
1822 | return; |
|
|
1823 | |
1809 | #if ISO_14755 |
1824 | #if ISO_14755 |
1810 | // 5.4 |
1825 | // 5.4 |
1811 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1826 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1812 | { |
1827 | { |
1813 | iso14755_54 (ev.x, ev.y); |
1828 | iso14755_54 (ev.x, ev.y); |
… | |
… | |
1825 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1840 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1826 | if (ev.button == MEvent.button && clickintime) |
1841 | if (ev.button == MEvent.button && clickintime) |
1827 | { |
1842 | { |
1828 | /* same button, within alloted time */ |
1843 | /* same button, within alloted time */ |
1829 | MEvent.clicks++; |
1844 | MEvent.clicks++; |
|
|
1845 | |
1830 | if (MEvent.clicks > 1) |
1846 | if (MEvent.clicks > 1) |
1831 | { |
1847 | { |
1832 | /* only report double clicks */ |
1848 | /* only report double clicks */ |
1833 | MEvent.clicks = 2; |
1849 | MEvent.clicks = 2; |
1834 | mouse_report (ev); |
1850 | mouse_report (ev); |
… | |
… | |
1854 | else |
1870 | else |
1855 | { |
1871 | { |
1856 | if (ev.button != MEvent.button) |
1872 | if (ev.button != MEvent.button) |
1857 | MEvent.clicks = 0; |
1873 | MEvent.clicks = 0; |
1858 | |
1874 | |
1859 | if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) |
|
|
1860 | switch (ev.button) |
1875 | switch (ev.button) |
1861 | { |
1876 | { |
1862 | case Button1: |
1877 | case Button1: |
1863 | /* allow meta + click to select rectangular areas */ |
1878 | /* allow meta + click to select rectangular areas */ |
1864 | /* should be done in screen.C */ |
1879 | /* should be done in screen.C */ |
1865 | #if ENABLE_FRILLS |
1880 | #if ENABLE_FRILLS |
1866 | selection.rect = !!(ev.state & ModMetaMask); |
1881 | selection.rect = !!(ev.state & ModMetaMask); |
1867 | #else |
1882 | #else |
1868 | selection.rect = false; |
1883 | selection.rect = false; |
1869 | #endif |
1884 | #endif |
1870 | |
1885 | |
1871 | /* allow shift+left click to extend selection */ |
1886 | /* allow shift+left click to extend selection */ |
1872 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1887 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1873 | { |
1888 | { |
1874 | if (MEvent.button == Button1 && clickintime) |
1889 | if (MEvent.button == Button1 && clickintime) |
1875 | selection_rotate (ev.x, ev.y); |
1890 | selection_rotate (ev.x, ev.y); |
1876 | else |
1891 | else |
1877 | selection_extend (ev.x, ev.y, 1); |
1892 | selection_extend (ev.x, ev.y, 1); |
1878 | } |
1893 | } |
1879 | else |
1894 | else |
1880 | { |
1895 | { |
1881 | if (MEvent.button == Button1 && clickintime) |
1896 | if (MEvent.button == Button1 && clickintime) |
1882 | MEvent.clicks++; |
1897 | MEvent.clicks++; |
1883 | else |
1898 | else |
1884 | MEvent.clicks = 1; |
1899 | MEvent.clicks = 1; |
1885 | |
1900 | |
1886 | selection_click (MEvent.clicks, ev.x, ev.y); |
1901 | selection_click (MEvent.clicks, ev.x, ev.y); |
1887 | } |
1902 | } |
1888 | |
1903 | |
1889 | MEvent.button = Button1; |
1904 | MEvent.button = Button1; |
1890 | break; |
1905 | break; |
1891 | |
1906 | |
1892 | case Button3: |
1907 | case Button3: |
1893 | if (MEvent.button == Button3 && clickintime) |
1908 | if (MEvent.button == Button3 && clickintime) |
1894 | selection_rotate (ev.x, ev.y); |
1909 | selection_rotate (ev.x, ev.y); |
1895 | else |
1910 | else |
1896 | selection_extend (ev.x, ev.y, 1); |
1911 | selection_extend (ev.x, ev.y, 1); |
1897 | |
1912 | |
1898 | MEvent.button = Button3; |
1913 | MEvent.button = Button3; |
1899 | break; |
1914 | break; |
1900 | } |
1915 | } |
1901 | } |
1916 | } |
1902 | |
1917 | |
1903 | MEvent.time = ev.time; |
1918 | MEvent.time = ev.time; |
1904 | return; |
1919 | return; |
1905 | } |
1920 | } |
1906 | |
1921 | |
… | |
… | |
2042 | } |
2057 | } |
2043 | |
2058 | |
2044 | break; |
2059 | break; |
2045 | } |
2060 | } |
2046 | } |
2061 | } |
|
|
2062 | |
2047 | return; |
2063 | return; |
2048 | } |
2064 | } |
2049 | #if MENUBAR |
|
|
2050 | /* |
|
|
2051 | * Menubar window processing of button press |
|
|
2052 | */ |
|
|
2053 | if (isMenuBarWindow (ev.window)) |
|
|
2054 | menubar_control (ev); |
|
|
2055 | #endif |
|
|
2056 | } |
2065 | } |
2057 | |
2066 | |
2058 | void |
2067 | void |
2059 | rxvt_term::button_release (XButtonEvent &ev) |
2068 | rxvt_term::button_release (XButtonEvent &ev) |
2060 | { |
2069 | { |
… | |
… | |
2066 | |
2075 | |
2067 | if (scrollbar_isUpDn ()) |
2076 | if (scrollbar_isUpDn ()) |
2068 | { |
2077 | { |
2069 | scrollBar.setIdle (); |
2078 | scrollBar.setIdle (); |
2070 | scrollbar_show (0); |
2079 | scrollbar_show (0); |
2071 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
2072 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
2073 | #endif |
|
|
2074 | } |
2080 | } |
2075 | |
2081 | |
2076 | #ifdef SELECTION_SCROLLING |
2082 | #ifdef SELECTION_SCROLLING |
2077 | if (sel_scroll_ev.active) |
2083 | if (sel_scroll_ev.active) |
2078 | sel_scroll_ev.stop(); |
2084 | sel_scroll_ev.stop(); |
2079 | #endif |
2085 | #endif |
2080 | |
2086 | |
2081 | if (ev.window == vt) |
2087 | if (ev.window == vt) |
2082 | { |
2088 | { |
|
|
2089 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2090 | return; |
|
|
2091 | |
2083 | #if ISO_14755 |
2092 | #if ISO_14755 |
2084 | // 5.4 |
2093 | // 5.4 |
2085 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2094 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2086 | return; |
2095 | return; |
2087 | #endif |
2096 | #endif |
|
|
2097 | |
2088 | if (reportmode) |
2098 | if (reportmode) |
2089 | { |
2099 | { |
2090 | /* mouse report from vt window */ |
2100 | /* mouse report from vt window */ |
2091 | /* don't report release of wheel "buttons" */ |
2101 | /* don't report release of wheel "buttons" */ |
2092 | if (ev.button >= 4) |
2102 | if (ev.button >= 4) |
… | |
… | |
2122 | { |
2132 | { |
2123 | case Button1: |
2133 | case Button1: |
2124 | case Button3: |
2134 | case Button3: |
2125 | selection_make (ev.time); |
2135 | selection_make (ev.time); |
2126 | break; |
2136 | break; |
|
|
2137 | |
2127 | case Button2: |
2138 | case Button2: |
2128 | selection_request (ev.time, ev.x, ev.y); |
2139 | if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
|
|
2140 | selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); |
2129 | break; |
2141 | break; |
|
|
2142 | |
2130 | #ifdef MOUSE_WHEEL |
2143 | #ifdef MOUSE_WHEEL |
2131 | case Button4: |
2144 | case Button4: |
2132 | case Button5: |
2145 | case Button5: |
2133 | { |
2146 | { |
2134 | int i; |
2147 | int i; |
… | |
… | |
2156 | slip_wheel_ev.start (); |
2169 | slip_wheel_ev.start (); |
2157 | } |
2170 | } |
2158 | else |
2171 | else |
2159 | { |
2172 | { |
2160 | # endif |
2173 | # endif |
2161 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2162 | scr_page (v, i); |
2174 | scr_page (v, i); |
2163 | scr_refresh (SMOOTH_REFRESH); |
|
|
2164 | scrollbar_show (1); |
2175 | scrollbar_show (1); |
2165 | # else |
|
|
2166 | while (i--) |
|
|
2167 | { |
|
|
2168 | scr_page (v, 1); |
|
|
2169 | scr_refresh (SMOOTH_REFRESH); |
|
|
2170 | scrollbar_show (1); |
|
|
2171 | } |
|
|
2172 | # endif |
|
|
2173 | # ifdef MOUSE_SLIP_WHEELING |
2176 | # ifdef MOUSE_SLIP_WHEELING |
2174 | } |
2177 | } |
2175 | #endif |
2178 | # endif |
2176 | } |
2179 | } |
2177 | break; |
2180 | break; |
2178 | #endif |
2181 | #endif |
2179 | } |
2182 | } |
2180 | } |
2183 | } |
2181 | #ifdef MENUBAR |
|
|
2182 | else if (isMenuBarWindow (ev.window)) |
|
|
2183 | menubar_control (ev); |
|
|
2184 | #endif |
|
|
2185 | } |
2184 | } |
2186 | |
2185 | |
2187 | #ifdef TRANSPARENT |
2186 | #ifdef TRANSPARENT |
2188 | #if TINTING |
2187 | #if TINTING |
2189 | /* taken from aterm-0.4.2 */ |
2188 | /* taken from aterm-0.4.2 */ |
2190 | |
2189 | |
2191 | typedef uint32_t RUINT32T; |
2190 | typedef uint32_t RUINT32T; |
2192 | |
2191 | |
2193 | void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) |
2192 | void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) |
2194 | { |
2193 | { |
2195 | int sh_r, sh_g, sh_b; |
2194 | int sh_r, sh_g, sh_b; |
2196 | RUINT32T mask_r, mask_g, mask_b; |
2195 | RUINT32T mask_r, mask_g, mask_b; |
2197 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2196 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2198 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2197 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2199 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2198 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2200 | int i; |
2199 | int i; |
2201 | |
2200 | |
2202 | Visual *visual = display->visual; |
2201 | Visual *visual = term->visual; |
2203 | |
2202 | |
2204 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2203 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2205 | |
2204 | |
2206 | /* for convenience */ |
2205 | /* for convenience */ |
2207 | mask_r = visual->red_mask; |
2206 | mask_r = visual->red_mask; |
… | |
… | |
2428 | Atom atype; |
2427 | Atom atype; |
2429 | unsigned char *prop = NULL; |
2428 | unsigned char *prop = NULL; |
2430 | Window root, oldp, *list; |
2429 | Window root, oldp, *list; |
2431 | Pixmap rootpixmap = None; |
2430 | Pixmap rootpixmap = None; |
2432 | XWindowAttributes wattr, wrootattr; |
2431 | XWindowAttributes wattr, wrootattr; |
2433 | dDisp; |
|
|
2434 | |
2432 | |
2435 | pchanged = 0; |
2433 | pchanged = 0; |
2436 | |
2434 | |
2437 | if (!OPTION (Opt_transparent)) |
2435 | if (!OPTION (Opt_transparent)) |
2438 | return pchanged; /* Don't try any more */ |
2436 | return pchanged; /* Don't try any more */ |
2439 | |
2437 | |
2440 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2438 | XGetWindowAttributes (dpy, display->root, &wrootattr); |
2441 | rootdepth = wrootattr.depth; |
2439 | rootdepth = wrootattr.depth; |
2442 | |
2440 | |
2443 | XGetWindowAttributes (disp, parent[0], &wattr); |
2441 | XGetWindowAttributes (dpy, parent[0], &wattr); |
2444 | |
2442 | |
2445 | if (rootdepth != wattr.depth) |
2443 | if (rootdepth != wattr.depth) |
2446 | { |
2444 | { |
2447 | if (am_transparent) |
2445 | if (am_transparent) |
2448 | { |
2446 | { |
2449 | pchanged = 1; |
2447 | pchanged = 1; |
2450 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2448 | XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); |
2451 | am_transparent = am_pixmap_trans = 0; |
2449 | am_transparent = am_pixmap_trans = 0; |
2452 | } |
2450 | } |
2453 | |
2451 | |
2454 | return pchanged; /* Don't try any more */ |
2452 | return pchanged; /* Don't try any more */ |
2455 | } |
2453 | } |
2456 | |
2454 | |
2457 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2455 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2458 | XSync (disp, False); |
2456 | XSync (dpy, False); |
2459 | |
2457 | |
2460 | /* |
2458 | /* |
2461 | * Make the frame window set by the window manager have |
2459 | * Make the frame window set by the window manager have |
2462 | * the root background. Some window managers put multiple nested frame |
2460 | * the root background. Some window managers put multiple nested frame |
2463 | * windows for each client, so we have to take care about that. |
2461 | * windows for each client, so we have to take care about that. |
2464 | */ |
2462 | */ |
2465 | i = (xa[XA_XROOTPMAP_ID] |
2463 | i = (xa[XA_XROOTPMAP_ID] |
2466 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2464 | && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID], |
2467 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2465 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2468 | &nitems, &bytes_after, &prop) == Success); |
2466 | &nitems, &bytes_after, &prop) == Success); |
2469 | |
2467 | |
2470 | if (!i || prop == NULL) |
2468 | if (!i || prop == NULL) |
2471 | i = (xa[XA_ESETROOT_PMAP_ID] |
2469 | i = (xa[XA_ESETROOT_PMAP_ID] |
2472 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2470 | && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], |
2473 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2471 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2474 | &nitems, &bytes_after, &prop) == Success); |
2472 | &nitems, &bytes_after, &prop) == Success); |
2475 | |
2473 | |
2476 | if (!i || prop == NULL |
2474 | if (!i || prop == NULL |
2477 | #if TINTING |
2475 | #if TINTING |
2478 | || !rs[Rs_color + Color_tint] |
2476 | || !ISSET_PIXCOLOR (Color_tint) |
2479 | #endif |
2477 | #endif |
2480 | ) |
2478 | ) |
2481 | have_pixmap = 0; |
2479 | have_pixmap = 0; |
2482 | else |
2480 | else |
2483 | { |
2481 | { |
… | |
… | |
2496 | Window cr; |
2494 | Window cr; |
2497 | XImage *image; |
2495 | XImage *image; |
2498 | GC gc; |
2496 | GC gc; |
2499 | XGCValues gcvalue; |
2497 | XGCValues gcvalue; |
2500 | |
2498 | |
2501 | XTranslateCoordinates (disp, parent[0], display->root, |
2499 | XTranslateCoordinates (dpy, parent[0], display->root, |
2502 | 0, 0, &sx, &sy, &cr); |
2500 | 0, 0, &sx, &sy, &cr); |
2503 | nw = (unsigned int)szHint.width; |
2501 | nw = (unsigned int)szHint.width; |
2504 | nh = (unsigned int)szHint.height; |
2502 | nh = (unsigned int)szHint.height; |
2505 | nx = ny = 0; |
2503 | nx = ny = 0; |
2506 | |
2504 | |
… | |
… | |
2519 | } |
2517 | } |
2520 | |
2518 | |
2521 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2519 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2522 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2520 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2523 | |
2521 | |
2524 | XSync (disp, False); |
2522 | XSync (dpy, False); |
2525 | allowedxerror = -1; |
2523 | allowedxerror = -1; |
2526 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2524 | image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2527 | |
2525 | |
2528 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2526 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2529 | /* XXX: may need a delay here? */ |
2527 | /* XXX: may need a delay here? */ |
2530 | allowedxerror = 0; |
2528 | allowedxerror = 0; |
2531 | |
2529 | |
… | |
… | |
2534 | if (am_transparent && am_pixmap_trans) |
2532 | if (am_transparent && am_pixmap_trans) |
2535 | { |
2533 | { |
2536 | pchanged = 1; |
2534 | pchanged = 1; |
2537 | if (pixmap != None) |
2535 | if (pixmap != None) |
2538 | { |
2536 | { |
2539 | XFreePixmap (disp, pixmap); |
2537 | XFreePixmap (dpy, pixmap); |
2540 | pixmap = None; |
2538 | pixmap = None; |
2541 | } |
2539 | } |
2542 | } |
2540 | } |
2543 | |
2541 | |
2544 | am_pixmap_trans = 0; |
2542 | am_pixmap_trans = 0; |
2545 | } |
2543 | } |
2546 | else |
2544 | else |
2547 | { |
2545 | { |
2548 | if (pixmap != None) |
2546 | if (pixmap != None) |
2549 | XFreePixmap (disp, pixmap); |
2547 | XFreePixmap (dpy, pixmap); |
2550 | |
2548 | |
2551 | #if TINTING |
2549 | #if TINTING |
2552 | if (ISSET_PIXCOLOR (Color_tint)) |
2550 | if (ISSET_PIXCOLOR (Color_tint)) |
2553 | { |
2551 | { |
2554 | unsigned short rm, gm, bm; |
|
|
2555 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2552 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2556 | |
2553 | |
|
|
2554 | rgba c; |
2557 | pix_colors_focused[Color_tint].get (display, rm, gm, bm); |
2555 | pix_colors_focused [Color_tint].get (c); |
2558 | |
2556 | |
2559 | ShadeXImage (display, image, shade, rm, gm, bm); |
2557 | ShadeXImage (this, image, shade, c.r, c.g, c.b); |
2560 | } |
2558 | } |
2561 | #endif |
2559 | #endif |
2562 | |
2560 | |
2563 | pixmap = XCreatePixmap (disp, vt, |
2561 | pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth); |
2564 | szHint.width, szHint.height, image->depth); |
|
|
2565 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2562 | gc = XCreateGC (dpy, vt, 0UL, &gcvalue); |
2566 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2563 | XPutImage (dpy, pixmap, gc, image, 0, 0, |
2567 | nx, ny, image->width, image->height); |
2564 | nx, ny, image->width, image->height); |
2568 | XFreeGC (disp, gc); |
2565 | XFreeGC (dpy, gc); |
2569 | XDestroyImage (image); |
2566 | XDestroyImage (image); |
2570 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2567 | XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); |
2571 | XClearWindow (disp, parent[0]); |
2568 | XClearWindow (dpy, parent[0]); |
2572 | |
2569 | |
2573 | if (!am_transparent || !am_pixmap_trans) |
2570 | if (!am_transparent || !am_pixmap_trans) |
2574 | pchanged = 1; |
2571 | pchanged = 1; |
2575 | |
2572 | |
2576 | am_transparent = am_pixmap_trans = 1; |
2573 | am_transparent = am_pixmap_trans = 1; |
2577 | } |
2574 | } |
2578 | } |
2575 | } |
2579 | |
2576 | |
2580 | if (am_pixmap_trans) |
2577 | if (am_pixmap_trans) |
2581 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2578 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2582 | else |
2579 | else |
2583 | { |
2580 | { |
2584 | unsigned int n; |
2581 | unsigned int n; |
2585 | /* |
2582 | /* |
2586 | * InheritPixmap transparency |
2583 | * InheritPixmap transparency |
2587 | */ |
2584 | */ |
2588 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2585 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2589 | { |
2586 | { |
2590 | oldp = parent[i]; |
2587 | oldp = parent[i]; |
2591 | XQueryTree (disp, parent[i - 1], &root, |
2588 | XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n); |
2592 | &parent[i], &list, &n); |
|
|
2593 | XFree (list); |
2589 | XFree (list); |
2594 | |
2590 | |
2595 | if (parent[i] == display->root) |
2591 | if (parent[i] == display->root) |
2596 | { |
2592 | { |
2597 | if (oldp != None) |
2593 | if (oldp != None) |
… | |
… | |
2605 | } |
2601 | } |
2606 | |
2602 | |
2607 | n = 0; |
2603 | n = 0; |
2608 | |
2604 | |
2609 | if (pchanged) |
2605 | if (pchanged) |
2610 | { |
|
|
2611 | for (; n < (unsigned int)i; n++) |
2606 | for (; n < (unsigned int)i; n++) |
2612 | { |
2607 | { |
2613 | XGetWindowAttributes (disp, parent[n], &wattr); |
2608 | XGetWindowAttributes (dpy, parent[n], &wattr); |
|
|
2609 | |
2614 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2610 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2615 | { |
2611 | { |
2616 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2612 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2617 | break; |
2613 | break; |
2618 | } |
2614 | } |
2619 | } |
2615 | } |
2620 | } |
|
|
2621 | |
2616 | |
2622 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2617 | if (n > (sizeof (parent) / sizeof (parent[0]))) |
2623 | { |
2618 | { |
2624 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2619 | XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]); |
2625 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2620 | XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); |
2626 | am_transparent = 0; |
2621 | am_transparent = 0; |
2627 | /* XXX: also turn off Opt_transparent? */ |
2622 | /* XXX: also turn off Opt_transparent? */ |
2628 | } |
2623 | } |
2629 | else |
2624 | else |
2630 | { |
2625 | { |
2631 | #if WAIT_FOR_WM |
|
|
2632 | /* wait (an arbitrary period) for the WM to do its thing |
|
|
2633 | * needed for fvwm2.2.2 (and before?) */ |
|
|
2634 | sleep (1); |
|
|
2635 | #endif |
|
|
2636 | for (n = 0; n < (unsigned int)i; n++) |
2626 | for (n = 0; n < (unsigned int)i; n++) |
2637 | { |
2627 | { |
2638 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2628 | XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative); |
2639 | XClearWindow (disp, parent[n]); |
2629 | XClearWindow (dpy, parent[n]); |
2640 | } |
2630 | } |
2641 | |
2631 | |
2642 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2632 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2643 | am_transparent = 1; |
2633 | am_transparent = 1; |
2644 | } |
2634 | } |
2645 | |
2635 | |
2646 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2636 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2647 | parent[i] = None; |
2637 | parent[i] = None; |
2648 | } |
2638 | } |
2649 | |
2639 | |
2650 | if (scrollBar.win) |
2640 | if (scrollBar.win) |
2651 | { |
2641 | { |
2652 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2642 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2653 | scrollBar.setIdle (); |
2643 | scrollBar.setIdle (); |
2654 | scrollbar_show (0); |
2644 | scrollbar_show (0); |
2655 | } |
2645 | } |
2656 | |
2646 | |
2657 | if (am_transparent) |
2647 | if (am_transparent) |
… | |
… | |
2669 | |
2659 | |
2670 | bool |
2660 | bool |
2671 | rxvt_term::cmd_parse () |
2661 | rxvt_term::cmd_parse () |
2672 | { |
2662 | { |
2673 | bool flag = false; |
2663 | bool flag = false; |
2674 | unicode_t ch = NOCHAR; |
2664 | wchar_t ch = NOCHAR; |
2675 | unsigned char *seq_begin; // remember start of esc-sequence here |
2665 | char *seq_begin; // remember start of esc-sequence here |
2676 | |
2666 | |
2677 | for (;;) |
2667 | for (;;) |
2678 | { |
2668 | { |
2679 | if (ch == NOCHAR) |
2669 | if (ch == NOCHAR) |
2680 | { |
2670 | { |
2681 | seq_begin = cmdbuf_ptr; |
2671 | seq_begin = cmdbuf_ptr; |
2682 | ch = next_char (); |
2672 | ch = next_char (); |
2683 | } |
|
|
2684 | |
2673 | |
2685 | if (ch == NOCHAR) // TODO: improve |
2674 | if (ch == NOCHAR) |
2686 | break; |
2675 | break; |
|
|
2676 | } |
2687 | |
2677 | |
2688 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2678 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2689 | { |
2679 | { |
2690 | if (!seen_input) |
2680 | if (!seen_input) |
2691 | { |
2681 | { |
… | |
… | |
2700 | if (seen_resize && cmd_pid) |
2690 | if (seen_resize && cmd_pid) |
2701 | kill (-cmd_pid, SIGWINCH); |
2691 | kill (-cmd_pid, SIGWINCH); |
2702 | } |
2692 | } |
2703 | |
2693 | |
2704 | /* Read a text string from the input buffer */ |
2694 | /* Read a text string from the input buffer */ |
2705 | unicode_t buf[UBUFSIZ]; |
2695 | wchar_t buf[UBUFSIZ]; |
2706 | bool refreshnow = false; |
2696 | bool refreshnow = false; |
2707 | int nlines = 0; |
2697 | int nlines = 0; |
2708 | unicode_t *str = buf; |
2698 | wchar_t *str = buf; |
2709 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2699 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2710 | |
2700 | |
2711 | for (;;) |
2701 | for (;;) |
2712 | { |
2702 | { |
2713 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2703 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2714 | break; |
2704 | break; |
… | |
… | |
2732 | } |
2722 | } |
2733 | |
2723 | |
2734 | // scr_add_lines only works for nlines <= nrow - 1. |
2724 | // scr_add_lines only works for nlines <= nrow - 1. |
2735 | if (nlines >= nrow - 1) |
2725 | if (nlines >= nrow - 1) |
2736 | { |
2726 | { |
|
|
2727 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2728 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2737 | scr_add_lines (buf, nlines, str - buf); |
2729 | scr_add_lines (buf, str - buf, nlines); |
|
|
2730 | |
2738 | nlines = 0; |
2731 | nlines = 0; |
2739 | str = buf; |
2732 | str = buf; |
2740 | eol = str + min (ncol, UBUFSIZ); |
2733 | eol = str + min (ncol, UBUFSIZ); |
2741 | } |
2734 | } |
2742 | |
2735 | |
… | |
… | |
2755 | |
2748 | |
2756 | seq_begin = cmdbuf_ptr; |
2749 | seq_begin = cmdbuf_ptr; |
2757 | ch = next_char (); |
2750 | ch = next_char (); |
2758 | } |
2751 | } |
2759 | |
2752 | |
|
|
2753 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2754 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2760 | scr_add_lines (buf, nlines, str - buf); |
2755 | scr_add_lines (buf, str - buf, nlines); |
2761 | |
2756 | |
2762 | /* |
2757 | /* |
2763 | * If there have been a lot of new lines, then update the screen |
2758 | * If there have been a lot of new lines, then update the screen |
2764 | * What the heck I'll cheat and only refresh less than every page-full. |
2759 | * What the heck I'll cheat and only refresh less than every page-full. |
2765 | * the number of pages between refreshes is refresh_limit, which |
2760 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2770 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2765 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2771 | refresh_limit++; |
2766 | refresh_limit++; |
2772 | else |
2767 | else |
2773 | { |
2768 | { |
2774 | flag = true; |
2769 | flag = true; |
2775 | scr_refresh (refresh_type); |
2770 | scr_refresh (); |
2776 | flush_ev.stop (); |
2771 | want_refresh = 1; |
2777 | } |
2772 | } |
2778 | } |
2773 | } |
2779 | |
2774 | |
2780 | } |
2775 | } |
2781 | else |
2776 | else |
… | |
… | |
2796 | } |
2791 | } |
2797 | |
2792 | |
2798 | return flag; |
2793 | return flag; |
2799 | } |
2794 | } |
2800 | |
2795 | |
2801 | // read the next octet |
|
|
2802 | unicode_t |
|
|
2803 | rxvt_term::next_octet () |
|
|
2804 | { |
|
|
2805 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2806 | ? *cmdbuf_ptr++ |
|
|
2807 | : NOCHAR; |
|
|
2808 | } |
|
|
2809 | |
|
|
2810 | // read the next character |
2796 | // read the next character |
2811 | unicode_t |
2797 | wchar_t |
2812 | rxvt_term::next_char () |
2798 | rxvt_term::next_char () NOTHROW |
2813 | { |
2799 | { |
2814 | while (cmdbuf_ptr < cmdbuf_endp) |
2800 | while (cmdbuf_ptr < cmdbuf_endp) |
2815 | { |
2801 | { |
2816 | // assume 7-bit to be ascii ALWAYS |
2802 | // assume 7-bit to be ascii ALWAYS |
2817 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2803 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2818 | return *cmdbuf_ptr++; |
2804 | return *cmdbuf_ptr++; |
2819 | |
2805 | |
2820 | wchar_t wc; |
2806 | wchar_t wc; |
2821 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2807 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2822 | |
2808 | |
2823 | if (len == (size_t)-2) |
2809 | if (len == (size_t)-2) |
2824 | { |
2810 | { |
2825 | // the mbstate stores incomplete sequences. didn't know this :/ |
2811 | // the mbstate stores incomplete sequences. didn't know this :/ |
2826 | cmdbuf_ptr = cmdbuf_endp; |
2812 | cmdbuf_ptr = cmdbuf_endp; |
2827 | break; |
2813 | break; |
2828 | } |
2814 | } |
2829 | |
2815 | |
2830 | if (len == (size_t)-1) |
2816 | if (len == (size_t)-1) |
2831 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2817 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2832 | |
2818 | |
2833 | // assume wchar == unicode |
2819 | // assume wchar == unicode |
2834 | cmdbuf_ptr += len; |
2820 | cmdbuf_ptr += len; |
2835 | return wc & UNICODE_MASK; |
2821 | return wc & UNICODE_MASK; |
2836 | } |
2822 | } |
2837 | |
2823 | |
2838 | return NOCHAR; |
2824 | return NOCHAR; |
2839 | } |
2825 | } |
|
|
2826 | |
|
|
2827 | // read the next octet |
|
|
2828 | uint32_t |
|
|
2829 | rxvt_term::next_octet () NOTHROW |
|
|
2830 | { |
|
|
2831 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2832 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2833 | : NOCHAR; |
|
|
2834 | } |
|
|
2835 | |
|
|
2836 | static class out_of_input out_of_input; |
2840 | |
2837 | |
2841 | /* rxvt_cmd_getc () - Return next input character */ |
2838 | /* rxvt_cmd_getc () - Return next input character */ |
2842 | /* |
2839 | /* |
2843 | * Return the next input character after first passing any keyboard input |
2840 | * Return the next input character after first passing any keyboard input |
2844 | * to the command. |
2841 | * to the command. |
2845 | */ |
2842 | */ |
2846 | unicode_t |
2843 | wchar_t |
2847 | rxvt_term::cmd_getc () |
2844 | rxvt_term::cmd_getc () THROW ((class out_of_input)) |
2848 | { |
2845 | { |
2849 | unicode_t c = next_char (); |
2846 | wchar_t c = next_char (); |
2850 | |
2847 | |
2851 | if (c == NOCHAR) |
2848 | if (c == NOCHAR) |
2852 | throw out_of_input; |
2849 | throw out_of_input; |
2853 | |
2850 | |
2854 | return c; |
2851 | return c; |
2855 | } |
2852 | } |
2856 | |
2853 | |
2857 | unicode_t |
2854 | uint32_t |
2858 | rxvt_term::cmd_get8 () |
2855 | rxvt_term::cmd_get8 () THROW ((class out_of_input)) |
2859 | { |
2856 | { |
2860 | unicode_t c = next_octet (); |
2857 | uint32_t c = next_octet (); |
2861 | |
2858 | |
2862 | if (c == NOCHAR) |
2859 | if (c == NOCHAR) |
2863 | throw out_of_input; |
2860 | throw out_of_input; |
2864 | |
2861 | |
2865 | return c; |
2862 | return c; |
… | |
… | |
2965 | case C0_ESC: |
2962 | case C0_ESC: |
2966 | process_escape_seq (); |
2963 | process_escape_seq (); |
2967 | break; |
2964 | break; |
2968 | case C0_ENQ: /* terminal Status */ |
2965 | case C0_ENQ: /* terminal Status */ |
2969 | if (rs[Rs_answerbackstring]) |
2966 | if (rs[Rs_answerbackstring]) |
2970 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2967 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2971 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2972 | else |
2968 | else |
2973 | tt_write ((unsigned char *)VT100_ANS, |
2969 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2974 | (unsigned int)strlen (VT100_ANS)); |
|
|
2975 | break; |
2970 | break; |
2976 | case C0_BEL: /* bell */ |
2971 | case C0_BEL: /* bell */ |
2977 | scr_bell (); |
2972 | scr_bell (); |
2978 | break; |
2973 | break; |
2979 | case C0_BS: /* backspace */ |
2974 | case C0_BS: /* backspace */ |
… | |
… | |
3103 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3098 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3104 | break; |
3099 | break; |
3105 | case '+': |
3100 | case '+': |
3106 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3101 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3107 | break; |
3102 | break; |
3108 | #if ENABLE_FRILLS |
3103 | #if !ENABLE_MINIMAL |
3109 | case '6': |
3104 | case '6': |
3110 | scr_backindex (); |
3105 | scr_backindex (); |
3111 | break; |
3106 | break; |
3112 | #endif |
3107 | #endif |
3113 | case '7': |
3108 | case '7': |
3114 | scr_cursor (SAVE); |
3109 | scr_cursor (SAVE); |
3115 | break; |
3110 | break; |
3116 | case '8': |
3111 | case '8': |
3117 | scr_cursor (RESTORE); |
3112 | scr_cursor (RESTORE); |
3118 | break; |
3113 | break; |
3119 | #if ENABLE_FRILLS |
3114 | #if !ENABLE_MINIMAL |
3120 | case '9': |
3115 | case '9': |
3121 | scr_forwardindex (); |
3116 | scr_forwardindex (); |
3122 | break; |
3117 | break; |
3123 | #endif |
3118 | #endif |
3124 | case '=': |
3119 | case '=': |
… | |
… | |
3134 | break; |
3129 | break; |
3135 | |
3130 | |
3136 | /* 8.3.87: NEXT LINE */ |
3131 | /* 8.3.87: NEXT LINE */ |
3137 | case C1_NEL: /* ESC E */ |
3132 | case C1_NEL: /* ESC E */ |
3138 | { |
3133 | { |
3139 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3134 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3140 | scr_add_lines (nlcr, 1, 2); |
3135 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3141 | } |
3136 | } |
3142 | break; |
3137 | break; |
3143 | |
3138 | |
3144 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3139 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3145 | case C1_ESA: /* ESC G */ |
3140 | case C1_ESA: /* ESC G */ |
… | |
… | |
3167 | process_dcs_seq (); |
3162 | process_dcs_seq (); |
3168 | break; |
3163 | break; |
3169 | |
3164 | |
3170 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3165 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3171 | case C1_SCI: /* ESC Z */ |
3166 | case C1_SCI: /* ESC Z */ |
3172 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3167 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3173 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3174 | break; /* steal obsolete ESC [ c */ |
3168 | break; /* steal obsolete ESC [ c */ |
3175 | |
3169 | |
3176 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3170 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3177 | case C1_CSI: /* ESC [ */ |
3171 | case C1_CSI: /* ESC [ */ |
3178 | process_csi_seq (); |
3172 | process_csi_seq (); |
… | |
… | |
3287 | ndef = get_byte_array_bit (csi_defaults, i); |
3281 | ndef = get_byte_array_bit (csi_defaults, i); |
3288 | for (p = 0; p < nargs; p++) |
3282 | for (p = 0; p < nargs; p++) |
3289 | if (arg[p] == -1) |
3283 | if (arg[p] == -1) |
3290 | arg[p] = ndef; |
3284 | arg[p] = ndef; |
3291 | |
3285 | |
3292 | #ifdef DEBUG_CMD |
|
|
3293 | fprintf (stderr, "CSI "); |
|
|
3294 | for (p = 0; p < nargs; p++) |
|
|
3295 | fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); |
|
|
3296 | fprintf (stderr, "%c\n", ch); |
|
|
3297 | #endif |
|
|
3298 | |
|
|
3299 | /* |
3286 | /* |
3300 | * private mode handling |
3287 | * private mode handling |
3301 | */ |
3288 | */ |
3302 | if (priv) |
3289 | if (priv) |
3303 | { |
3290 | { |
3304 | switch (priv) |
3291 | switch (priv) |
3305 | { |
3292 | { |
3306 | case '>': |
3293 | case '>': |
3307 | if (ch == CSI_DA) /* secondary device attributes */ |
3294 | if (ch == CSI_DA) /* secondary device attributes */ |
3308 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3295 | { |
|
|
3296 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
|
|
3297 | // 'U' for rxvt-unicode != 7.[34] (where it was broken). |
|
|
3298 | // |
|
|
3299 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
|
|
3300 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
|
|
3301 | // that we do not support xterm mouse reporting (should be 95 when we do). |
|
|
3302 | // |
|
|
3303 | tt_printf ("\033[>%d;94;0c", 'U'); |
|
|
3304 | } |
3309 | break; |
3305 | break; |
3310 | case '?': |
3306 | case '?': |
3311 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3307 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3312 | process_terminal_mode (ch, priv, nargs, arg); |
3308 | process_terminal_mode (ch, priv, nargs, arg); |
3313 | break; |
3309 | break; |
… | |
… | |
3422 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3418 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3423 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3419 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3424 | break; |
3420 | break; |
3425 | |
3421 | |
3426 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3422 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3427 | tt_write ((const unsigned char *)VT100_ANS, |
3423 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3428 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3429 | break; |
3424 | break; |
3430 | |
3425 | |
3431 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3426 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3432 | process_sgr_mode (nargs, arg); |
3427 | process_sgr_mode (nargs, arg); |
3433 | break; |
3428 | break; |
… | |
… | |
3517 | break; |
3512 | break; |
3518 | case CSI_75: |
3513 | case CSI_75: |
3519 | scr_cursor (RESTORE); |
3514 | scr_cursor (RESTORE); |
3520 | break; |
3515 | break; |
3521 | |
3516 | |
3522 | #if ENABLE_FRILLS |
3517 | #if !ENABLE_MINIMAL |
3523 | case CSI_74: |
3518 | case CSI_74: |
3524 | process_window_ops (arg, nargs); |
3519 | process_window_ops (arg, nargs); |
3525 | break; |
3520 | break; |
3526 | #endif |
3521 | #endif |
3527 | |
3522 | |
… | |
… | |
3534 | break; |
3529 | break; |
3535 | } |
3530 | } |
3536 | } |
3531 | } |
3537 | /*}}} */ |
3532 | /*}}} */ |
3538 | |
3533 | |
3539 | #if ENABLE_FRILLS |
3534 | #if !ENABLE_MINIMAL |
3540 | /* ARGSUSED */ |
3535 | /* ARGSUSED */ |
3541 | void |
3536 | void |
3542 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3537 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3543 | { |
3538 | { |
3544 | int x, y; |
3539 | int x, y; |
3545 | XWindowAttributes wattr; |
3540 | XWindowAttributes wattr; |
3546 | Window wdummy; |
3541 | Window wdummy; |
3547 | dDisp; |
3542 | |
|
|
3543 | dLocal (Display *, dpy); |
3548 | |
3544 | |
3549 | if (nargs == 0) |
3545 | if (nargs == 0) |
3550 | return; |
3546 | return; |
3551 | |
3547 | |
3552 | switch (args[0]) |
3548 | switch (args[0]) |
3553 | { |
3549 | { |
3554 | /* |
3550 | /* |
3555 | * commands |
3551 | * commands |
3556 | */ |
3552 | */ |
3557 | case 1: /* deiconify window */ |
3553 | case 1: /* deiconify window */ |
3558 | XMapWindow (disp, parent[0]); |
3554 | XMapWindow (dpy, parent[0]); |
3559 | break; |
3555 | break; |
3560 | case 2: /* iconify window */ |
3556 | case 2: /* iconify window */ |
3561 | XIconifyWindow (disp, parent[0], display->screen); |
3557 | XIconifyWindow (dpy, parent[0], display->screen); |
3562 | break; |
3558 | break; |
3563 | case 3: /* set position (pixels) */ |
3559 | case 3: /* set position (pixels) */ |
3564 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3560 | XMoveWindow (dpy, parent[0], args[1], args[2]); |
3565 | break; |
3561 | break; |
3566 | case 4: /* set size (pixels) */ |
3562 | case 4: /* set size (pixels) */ |
3567 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3563 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3568 | break; |
3564 | break; |
3569 | case 5: /* raise window */ |
3565 | case 5: /* raise window */ |
3570 | XRaiseWindow (disp, parent[0]); |
3566 | XRaiseWindow (dpy, parent[0]); |
3571 | break; |
3567 | break; |
3572 | case 6: /* lower window */ |
3568 | case 6: /* lower window */ |
3573 | XLowerWindow (disp, parent[0]); |
3569 | XLowerWindow (dpy, parent[0]); |
3574 | break; |
3570 | break; |
3575 | case 7: /* refresh window */ |
3571 | case 7: /* refresh window */ |
3576 | scr_touch (true); |
3572 | scr_touch (true); |
3577 | break; |
3573 | break; |
3578 | case 8: /* set size (chars) */ |
3574 | case 8: /* set size (chars) */ |
… | |
… | |
3585 | if (args[0] >= 24) /* set height (chars) */ |
3581 | if (args[0] >= 24) /* set height (chars) */ |
3586 | set_widthheight ((unsigned int)width, |
3582 | set_widthheight ((unsigned int)width, |
3587 | (unsigned int) (args[1] * fheight)); |
3583 | (unsigned int) (args[1] * fheight)); |
3588 | break; |
3584 | break; |
3589 | |
3585 | |
3590 | |
|
|
3591 | /* |
3586 | /* |
3592 | * reports - some output format copied from XTerm |
3587 | * reports - some output format copied from XTerm |
3593 | */ |
3588 | */ |
3594 | case 11: /* report window state */ |
3589 | case 11: /* report window state */ |
3595 | XGetWindowAttributes (disp, parent[0], &wattr); |
3590 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3596 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3591 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3597 | break; |
3592 | break; |
3598 | case 13: /* report window position */ |
3593 | case 13: /* report window position */ |
3599 | XGetWindowAttributes (disp, parent[0], &wattr); |
3594 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3600 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3595 | XTranslateCoordinates (dpy, parent[0], wattr.root, |
3601 | -wattr.border_width, -wattr.border_width, |
3596 | -wattr.border_width, -wattr.border_width, |
3602 | &x, &y, &wdummy); |
3597 | &x, &y, &wdummy); |
3603 | tt_printf ("\033[3;%d;%dt", x, y); |
3598 | tt_printf ("\033[3;%d;%dt", x, y); |
3604 | break; |
3599 | break; |
3605 | case 14: /* report window size (pixels) */ |
3600 | case 14: /* report window size (pixels) */ |
3606 | XGetWindowAttributes (disp, parent[0], &wattr); |
3601 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3607 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3602 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3608 | break; |
3603 | break; |
3609 | case 18: /* report text area size (chars) */ |
3604 | case 18: /* report text area size (chars) */ |
3610 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3605 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3611 | break; |
3606 | break; |
… | |
… | |
3613 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3608 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3614 | break; |
3609 | break; |
3615 | case 20: /* report icon label */ |
3610 | case 20: /* report icon label */ |
3616 | { |
3611 | { |
3617 | char *s; |
3612 | char *s; |
3618 | XGetIconName (disp, parent[0], &s); |
3613 | XGetIconName (dpy, parent[0], &s); |
3619 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3614 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3620 | XFree (s); |
3615 | XFree (s); |
3621 | } |
3616 | } |
3622 | break; |
3617 | break; |
3623 | case 21: /* report window title */ |
3618 | case 21: /* report window title */ |
3624 | { |
3619 | { |
3625 | char *s; |
3620 | char *s; |
3626 | XFetchName (disp, parent[0], &s); |
3621 | XFetchName (dpy, parent[0], &s); |
3627 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3622 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3628 | XFree (s); |
3623 | XFree (s); |
3629 | } |
3624 | } |
3630 | break; |
3625 | break; |
3631 | } |
3626 | } |
… | |
… | |
3635 | /*----------------------------------------------------------------------*/ |
3630 | /*----------------------------------------------------------------------*/ |
3636 | /* |
3631 | /* |
3637 | * get input up until STRING TERMINATOR (or BEL) |
3632 | * get input up until STRING TERMINATOR (or BEL) |
3638 | * ends_how is terminator used. returned input must be free()'d |
3633 | * ends_how is terminator used. returned input must be free()'d |
3639 | */ |
3634 | */ |
3640 | unsigned char * |
3635 | char * |
3641 | rxvt_term::get_to_st (unicode_t &ends_how) |
3636 | rxvt_term::get_to_st (unicode_t &ends_how) |
3642 | { |
3637 | { |
3643 | unicode_t ch; |
3638 | unicode_t ch; |
3644 | bool seen_esc = false; |
3639 | bool seen_esc = false; |
3645 | unsigned int n = 0; |
3640 | unsigned int n = 0; |
… | |
… | |
3678 | |
3673 | |
3679 | string[n++] = '\0'; |
3674 | string[n++] = '\0'; |
3680 | |
3675 | |
3681 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3676 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3682 | |
3677 | |
3683 | return (unsigned char *)rxvt_wcstombs (string); |
3678 | return rxvt_wcstombs (string); |
3684 | } |
3679 | } |
3685 | |
3680 | |
3686 | /*----------------------------------------------------------------------*/ |
3681 | /*----------------------------------------------------------------------*/ |
3687 | /* |
3682 | /* |
3688 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3683 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3689 | */ |
3684 | */ |
3690 | void |
3685 | void |
3691 | rxvt_term::process_dcs_seq () |
3686 | rxvt_term::process_dcs_seq () |
3692 | { |
3687 | { |
3693 | unsigned char *s; |
3688 | char *s; |
3694 | unicode_t eh; |
3689 | unicode_t eh; |
3695 | |
3690 | |
3696 | /* |
3691 | /* |
3697 | * Not handled yet |
3692 | * Not handled yet |
3698 | */ |
3693 | */ |
… | |
… | |
3717 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3712 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3718 | arg = arg * 10 + (ch - '0'); |
3713 | arg = arg * 10 + (ch - '0'); |
3719 | |
3714 | |
3720 | if (ch == ';') |
3715 | if (ch == ';') |
3721 | { |
3716 | { |
3722 | unsigned char *s = get_to_st (eh); |
3717 | char *s = get_to_st (eh); |
3723 | |
3718 | |
3724 | if (s) |
3719 | if (s) |
3725 | { |
3720 | { |
3726 | process_xterm_seq (arg, (char *)s, eh); |
3721 | process_xterm_seq (arg, s, eh); |
3727 | free (s); |
3722 | free (s); |
3728 | } |
3723 | } |
3729 | } |
3724 | } |
3730 | } |
3725 | } |
3731 | |
3726 | |
3732 | void |
3727 | void |
3733 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3728 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3734 | { |
3729 | { |
3735 | if (str[0] == '?' && !str[1]) |
3730 | if (str[0] == '?' && !str[1]) |
3736 | { |
3731 | { |
3737 | unsigned short r, g, b; |
3732 | rgba c; |
3738 | pix_colors_focused[color].get (display, r, g, b); |
3733 | pix_colors_focused[color].get (c); |
|
|
3734 | |
|
|
3735 | #if XFT |
|
|
3736 | if (c.a != rgba::MAX_CC) |
|
|
3737 | tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); |
|
|
3738 | else |
|
|
3739 | #endif |
3739 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3740 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); |
3740 | } |
3741 | } |
3741 | else |
3742 | else |
3742 | set_window_color (color, str); |
3743 | set_window_color (color, str); |
3743 | } |
3744 | } |
3744 | |
3745 | |
3745 | /* |
3746 | /* |
3746 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3747 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3747 | */ |
3748 | */ |
3748 | void |
3749 | void |
3749 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3750 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3750 | { |
3751 | { |
3751 | int changed = 0; |
|
|
3752 | int color; |
3752 | int color; |
3753 | char *buf, *name; |
3753 | char *buf, *name; |
3754 | bool query = str[0] == '?' && !str[1]; |
3754 | bool query = str[0] == '?' && !str[1]; |
3755 | int saveop = op; |
3755 | int saveop = op; |
3756 | dDisp; |
3756 | |
|
|
3757 | dLocal (Display *, dpy); |
3757 | |
3758 | |
3758 | assert (str != NULL); |
3759 | assert (str != NULL); |
3759 | switch (op) |
3760 | switch (op) |
3760 | { |
3761 | { |
3761 | case XTerm_name: |
3762 | case XTerm_name: |
… | |
… | |
3777 | unsigned long bytes_after; |
3778 | unsigned long bytes_after; |
3778 | unsigned char *value = 0; |
3779 | unsigned char *value = 0; |
3779 | const char *str = ""; |
3780 | const char *str = ""; |
3780 | |
3781 | |
3781 | if (prop |
3782 | if (prop |
3782 | && XGetWindowProperty (disp, parent[0], |
3783 | && XGetWindowProperty (dpy, parent[0], |
3783 | prop, 0, 1<<16, 0, AnyPropertyType, |
3784 | prop, 0, 1<<16, 0, AnyPropertyType, |
3784 | &actual_type, &actual_format, |
3785 | &actual_type, &actual_format, |
3785 | &nitems, &bytes_after, &value) == Success |
3786 | &nitems, &bytes_after, &value) == Success |
3786 | && actual_type != None |
3787 | && actual_type != None |
3787 | && actual_format == 8) |
3788 | && actual_format == 8) |
3788 | str = (const char *)(value); |
3789 | str = (const char *)(value); |
3789 | |
3790 | |
3790 | tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); |
3791 | tt_printf ("\033]%d;%s%c", op, str, resp); |
3791 | |
3792 | |
3792 | XFree (value); |
3793 | XFree (value); |
3793 | } |
3794 | } |
3794 | else |
3795 | else |
3795 | { |
3796 | { |
… | |
… | |
3799 | { |
3800 | { |
3800 | *eq = 0; |
3801 | *eq = 0; |
3801 | set_utf8_property (display->atom (str), eq + 1); |
3802 | set_utf8_property (display->atom (str), eq + 1); |
3802 | } |
3803 | } |
3803 | else |
3804 | else |
3804 | XDeleteProperty (disp, parent[0], |
3805 | XDeleteProperty (dpy, parent[0], |
3805 | display->atom (str)); |
3806 | display->atom (str)); |
3806 | } |
3807 | } |
3807 | break; |
3808 | break; |
3808 | |
3809 | |
3809 | case XTerm_Color: |
3810 | case XTerm_Color: |
… | |
… | |
3811 | { |
3812 | { |
3812 | if ((name = strchr (buf, ';')) == NULL) |
3813 | if ((name = strchr (buf, ';')) == NULL) |
3813 | break; |
3814 | break; |
3814 | |
3815 | |
3815 | *name++ = '\0'; |
3816 | *name++ = '\0'; |
3816 | color = atoi (buf); |
3817 | color = atoi (buf) + minCOLOR; |
3817 | |
3818 | |
3818 | if (color < 0 || color >= TOTAL_COLORS) |
3819 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3819 | break; |
3820 | break; |
3820 | |
3821 | |
3821 | if ((buf = strchr (name, ';')) != NULL) |
3822 | if ((buf = strchr (name, ';')) != NULL) |
3822 | *buf++ = '\0'; |
3823 | *buf++ = '\0'; |
3823 | |
3824 | |
3824 | if (name[0] == '?' && !name[1]) |
3825 | process_color_seq (op, color, name, resp); |
3825 | { |
|
|
3826 | unsigned short r, g, b; |
|
|
3827 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
|
|
3828 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
|
|
3829 | } |
|
|
3830 | else |
|
|
3831 | set_window_color (color + minCOLOR, name); |
|
|
3832 | } |
3826 | } |
3833 | break; |
3827 | break; |
3834 | case XTerm_Color00: |
3828 | case XTerm_Color00: |
3835 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3829 | process_color_seq (op, Color_fg, str, resp); |
3836 | break; |
3830 | break; |
3837 | case XTerm_Color01: |
3831 | case XTerm_Color01: |
3838 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3832 | process_color_seq (op, Color_bg, str, resp); |
3839 | break; |
3833 | break; |
3840 | #ifndef NO_CURSORCOLOR |
3834 | #ifndef NO_CURSORCOLOR |
3841 | case XTerm_Color_cursor: |
3835 | case XTerm_Color_cursor: |
3842 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3836 | process_color_seq (op, Color_cursor, str, resp); |
3843 | break; |
3837 | break; |
3844 | #endif |
3838 | #endif |
3845 | case XTerm_Color_pointer_fg: |
3839 | case XTerm_Color_pointer_fg: |
3846 | process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); |
3840 | process_color_seq (op, Color_pointer_fg, str, resp); |
3847 | break; |
3841 | break; |
3848 | case XTerm_Color_pointer_bg: |
3842 | case XTerm_Color_pointer_bg: |
3849 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3843 | process_color_seq (op, Color_pointer_bg, str, resp); |
3850 | break; |
3844 | break; |
3851 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3845 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3852 | case XTerm_Color_BD: |
|
|
3853 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3854 | break; |
|
|
3855 | case XTerm_Color_UL: |
|
|
3856 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3857 | break; |
|
|
3858 | case XTerm_Color_RV: |
3846 | case XTerm_Color_RV: |
3859 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3847 | process_color_seq (op, Color_RV, str, resp); |
|
|
3848 | break; |
|
|
3849 | case Rxvt_Color_BD: |
|
|
3850 | case URxvt_Color_BD: |
|
|
3851 | process_color_seq (op, Color_BD, str, resp); |
|
|
3852 | break; |
|
|
3853 | case Rxvt_Color_UL: |
|
|
3854 | case URxvt_Color_UL: |
|
|
3855 | process_color_seq (op, Color_UL, str, resp); |
3860 | break; |
3856 | break; |
3861 | case URxvt_Color_IT: |
3857 | case URxvt_Color_IT: |
3862 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3858 | process_color_seq (op, Color_IT, str, resp); |
3863 | break; |
3859 | break; |
3864 | #endif |
3860 | #endif |
3865 | #if TRANSPARENT && TINTING |
3861 | #if TRANSPARENT && TINTING |
3866 | case URxvt_Color_tint: |
3862 | case URxvt_Color_tint: |
3867 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3863 | process_color_seq (op, Color_tint, str, resp); |
|
|
3864 | |
3868 | check_our_parents (); |
3865 | check_our_parents (); |
|
|
3866 | |
3869 | if (am_transparent) |
3867 | if (am_transparent) |
3870 | want_full_refresh = want_refresh = 1; |
3868 | want_full_refresh = want_refresh = 1; |
3871 | break; |
|
|
3872 | #endif |
|
|
3873 | |
3869 | |
|
|
3870 | break; |
|
|
3871 | #endif |
|
|
3872 | |
3874 | case XTerm_Pixmap: |
3873 | case Rxvt_Pixmap: |
|
|
3874 | { |
3875 | if (*str != ';') |
3875 | if (*str != ';') |
3876 | { |
3876 | { |
3877 | #if XPM_BACKGROUND |
3877 | #if XPM_BACKGROUND |
3878 | scale_pixmap (""); /* reset to default scaling */ |
3878 | scale_pixmap (""); /* reset to default scaling */ |
3879 | set_bgPixmap (str); /* change pixmap */ |
3879 | set_bgPixmap (str); /* change pixmap */ |
3880 | #endif |
|
|
3881 | scr_touch (true); |
3880 | scr_touch (true); |
|
|
3881 | #endif |
3882 | } |
3882 | } |
|
|
3883 | |
|
|
3884 | int changed = 0; |
|
|
3885 | |
3883 | while ((str = strchr (str, ';')) != NULL) |
3886 | while ((str = strchr (str, ';')) != NULL) |
3884 | { |
3887 | { |
3885 | str++; |
3888 | str++; |
3886 | #if XPM_BACKGROUND |
3889 | #if XPM_BACKGROUND |
3887 | changed += scale_pixmap (str); |
3890 | changed += scale_pixmap (str); |
3888 | #endif |
3891 | #endif |
3889 | } |
3892 | } |
3890 | |
3893 | |
3891 | if (changed) |
3894 | if (changed) |
3892 | { |
3895 | { |
3893 | #ifdef XPM_BACKGROUND |
3896 | #ifdef XPM_BACKGROUND |
3894 | resize_pixmap (); |
3897 | resize_pixmap (); |
3895 | #endif |
|
|
3896 | scr_touch (true); |
3898 | scr_touch (true); |
|
|
3899 | #endif |
3897 | } |
3900 | } |
|
|
3901 | } |
3898 | break; |
3902 | break; |
3899 | |
3903 | |
3900 | case XTerm_restoreFG: |
3904 | case Rxvt_restoreFG: |
3901 | set_window_color (Color_fg, str); |
3905 | set_window_color (Color_fg, str); |
3902 | break; |
3906 | break; |
3903 | case XTerm_restoreBG: |
3907 | case Rxvt_restoreBG: |
3904 | set_window_color (Color_bg, str); |
3908 | set_window_color (Color_bg, str); |
3905 | break; |
3909 | break; |
3906 | |
3910 | |
3907 | case XTerm_logfile: |
3911 | case XTerm_logfile: |
3908 | // TODO, when secure mode? |
3912 | // TODO, when secure mode? |
3909 | break; |
3913 | break; |
3910 | |
3914 | |
3911 | #ifdef MENUBAR |
|
|
3912 | case URxvt_Menu: |
|
|
3913 | if (OPTION (Opt_insecure)) |
|
|
3914 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3915 | break; |
|
|
3916 | #endif |
|
|
3917 | #if 0 |
3915 | #if 0 |
3918 | case XTerm_dumpscreen: /* no error notices */ |
3916 | case Rxvt_dumpscreen: /* no error notices */ |
3919 | { |
3917 | { |
3920 | int fd; |
3918 | int fd; |
3921 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3919 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3922 | { |
3920 | { |
3923 | scr_dump (fd); |
3921 | scr_dump (fd); |
… | |
… | |
3947 | allocated.push_back ((void *)res); |
3945 | allocated.push_back ((void *)res); |
3948 | set_fonts (); |
3946 | set_fonts (); |
3949 | } |
3947 | } |
3950 | break; |
3948 | break; |
3951 | |
3949 | |
3952 | #if ENABLE_FRILLS |
3950 | case URxvt_version: |
|
|
3951 | if (query) |
|
|
3952 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", |
|
|
3953 | op, |
|
|
3954 | rs[Rs_name], VERSION[0], VERSION[2], |
|
|
3955 | resp); |
|
|
3956 | break; |
|
|
3957 | |
|
|
3958 | #if !ENABLE_MINIMAL |
3953 | case URxvt_locale: |
3959 | case URxvt_locale: |
3954 | if (query) |
3960 | if (query) |
3955 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3961 | tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); |
3956 | else |
3962 | else |
3957 | { |
3963 | { |
3958 | set_locale (str); |
3964 | set_locale (str); |
3959 | pty.set_utf8_mode (enc_utf8); |
3965 | pty->set_utf8_mode (enc_utf8); |
3960 | init_xlocale (); |
3966 | init_xlocale (); |
3961 | } |
3967 | } |
3962 | break; |
3968 | break; |
3963 | |
3969 | |
3964 | case URxvt_view_up: |
3970 | case URxvt_view_up: |
… | |
… | |
3975 | break; |
3981 | break; |
3976 | #endif |
3982 | #endif |
3977 | |
3983 | |
3978 | #if ENABLE_PERL |
3984 | #if ENABLE_PERL |
3979 | case URxvt_perl: |
3985 | case URxvt_perl: |
3980 | if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) |
3986 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
3981 | ; // no responses yet |
3987 | ; // no responses yet |
3982 | break; |
3988 | break; |
3983 | #endif |
3989 | #endif |
3984 | } |
3990 | } |
3985 | } |
3991 | } |
… | |
… | |
4017 | return state; |
4023 | return state; |
4018 | } |
4024 | } |
4019 | |
4025 | |
4020 | /* we're not using priv _yet_ */ |
4026 | /* we're not using priv _yet_ */ |
4021 | void |
4027 | void |
4022 | rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) |
4028 | rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) |
4023 | { |
4029 | { |
4024 | unsigned int i, j; |
4030 | unsigned int i, j; |
4025 | int state; |
4031 | int state; |
4026 | |
4032 | |
4027 | static const struct |
4033 | static const struct |
… | |
… | |
4038 | { 5, PrivMode_rVideo }, |
4044 | { 5, PrivMode_rVideo }, |
4039 | { 6, PrivMode_relOrigin }, |
4045 | { 6, PrivMode_relOrigin }, |
4040 | { 7, PrivMode_Autowrap }, |
4046 | { 7, PrivMode_Autowrap }, |
4041 | // 8, bi-directional support mode |
4047 | // 8, bi-directional support mode |
4042 | { 9, PrivMode_MouseX10 }, |
4048 | { 9, PrivMode_MouseX10 }, |
4043 | #ifdef menuBar_esc |
|
|
4044 | { menuBar_esc, PrivMode_menuBar }, |
|
|
4045 | #endif |
|
|
4046 | // 18, 19 printing-related |
4049 | // 18, 19 printing-related |
4047 | { 25, PrivMode_VisibleCursor }, |
4050 | { 25, PrivMode_VisibleCursor }, |
4048 | #ifdef scrollBar_esc |
4051 | #ifdef scrollBar_esc |
4049 | { scrollBar_esc, PrivMode_scrollBar }, |
4052 | { scrollBar_esc, PrivMode_scrollBar }, |
4050 | #endif |
4053 | #endif |
… | |
… | |
4097 | /* extra handling for values with state unkept */ |
4100 | /* extra handling for values with state unkept */ |
4098 | switch (arg[i]) |
4101 | switch (arg[i]) |
4099 | { |
4102 | { |
4100 | #if ENABLE_STYLES |
4103 | #if ENABLE_STYLES |
4101 | case 1021: |
4104 | case 1021: |
4102 | if (mode) |
4105 | set_option (Opt_intensityStyles, mode); |
4103 | SET_OPTION (Opt_intensityStyles); |
|
|
4104 | else |
|
|
4105 | CLR_OPTION (Opt_intensityStyles); |
|
|
4106 | |
4106 | |
4107 | scr_touch (true); |
4107 | scr_touch (true); |
4108 | break; |
4108 | break; |
4109 | #endif |
4109 | #endif |
4110 | case 1048: /* alternative cursor save */ |
4110 | case 1048: /* alternative cursor save */ |
… | |
… | |
4132 | case 3: /* 80/132 */ |
4132 | case 3: /* 80/132 */ |
4133 | if (priv_modes & PrivMode_132OK) |
4133 | if (priv_modes & PrivMode_132OK) |
4134 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4134 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4135 | break; |
4135 | break; |
4136 | case 4: /* smooth scrolling */ |
4136 | case 4: /* smooth scrolling */ |
4137 | if (!state) |
4137 | set_option (Opt_jumpScroll, !state); |
4138 | SET_OPTION (Opt_jumpScroll); |
|
|
4139 | else |
|
|
4140 | CLR_OPTION (Opt_jumpScroll); |
|
|
4141 | break; |
4138 | break; |
4142 | case 5: /* reverse video */ |
4139 | case 5: /* reverse video */ |
4143 | scr_rvideo_mode (state); |
4140 | scr_rvideo_mode (state); |
4144 | break; |
4141 | break; |
4145 | case 6: /* relative/absolute origins */ |
4142 | case 6: /* relative/absolute origins */ |
… | |
… | |
4151 | /* case 8: - auto repeat, can't do on a per window basis */ |
4148 | /* case 8: - auto repeat, can't do on a per window basis */ |
4152 | case 9: /* X10 mouse reporting */ |
4149 | case 9: /* X10 mouse reporting */ |
4153 | if (state) /* orthogonal */ |
4150 | if (state) /* orthogonal */ |
4154 | priv_modes &= ~PrivMode_MouseX11; |
4151 | priv_modes &= ~PrivMode_MouseX11; |
4155 | break; |
4152 | break; |
4156 | #ifdef menuBar_esc |
|
|
4157 | case menuBar_esc: |
|
|
4158 | #ifdef MENUBAR |
|
|
4159 | map_menuBar (state); |
|
|
4160 | #endif |
|
|
4161 | break; |
|
|
4162 | #endif |
|
|
4163 | #ifdef scrollBar_esc |
4153 | #ifdef scrollBar_esc |
4164 | case scrollBar_esc: |
4154 | case scrollBar_esc: |
4165 | if (scrollbar_mapping (state)) |
4155 | if (scrollbar_mapping (state)) |
4166 | { |
4156 | { |
4167 | resize_all_windows (0, 0, 0); |
4157 | resize_all_windows (0, 0, 0); |
… | |
… | |
4186 | #if 0 |
4176 | #if 0 |
4187 | case 1001: |
4177 | case 1001: |
4188 | break; /* X11 mouse highlighting */ |
4178 | break; /* X11 mouse highlighting */ |
4189 | #endif |
4179 | #endif |
4190 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4180 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4191 | if (!state) |
4181 | set_option (Opt_scrollTtyOutput, !state); |
4192 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4193 | else |
|
|
4194 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4195 | break; |
4182 | break; |
4196 | case 1011: /* scroll to bottom on key press */ |
4183 | case 1011: /* scroll to bottom on key press */ |
4197 | if (state) |
4184 | set_option (Opt_scrollTtyKeypress, state); |
4198 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4199 | else |
|
|
4200 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4201 | break; |
4185 | break; |
4202 | case 1047: /* secondary screen w/ clearing last */ |
4186 | case 1047: /* secondary screen w/ clearing last */ |
4203 | if (OPTION (Opt_secondaryScreen)) |
4187 | if (OPTION (Opt_secondaryScreen)) |
4204 | if (current_screen != PRIMARY) |
4188 | if (current_screen != PRIMARY) |
4205 | scr_erase_screen (2); |
4189 | scr_erase_screen (2); |
… | |
… | |
4343 | scr_color (Color_bg, Color_bg); |
4327 | scr_color (Color_bg, Color_bg); |
4344 | break; |
4328 | break; |
4345 | |
4329 | |
4346 | //case 50: // not variable spacing |
4330 | //case 50: // not variable spacing |
4347 | |
4331 | |
4348 | #ifndef NO_BRIGHTCOLOR |
4332 | #if !ENABLE_MINIMAL |
4349 | case 90: |
4333 | case 90: |
4350 | case 91: /* set bright fg color */ |
4334 | case 91: /* set bright fg color */ |
4351 | case 92: |
4335 | case 92: |
4352 | case 93: |
4336 | case 93: |
4353 | case 94: |
4337 | case 94: |
… | |
… | |
4398 | */ |
4382 | */ |
4399 | void |
4383 | void |
4400 | rxvt_term::tt_printf (const char *fmt,...) |
4384 | rxvt_term::tt_printf (const char *fmt,...) |
4401 | { |
4385 | { |
4402 | va_list arg_ptr; |
4386 | va_list arg_ptr; |
4403 | unsigned char buf[256]; |
4387 | char buf[256]; |
4404 | |
4388 | |
4405 | va_start (arg_ptr, fmt); |
4389 | va_start (arg_ptr, fmt); |
4406 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4390 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4407 | va_end (arg_ptr); |
4391 | va_end (arg_ptr); |
4408 | tt_write (buf, strlen (buf)); |
4392 | tt_write (buf, strlen (buf)); |
… | |
… | |
4413 | * or generated by us in response to a query ESC sequence. |
4397 | * or generated by us in response to a query ESC sequence. |
4414 | */ |
4398 | */ |
4415 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4399 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4416 | |
4400 | |
4417 | void |
4401 | void |
4418 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4402 | rxvt_term::tt_write (const char *data, unsigned int len) |
4419 | { |
4403 | { |
|
|
4404 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4405 | return; |
|
|
4406 | |
|
|
4407 | if (pty->pty < 0) |
|
|
4408 | return; |
|
|
4409 | |
4420 | if (v_buflen == 0) |
4410 | if (v_buflen == 0) |
4421 | { |
4411 | { |
4422 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4412 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4423 | |
4413 | |
4424 | if ((unsigned int)written == len) |
4414 | if ((unsigned int)written == len) |
4425 | return; |
4415 | return; |
4426 | |
4416 | |
4427 | data += written; |
4417 | data += written; |
4428 | len -= written; |
4418 | len -= written; |
4429 | } |
4419 | } |
4430 | |
4420 | |
4431 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4421 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4432 | |
4422 | |
4433 | memcpy (v_buffer + v_buflen, data, len); |
4423 | memcpy (v_buffer + v_buflen, data, len); |
4434 | v_buflen += len; |
4424 | v_buflen += len; |
4435 | |
4425 | |
4436 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4426 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4437 | } |
4427 | } |
4438 | |
4428 | |
4439 | void rxvt_term::pty_write () |
4429 | void rxvt_term::pty_write () |
4440 | { |
4430 | { |
4441 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4431 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4442 | |
4432 | |
4443 | if (written > 0) |
4433 | if (written > 0) |
4444 | { |
4434 | { |
4445 | v_buflen -= written; |
4435 | v_buflen -= written; |
4446 | |
4436 | |