… | |
… | |
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. |
… | |
… | |
43 | * along with this program; if not, write to the Free Software |
43 | * along with this program; if not, write to the Free Software |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
45 | *----------------------------------------------------------------------*/ |
45 | *----------------------------------------------------------------------*/ |
46 | |
46 | |
47 | /*{{{ includes: */ |
47 | /*{{{ includes: */ |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" |
|
|
50 | #include "rxvtperl.h" |
50 | #include "version.h" |
51 | #include "version.h" |
51 | #include "command.h" |
52 | #include "command.h" |
|
|
53 | |
|
|
54 | #if HAVE_SCHED_YIELD |
|
|
55 | #undef HAVE_SCHED_YIELD // disabled for the time being |
|
|
56 | //# include <sched.h> |
|
|
57 | #endif |
52 | |
58 | |
53 | #ifdef KEYSYM_RESOURCE |
59 | #ifdef KEYSYM_RESOURCE |
54 | # include "keyboard.h" |
60 | # include "keyboard.h" |
55 | #endif |
61 | #endif |
56 | |
62 | |
… | |
… | |
141 | || !IN_RANGE_EXC (y, 0, nrow)) |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
142 | return; |
148 | return; |
143 | |
149 | |
144 | for (;;) |
150 | for (;;) |
145 | { |
151 | { |
146 | const line_t &l = ROW(-view_start); |
152 | const line_t &l = ROW(y + view_start); |
147 | |
153 | |
148 | text_t t = l.t[x]; |
154 | text_t t = l.t[x]; |
149 | |
155 | |
150 | if (t != NOCHAR || !x) |
156 | if (t != NOCHAR || !x) |
151 | { |
157 | { |
152 | iso14755_51 (l.t[x], l.r[x]); |
158 | iso14755_51 (l.t[x], l.r[x], x, y); |
153 | iso14755buf = ISO_14755_54; |
159 | iso14755buf = ISO_14755_54; |
154 | break; |
160 | break; |
155 | } |
161 | } |
156 | |
162 | |
157 | x--; |
163 | x--; |
158 | } |
164 | } |
159 | } |
165 | } |
160 | #endif |
|
|
161 | |
166 | |
162 | #if ENABLE_OVERLAY |
|
|
163 | void |
167 | void |
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
168 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) |
165 | { |
169 | { |
166 | rxvt_fontset *fs = FONTSET (r); |
170 | rxvt_fontset *fs = FONTSET (r); |
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
171 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
168 | wchar_t *chr, *alloc, ch2, *fname; |
172 | wchar_t *chr, *alloc, ch2, *fname; |
169 | int len; |
173 | int len; |
170 | |
174 | |
171 | fname = rxvt_utf8towcs (f->name); |
175 | fname = rxvt_utf8towcs (f->name); |
172 | |
176 | |
173 | #if ENABLE_COMBINING |
177 | # if ENABLE_COMBINING |
174 | if (IS_COMPOSE (ch)) |
178 | if (IS_COMPOSE (ch)) |
175 | { |
179 | { |
176 | len = rxvt_composite.expand (ch, 0); |
180 | len = rxvt_composite.expand (ch, 0); |
177 | alloc = chr = new wchar_t[len]; |
181 | alloc = chr = new wchar_t[len]; |
178 | rxvt_composite.expand (ch, chr); |
182 | rxvt_composite.expand (ch, chr); |
179 | } |
183 | } |
180 | else |
184 | else |
181 | #endif |
185 | # endif |
182 | { |
186 | { |
183 | ch2 = ch; |
187 | ch2 = ch; |
184 | |
188 | |
185 | alloc = 0; |
189 | alloc = 0; |
186 | chr = &ch2; |
190 | chr = &ch2; |
187 | len = 1; |
191 | len = 1; |
188 | } |
192 | } |
189 | |
193 | |
|
|
194 | char attr[80]; // plenty |
|
|
195 | |
|
|
196 | sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", |
|
|
197 | (int)r, |
|
|
198 | fgcolor_of (r), bgcolor_of (r), |
|
|
199 | r & RS_Bold ? " bold" : "", |
|
|
200 | r & RS_Italic ? " italic" : "", |
|
|
201 | r & RS_Blink ? " blink" : "", |
|
|
202 | r & RS_RVid ? " rvid" : "", |
|
|
203 | r & RS_Uline ? " uline" : "", |
|
|
204 | r & RS_Careful ? " careful" : ""); |
|
|
205 | |
190 | int width = wcswidth (fname, wcslen (fname)); |
206 | int width = wcswidth (fname, wcslen (fname)); |
191 | |
207 | |
192 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
208 | max_it (width, 8+5); // for char + hey |
|
|
209 | max_it (width, strlen (attr)); |
|
|
210 | |
|
|
211 | if (y >= 0) |
|
|
212 | { |
|
|
213 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
|
|
214 | x = 0; |
|
|
215 | } |
|
|
216 | |
|
|
217 | scr_overlay_new (x, y, width, len + 2); |
193 | |
218 | |
194 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
219 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
195 | |
220 | |
196 | for (int y = 0; y < len; y++) |
221 | for (int y = 0; y < len; y++) |
197 | { |
222 | { |
… | |
… | |
200 | ch = *chr++; |
225 | ch = *chr++; |
201 | |
226 | |
202 | sprintf (buf, "%8x", ch); |
227 | sprintf (buf, "%8x", ch); |
203 | scr_overlay_set (0, y, buf); |
228 | scr_overlay_set (0, y, buf); |
204 | scr_overlay_set (9, y, '='); |
229 | scr_overlay_set (9, y, '='); |
205 | #if !UNICODE3 |
230 | # if !UNICODE3 |
206 | if (ch >= 0x10000) |
231 | if (ch >= 0x10000) |
207 | ch = 0xfffd; |
232 | ch = 0xfffd; |
208 | #endif |
233 | # endif |
209 | scr_overlay_set (11, y, ch, r); |
234 | scr_overlay_set (11, y, ch, r); |
210 | scr_overlay_set (12, y, NOCHAR, r); |
235 | scr_overlay_set (12, y, NOCHAR, r); |
211 | } |
236 | } |
212 | |
237 | |
|
|
238 | scr_overlay_set (0, len , attr); |
213 | scr_overlay_set (0, len, fname); |
239 | scr_overlay_set (0, len + 1, fname); |
214 | |
240 | |
215 | free (fname); |
241 | free (fname); |
216 | |
242 | |
217 | #if ENABLE_COMBINING |
243 | # if ENABLE_COMBINING |
218 | if (alloc) |
244 | if (alloc) |
219 | delete [] alloc; |
245 | delete [] alloc; |
220 | #endif |
246 | # endif |
221 | } |
247 | } |
222 | #endif |
248 | #endif |
223 | |
249 | |
224 | void |
250 | void |
225 | rxvt_term::commit_iso14755 () |
251 | rxvt_term::commit_iso14755 () |
… | |
… | |
242 | mb[0] = ch[0]; |
268 | mb[0] = ch[0]; |
243 | len = 1; |
269 | len = 1; |
244 | } |
270 | } |
245 | |
271 | |
246 | if (len > 0) |
272 | if (len > 0) |
247 | tt_write ((unsigned char *)mb, len); |
273 | tt_write (mb, len); |
248 | else |
274 | else |
249 | scr_bell (); |
275 | scr_bell (); |
250 | } |
276 | } |
251 | |
277 | |
252 | iso14755buf = 0; |
278 | iso14755buf = 0; |
… | |
… | |
280 | KeySym keysym; |
306 | KeySym keysym; |
281 | #ifdef DEBUG_CMD |
307 | #ifdef DEBUG_CMD |
282 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
283 | #endif |
309 | #endif |
284 | int valid_keysym; |
310 | int valid_keysym; |
285 | unsigned char kbuf[KBUFSZ]; |
311 | char kbuf[KBUFSZ]; |
286 | |
312 | |
287 | /* |
313 | /* |
288 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
314 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
289 | * escape sequence to toggle the Keypad. |
315 | * escape sequence to toggle the Keypad. |
290 | * |
316 | * |
… | |
… | |
308 | Status status_return; |
334 | Status status_return; |
309 | |
335 | |
310 | #if 0 |
336 | #if 0 |
311 | #ifdef X_HAVE_UTF8_STRING |
337 | #ifdef X_HAVE_UTF8_STRING |
312 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
338 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
313 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
339 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
314 | KBUFSZ, &keysym, &status_return); |
340 | KBUFSZ, &keysym, &status_return); |
315 | else |
341 | else |
316 | #endif |
342 | #endif |
317 | #endif |
343 | #endif |
318 | { |
344 | { |
… | |
… | |
355 | || status_return == XLookupBoth; |
381 | || status_return == XLookupBoth; |
356 | } |
382 | } |
357 | else |
383 | else |
358 | #endif |
384 | #endif |
359 | { |
385 | { |
360 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
386 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
361 | valid_keysym = keysym != NoSymbol; |
387 | valid_keysym = keysym != NoSymbol; |
362 | } |
388 | } |
363 | |
389 | |
364 | if (valid_keysym) |
390 | if (valid_keysym) |
365 | { |
391 | { |
… | |
… | |
829 | { |
855 | { |
830 | #ifdef META8_OPTION |
856 | #ifdef META8_OPTION |
831 | /* set 8-bit on */ |
857 | /* set 8-bit on */ |
832 | if (meta && (meta_char == 0x80)) |
858 | if (meta && (meta_char == 0x80)) |
833 | { |
859 | { |
834 | unsigned char *ch; |
860 | char *ch; |
835 | |
861 | |
836 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
837 | *ch |= 0x80; |
863 | *ch |= 0x80; |
838 | |
864 | |
839 | meta = 0; |
865 | meta = 0; |
… | |
… | |
841 | #endif |
867 | #endif |
842 | /* nil */ ; |
868 | /* nil */ ; |
843 | } |
869 | } |
844 | } |
870 | } |
845 | |
871 | |
|
|
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
|
|
873 | return; |
|
|
874 | |
846 | if (len <= 0) |
875 | if (len <= 0) |
847 | return; /* not mapped */ |
876 | return; /* not mapped */ |
848 | |
877 | |
849 | if (options & Opt_scrollTtyKeypress) |
878 | if (OPTION (Opt_scrollTtyKeypress)) |
850 | if (view_start) |
879 | if (view_start) |
851 | { |
880 | { |
852 | view_start = 0; |
881 | view_start = 0; |
853 | want_refresh = 1; |
882 | want_refresh = 1; |
854 | } |
883 | } |
… | |
… | |
872 | #ifdef META8_OPTION |
901 | #ifdef META8_OPTION |
873 | && meta_char == C0_ESC |
902 | && meta_char == C0_ESC |
874 | #endif |
903 | #endif |
875 | ) |
904 | ) |
876 | { |
905 | { |
877 | const unsigned char ch = C0_ESC; |
906 | const char ch = C0_ESC; |
878 | tt_write (&ch, 1); |
907 | tt_write (&ch, 1); |
879 | } |
908 | } |
880 | |
909 | |
881 | #if defined(DEBUG_CMD) |
910 | #if defined(DEBUG_CMD) |
882 | /* Display keyboard buffer contents */ |
911 | /* Display keyboard buffer contents */ |
… | |
… | |
894 | |
923 | |
895 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
924 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
896 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
925 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
897 | /* attempt to `write' count to the input buffer */ |
926 | /* attempt to `write' count to the input buffer */ |
898 | unsigned int |
927 | unsigned int |
899 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
928 | rxvt_term::cmd_write (const char *str, unsigned int count) |
900 | { |
929 | { |
901 | unsigned int n, s; |
930 | unsigned int n, s; |
902 | |
931 | |
903 | n = cmdbuf_ptr - cmdbuf_base; |
932 | n = cmdbuf_ptr - cmdbuf_base; |
904 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
933 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
941 | } |
970 | } |
942 | #endif |
971 | #endif |
943 | |
972 | |
944 | if (want_refresh) |
973 | if (want_refresh) |
945 | { |
974 | { |
|
|
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
|
|
976 | { |
|
|
977 | int row = view_start; |
|
|
978 | int end_row = row + nrow; |
|
|
979 | |
|
|
980 | while (row > top_row && ROW (row - 1).is_longer ()) |
|
|
981 | --row; |
|
|
982 | |
|
|
983 | do |
|
|
984 | { |
|
|
985 | int start_row = row; |
|
|
986 | line_t *l; |
|
|
987 | |
|
|
988 | do |
|
|
989 | { |
|
|
990 | l = &ROW (row++); |
|
|
991 | |
|
|
992 | if (!(l->f & LINE_FILTERED)) |
|
|
993 | { |
|
|
994 | // line not filtered, mark it as filtered |
|
|
995 | l->f |= LINE_FILTERED; |
|
|
996 | while (l->is_longer ()) |
|
|
997 | { |
|
|
998 | l = &ROW (row++); |
|
|
999 | l->f |= LINE_FILTERED; |
|
|
1000 | } |
|
|
1001 | |
|
|
1002 | // and filter it |
|
|
1003 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1004 | |
|
|
1005 | break; |
|
|
1006 | } |
|
|
1007 | } |
|
|
1008 | while (l->is_longer () && row < end_row); |
|
|
1009 | } |
|
|
1010 | while (row < end_row); |
|
|
1011 | } |
|
|
1012 | |
946 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
947 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
948 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
949 | IMSendSpot (); |
1016 | IMSendSpot (); |
950 | #endif |
1017 | #endif |
… | |
… | |
960 | SET_LOCALE (locale); |
1027 | SET_LOCALE (locale); |
961 | |
1028 | |
962 | display->flush (); |
1029 | display->flush (); |
963 | |
1030 | |
964 | if (want_refresh && !flush_ev.active) |
1031 | if (want_refresh && !flush_ev.active) |
965 | flush_ev.start (NOW + 0.01); |
1032 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
966 | } |
1033 | } |
967 | |
1034 | |
968 | void |
1035 | void |
969 | rxvt_term::flush_cb (time_watcher &w) |
1036 | rxvt_term::flush_cb (time_watcher &w) |
970 | { |
1037 | { |
… | |
… | |
1034 | { |
1101 | { |
1035 | if (mouse_slip_wheel_speed == 0 |
1102 | if (mouse_slip_wheel_speed == 0 |
1036 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1103 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1037 | : scr_page (UP, mouse_slip_wheel_speed)) |
1104 | : scr_page (UP, mouse_slip_wheel_speed)) |
1038 | { |
1105 | { |
1039 | if (view_start == nsaved || |
1106 | if (view_start == top_row || view_start == 0) |
1040 | view_start == 0) |
|
|
1041 | mouse_slip_wheel_speed = 0; |
1107 | mouse_slip_wheel_speed = 0; |
1042 | |
1108 | |
1043 | refresh_type |= SMOOTH_REFRESH; |
1109 | refresh_type |= SMOOTH_REFRESH; |
1044 | want_refresh = 1; |
1110 | want_refresh = 1; |
1045 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1111 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1046 | } |
1112 | } |
1047 | } |
1113 | } |
1048 | #endif |
1114 | #endif |
1049 | |
1115 | |
|
|
1116 | #if HAVE_SCHED_YIELD |
|
|
1117 | static struct event_handler |
|
|
1118 | { |
|
|
1119 | check_watcher cw_yield; |
|
|
1120 | |
|
|
1121 | void yield (check_watcher &w) |
|
|
1122 | { |
|
|
1123 | sched_yield (); |
|
|
1124 | w.stop (); |
|
|
1125 | } |
|
|
1126 | |
|
|
1127 | event_handler () |
|
|
1128 | : cw_yield (this, &event_handler::yield) |
|
|
1129 | { |
|
|
1130 | } |
|
|
1131 | } event_handler; |
|
|
1132 | #endif |
|
|
1133 | |
1050 | bool |
1134 | bool |
1051 | rxvt_term::pty_fill () |
1135 | rxvt_term::pty_fill () |
1052 | { |
1136 | { |
1053 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1137 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1054 | |
1138 | |
1055 | if (CBUFSIZ == n) |
1139 | if (CBUFSIZ == n) |
1056 | { |
1140 | { |
1057 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1141 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1058 | n = 0; |
1142 | n = 0; |
1059 | } |
1143 | } |
1060 | |
1144 | |
1061 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1145 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1062 | cmdbuf_ptr = cmdbuf_base; |
1146 | cmdbuf_ptr = cmdbuf_base; |
1063 | cmdbuf_endp = cmdbuf_ptr + n; |
1147 | cmdbuf_endp = cmdbuf_ptr + n; |
1064 | |
1148 | |
1065 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1149 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1066 | |
1150 | |
1067 | if (n > 0) |
1151 | if (r > 0) |
1068 | { |
1152 | { |
1069 | cmdbuf_endp += n; |
1153 | cmdbuf_endp += r; |
1070 | return true; |
1154 | return true; |
1071 | } |
1155 | } |
1072 | else if (n < 0 && errno != EAGAIN) |
1156 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1157 | { |
|
|
1158 | #if HAVE_SCHED_YIELD |
|
|
1159 | if (display->is_local) |
|
|
1160 | event_handler.cw_yield.start (); |
|
|
1161 | #endif |
|
|
1162 | } |
|
|
1163 | else |
|
|
1164 | { |
|
|
1165 | pty_ev.stop (); |
|
|
1166 | |
|
|
1167 | if (!OPTION (Opt_hold)) |
1073 | destroy (); |
1168 | destroy (); |
|
|
1169 | } |
1074 | |
1170 | |
1075 | return false; |
1171 | return false; |
1076 | } |
1172 | } |
1077 | |
1173 | |
1078 | void |
1174 | void |
… | |
… | |
1098 | recolour_cursor (); |
1194 | recolour_cursor (); |
1099 | |
1195 | |
1100 | #ifdef POINTER_BLANK |
1196 | #ifdef POINTER_BLANK |
1101 | hidden_pointer = 0; |
1197 | hidden_pointer = 0; |
1102 | |
1198 | |
1103 | if (options & Opt_pointerBlank) |
1199 | if (OPTION (Opt_pointerBlank)) |
1104 | pointer_ev.start (NOW + pointerBlankDelay); |
1200 | pointer_ev.start (NOW + pointerBlankDelay); |
1105 | #endif |
1201 | #endif |
1106 | } |
1202 | } |
1107 | |
1203 | |
1108 | #ifdef POINTER_BLANK |
1204 | #ifdef POINTER_BLANK |
1109 | void |
1205 | void |
1110 | rxvt_term::pointer_blank () |
1206 | rxvt_term::pointer_blank () |
1111 | { |
1207 | { |
1112 | if (! (options & Opt_pointerBlank)) |
1208 | if (!OPTION (Opt_pointerBlank)) |
1113 | return; |
1209 | return; |
1114 | |
1210 | |
1115 | XDefineCursor (display->display, vt, display->blank_cursor); |
1211 | XDefineCursor (display->display, vt, display->blank_cursor); |
1116 | XFlush (display->display); |
1212 | XFlush (display->display); |
1117 | |
1213 | |
… | |
… | |
1214 | dDisp; |
1310 | dDisp; |
1215 | |
1311 | |
1216 | SET_R (this); |
1312 | SET_R (this); |
1217 | SET_LOCALE (locale); |
1313 | SET_LOCALE (locale); |
1218 | |
1314 | |
1219 | #if defined(CURSOR_BLINK) |
1315 | if (ev.xany.window == vt |
1220 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
1316 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1221 | { |
1317 | return; |
1222 | if (hidden_cursor) |
|
|
1223 | { |
|
|
1224 | hidden_cursor = 0; |
|
|
1225 | want_refresh = 1; |
|
|
1226 | } |
|
|
1227 | |
1318 | |
1228 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1319 | // for XQueryPointer |
1229 | } |
|
|
1230 | #endif |
|
|
1231 | |
|
|
1232 | #if defined(POINTER_BLANK) |
|
|
1233 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1234 | { |
|
|
1235 | if (ev.type == MotionNotify |
|
|
1236 | || ev.type == ButtonPress |
|
|
1237 | || ev.type == ButtonRelease) |
|
|
1238 | if (hidden_pointer) |
|
|
1239 | pointer_unblank (); |
|
|
1240 | |
|
|
1241 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1242 | pointer_blank (); |
|
|
1243 | } |
|
|
1244 | #endif |
|
|
1245 | |
|
|
1246 | Window unused_root, unused_child; |
1320 | Window unused_root, unused_child; |
1247 | int unused_root_x, unused_root_y; |
1321 | int unused_root_x, unused_root_y; |
1248 | unsigned int unused_mask; |
1322 | unsigned int unused_mask; |
1249 | |
1323 | |
1250 | switch (ev.type) |
1324 | switch (ev.type) |
… | |
… | |
1257 | |
1331 | |
1258 | break; |
1332 | break; |
1259 | |
1333 | |
1260 | case KeyRelease: |
1334 | case KeyRelease: |
1261 | { |
1335 | { |
1262 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1336 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1263 | KeySym ks; |
1337 | KeySym keysym; |
1264 | |
1338 | |
1265 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1339 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1266 | #endif |
1340 | #endif |
1267 | |
1341 | |
1268 | #if ENABLE_FRILLS || ISO_14755 |
1342 | #if ENABLE_FRILLS || ISO_14755 |
1269 | // ISO 14755 support |
1343 | // ISO 14755 support |
1270 | if (iso14755buf) |
1344 | if (iso14755buf) |
… | |
… | |
1275 | # endif |
1349 | # endif |
1276 | # if ISO_14755 |
1350 | # if ISO_14755 |
1277 | // iso14755 part 5.2 handling: release time |
1351 | // iso14755 part 5.2 handling: release time |
1278 | // first: controls |
1352 | // first: controls |
1279 | if ((ev.xkey.state & ControlMask) |
1353 | if ((ev.xkey.state & ControlMask) |
1280 | && ((ks >= 0x40 && ks <= 0x5f) |
1354 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1281 | || (ks >= 0x61 && ks <= 0x7f))) |
1355 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1282 | { |
1356 | { |
1283 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1357 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1284 | commit_iso14755 (); |
1358 | commit_iso14755 (); |
1285 | return; // case-break; |
1359 | goto skip_switch; |
1286 | } |
1360 | } |
1287 | |
1361 | |
1288 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1362 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1289 | if (i[0] == ks) |
1363 | if (i[0] == keysym) |
1290 | { |
1364 | { |
1291 | iso14755buf = ISO_14755_51 | i[1]; |
1365 | iso14755buf = ISO_14755_51 | i[1]; |
1292 | commit_iso14755 (); |
1366 | commit_iso14755 (); |
1293 | return; // case-break; |
1367 | goto skip_switch; |
1294 | } |
1368 | } |
1295 | |
1369 | |
1296 | scr_bell (); |
1370 | scr_bell (); |
1297 | # endif |
1371 | # endif |
1298 | iso14755buf = 0; |
1372 | iso14755buf = 0; |
… | |
… | |
1317 | else |
1391 | else |
1318 | iso14755buf = 0; |
1392 | iso14755buf = 0; |
1319 | } |
1393 | } |
1320 | #endif |
1394 | #endif |
1321 | |
1395 | |
|
|
1396 | if (ev.xany.window == vt |
|
|
1397 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1398 | break; |
|
|
1399 | |
1322 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1400 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1323 | if (!(ev.xkey.state & ControlMask)) |
1401 | if (!(ev.xkey.state & ControlMask)) |
1324 | slip_wheel_ev.stop (); |
1402 | slip_wheel_ev.stop (); |
1325 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1403 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1326 | mouse_slip_wheel_speed = 0; |
1404 | mouse_slip_wheel_speed = 0; |
1327 | #endif |
1405 | #endif |
1328 | break; |
1406 | break; |
1329 | } |
1407 | } |
1330 | |
1408 | |
… | |
… | |
1434 | seen_resize = 1; |
1512 | seen_resize = 1; |
1435 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1513 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1436 | } |
1514 | } |
1437 | |
1515 | |
1438 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1516 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1439 | if (options & Opt_transparent) |
1517 | if (OPTION (Opt_transparent)) |
1440 | check_our_parents (); |
1518 | check_our_parents (); |
1441 | #endif |
1519 | #endif |
1442 | } |
1520 | } |
1443 | break; |
1521 | break; |
1444 | |
1522 | |
… | |
… | |
1460 | |
1538 | |
1461 | case SelectionRequest: |
1539 | case SelectionRequest: |
1462 | selection_send (ev.xselectionrequest); |
1540 | selection_send (ev.xselectionrequest); |
1463 | break; |
1541 | break; |
1464 | |
1542 | |
|
|
1543 | case MapNotify: |
|
|
1544 | mapped = 1; |
|
|
1545 | #ifdef TEXT_BLINK |
|
|
1546 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1547 | #endif |
|
|
1548 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1549 | break; |
|
|
1550 | |
1465 | case UnmapNotify: |
1551 | case UnmapNotify: |
1466 | mapped = 0; |
1552 | mapped = 0; |
1467 | #ifdef TEXT_BLINK |
1553 | #ifdef TEXT_BLINK |
1468 | text_blink_ev.stop (); |
1554 | text_blink_ev.stop (); |
1469 | #endif |
1555 | #endif |
1470 | break; |
1556 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1471 | |
|
|
1472 | case MapNotify: |
|
|
1473 | mapped = 1; |
|
|
1474 | #ifdef TEXT_BLINK |
|
|
1475 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1476 | #endif |
|
|
1477 | break; |
1557 | break; |
1478 | |
1558 | |
1479 | #ifdef TRANSPARENT |
1559 | #ifdef TRANSPARENT |
1480 | case ReparentNotify: |
1560 | case ReparentNotify: |
1481 | rootwin_cb (ev); |
1561 | rootwin_cb (ev); |
… | |
… | |
1495 | |
1575 | |
1496 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1576 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1497 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1577 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1498 | ev.xexpose.width, ev.xexpose.height, False); |
1578 | ev.xexpose.width, ev.xexpose.height, False); |
1499 | |
1579 | |
1500 | scr_refresh (refresh_type); |
1580 | want_refresh = 1; |
1501 | } |
1581 | } |
1502 | else |
1582 | else |
1503 | { |
1583 | { |
1504 | XEvent unused_event; |
1584 | XEvent unused_event; |
1505 | |
1585 | |
… | |
… | |
1540 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1620 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1541 | break; |
1621 | break; |
1542 | |
1622 | |
1543 | if (ev.xany.window == vt) |
1623 | if (ev.xany.window == vt) |
1544 | { |
1624 | { |
|
|
1625 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1626 | ; // nop |
1545 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1627 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1546 | { |
1628 | { |
1547 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1629 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1548 | ; |
1630 | ; |
1549 | |
1631 | |
1550 | XQueryPointer (disp, vt, |
1632 | XQueryPointer (disp, vt, |
… | |
… | |
1600 | } |
1682 | } |
1601 | |
1683 | |
1602 | scroll_selection_lines = Pixel2Height (dist) |
1684 | scroll_selection_lines = Pixel2Height (dist) |
1603 | / SELECTION_SCROLL_LINE_SPEEDUP |
1685 | / SELECTION_SCROLL_LINE_SPEEDUP |
1604 | + 1; |
1686 | + 1; |
1605 | MIN_IT (scroll_selection_lines, |
1687 | min_it (scroll_selection_lines, |
1606 | SELECTION_SCROLL_MAX_LINES); |
1688 | SELECTION_SCROLL_MAX_LINES); |
1607 | } |
1689 | } |
1608 | else |
1690 | else |
1609 | { |
1691 | { |
1610 | /* we are within the text window, so we |
1692 | /* we are within the text window, so we |
… | |
… | |
1630 | &unused_root_x, &unused_root_y, |
1712 | &unused_root_x, &unused_root_y, |
1631 | &ev.xbutton.x, &ev.xbutton.y, |
1713 | &ev.xbutton.x, &ev.xbutton.y, |
1632 | &unused_mask); |
1714 | &unused_mask); |
1633 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1715 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1634 | scrollbar_size ()); |
1716 | scrollbar_size ()); |
1635 | scr_refresh (refresh_type); |
1717 | want_refresh = 1; |
1636 | refresh_limit = 0; |
1718 | refresh_limit = 0; |
1637 | scrollbar_show (1); |
1719 | scrollbar_show (1); |
1638 | } |
1720 | } |
1639 | break; |
1721 | break; |
1640 | } |
1722 | } |
|
|
1723 | |
|
|
1724 | skip_switch: ; |
|
|
1725 | |
|
|
1726 | #if defined(CURSOR_BLINK) |
|
|
1727 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1728 | { |
|
|
1729 | if (hidden_cursor) |
|
|
1730 | { |
|
|
1731 | hidden_cursor = 0; |
|
|
1732 | want_refresh = 1; |
|
|
1733 | } |
|
|
1734 | |
|
|
1735 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1736 | } |
|
|
1737 | #endif |
|
|
1738 | |
|
|
1739 | #if defined(POINTER_BLANK) |
|
|
1740 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1741 | { |
|
|
1742 | if (ev.type == MotionNotify |
|
|
1743 | || ev.type == ButtonPress |
|
|
1744 | || ev.type == ButtonRelease) |
|
|
1745 | if (hidden_pointer) |
|
|
1746 | pointer_unblank (); |
|
|
1747 | |
|
|
1748 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1749 | pointer_blank (); |
|
|
1750 | } |
|
|
1751 | #endif |
1641 | } |
1752 | } |
1642 | |
1753 | |
1643 | void |
1754 | void |
1644 | rxvt_term::focus_in () |
1755 | rxvt_term::focus_in () |
1645 | { |
1756 | { |
1646 | if (!focus) |
1757 | if (!focus) |
1647 | { |
1758 | { |
1648 | focus = 1; |
1759 | focus = 1; |
1649 | want_refresh = 1; |
1760 | want_refresh = 1; |
|
|
1761 | |
|
|
1762 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1763 | |
1650 | #if USE_XIM |
1764 | #if USE_XIM |
1651 | if (Input_Context != NULL) |
1765 | if (Input_Context != NULL) |
1652 | { |
1766 | { |
1653 | IMSetStatusPosition (); |
1767 | IMSetStatusPosition (); |
1654 | XSetICFocus (Input_Context); |
1768 | XSetICFocus (Input_Context); |
1655 | } |
1769 | } |
1656 | #endif |
1770 | #endif |
1657 | #if CURSOR_BLINK |
1771 | #if CURSOR_BLINK |
1658 | if (options & Opt_cursorBlink) |
1772 | if (OPTION (Opt_cursorBlink)) |
1659 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1773 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1660 | #endif |
1774 | #endif |
1661 | #if OFF_FOCUS_FADING |
1775 | #if OFF_FOCUS_FADING |
1662 | if (rs[Rs_fade]) |
1776 | if (rs[Rs_fade]) |
1663 | { |
1777 | { |
… | |
… | |
1674 | if (focus) |
1788 | if (focus) |
1675 | { |
1789 | { |
1676 | focus = 0; |
1790 | focus = 0; |
1677 | want_refresh = 1; |
1791 | want_refresh = 1; |
1678 | |
1792 | |
|
|
1793 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1794 | |
1679 | #if ENABLE_FRILLS || ISO_14755 |
1795 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1796 | if (iso14755buf) |
|
|
1797 | { |
1680 | iso14755buf = 0; |
1798 | iso14755buf = 0; |
1681 | #endif |
|
|
1682 | #if ENABLE_OVERLAY |
1799 | # if ENABLE_OVERLAY |
1683 | scr_overlay_off (); |
1800 | scr_overlay_off (); |
|
|
1801 | # endif |
|
|
1802 | } |
1684 | #endif |
1803 | #endif |
1685 | #if USE_XIM |
1804 | #if USE_XIM |
1686 | if (Input_Context != NULL) |
1805 | if (Input_Context != NULL) |
1687 | XUnsetICFocus (Input_Context); |
1806 | XUnsetICFocus (Input_Context); |
1688 | #endif |
1807 | #endif |
1689 | #if CURSOR_BLINK |
1808 | #if CURSOR_BLINK |
1690 | if (options & Opt_cursorBlink) |
1809 | if (OPTION (Opt_cursorBlink)) |
1691 | cursor_blink_ev.stop (); |
1810 | cursor_blink_ev.stop (); |
1692 | hidden_cursor = 0; |
1811 | hidden_cursor = 0; |
1693 | #endif |
1812 | #endif |
1694 | #if OFF_FOCUS_FADING |
1813 | #if OFF_FOCUS_FADING |
1695 | if (rs[Rs_fade]) |
1814 | if (rs[Rs_fade]) |
… | |
… | |
1719 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1838 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1720 | return; |
1839 | return; |
1721 | |
1840 | |
1722 | /* FALLTHROUGH */ |
1841 | /* FALLTHROUGH */ |
1723 | case ReparentNotify: |
1842 | case ReparentNotify: |
1724 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1843 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1725 | want_refresh = want_full_refresh = 1; |
1844 | want_refresh = want_full_refresh = 1; |
1726 | break; |
1845 | break; |
1727 | } |
1846 | } |
1728 | } |
1847 | } |
1729 | #endif |
1848 | #endif |
… | |
… | |
1732 | rxvt_term::button_press (XButtonEvent &ev) |
1851 | rxvt_term::button_press (XButtonEvent &ev) |
1733 | { |
1852 | { |
1734 | int reportmode = 0, clickintime; |
1853 | int reportmode = 0, clickintime; |
1735 | |
1854 | |
1736 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1855 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1856 | |
1737 | if (!bypass_keystate) |
1857 | if (!bypass_keystate) |
1738 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1858 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1739 | |
1859 | |
1740 | /* |
1860 | /* |
1741 | * VT window processing of button press |
1861 | * VT window processing of button press |
… | |
… | |
1761 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1881 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1762 | if (ev.button == MEvent.button && clickintime) |
1882 | if (ev.button == MEvent.button && clickintime) |
1763 | { |
1883 | { |
1764 | /* same button, within alloted time */ |
1884 | /* same button, within alloted time */ |
1765 | MEvent.clicks++; |
1885 | MEvent.clicks++; |
|
|
1886 | |
1766 | if (MEvent.clicks > 1) |
1887 | if (MEvent.clicks > 1) |
1767 | { |
1888 | { |
1768 | /* only report double clicks */ |
1889 | /* only report double clicks */ |
1769 | MEvent.clicks = 2; |
1890 | MEvent.clicks = 2; |
1770 | mouse_report (ev); |
1891 | mouse_report (ev); |
… | |
… | |
1790 | else |
1911 | else |
1791 | { |
1912 | { |
1792 | if (ev.button != MEvent.button) |
1913 | if (ev.button != MEvent.button) |
1793 | MEvent.clicks = 0; |
1914 | MEvent.clicks = 0; |
1794 | |
1915 | |
|
|
1916 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1795 | switch (ev.button) |
1917 | switch (ev.button) |
1796 | { |
1918 | { |
1797 | case Button1: |
1919 | case Button1: |
1798 | /* allow meta + click to select rectangular areas */ |
1920 | /* allow meta + click to select rectangular areas */ |
1799 | /* should be done in screen.C */ |
1921 | /* should be done in screen.C */ |
1800 | #if ENABLE_FRILLS |
1922 | #if ENABLE_FRILLS |
1801 | selection.rect = !!(ev.state & ModMetaMask); |
1923 | selection.rect = !!(ev.state & ModMetaMask); |
1802 | #else |
1924 | #else |
1803 | selection.rect = false; |
1925 | selection.rect = false; |
1804 | #endif |
1926 | #endif |
1805 | |
1927 | |
1806 | /* allow shift+left click to extend selection */ |
1928 | /* allow shift+left click to extend selection */ |
1807 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1929 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1808 | { |
1930 | { |
1809 | if (MEvent.button == Button1 && clickintime) |
1931 | if (MEvent.button == Button1 && clickintime) |
1810 | selection_rotate (ev.x, ev.y); |
1932 | selection_rotate (ev.x, ev.y); |
1811 | else |
1933 | else |
1812 | selection_extend (ev.x, ev.y, 1); |
1934 | selection_extend (ev.x, ev.y, 1); |
1813 | } |
1935 | } |
1814 | else |
1936 | else |
1815 | { |
1937 | { |
1816 | if (MEvent.button == Button1 && clickintime) |
1938 | if (MEvent.button == Button1 && clickintime) |
1817 | MEvent.clicks++; |
1939 | MEvent.clicks++; |
1818 | else |
1940 | else |
1819 | MEvent.clicks = 1; |
1941 | MEvent.clicks = 1; |
1820 | |
1942 | |
1821 | selection_click (MEvent.clicks, ev.x, ev.y); |
1943 | selection_click (MEvent.clicks, ev.x, ev.y); |
1822 | } |
1944 | } |
1823 | |
1945 | |
1824 | MEvent.button = Button1; |
1946 | MEvent.button = Button1; |
1825 | break; |
1947 | break; |
1826 | |
1948 | |
1827 | case Button3: |
1949 | case Button3: |
1828 | if (MEvent.button == Button3 && clickintime) |
1950 | if (MEvent.button == Button3 && clickintime) |
1829 | selection_rotate (ev.x, ev.y); |
1951 | selection_rotate (ev.x, ev.y); |
1830 | else |
1952 | else |
1831 | selection_extend (ev.x, ev.y, 1); |
1953 | selection_extend (ev.x, ev.y, 1); |
1832 | |
1954 | |
1833 | MEvent.button = Button3; |
1955 | MEvent.button = Button3; |
1834 | break; |
1956 | break; |
1835 | } |
1957 | } |
1836 | } |
1958 | } |
1837 | |
1959 | |
1838 | MEvent.time = ev.time; |
1960 | MEvent.time = ev.time; |
1839 | return; |
1961 | return; |
1840 | } |
1962 | } |
1841 | |
1963 | |
… | |
… | |
1977 | } |
2099 | } |
1978 | |
2100 | |
1979 | break; |
2101 | break; |
1980 | } |
2102 | } |
1981 | } |
2103 | } |
|
|
2104 | |
1982 | return; |
2105 | return; |
1983 | } |
2106 | } |
|
|
2107 | |
1984 | #if MENUBAR |
2108 | #if MENUBAR |
1985 | /* |
2109 | /* |
1986 | * Menubar window processing of button press |
2110 | * Menubar window processing of button press |
1987 | */ |
2111 | */ |
1988 | if (isMenuBarWindow (ev.window)) |
2112 | if (isMenuBarWindow (ev.window)) |
… | |
… | |
2051 | if (priv_modes & PrivMode_mouse_report |
2175 | if (priv_modes & PrivMode_mouse_report |
2052 | && bypass_keystate |
2176 | && bypass_keystate |
2053 | && ev.button == Button1 && MEvent.clicks <= 1) |
2177 | && ev.button == Button1 && MEvent.clicks <= 1) |
2054 | selection_extend (ev.x, ev.y, 0); |
2178 | selection_extend (ev.x, ev.y, 0); |
2055 | |
2179 | |
|
|
2180 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2181 | return; |
|
|
2182 | |
2056 | switch (ev.button) |
2183 | switch (ev.button) |
2057 | { |
2184 | { |
2058 | case Button1: |
2185 | case Button1: |
2059 | case Button3: |
2186 | case Button3: |
2060 | selection_make (ev.time); |
2187 | selection_make (ev.time); |
… | |
… | |
2071 | |
2198 | |
2072 | v = ev.button == Button4 ? UP : DN; |
2199 | v = ev.button == Button4 ? UP : DN; |
2073 | |
2200 | |
2074 | if (ev.state & ShiftMask) |
2201 | if (ev.state & ShiftMask) |
2075 | i = 1; |
2202 | i = 1; |
2076 | else if (options & Opt_mouseWheelScrollPage) |
2203 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2077 | i = nrow - 1; |
2204 | i = nrow - 1; |
2078 | else |
2205 | else |
2079 | i = 5; |
2206 | i = 5; |
2080 | |
2207 | |
2081 | # ifdef MOUSE_SLIP_WHEELING |
2208 | # ifdef MOUSE_SLIP_WHEELING |
… | |
… | |
2091 | slip_wheel_ev.start (); |
2218 | slip_wheel_ev.start (); |
2092 | } |
2219 | } |
2093 | else |
2220 | else |
2094 | { |
2221 | { |
2095 | # endif |
2222 | # endif |
2096 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2097 | scr_page (v, i); |
2223 | scr_page (v, i); |
2098 | scr_refresh (SMOOTH_REFRESH); |
|
|
2099 | scrollbar_show (1); |
2224 | scrollbar_show (1); |
2100 | # else |
|
|
2101 | while (i--) |
|
|
2102 | { |
|
|
2103 | scr_page (v, 1); |
|
|
2104 | scr_refresh (SMOOTH_REFRESH); |
|
|
2105 | scrollbar_show (1); |
|
|
2106 | } |
|
|
2107 | # endif |
|
|
2108 | # ifdef MOUSE_SLIP_WHEELING |
2225 | # ifdef MOUSE_SLIP_WHEELING |
2109 | } |
2226 | } |
2110 | #endif |
2227 | # endif |
2111 | } |
2228 | } |
2112 | break; |
2229 | break; |
2113 | #endif |
2230 | #endif |
2114 | } |
2231 | } |
2115 | } |
2232 | } |
… | |
… | |
2367 | XWindowAttributes wattr, wrootattr; |
2484 | XWindowAttributes wattr, wrootattr; |
2368 | dDisp; |
2485 | dDisp; |
2369 | |
2486 | |
2370 | pchanged = 0; |
2487 | pchanged = 0; |
2371 | |
2488 | |
2372 | if (!(options & Opt_transparent)) |
2489 | if (!OPTION (Opt_transparent)) |
2373 | return pchanged; /* Don't try any more */ |
2490 | return pchanged; /* Don't try any more */ |
2374 | |
2491 | |
2375 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2492 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2376 | rootdepth = wrootattr.depth; |
2493 | rootdepth = wrootattr.depth; |
2377 | |
2494 | |
… | |
… | |
2451 | nh += sy; |
2568 | nh += sy; |
2452 | ny = -sy; |
2569 | ny = -sy; |
2453 | sy = 0; |
2570 | sy = 0; |
2454 | } |
2571 | } |
2455 | |
2572 | |
2456 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2573 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2457 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2574 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2458 | |
2575 | |
2459 | XSync (disp, False); |
2576 | XSync (disp, False); |
2460 | allowedxerror = -1; |
2577 | allowedxerror = -1; |
2461 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2578 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2462 | |
2579 | |
… | |
… | |
2604 | |
2721 | |
2605 | bool |
2722 | bool |
2606 | rxvt_term::cmd_parse () |
2723 | rxvt_term::cmd_parse () |
2607 | { |
2724 | { |
2608 | bool flag = false; |
2725 | bool flag = false; |
2609 | unicode_t ch = NOCHAR; |
2726 | wchar_t ch = NOCHAR; |
2610 | unsigned char *seq_begin; // remember start of esc-sequence here |
2727 | char *seq_begin; // remember start of esc-sequence here |
2611 | |
2728 | |
2612 | for (;;) |
2729 | for (;;) |
2613 | { |
2730 | { |
2614 | if (ch == NOCHAR) |
2731 | if (ch == NOCHAR) |
2615 | { |
2732 | { |
2616 | seq_begin = cmdbuf_ptr; |
2733 | seq_begin = cmdbuf_ptr; |
2617 | ch = next_char (); |
2734 | ch = next_char (); |
2618 | } |
|
|
2619 | |
2735 | |
2620 | if (ch == NOCHAR) // TODO: improve |
2736 | if (ch == NOCHAR) |
2621 | break; |
2737 | break; |
|
|
2738 | } |
2622 | |
2739 | |
2623 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2740 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2624 | { |
2741 | { |
2625 | if (!seen_input) |
2742 | if (!seen_input) |
2626 | { |
2743 | { |
… | |
… | |
2635 | if (seen_resize && cmd_pid) |
2752 | if (seen_resize && cmd_pid) |
2636 | kill (-cmd_pid, SIGWINCH); |
2753 | kill (-cmd_pid, SIGWINCH); |
2637 | } |
2754 | } |
2638 | |
2755 | |
2639 | /* Read a text string from the input buffer */ |
2756 | /* Read a text string from the input buffer */ |
2640 | unicode_t buf[UBUFSIZ]; |
2757 | wchar_t buf[UBUFSIZ]; |
2641 | bool refreshnow = false; |
2758 | bool refreshnow = false; |
2642 | int nlines = 0; |
2759 | int nlines = 0; |
2643 | unicode_t *str = buf; |
2760 | wchar_t *str = buf; |
2644 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2761 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2645 | |
2762 | |
2646 | for (;;) |
2763 | for (;;) |
2647 | { |
2764 | { |
2648 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2765 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2649 | break; |
2766 | break; |
… | |
… | |
2655 | if (ch == C0_LF) |
2772 | if (ch == C0_LF) |
2656 | nlines++; |
2773 | nlines++; |
2657 | |
2774 | |
2658 | refresh_count++; |
2775 | refresh_count++; |
2659 | |
2776 | |
2660 | if (!(options & Opt_jumpScroll) |
2777 | if (!OPTION (Opt_jumpScroll) |
2661 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2778 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2662 | { |
2779 | { |
2663 | refreshnow = true; |
2780 | refreshnow = true; |
|
|
2781 | refresh_count = 0; |
2664 | ch = NOCHAR; |
2782 | ch = NOCHAR; |
2665 | break; |
2783 | break; |
2666 | } |
2784 | } |
2667 | |
2785 | |
2668 | // scr_add_lines only works for nlines <= nrow - 1. |
2786 | // scr_add_lines only works for nlines <= nrow - 1. |
2669 | if (nlines >= nrow - 1) |
2787 | if (nlines >= nrow - 1) |
2670 | { |
2788 | { |
|
|
2789 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2671 | scr_add_lines (buf, nlines, str - buf); |
2790 | scr_add_lines (buf, str - buf, nlines); |
|
|
2791 | |
2672 | nlines = 0; |
2792 | nlines = 0; |
2673 | str = buf; |
2793 | str = buf; |
2674 | eol = str + min (ncol, UBUFSIZ); |
2794 | eol = str + min (ncol, UBUFSIZ); |
2675 | } |
2795 | } |
2676 | |
2796 | |
… | |
… | |
2689 | |
2809 | |
2690 | seq_begin = cmdbuf_ptr; |
2810 | seq_begin = cmdbuf_ptr; |
2691 | ch = next_char (); |
2811 | ch = next_char (); |
2692 | } |
2812 | } |
2693 | |
2813 | |
|
|
2814 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2694 | scr_add_lines (buf, nlines, str - buf); |
2815 | scr_add_lines (buf, str - buf, nlines); |
2695 | |
2816 | |
2696 | /* |
2817 | /* |
2697 | * If there have been a lot of new lines, then update the screen |
2818 | * If there have been a lot of new lines, then update the screen |
2698 | * What the heck I'll cheat and only refresh less than every page-full. |
2819 | * What the heck I'll cheat and only refresh less than every page-full. |
2699 | * the number of pages between refreshes is refresh_limit, which |
2820 | * the number of pages between refreshes is refresh_limit, which |
2700 | * is incremented here because we must be doing flat-out scrolling. |
2821 | * is incremented here because we must be doing flat-out scrolling. |
2701 | */ |
2822 | */ |
2702 | if (refreshnow) |
2823 | if (refreshnow) |
2703 | { |
2824 | { |
2704 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2825 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2705 | refresh_limit++; |
2826 | refresh_limit++; |
2706 | else |
2827 | else |
2707 | { |
2828 | { |
2708 | flag = true; |
2829 | flag = true; |
2709 | scr_refresh (refresh_type); |
2830 | scr_refresh (refresh_type); |
|
|
2831 | want_refresh = 1; |
2710 | } |
2832 | } |
2711 | } |
2833 | } |
2712 | |
2834 | |
2713 | } |
2835 | } |
2714 | else |
2836 | else |
… | |
… | |
2729 | } |
2851 | } |
2730 | |
2852 | |
2731 | return flag; |
2853 | return flag; |
2732 | } |
2854 | } |
2733 | |
2855 | |
2734 | // read the next octet |
|
|
2735 | unicode_t |
|
|
2736 | rxvt_term::next_octet () |
|
|
2737 | { |
|
|
2738 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2739 | ? *cmdbuf_ptr++ |
|
|
2740 | : NOCHAR; |
|
|
2741 | } |
|
|
2742 | |
|
|
2743 | // read the next character |
2856 | // read the next character |
2744 | unicode_t |
2857 | wchar_t |
2745 | rxvt_term::next_char () |
2858 | rxvt_term::next_char () |
2746 | { |
2859 | { |
2747 | while (cmdbuf_ptr < cmdbuf_endp) |
2860 | while (cmdbuf_ptr < cmdbuf_endp) |
2748 | { |
2861 | { |
2749 | // assume 7-bit to be ascii ALWAYS |
2862 | // assume 7-bit to be ascii ALWAYS |
2750 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2863 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2751 | return *cmdbuf_ptr++; |
2864 | return *cmdbuf_ptr++; |
2752 | |
2865 | |
2753 | wchar_t wc; |
2866 | wchar_t wc; |
2754 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2867 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2755 | |
2868 | |
2756 | if (len == (size_t)-2) |
2869 | if (len == (size_t)-2) |
2757 | { |
2870 | { |
2758 | // the mbstate stores incomplete sequences. didn't know this :/ |
2871 | // the mbstate stores incomplete sequences. didn't know this :/ |
2759 | cmdbuf_ptr = cmdbuf_endp; |
2872 | cmdbuf_ptr = cmdbuf_endp; |
2760 | break; |
2873 | break; |
2761 | } |
2874 | } |
2762 | |
2875 | |
2763 | if (len == (size_t)-1) |
2876 | if (len == (size_t)-1) |
2764 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2877 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2765 | |
2878 | |
2766 | // assume wchar == unicode |
2879 | // assume wchar == unicode |
2767 | cmdbuf_ptr += len; |
2880 | cmdbuf_ptr += len; |
2768 | return wc & UNICODE_MASK; |
2881 | return wc & UNICODE_MASK; |
2769 | } |
2882 | } |
2770 | |
2883 | |
2771 | return NOCHAR; |
2884 | return NOCHAR; |
|
|
2885 | } |
|
|
2886 | |
|
|
2887 | // read the next octet |
|
|
2888 | uint32_t |
|
|
2889 | rxvt_term::next_octet () |
|
|
2890 | { |
|
|
2891 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2892 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2893 | : NOCHAR; |
2772 | } |
2894 | } |
2773 | |
2895 | |
2774 | /* rxvt_cmd_getc () - Return next input character */ |
2896 | /* rxvt_cmd_getc () - Return next input character */ |
2775 | /* |
2897 | /* |
2776 | * Return the next input character after first passing any keyboard input |
2898 | * Return the next input character after first passing any keyboard input |
2777 | * to the command. |
2899 | * to the command. |
2778 | */ |
2900 | */ |
2779 | unicode_t |
2901 | wchar_t |
2780 | rxvt_term::cmd_getc () |
2902 | rxvt_term::cmd_getc () |
2781 | { |
2903 | { |
2782 | unicode_t c = next_char (); |
2904 | wchar_t c = next_char (); |
2783 | |
2905 | |
2784 | if (c == NOCHAR) |
2906 | if (c == NOCHAR) |
2785 | throw out_of_input; |
2907 | throw out_of_input; |
2786 | |
2908 | |
2787 | return c; |
2909 | return c; |
2788 | } |
2910 | } |
2789 | |
2911 | |
2790 | unicode_t |
2912 | uint32_t |
2791 | rxvt_term::cmd_get8 () |
2913 | rxvt_term::cmd_get8 () |
2792 | { |
2914 | { |
2793 | unicode_t c = next_octet (); |
2915 | uint32_t c = next_octet (); |
2794 | |
2916 | |
2795 | if (c == NOCHAR) |
2917 | if (c == NOCHAR) |
2796 | throw out_of_input; |
2918 | throw out_of_input; |
2797 | |
2919 | |
2798 | return c; |
2920 | return c; |
… | |
… | |
2898 | case C0_ESC: |
3020 | case C0_ESC: |
2899 | process_escape_seq (); |
3021 | process_escape_seq (); |
2900 | break; |
3022 | break; |
2901 | case C0_ENQ: /* terminal Status */ |
3023 | case C0_ENQ: /* terminal Status */ |
2902 | if (rs[Rs_answerbackstring]) |
3024 | if (rs[Rs_answerbackstring]) |
2903 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
3025 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2904 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2905 | else |
3026 | else |
2906 | tt_write ((unsigned char *)VT100_ANS, |
3027 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2907 | (unsigned int)strlen (VT100_ANS)); |
|
|
2908 | break; |
3028 | break; |
2909 | case C0_BEL: /* bell */ |
3029 | case C0_BEL: /* bell */ |
2910 | scr_bell (); |
3030 | scr_bell (); |
2911 | break; |
3031 | break; |
2912 | case C0_BS: /* backspace */ |
3032 | case C0_BS: /* backspace */ |
… | |
… | |
3067 | break; |
3187 | break; |
3068 | |
3188 | |
3069 | /* 8.3.87: NEXT LINE */ |
3189 | /* 8.3.87: NEXT LINE */ |
3070 | case C1_NEL: /* ESC E */ |
3190 | case C1_NEL: /* ESC E */ |
3071 | { |
3191 | { |
3072 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3192 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3073 | scr_add_lines (nlcr, 1, 2); |
3193 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3074 | } |
3194 | } |
3075 | break; |
3195 | break; |
3076 | |
3196 | |
3077 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3197 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3078 | case C1_ESA: /* ESC G */ |
3198 | case C1_ESA: /* ESC G */ |
… | |
… | |
3100 | process_dcs_seq (); |
3220 | process_dcs_seq (); |
3101 | break; |
3221 | break; |
3102 | |
3222 | |
3103 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3223 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3104 | case C1_SCI: /* ESC Z */ |
3224 | case C1_SCI: /* ESC Z */ |
3105 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3225 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3106 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3107 | break; /* steal obsolete ESC [ c */ |
3226 | break; /* steal obsolete ESC [ c */ |
3108 | |
3227 | |
3109 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3228 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3110 | case C1_CSI: /* ESC [ */ |
3229 | case C1_CSI: /* ESC [ */ |
3111 | process_csi_seq (); |
3230 | process_csi_seq (); |
… | |
… | |
3355 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3474 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3356 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3475 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3357 | break; |
3476 | break; |
3358 | |
3477 | |
3359 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3478 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3360 | tt_write ((const unsigned char *)VT100_ANS, |
3479 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3361 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3362 | break; |
3480 | break; |
3363 | |
3481 | |
3364 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3482 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3365 | process_sgr_mode (nargs, arg); |
3483 | process_sgr_mode (nargs, arg); |
3366 | break; |
3484 | break; |
… | |
… | |
3373 | break; |
3491 | break; |
3374 | case 6: /* CPR requested */ |
3492 | case 6: /* CPR requested */ |
3375 | scr_report_position (); |
3493 | scr_report_position (); |
3376 | break; |
3494 | break; |
3377 | case 7: /* unofficial extension */ |
3495 | case 7: /* unofficial extension */ |
3378 | if (options & Opt_insecure) |
3496 | if (OPTION (Opt_insecure)) |
3379 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3497 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3380 | break; |
3498 | break; |
3381 | case 8: /* unofficial extension */ |
3499 | case 8: /* unofficial extension */ |
3382 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3500 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3383 | break; |
3501 | break; |
… | |
… | |
3547 | break; |
3665 | break; |
3548 | case 20: /* report icon label */ |
3666 | case 20: /* report icon label */ |
3549 | { |
3667 | { |
3550 | char *s; |
3668 | char *s; |
3551 | XGetIconName (disp, parent[0], &s); |
3669 | XGetIconName (disp, parent[0], &s); |
3552 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3670 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3553 | XFree (s); |
3671 | XFree (s); |
3554 | } |
3672 | } |
3555 | break; |
3673 | break; |
3556 | case 21: /* report window title */ |
3674 | case 21: /* report window title */ |
3557 | { |
3675 | { |
3558 | char *s; |
3676 | char *s; |
3559 | XFetchName (disp, parent[0], &s); |
3677 | XFetchName (disp, parent[0], &s); |
3560 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3678 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3561 | XFree (s); |
3679 | XFree (s); |
3562 | } |
3680 | } |
3563 | break; |
3681 | break; |
3564 | } |
3682 | } |
3565 | } |
3683 | } |
… | |
… | |
3568 | /*----------------------------------------------------------------------*/ |
3686 | /*----------------------------------------------------------------------*/ |
3569 | /* |
3687 | /* |
3570 | * get input up until STRING TERMINATOR (or BEL) |
3688 | * get input up until STRING TERMINATOR (or BEL) |
3571 | * ends_how is terminator used. returned input must be free()'d |
3689 | * ends_how is terminator used. returned input must be free()'d |
3572 | */ |
3690 | */ |
3573 | unsigned char * |
3691 | char * |
3574 | rxvt_term::get_to_st (unicode_t &ends_how) |
3692 | rxvt_term::get_to_st (unicode_t &ends_how) |
3575 | { |
3693 | { |
3576 | unicode_t ch; |
3694 | unicode_t ch; |
3577 | bool seen_esc = false; |
3695 | bool seen_esc = false; |
3578 | unsigned int n = 0; |
3696 | unsigned int n = 0; |
… | |
… | |
3611 | |
3729 | |
3612 | string[n++] = '\0'; |
3730 | string[n++] = '\0'; |
3613 | |
3731 | |
3614 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3732 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3615 | |
3733 | |
3616 | return (unsigned char *)rxvt_wcstombs (string); |
3734 | return rxvt_wcstombs (string); |
3617 | } |
3735 | } |
3618 | |
3736 | |
3619 | /*----------------------------------------------------------------------*/ |
3737 | /*----------------------------------------------------------------------*/ |
3620 | /* |
3738 | /* |
3621 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3739 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3622 | */ |
3740 | */ |
3623 | void |
3741 | void |
3624 | rxvt_term::process_dcs_seq () |
3742 | rxvt_term::process_dcs_seq () |
3625 | { |
3743 | { |
3626 | unsigned char *s; |
3744 | char *s; |
3627 | unicode_t eh; |
3745 | unicode_t eh; |
3628 | |
3746 | |
3629 | /* |
3747 | /* |
3630 | * Not handled yet |
3748 | * Not handled yet |
3631 | */ |
3749 | */ |
… | |
… | |
3650 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3768 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3651 | arg = arg * 10 + (ch - '0'); |
3769 | arg = arg * 10 + (ch - '0'); |
3652 | |
3770 | |
3653 | if (ch == ';') |
3771 | if (ch == ';') |
3654 | { |
3772 | { |
3655 | unsigned char *s = get_to_st (eh); |
3773 | char *s = get_to_st (eh); |
3656 | |
3774 | |
3657 | if (s) |
3775 | if (s) |
3658 | { |
3776 | { |
3659 | process_xterm_seq (arg, (char *)s, eh); |
3777 | process_xterm_seq (arg, s, eh); |
3660 | free (s); |
3778 | free (s); |
3661 | } |
3779 | } |
3662 | } |
3780 | } |
3663 | } |
3781 | } |
3664 | |
3782 | |
3665 | void |
3783 | void |
3666 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3784 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3667 | { |
3785 | { |
3668 | if (str[0] == '?' && !str[1]) |
3786 | if (str[0] == '?' && !str[1]) |
3669 | { |
3787 | { |
3670 | unsigned short r, g, b; |
3788 | unsigned short r, g, b; |
3671 | pix_colors_focused[color].get (display, r, g, b); |
3789 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3677 | |
3795 | |
3678 | /* |
3796 | /* |
3679 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3797 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3680 | */ |
3798 | */ |
3681 | void |
3799 | void |
3682 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3800 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3683 | { |
3801 | { |
3684 | int changed = 0; |
3802 | int changed = 0; |
3685 | int color; |
3803 | int color; |
3686 | char *buf, *name; |
3804 | char *buf, *name; |
3687 | bool query = str[0] == '?' && !str[1]; |
3805 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
3744 | { |
3862 | { |
3745 | if ((name = strchr (buf, ';')) == NULL) |
3863 | if ((name = strchr (buf, ';')) == NULL) |
3746 | break; |
3864 | break; |
3747 | |
3865 | |
3748 | *name++ = '\0'; |
3866 | *name++ = '\0'; |
3749 | color = atoi (buf); |
3867 | color = atoi (buf) + minCOLOR; |
3750 | |
3868 | |
3751 | if (color < 0 || color >= TOTAL_COLORS) |
3869 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3752 | break; |
3870 | break; |
3753 | |
3871 | |
3754 | if ((buf = strchr (name, ';')) != NULL) |
3872 | if ((buf = strchr (name, ';')) != NULL) |
3755 | *buf++ = '\0'; |
3873 | *buf++ = '\0'; |
3756 | |
3874 | |
3757 | if (name[0] == '?' && !name[1]) |
3875 | if (name[0] == '?' && !name[1]) |
3758 | { |
3876 | { |
3759 | unsigned short r, g, b; |
3877 | unsigned short r, g, b; |
3760 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3878 | pix_colors_focused[color].get (display, r, g, b); |
3761 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3879 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3762 | } |
3880 | } |
3763 | else |
3881 | else |
3764 | set_window_color (color + minCOLOR, name); |
3882 | set_window_color (color, name); |
3765 | } |
3883 | } |
3766 | break; |
3884 | break; |
3767 | case XTerm_Color00: |
3885 | case XTerm_Color00: |
3768 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3886 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3769 | break; |
3887 | break; |
3770 | case XTerm_Color01: |
3888 | case XTerm_Color01: |
3771 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3889 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3772 | break; |
3890 | break; |
3773 | #ifndef NO_CURSORCOLOR |
3891 | #ifndef NO_CURSORCOLOR |
3774 | case XTerm_Color_cursor: |
3892 | case XTerm_Color_cursor: |
3775 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3893 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3776 | break; |
3894 | break; |
… | |
… | |
3780 | break; |
3898 | break; |
3781 | case XTerm_Color_pointer_bg: |
3899 | case XTerm_Color_pointer_bg: |
3782 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3900 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3783 | break; |
3901 | break; |
3784 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3902 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3785 | case XTerm_Color_BD: |
|
|
3786 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3787 | break; |
|
|
3788 | case XTerm_Color_UL: |
|
|
3789 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3790 | break; |
|
|
3791 | case XTerm_Color_RV: |
3903 | case XTerm_Color_RV: |
3792 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3904 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3905 | break; |
|
|
3906 | case Rxvt_Color_BD: |
|
|
3907 | case URxvt_Color_BD: |
|
|
3908 | process_color_seq (op, Color_BD, str, resp); |
|
|
3909 | break; |
|
|
3910 | case Rxvt_Color_UL: |
|
|
3911 | case URxvt_Color_UL: |
|
|
3912 | process_color_seq (op, Color_UL, str, resp); |
3793 | break; |
3913 | break; |
3794 | case URxvt_Color_IT: |
3914 | case URxvt_Color_IT: |
3795 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3915 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3796 | break; |
3916 | break; |
3797 | #endif |
3917 | #endif |
… | |
… | |
3802 | if (am_transparent) |
3922 | if (am_transparent) |
3803 | want_full_refresh = want_refresh = 1; |
3923 | want_full_refresh = want_refresh = 1; |
3804 | break; |
3924 | break; |
3805 | #endif |
3925 | #endif |
3806 | |
3926 | |
3807 | case XTerm_Pixmap: |
3927 | case Rxvt_Pixmap: |
3808 | if (*str != ';') |
3928 | if (*str != ';') |
3809 | { |
3929 | { |
3810 | #if XPM_BACKGROUND |
3930 | #if XPM_BACKGROUND |
3811 | scale_pixmap (""); /* reset to default scaling */ |
3931 | scale_pixmap (""); /* reset to default scaling */ |
3812 | set_bgPixmap (str); /* change pixmap */ |
3932 | set_bgPixmap (str); /* change pixmap */ |
3813 | #endif |
|
|
3814 | scr_touch (true); |
3933 | scr_touch (true); |
|
|
3934 | #endif |
3815 | } |
3935 | } |
|
|
3936 | |
3816 | while ((str = strchr (str, ';')) != NULL) |
3937 | while ((str = strchr (str, ';')) != NULL) |
3817 | { |
3938 | { |
3818 | str++; |
3939 | str++; |
3819 | #if XPM_BACKGROUND |
3940 | #if XPM_BACKGROUND |
3820 | changed += scale_pixmap (str); |
3941 | changed += scale_pixmap (str); |
… | |
… | |
3823 | |
3944 | |
3824 | if (changed) |
3945 | if (changed) |
3825 | { |
3946 | { |
3826 | #ifdef XPM_BACKGROUND |
3947 | #ifdef XPM_BACKGROUND |
3827 | resize_pixmap (); |
3948 | resize_pixmap (); |
3828 | #endif |
|
|
3829 | scr_touch (true); |
3949 | scr_touch (true); |
|
|
3950 | #endif |
3830 | } |
3951 | } |
3831 | break; |
3952 | break; |
3832 | |
3953 | |
3833 | case XTerm_restoreFG: |
3954 | case Rxvt_restoreFG: |
3834 | set_window_color (Color_fg, str); |
3955 | set_window_color (Color_fg, str); |
3835 | break; |
3956 | break; |
3836 | case XTerm_restoreBG: |
3957 | case Rxvt_restoreBG: |
3837 | set_window_color (Color_bg, str); |
3958 | set_window_color (Color_bg, str); |
3838 | break; |
3959 | break; |
3839 | |
3960 | |
3840 | case XTerm_logfile: |
3961 | case XTerm_logfile: |
3841 | // TODO, when secure mode? |
3962 | // TODO, when secure mode? |
3842 | break; |
3963 | break; |
3843 | |
3964 | |
3844 | #ifdef MENUBAR |
3965 | #ifdef MENUBAR |
3845 | case URxvt_Menu: |
3966 | case URxvt_Menu: |
3846 | if (options & Opt_insecure) |
3967 | if (OPTION (Opt_insecure)) |
3847 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3968 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3848 | break; |
3969 | break; |
3849 | #endif |
3970 | #endif |
3850 | #if 0 |
3971 | #if 0 |
3851 | case XTerm_dumpscreen: /* no error notices */ |
3972 | case Rxvt_dumpscreen: /* no error notices */ |
3852 | { |
3973 | { |
3853 | int fd; |
3974 | int fd; |
3854 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3975 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3855 | { |
3976 | { |
3856 | scr_dump (fd); |
3977 | scr_dump (fd); |
… | |
… | |
3867 | case URxvt_italicFont: |
3988 | case URxvt_italicFont: |
3868 | case URxvt_boldItalicFont: |
3989 | case URxvt_boldItalicFont: |
3869 | #endif |
3990 | #endif |
3870 | if (query) |
3991 | if (query) |
3871 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3992 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3872 | (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3993 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3873 | ? fontset[op - URxvt_font]->fontdesc : "", |
3994 | ? fontset[op - URxvt_font]->fontdesc : "", |
3874 | resp); |
3995 | resp); |
3875 | else |
3996 | else |
3876 | { |
3997 | { |
3877 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3998 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
… | |
… | |
3883 | break; |
4004 | break; |
3884 | |
4005 | |
3885 | #if ENABLE_FRILLS |
4006 | #if ENABLE_FRILLS |
3886 | case URxvt_locale: |
4007 | case URxvt_locale: |
3887 | if (query) |
4008 | if (query) |
3888 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); |
4009 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3889 | else |
4010 | else |
3890 | { |
4011 | { |
3891 | set_locale (str); |
4012 | set_locale (str); |
3892 | pty.set_utf8_mode (enc_utf8); |
4013 | pty.set_utf8_mode (enc_utf8); |
3893 | init_xlocale (); |
4014 | init_xlocale (); |
3894 | } |
4015 | } |
3895 | break; |
4016 | break; |
3896 | |
4017 | |
3897 | case URxvt_view_up: |
4018 | case URxvt_view_up: |
3898 | case URxvt_view_down: |
4019 | case URxvt_view_down: |
|
|
4020 | { |
3899 | int lines = atoi (str); |
4021 | int lines = atoi (str); |
3900 | |
4022 | |
3901 | if (lines) |
4023 | if (lines) |
3902 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
4024 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3903 | else |
4025 | else |
3904 | { |
|
|
3905 | scr_erase_savelines (); |
4026 | scr_erase_savelines (); |
3906 | } |
4027 | } |
3907 | |
4028 | |
|
|
4029 | break; |
|
|
4030 | #endif |
|
|
4031 | |
|
|
4032 | #if ENABLE_PERL |
|
|
4033 | case URxvt_perl: |
|
|
4034 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
|
|
4035 | ; // no responses yet |
3908 | break; |
4036 | break; |
3909 | #endif |
4037 | #endif |
3910 | } |
4038 | } |
3911 | } |
4039 | } |
3912 | /*----------------------------------------------------------------------*/ |
4040 | /*----------------------------------------------------------------------*/ |
… | |
… | |
4021 | } |
4149 | } |
4022 | |
4150 | |
4023 | /* extra handling for values with state unkept */ |
4151 | /* extra handling for values with state unkept */ |
4024 | switch (arg[i]) |
4152 | switch (arg[i]) |
4025 | { |
4153 | { |
|
|
4154 | #if ENABLE_STYLES |
|
|
4155 | case 1021: |
|
|
4156 | set_option (Opt_intensityStyles, mode); |
|
|
4157 | |
|
|
4158 | scr_touch (true); |
|
|
4159 | break; |
|
|
4160 | #endif |
4026 | case 1048: /* alternative cursor save */ |
4161 | case 1048: /* alternative cursor save */ |
4027 | case 1049: |
4162 | case 1049: |
4028 | if (options & Opt_secondaryScreen) |
4163 | if (OPTION (Opt_secondaryScreen)) |
4029 | if (mode == 0) |
4164 | if (mode == 0) |
4030 | scr_cursor (RESTORE); |
4165 | scr_cursor (RESTORE); |
4031 | else if (mode == 1) |
4166 | else if (mode == 1) |
4032 | scr_cursor (SAVE); |
4167 | scr_cursor (SAVE); |
4033 | break; |
4168 | break; |
… | |
… | |
4048 | case 3: /* 80/132 */ |
4183 | case 3: /* 80/132 */ |
4049 | if (priv_modes & PrivMode_132OK) |
4184 | if (priv_modes & PrivMode_132OK) |
4050 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4185 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4051 | break; |
4186 | break; |
4052 | case 4: /* smooth scrolling */ |
4187 | case 4: /* smooth scrolling */ |
4053 | if (state) |
|
|
4054 | options &= ~Opt_jumpScroll; |
|
|
4055 | else |
|
|
4056 | options |= Opt_jumpScroll; |
4188 | set_option (Opt_jumpScroll, !state); |
4057 | break; |
4189 | break; |
4058 | case 5: /* reverse video */ |
4190 | case 5: /* reverse video */ |
4059 | scr_rvideo_mode (state); |
4191 | scr_rvideo_mode (state); |
4060 | break; |
4192 | break; |
4061 | case 6: /* relative/absolute origins */ |
4193 | case 6: /* relative/absolute origins */ |
… | |
… | |
4102 | #if 0 |
4234 | #if 0 |
4103 | case 1001: |
4235 | case 1001: |
4104 | break; /* X11 mouse highlighting */ |
4236 | break; /* X11 mouse highlighting */ |
4105 | #endif |
4237 | #endif |
4106 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4238 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4107 | if (state) |
|
|
4108 | options &= ~Opt_scrollTtyOutput; |
|
|
4109 | else |
|
|
4110 | options |= Opt_scrollTtyOutput; |
4239 | set_option (Opt_scrollTtyOutput, !state); |
4111 | break; |
4240 | break; |
4112 | case 1011: /* scroll to bottom on key press */ |
4241 | case 1011: /* scroll to bottom on key press */ |
4113 | if (state) |
|
|
4114 | options |= Opt_scrollTtyKeypress; |
4242 | set_option (Opt_scrollTtyKeypress, state); |
4115 | else |
|
|
4116 | options &= ~Opt_scrollTtyKeypress; |
|
|
4117 | break; |
4243 | break; |
4118 | case 1047: /* secondary screen w/ clearing last */ |
4244 | case 1047: /* secondary screen w/ clearing last */ |
4119 | if (options & Opt_secondaryScreen) |
4245 | if (OPTION (Opt_secondaryScreen)) |
4120 | if (current_screen != PRIMARY) |
4246 | if (current_screen != PRIMARY) |
4121 | scr_erase_screen (2); |
4247 | scr_erase_screen (2); |
4122 | scr_change_screen (state); |
4248 | scr_change_screen (state); |
4123 | break; |
4249 | break; |
4124 | case 1049: /* secondary screen w/ clearing first */ |
4250 | case 1049: /* secondary screen w/ clearing first */ |
4125 | scr_change_screen (state); |
4251 | scr_change_screen (state); |
4126 | if (options & Opt_secondaryScreen) |
4252 | if (OPTION (Opt_secondaryScreen)) |
4127 | if (current_screen != PRIMARY) |
4253 | if (current_screen != PRIMARY) |
4128 | scr_erase_screen (2); |
4254 | scr_erase_screen (2); |
4129 | break; |
4255 | break; |
4130 | default: |
4256 | default: |
4131 | break; |
4257 | break; |
… | |
… | |
4259 | scr_color (Color_bg, Color_bg); |
4385 | scr_color (Color_bg, Color_bg); |
4260 | break; |
4386 | break; |
4261 | |
4387 | |
4262 | //case 50: // not variable spacing |
4388 | //case 50: // not variable spacing |
4263 | |
4389 | |
4264 | #ifndef NO_BRIGHTCOLOR |
4390 | #if ENABLE_FRILLS |
4265 | case 90: |
4391 | case 90: |
4266 | case 91: /* set bright fg color */ |
4392 | case 91: /* set bright fg color */ |
4267 | case 92: |
4393 | case 92: |
4268 | case 93: |
4394 | case 93: |
4269 | case 94: |
4395 | case 94: |
… | |
… | |
4281 | case 106: |
4407 | case 106: |
4282 | case 107: |
4408 | case 107: |
4283 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4409 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4284 | break; |
4410 | break; |
4285 | #endif |
4411 | #endif |
4286 | |
|
|
4287 | } |
4412 | } |
4288 | } |
4413 | } |
4289 | } |
4414 | } |
4290 | /*}}} */ |
4415 | /*}}} */ |
4291 | |
4416 | |
… | |
… | |
4315 | */ |
4440 | */ |
4316 | void |
4441 | void |
4317 | rxvt_term::tt_printf (const char *fmt,...) |
4442 | rxvt_term::tt_printf (const char *fmt,...) |
4318 | { |
4443 | { |
4319 | va_list arg_ptr; |
4444 | va_list arg_ptr; |
4320 | unsigned char buf[256]; |
4445 | char buf[256]; |
4321 | |
4446 | |
4322 | va_start (arg_ptr, fmt); |
4447 | va_start (arg_ptr, fmt); |
4323 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4448 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4324 | va_end (arg_ptr); |
4449 | va_end (arg_ptr); |
4325 | tt_write (buf, strlen (buf)); |
4450 | tt_write (buf, strlen (buf)); |
… | |
… | |
4330 | * or generated by us in response to a query ESC sequence. |
4455 | * or generated by us in response to a query ESC sequence. |
4331 | */ |
4456 | */ |
4332 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4457 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4333 | |
4458 | |
4334 | void |
4459 | void |
4335 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4460 | rxvt_term::tt_write (const char *data, unsigned int len) |
4336 | { |
4461 | { |
|
|
4462 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4463 | return; |
|
|
4464 | |
|
|
4465 | if (pty.pty < 0) |
|
|
4466 | return; |
|
|
4467 | |
4337 | if (v_buflen == 0) |
4468 | if (v_buflen == 0) |
4338 | { |
4469 | { |
4339 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4470 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4340 | |
4471 | |
4341 | if ((unsigned int)written == len) |
4472 | if ((unsigned int)written == len) |
… | |
… | |
4343 | |
4474 | |
4344 | data += written; |
4475 | data += written; |
4345 | len -= written; |
4476 | len -= written; |
4346 | } |
4477 | } |
4347 | |
4478 | |
4348 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4479 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4349 | |
4480 | |
4350 | memcpy (v_buffer + v_buflen, data, len); |
4481 | memcpy (v_buffer + v_buflen, data, len); |
4351 | v_buflen += len; |
4482 | v_buflen += len; |
4352 | |
4483 | |
4353 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4484 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
… | |
… | |
4372 | } |
4503 | } |
4373 | |
4504 | |
4374 | memmove (v_buffer, v_buffer + written, v_buflen); |
4505 | memmove (v_buffer, v_buffer + written, v_buflen); |
4375 | } |
4506 | } |
4376 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4507 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4377 | // original code just ignores this... |
4508 | pty_ev.set (EVENT_READ); |
4378 | destroy (); |
|
|
4379 | } |
4509 | } |
4380 | |
4510 | |
4381 | /*----------------------- end-of-file (C source) -----------------------*/ |
4511 | /*----------------------- end-of-file (C source) -----------------------*/ |
4382 | |
4512 | |