… | |
… | |
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 | |
… | |
… | |
135 | rxvt_term::iso14755_54 (int x, int y) |
141 | rxvt_term::iso14755_54 (int x, int y) |
136 | { |
142 | { |
137 | x = Pixel2Col (x); |
143 | x = Pixel2Col (x); |
138 | y = Pixel2Row (y); |
144 | y = Pixel2Row (y); |
139 | |
145 | |
140 | if (x < 0 || x >= TermWin.ncol |
146 | if (!IN_RANGE_EXC (x, 0, ncol) |
141 | || y < 0 || y >= TermWin.nrow) |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
142 | return; |
148 | return; |
143 | |
149 | |
144 | for (;;) |
150 | for (;;) |
145 | { |
151 | { |
146 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
152 | const line_t &l = ROW(y - view_start); |
|
|
153 | |
|
|
154 | text_t t = l.t[x]; |
147 | |
155 | |
148 | if (t != NOCHAR || !x) |
156 | if (t != NOCHAR || !x) |
149 | { |
157 | { |
150 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
158 | iso14755_51 (l.t[x], l.r[x], x, y); |
151 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
152 | iso14755buf = ISO_14755_54; |
159 | iso14755buf = ISO_14755_54; |
153 | break; |
160 | break; |
154 | } |
161 | } |
155 | |
162 | |
156 | x--; |
163 | x--; |
157 | } |
164 | } |
158 | |
|
|
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 | { |
366 | #ifdef KEYSYM_RESOURCE |
392 | #ifdef KEYSYM_RESOURCE |
367 | if (keyboard->dispatch (this, keysym, ev.state)) |
393 | if (keyboard->dispatch (this, keysym, ev.state)) |
368 | return; |
394 | return; |
369 | #endif |
395 | #endif |
370 | |
396 | |
371 | if (TermWin.saveLines) |
397 | if (saveLines) |
372 | { |
398 | { |
373 | #ifdef UNSHIFTED_SCROLLKEYS |
399 | #ifdef UNSHIFTED_SCROLLKEYS |
374 | if (!ctrl && !meta) |
400 | if (!ctrl && !meta) |
375 | #else |
401 | #else |
376 | if (IS_SCROLL_MOD) |
402 | if (IS_SCROLL_MOD) |
377 | #endif |
403 | #endif |
378 | { |
404 | { |
379 | int lnsppg; |
405 | int lnsppg; |
380 | |
406 | |
381 | #ifdef PAGING_CONTEXT_LINES |
407 | #ifdef PAGING_CONTEXT_LINES |
382 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
408 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
383 | #else |
409 | #else |
384 | lnsppg = TermWin.nrow * 4 / 5; |
410 | lnsppg = nrow * 4 / 5; |
385 | #endif |
411 | #endif |
386 | if (keysym == XK_Prior) |
412 | if (keysym == XK_Prior) |
387 | { |
413 | { |
388 | scr_page (UP, lnsppg); |
414 | scr_page (UP, lnsppg); |
389 | return; |
415 | return; |
… | |
… | |
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 (TermWin.view_start) |
879 | if (view_start) |
851 | { |
880 | { |
852 | TermWin.view_start = 0; |
881 | view_start = 0; |
853 | want_refresh = 1; |
882 | want_refresh = 1; |
854 | } |
883 | } |
855 | |
884 | |
856 | /* |
885 | /* |
857 | * these modifications only affect the static keybuffer |
886 | * these modifications only affect the static keybuffer |
… | |
… | |
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 > -nsaved && 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 | row++; |
|
|
994 | else |
|
|
995 | { |
|
|
996 | // line not filtered, mark it as filtered |
|
|
997 | l->f |= LINE_FILTERED; |
|
|
998 | while (l->is_longer ()) |
|
|
999 | { |
|
|
1000 | l = &ROW (++row); |
|
|
1001 | l->f |= LINE_FILTERED; |
|
|
1002 | } |
|
|
1003 | |
|
|
1004 | // and filter it |
|
|
1005 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1006 | |
|
|
1007 | break; |
|
|
1008 | } |
|
|
1009 | } |
|
|
1010 | while (l->is_longer () && row < end_row); |
|
|
1011 | } |
|
|
1012 | while (++row < end_row); |
|
|
1013 | } |
|
|
1014 | |
946 | scr_refresh (refresh_type); |
1015 | scr_refresh (refresh_type); |
947 | scrollbar_show (1); |
1016 | scrollbar_show (1); |
948 | #ifdef USE_XIM |
1017 | #ifdef USE_XIM |
949 | IMSendSpot (); |
1018 | IMSendSpot (); |
950 | #endif |
1019 | #endif |
… | |
… | |
960 | SET_LOCALE (locale); |
1029 | SET_LOCALE (locale); |
961 | |
1030 | |
962 | display->flush (); |
1031 | display->flush (); |
963 | |
1032 | |
964 | if (want_refresh && !flush_ev.active) |
1033 | if (want_refresh && !flush_ev.active) |
965 | flush_ev.start (NOW + 0.01); |
1034 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
966 | } |
1035 | } |
967 | |
1036 | |
968 | void |
1037 | void |
969 | rxvt_term::flush_cb (time_watcher &w) |
1038 | rxvt_term::flush_cb (time_watcher &w) |
970 | { |
1039 | { |
… | |
… | |
1034 | { |
1103 | { |
1035 | if (mouse_slip_wheel_speed == 0 |
1104 | if (mouse_slip_wheel_speed == 0 |
1036 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1105 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1037 | : scr_page (UP, mouse_slip_wheel_speed)) |
1106 | : scr_page (UP, mouse_slip_wheel_speed)) |
1038 | { |
1107 | { |
1039 | if (TermWin.view_start == TermWin.nscrolled || |
1108 | if (view_start == nsaved || |
1040 | TermWin.view_start == 0) |
1109 | view_start == 0) |
1041 | mouse_slip_wheel_speed = 0; |
1110 | mouse_slip_wheel_speed = 0; |
1042 | |
1111 | |
1043 | refresh_type |= SMOOTH_REFRESH; |
1112 | refresh_type |= SMOOTH_REFRESH; |
1044 | want_refresh = 1; |
1113 | want_refresh = 1; |
1045 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1114 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1046 | } |
1115 | } |
1047 | } |
1116 | } |
1048 | #endif |
1117 | #endif |
1049 | |
1118 | |
|
|
1119 | #if HAVE_SCHED_YIELD |
|
|
1120 | static struct event_handler |
|
|
1121 | { |
|
|
1122 | check_watcher cw_yield; |
|
|
1123 | |
|
|
1124 | void yield (check_watcher &w) |
|
|
1125 | { |
|
|
1126 | sched_yield (); |
|
|
1127 | w.stop (); |
|
|
1128 | } |
|
|
1129 | |
|
|
1130 | event_handler () |
|
|
1131 | : cw_yield (this, &event_handler::yield) |
|
|
1132 | { |
|
|
1133 | } |
|
|
1134 | } event_handler; |
|
|
1135 | #endif |
|
|
1136 | |
1050 | bool |
1137 | bool |
1051 | rxvt_term::pty_fill () |
1138 | rxvt_term::pty_fill () |
1052 | { |
1139 | { |
1053 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1140 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1054 | |
1141 | |
1055 | if (CBUFSIZ == n) |
1142 | if (CBUFSIZ == n) |
1056 | { |
1143 | { |
1057 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1144 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1058 | n = 0; |
1145 | n = 0; |
1059 | } |
1146 | } |
1060 | |
1147 | |
1061 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1148 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1062 | cmdbuf_ptr = cmdbuf_base; |
1149 | cmdbuf_ptr = cmdbuf_base; |
1063 | cmdbuf_endp = cmdbuf_ptr + n; |
1150 | cmdbuf_endp = cmdbuf_ptr + n; |
1064 | |
1151 | |
1065 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1152 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1066 | |
1153 | |
1067 | if (n > 0) |
1154 | if (r > 0) |
1068 | { |
1155 | { |
1069 | cmdbuf_endp += n; |
1156 | cmdbuf_endp += r; |
1070 | return true; |
1157 | return true; |
1071 | } |
1158 | } |
1072 | else if (n < 0 && errno != EAGAIN) |
1159 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1160 | { |
|
|
1161 | #if HAVE_SCHED_YIELD |
|
|
1162 | if (display->is_local) |
|
|
1163 | event_handler.cw_yield.start (); |
|
|
1164 | #endif |
|
|
1165 | } |
|
|
1166 | else |
|
|
1167 | { |
|
|
1168 | pty_ev.stop (); |
|
|
1169 | |
|
|
1170 | if (!OPTION (Opt_hold)) |
1073 | destroy (); |
1171 | destroy (); |
|
|
1172 | } |
1074 | |
1173 | |
1075 | return false; |
1174 | return false; |
1076 | } |
1175 | } |
1077 | |
1176 | |
1078 | void |
1177 | void |
… | |
… | |
1092 | } |
1191 | } |
1093 | |
1192 | |
1094 | void |
1193 | void |
1095 | rxvt_term::pointer_unblank () |
1194 | rxvt_term::pointer_unblank () |
1096 | { |
1195 | { |
1097 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1196 | XDefineCursor (display->display, vt, TermWin_cursor); |
1098 | recolour_cursor (); |
1197 | recolour_cursor (); |
1099 | |
1198 | |
1100 | #ifdef POINTER_BLANK |
1199 | #ifdef POINTER_BLANK |
1101 | hidden_pointer = 0; |
1200 | hidden_pointer = 0; |
1102 | |
1201 | |
1103 | if (options & Opt_pointerBlank) |
1202 | if (OPTION (Opt_pointerBlank)) |
1104 | pointer_ev.start (NOW + pointerBlankDelay); |
1203 | pointer_ev.start (NOW + pointerBlankDelay); |
1105 | #endif |
1204 | #endif |
1106 | } |
1205 | } |
1107 | |
1206 | |
1108 | #ifdef POINTER_BLANK |
1207 | #ifdef POINTER_BLANK |
1109 | void |
1208 | void |
1110 | rxvt_term::pointer_blank () |
1209 | rxvt_term::pointer_blank () |
1111 | { |
1210 | { |
1112 | if (! (options & Opt_pointerBlank)) |
1211 | if (!OPTION (Opt_pointerBlank)) |
1113 | return; |
1212 | return; |
1114 | |
1213 | |
1115 | XDefineCursor (display->display, TermWin.vt, display->blank_cursor); |
1214 | XDefineCursor (display->display, vt, display->blank_cursor); |
1116 | XFlush (display->display); |
1215 | XFlush (display->display); |
1117 | |
1216 | |
1118 | hidden_pointer = 1; |
1217 | hidden_pointer = 1; |
1119 | } |
1218 | } |
1120 | |
1219 | |
… | |
… | |
1214 | dDisp; |
1313 | dDisp; |
1215 | |
1314 | |
1216 | SET_R (this); |
1315 | SET_R (this); |
1217 | SET_LOCALE (locale); |
1316 | SET_LOCALE (locale); |
1218 | |
1317 | |
1219 | #if defined(CURSOR_BLINK) |
|
|
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; |
1318 | Window unused_root, unused_child; |
1247 | int unused_root_x, unused_root_y; |
1319 | int unused_root_x, unused_root_y; |
1248 | unsigned int unused_mask; |
1320 | unsigned int unused_mask; |
1249 | |
1321 | |
1250 | switch (ev.type) |
1322 | switch (ev.type) |
… | |
… | |
1257 | |
1329 | |
1258 | break; |
1330 | break; |
1259 | |
1331 | |
1260 | case KeyRelease: |
1332 | case KeyRelease: |
1261 | { |
1333 | { |
1262 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1334 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1263 | KeySym ks; |
1335 | KeySym keysym; |
1264 | |
1336 | |
1265 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1337 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1266 | #endif |
1338 | #endif |
1267 | |
1339 | |
1268 | #if ENABLE_FRILLS || ISO_14755 |
1340 | #if ENABLE_FRILLS || ISO_14755 |
1269 | // ISO 14755 support |
1341 | // ISO 14755 support |
1270 | if (iso14755buf) |
1342 | if (iso14755buf) |
… | |
… | |
1275 | # endif |
1347 | # endif |
1276 | # if ISO_14755 |
1348 | # if ISO_14755 |
1277 | // iso14755 part 5.2 handling: release time |
1349 | // iso14755 part 5.2 handling: release time |
1278 | // first: controls |
1350 | // first: controls |
1279 | if ((ev.xkey.state & ControlMask) |
1351 | if ((ev.xkey.state & ControlMask) |
1280 | && ((ks >= 0x40 && ks <= 0x5f) |
1352 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1281 | || (ks >= 0x61 && ks <= 0x7f))) |
1353 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1282 | { |
1354 | { |
1283 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1355 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1284 | commit_iso14755 (); |
1356 | commit_iso14755 (); |
1285 | return; // case-break; |
1357 | goto skip_switch; |
1286 | } |
1358 | } |
1287 | |
1359 | |
1288 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1360 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1289 | if (i[0] == ks) |
1361 | if (i[0] == keysym) |
1290 | { |
1362 | { |
1291 | iso14755buf = ISO_14755_51 | i[1]; |
1363 | iso14755buf = ISO_14755_51 | i[1]; |
1292 | commit_iso14755 (); |
1364 | commit_iso14755 (); |
1293 | return; // case-break; |
1365 | goto skip_switch; |
1294 | } |
1366 | } |
1295 | |
1367 | |
1296 | scr_bell (); |
1368 | scr_bell (); |
1297 | # endif |
1369 | # endif |
1298 | iso14755buf = 0; |
1370 | iso14755buf = 0; |
… | |
… | |
1317 | else |
1389 | else |
1318 | iso14755buf = 0; |
1390 | iso14755buf = 0; |
1319 | } |
1391 | } |
1320 | #endif |
1392 | #endif |
1321 | |
1393 | |
|
|
1394 | if (ev.xany.window == vt |
|
|
1395 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1396 | break; |
|
|
1397 | |
1322 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1398 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1323 | if (!(ev.xkey.state & ControlMask)) |
1399 | if (!(ev.xkey.state & ControlMask)) |
1324 | slip_wheel_ev.stop (); |
1400 | slip_wheel_ev.stop (); |
1325 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1401 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1326 | mouse_slip_wheel_speed = 0; |
1402 | mouse_slip_wheel_speed = 0; |
1327 | #endif |
1403 | #endif |
1328 | break; |
1404 | break; |
1329 | } |
1405 | } |
1330 | |
1406 | |
… | |
… | |
1422 | case FocusOut: |
1498 | case FocusOut: |
1423 | focus_out (); |
1499 | focus_out (); |
1424 | break; |
1500 | break; |
1425 | |
1501 | |
1426 | case ConfigureNotify: |
1502 | case ConfigureNotify: |
1427 | if (ev.xconfigure.window == TermWin.parent[0]) |
1503 | if (ev.xconfigure.window == parent[0]) |
1428 | { |
1504 | { |
1429 | int height, width; |
|
|
1430 | |
|
|
1431 | do |
|
|
1432 | { /* Wrap lots of configures into one */ |
|
|
1433 | width = ev.xconfigure.width; |
|
|
1434 | height = ev.xconfigure.height; |
|
|
1435 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
|
|
1436 | } |
|
|
1437 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); |
1505 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1506 | ; |
1438 | |
1507 | |
1439 | if (szHint.width != width || szHint.height != height) |
1508 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1440 | { |
1509 | { |
1441 | seen_resize = 1; |
1510 | seen_resize = 1; |
1442 | resize_all_windows (width, height, 1); |
1511 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1443 | } |
1512 | } |
1444 | |
1513 | |
1445 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1514 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1446 | if (options & Opt_transparent) |
1515 | if (OPTION (Opt_transparent)) |
1447 | check_our_parents (); |
1516 | check_our_parents (); |
1448 | #endif |
1517 | #endif |
1449 | } |
1518 | } |
1450 | break; |
1519 | break; |
1451 | |
1520 | |
… | |
… | |
1467 | |
1536 | |
1468 | case SelectionRequest: |
1537 | case SelectionRequest: |
1469 | selection_send (ev.xselectionrequest); |
1538 | selection_send (ev.xselectionrequest); |
1470 | break; |
1539 | break; |
1471 | |
1540 | |
|
|
1541 | case MapNotify: |
|
|
1542 | mapped = 1; |
|
|
1543 | #ifdef TEXT_BLINK |
|
|
1544 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1545 | #endif |
|
|
1546 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1547 | break; |
|
|
1548 | |
1472 | case UnmapNotify: |
1549 | case UnmapNotify: |
1473 | TermWin.mapped = 0; |
1550 | mapped = 0; |
1474 | #ifdef TEXT_BLINK |
1551 | #ifdef TEXT_BLINK |
1475 | text_blink_ev.stop (); |
1552 | text_blink_ev.stop (); |
1476 | #endif |
1553 | #endif |
1477 | break; |
1554 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1478 | |
|
|
1479 | case MapNotify: |
|
|
1480 | TermWin.mapped = 1; |
|
|
1481 | #ifdef TEXT_BLINK |
|
|
1482 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1483 | #endif |
|
|
1484 | break; |
1555 | break; |
1485 | |
1556 | |
1486 | #ifdef TRANSPARENT |
1557 | #ifdef TRANSPARENT |
1487 | case ReparentNotify: |
1558 | case ReparentNotify: |
1488 | rootwin_cb (ev); |
1559 | rootwin_cb (ev); |
1489 | break; |
1560 | break; |
1490 | #endif /* TRANSPARENT */ |
1561 | #endif /* TRANSPARENT */ |
1491 | |
1562 | |
1492 | case GraphicsExpose: |
1563 | case GraphicsExpose: |
1493 | case Expose: |
1564 | case Expose: |
1494 | if (ev.xany.window == TermWin.vt) |
1565 | if (ev.xany.window == vt) |
1495 | { |
1566 | { |
1496 | do |
1567 | do |
1497 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1568 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1498 | ev.xexpose.width, ev.xexpose.height, False); |
1569 | ev.xexpose.width, ev.xexpose.height, False); |
1499 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); |
1570 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1500 | |
1571 | |
1501 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1572 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1502 | |
1573 | |
1503 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) |
1574 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1504 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1575 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1505 | ev.xexpose.width, ev.xexpose.height, False); |
1576 | ev.xexpose.width, ev.xexpose.height, False); |
1506 | |
1577 | |
1507 | scr_refresh (refresh_type); |
1578 | scr_refresh (refresh_type); |
1508 | } |
1579 | } |
… | |
… | |
1524 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1595 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1525 | menubar_expose (); |
1596 | menubar_expose (); |
1526 | #endif |
1597 | #endif |
1527 | |
1598 | |
1528 | #ifdef TRANSPARENT |
1599 | #ifdef TRANSPARENT |
1529 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1600 | if (am_transparent && ev.xany.window == parent[0]) |
1530 | XClearWindow (disp, ev.xany.window); |
1601 | XClearWindow (disp, ev.xany.window); |
1531 | #endif |
1602 | #endif |
1532 | } |
1603 | } |
1533 | break; |
1604 | break; |
1534 | |
1605 | |
… | |
… | |
1545 | } |
1616 | } |
1546 | #endif |
1617 | #endif |
1547 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1618 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1548 | break; |
1619 | break; |
1549 | |
1620 | |
1550 | if (ev.xany.window == TermWin.vt) |
1621 | if (ev.xany.window == vt) |
1551 | { |
1622 | { |
|
|
1623 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1624 | ; // nop |
1552 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1625 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1553 | { |
1626 | { |
1554 | while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) |
1627 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1555 | ; |
1628 | ; |
1556 | |
1629 | |
1557 | XQueryPointer (disp, TermWin.vt, |
1630 | XQueryPointer (disp, vt, |
1558 | &unused_root, &unused_child, |
1631 | &unused_root, &unused_child, |
1559 | &unused_root_x, &unused_root_y, |
1632 | &unused_root_x, &unused_root_y, |
1560 | &ev.xbutton.x, &ev.xbutton.y, |
1633 | &ev.xbutton.x, &ev.xbutton.y, |
1561 | &ev.xbutton.state); |
1634 | &ev.xbutton.state); |
1562 | #ifdef MOUSE_THRESHOLD |
1635 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1574 | #endif |
1647 | #endif |
1575 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1648 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1576 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1649 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1577 | |
1650 | |
1578 | #ifdef SELECTION_SCROLLING |
1651 | #ifdef SELECTION_SCROLLING |
1579 | if (ev.xbutton.y < TermWin.int_bwidth |
1652 | if (ev.xbutton.y < int_bwidth |
1580 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1653 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1581 | { |
1654 | { |
1582 | int dist; |
1655 | int dist; |
1583 | |
1656 | |
1584 | /* don't clobber the current delay if we are |
1657 | /* don't clobber the current delay if we are |
1585 | * already in the middle of scrolling. |
1658 | * already in the middle of scrolling. |
… | |
… | |
1593 | selection_save_x = ev.xbutton.x; |
1666 | selection_save_x = ev.xbutton.x; |
1594 | selection_save_y = ev.xbutton.y; |
1667 | selection_save_y = ev.xbutton.y; |
1595 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1668 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1596 | |
1669 | |
1597 | /* calc number of lines to scroll */ |
1670 | /* calc number of lines to scroll */ |
1598 | if (ev.xbutton.y < TermWin.int_bwidth) |
1671 | if (ev.xbutton.y < int_bwidth) |
1599 | { |
1672 | { |
1600 | scroll_selection_dir = UP; |
1673 | scroll_selection_dir = UP; |
1601 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1674 | dist = int_bwidth - ev.xbutton.y; |
1602 | } |
1675 | } |
1603 | else |
1676 | else |
1604 | { |
1677 | { |
1605 | scroll_selection_dir = DN; |
1678 | scroll_selection_dir = DN; |
1606 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1679 | dist = ev.xbutton.y - (int_bwidth + height); |
1607 | } |
1680 | } |
1608 | |
1681 | |
1609 | scroll_selection_lines = Pixel2Height (dist) |
1682 | scroll_selection_lines = Pixel2Height (dist) |
1610 | / SELECTION_SCROLL_LINE_SPEEDUP |
1683 | / SELECTION_SCROLL_LINE_SPEEDUP |
1611 | + 1; |
1684 | + 1; |
1612 | MIN_IT (scroll_selection_lines, |
1685 | min_it (scroll_selection_lines, |
1613 | SELECTION_SCROLL_MAX_LINES); |
1686 | SELECTION_SCROLL_MAX_LINES); |
1614 | } |
1687 | } |
1615 | else |
1688 | else |
1616 | { |
1689 | { |
1617 | /* we are within the text window, so we |
1690 | /* we are within the text window, so we |
… | |
… | |
1643 | refresh_limit = 0; |
1716 | refresh_limit = 0; |
1644 | scrollbar_show (1); |
1717 | scrollbar_show (1); |
1645 | } |
1718 | } |
1646 | break; |
1719 | break; |
1647 | } |
1720 | } |
|
|
1721 | |
|
|
1722 | skip_switch: ; |
|
|
1723 | |
|
|
1724 | #if defined(CURSOR_BLINK) |
|
|
1725 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1726 | { |
|
|
1727 | if (hidden_cursor) |
|
|
1728 | { |
|
|
1729 | hidden_cursor = 0; |
|
|
1730 | want_refresh = 1; |
|
|
1731 | } |
|
|
1732 | |
|
|
1733 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1734 | } |
|
|
1735 | #endif |
|
|
1736 | |
|
|
1737 | #if defined(POINTER_BLANK) |
|
|
1738 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1739 | { |
|
|
1740 | if (ev.type == MotionNotify |
|
|
1741 | || ev.type == ButtonPress |
|
|
1742 | || ev.type == ButtonRelease) |
|
|
1743 | if (hidden_pointer) |
|
|
1744 | pointer_unblank (); |
|
|
1745 | |
|
|
1746 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1747 | pointer_blank (); |
|
|
1748 | } |
|
|
1749 | #endif |
1648 | } |
1750 | } |
1649 | |
1751 | |
1650 | void |
1752 | void |
1651 | rxvt_term::focus_in () |
1753 | rxvt_term::focus_in () |
1652 | { |
1754 | { |
1653 | if (!TermWin.focus) |
1755 | if (!focus) |
1654 | { |
1756 | { |
1655 | TermWin.focus = 1; |
1757 | focus = 1; |
1656 | want_refresh = 1; |
1758 | want_refresh = 1; |
|
|
1759 | |
|
|
1760 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1761 | |
1657 | #ifdef USE_XIM |
1762 | #if USE_XIM |
1658 | if (Input_Context != NULL) |
1763 | if (Input_Context != NULL) |
1659 | { |
1764 | { |
1660 | IMSetStatusPosition (); |
1765 | IMSetStatusPosition (); |
1661 | XSetICFocus (Input_Context); |
1766 | XSetICFocus (Input_Context); |
1662 | } |
1767 | } |
1663 | #endif |
1768 | #endif |
1664 | #ifdef CURSOR_BLINK |
1769 | #if CURSOR_BLINK |
1665 | if (options & Opt_cursorBlink) |
1770 | if (OPTION (Opt_cursorBlink)) |
1666 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1771 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1667 | #endif |
1772 | #endif |
1668 | #ifdef OFF_FOCUS_FADING |
1773 | #if OFF_FOCUS_FADING |
1669 | if (rs[Rs_fade]) |
1774 | if (rs[Rs_fade]) |
1670 | { |
1775 | { |
1671 | pix_colors = pix_colors_focused; |
1776 | pix_colors = pix_colors_focused; |
1672 | scr_recolour (); |
1777 | scr_recolour (); |
1673 | } |
1778 | } |
… | |
… | |
1676 | } |
1781 | } |
1677 | |
1782 | |
1678 | void |
1783 | void |
1679 | rxvt_term::focus_out () |
1784 | rxvt_term::focus_out () |
1680 | { |
1785 | { |
1681 | if (TermWin.focus) |
1786 | if (focus) |
1682 | { |
1787 | { |
1683 | TermWin.focus = 0; |
1788 | focus = 0; |
1684 | want_refresh = 1; |
1789 | want_refresh = 1; |
1685 | |
1790 | |
|
|
1791 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1792 | |
1686 | #if ENABLE_FRILLS || ISO_14755 |
1793 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1794 | if (iso14755buf) |
|
|
1795 | { |
1687 | iso14755buf = 0; |
1796 | iso14755buf = 0; |
1688 | #endif |
|
|
1689 | #if ENABLE_OVERLAY |
1797 | # if ENABLE_OVERLAY |
1690 | scr_overlay_off (); |
1798 | scr_overlay_off (); |
1691 | #endif |
1799 | # endif |
|
|
1800 | } |
|
|
1801 | #endif |
1692 | #ifdef USE_XIM |
1802 | #if USE_XIM |
1693 | if (Input_Context != NULL) |
1803 | if (Input_Context != NULL) |
1694 | XUnsetICFocus (Input_Context); |
1804 | XUnsetICFocus (Input_Context); |
1695 | #endif |
1805 | #endif |
1696 | #ifdef CURSOR_BLINK |
1806 | #if CURSOR_BLINK |
1697 | if (options & Opt_cursorBlink) |
1807 | if (OPTION (Opt_cursorBlink)) |
1698 | cursor_blink_ev.stop (); |
1808 | cursor_blink_ev.stop (); |
1699 | hidden_cursor = 0; |
1809 | hidden_cursor = 0; |
1700 | #endif |
1810 | #endif |
1701 | #ifdef OFF_FOCUS_FADING |
1811 | #if OFF_FOCUS_FADING |
1702 | if (rs[Rs_fade]) |
1812 | if (rs[Rs_fade]) |
1703 | { |
1813 | { |
1704 | pix_colors = pix_colors_unfocused; |
1814 | pix_colors = pix_colors_unfocused; |
1705 | scr_recolour (); |
1815 | scr_recolour (); |
1706 | } |
1816 | } |
… | |
… | |
1726 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1836 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1727 | return; |
1837 | return; |
1728 | |
1838 | |
1729 | /* FALLTHROUGH */ |
1839 | /* FALLTHROUGH */ |
1730 | case ReparentNotify: |
1840 | case ReparentNotify: |
1731 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1841 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1732 | want_refresh = want_full_refresh = 1; |
1842 | want_refresh = want_full_refresh = 1; |
1733 | break; |
1843 | break; |
1734 | } |
1844 | } |
1735 | } |
1845 | } |
1736 | #endif |
1846 | #endif |
… | |
… | |
1739 | rxvt_term::button_press (XButtonEvent &ev) |
1849 | rxvt_term::button_press (XButtonEvent &ev) |
1740 | { |
1850 | { |
1741 | int reportmode = 0, clickintime; |
1851 | int reportmode = 0, clickintime; |
1742 | |
1852 | |
1743 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1853 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1854 | |
1744 | if (!bypass_keystate) |
1855 | if (!bypass_keystate) |
1745 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1856 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1746 | |
1857 | |
1747 | /* |
1858 | /* |
1748 | * VT window processing of button press |
1859 | * VT window processing of button press |
1749 | */ |
1860 | */ |
1750 | if (ev.window == TermWin.vt) |
1861 | if (ev.window == vt) |
1751 | { |
1862 | { |
1752 | #if ISO_14755 |
1863 | #if ISO_14755 |
1753 | // 5.4 |
1864 | // 5.4 |
1754 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1865 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1755 | { |
1866 | { |
… | |
… | |
1768 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1879 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1769 | if (ev.button == MEvent.button && clickintime) |
1880 | if (ev.button == MEvent.button && clickintime) |
1770 | { |
1881 | { |
1771 | /* same button, within alloted time */ |
1882 | /* same button, within alloted time */ |
1772 | MEvent.clicks++; |
1883 | MEvent.clicks++; |
|
|
1884 | |
1773 | if (MEvent.clicks > 1) |
1885 | if (MEvent.clicks > 1) |
1774 | { |
1886 | { |
1775 | /* only report double clicks */ |
1887 | /* only report double clicks */ |
1776 | MEvent.clicks = 2; |
1888 | MEvent.clicks = 2; |
1777 | mouse_report (ev); |
1889 | mouse_report (ev); |
… | |
… | |
1797 | else |
1909 | else |
1798 | { |
1910 | { |
1799 | if (ev.button != MEvent.button) |
1911 | if (ev.button != MEvent.button) |
1800 | MEvent.clicks = 0; |
1912 | MEvent.clicks = 0; |
1801 | |
1913 | |
|
|
1914 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1802 | switch (ev.button) |
1915 | switch (ev.button) |
1803 | { |
1916 | { |
1804 | case Button1: |
1917 | case Button1: |
1805 | /* allow meta + click to select rectangular areas */ |
1918 | /* allow meta + click to select rectangular areas */ |
1806 | /* should be done in screen.C */ |
1919 | /* should be done in screen.C */ |
1807 | #if ENABLE_FRILLS |
1920 | #if ENABLE_FRILLS |
1808 | selection.rect = !!(ev.state & ModMetaMask); |
1921 | selection.rect = !!(ev.state & ModMetaMask); |
1809 | #else |
1922 | #else |
1810 | selection.rect = false; |
1923 | selection.rect = false; |
1811 | #endif |
1924 | #endif |
1812 | |
1925 | |
1813 | /* allow shift+left click to extend selection */ |
1926 | /* allow shift+left click to extend selection */ |
1814 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1927 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1815 | { |
1928 | { |
1816 | if (MEvent.button == Button1 && clickintime) |
1929 | if (MEvent.button == Button1 && clickintime) |
1817 | selection_rotate (ev.x, ev.y); |
1930 | selection_rotate (ev.x, ev.y); |
1818 | else |
1931 | else |
1819 | selection_extend (ev.x, ev.y, 1); |
1932 | selection_extend (ev.x, ev.y, 1); |
1820 | } |
1933 | } |
1821 | else |
1934 | else |
1822 | { |
1935 | { |
1823 | if (MEvent.button == Button1 && clickintime) |
1936 | if (MEvent.button == Button1 && clickintime) |
1824 | MEvent.clicks++; |
1937 | MEvent.clicks++; |
1825 | else |
1938 | else |
1826 | MEvent.clicks = 1; |
1939 | MEvent.clicks = 1; |
1827 | |
1940 | |
1828 | selection_click (MEvent.clicks, ev.x, ev.y); |
1941 | selection_click (MEvent.clicks, ev.x, ev.y); |
1829 | } |
1942 | } |
1830 | |
1943 | |
1831 | MEvent.button = Button1; |
1944 | MEvent.button = Button1; |
1832 | break; |
1945 | break; |
1833 | |
1946 | |
1834 | case Button3: |
1947 | case Button3: |
1835 | if (MEvent.button == Button3 && clickintime) |
1948 | if (MEvent.button == Button3 && clickintime) |
1836 | selection_rotate (ev.x, ev.y); |
1949 | selection_rotate (ev.x, ev.y); |
1837 | else |
1950 | else |
1838 | selection_extend (ev.x, ev.y, 1); |
1951 | selection_extend (ev.x, ev.y, 1); |
1839 | |
1952 | |
1840 | MEvent.button = Button3; |
1953 | MEvent.button = Button3; |
1841 | break; |
1954 | break; |
1842 | } |
1955 | } |
1843 | } |
1956 | } |
1844 | |
1957 | |
1845 | MEvent.time = ev.time; |
1958 | MEvent.time = ev.time; |
1846 | return; |
1959 | return; |
1847 | } |
1960 | } |
1848 | |
1961 | |
… | |
… | |
1960 | case Button3: |
2073 | case Button3: |
1961 | if (scrollBar.style != R_SB_XTERM) |
2074 | if (scrollBar.style != R_SB_XTERM) |
1962 | { |
2075 | { |
1963 | if (scrollbar_above_slider (ev.y)) |
2076 | if (scrollbar_above_slider (ev.y)) |
1964 | # ifdef RXVT_SCROLL_FULL |
2077 | # ifdef RXVT_SCROLL_FULL |
1965 | scr_page (UP, TermWin.nrow - 1); |
2078 | scr_page (UP, nrow - 1); |
1966 | # else |
2079 | # else |
1967 | scr_page (UP, TermWin.nrow / 4); |
2080 | scr_page (UP, nrow / 4); |
1968 | # endif |
2081 | # endif |
1969 | else if (scrollbar_below_slider (ev.y)) |
2082 | else if (scrollbar_below_slider (ev.y)) |
1970 | # ifdef RXVT_SCROLL_FULL |
2083 | # ifdef RXVT_SCROLL_FULL |
1971 | scr_page (DN, TermWin.nrow - 1); |
2084 | scr_page (DN, nrow - 1); |
1972 | # else |
2085 | # else |
1973 | scr_page (DN, TermWin.nrow / 4); |
2086 | scr_page (DN, nrow / 4); |
1974 | # endif |
2087 | # endif |
1975 | else |
2088 | else |
1976 | scrollBar.setMotion (); |
2089 | scrollBar.setMotion (); |
1977 | } |
2090 | } |
1978 | else |
2091 | else |
1979 | { |
2092 | { |
1980 | scr_page ((ev.button == Button1 ? DN : UP), |
2093 | scr_page ((ev.button == Button1 ? DN : UP), |
1981 | (TermWin.nrow |
2094 | (nrow |
1982 | * scrollbar_position (ev.y) |
2095 | * scrollbar_position (ev.y) |
1983 | / scrollbar_size ())); |
2096 | / scrollbar_size ())); |
1984 | } |
2097 | } |
1985 | |
2098 | |
1986 | break; |
2099 | break; |
1987 | } |
2100 | } |
1988 | } |
2101 | } |
|
|
2102 | |
1989 | return; |
2103 | return; |
1990 | } |
2104 | } |
|
|
2105 | |
1991 | #if MENUBAR |
2106 | #if MENUBAR |
1992 | /* |
2107 | /* |
1993 | * Menubar window processing of button press |
2108 | * Menubar window processing of button press |
1994 | */ |
2109 | */ |
1995 | if (isMenuBarWindow (ev.window)) |
2110 | if (isMenuBarWindow (ev.window)) |
… | |
… | |
2018 | #ifdef SELECTION_SCROLLING |
2133 | #ifdef SELECTION_SCROLLING |
2019 | if (sel_scroll_ev.active) |
2134 | if (sel_scroll_ev.active) |
2020 | sel_scroll_ev.stop(); |
2135 | sel_scroll_ev.stop(); |
2021 | #endif |
2136 | #endif |
2022 | |
2137 | |
2023 | if (ev.window == TermWin.vt) |
2138 | if (ev.window == vt) |
2024 | { |
2139 | { |
2025 | #if ISO_14755 |
2140 | #if ISO_14755 |
2026 | // 5.4 |
2141 | // 5.4 |
2027 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2142 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2028 | return; |
2143 | return; |
… | |
… | |
2058 | if (priv_modes & PrivMode_mouse_report |
2173 | if (priv_modes & PrivMode_mouse_report |
2059 | && bypass_keystate |
2174 | && bypass_keystate |
2060 | && ev.button == Button1 && MEvent.clicks <= 1) |
2175 | && ev.button == Button1 && MEvent.clicks <= 1) |
2061 | selection_extend (ev.x, ev.y, 0); |
2176 | selection_extend (ev.x, ev.y, 0); |
2062 | |
2177 | |
|
|
2178 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2179 | return; |
|
|
2180 | |
2063 | switch (ev.button) |
2181 | switch (ev.button) |
2064 | { |
2182 | { |
2065 | case Button1: |
2183 | case Button1: |
2066 | case Button3: |
2184 | case Button3: |
2067 | selection_make (ev.time); |
2185 | selection_make (ev.time); |
… | |
… | |
2078 | |
2196 | |
2079 | v = ev.button == Button4 ? UP : DN; |
2197 | v = ev.button == Button4 ? UP : DN; |
2080 | |
2198 | |
2081 | if (ev.state & ShiftMask) |
2199 | if (ev.state & ShiftMask) |
2082 | i = 1; |
2200 | i = 1; |
2083 | else if (options & Opt_mouseWheelScrollPage) |
2201 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2084 | i = TermWin.nrow - 1; |
2202 | i = nrow - 1; |
2085 | else |
2203 | else |
2086 | i = 5; |
2204 | i = 5; |
2087 | |
2205 | |
2088 | # ifdef MOUSE_SLIP_WHEELING |
2206 | # ifdef MOUSE_SLIP_WHEELING |
2089 | if (ev.state & ControlMask) |
2207 | if (ev.state & ControlMask) |
2090 | { |
2208 | { |
2091 | mouse_slip_wheel_speed += v ? -1 : 1; |
2209 | mouse_slip_wheel_speed += v ? -1 : 1; |
2092 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2210 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2093 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2211 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2094 | |
2212 | |
2095 | if (slip_wheel_ev.at < NOW) |
2213 | if (slip_wheel_ev.at < NOW) |
2096 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2214 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2097 | |
2215 | |
2098 | slip_wheel_ev.start (); |
2216 | slip_wheel_ev.start (); |
… | |
… | |
2374 | XWindowAttributes wattr, wrootattr; |
2492 | XWindowAttributes wattr, wrootattr; |
2375 | dDisp; |
2493 | dDisp; |
2376 | |
2494 | |
2377 | pchanged = 0; |
2495 | pchanged = 0; |
2378 | |
2496 | |
2379 | if (!(options & Opt_transparent)) |
2497 | if (!OPTION (Opt_transparent)) |
2380 | return pchanged; /* Don't try any more */ |
2498 | return pchanged; /* Don't try any more */ |
2381 | |
2499 | |
2382 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2500 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2383 | rootdepth = wrootattr.depth; |
2501 | rootdepth = wrootattr.depth; |
2384 | |
2502 | |
2385 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
2503 | XGetWindowAttributes (disp, parent[0], &wattr); |
2386 | |
2504 | |
2387 | if (rootdepth != wattr.depth) |
2505 | if (rootdepth != wattr.depth) |
2388 | { |
2506 | { |
2389 | if (am_transparent) |
2507 | if (am_transparent) |
2390 | { |
2508 | { |
2391 | pchanged = 1; |
2509 | pchanged = 1; |
2392 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2510 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2393 | am_transparent = am_pixmap_trans = 0; |
2511 | am_transparent = am_pixmap_trans = 0; |
2394 | } |
2512 | } |
2395 | |
2513 | |
2396 | return pchanged; /* Don't try any more */ |
2514 | return pchanged; /* Don't try any more */ |
2397 | } |
2515 | } |
… | |
… | |
2438 | Window cr; |
2556 | Window cr; |
2439 | XImage *image; |
2557 | XImage *image; |
2440 | GC gc; |
2558 | GC gc; |
2441 | XGCValues gcvalue; |
2559 | XGCValues gcvalue; |
2442 | |
2560 | |
2443 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
2561 | XTranslateCoordinates (disp, parent[0], display->root, |
2444 | 0, 0, &sx, &sy, &cr); |
2562 | 0, 0, &sx, &sy, &cr); |
2445 | nw = (unsigned int)szHint.width; |
2563 | nw = (unsigned int)szHint.width; |
2446 | nh = (unsigned int)szHint.height; |
2564 | nh = (unsigned int)szHint.height; |
2447 | nx = ny = 0; |
2565 | nx = ny = 0; |
2448 | |
2566 | |
… | |
… | |
2458 | nh += sy; |
2576 | nh += sy; |
2459 | ny = -sy; |
2577 | ny = -sy; |
2460 | sy = 0; |
2578 | sy = 0; |
2461 | } |
2579 | } |
2462 | |
2580 | |
2463 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2581 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2464 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2582 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2465 | |
2583 | |
2466 | XSync (disp, False); |
2584 | XSync (disp, False); |
2467 | allowedxerror = -1; |
2585 | allowedxerror = -1; |
2468 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2586 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2469 | |
2587 | |
… | |
… | |
2474 | if (image == NULL) |
2592 | if (image == NULL) |
2475 | { |
2593 | { |
2476 | if (am_transparent && am_pixmap_trans) |
2594 | if (am_transparent && am_pixmap_trans) |
2477 | { |
2595 | { |
2478 | pchanged = 1; |
2596 | pchanged = 1; |
2479 | if (TermWin.pixmap != None) |
2597 | if (pixmap != None) |
2480 | { |
2598 | { |
2481 | XFreePixmap (disp, TermWin.pixmap); |
2599 | XFreePixmap (disp, pixmap); |
2482 | TermWin.pixmap = None; |
2600 | pixmap = None; |
2483 | } |
2601 | } |
2484 | } |
2602 | } |
2485 | |
2603 | |
2486 | am_pixmap_trans = 0; |
2604 | am_pixmap_trans = 0; |
2487 | } |
2605 | } |
2488 | else |
2606 | else |
2489 | { |
2607 | { |
2490 | if (TermWin.pixmap != None) |
2608 | if (pixmap != None) |
2491 | XFreePixmap (disp, TermWin.pixmap); |
2609 | XFreePixmap (disp, pixmap); |
2492 | |
2610 | |
2493 | #if TINTING |
2611 | #if TINTING |
2494 | if (ISSET_PIXCOLOR (Color_tint)) |
2612 | if (ISSET_PIXCOLOR (Color_tint)) |
2495 | { |
2613 | { |
2496 | unsigned short rm, gm, bm; |
2614 | unsigned short rm, gm, bm; |
… | |
… | |
2500 | |
2618 | |
2501 | ShadeXImage (display, image, shade, rm, gm, bm); |
2619 | ShadeXImage (display, image, shade, rm, gm, bm); |
2502 | } |
2620 | } |
2503 | #endif |
2621 | #endif |
2504 | |
2622 | |
2505 | TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, |
2623 | pixmap = XCreatePixmap (disp, vt, |
2506 | szHint.width, szHint.height, image->depth); |
2624 | szHint.width, szHint.height, image->depth); |
2507 | gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); |
2625 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2508 | XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, |
2626 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2509 | nx, ny, image->width, image->height); |
2627 | nx, ny, image->width, image->height); |
2510 | XFreeGC (disp, gc); |
2628 | XFreeGC (disp, gc); |
2511 | XDestroyImage (image); |
2629 | XDestroyImage (image); |
2512 | XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); |
2630 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2513 | XClearWindow (disp, TermWin.parent[0]); |
2631 | XClearWindow (disp, parent[0]); |
2514 | |
2632 | |
2515 | if (!am_transparent || !am_pixmap_trans) |
2633 | if (!am_transparent || !am_pixmap_trans) |
2516 | pchanged = 1; |
2634 | pchanged = 1; |
2517 | |
2635 | |
2518 | am_transparent = am_pixmap_trans = 1; |
2636 | am_transparent = am_pixmap_trans = 1; |
2519 | } |
2637 | } |
2520 | } |
2638 | } |
2521 | |
2639 | |
2522 | if (am_pixmap_trans) |
2640 | if (am_pixmap_trans) |
2523 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2641 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2524 | else |
2642 | else |
2525 | { |
2643 | { |
2526 | unsigned int n; |
2644 | unsigned int n; |
2527 | /* |
2645 | /* |
2528 | * InheritPixmap transparency |
2646 | * InheritPixmap transparency |
2529 | */ |
2647 | */ |
2530 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2648 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2531 | { |
2649 | { |
2532 | oldp = TermWin.parent[i]; |
2650 | oldp = parent[i]; |
2533 | XQueryTree (disp, TermWin.parent[i - 1], &root, |
2651 | XQueryTree (disp, parent[i - 1], &root, |
2534 | &TermWin.parent[i], &list, &n); |
2652 | &parent[i], &list, &n); |
2535 | XFree (list); |
2653 | XFree (list); |
2536 | |
2654 | |
2537 | if (TermWin.parent[i] == display->root) |
2655 | if (parent[i] == display->root) |
2538 | { |
2656 | { |
2539 | if (oldp != None) |
2657 | if (oldp != None) |
2540 | pchanged = 1; |
2658 | pchanged = 1; |
2541 | |
2659 | |
2542 | break; |
2660 | break; |
2543 | } |
2661 | } |
2544 | |
2662 | |
2545 | if (oldp != TermWin.parent[i]) |
2663 | if (oldp != parent[i]) |
2546 | pchanged = 1; |
2664 | pchanged = 1; |
2547 | } |
2665 | } |
2548 | |
2666 | |
2549 | n = 0; |
2667 | n = 0; |
2550 | |
2668 | |
2551 | if (pchanged) |
2669 | if (pchanged) |
2552 | { |
2670 | { |
2553 | for (; n < (unsigned int)i; n++) |
2671 | for (; n < (unsigned int)i; n++) |
2554 | { |
2672 | { |
2555 | XGetWindowAttributes (disp, TermWin.parent[n], &wattr); |
2673 | XGetWindowAttributes (disp, parent[n], &wattr); |
2556 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2674 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2557 | { |
2675 | { |
2558 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2676 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2559 | break; |
2677 | break; |
2560 | } |
2678 | } |
2561 | } |
2679 | } |
2562 | } |
2680 | } |
2563 | |
2681 | |
2564 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2682 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2565 | { |
2683 | { |
2566 | XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2684 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2567 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2685 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2568 | am_transparent = 0; |
2686 | am_transparent = 0; |
2569 | /* XXX: also turn off Opt_transparent? */ |
2687 | /* XXX: also turn off Opt_transparent? */ |
2570 | } |
2688 | } |
2571 | else |
2689 | else |
2572 | { |
2690 | { |
… | |
… | |
2575 | * needed for fvwm2.2.2 (and before?) */ |
2693 | * needed for fvwm2.2.2 (and before?) */ |
2576 | sleep (1); |
2694 | sleep (1); |
2577 | #endif |
2695 | #endif |
2578 | for (n = 0; n < (unsigned int)i; n++) |
2696 | for (n = 0; n < (unsigned int)i; n++) |
2579 | { |
2697 | { |
2580 | XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); |
2698 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2581 | XClearWindow (disp, TermWin.parent[n]); |
2699 | XClearWindow (disp, parent[n]); |
2582 | } |
2700 | } |
2583 | |
2701 | |
2584 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2702 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2585 | am_transparent = 1; |
2703 | am_transparent = 1; |
2586 | } |
2704 | } |
2587 | |
2705 | |
2588 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2706 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2589 | TermWin.parent[i] = None; |
2707 | parent[i] = None; |
2590 | } |
2708 | } |
2591 | |
2709 | |
2592 | if (scrollBar.win) |
2710 | if (scrollBar.win) |
2593 | { |
2711 | { |
2594 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2712 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
… | |
… | |
2611 | |
2729 | |
2612 | bool |
2730 | bool |
2613 | rxvt_term::cmd_parse () |
2731 | rxvt_term::cmd_parse () |
2614 | { |
2732 | { |
2615 | bool flag = false; |
2733 | bool flag = false; |
2616 | unicode_t ch = NOCHAR; |
2734 | wchar_t ch = NOCHAR; |
2617 | unsigned char *seq_begin; // remember start of esc-sequence here |
2735 | char *seq_begin; // remember start of esc-sequence here |
2618 | |
2736 | |
2619 | for (;;) |
2737 | for (;;) |
2620 | { |
2738 | { |
2621 | if (ch == NOCHAR) |
2739 | if (ch == NOCHAR) |
2622 | { |
2740 | { |
2623 | seq_begin = cmdbuf_ptr; |
2741 | seq_begin = cmdbuf_ptr; |
2624 | ch = next_char (); |
2742 | ch = next_char (); |
2625 | } |
|
|
2626 | |
2743 | |
2627 | if (ch == NOCHAR) // TODO: improve |
2744 | if (ch == NOCHAR) |
2628 | break; |
2745 | break; |
|
|
2746 | } |
2629 | |
2747 | |
2630 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2748 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2631 | { |
2749 | { |
2632 | if (!seen_input) |
2750 | if (!seen_input) |
2633 | { |
2751 | { |
… | |
… | |
2642 | if (seen_resize && cmd_pid) |
2760 | if (seen_resize && cmd_pid) |
2643 | kill (-cmd_pid, SIGWINCH); |
2761 | kill (-cmd_pid, SIGWINCH); |
2644 | } |
2762 | } |
2645 | |
2763 | |
2646 | /* Read a text string from the input buffer */ |
2764 | /* Read a text string from the input buffer */ |
2647 | unicode_t buf[UBUFSIZ]; |
2765 | wchar_t buf[UBUFSIZ]; |
2648 | bool refreshnow = false; |
2766 | bool refreshnow = false; |
2649 | int nlines = 0; |
2767 | int nlines = 0; |
2650 | unicode_t *str = buf; |
2768 | wchar_t *str = buf; |
2651 | unicode_t *eol = str + min (TermWin.ncol, UBUFSIZ); |
2769 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2652 | |
2770 | |
2653 | for (;;) |
2771 | for (;;) |
2654 | { |
2772 | { |
2655 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2773 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2656 | break; |
2774 | break; |
2657 | |
2775 | |
2658 | *str++ = ch; |
2776 | *str++ = ch; |
2659 | |
2777 | |
2660 | if (ch == C0_LF || str >= eol) |
2778 | if (ch == C0_LF || str >= eol) |
2661 | { |
2779 | { |
|
|
2780 | if (ch == C0_LF) |
2662 | nlines++; |
2781 | nlines++; |
|
|
2782 | |
2663 | refresh_count++; |
2783 | refresh_count++; |
2664 | |
2784 | |
2665 | if (!(options & Opt_jumpScroll) |
2785 | if (!OPTION (Opt_jumpScroll) |
2666 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2786 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2667 | { |
2787 | { |
2668 | refreshnow = true; |
2788 | refreshnow = true; |
|
|
2789 | refresh_count = 0; |
2669 | ch = NOCHAR; |
2790 | ch = NOCHAR; |
2670 | break; |
2791 | break; |
2671 | } |
2792 | } |
2672 | |
2793 | |
2673 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2794 | // scr_add_lines only works for nlines <= nrow - 1. |
2674 | if (nlines >= TermWin.nrow - 1) |
2795 | if (nlines >= nrow - 1) |
2675 | { |
2796 | { |
|
|
2797 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2676 | scr_add_lines (buf, nlines, str - buf); |
2798 | scr_add_lines (buf, str - buf, nlines); |
|
|
2799 | |
2677 | nlines = 0; |
2800 | nlines = 0; |
2678 | str = buf; |
2801 | str = buf; |
2679 | eol = str + min (TermWin.ncol, UBUFSIZ); |
2802 | eol = str + min (ncol, UBUFSIZ); |
2680 | } |
2803 | } |
2681 | |
2804 | |
2682 | if (str >= eol) |
2805 | if (str >= eol) |
2683 | { |
2806 | { |
2684 | if (eol >= buf + UBUFSIZ) |
2807 | if (eol >= buf + UBUFSIZ) |
2685 | { |
2808 | { |
2686 | ch = NOCHAR; |
2809 | ch = NOCHAR; |
2687 | break; |
2810 | break; |
2688 | } |
2811 | } |
2689 | else |
2812 | else |
2690 | eol = min (eol + TermWin.ncol, buf + UBUFSIZ); |
2813 | eol = min (eol + ncol, buf + UBUFSIZ); |
2691 | } |
2814 | } |
2692 | |
2815 | |
2693 | } |
2816 | } |
2694 | |
2817 | |
2695 | seq_begin = cmdbuf_ptr; |
2818 | seq_begin = cmdbuf_ptr; |
2696 | ch = next_char (); |
2819 | ch = next_char (); |
2697 | } |
2820 | } |
2698 | |
2821 | |
|
|
2822 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2699 | scr_add_lines (buf, nlines, str - buf); |
2823 | scr_add_lines (buf, str - buf, nlines); |
2700 | |
2824 | |
2701 | /* |
2825 | /* |
2702 | * If there have been a lot of new lines, then update the screen |
2826 | * If there have been a lot of new lines, then update the screen |
2703 | * What the heck I'll cheat and only refresh less than every page-full. |
2827 | * What the heck I'll cheat and only refresh less than every page-full. |
2704 | * the number of pages between refreshes is refresh_limit, which |
2828 | * the number of pages between refreshes is refresh_limit, which |
2705 | * is incremented here because we must be doing flat-out scrolling. |
2829 | * is incremented here because we must be doing flat-out scrolling. |
2706 | */ |
2830 | */ |
2707 | if (refreshnow) |
2831 | if (refreshnow) |
2708 | { |
2832 | { |
2709 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2833 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2710 | refresh_limit++; |
2834 | refresh_limit++; |
2711 | else |
2835 | else |
2712 | { |
2836 | { |
2713 | flag = true; |
2837 | flag = true; |
2714 | scr_refresh (refresh_type); |
2838 | scr_refresh (refresh_type); |
|
|
2839 | flush_ev.stop (); |
2715 | } |
2840 | } |
2716 | } |
2841 | } |
2717 | |
2842 | |
2718 | } |
2843 | } |
2719 | else |
2844 | else |
… | |
… | |
2734 | } |
2859 | } |
2735 | |
2860 | |
2736 | return flag; |
2861 | return flag; |
2737 | } |
2862 | } |
2738 | |
2863 | |
2739 | // read the next octet |
|
|
2740 | unicode_t |
|
|
2741 | rxvt_term::next_octet () |
|
|
2742 | { |
|
|
2743 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2744 | ? *cmdbuf_ptr++ |
|
|
2745 | : NOCHAR; |
|
|
2746 | } |
|
|
2747 | |
|
|
2748 | // read the next character |
2864 | // read the next character |
2749 | unicode_t |
2865 | wchar_t |
2750 | rxvt_term::next_char () |
2866 | rxvt_term::next_char () |
2751 | { |
2867 | { |
2752 | while (cmdbuf_ptr < cmdbuf_endp) |
2868 | while (cmdbuf_ptr < cmdbuf_endp) |
2753 | { |
2869 | { |
2754 | // assume 7-bit to be ascii ALWAYS |
2870 | // assume 7-bit to be ascii ALWAYS |
2755 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2871 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2756 | return *cmdbuf_ptr++; |
2872 | return *cmdbuf_ptr++; |
2757 | |
2873 | |
2758 | wchar_t wc; |
2874 | wchar_t wc; |
2759 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2875 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2760 | |
2876 | |
2761 | if (len == (size_t)-2) |
2877 | if (len == (size_t)-2) |
2762 | { |
2878 | { |
2763 | // the mbstate stores incomplete sequences. didn't know this :/ |
2879 | // the mbstate stores incomplete sequences. didn't know this :/ |
2764 | cmdbuf_ptr = cmdbuf_endp; |
2880 | cmdbuf_ptr = cmdbuf_endp; |
2765 | break; |
2881 | break; |
2766 | } |
2882 | } |
2767 | |
2883 | |
2768 | if (len == (size_t)-1) |
2884 | if (len == (size_t)-1) |
2769 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2885 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2770 | |
2886 | |
2771 | // assume wchar == unicode |
2887 | // assume wchar == unicode |
2772 | cmdbuf_ptr += len; |
2888 | cmdbuf_ptr += len; |
2773 | return wc & UNICODE_MASK; |
2889 | return wc & UNICODE_MASK; |
2774 | } |
2890 | } |
2775 | |
2891 | |
2776 | return NOCHAR; |
2892 | return NOCHAR; |
|
|
2893 | } |
|
|
2894 | |
|
|
2895 | // read the next octet |
|
|
2896 | uint32_t |
|
|
2897 | rxvt_term::next_octet () |
|
|
2898 | { |
|
|
2899 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2900 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2901 | : NOCHAR; |
2777 | } |
2902 | } |
2778 | |
2903 | |
2779 | /* rxvt_cmd_getc () - Return next input character */ |
2904 | /* rxvt_cmd_getc () - Return next input character */ |
2780 | /* |
2905 | /* |
2781 | * Return the next input character after first passing any keyboard input |
2906 | * Return the next input character after first passing any keyboard input |
2782 | * to the command. |
2907 | * to the command. |
2783 | */ |
2908 | */ |
2784 | unicode_t |
2909 | wchar_t |
2785 | rxvt_term::cmd_getc () |
2910 | rxvt_term::cmd_getc () |
2786 | { |
2911 | { |
2787 | unicode_t c = next_char (); |
2912 | wchar_t c = next_char (); |
2788 | |
2913 | |
2789 | if (c == NOCHAR) |
2914 | if (c == NOCHAR) |
2790 | throw out_of_input; |
2915 | throw out_of_input; |
2791 | |
2916 | |
2792 | return c; |
2917 | return c; |
2793 | } |
2918 | } |
2794 | |
2919 | |
2795 | unicode_t |
2920 | uint32_t |
2796 | rxvt_term::cmd_get8 () |
2921 | rxvt_term::cmd_get8 () |
2797 | { |
2922 | { |
2798 | unicode_t c = next_octet (); |
2923 | uint32_t c = next_octet (); |
2799 | |
2924 | |
2800 | if (c == NOCHAR) |
2925 | if (c == NOCHAR) |
2801 | throw out_of_input; |
2926 | throw out_of_input; |
2802 | |
2927 | |
2803 | return c; |
2928 | return c; |
… | |
… | |
2903 | case C0_ESC: |
3028 | case C0_ESC: |
2904 | process_escape_seq (); |
3029 | process_escape_seq (); |
2905 | break; |
3030 | break; |
2906 | case C0_ENQ: /* terminal Status */ |
3031 | case C0_ENQ: /* terminal Status */ |
2907 | if (rs[Rs_answerbackstring]) |
3032 | if (rs[Rs_answerbackstring]) |
2908 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
3033 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2909 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2910 | else |
3034 | else |
2911 | tt_write ((unsigned char *)VT100_ANS, |
3035 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2912 | (unsigned int)strlen (VT100_ANS)); |
|
|
2913 | break; |
3036 | break; |
2914 | case C0_BEL: /* bell */ |
3037 | case C0_BEL: /* bell */ |
2915 | scr_bell (); |
3038 | scr_bell (); |
2916 | break; |
3039 | break; |
2917 | case C0_BS: /* backspace */ |
3040 | case C0_BS: /* backspace */ |
… | |
… | |
3072 | break; |
3195 | break; |
3073 | |
3196 | |
3074 | /* 8.3.87: NEXT LINE */ |
3197 | /* 8.3.87: NEXT LINE */ |
3075 | case C1_NEL: /* ESC E */ |
3198 | case C1_NEL: /* ESC E */ |
3076 | { |
3199 | { |
3077 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3200 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3078 | scr_add_lines (nlcr, 1, 2); |
3201 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3079 | } |
3202 | } |
3080 | break; |
3203 | break; |
3081 | |
3204 | |
3082 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3205 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3083 | case C1_ESA: /* ESC G */ |
3206 | case C1_ESA: /* ESC G */ |
… | |
… | |
3105 | process_dcs_seq (); |
3228 | process_dcs_seq (); |
3106 | break; |
3229 | break; |
3107 | |
3230 | |
3108 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3231 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3109 | case C1_SCI: /* ESC Z */ |
3232 | case C1_SCI: /* ESC Z */ |
3110 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3233 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3111 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3112 | break; /* steal obsolete ESC [ c */ |
3234 | break; /* steal obsolete ESC [ c */ |
3113 | |
3235 | |
3114 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3236 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3115 | case C1_CSI: /* ESC [ */ |
3237 | case C1_CSI: /* ESC [ */ |
3116 | process_csi_seq (); |
3238 | process_csi_seq (); |
… | |
… | |
3356 | |
3478 | |
3357 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3479 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3358 | arg[0] = -arg[0]; |
3480 | arg[0] = -arg[0]; |
3359 | /* FALLTHROUGH */ |
3481 | /* FALLTHROUGH */ |
3360 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3482 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3361 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3483 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3362 | break; |
3484 | break; |
3363 | |
3485 | |
3364 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3486 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3365 | tt_write ((const unsigned char *)VT100_ANS, |
3487 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3366 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3367 | break; |
3488 | break; |
3368 | |
3489 | |
3369 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3490 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3370 | process_sgr_mode (nargs, arg); |
3491 | process_sgr_mode (nargs, arg); |
3371 | break; |
3492 | break; |
… | |
… | |
3378 | break; |
3499 | break; |
3379 | case 6: /* CPR requested */ |
3500 | case 6: /* CPR requested */ |
3380 | scr_report_position (); |
3501 | scr_report_position (); |
3381 | break; |
3502 | break; |
3382 | case 7: /* unofficial extension */ |
3503 | case 7: /* unofficial extension */ |
3383 | if (options & Opt_insecure) |
3504 | if (OPTION (Opt_insecure)) |
3384 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3505 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3385 | break; |
3506 | break; |
3386 | case 8: /* unofficial extension */ |
3507 | case 8: /* unofficial extension */ |
3387 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3508 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3388 | break; |
3509 | break; |
… | |
… | |
3491 | { |
3612 | { |
3492 | /* |
3613 | /* |
3493 | * commands |
3614 | * commands |
3494 | */ |
3615 | */ |
3495 | case 1: /* deiconify window */ |
3616 | case 1: /* deiconify window */ |
3496 | XMapWindow (disp, TermWin.parent[0]); |
3617 | XMapWindow (disp, parent[0]); |
3497 | break; |
3618 | break; |
3498 | case 2: /* iconify window */ |
3619 | case 2: /* iconify window */ |
3499 | XIconifyWindow (disp, TermWin.parent[0], display->screen); |
3620 | XIconifyWindow (disp, parent[0], display->screen); |
3500 | break; |
3621 | break; |
3501 | case 3: /* set position (pixels) */ |
3622 | case 3: /* set position (pixels) */ |
3502 | XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); |
3623 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3503 | break; |
3624 | break; |
3504 | case 4: /* set size (pixels) */ |
3625 | case 4: /* set size (pixels) */ |
3505 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3626 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3506 | break; |
3627 | break; |
3507 | case 5: /* raise window */ |
3628 | case 5: /* raise window */ |
3508 | XRaiseWindow (disp, TermWin.parent[0]); |
3629 | XRaiseWindow (disp, parent[0]); |
3509 | break; |
3630 | break; |
3510 | case 6: /* lower window */ |
3631 | case 6: /* lower window */ |
3511 | XLowerWindow (disp, TermWin.parent[0]); |
3632 | XLowerWindow (disp, parent[0]); |
3512 | break; |
3633 | break; |
3513 | case 7: /* refresh window */ |
3634 | case 7: /* refresh window */ |
3514 | scr_touch (true); |
3635 | scr_touch (true); |
3515 | break; |
3636 | break; |
3516 | case 8: /* set size (chars) */ |
3637 | case 8: /* set size (chars) */ |
3517 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3638 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3518 | (unsigned int) (args[1] * TermWin.fheight)); |
3639 | (unsigned int) (args[1] * fheight)); |
3519 | break; |
3640 | break; |
3520 | |
3641 | |
3521 | //case 9: NYI, TODO, restore maximized window or maximize window |
3642 | //case 9: NYI, TODO, restore maximized window or maximize window |
3522 | default: |
3643 | default: |
3523 | if (args[0] >= 24) /* set height (chars) */ |
3644 | if (args[0] >= 24) /* set height (chars) */ |
3524 | set_widthheight ((unsigned int)TermWin.width, |
3645 | set_widthheight ((unsigned int)width, |
3525 | (unsigned int) (args[1] * TermWin.fheight)); |
3646 | (unsigned int) (args[1] * fheight)); |
3526 | break; |
3647 | break; |
3527 | |
3648 | |
3528 | |
3649 | |
3529 | /* |
3650 | /* |
3530 | * reports - some output format copied from XTerm |
3651 | * reports - some output format copied from XTerm |
3531 | */ |
3652 | */ |
3532 | case 11: /* report window state */ |
3653 | case 11: /* report window state */ |
3533 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3654 | XGetWindowAttributes (disp, parent[0], &wattr); |
3534 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3655 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3535 | break; |
3656 | break; |
3536 | case 13: /* report window position */ |
3657 | case 13: /* report window position */ |
3537 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3658 | XGetWindowAttributes (disp, parent[0], &wattr); |
3538 | XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, |
3659 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3539 | -wattr.border_width, -wattr.border_width, |
3660 | -wattr.border_width, -wattr.border_width, |
3540 | &x, &y, &wdummy); |
3661 | &x, &y, &wdummy); |
3541 | tt_printf ("\033[3;%d;%dt", x, y); |
3662 | tt_printf ("\033[3;%d;%dt", x, y); |
3542 | break; |
3663 | break; |
3543 | case 14: /* report window size (pixels) */ |
3664 | case 14: /* report window size (pixels) */ |
3544 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3665 | XGetWindowAttributes (disp, parent[0], &wattr); |
3545 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3666 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3546 | break; |
3667 | break; |
3547 | case 18: /* report text area size (chars) */ |
3668 | case 18: /* report text area size (chars) */ |
3548 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3669 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3549 | break; |
3670 | break; |
3550 | case 19: /* report window size (chars) */ |
3671 | case 19: /* report window size (chars) */ |
3551 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3672 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3552 | break; |
3673 | break; |
3553 | case 20: /* report icon label */ |
3674 | case 20: /* report icon label */ |
3554 | { |
3675 | { |
3555 | char *s; |
3676 | char *s; |
3556 | XGetIconName (disp, TermWin.parent[0], &s); |
3677 | XGetIconName (disp, parent[0], &s); |
3557 | 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 */ |
3558 | XFree (s); |
3679 | XFree (s); |
3559 | } |
3680 | } |
3560 | break; |
3681 | break; |
3561 | case 21: /* report window title */ |
3682 | case 21: /* report window title */ |
3562 | { |
3683 | { |
3563 | char *s; |
3684 | char *s; |
3564 | XFetchName (disp, TermWin.parent[0], &s); |
3685 | XFetchName (disp, parent[0], &s); |
3565 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3686 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3566 | XFree (s); |
3687 | XFree (s); |
3567 | } |
3688 | } |
3568 | break; |
3689 | break; |
3569 | } |
3690 | } |
3570 | } |
3691 | } |
… | |
… | |
3573 | /*----------------------------------------------------------------------*/ |
3694 | /*----------------------------------------------------------------------*/ |
3574 | /* |
3695 | /* |
3575 | * get input up until STRING TERMINATOR (or BEL) |
3696 | * get input up until STRING TERMINATOR (or BEL) |
3576 | * ends_how is terminator used. returned input must be free()'d |
3697 | * ends_how is terminator used. returned input must be free()'d |
3577 | */ |
3698 | */ |
3578 | unsigned char * |
3699 | char * |
3579 | rxvt_term::get_to_st (unicode_t &ends_how) |
3700 | rxvt_term::get_to_st (unicode_t &ends_how) |
3580 | { |
3701 | { |
3581 | unicode_t ch; |
3702 | unicode_t ch; |
3582 | bool seen_esc = false; |
3703 | bool seen_esc = false; |
3583 | unsigned int n = 0; |
3704 | unsigned int n = 0; |
… | |
… | |
3616 | |
3737 | |
3617 | string[n++] = '\0'; |
3738 | string[n++] = '\0'; |
3618 | |
3739 | |
3619 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3740 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3620 | |
3741 | |
3621 | return (unsigned char *)rxvt_wcstombs (string); |
3742 | return rxvt_wcstombs (string); |
3622 | } |
3743 | } |
3623 | |
3744 | |
3624 | /*----------------------------------------------------------------------*/ |
3745 | /*----------------------------------------------------------------------*/ |
3625 | /* |
3746 | /* |
3626 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3747 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3627 | */ |
3748 | */ |
3628 | void |
3749 | void |
3629 | rxvt_term::process_dcs_seq () |
3750 | rxvt_term::process_dcs_seq () |
3630 | { |
3751 | { |
3631 | unsigned char *s; |
3752 | char *s; |
3632 | unicode_t eh; |
3753 | unicode_t eh; |
3633 | |
3754 | |
3634 | /* |
3755 | /* |
3635 | * Not handled yet |
3756 | * Not handled yet |
3636 | */ |
3757 | */ |
… | |
… | |
3655 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3776 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3656 | arg = arg * 10 + (ch - '0'); |
3777 | arg = arg * 10 + (ch - '0'); |
3657 | |
3778 | |
3658 | if (ch == ';') |
3779 | if (ch == ';') |
3659 | { |
3780 | { |
3660 | unsigned char *s = get_to_st (eh); |
3781 | char *s = get_to_st (eh); |
3661 | |
3782 | |
3662 | if (s) |
3783 | if (s) |
3663 | { |
3784 | { |
3664 | process_xterm_seq (arg, (char *)s, eh); |
3785 | process_xterm_seq (arg, s, eh); |
3665 | free (s); |
3786 | free (s); |
3666 | } |
3787 | } |
3667 | } |
3788 | } |
3668 | } |
3789 | } |
3669 | |
3790 | |
3670 | void |
3791 | void |
3671 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3792 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3672 | { |
3793 | { |
3673 | if (str[0] == '?' && !str[1]) |
3794 | if (str[0] == '?' && !str[1]) |
3674 | { |
3795 | { |
3675 | unsigned short r, g, b; |
3796 | unsigned short r, g, b; |
3676 | pix_colors_focused[color].get (display, r, g, b); |
3797 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3682 | |
3803 | |
3683 | /* |
3804 | /* |
3684 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3805 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3685 | */ |
3806 | */ |
3686 | void |
3807 | void |
3687 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3808 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3688 | { |
3809 | { |
3689 | int changed = 0; |
3810 | int changed = 0; |
3690 | int color; |
3811 | int color; |
3691 | char *buf, *name; |
3812 | char *buf, *name; |
3692 | bool query = str[0] == '?' && !str[1]; |
3813 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
3715 | unsigned long bytes_after; |
3836 | unsigned long bytes_after; |
3716 | unsigned char *value = 0; |
3837 | unsigned char *value = 0; |
3717 | const char *str = ""; |
3838 | const char *str = ""; |
3718 | |
3839 | |
3719 | if (prop |
3840 | if (prop |
3720 | && XGetWindowProperty (disp, TermWin.parent[0], |
3841 | && XGetWindowProperty (disp, parent[0], |
3721 | prop, 0, 1<<16, 0, AnyPropertyType, |
3842 | prop, 0, 1<<16, 0, AnyPropertyType, |
3722 | &actual_type, &actual_format, |
3843 | &actual_type, &actual_format, |
3723 | &nitems, &bytes_after, &value) == Success |
3844 | &nitems, &bytes_after, &value) == Success |
3724 | && actual_type != None |
3845 | && actual_type != None |
3725 | && actual_format == 8) |
3846 | && actual_format == 8) |
… | |
… | |
3737 | { |
3858 | { |
3738 | *eq = 0; |
3859 | *eq = 0; |
3739 | set_utf8_property (display->atom (str), eq + 1); |
3860 | set_utf8_property (display->atom (str), eq + 1); |
3740 | } |
3861 | } |
3741 | else |
3862 | else |
3742 | XDeleteProperty (disp, TermWin.parent[0], |
3863 | XDeleteProperty (disp, parent[0], |
3743 | display->atom (str)); |
3864 | display->atom (str)); |
3744 | } |
3865 | } |
3745 | break; |
3866 | break; |
3746 | |
3867 | |
3747 | case XTerm_Color: |
3868 | case XTerm_Color: |
… | |
… | |
3846 | // TODO, when secure mode? |
3967 | // TODO, when secure mode? |
3847 | break; |
3968 | break; |
3848 | |
3969 | |
3849 | #ifdef MENUBAR |
3970 | #ifdef MENUBAR |
3850 | case URxvt_Menu: |
3971 | case URxvt_Menu: |
3851 | if (options & Opt_insecure) |
3972 | if (OPTION (Opt_insecure)) |
3852 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3973 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3853 | break; |
3974 | break; |
3854 | #endif |
3975 | #endif |
3855 | #if 0 |
3976 | #if 0 |
3856 | case XTerm_dumpscreen: /* no error notices */ |
3977 | case XTerm_dumpscreen: /* no error notices */ |
… | |
… | |
3872 | case URxvt_italicFont: |
3993 | case URxvt_italicFont: |
3873 | case URxvt_boldItalicFont: |
3994 | case URxvt_boldItalicFont: |
3874 | #endif |
3995 | #endif |
3875 | if (query) |
3996 | if (query) |
3876 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3997 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3877 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3998 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3878 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3999 | ? fontset[op - URxvt_font]->fontdesc : "", |
3879 | resp); |
4000 | resp); |
3880 | else |
4001 | else |
3881 | { |
4002 | { |
3882 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
4003 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3883 | |
4004 | |
… | |
… | |
3888 | break; |
4009 | break; |
3889 | |
4010 | |
3890 | #if ENABLE_FRILLS |
4011 | #if ENABLE_FRILLS |
3891 | case URxvt_locale: |
4012 | case URxvt_locale: |
3892 | if (query) |
4013 | if (query) |
3893 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); |
4014 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3894 | else |
4015 | else |
3895 | { |
4016 | { |
3896 | set_locale (str); |
4017 | set_locale (str); |
3897 | pty.set_utf8_mode (enc_utf8); |
4018 | pty.set_utf8_mode (enc_utf8); |
3898 | init_xlocale (); |
4019 | init_xlocale (); |
3899 | } |
4020 | } |
3900 | break; |
4021 | break; |
3901 | |
4022 | |
3902 | case URxvt_view_up: |
4023 | case URxvt_view_up: |
3903 | case URxvt_view_down: |
4024 | case URxvt_view_down: |
|
|
4025 | { |
3904 | int lines = atoi (str); |
4026 | int lines = atoi (str); |
3905 | |
4027 | |
3906 | if (lines) |
4028 | if (lines) |
3907 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
4029 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3908 | else |
4030 | else |
3909 | { |
|
|
3910 | scr_erase_savelines (); |
4031 | scr_erase_savelines (); |
3911 | } |
4032 | } |
3912 | |
4033 | |
|
|
4034 | break; |
|
|
4035 | #endif |
|
|
4036 | |
|
|
4037 | #if ENABLE_PERL |
|
|
4038 | case URxvt_perl: |
|
|
4039 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
|
|
4040 | ; // no responses yet |
3913 | break; |
4041 | break; |
3914 | #endif |
4042 | #endif |
3915 | } |
4043 | } |
3916 | } |
4044 | } |
3917 | /*----------------------------------------------------------------------*/ |
4045 | /*----------------------------------------------------------------------*/ |
… | |
… | |
4026 | } |
4154 | } |
4027 | |
4155 | |
4028 | /* extra handling for values with state unkept */ |
4156 | /* extra handling for values with state unkept */ |
4029 | switch (arg[i]) |
4157 | switch (arg[i]) |
4030 | { |
4158 | { |
|
|
4159 | #if ENABLE_STYLES |
|
|
4160 | case 1021: |
|
|
4161 | set_option (Opt_intensityStyles, mode); |
|
|
4162 | |
|
|
4163 | scr_touch (true); |
|
|
4164 | break; |
|
|
4165 | #endif |
4031 | case 1048: /* alternative cursor save */ |
4166 | case 1048: /* alternative cursor save */ |
4032 | case 1049: |
4167 | case 1049: |
4033 | if (options & Opt_secondaryScreen) |
4168 | if (OPTION (Opt_secondaryScreen)) |
4034 | if (mode == 0) |
4169 | if (mode == 0) |
4035 | scr_cursor (RESTORE); |
4170 | scr_cursor (RESTORE); |
4036 | else if (mode == 1) |
4171 | else if (mode == 1) |
4037 | scr_cursor (SAVE); |
4172 | scr_cursor (SAVE); |
4038 | break; |
4173 | break; |
… | |
… | |
4050 | */ |
4185 | */ |
4051 | PrivMode (1, PrivMode_vt52); |
4186 | PrivMode (1, PrivMode_vt52); |
4052 | break; |
4187 | break; |
4053 | case 3: /* 80/132 */ |
4188 | case 3: /* 80/132 */ |
4054 | if (priv_modes & PrivMode_132OK) |
4189 | if (priv_modes & PrivMode_132OK) |
4055 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4190 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4056 | break; |
4191 | break; |
4057 | case 4: /* smooth scrolling */ |
4192 | case 4: /* smooth scrolling */ |
4058 | if (state) |
|
|
4059 | options &= ~Opt_jumpScroll; |
|
|
4060 | else |
|
|
4061 | options |= Opt_jumpScroll; |
4193 | set_option (Opt_jumpScroll, !state); |
4062 | break; |
4194 | break; |
4063 | case 5: /* reverse video */ |
4195 | case 5: /* reverse video */ |
4064 | scr_rvideo_mode (state); |
4196 | scr_rvideo_mode (state); |
4065 | break; |
4197 | break; |
4066 | case 6: /* relative/absolute origins */ |
4198 | case 6: /* relative/absolute origins */ |
… | |
… | |
4107 | #if 0 |
4239 | #if 0 |
4108 | case 1001: |
4240 | case 1001: |
4109 | break; /* X11 mouse highlighting */ |
4241 | break; /* X11 mouse highlighting */ |
4110 | #endif |
4242 | #endif |
4111 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4243 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4112 | if (state) |
|
|
4113 | options &= ~Opt_scrollTtyOutput; |
|
|
4114 | else |
|
|
4115 | options |= Opt_scrollTtyOutput; |
4244 | set_option (Opt_scrollTtyOutput, !state); |
4116 | break; |
4245 | break; |
4117 | case 1011: /* scroll to bottom on key press */ |
4246 | case 1011: /* scroll to bottom on key press */ |
4118 | if (state) |
|
|
4119 | options |= Opt_scrollTtyKeypress; |
4247 | set_option (Opt_scrollTtyKeypress, state); |
4120 | else |
|
|
4121 | options &= ~Opt_scrollTtyKeypress; |
|
|
4122 | break; |
4248 | break; |
4123 | case 1047: /* secondary screen w/ clearing last */ |
4249 | case 1047: /* secondary screen w/ clearing last */ |
4124 | if (options & Opt_secondaryScreen) |
4250 | if (OPTION (Opt_secondaryScreen)) |
4125 | if (current_screen != PRIMARY) |
4251 | if (current_screen != PRIMARY) |
4126 | scr_erase_screen (2); |
4252 | scr_erase_screen (2); |
4127 | scr_change_screen (state); |
4253 | scr_change_screen (state); |
4128 | break; |
4254 | break; |
4129 | case 1049: /* secondary screen w/ clearing first */ |
4255 | case 1049: /* secondary screen w/ clearing first */ |
4130 | scr_change_screen (state); |
4256 | scr_change_screen (state); |
4131 | if (options & Opt_secondaryScreen) |
4257 | if (OPTION (Opt_secondaryScreen)) |
4132 | if (current_screen != PRIMARY) |
4258 | if (current_screen != PRIMARY) |
4133 | scr_erase_screen (2); |
4259 | scr_erase_screen (2); |
4134 | break; |
4260 | break; |
4135 | default: |
4261 | default: |
4136 | break; |
4262 | break; |
… | |
… | |
4264 | scr_color (Color_bg, Color_bg); |
4390 | scr_color (Color_bg, Color_bg); |
4265 | break; |
4391 | break; |
4266 | |
4392 | |
4267 | //case 50: // not variable spacing |
4393 | //case 50: // not variable spacing |
4268 | |
4394 | |
4269 | #ifndef NO_BRIGHTCOLOR |
4395 | #if ENABLE_FRILLS |
4270 | case 90: |
4396 | case 90: |
4271 | case 91: /* set bright fg color */ |
4397 | case 91: /* set bright fg color */ |
4272 | case 92: |
4398 | case 92: |
4273 | case 93: |
4399 | case 93: |
4274 | case 94: |
4400 | case 94: |
… | |
… | |
4286 | case 106: |
4412 | case 106: |
4287 | case 107: |
4413 | case 107: |
4288 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4414 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4289 | break; |
4415 | break; |
4290 | #endif |
4416 | #endif |
4291 | |
|
|
4292 | } |
4417 | } |
4293 | } |
4418 | } |
4294 | } |
4419 | } |
4295 | /*}}} */ |
4420 | /*}}} */ |
4296 | |
4421 | |
… | |
… | |
4320 | */ |
4445 | */ |
4321 | void |
4446 | void |
4322 | rxvt_term::tt_printf (const char *fmt,...) |
4447 | rxvt_term::tt_printf (const char *fmt,...) |
4323 | { |
4448 | { |
4324 | va_list arg_ptr; |
4449 | va_list arg_ptr; |
4325 | unsigned char buf[256]; |
4450 | char buf[256]; |
4326 | |
4451 | |
4327 | va_start (arg_ptr, fmt); |
4452 | va_start (arg_ptr, fmt); |
4328 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4453 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4329 | va_end (arg_ptr); |
4454 | va_end (arg_ptr); |
4330 | tt_write (buf, strlen (buf)); |
4455 | tt_write (buf, strlen (buf)); |
… | |
… | |
4335 | * or generated by us in response to a query ESC sequence. |
4460 | * or generated by us in response to a query ESC sequence. |
4336 | */ |
4461 | */ |
4337 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4462 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4338 | |
4463 | |
4339 | void |
4464 | void |
4340 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4465 | rxvt_term::tt_write (const char *data, unsigned int len) |
4341 | { |
4466 | { |
|
|
4467 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4468 | return; |
|
|
4469 | |
|
|
4470 | if (pty.pty < 0) |
|
|
4471 | return; |
|
|
4472 | |
4342 | if (v_buflen == 0) |
4473 | if (v_buflen == 0) |
4343 | { |
4474 | { |
4344 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4475 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4345 | |
4476 | |
4346 | if ((unsigned int)written == len) |
4477 | if ((unsigned int)written == len) |
… | |
… | |
4348 | |
4479 | |
4349 | data += written; |
4480 | data += written; |
4350 | len -= written; |
4481 | len -= written; |
4351 | } |
4482 | } |
4352 | |
4483 | |
4353 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4484 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4354 | |
4485 | |
4355 | memcpy (v_buffer + v_buflen, data, len); |
4486 | memcpy (v_buffer + v_buflen, data, len); |
4356 | v_buflen += len; |
4487 | v_buflen += len; |
4357 | |
4488 | |
4358 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4489 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
… | |
… | |
4377 | } |
4508 | } |
4378 | |
4509 | |
4379 | memmove (v_buffer, v_buffer + written, v_buflen); |
4510 | memmove (v_buffer, v_buffer + written, v_buflen); |
4380 | } |
4511 | } |
4381 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4512 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4382 | // original code just ignores this... |
4513 | pty_ev.set (EVENT_READ); |
4383 | destroy (); |
|
|
4384 | } |
4514 | } |
4385 | |
4515 | |
4386 | /*----------------------- end-of-file (C source) -----------------------*/ |
4516 | /*----------------------- end-of-file (C source) -----------------------*/ |
4387 | |
4517 | |