… | |
… | |
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" |
52 | |
53 | |
|
|
54 | #if HAVE_SCHED_YIELD |
|
|
55 | #undef HAVE_SCHED_YIELD // disabled for the time being |
|
|
56 | //# include <sched.h> |
|
|
57 | #endif |
|
|
58 | |
53 | #ifdef KEYSYM_RESOURCE |
59 | #ifdef KEYSYM_RESOURCE |
54 | # include "keyboard.h" |
60 | # include "keyboard.h" |
55 | #endif |
61 | #endif |
56 | |
62 | |
57 | #include <csignal> |
63 | #include <csignal> |
58 | |
64 | |
59 | /*----------------------------------------------------------------------*/ |
65 | /*----------------------------------------------------------------------*/ |
60 | |
66 | |
61 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
67 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
62 | |
|
|
63 | // exception thrown when the command parser runs out of input data |
|
|
64 | class out_of_input { } out_of_input; |
|
|
65 | |
68 | |
66 | #if ENABLE_FRILLS || ISO_14755 |
69 | #if ENABLE_FRILLS || ISO_14755 |
67 | |
70 | |
68 | #define ISO_14755_STARTED 0x80000000UL |
71 | #define ISO_14755_STARTED 0x80000000UL |
69 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
72 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
… | |
… | |
141 | || !IN_RANGE_EXC (y, 0, nrow)) |
144 | || !IN_RANGE_EXC (y, 0, nrow)) |
142 | return; |
145 | return; |
143 | |
146 | |
144 | for (;;) |
147 | for (;;) |
145 | { |
148 | { |
146 | const line_t &l = ROW(-view_start); |
149 | const line_t &l = ROW(y + view_start); |
147 | |
150 | |
148 | text_t t = l.t[x]; |
151 | text_t t = l.t[x]; |
149 | |
152 | |
150 | if (t != NOCHAR || !x) |
153 | if (t != NOCHAR || !x) |
151 | { |
154 | { |
152 | iso14755_51 (l.t[x], l.r[x]); |
155 | iso14755_51 (l.t[x], l.r[x], x, y); |
153 | iso14755buf = ISO_14755_54; |
156 | iso14755buf = ISO_14755_54; |
154 | break; |
157 | break; |
155 | } |
158 | } |
156 | |
159 | |
157 | x--; |
160 | x--; |
158 | } |
161 | } |
159 | } |
162 | } |
160 | #endif |
|
|
161 | |
163 | |
162 | #if ENABLE_OVERLAY |
|
|
163 | void |
164 | void |
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
165 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) |
165 | { |
166 | { |
166 | rxvt_fontset *fs = FONTSET (r); |
167 | rxvt_fontset *fs = FONTSET (r); |
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
168 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
168 | wchar_t *chr, *alloc, ch2, *fname; |
169 | wchar_t *chr, *alloc, ch2, *fname; |
169 | int len; |
170 | int len; |
170 | |
171 | |
171 | fname = rxvt_utf8towcs (f->name); |
172 | fname = rxvt_utf8towcs (f->name); |
172 | |
173 | |
173 | #if ENABLE_COMBINING |
174 | # if ENABLE_COMBINING |
174 | if (IS_COMPOSE (ch)) |
175 | if (IS_COMPOSE (ch)) |
175 | { |
176 | { |
176 | len = rxvt_composite.expand (ch, 0); |
177 | len = rxvt_composite.expand (ch, 0); |
177 | alloc = chr = new wchar_t[len]; |
178 | alloc = chr = new wchar_t[len]; |
178 | rxvt_composite.expand (ch, chr); |
179 | rxvt_composite.expand (ch, chr); |
179 | } |
180 | } |
180 | else |
181 | else |
181 | #endif |
182 | # endif |
182 | { |
183 | { |
183 | ch2 = ch; |
184 | ch2 = ch; |
184 | |
185 | |
185 | alloc = 0; |
186 | alloc = 0; |
186 | chr = &ch2; |
187 | chr = &ch2; |
187 | len = 1; |
188 | len = 1; |
188 | } |
189 | } |
189 | |
190 | |
|
|
191 | char attr[80]; // plenty |
|
|
192 | |
|
|
193 | sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", |
|
|
194 | (int)r, |
|
|
195 | fgcolor_of (r), bgcolor_of (r), |
|
|
196 | r & RS_Bold ? " bold" : "", |
|
|
197 | r & RS_Italic ? " italic" : "", |
|
|
198 | r & RS_Blink ? " blink" : "", |
|
|
199 | r & RS_RVid ? " rvid" : "", |
|
|
200 | r & RS_Uline ? " uline" : "", |
|
|
201 | r & RS_Careful ? " careful" : ""); |
|
|
202 | |
190 | int width = wcswidth (fname, wcslen (fname)); |
203 | int width = wcswidth (fname, wcslen (fname)); |
191 | |
204 | |
192 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
205 | max_it (width, 8+5); // for char + hey |
|
|
206 | max_it (width, strlen (attr)); |
|
|
207 | |
|
|
208 | if (y >= 0) |
|
|
209 | { |
|
|
210 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
|
|
211 | x = 0; |
|
|
212 | } |
|
|
213 | |
|
|
214 | scr_overlay_new (x, y, width, len + 2); |
193 | |
215 | |
194 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
216 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
195 | |
217 | |
196 | for (int y = 0; y < len; y++) |
218 | for (int y = 0; y < len; y++) |
197 | { |
219 | { |
… | |
… | |
200 | ch = *chr++; |
222 | ch = *chr++; |
201 | |
223 | |
202 | sprintf (buf, "%8x", ch); |
224 | sprintf (buf, "%8x", ch); |
203 | scr_overlay_set (0, y, buf); |
225 | scr_overlay_set (0, y, buf); |
204 | scr_overlay_set (9, y, '='); |
226 | scr_overlay_set (9, y, '='); |
205 | #if !UNICODE3 |
227 | # if !UNICODE3 |
206 | if (ch >= 0x10000) |
228 | if (ch >= 0x10000) |
207 | ch = 0xfffd; |
229 | ch = 0xfffd; |
208 | #endif |
230 | # endif |
209 | scr_overlay_set (11, y, ch, r); |
231 | scr_overlay_set (11, y, ch, r); |
210 | scr_overlay_set (12, y, NOCHAR, r); |
232 | scr_overlay_set (12, y, NOCHAR, r); |
211 | } |
233 | } |
212 | |
234 | |
|
|
235 | scr_overlay_set (0, len , attr); |
213 | scr_overlay_set (0, len, fname); |
236 | scr_overlay_set (0, len + 1, fname); |
214 | |
237 | |
215 | free (fname); |
238 | free (fname); |
216 | |
239 | |
217 | #if ENABLE_COMBINING |
240 | # if ENABLE_COMBINING |
218 | if (alloc) |
241 | if (alloc) |
219 | delete [] alloc; |
242 | delete [] alloc; |
220 | #endif |
243 | # endif |
221 | } |
244 | } |
222 | #endif |
245 | #endif |
223 | |
246 | |
224 | void |
247 | void |
225 | rxvt_term::commit_iso14755 () |
248 | rxvt_term::commit_iso14755 () |
… | |
… | |
242 | mb[0] = ch[0]; |
265 | mb[0] = ch[0]; |
243 | len = 1; |
266 | len = 1; |
244 | } |
267 | } |
245 | |
268 | |
246 | if (len > 0) |
269 | if (len > 0) |
247 | tt_write ((unsigned char *)mb, len); |
270 | tt_write (mb, len); |
248 | else |
271 | else |
249 | scr_bell (); |
272 | scr_bell (); |
250 | } |
273 | } |
251 | |
274 | |
252 | iso14755buf = 0; |
275 | iso14755buf = 0; |
… | |
… | |
276 | rxvt_term::lookup_key (XKeyEvent &ev) |
299 | rxvt_term::lookup_key (XKeyEvent &ev) |
277 | { |
300 | { |
278 | int ctrl, meta, shft, len; |
301 | int ctrl, meta, shft, len; |
279 | unsigned int newlen; |
302 | unsigned int newlen; |
280 | KeySym keysym; |
303 | KeySym keysym; |
281 | #ifdef DEBUG_CMD |
|
|
282 | static int debug_key = 1; /* accessible by a debugger only */ |
|
|
283 | #endif |
|
|
284 | int valid_keysym; |
304 | int valid_keysym; |
285 | unsigned char kbuf[KBUFSZ]; |
305 | char kbuf[KBUFSZ]; |
286 | |
306 | |
287 | /* |
307 | /* |
288 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
308 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
289 | * escape sequence to toggle the Keypad. |
309 | * escape sequence to toggle the Keypad. |
290 | * |
310 | * |
… | |
… | |
308 | Status status_return; |
328 | Status status_return; |
309 | |
329 | |
310 | #if 0 |
330 | #if 0 |
311 | #ifdef X_HAVE_UTF8_STRING |
331 | #ifdef X_HAVE_UTF8_STRING |
312 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
332 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
313 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
333 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
314 | KBUFSZ, &keysym, &status_return); |
334 | KBUFSZ, &keysym, &status_return); |
315 | else |
335 | else |
316 | #endif |
336 | #endif |
317 | #endif |
337 | #endif |
318 | { |
338 | { |
… | |
… | |
355 | || status_return == XLookupBoth; |
375 | || status_return == XLookupBoth; |
356 | } |
376 | } |
357 | else |
377 | else |
358 | #endif |
378 | #endif |
359 | { |
379 | { |
360 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
380 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
361 | valid_keysym = keysym != NoSymbol; |
381 | valid_keysym = keysym != NoSymbol; |
362 | } |
382 | } |
363 | |
383 | |
364 | if (valid_keysym) |
384 | if (valid_keysym) |
365 | { |
385 | { |
… | |
… | |
417 | scr_move_to (0, 1); |
437 | scr_move_to (0, 1); |
418 | return; |
438 | return; |
419 | } |
439 | } |
420 | else if (keysym == XK_End) |
440 | else if (keysym == XK_End) |
421 | { |
441 | { |
422 | scr_move_to (1, 0); |
442 | scr_move_to (1, 1); |
423 | return; |
443 | return; |
424 | } |
444 | } |
425 | } |
445 | } |
426 | #endif |
446 | #endif |
427 | } |
447 | } |
… | |
… | |
438 | { |
458 | { |
439 | switch (keysym) |
459 | switch (keysym) |
440 | { |
460 | { |
441 | /* normal XTerm key bindings */ |
461 | /* normal XTerm key bindings */ |
442 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
462 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
443 | selection_request (ev.time, 0, 0); |
463 | selection_request (ev.time); |
444 | return; |
464 | return; |
445 | #if TODO |
465 | #if TODO |
446 | /* rxvt extras */ |
466 | /* rxvt extras */ |
447 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
467 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
448 | change_font (FONT_UP); |
468 | change_font (FONT_UP); |
… | |
… | |
829 | { |
849 | { |
830 | #ifdef META8_OPTION |
850 | #ifdef META8_OPTION |
831 | /* set 8-bit on */ |
851 | /* set 8-bit on */ |
832 | if (meta && (meta_char == 0x80)) |
852 | if (meta && (meta_char == 0x80)) |
833 | { |
853 | { |
834 | unsigned char *ch; |
854 | char *ch; |
835 | |
855 | |
836 | for (ch = kbuf; ch < kbuf + len; ch++) |
856 | for (ch = kbuf; ch < kbuf + len; ch++) |
837 | *ch |= 0x80; |
857 | *ch |= 0x80; |
838 | |
858 | |
839 | meta = 0; |
859 | meta = 0; |
… | |
… | |
841 | #endif |
861 | #endif |
842 | /* nil */ ; |
862 | /* nil */ ; |
843 | } |
863 | } |
844 | } |
864 | } |
845 | |
865 | |
|
|
866 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
|
|
867 | return; |
|
|
868 | |
846 | if (len <= 0) |
869 | if (len <= 0) |
847 | return; /* not mapped */ |
870 | return; /* not mapped */ |
848 | |
871 | |
849 | if (options & Opt_scrollTtyKeypress) |
872 | if (OPTION (Opt_scrollTtyKeypress)) |
850 | if (view_start) |
873 | if (view_start) |
851 | { |
874 | { |
852 | view_start = 0; |
875 | view_start = 0; |
853 | want_refresh = 1; |
876 | want_refresh = 1; |
854 | } |
877 | } |
… | |
… | |
872 | #ifdef META8_OPTION |
895 | #ifdef META8_OPTION |
873 | && meta_char == C0_ESC |
896 | && meta_char == C0_ESC |
874 | #endif |
897 | #endif |
875 | ) |
898 | ) |
876 | { |
899 | { |
877 | const unsigned char ch = C0_ESC; |
900 | const char ch = C0_ESC; |
878 | tt_write (&ch, 1); |
901 | tt_write (&ch, 1); |
879 | } |
902 | } |
880 | |
903 | |
881 | #if defined(DEBUG_CMD) |
|
|
882 | /* Display keyboard buffer contents */ |
|
|
883 | unsigned char *p; |
|
|
884 | int i; |
|
|
885 | |
|
|
886 | fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); |
|
|
887 | for (i = 0, p = kbuf; i < len; i++, p++) |
|
|
888 | fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
|
|
889 | fprintf (stderr, "'\n"); |
|
|
890 | #endif /* DEBUG_CMD */ |
|
|
891 | tt_write (kbuf, (unsigned int)len); |
904 | tt_write (kbuf, (unsigned int)len); |
892 | } |
905 | } |
893 | /*}}} */ |
906 | /*}}} */ |
894 | |
907 | |
895 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
908 | #if defined (KEYSYM_RESOURCE) |
896 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
|
|
897 | /* attempt to `write' count to the input buffer */ |
|
|
898 | unsigned int |
909 | unsigned int |
899 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
910 | rxvt_term::cmd_write (const char *str, unsigned int count) |
900 | { |
911 | { |
901 | unsigned int n, s; |
912 | unsigned int n, s; |
902 | |
913 | |
903 | n = cmdbuf_ptr - cmdbuf_base; |
914 | n = cmdbuf_ptr - cmdbuf_base; |
904 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
915 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
941 | } |
952 | } |
942 | #endif |
953 | #endif |
943 | |
954 | |
944 | if (want_refresh) |
955 | if (want_refresh) |
945 | { |
956 | { |
|
|
957 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
|
|
958 | { |
|
|
959 | int row = view_start; |
|
|
960 | int end_row = row + nrow; |
|
|
961 | |
|
|
962 | while (row > top_row && ROW (row - 1).is_longer ()) |
|
|
963 | --row; |
|
|
964 | |
|
|
965 | do |
|
|
966 | { |
|
|
967 | int start_row = row; |
|
|
968 | line_t *l; |
|
|
969 | |
|
|
970 | do |
|
|
971 | { |
|
|
972 | l = &ROW (row++); |
|
|
973 | |
|
|
974 | if (!(l->f & LINE_FILTERED)) |
|
|
975 | { |
|
|
976 | // line not filtered, mark it as filtered |
|
|
977 | l->f |= LINE_FILTERED; |
|
|
978 | while (l->is_longer ()) |
|
|
979 | { |
|
|
980 | l = &ROW (row++); |
|
|
981 | l->f |= LINE_FILTERED; |
|
|
982 | } |
|
|
983 | |
|
|
984 | // and filter it |
|
|
985 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
986 | |
|
|
987 | break; |
|
|
988 | } |
|
|
989 | } |
|
|
990 | while (l->is_longer () && row < end_row); |
|
|
991 | } |
|
|
992 | while (row < end_row); |
|
|
993 | } |
|
|
994 | |
946 | scr_refresh (refresh_type); |
995 | scr_refresh (); |
947 | scrollbar_show (1); |
996 | scrollbar_show (1); |
948 | #ifdef USE_XIM |
997 | #ifdef USE_XIM |
949 | IMSendSpot (); |
998 | IMSendSpot (); |
950 | #endif |
999 | #endif |
951 | } |
1000 | } |
… | |
… | |
954 | } |
1003 | } |
955 | |
1004 | |
956 | void |
1005 | void |
957 | rxvt_term::check_cb (check_watcher &w) |
1006 | rxvt_term::check_cb (check_watcher &w) |
958 | { |
1007 | { |
959 | SET_R (this); |
1008 | make_current (); |
960 | SET_LOCALE (locale); |
|
|
961 | |
1009 | |
962 | display->flush (); |
1010 | display->flush (); |
963 | |
1011 | |
964 | if (want_refresh && !flush_ev.active) |
1012 | if (want_refresh && !flush_ev.active) |
965 | flush_ev.start (NOW + 0.01); |
1013 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
966 | } |
1014 | } |
967 | |
1015 | |
968 | void |
1016 | void |
969 | rxvt_term::flush_cb (time_watcher &w) |
1017 | rxvt_term::flush_cb (time_watcher &w) |
970 | { |
1018 | { |
971 | SET_R (this); |
1019 | make_current (); |
972 | SET_LOCALE (locale); |
|
|
973 | |
1020 | |
974 | refresh_limit = 1; |
1021 | refresh_limit = 1; |
975 | refresh_count = 0; |
1022 | refresh_count = 0; |
976 | flush (); |
1023 | flush (); |
977 | } |
1024 | } |
… | |
… | |
981 | rxvt_term::cursor_blink_cb (time_watcher &w) |
1028 | rxvt_term::cursor_blink_cb (time_watcher &w) |
982 | { |
1029 | { |
983 | hidden_cursor = !hidden_cursor; |
1030 | hidden_cursor = !hidden_cursor; |
984 | want_refresh = 1; |
1031 | want_refresh = 1; |
985 | |
1032 | |
986 | w.start (w.at + BLINK_INTERVAL); |
1033 | w.start (w.at + CURSOR_BLINK_INTERVAL); |
987 | } |
1034 | } |
988 | #endif |
1035 | #endif |
989 | |
1036 | |
990 | #ifdef TEXT_BLINK |
1037 | #ifdef TEXT_BLINK |
991 | void |
1038 | void |
… | |
… | |
1005 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1052 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1006 | { |
1053 | { |
1007 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1054 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1008 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1055 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1009 | { |
1056 | { |
1010 | refresh_type |= SMOOTH_REFRESH; |
|
|
1011 | want_refresh = 1; |
1057 | want_refresh = 1; |
1012 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1058 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1013 | } |
1059 | } |
1014 | } |
1060 | } |
1015 | #endif |
1061 | #endif |
… | |
… | |
1019 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1065 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1020 | { |
1066 | { |
1021 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1067 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1022 | { |
1068 | { |
1023 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1069 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1024 | refresh_type |= SMOOTH_REFRESH; |
|
|
1025 | want_refresh = 1; |
1070 | want_refresh = 1; |
1026 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1071 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1027 | } |
1072 | } |
1028 | } |
1073 | } |
1029 | #endif |
1074 | #endif |
… | |
… | |
1034 | { |
1079 | { |
1035 | if (mouse_slip_wheel_speed == 0 |
1080 | if (mouse_slip_wheel_speed == 0 |
1036 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1081 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1037 | : scr_page (UP, mouse_slip_wheel_speed)) |
1082 | : scr_page (UP, mouse_slip_wheel_speed)) |
1038 | { |
1083 | { |
1039 | if (view_start == nsaved || |
1084 | if (view_start == top_row || view_start == 0) |
1040 | view_start == 0) |
|
|
1041 | mouse_slip_wheel_speed = 0; |
1085 | mouse_slip_wheel_speed = 0; |
1042 | |
1086 | |
1043 | refresh_type |= SMOOTH_REFRESH; |
|
|
1044 | want_refresh = 1; |
1087 | want_refresh = 1; |
1045 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1088 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1046 | } |
1089 | } |
1047 | } |
1090 | } |
1048 | #endif |
1091 | #endif |
1049 | |
1092 | |
|
|
1093 | #if HAVE_SCHED_YIELD |
|
|
1094 | static struct event_handler |
|
|
1095 | { |
|
|
1096 | check_watcher cw_yield; |
|
|
1097 | |
|
|
1098 | void yield (check_watcher &w) |
|
|
1099 | { |
|
|
1100 | sched_yield (); |
|
|
1101 | w.stop (); |
|
|
1102 | } |
|
|
1103 | |
|
|
1104 | event_handler () |
|
|
1105 | : cw_yield (this, &event_handler::yield) |
|
|
1106 | { |
|
|
1107 | } |
|
|
1108 | } event_handler; |
|
|
1109 | #endif |
|
|
1110 | |
1050 | bool |
1111 | bool |
1051 | rxvt_term::pty_fill () |
1112 | rxvt_term::pty_fill () |
1052 | { |
1113 | { |
1053 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1114 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1054 | |
1115 | |
1055 | if (CBUFSIZ == n) |
1116 | if (CBUFSIZ == n) |
1056 | { |
1117 | { |
1057 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1118 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1058 | n = 0; |
1119 | n = 0; |
1059 | } |
1120 | } |
1060 | |
1121 | |
1061 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1122 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1062 | cmdbuf_ptr = cmdbuf_base; |
1123 | cmdbuf_ptr = cmdbuf_base; |
1063 | cmdbuf_endp = cmdbuf_ptr + n; |
1124 | cmdbuf_endp = cmdbuf_ptr + n; |
1064 | |
1125 | |
1065 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1126 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1066 | |
1127 | |
1067 | if (n > 0) |
1128 | if (r > 0) |
1068 | { |
1129 | { |
1069 | cmdbuf_endp += n; |
1130 | cmdbuf_endp += r; |
1070 | return true; |
1131 | return true; |
1071 | } |
1132 | } |
1072 | else if (n < 0 && errno != EAGAIN) |
1133 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1134 | { |
|
|
1135 | #if HAVE_SCHED_YIELD |
|
|
1136 | if (display->is_local) |
|
|
1137 | event_handler.cw_yield.start (); |
|
|
1138 | #endif |
|
|
1139 | } |
|
|
1140 | else |
|
|
1141 | { |
|
|
1142 | pty_ev.stop (); |
|
|
1143 | |
|
|
1144 | if (!OPTION (Opt_hold)) |
1073 | destroy (); |
1145 | destroy (); |
|
|
1146 | } |
1074 | |
1147 | |
1075 | return false; |
1148 | return false; |
1076 | } |
1149 | } |
1077 | |
1150 | |
1078 | void |
1151 | void |
1079 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1152 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1080 | { |
1153 | { |
1081 | SET_R (this); |
1154 | make_current (); |
1082 | SET_LOCALE (locale); |
|
|
1083 | |
1155 | |
1084 | if (revents & EVENT_READ) |
1156 | if (revents & EVENT_READ) |
1085 | // loop, but don't allow a single term to monopolize us |
1157 | // loop, but don't allow a single term to monopolize us |
1086 | while (pty_fill ()) |
1158 | while (pty_fill ()) |
1087 | if (cmd_parse ()) |
1159 | if (cmd_parse ()) |
… | |
… | |
1098 | recolour_cursor (); |
1170 | recolour_cursor (); |
1099 | |
1171 | |
1100 | #ifdef POINTER_BLANK |
1172 | #ifdef POINTER_BLANK |
1101 | hidden_pointer = 0; |
1173 | hidden_pointer = 0; |
1102 | |
1174 | |
1103 | if (options & Opt_pointerBlank) |
1175 | if (OPTION (Opt_pointerBlank)) |
1104 | pointer_ev.start (NOW + pointerBlankDelay); |
1176 | pointer_ev.start (NOW + pointerBlankDelay); |
1105 | #endif |
1177 | #endif |
1106 | } |
1178 | } |
1107 | |
1179 | |
1108 | #ifdef POINTER_BLANK |
1180 | #ifdef POINTER_BLANK |
1109 | void |
1181 | void |
1110 | rxvt_term::pointer_blank () |
1182 | rxvt_term::pointer_blank () |
1111 | { |
1183 | { |
1112 | if (! (options & Opt_pointerBlank)) |
1184 | if (!OPTION (Opt_pointerBlank)) |
1113 | return; |
1185 | return; |
1114 | |
1186 | |
1115 | XDefineCursor (display->display, vt, display->blank_cursor); |
1187 | XDefineCursor (display->display, vt, display->blank_cursor); |
1116 | XFlush (display->display); |
1188 | XFlush (display->display); |
1117 | |
1189 | |
… | |
… | |
1119 | } |
1191 | } |
1120 | |
1192 | |
1121 | void |
1193 | void |
1122 | rxvt_term::pointer_cb (time_watcher &w) |
1194 | rxvt_term::pointer_cb (time_watcher &w) |
1123 | { |
1195 | { |
1124 | SET_R (this); |
1196 | make_current (); |
1125 | SET_LOCALE (locale); |
|
|
1126 | |
1197 | |
1127 | pointer_blank (); |
1198 | pointer_blank (); |
1128 | } |
1199 | } |
1129 | #endif |
1200 | #endif |
1130 | |
1201 | |
… | |
… | |
1209 | |
1280 | |
1210 | /*{{{ process an X event */ |
1281 | /*{{{ process an X event */ |
1211 | void |
1282 | void |
1212 | rxvt_term::x_cb (XEvent &ev) |
1283 | rxvt_term::x_cb (XEvent &ev) |
1213 | { |
1284 | { |
|
|
1285 | make_current (); |
|
|
1286 | |
1214 | dDisp; |
1287 | dDisp; |
1215 | |
1288 | |
1216 | SET_R (this); |
1289 | if (ev.xany.window == vt |
1217 | SET_LOCALE (locale); |
1290 | && SHOULD_INVOKE (HOOK_X_EVENT) |
|
|
1291 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1292 | return; |
1218 | |
1293 | |
1219 | #if defined(CURSOR_BLINK) |
1294 | // for XQueryPointer |
1220 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1221 | { |
|
|
1222 | if (hidden_cursor) |
|
|
1223 | { |
|
|
1224 | hidden_cursor = 0; |
|
|
1225 | want_refresh = 1; |
|
|
1226 | } |
|
|
1227 | |
|
|
1228 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
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; |
1295 | Window unused_root, unused_child; |
1247 | int unused_root_x, unused_root_y; |
1296 | int unused_root_x, unused_root_y; |
1248 | unsigned int unused_mask; |
1297 | unsigned int unused_mask; |
1249 | |
1298 | |
1250 | switch (ev.type) |
1299 | switch (ev.type) |
… | |
… | |
1257 | |
1306 | |
1258 | break; |
1307 | break; |
1259 | |
1308 | |
1260 | case KeyRelease: |
1309 | case KeyRelease: |
1261 | { |
1310 | { |
1262 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1311 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1263 | KeySym ks; |
1312 | KeySym keysym; |
1264 | |
1313 | |
1265 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1314 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1266 | #endif |
1315 | #endif |
1267 | |
1316 | |
1268 | #if ENABLE_FRILLS || ISO_14755 |
1317 | #if ENABLE_FRILLS || ISO_14755 |
1269 | // ISO 14755 support |
1318 | // ISO 14755 support |
1270 | if (iso14755buf) |
1319 | if (iso14755buf) |
… | |
… | |
1275 | # endif |
1324 | # endif |
1276 | # if ISO_14755 |
1325 | # if ISO_14755 |
1277 | // iso14755 part 5.2 handling: release time |
1326 | // iso14755 part 5.2 handling: release time |
1278 | // first: controls |
1327 | // first: controls |
1279 | if ((ev.xkey.state & ControlMask) |
1328 | if ((ev.xkey.state & ControlMask) |
1280 | && ((ks >= 0x40 && ks <= 0x5f) |
1329 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1281 | || (ks >= 0x61 && ks <= 0x7f))) |
1330 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1282 | { |
1331 | { |
1283 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1332 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1284 | commit_iso14755 (); |
1333 | commit_iso14755 (); |
1285 | return; // case-break; |
1334 | goto skip_switch; |
1286 | } |
1335 | } |
1287 | |
1336 | |
1288 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1337 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1289 | if (i[0] == ks) |
1338 | if (i[0] == keysym) |
1290 | { |
1339 | { |
1291 | iso14755buf = ISO_14755_51 | i[1]; |
1340 | iso14755buf = ISO_14755_51 | i[1]; |
1292 | commit_iso14755 (); |
1341 | commit_iso14755 (); |
1293 | return; // case-break; |
1342 | goto skip_switch; |
1294 | } |
1343 | } |
1295 | |
1344 | |
1296 | scr_bell (); |
1345 | scr_bell (); |
1297 | # endif |
1346 | # endif |
1298 | iso14755buf = 0; |
1347 | iso14755buf = 0; |
… | |
… | |
1317 | else |
1366 | else |
1318 | iso14755buf = 0; |
1367 | iso14755buf = 0; |
1319 | } |
1368 | } |
1320 | #endif |
1369 | #endif |
1321 | |
1370 | |
|
|
1371 | if (ev.xany.window == vt |
|
|
1372 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1373 | break; |
|
|
1374 | |
1322 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1375 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1323 | if (!(ev.xkey.state & ControlMask)) |
1376 | if (!(ev.xkey.state & ControlMask)) |
1324 | slip_wheel_ev.stop (); |
1377 | slip_wheel_ev.stop (); |
1325 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1378 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1326 | mouse_slip_wheel_speed = 0; |
1379 | mouse_slip_wheel_speed = 0; |
1327 | #endif |
1380 | #endif |
1328 | break; |
1381 | break; |
1329 | } |
1382 | } |
1330 | |
1383 | |
… | |
… | |
1336 | button_release (ev.xbutton); |
1389 | button_release (ev.xbutton); |
1337 | break; |
1390 | break; |
1338 | |
1391 | |
1339 | case ClientMessage: |
1392 | case ClientMessage: |
1340 | if (ev.xclient.format == 32 |
1393 | if (ev.xclient.format == 32 |
1341 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
1394 | && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END))) |
1342 | { |
1395 | { |
|
|
1396 | if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1397 | { |
|
|
1398 | if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END))) |
|
|
1399 | { |
1343 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1400 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
|
|
1401 | { |
|
|
1402 | if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) |
1344 | destroy (); |
1403 | destroy (); |
|
|
1404 | } |
1345 | #if ENABLE_EWMH |
1405 | #if ENABLE_EWMH |
1346 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1406 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1347 | XSendEvent (disp, ev.xclient.window = display->root, |
1407 | XSendEvent (disp, ev.xclient.window = display->root, |
1348 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1408 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1349 | &ev); |
1409 | &ev); |
|
|
1410 | #endif |
|
|
1411 | } |
|
|
1412 | } |
|
|
1413 | #if ENABLE_XEMBED |
|
|
1414 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1415 | { |
|
|
1416 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1417 | focus_in (); |
|
|
1418 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1419 | focus_out (); |
|
|
1420 | } |
1350 | #endif |
1421 | #endif |
1351 | } |
1422 | } |
1352 | #if ENABLE_XEMBED |
|
|
1353 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1354 | { |
|
|
1355 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1356 | focus_in (); |
|
|
1357 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1358 | focus_out (); |
|
|
1359 | } |
|
|
1360 | #endif |
|
|
1361 | #ifdef OFFIX_DND |
|
|
1362 | /* OffiX Dnd (drag 'n' drop) protocol */ |
|
|
1363 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
|
|
1364 | && (ev.xclient.data.l[0] == DndFile |
|
|
1365 | || ev.xclient.data.l[0] == DndDir |
|
|
1366 | || ev.xclient.data.l[0] == DndLink)) |
|
|
1367 | { |
|
|
1368 | /* Get Dnd data */ |
|
|
1369 | Atom ActualType; |
|
|
1370 | int ActualFormat; |
|
|
1371 | unsigned char *data; |
|
|
1372 | unsigned long Size, RemainingBytes; |
|
|
1373 | |
|
|
1374 | XGetWindowProperty (disp, display->root, |
|
|
1375 | xa[XA_DNDSELECTION], |
|
|
1376 | 0L, 1000000L, |
|
|
1377 | False, AnyPropertyType, |
|
|
1378 | &ActualType, &ActualFormat, |
|
|
1379 | &Size, &RemainingBytes, |
|
|
1380 | &data); |
|
|
1381 | set_string_property (XA_CUT_BUFFER0, data); |
|
|
1382 | XFree (data); |
|
|
1383 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
|
|
1384 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
|
|
1385 | } |
|
|
1386 | #endif /* OFFIX_DND */ |
|
|
1387 | break; |
1423 | break; |
1388 | |
1424 | |
1389 | case MappingNotify: |
1425 | case MappingNotify: |
1390 | XRefreshKeyboardMapping (&ev.xmapping); |
1426 | XRefreshKeyboardMapping (&ev.xmapping); |
1391 | break; |
1427 | break; |
… | |
… | |
1433 | { |
1469 | { |
1434 | seen_resize = 1; |
1470 | seen_resize = 1; |
1435 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1471 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1436 | } |
1472 | } |
1437 | |
1473 | |
|
|
1474 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1475 | |
1438 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1476 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1439 | if (options & Opt_transparent) |
1477 | if (OPTION (Opt_transparent)) |
1440 | check_our_parents (); |
1478 | check_our_parents (); |
1441 | #endif |
1479 | #endif |
1442 | } |
1480 | } |
1443 | break; |
1481 | break; |
1444 | |
1482 | |
1445 | case PropertyNotify: |
1483 | case PropertyNotify: |
|
|
1484 | if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1446 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1485 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1447 | && ev.xproperty.state == PropertyNewValue) |
1486 | && ev.xproperty.state == PropertyNewValue) |
1448 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1487 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1449 | |
1488 | |
1450 | break; |
1489 | break; |
1451 | |
1490 | |
1452 | case SelectionClear: |
1491 | case SelectionClear: |
1453 | selection_clear (); |
1492 | selection_clear (); |
… | |
… | |
1458 | selection_paste (ev.xselection.requestor, ev.xselection.property, true); |
1497 | selection_paste (ev.xselection.requestor, ev.xselection.property, true); |
1459 | break; |
1498 | break; |
1460 | |
1499 | |
1461 | case SelectionRequest: |
1500 | case SelectionRequest: |
1462 | selection_send (ev.xselectionrequest); |
1501 | selection_send (ev.xselectionrequest); |
|
|
1502 | break; |
|
|
1503 | |
|
|
1504 | case MapNotify: |
|
|
1505 | mapped = 1; |
|
|
1506 | #ifdef TEXT_BLINK |
|
|
1507 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1508 | #endif |
|
|
1509 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1463 | break; |
1510 | break; |
1464 | |
1511 | |
1465 | case UnmapNotify: |
1512 | case UnmapNotify: |
1466 | mapped = 0; |
1513 | mapped = 0; |
1467 | #ifdef TEXT_BLINK |
1514 | #ifdef TEXT_BLINK |
1468 | text_blink_ev.stop (); |
1515 | text_blink_ev.stop (); |
1469 | #endif |
1516 | #endif |
1470 | break; |
1517 | 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; |
1518 | break; |
1478 | |
1519 | |
1479 | #ifdef TRANSPARENT |
1520 | #ifdef TRANSPARENT |
1480 | case ReparentNotify: |
1521 | case ReparentNotify: |
1481 | rootwin_cb (ev); |
1522 | rootwin_cb (ev); |
… | |
… | |
1495 | |
1536 | |
1496 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1537 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1497 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1538 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1498 | ev.xexpose.width, ev.xexpose.height, False); |
1539 | ev.xexpose.width, ev.xexpose.height, False); |
1499 | |
1540 | |
1500 | scr_refresh (refresh_type); |
1541 | want_refresh = 1; |
1501 | } |
1542 | } |
1502 | else |
1543 | else |
1503 | { |
1544 | { |
1504 | XEvent unused_event; |
1545 | XEvent unused_event; |
1505 | |
1546 | |
… | |
… | |
1511 | if (isScrollbarWindow (ev.xany.window)) |
1552 | if (isScrollbarWindow (ev.xany.window)) |
1512 | { |
1553 | { |
1513 | scrollBar.setIdle (); |
1554 | scrollBar.setIdle (); |
1514 | scrollbar_show (0); |
1555 | scrollbar_show (0); |
1515 | } |
1556 | } |
1516 | #ifdef MENUBAR |
|
|
1517 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1518 | menubar_expose (); |
|
|
1519 | #endif |
|
|
1520 | |
1557 | |
1521 | #ifdef TRANSPARENT |
1558 | #ifdef TRANSPARENT |
1522 | if (am_transparent && ev.xany.window == parent[0]) |
1559 | if (am_transparent && ev.xany.window == parent[0]) |
1523 | XClearWindow (disp, ev.xany.window); |
1560 | XClearWindow (disp, ev.xany.window); |
1524 | #endif |
1561 | #endif |
… | |
… | |
1528 | case MotionNotify: |
1565 | case MotionNotify: |
1529 | #ifdef POINTER_BLANK |
1566 | #ifdef POINTER_BLANK |
1530 | if (hidden_pointer) |
1567 | if (hidden_pointer) |
1531 | pointer_unblank (); |
1568 | pointer_unblank (); |
1532 | #endif |
1569 | #endif |
1533 | #if MENUBAR |
|
|
1534 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1535 | { |
|
|
1536 | menubar_control (ev.xbutton); |
|
|
1537 | break; |
|
|
1538 | } |
|
|
1539 | #endif |
|
|
1540 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1570 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1541 | break; |
1571 | break; |
1542 | |
1572 | |
1543 | if (ev.xany.window == vt) |
1573 | if (ev.xany.window == vt) |
1544 | { |
1574 | { |
|
|
1575 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
|
|
1576 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1577 | ; // nop |
1545 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1578 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1546 | { |
1579 | { |
1547 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1580 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1548 | ; |
1581 | ; |
1549 | |
1582 | |
1550 | XQueryPointer (disp, vt, |
1583 | XQueryPointer (disp, vt, |
… | |
… | |
1600 | } |
1633 | } |
1601 | |
1634 | |
1602 | scroll_selection_lines = Pixel2Height (dist) |
1635 | scroll_selection_lines = Pixel2Height (dist) |
1603 | / SELECTION_SCROLL_LINE_SPEEDUP |
1636 | / SELECTION_SCROLL_LINE_SPEEDUP |
1604 | + 1; |
1637 | + 1; |
1605 | MIN_IT (scroll_selection_lines, |
1638 | min_it (scroll_selection_lines, |
1606 | SELECTION_SCROLL_MAX_LINES); |
1639 | SELECTION_SCROLL_MAX_LINES); |
1607 | } |
1640 | } |
1608 | else |
1641 | else |
1609 | { |
1642 | { |
1610 | /* we are within the text window, so we |
1643 | /* we are within the text window, so we |
… | |
… | |
1630 | &unused_root_x, &unused_root_y, |
1663 | &unused_root_x, &unused_root_y, |
1631 | &ev.xbutton.x, &ev.xbutton.y, |
1664 | &ev.xbutton.x, &ev.xbutton.y, |
1632 | &unused_mask); |
1665 | &unused_mask); |
1633 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1666 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1634 | scrollbar_size ()); |
1667 | scrollbar_size ()); |
1635 | scr_refresh (refresh_type); |
1668 | want_refresh = 1; |
1636 | refresh_limit = 0; |
1669 | refresh_limit = 0; |
1637 | scrollbar_show (1); |
1670 | scrollbar_show (1); |
1638 | } |
1671 | } |
1639 | break; |
1672 | break; |
1640 | } |
1673 | } |
|
|
1674 | |
|
|
1675 | skip_switch: ; |
|
|
1676 | |
|
|
1677 | #if defined(CURSOR_BLINK) |
|
|
1678 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1679 | { |
|
|
1680 | if (hidden_cursor) |
|
|
1681 | { |
|
|
1682 | hidden_cursor = 0; |
|
|
1683 | want_refresh = 1; |
|
|
1684 | } |
|
|
1685 | |
|
|
1686 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
|
|
1687 | } |
|
|
1688 | #endif |
|
|
1689 | |
|
|
1690 | #if defined(POINTER_BLANK) |
|
|
1691 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1692 | { |
|
|
1693 | if (ev.type == MotionNotify |
|
|
1694 | || ev.type == ButtonPress |
|
|
1695 | || ev.type == ButtonRelease) |
|
|
1696 | if (hidden_pointer) |
|
|
1697 | pointer_unblank (); |
|
|
1698 | |
|
|
1699 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1700 | pointer_blank (); |
|
|
1701 | } |
|
|
1702 | #endif |
1641 | } |
1703 | } |
1642 | |
1704 | |
1643 | void |
1705 | void |
1644 | rxvt_term::focus_in () |
1706 | rxvt_term::focus_in () |
1645 | { |
1707 | { |
1646 | if (!focus) |
1708 | if (!focus) |
1647 | { |
1709 | { |
1648 | focus = 1; |
1710 | focus = 1; |
1649 | want_refresh = 1; |
1711 | want_refresh = 1; |
|
|
1712 | |
|
|
1713 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1714 | |
1650 | #if USE_XIM |
1715 | #if USE_XIM |
1651 | if (Input_Context != NULL) |
1716 | if (Input_Context != NULL) |
1652 | { |
1717 | { |
1653 | IMSetStatusPosition (); |
1718 | IMSetStatusPosition (); |
1654 | XSetICFocus (Input_Context); |
1719 | XSetICFocus (Input_Context); |
1655 | } |
1720 | } |
1656 | #endif |
1721 | #endif |
1657 | #if CURSOR_BLINK |
1722 | #if CURSOR_BLINK |
1658 | if (options & Opt_cursorBlink) |
1723 | if (OPTION (Opt_cursorBlink)) |
1659 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1724 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
1660 | #endif |
1725 | #endif |
1661 | #if OFF_FOCUS_FADING |
1726 | #if OFF_FOCUS_FADING |
1662 | if (rs[Rs_fade]) |
1727 | if (rs[Rs_fade]) |
1663 | { |
1728 | { |
1664 | pix_colors = pix_colors_focused; |
1729 | pix_colors = pix_colors_focused; |
… | |
… | |
1674 | if (focus) |
1739 | if (focus) |
1675 | { |
1740 | { |
1676 | focus = 0; |
1741 | focus = 0; |
1677 | want_refresh = 1; |
1742 | want_refresh = 1; |
1678 | |
1743 | |
|
|
1744 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1745 | |
1679 | #if ENABLE_FRILLS || ISO_14755 |
1746 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1747 | if (iso14755buf) |
|
|
1748 | { |
1680 | iso14755buf = 0; |
1749 | iso14755buf = 0; |
1681 | #endif |
|
|
1682 | #if ENABLE_OVERLAY |
1750 | # if ENABLE_OVERLAY |
1683 | scr_overlay_off (); |
1751 | scr_overlay_off (); |
|
|
1752 | # endif |
|
|
1753 | } |
1684 | #endif |
1754 | #endif |
1685 | #if USE_XIM |
1755 | #if USE_XIM |
1686 | if (Input_Context != NULL) |
1756 | if (Input_Context != NULL) |
1687 | XUnsetICFocus (Input_Context); |
1757 | XUnsetICFocus (Input_Context); |
1688 | #endif |
1758 | #endif |
1689 | #if CURSOR_BLINK |
1759 | #if CURSOR_BLINK |
1690 | if (options & Opt_cursorBlink) |
1760 | if (OPTION (Opt_cursorBlink)) |
1691 | cursor_blink_ev.stop (); |
1761 | cursor_blink_ev.stop (); |
1692 | hidden_cursor = 0; |
1762 | hidden_cursor = 0; |
1693 | #endif |
1763 | #endif |
1694 | #if OFF_FOCUS_FADING |
1764 | #if OFF_FOCUS_FADING |
1695 | if (rs[Rs_fade]) |
1765 | if (rs[Rs_fade]) |
… | |
… | |
1703 | |
1773 | |
1704 | #if TRANSPARENT |
1774 | #if TRANSPARENT |
1705 | void |
1775 | void |
1706 | rxvt_term::rootwin_cb (XEvent &ev) |
1776 | rxvt_term::rootwin_cb (XEvent &ev) |
1707 | { |
1777 | { |
1708 | SET_R (this); |
1778 | make_current (); |
1709 | SET_LOCALE (locale); |
|
|
1710 | |
1779 | |
1711 | switch (ev.type) |
1780 | switch (ev.type) |
1712 | { |
1781 | { |
1713 | case PropertyNotify: |
1782 | case PropertyNotify: |
1714 | /* |
1783 | /* |
… | |
… | |
1719 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1788 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1720 | return; |
1789 | return; |
1721 | |
1790 | |
1722 | /* FALLTHROUGH */ |
1791 | /* FALLTHROUGH */ |
1723 | case ReparentNotify: |
1792 | case ReparentNotify: |
1724 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1793 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1725 | want_refresh = want_full_refresh = 1; |
1794 | want_refresh = want_full_refresh = 1; |
1726 | break; |
1795 | break; |
1727 | } |
1796 | } |
1728 | } |
1797 | } |
1729 | #endif |
1798 | #endif |
… | |
… | |
1732 | rxvt_term::button_press (XButtonEvent &ev) |
1801 | rxvt_term::button_press (XButtonEvent &ev) |
1733 | { |
1802 | { |
1734 | int reportmode = 0, clickintime; |
1803 | int reportmode = 0, clickintime; |
1735 | |
1804 | |
1736 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1805 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1806 | |
1737 | if (!bypass_keystate) |
1807 | if (!bypass_keystate) |
1738 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1808 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1739 | |
1809 | |
1740 | /* |
1810 | /* |
1741 | * VT window processing of button press |
1811 | * VT window processing of button press |
1742 | */ |
1812 | */ |
1743 | if (ev.window == vt) |
1813 | if (ev.window == vt) |
1744 | { |
1814 | { |
|
|
1815 | if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
|
|
1816 | return; |
|
|
1817 | |
1745 | #if ISO_14755 |
1818 | #if ISO_14755 |
1746 | // 5.4 |
1819 | // 5.4 |
1747 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1820 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1748 | { |
1821 | { |
1749 | iso14755_54 (ev.x, ev.y); |
1822 | iso14755_54 (ev.x, ev.y); |
… | |
… | |
1761 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1834 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1762 | if (ev.button == MEvent.button && clickintime) |
1835 | if (ev.button == MEvent.button && clickintime) |
1763 | { |
1836 | { |
1764 | /* same button, within alloted time */ |
1837 | /* same button, within alloted time */ |
1765 | MEvent.clicks++; |
1838 | MEvent.clicks++; |
|
|
1839 | |
1766 | if (MEvent.clicks > 1) |
1840 | if (MEvent.clicks > 1) |
1767 | { |
1841 | { |
1768 | /* only report double clicks */ |
1842 | /* only report double clicks */ |
1769 | MEvent.clicks = 2; |
1843 | MEvent.clicks = 2; |
1770 | mouse_report (ev); |
1844 | mouse_report (ev); |
… | |
… | |
1802 | #else |
1876 | #else |
1803 | selection.rect = false; |
1877 | selection.rect = false; |
1804 | #endif |
1878 | #endif |
1805 | |
1879 | |
1806 | /* allow shift+left click to extend selection */ |
1880 | /* allow shift+left click to extend selection */ |
1807 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1881 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1808 | { |
1882 | { |
1809 | if (MEvent.button == Button1 && clickintime) |
1883 | if (MEvent.button == Button1 && clickintime) |
1810 | selection_rotate (ev.x, ev.y); |
1884 | selection_rotate (ev.x, ev.y); |
1811 | else |
1885 | else |
1812 | selection_extend (ev.x, ev.y, 1); |
1886 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
1977 | } |
2051 | } |
1978 | |
2052 | |
1979 | break; |
2053 | break; |
1980 | } |
2054 | } |
1981 | } |
2055 | } |
|
|
2056 | |
1982 | return; |
2057 | return; |
1983 | } |
2058 | } |
1984 | #if MENUBAR |
|
|
1985 | /* |
|
|
1986 | * Menubar window processing of button press |
|
|
1987 | */ |
|
|
1988 | if (isMenuBarWindow (ev.window)) |
|
|
1989 | menubar_control (ev); |
|
|
1990 | #endif |
|
|
1991 | } |
2059 | } |
1992 | |
2060 | |
1993 | void |
2061 | void |
1994 | rxvt_term::button_release (XButtonEvent &ev) |
2062 | rxvt_term::button_release (XButtonEvent &ev) |
1995 | { |
2063 | { |
… | |
… | |
2001 | |
2069 | |
2002 | if (scrollbar_isUpDn ()) |
2070 | if (scrollbar_isUpDn ()) |
2003 | { |
2071 | { |
2004 | scrollBar.setIdle (); |
2072 | scrollBar.setIdle (); |
2005 | scrollbar_show (0); |
2073 | scrollbar_show (0); |
2006 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
2007 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
2008 | #endif |
|
|
2009 | } |
2074 | } |
2010 | |
2075 | |
2011 | #ifdef SELECTION_SCROLLING |
2076 | #ifdef SELECTION_SCROLLING |
2012 | if (sel_scroll_ev.active) |
2077 | if (sel_scroll_ev.active) |
2013 | sel_scroll_ev.stop(); |
2078 | sel_scroll_ev.stop(); |
2014 | #endif |
2079 | #endif |
2015 | |
2080 | |
2016 | if (ev.window == vt) |
2081 | if (ev.window == vt) |
2017 | { |
2082 | { |
|
|
2083 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2084 | return; |
|
|
2085 | |
2018 | #if ISO_14755 |
2086 | #if ISO_14755 |
2019 | // 5.4 |
2087 | // 5.4 |
2020 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2088 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2021 | return; |
2089 | return; |
2022 | #endif |
2090 | #endif |
|
|
2091 | |
2023 | if (reportmode) |
2092 | if (reportmode) |
2024 | { |
2093 | { |
2025 | /* mouse report from vt window */ |
2094 | /* mouse report from vt window */ |
2026 | /* don't report release of wheel "buttons" */ |
2095 | /* don't report release of wheel "buttons" */ |
2027 | if (ev.button >= 4) |
2096 | if (ev.button >= 4) |
… | |
… | |
2057 | { |
2126 | { |
2058 | case Button1: |
2127 | case Button1: |
2059 | case Button3: |
2128 | case Button3: |
2060 | selection_make (ev.time); |
2129 | selection_make (ev.time); |
2061 | break; |
2130 | break; |
|
|
2131 | |
2062 | case Button2: |
2132 | case Button2: |
2063 | selection_request (ev.time, ev.x, ev.y); |
2133 | if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
|
|
2134 | selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); |
2064 | break; |
2135 | break; |
|
|
2136 | |
2065 | #ifdef MOUSE_WHEEL |
2137 | #ifdef MOUSE_WHEEL |
2066 | case Button4: |
2138 | case Button4: |
2067 | case Button5: |
2139 | case Button5: |
2068 | { |
2140 | { |
2069 | int i; |
2141 | int i; |
… | |
… | |
2071 | |
2143 | |
2072 | v = ev.button == Button4 ? UP : DN; |
2144 | v = ev.button == Button4 ? UP : DN; |
2073 | |
2145 | |
2074 | if (ev.state & ShiftMask) |
2146 | if (ev.state & ShiftMask) |
2075 | i = 1; |
2147 | i = 1; |
2076 | else if (options & Opt_mouseWheelScrollPage) |
2148 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2077 | i = nrow - 1; |
2149 | i = nrow - 1; |
2078 | else |
2150 | else |
2079 | i = 5; |
2151 | i = 5; |
2080 | |
2152 | |
2081 | # ifdef MOUSE_SLIP_WHEELING |
2153 | # ifdef MOUSE_SLIP_WHEELING |
… | |
… | |
2091 | slip_wheel_ev.start (); |
2163 | slip_wheel_ev.start (); |
2092 | } |
2164 | } |
2093 | else |
2165 | else |
2094 | { |
2166 | { |
2095 | # endif |
2167 | # endif |
2096 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2097 | scr_page (v, i); |
2168 | scr_page (v, i); |
2098 | scr_refresh (SMOOTH_REFRESH); |
|
|
2099 | scrollbar_show (1); |
2169 | 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 |
2170 | # ifdef MOUSE_SLIP_WHEELING |
2109 | } |
2171 | } |
2110 | #endif |
2172 | # endif |
2111 | } |
2173 | } |
2112 | break; |
2174 | break; |
2113 | #endif |
2175 | #endif |
2114 | } |
2176 | } |
2115 | } |
2177 | } |
2116 | #ifdef MENUBAR |
|
|
2117 | else if (isMenuBarWindow (ev.window)) |
|
|
2118 | menubar_control (ev); |
|
|
2119 | #endif |
|
|
2120 | } |
2178 | } |
2121 | |
2179 | |
2122 | #ifdef TRANSPARENT |
2180 | #ifdef TRANSPARENT |
2123 | #if TINTING |
2181 | #if TINTING |
2124 | /* taken from aterm-0.4.2 */ |
2182 | /* taken from aterm-0.4.2 */ |
… | |
… | |
2367 | XWindowAttributes wattr, wrootattr; |
2425 | XWindowAttributes wattr, wrootattr; |
2368 | dDisp; |
2426 | dDisp; |
2369 | |
2427 | |
2370 | pchanged = 0; |
2428 | pchanged = 0; |
2371 | |
2429 | |
2372 | if (!(options & Opt_transparent)) |
2430 | if (!OPTION (Opt_transparent)) |
2373 | return pchanged; /* Don't try any more */ |
2431 | return pchanged; /* Don't try any more */ |
2374 | |
2432 | |
2375 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2433 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2376 | rootdepth = wrootattr.depth; |
2434 | rootdepth = wrootattr.depth; |
2377 | |
2435 | |
… | |
… | |
2451 | nh += sy; |
2509 | nh += sy; |
2452 | ny = -sy; |
2510 | ny = -sy; |
2453 | sy = 0; |
2511 | sy = 0; |
2454 | } |
2512 | } |
2455 | |
2513 | |
2456 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2514 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2457 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2515 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2458 | |
2516 | |
2459 | XSync (disp, False); |
2517 | XSync (disp, False); |
2460 | allowedxerror = -1; |
2518 | allowedxerror = -1; |
2461 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2519 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2462 | |
2520 | |
… | |
… | |
2561 | am_transparent = 0; |
2619 | am_transparent = 0; |
2562 | /* XXX: also turn off Opt_transparent? */ |
2620 | /* XXX: also turn off Opt_transparent? */ |
2563 | } |
2621 | } |
2564 | else |
2622 | else |
2565 | { |
2623 | { |
2566 | #if WAIT_FOR_WM |
|
|
2567 | /* wait (an arbitrary period) for the WM to do its thing |
|
|
2568 | * needed for fvwm2.2.2 (and before?) */ |
|
|
2569 | sleep (1); |
|
|
2570 | #endif |
|
|
2571 | for (n = 0; n < (unsigned int)i; n++) |
2624 | for (n = 0; n < (unsigned int)i; n++) |
2572 | { |
2625 | { |
2573 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2626 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2574 | XClearWindow (disp, parent[n]); |
2627 | XClearWindow (disp, parent[n]); |
2575 | } |
2628 | } |
… | |
… | |
2604 | |
2657 | |
2605 | bool |
2658 | bool |
2606 | rxvt_term::cmd_parse () |
2659 | rxvt_term::cmd_parse () |
2607 | { |
2660 | { |
2608 | bool flag = false; |
2661 | bool flag = false; |
2609 | unicode_t ch = NOCHAR; |
2662 | wchar_t ch = NOCHAR; |
2610 | unsigned char *seq_begin; // remember start of esc-sequence here |
2663 | char *seq_begin; // remember start of esc-sequence here |
2611 | |
2664 | |
2612 | for (;;) |
2665 | for (;;) |
2613 | { |
2666 | { |
2614 | if (ch == NOCHAR) |
2667 | if (ch == NOCHAR) |
2615 | { |
2668 | { |
2616 | seq_begin = cmdbuf_ptr; |
2669 | seq_begin = cmdbuf_ptr; |
2617 | ch = next_char (); |
2670 | ch = next_char (); |
2618 | } |
|
|
2619 | |
2671 | |
2620 | if (ch == NOCHAR) // TODO: improve |
2672 | if (ch == NOCHAR) |
2621 | break; |
2673 | break; |
|
|
2674 | } |
2622 | |
2675 | |
2623 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2676 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2624 | { |
2677 | { |
2625 | if (!seen_input) |
2678 | if (!seen_input) |
2626 | { |
2679 | { |
… | |
… | |
2635 | if (seen_resize && cmd_pid) |
2688 | if (seen_resize && cmd_pid) |
2636 | kill (-cmd_pid, SIGWINCH); |
2689 | kill (-cmd_pid, SIGWINCH); |
2637 | } |
2690 | } |
2638 | |
2691 | |
2639 | /* Read a text string from the input buffer */ |
2692 | /* Read a text string from the input buffer */ |
2640 | unicode_t buf[UBUFSIZ]; |
2693 | wchar_t buf[UBUFSIZ]; |
2641 | bool refreshnow = false; |
2694 | bool refreshnow = false; |
2642 | int nlines = 0; |
2695 | int nlines = 0; |
2643 | unicode_t *str = buf; |
2696 | wchar_t *str = buf; |
2644 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2697 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2645 | |
2698 | |
2646 | for (;;) |
2699 | for (;;) |
2647 | { |
2700 | { |
2648 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2701 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2649 | break; |
2702 | break; |
… | |
… | |
2655 | if (ch == C0_LF) |
2708 | if (ch == C0_LF) |
2656 | nlines++; |
2709 | nlines++; |
2657 | |
2710 | |
2658 | refresh_count++; |
2711 | refresh_count++; |
2659 | |
2712 | |
2660 | if (!(options & Opt_jumpScroll) |
2713 | if (!OPTION (Opt_jumpScroll) |
2661 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2714 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2662 | { |
2715 | { |
2663 | refreshnow = true; |
2716 | refreshnow = true; |
|
|
2717 | refresh_count = 0; |
2664 | ch = NOCHAR; |
2718 | ch = NOCHAR; |
2665 | break; |
2719 | break; |
2666 | } |
2720 | } |
2667 | |
2721 | |
2668 | // scr_add_lines only works for nlines <= nrow - 1. |
2722 | // scr_add_lines only works for nlines <= nrow - 1. |
2669 | if (nlines >= nrow - 1) |
2723 | if (nlines >= nrow - 1) |
2670 | { |
2724 | { |
|
|
2725 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2726 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2671 | scr_add_lines (buf, nlines, str - buf); |
2727 | scr_add_lines (buf, str - buf, nlines); |
|
|
2728 | |
2672 | nlines = 0; |
2729 | nlines = 0; |
2673 | str = buf; |
2730 | str = buf; |
2674 | eol = str + min (ncol, UBUFSIZ); |
2731 | eol = str + min (ncol, UBUFSIZ); |
2675 | } |
2732 | } |
2676 | |
2733 | |
… | |
… | |
2689 | |
2746 | |
2690 | seq_begin = cmdbuf_ptr; |
2747 | seq_begin = cmdbuf_ptr; |
2691 | ch = next_char (); |
2748 | ch = next_char (); |
2692 | } |
2749 | } |
2693 | |
2750 | |
|
|
2751 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2752 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2694 | scr_add_lines (buf, nlines, str - buf); |
2753 | scr_add_lines (buf, str - buf, nlines); |
2695 | |
2754 | |
2696 | /* |
2755 | /* |
2697 | * If there have been a lot of new lines, then update the screen |
2756 | * 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. |
2757 | * 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 |
2758 | * the number of pages between refreshes is refresh_limit, which |
2700 | * is incremented here because we must be doing flat-out scrolling. |
2759 | * is incremented here because we must be doing flat-out scrolling. |
2701 | */ |
2760 | */ |
2702 | if (refreshnow) |
2761 | if (refreshnow) |
2703 | { |
2762 | { |
2704 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2763 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2705 | refresh_limit++; |
2764 | refresh_limit++; |
2706 | else |
2765 | else |
2707 | { |
2766 | { |
2708 | flag = true; |
2767 | flag = true; |
2709 | scr_refresh (refresh_type); |
2768 | scr_refresh (); |
|
|
2769 | want_refresh = 1; |
2710 | } |
2770 | } |
2711 | } |
2771 | } |
2712 | |
2772 | |
2713 | } |
2773 | } |
2714 | else |
2774 | else |
… | |
… | |
2729 | } |
2789 | } |
2730 | |
2790 | |
2731 | return flag; |
2791 | return flag; |
2732 | } |
2792 | } |
2733 | |
2793 | |
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 |
2794 | // read the next character |
2744 | unicode_t |
2795 | wchar_t |
2745 | rxvt_term::next_char () |
2796 | rxvt_term::next_char () NOTHROW |
2746 | { |
2797 | { |
2747 | while (cmdbuf_ptr < cmdbuf_endp) |
2798 | while (cmdbuf_ptr < cmdbuf_endp) |
2748 | { |
2799 | { |
2749 | // assume 7-bit to be ascii ALWAYS |
2800 | // assume 7-bit to be ascii ALWAYS |
2750 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2801 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2751 | return *cmdbuf_ptr++; |
2802 | return *cmdbuf_ptr++; |
2752 | |
2803 | |
2753 | wchar_t wc; |
2804 | wchar_t wc; |
2754 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2805 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2755 | |
2806 | |
2756 | if (len == (size_t)-2) |
2807 | if (len == (size_t)-2) |
2757 | { |
2808 | { |
2758 | // the mbstate stores incomplete sequences. didn't know this :/ |
2809 | // the mbstate stores incomplete sequences. didn't know this :/ |
2759 | cmdbuf_ptr = cmdbuf_endp; |
2810 | cmdbuf_ptr = cmdbuf_endp; |
2760 | break; |
2811 | break; |
2761 | } |
2812 | } |
2762 | |
2813 | |
2763 | if (len == (size_t)-1) |
2814 | if (len == (size_t)-1) |
2764 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2815 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2765 | |
2816 | |
2766 | // assume wchar == unicode |
2817 | // assume wchar == unicode |
2767 | cmdbuf_ptr += len; |
2818 | cmdbuf_ptr += len; |
2768 | return wc & UNICODE_MASK; |
2819 | return wc & UNICODE_MASK; |
2769 | } |
2820 | } |
2770 | |
2821 | |
2771 | return NOCHAR; |
2822 | return NOCHAR; |
2772 | } |
2823 | } |
|
|
2824 | |
|
|
2825 | // read the next octet |
|
|
2826 | uint32_t |
|
|
2827 | rxvt_term::next_octet () NOTHROW |
|
|
2828 | { |
|
|
2829 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2830 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2831 | : NOCHAR; |
|
|
2832 | } |
|
|
2833 | |
|
|
2834 | static class out_of_input out_of_input; |
2773 | |
2835 | |
2774 | /* rxvt_cmd_getc () - Return next input character */ |
2836 | /* rxvt_cmd_getc () - Return next input character */ |
2775 | /* |
2837 | /* |
2776 | * Return the next input character after first passing any keyboard input |
2838 | * Return the next input character after first passing any keyboard input |
2777 | * to the command. |
2839 | * to the command. |
2778 | */ |
2840 | */ |
2779 | unicode_t |
2841 | wchar_t |
2780 | rxvt_term::cmd_getc () |
2842 | rxvt_term::cmd_getc () THROW ((class out_of_input)) |
2781 | { |
2843 | { |
2782 | unicode_t c = next_char (); |
2844 | wchar_t c = next_char (); |
2783 | |
2845 | |
2784 | if (c == NOCHAR) |
2846 | if (c == NOCHAR) |
2785 | throw out_of_input; |
2847 | throw out_of_input; |
2786 | |
2848 | |
2787 | return c; |
2849 | return c; |
2788 | } |
2850 | } |
2789 | |
2851 | |
2790 | unicode_t |
2852 | uint32_t |
2791 | rxvt_term::cmd_get8 () |
2853 | rxvt_term::cmd_get8 () THROW ((class out_of_input)) |
2792 | { |
2854 | { |
2793 | unicode_t c = next_octet (); |
2855 | uint32_t c = next_octet (); |
2794 | |
2856 | |
2795 | if (c == NOCHAR) |
2857 | if (c == NOCHAR) |
2796 | throw out_of_input; |
2858 | throw out_of_input; |
2797 | |
2859 | |
2798 | return c; |
2860 | return c; |
… | |
… | |
2898 | case C0_ESC: |
2960 | case C0_ESC: |
2899 | process_escape_seq (); |
2961 | process_escape_seq (); |
2900 | break; |
2962 | break; |
2901 | case C0_ENQ: /* terminal Status */ |
2963 | case C0_ENQ: /* terminal Status */ |
2902 | if (rs[Rs_answerbackstring]) |
2964 | if (rs[Rs_answerbackstring]) |
2903 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2965 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2904 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2905 | else |
2966 | else |
2906 | tt_write ((unsigned char *)VT100_ANS, |
2967 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2907 | (unsigned int)strlen (VT100_ANS)); |
|
|
2908 | break; |
2968 | break; |
2909 | case C0_BEL: /* bell */ |
2969 | case C0_BEL: /* bell */ |
2910 | scr_bell (); |
2970 | scr_bell (); |
2911 | break; |
2971 | break; |
2912 | case C0_BS: /* backspace */ |
2972 | case C0_BS: /* backspace */ |
… | |
… | |
3067 | break; |
3127 | break; |
3068 | |
3128 | |
3069 | /* 8.3.87: NEXT LINE */ |
3129 | /* 8.3.87: NEXT LINE */ |
3070 | case C1_NEL: /* ESC E */ |
3130 | case C1_NEL: /* ESC E */ |
3071 | { |
3131 | { |
3072 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3132 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3073 | scr_add_lines (nlcr, 1, 2); |
3133 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3074 | } |
3134 | } |
3075 | break; |
3135 | break; |
3076 | |
3136 | |
3077 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3137 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3078 | case C1_ESA: /* ESC G */ |
3138 | case C1_ESA: /* ESC G */ |
… | |
… | |
3100 | process_dcs_seq (); |
3160 | process_dcs_seq (); |
3101 | break; |
3161 | break; |
3102 | |
3162 | |
3103 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3163 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3104 | case C1_SCI: /* ESC Z */ |
3164 | case C1_SCI: /* ESC Z */ |
3105 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3165 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3106 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3107 | break; /* steal obsolete ESC [ c */ |
3166 | break; /* steal obsolete ESC [ c */ |
3108 | |
3167 | |
3109 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3168 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3110 | case C1_CSI: /* ESC [ */ |
3169 | case C1_CSI: /* ESC [ */ |
3111 | process_csi_seq (); |
3170 | process_csi_seq (); |
… | |
… | |
3220 | ndef = get_byte_array_bit (csi_defaults, i); |
3279 | ndef = get_byte_array_bit (csi_defaults, i); |
3221 | for (p = 0; p < nargs; p++) |
3280 | for (p = 0; p < nargs; p++) |
3222 | if (arg[p] == -1) |
3281 | if (arg[p] == -1) |
3223 | arg[p] = ndef; |
3282 | arg[p] = ndef; |
3224 | |
3283 | |
3225 | #ifdef DEBUG_CMD |
|
|
3226 | fprintf (stderr, "CSI "); |
|
|
3227 | for (p = 0; p < nargs; p++) |
|
|
3228 | fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); |
|
|
3229 | fprintf (stderr, "%c\n", ch); |
|
|
3230 | #endif |
|
|
3231 | |
|
|
3232 | /* |
3284 | /* |
3233 | * private mode handling |
3285 | * private mode handling |
3234 | */ |
3286 | */ |
3235 | if (priv) |
3287 | if (priv) |
3236 | { |
3288 | { |
3237 | switch (priv) |
3289 | switch (priv) |
3238 | { |
3290 | { |
3239 | case '>': |
3291 | case '>': |
3240 | if (ch == CSI_DA) /* secondary device attributes */ |
3292 | if (ch == CSI_DA) /* secondary device attributes */ |
|
|
3293 | { |
|
|
3294 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
|
|
3295 | // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. |
|
|
3296 | // |
|
|
3297 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
|
|
3298 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
|
|
3299 | // that we do not support xterm mouse reporting (should be 95 when we do). |
|
|
3300 | // |
3241 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3301 | tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); |
|
|
3302 | } |
3242 | break; |
3303 | break; |
3243 | case '?': |
3304 | case '?': |
3244 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3305 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3245 | process_terminal_mode (ch, priv, nargs, arg); |
3306 | process_terminal_mode (ch, priv, nargs, arg); |
3246 | break; |
3307 | break; |
… | |
… | |
3355 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3416 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3356 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3417 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3357 | break; |
3418 | break; |
3358 | |
3419 | |
3359 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3420 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3360 | tt_write ((const unsigned char *)VT100_ANS, |
3421 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3361 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3362 | break; |
3422 | break; |
3363 | |
3423 | |
3364 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3424 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3365 | process_sgr_mode (nargs, arg); |
3425 | process_sgr_mode (nargs, arg); |
3366 | break; |
3426 | break; |
… | |
… | |
3373 | break; |
3433 | break; |
3374 | case 6: /* CPR requested */ |
3434 | case 6: /* CPR requested */ |
3375 | scr_report_position (); |
3435 | scr_report_position (); |
3376 | break; |
3436 | break; |
3377 | case 7: /* unofficial extension */ |
3437 | case 7: /* unofficial extension */ |
3378 | if (options & Opt_insecure) |
3438 | if (OPTION (Opt_insecure)) |
3379 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3439 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3380 | break; |
3440 | break; |
3381 | case 8: /* unofficial extension */ |
3441 | case 8: /* unofficial extension */ |
3382 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3442 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3383 | break; |
3443 | break; |
… | |
… | |
3547 | break; |
3607 | break; |
3548 | case 20: /* report icon label */ |
3608 | case 20: /* report icon label */ |
3549 | { |
3609 | { |
3550 | char *s; |
3610 | char *s; |
3551 | XGetIconName (disp, parent[0], &s); |
3611 | XGetIconName (disp, parent[0], &s); |
3552 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3612 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3553 | XFree (s); |
3613 | XFree (s); |
3554 | } |
3614 | } |
3555 | break; |
3615 | break; |
3556 | case 21: /* report window title */ |
3616 | case 21: /* report window title */ |
3557 | { |
3617 | { |
3558 | char *s; |
3618 | char *s; |
3559 | XFetchName (disp, parent[0], &s); |
3619 | XFetchName (disp, parent[0], &s); |
3560 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3620 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3561 | XFree (s); |
3621 | XFree (s); |
3562 | } |
3622 | } |
3563 | break; |
3623 | break; |
3564 | } |
3624 | } |
3565 | } |
3625 | } |
… | |
… | |
3568 | /*----------------------------------------------------------------------*/ |
3628 | /*----------------------------------------------------------------------*/ |
3569 | /* |
3629 | /* |
3570 | * get input up until STRING TERMINATOR (or BEL) |
3630 | * get input up until STRING TERMINATOR (or BEL) |
3571 | * ends_how is terminator used. returned input must be free()'d |
3631 | * ends_how is terminator used. returned input must be free()'d |
3572 | */ |
3632 | */ |
3573 | unsigned char * |
3633 | char * |
3574 | rxvt_term::get_to_st (unicode_t &ends_how) |
3634 | rxvt_term::get_to_st (unicode_t &ends_how) |
3575 | { |
3635 | { |
3576 | unicode_t ch; |
3636 | unicode_t ch; |
3577 | bool seen_esc = false; |
3637 | bool seen_esc = false; |
3578 | unsigned int n = 0; |
3638 | unsigned int n = 0; |
… | |
… | |
3611 | |
3671 | |
3612 | string[n++] = '\0'; |
3672 | string[n++] = '\0'; |
3613 | |
3673 | |
3614 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3674 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3615 | |
3675 | |
3616 | return (unsigned char *)rxvt_wcstombs (string); |
3676 | return rxvt_wcstombs (string); |
3617 | } |
3677 | } |
3618 | |
3678 | |
3619 | /*----------------------------------------------------------------------*/ |
3679 | /*----------------------------------------------------------------------*/ |
3620 | /* |
3680 | /* |
3621 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3681 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3622 | */ |
3682 | */ |
3623 | void |
3683 | void |
3624 | rxvt_term::process_dcs_seq () |
3684 | rxvt_term::process_dcs_seq () |
3625 | { |
3685 | { |
3626 | unsigned char *s; |
3686 | char *s; |
3627 | unicode_t eh; |
3687 | unicode_t eh; |
3628 | |
3688 | |
3629 | /* |
3689 | /* |
3630 | * Not handled yet |
3690 | * Not handled yet |
3631 | */ |
3691 | */ |
… | |
… | |
3650 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3710 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3651 | arg = arg * 10 + (ch - '0'); |
3711 | arg = arg * 10 + (ch - '0'); |
3652 | |
3712 | |
3653 | if (ch == ';') |
3713 | if (ch == ';') |
3654 | { |
3714 | { |
3655 | unsigned char *s = get_to_st (eh); |
3715 | char *s = get_to_st (eh); |
3656 | |
3716 | |
3657 | if (s) |
3717 | if (s) |
3658 | { |
3718 | { |
3659 | process_xterm_seq (arg, (char *)s, eh); |
3719 | process_xterm_seq (arg, s, eh); |
3660 | free (s); |
3720 | free (s); |
3661 | } |
3721 | } |
3662 | } |
3722 | } |
3663 | } |
3723 | } |
3664 | |
3724 | |
3665 | void |
3725 | void |
3666 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3726 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3667 | { |
3727 | { |
3668 | if (str[0] == '?' && !str[1]) |
3728 | if (str[0] == '?' && !str[1]) |
3669 | { |
3729 | { |
3670 | unsigned short r, g, b; |
3730 | unsigned short r, g, b; |
3671 | pix_colors_focused[color].get (display, r, g, b); |
3731 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3677 | |
3737 | |
3678 | /* |
3738 | /* |
3679 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3739 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3680 | */ |
3740 | */ |
3681 | void |
3741 | void |
3682 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3742 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3683 | { |
3743 | { |
3684 | int changed = 0; |
|
|
3685 | int color; |
3744 | int color; |
3686 | char *buf, *name; |
3745 | char *buf, *name; |
3687 | bool query = str[0] == '?' && !str[1]; |
3746 | bool query = str[0] == '?' && !str[1]; |
3688 | int saveop = op; |
3747 | int saveop = op; |
3689 | dDisp; |
3748 | dDisp; |
… | |
… | |
3744 | { |
3803 | { |
3745 | if ((name = strchr (buf, ';')) == NULL) |
3804 | if ((name = strchr (buf, ';')) == NULL) |
3746 | break; |
3805 | break; |
3747 | |
3806 | |
3748 | *name++ = '\0'; |
3807 | *name++ = '\0'; |
3749 | color = atoi (buf); |
3808 | color = atoi (buf) + minCOLOR; |
3750 | |
3809 | |
3751 | if (color < 0 || color >= TOTAL_COLORS) |
3810 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3752 | break; |
3811 | break; |
3753 | |
3812 | |
3754 | if ((buf = strchr (name, ';')) != NULL) |
3813 | if ((buf = strchr (name, ';')) != NULL) |
3755 | *buf++ = '\0'; |
3814 | *buf++ = '\0'; |
3756 | |
3815 | |
3757 | if (name[0] == '?' && !name[1]) |
3816 | if (name[0] == '?' && !name[1]) |
3758 | { |
3817 | { |
3759 | unsigned short r, g, b; |
3818 | unsigned short r, g, b; |
3760 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3819 | 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); |
3820 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3762 | } |
3821 | } |
3763 | else |
3822 | else |
3764 | set_window_color (color + minCOLOR, name); |
3823 | set_window_color (color, name); |
3765 | } |
3824 | } |
3766 | break; |
3825 | break; |
3767 | case XTerm_Color00: |
3826 | case XTerm_Color00: |
3768 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3827 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3769 | break; |
3828 | break; |
3770 | case XTerm_Color01: |
3829 | case XTerm_Color01: |
3771 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3830 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3772 | break; |
3831 | break; |
3773 | #ifndef NO_CURSORCOLOR |
3832 | #ifndef NO_CURSORCOLOR |
3774 | case XTerm_Color_cursor: |
3833 | case XTerm_Color_cursor: |
3775 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3834 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3776 | break; |
3835 | break; |
… | |
… | |
3780 | break; |
3839 | break; |
3781 | case XTerm_Color_pointer_bg: |
3840 | case XTerm_Color_pointer_bg: |
3782 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3841 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3783 | break; |
3842 | break; |
3784 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3843 | #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: |
3844 | case XTerm_Color_RV: |
3792 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3845 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3846 | break; |
|
|
3847 | case Rxvt_Color_BD: |
|
|
3848 | case URxvt_Color_BD: |
|
|
3849 | process_color_seq (op, Color_BD, str, resp); |
|
|
3850 | break; |
|
|
3851 | case Rxvt_Color_UL: |
|
|
3852 | case URxvt_Color_UL: |
|
|
3853 | process_color_seq (op, Color_UL, str, resp); |
3793 | break; |
3854 | break; |
3794 | case URxvt_Color_IT: |
3855 | case URxvt_Color_IT: |
3795 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3856 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3796 | break; |
3857 | break; |
3797 | #endif |
3858 | #endif |
… | |
… | |
3802 | if (am_transparent) |
3863 | if (am_transparent) |
3803 | want_full_refresh = want_refresh = 1; |
3864 | want_full_refresh = want_refresh = 1; |
3804 | break; |
3865 | break; |
3805 | #endif |
3866 | #endif |
3806 | |
3867 | |
3807 | case XTerm_Pixmap: |
3868 | case Rxvt_Pixmap: |
|
|
3869 | { |
3808 | if (*str != ';') |
3870 | if (*str != ';') |
3809 | { |
3871 | { |
3810 | #if XPM_BACKGROUND |
3872 | #if XPM_BACKGROUND |
3811 | scale_pixmap (""); /* reset to default scaling */ |
3873 | scale_pixmap (""); /* reset to default scaling */ |
3812 | set_bgPixmap (str); /* change pixmap */ |
3874 | set_bgPixmap (str); /* change pixmap */ |
3813 | #endif |
|
|
3814 | scr_touch (true); |
3875 | scr_touch (true); |
|
|
3876 | #endif |
3815 | } |
3877 | } |
|
|
3878 | |
|
|
3879 | int changed = 0; |
|
|
3880 | |
3816 | while ((str = strchr (str, ';')) != NULL) |
3881 | while ((str = strchr (str, ';')) != NULL) |
3817 | { |
3882 | { |
3818 | str++; |
3883 | str++; |
3819 | #if XPM_BACKGROUND |
3884 | #if XPM_BACKGROUND |
3820 | changed += scale_pixmap (str); |
3885 | changed += scale_pixmap (str); |
3821 | #endif |
3886 | #endif |
3822 | } |
3887 | } |
3823 | |
3888 | |
3824 | if (changed) |
3889 | if (changed) |
3825 | { |
3890 | { |
3826 | #ifdef XPM_BACKGROUND |
3891 | #ifdef XPM_BACKGROUND |
3827 | resize_pixmap (); |
3892 | resize_pixmap (); |
3828 | #endif |
|
|
3829 | scr_touch (true); |
3893 | scr_touch (true); |
|
|
3894 | #endif |
3830 | } |
3895 | } |
|
|
3896 | } |
3831 | break; |
3897 | break; |
3832 | |
3898 | |
3833 | case XTerm_restoreFG: |
3899 | case Rxvt_restoreFG: |
3834 | set_window_color (Color_fg, str); |
3900 | set_window_color (Color_fg, str); |
3835 | break; |
3901 | break; |
3836 | case XTerm_restoreBG: |
3902 | case Rxvt_restoreBG: |
3837 | set_window_color (Color_bg, str); |
3903 | set_window_color (Color_bg, str); |
3838 | break; |
3904 | break; |
3839 | |
3905 | |
3840 | case XTerm_logfile: |
3906 | case XTerm_logfile: |
3841 | // TODO, when secure mode? |
3907 | // TODO, when secure mode? |
3842 | break; |
3908 | break; |
3843 | |
3909 | |
3844 | #ifdef MENUBAR |
|
|
3845 | case URxvt_Menu: |
|
|
3846 | if (options & Opt_insecure) |
|
|
3847 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3848 | break; |
|
|
3849 | #endif |
|
|
3850 | #if 0 |
3910 | #if 0 |
3851 | case XTerm_dumpscreen: /* no error notices */ |
3911 | case Rxvt_dumpscreen: /* no error notices */ |
3852 | { |
3912 | { |
3853 | int fd; |
3913 | int fd; |
3854 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3914 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3855 | { |
3915 | { |
3856 | scr_dump (fd); |
3916 | scr_dump (fd); |
… | |
… | |
3867 | case URxvt_italicFont: |
3927 | case URxvt_italicFont: |
3868 | case URxvt_boldItalicFont: |
3928 | case URxvt_boldItalicFont: |
3869 | #endif |
3929 | #endif |
3870 | if (query) |
3930 | if (query) |
3871 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3931 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3872 | (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3932 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3873 | ? fontset[op - URxvt_font]->fontdesc : "", |
3933 | ? fontset[op - URxvt_font]->fontdesc : "", |
3874 | resp); |
3934 | resp); |
3875 | else |
3935 | else |
3876 | { |
3936 | { |
3877 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3937 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
… | |
… | |
3883 | break; |
3943 | break; |
3884 | |
3944 | |
3885 | #if ENABLE_FRILLS |
3945 | #if ENABLE_FRILLS |
3886 | case URxvt_locale: |
3946 | case URxvt_locale: |
3887 | if (query) |
3947 | if (query) |
3888 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); |
3948 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3889 | else |
3949 | else |
3890 | { |
3950 | { |
3891 | set_locale (str); |
3951 | set_locale (str); |
3892 | pty.set_utf8_mode (enc_utf8); |
3952 | pty->set_utf8_mode (enc_utf8); |
3893 | init_xlocale (); |
3953 | init_xlocale (); |
3894 | } |
3954 | } |
3895 | break; |
3955 | break; |
3896 | |
3956 | |
3897 | case URxvt_view_up: |
3957 | case URxvt_view_up: |
3898 | case URxvt_view_down: |
3958 | case URxvt_view_down: |
|
|
3959 | { |
3899 | int lines = atoi (str); |
3960 | int lines = atoi (str); |
3900 | |
3961 | |
3901 | if (lines) |
3962 | if (lines) |
3902 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3963 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3903 | else |
3964 | else |
3904 | { |
|
|
3905 | scr_erase_savelines (); |
3965 | scr_erase_savelines (); |
3906 | } |
3966 | } |
3907 | |
3967 | |
|
|
3968 | break; |
|
|
3969 | #endif |
|
|
3970 | |
|
|
3971 | #if ENABLE_PERL |
|
|
3972 | case URxvt_perl: |
|
|
3973 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
|
|
3974 | ; // no responses yet |
3908 | break; |
3975 | break; |
3909 | #endif |
3976 | #endif |
3910 | } |
3977 | } |
3911 | } |
3978 | } |
3912 | /*----------------------------------------------------------------------*/ |
3979 | /*----------------------------------------------------------------------*/ |
… | |
… | |
3943 | return state; |
4010 | return state; |
3944 | } |
4011 | } |
3945 | |
4012 | |
3946 | /* we're not using priv _yet_ */ |
4013 | /* we're not using priv _yet_ */ |
3947 | void |
4014 | void |
3948 | rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) |
4015 | rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) |
3949 | { |
4016 | { |
3950 | unsigned int i, j; |
4017 | unsigned int i, j; |
3951 | int state; |
4018 | int state; |
3952 | |
4019 | |
3953 | static const struct |
4020 | static const struct |
… | |
… | |
3964 | { 5, PrivMode_rVideo }, |
4031 | { 5, PrivMode_rVideo }, |
3965 | { 6, PrivMode_relOrigin }, |
4032 | { 6, PrivMode_relOrigin }, |
3966 | { 7, PrivMode_Autowrap }, |
4033 | { 7, PrivMode_Autowrap }, |
3967 | // 8, bi-directional support mode |
4034 | // 8, bi-directional support mode |
3968 | { 9, PrivMode_MouseX10 }, |
4035 | { 9, PrivMode_MouseX10 }, |
3969 | #ifdef menuBar_esc |
|
|
3970 | { menuBar_esc, PrivMode_menuBar }, |
|
|
3971 | #endif |
|
|
3972 | // 18, 19 printing-related |
4036 | // 18, 19 printing-related |
3973 | { 25, PrivMode_VisibleCursor }, |
4037 | { 25, PrivMode_VisibleCursor }, |
3974 | #ifdef scrollBar_esc |
4038 | #ifdef scrollBar_esc |
3975 | { scrollBar_esc, PrivMode_scrollBar }, |
4039 | { scrollBar_esc, PrivMode_scrollBar }, |
3976 | #endif |
4040 | #endif |
… | |
… | |
4021 | } |
4085 | } |
4022 | |
4086 | |
4023 | /* extra handling for values with state unkept */ |
4087 | /* extra handling for values with state unkept */ |
4024 | switch (arg[i]) |
4088 | switch (arg[i]) |
4025 | { |
4089 | { |
|
|
4090 | #if ENABLE_STYLES |
|
|
4091 | case 1021: |
|
|
4092 | set_option (Opt_intensityStyles, mode); |
|
|
4093 | |
|
|
4094 | scr_touch (true); |
|
|
4095 | break; |
|
|
4096 | #endif |
4026 | case 1048: /* alternative cursor save */ |
4097 | case 1048: /* alternative cursor save */ |
4027 | case 1049: |
4098 | case 1049: |
4028 | if (options & Opt_secondaryScreen) |
4099 | if (OPTION (Opt_secondaryScreen)) |
4029 | if (mode == 0) |
4100 | if (mode == 0) |
4030 | scr_cursor (RESTORE); |
4101 | scr_cursor (RESTORE); |
4031 | else if (mode == 1) |
4102 | else if (mode == 1) |
4032 | scr_cursor (SAVE); |
4103 | scr_cursor (SAVE); |
4033 | break; |
4104 | break; |
… | |
… | |
4048 | case 3: /* 80/132 */ |
4119 | case 3: /* 80/132 */ |
4049 | if (priv_modes & PrivMode_132OK) |
4120 | if (priv_modes & PrivMode_132OK) |
4050 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4121 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4051 | break; |
4122 | break; |
4052 | case 4: /* smooth scrolling */ |
4123 | case 4: /* smooth scrolling */ |
4053 | if (state) |
|
|
4054 | options &= ~Opt_jumpScroll; |
|
|
4055 | else |
|
|
4056 | options |= Opt_jumpScroll; |
4124 | set_option (Opt_jumpScroll, !state); |
4057 | break; |
4125 | break; |
4058 | case 5: /* reverse video */ |
4126 | case 5: /* reverse video */ |
4059 | scr_rvideo_mode (state); |
4127 | scr_rvideo_mode (state); |
4060 | break; |
4128 | break; |
4061 | case 6: /* relative/absolute origins */ |
4129 | case 6: /* relative/absolute origins */ |
… | |
… | |
4067 | /* case 8: - auto repeat, can't do on a per window basis */ |
4135 | /* case 8: - auto repeat, can't do on a per window basis */ |
4068 | case 9: /* X10 mouse reporting */ |
4136 | case 9: /* X10 mouse reporting */ |
4069 | if (state) /* orthogonal */ |
4137 | if (state) /* orthogonal */ |
4070 | priv_modes &= ~PrivMode_MouseX11; |
4138 | priv_modes &= ~PrivMode_MouseX11; |
4071 | break; |
4139 | break; |
4072 | #ifdef menuBar_esc |
|
|
4073 | case menuBar_esc: |
|
|
4074 | #ifdef MENUBAR |
|
|
4075 | map_menuBar (state); |
|
|
4076 | #endif |
|
|
4077 | break; |
|
|
4078 | #endif |
|
|
4079 | #ifdef scrollBar_esc |
4140 | #ifdef scrollBar_esc |
4080 | case scrollBar_esc: |
4141 | case scrollBar_esc: |
4081 | if (scrollbar_mapping (state)) |
4142 | if (scrollbar_mapping (state)) |
4082 | { |
4143 | { |
4083 | resize_all_windows (0, 0, 0); |
4144 | resize_all_windows (0, 0, 0); |
… | |
… | |
4102 | #if 0 |
4163 | #if 0 |
4103 | case 1001: |
4164 | case 1001: |
4104 | break; /* X11 mouse highlighting */ |
4165 | break; /* X11 mouse highlighting */ |
4105 | #endif |
4166 | #endif |
4106 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4167 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4107 | if (state) |
|
|
4108 | options &= ~Opt_scrollTtyOutput; |
|
|
4109 | else |
|
|
4110 | options |= Opt_scrollTtyOutput; |
4168 | set_option (Opt_scrollTtyOutput, !state); |
4111 | break; |
4169 | break; |
4112 | case 1011: /* scroll to bottom on key press */ |
4170 | case 1011: /* scroll to bottom on key press */ |
4113 | if (state) |
|
|
4114 | options |= Opt_scrollTtyKeypress; |
4171 | set_option (Opt_scrollTtyKeypress, state); |
4115 | else |
|
|
4116 | options &= ~Opt_scrollTtyKeypress; |
|
|
4117 | break; |
4172 | break; |
4118 | case 1047: /* secondary screen w/ clearing last */ |
4173 | case 1047: /* secondary screen w/ clearing last */ |
4119 | if (options & Opt_secondaryScreen) |
4174 | if (OPTION (Opt_secondaryScreen)) |
4120 | if (current_screen != PRIMARY) |
4175 | if (current_screen != PRIMARY) |
4121 | scr_erase_screen (2); |
4176 | scr_erase_screen (2); |
4122 | scr_change_screen (state); |
4177 | scr_change_screen (state); |
4123 | break; |
4178 | break; |
4124 | case 1049: /* secondary screen w/ clearing first */ |
4179 | case 1049: /* secondary screen w/ clearing first */ |
4125 | scr_change_screen (state); |
4180 | scr_change_screen (state); |
4126 | if (options & Opt_secondaryScreen) |
4181 | if (OPTION (Opt_secondaryScreen)) |
4127 | if (current_screen != PRIMARY) |
4182 | if (current_screen != PRIMARY) |
4128 | scr_erase_screen (2); |
4183 | scr_erase_screen (2); |
4129 | break; |
4184 | break; |
4130 | default: |
4185 | default: |
4131 | break; |
4186 | break; |
… | |
… | |
4259 | scr_color (Color_bg, Color_bg); |
4314 | scr_color (Color_bg, Color_bg); |
4260 | break; |
4315 | break; |
4261 | |
4316 | |
4262 | //case 50: // not variable spacing |
4317 | //case 50: // not variable spacing |
4263 | |
4318 | |
4264 | #ifndef NO_BRIGHTCOLOR |
4319 | #if ENABLE_FRILLS |
4265 | case 90: |
4320 | case 90: |
4266 | case 91: /* set bright fg color */ |
4321 | case 91: /* set bright fg color */ |
4267 | case 92: |
4322 | case 92: |
4268 | case 93: |
4323 | case 93: |
4269 | case 94: |
4324 | case 94: |
… | |
… | |
4281 | case 106: |
4336 | case 106: |
4282 | case 107: |
4337 | case 107: |
4283 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4338 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4284 | break; |
4339 | break; |
4285 | #endif |
4340 | #endif |
4286 | |
|
|
4287 | } |
4341 | } |
4288 | } |
4342 | } |
4289 | } |
4343 | } |
4290 | /*}}} */ |
4344 | /*}}} */ |
4291 | |
4345 | |
… | |
… | |
4315 | */ |
4369 | */ |
4316 | void |
4370 | void |
4317 | rxvt_term::tt_printf (const char *fmt,...) |
4371 | rxvt_term::tt_printf (const char *fmt,...) |
4318 | { |
4372 | { |
4319 | va_list arg_ptr; |
4373 | va_list arg_ptr; |
4320 | unsigned char buf[256]; |
4374 | char buf[256]; |
4321 | |
4375 | |
4322 | va_start (arg_ptr, fmt); |
4376 | va_start (arg_ptr, fmt); |
4323 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4377 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4324 | va_end (arg_ptr); |
4378 | va_end (arg_ptr); |
4325 | tt_write (buf, strlen (buf)); |
4379 | tt_write (buf, strlen (buf)); |
… | |
… | |
4330 | * or generated by us in response to a query ESC sequence. |
4384 | * or generated by us in response to a query ESC sequence. |
4331 | */ |
4385 | */ |
4332 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4386 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4333 | |
4387 | |
4334 | void |
4388 | void |
4335 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4389 | rxvt_term::tt_write (const char *data, unsigned int len) |
4336 | { |
4390 | { |
|
|
4391 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4392 | return; |
|
|
4393 | |
|
|
4394 | if (pty->pty < 0) |
|
|
4395 | return; |
|
|
4396 | |
4337 | if (v_buflen == 0) |
4397 | if (v_buflen == 0) |
4338 | { |
4398 | { |
4339 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4399 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4340 | |
4400 | |
4341 | if ((unsigned int)written == len) |
4401 | if ((unsigned int)written == len) |
4342 | return; |
4402 | return; |
4343 | |
4403 | |
4344 | data += written; |
4404 | data += written; |
4345 | len -= written; |
4405 | len -= written; |
4346 | } |
4406 | } |
4347 | |
4407 | |
4348 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4408 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4349 | |
4409 | |
4350 | memcpy (v_buffer + v_buflen, data, len); |
4410 | memcpy (v_buffer + v_buflen, data, len); |
4351 | v_buflen += len; |
4411 | v_buflen += len; |
4352 | |
4412 | |
4353 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4413 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4354 | } |
4414 | } |
4355 | |
4415 | |
4356 | void rxvt_term::pty_write () |
4416 | void rxvt_term::pty_write () |
4357 | { |
4417 | { |
4358 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4418 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4359 | |
4419 | |
4360 | if (written > 0) |
4420 | if (written > 0) |
4361 | { |
4421 | { |
4362 | v_buflen -= written; |
4422 | v_buflen -= written; |
4363 | |
4423 | |
… | |
… | |
4372 | } |
4432 | } |
4373 | |
4433 | |
4374 | memmove (v_buffer, v_buffer + written, v_buflen); |
4434 | memmove (v_buffer, v_buffer + written, v_buflen); |
4375 | } |
4435 | } |
4376 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4436 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4377 | // original code just ignores this... |
4437 | pty_ev.set (EVENT_READ); |
4378 | destroy (); |
|
|
4379 | } |
4438 | } |
4380 | |
4439 | |
4381 | /*----------------------- end-of-file (C source) -----------------------*/ |
4440 | /*----------------------- end-of-file (C source) -----------------------*/ |
4382 | |
4441 | |