… | |
… | |
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-2004 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 | |
… | |
… | |
117 | XK_Escape, 0x238b, |
123 | XK_Escape, 0x238b, |
118 | XK_Undo, 0x238c, |
124 | XK_Undo, 0x238c, |
119 | XK_Print, 0x2399, |
125 | XK_Print, 0x2399, |
120 | |
126 | |
121 | XK_space, 0x2423, |
127 | XK_space, 0x2423, |
|
|
128 | |
|
|
129 | #ifdef XK_KP_Begin |
|
|
130 | XK_KP_Prior, 0x21de, |
|
|
131 | XK_KP_Next, 0x21df, |
|
|
132 | XK_KP_Begin, 0x2320, |
|
|
133 | XK_KP_Insert, 0x2380, |
|
|
134 | XK_KP_Delete, 0x2326, |
122 | XK_KP_Space, 0x2422, |
135 | XK_KP_Space, 0x2422, |
|
|
136 | #endif |
123 | 0, |
137 | 0, |
124 | }; |
138 | }; |
125 | |
139 | |
126 | void |
140 | void |
127 | rxvt_term::iso14755_54 (int x, int y) |
141 | rxvt_term::iso14755_54 (int x, int y) |
128 | { |
142 | { |
129 | x = Pixel2Col (x); |
143 | x = Pixel2Col (x); |
130 | y = Pixel2Row (y); |
144 | y = Pixel2Row (y); |
131 | |
145 | |
132 | if (x < 0 || x >= TermWin.ncol |
146 | if (!IN_RANGE_EXC (x, 0, ncol) |
133 | || y < 0 || y >= TermWin.nrow) |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
134 | return; |
148 | return; |
135 | |
149 | |
136 | for (;;) |
150 | for (;;) |
137 | { |
151 | { |
138 | 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]; |
139 | |
155 | |
140 | if (t != NOCHAR || !x) |
156 | if (t != NOCHAR || !x) |
141 | { |
157 | { |
142 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
158 | iso14755_51 (l.t[x], l.r[x], x, y); |
143 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
144 | iso14755buf = ISO_14755_54; |
159 | iso14755buf = ISO_14755_54; |
145 | break; |
160 | break; |
146 | } |
161 | } |
147 | |
162 | |
148 | x--; |
163 | x--; |
149 | } |
164 | } |
150 | |
|
|
151 | } |
165 | } |
152 | #endif |
|
|
153 | |
166 | |
154 | #if ENABLE_OVERLAY |
|
|
155 | void |
167 | void |
156 | 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) |
157 | { |
169 | { |
158 | rxvt_fontset *fs = FONTSET (r); |
170 | rxvt_fontset *fs = FONTSET (r); |
159 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
171 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
160 | wchar_t *chr, *alloc, ch2; |
172 | wchar_t *chr, *alloc, ch2, *fname; |
161 | int len; |
173 | int len; |
162 | |
174 | |
|
|
175 | fname = rxvt_utf8towcs (f->name); |
|
|
176 | |
163 | #if ENABLE_COMBINING |
177 | # if ENABLE_COMBINING |
164 | if (IS_COMPOSE (ch)) |
178 | if (IS_COMPOSE (ch)) |
165 | { |
179 | { |
166 | len = rxvt_composite.expand (ch, 0); |
180 | len = rxvt_composite.expand (ch, 0); |
167 | alloc = chr = new wchar_t[len]; |
181 | alloc = chr = new wchar_t[len]; |
168 | rxvt_composite.expand (ch, chr); |
182 | rxvt_composite.expand (ch, chr); |
169 | } |
183 | } |
170 | else |
184 | else |
171 | #endif |
185 | # endif |
172 | { |
186 | { |
173 | ch2 = ch; |
187 | ch2 = ch; |
174 | |
188 | |
175 | alloc = 0; |
189 | alloc = 0; |
176 | chr = &ch2; |
190 | chr = &ch2; |
177 | len = 1; |
191 | len = 1; |
178 | } |
192 | } |
179 | |
193 | |
180 | int width = strlen (f->name); |
194 | char attr[80]; // plenty |
181 | |
195 | |
182 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
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 | |
|
|
206 | int width = wcswidth (fname, wcslen (fname)); |
|
|
207 | |
|
|
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); |
183 | |
218 | |
184 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
219 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
185 | |
220 | |
186 | for (int y = 0; y < len; y++) |
221 | for (int y = 0; y < len; y++) |
187 | { |
222 | { |
… | |
… | |
190 | ch = *chr++; |
225 | ch = *chr++; |
191 | |
226 | |
192 | sprintf (buf, "%8x", ch); |
227 | sprintf (buf, "%8x", ch); |
193 | scr_overlay_set (0, y, buf); |
228 | scr_overlay_set (0, y, buf); |
194 | scr_overlay_set (9, y, '='); |
229 | scr_overlay_set (9, y, '='); |
195 | #if !UNICODE3 |
230 | # if !UNICODE3 |
196 | if (ch >= 0x10000) |
231 | if (ch >= 0x10000) |
197 | ch = 0xfffd; |
232 | ch = 0xfffd; |
198 | #endif |
233 | # endif |
199 | scr_overlay_set (11, y, ch, r); |
234 | scr_overlay_set (11, y, ch, r); |
200 | scr_overlay_set (12, y, NOCHAR, r); |
235 | scr_overlay_set (12, y, NOCHAR, r); |
201 | } |
236 | } |
202 | |
237 | |
|
|
238 | scr_overlay_set (0, len , attr); |
203 | scr_overlay_set (0, len, f->name); |
239 | scr_overlay_set (0, len + 1, fname); |
204 | |
240 | |
|
|
241 | free (fname); |
|
|
242 | |
205 | #if ENABLE_COMBINING |
243 | # if ENABLE_COMBINING |
206 | if (alloc) |
244 | if (alloc) |
207 | delete [] alloc; |
245 | delete [] alloc; |
208 | #endif |
246 | # endif |
209 | } |
247 | } |
210 | #endif |
248 | #endif |
211 | |
249 | |
212 | void |
250 | void |
213 | rxvt_term::commit_iso14755 () |
251 | rxvt_term::commit_iso14755 () |
… | |
… | |
230 | mb[0] = ch[0]; |
268 | mb[0] = ch[0]; |
231 | len = 1; |
269 | len = 1; |
232 | } |
270 | } |
233 | |
271 | |
234 | if (len > 0) |
272 | if (len > 0) |
235 | tt_write ((unsigned char *)mb, len); |
273 | tt_write (mb, len); |
236 | else |
274 | else |
237 | scr_bell (); |
275 | scr_bell (); |
238 | } |
276 | } |
239 | |
277 | |
240 | iso14755buf = 0; |
278 | iso14755buf = 0; |
… | |
… | |
268 | KeySym keysym; |
306 | KeySym keysym; |
269 | #ifdef DEBUG_CMD |
307 | #ifdef DEBUG_CMD |
270 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
271 | #endif |
309 | #endif |
272 | int valid_keysym; |
310 | int valid_keysym; |
273 | unsigned char kbuf[KBUFSZ]; |
311 | char kbuf[KBUFSZ]; |
274 | |
312 | |
275 | /* |
313 | /* |
276 | * 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 |
277 | * escape sequence to toggle the Keypad. |
315 | * escape sequence to toggle the Keypad. |
278 | * |
316 | * |
279 | * Always permit `shift' to override the current setting |
317 | * Always permit `shift' to override the current setting |
280 | */ |
318 | */ |
281 | shft = (ev.state & ShiftMask); |
319 | shft = ev.state & ShiftMask; |
282 | ctrl = (ev.state & ControlMask); |
320 | ctrl = ev.state & ControlMask; |
283 | meta = (ev.state & ModMetaMask); |
321 | meta = ev.state & ModMetaMask; |
284 | |
322 | |
285 | if (numlock_state || (ev.state & ModNumLockMask)) |
323 | if (numlock_state || (ev.state & ModNumLockMask)) |
286 | { |
324 | { |
287 | numlock_state = (ev.state & ModNumLockMask); |
325 | numlock_state = (ev.state & ModNumLockMask); |
288 | PrivMode ((!numlock_state), PrivMode_aplKP); |
326 | PrivMode ((!numlock_state), PrivMode_aplKP); |
… | |
… | |
296 | Status status_return; |
334 | Status status_return; |
297 | |
335 | |
298 | #if 0 |
336 | #if 0 |
299 | #ifdef X_HAVE_UTF8_STRING |
337 | #ifdef X_HAVE_UTF8_STRING |
300 | 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 |
301 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
339 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
302 | KBUFSZ, &keysym, &status_return); |
340 | KBUFSZ, &keysym, &status_return); |
303 | else |
341 | else |
304 | #endif |
342 | #endif |
305 | #endif |
343 | #endif |
306 | { |
344 | { |
… | |
… | |
308 | |
346 | |
309 | // the XOpenIM manpage lies about hardcoding the locale |
347 | // the XOpenIM manpage lies about hardcoding the locale |
310 | // at the point of XOpenIM, so temporarily switch locales |
348 | // at the point of XOpenIM, so temporarily switch locales |
311 | if (rs[Rs_imLocale]) |
349 | if (rs[Rs_imLocale]) |
312 | SET_LOCALE (rs[Rs_imLocale]); |
350 | SET_LOCALE (rs[Rs_imLocale]); |
|
|
351 | |
313 | // assume wchar_t == unicode or better |
352 | // assume wchar_t == unicode or better |
314 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
353 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
315 | KBUFSZ, &keysym, &status_return); |
354 | KBUFSZ, &keysym, &status_return); |
|
|
355 | |
316 | if (rs[Rs_imLocale]) |
356 | if (rs[Rs_imLocale]) |
317 | SET_LOCALE (locale); |
357 | SET_LOCALE (locale); |
318 | |
358 | |
319 | if (status_return == XLookupChars |
359 | if (status_return == XLookupChars |
320 | || status_return == XLookupBoth) |
360 | || status_return == XLookupBoth) |
… | |
… | |
341 | || status_return == XLookupBoth; |
381 | || status_return == XLookupBoth; |
342 | } |
382 | } |
343 | else |
383 | else |
344 | #endif |
384 | #endif |
345 | { |
385 | { |
346 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
386 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
347 | valid_keysym = keysym != NoSymbol; |
387 | valid_keysym = keysym != NoSymbol; |
348 | } |
388 | } |
349 | |
389 | |
350 | if (valid_keysym) |
390 | if (valid_keysym) |
351 | { |
391 | { |
352 | #ifdef KEYSYM_RESOURCE |
392 | #ifdef KEYSYM_RESOURCE |
353 | if (keyboard->dispatch (this, keysym, ev.state)) |
393 | if (keyboard->dispatch (this, keysym, ev.state)) |
354 | return; |
394 | return; |
355 | #endif |
395 | #endif |
356 | |
396 | |
357 | if (TermWin.saveLines) |
397 | if (saveLines) |
358 | { |
398 | { |
359 | #ifdef UNSHIFTED_SCROLLKEYS |
399 | #ifdef UNSHIFTED_SCROLLKEYS |
360 | if (!ctrl && !meta) |
400 | if (!ctrl && !meta) |
361 | #else |
401 | #else |
362 | if (IS_SCROLL_MOD) |
402 | if (IS_SCROLL_MOD) |
363 | #endif |
403 | #endif |
364 | { |
404 | { |
365 | int lnsppg; |
405 | int lnsppg; |
366 | |
406 | |
367 | #ifdef PAGING_CONTEXT_LINES |
407 | #ifdef PAGING_CONTEXT_LINES |
368 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
408 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
369 | #else |
409 | #else |
370 | lnsppg = TermWin.nrow * 4 / 5; |
410 | lnsppg = nrow * 4 / 5; |
371 | #endif |
411 | #endif |
372 | if (keysym == XK_Prior) |
412 | if (keysym == XK_Prior) |
373 | { |
413 | { |
374 | scr_page (UP, lnsppg); |
414 | scr_page (UP, lnsppg); |
375 | return; |
415 | return; |
… | |
… | |
512 | else |
552 | else |
513 | strcpy (kbuf, key_backspace); |
553 | strcpy (kbuf, key_backspace); |
514 | break; |
554 | break; |
515 | #endif |
555 | #endif |
516 | #ifndef NO_DELETE_KEY |
556 | #ifndef NO_DELETE_KEY |
|
|
557 | # ifdef XK_KP_Prior |
|
|
558 | case XK_KP_Delete: |
|
|
559 | /* allow shift to override */ |
|
|
560 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
561 | { |
|
|
562 | strcpy (kbuf, "\033On"); |
|
|
563 | break; |
|
|
564 | } |
|
|
565 | /* FALLTHROUGH */ |
|
|
566 | # endif |
517 | case XK_Delete: |
567 | case XK_Delete: |
518 | strcpy (kbuf, key_delete); |
568 | strcpy (kbuf, key_delete); |
519 | break; |
569 | break; |
520 | #endif |
570 | #endif |
521 | case XK_Tab: |
571 | case XK_Tab: |
… | |
… | |
624 | #ifdef XK_KP_Begin |
674 | #ifdef XK_KP_Begin |
625 | case XK_KP_Begin: |
675 | case XK_KP_Begin: |
626 | strcpy (kbuf, "\033Ou"); |
676 | strcpy (kbuf, "\033Ou"); |
627 | break; |
677 | break; |
628 | |
678 | |
629 | case XK_KP_Insert: |
|
|
630 | strcpy (kbuf, "\033Op"); |
|
|
631 | break; |
|
|
632 | |
|
|
633 | case XK_KP_Delete: |
|
|
634 | strcpy (kbuf, "\033On"); |
|
|
635 | break; |
|
|
636 | #endif |
679 | #endif |
637 | case XK_KP_F1: /* "\033OP" */ |
680 | case XK_KP_F1: /* "\033OP" */ |
638 | case XK_KP_F2: /* "\033OQ" */ |
681 | case XK_KP_F2: /* "\033OQ" */ |
639 | case XK_KP_F3: /* "\033OR" */ |
682 | case XK_KP_F3: /* "\033OR" */ |
640 | case XK_KP_F4: /* "\033OS" */ |
683 | case XK_KP_F4: /* "\033OS" */ |
… | |
… | |
672 | break; |
715 | break; |
673 | |
716 | |
674 | case XK_Find: |
717 | case XK_Find: |
675 | strcpy (kbuf, "\033[1~"); |
718 | strcpy (kbuf, "\033[1~"); |
676 | break; |
719 | break; |
|
|
720 | |
|
|
721 | #ifdef XK_KP_End |
|
|
722 | case XK_KP_Insert: |
|
|
723 | /* allow shift to override */ |
|
|
724 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
725 | { |
|
|
726 | strcpy (kbuf, "\033Op"); |
|
|
727 | break; |
|
|
728 | } |
|
|
729 | /* FALLTHROUGH */ |
|
|
730 | #endif |
677 | case XK_Insert: |
731 | case XK_Insert: |
678 | strcpy (kbuf, "\033[2~"); |
732 | strcpy (kbuf, "\033[2~"); |
679 | break; |
733 | break; |
680 | #ifdef DXK_Remove /* support for DEC remove like key */ |
734 | #ifdef DXK_Remove /* support for DEC remove like key */ |
681 | case DXK_Remove: |
735 | case DXK_Remove: |
… | |
… | |
801 | { |
855 | { |
802 | #ifdef META8_OPTION |
856 | #ifdef META8_OPTION |
803 | /* set 8-bit on */ |
857 | /* set 8-bit on */ |
804 | if (meta && (meta_char == 0x80)) |
858 | if (meta && (meta_char == 0x80)) |
805 | { |
859 | { |
806 | unsigned char *ch; |
860 | char *ch; |
807 | |
861 | |
808 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
809 | *ch |= 0x80; |
863 | *ch |= 0x80; |
810 | |
864 | |
811 | meta = 0; |
865 | meta = 0; |
… | |
… | |
813 | #endif |
867 | #endif |
814 | /* nil */ ; |
868 | /* nil */ ; |
815 | } |
869 | } |
816 | } |
870 | } |
817 | |
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 | |
818 | if (len <= 0) |
875 | if (len <= 0) |
819 | return; /* not mapped */ |
876 | return; /* not mapped */ |
820 | |
877 | |
821 | if (options & Opt_scrollTtyKeypress) |
878 | if (OPTION (Opt_scrollTtyKeypress)) |
822 | if (TermWin.view_start) |
879 | if (view_start) |
823 | { |
880 | { |
824 | TermWin.view_start = 0; |
881 | view_start = 0; |
825 | want_refresh = 1; |
882 | want_refresh = 1; |
826 | } |
883 | } |
827 | |
884 | |
828 | /* |
885 | /* |
829 | * these modifications only affect the static keybuffer |
886 | * these modifications only affect the static keybuffer |
… | |
… | |
844 | #ifdef META8_OPTION |
901 | #ifdef META8_OPTION |
845 | && meta_char == C0_ESC |
902 | && meta_char == C0_ESC |
846 | #endif |
903 | #endif |
847 | ) |
904 | ) |
848 | { |
905 | { |
849 | const unsigned char ch = C0_ESC; |
906 | const char ch = C0_ESC; |
850 | tt_write (&ch, 1); |
907 | tt_write (&ch, 1); |
851 | } |
908 | } |
852 | |
909 | |
853 | #if defined(DEBUG_CMD) |
910 | #if defined(DEBUG_CMD) |
854 | /* Display keyboard buffer contents */ |
911 | /* Display keyboard buffer contents */ |
… | |
… | |
866 | |
923 | |
867 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
924 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
868 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
925 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
869 | /* attempt to `write' count to the input buffer */ |
926 | /* attempt to `write' count to the input buffer */ |
870 | unsigned int |
927 | unsigned int |
871 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
928 | rxvt_term::cmd_write (const char *str, unsigned int count) |
872 | { |
929 | { |
873 | unsigned int n, s; |
930 | unsigned int n, s; |
874 | |
931 | |
875 | n = cmdbuf_ptr - cmdbuf_base; |
932 | n = cmdbuf_ptr - cmdbuf_base; |
876 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
933 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
913 | } |
970 | } |
914 | #endif |
971 | #endif |
915 | |
972 | |
916 | if (want_refresh) |
973 | if (want_refresh) |
917 | { |
974 | { |
|
|
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
|
|
976 | { |
|
|
977 | int row = view_start; |
|
|
978 | int end_row = row + nrow; |
|
|
979 | |
|
|
980 | while (row > top_row && ROW (row - 1).is_longer ()) |
|
|
981 | --row; |
|
|
982 | |
|
|
983 | do |
|
|
984 | { |
|
|
985 | int start_row = row; |
|
|
986 | line_t *l; |
|
|
987 | |
|
|
988 | do |
|
|
989 | { |
|
|
990 | l = &ROW (row++); |
|
|
991 | |
|
|
992 | if (!(l->f & LINE_FILTERED)) |
|
|
993 | { |
|
|
994 | // line not filtered, mark it as filtered |
|
|
995 | l->f |= LINE_FILTERED; |
|
|
996 | while (l->is_longer ()) |
|
|
997 | { |
|
|
998 | l = &ROW (row++); |
|
|
999 | l->f |= LINE_FILTERED; |
|
|
1000 | } |
|
|
1001 | |
|
|
1002 | // and filter it |
|
|
1003 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1004 | |
|
|
1005 | break; |
|
|
1006 | } |
|
|
1007 | } |
|
|
1008 | while (l->is_longer () && row < end_row); |
|
|
1009 | } |
|
|
1010 | while (row < end_row); |
|
|
1011 | } |
|
|
1012 | |
918 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
919 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
920 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
921 | IMSendSpot (); |
1016 | IMSendSpot (); |
922 | #endif |
1017 | #endif |
… | |
… | |
932 | SET_LOCALE (locale); |
1027 | SET_LOCALE (locale); |
933 | |
1028 | |
934 | display->flush (); |
1029 | display->flush (); |
935 | |
1030 | |
936 | if (want_refresh && !flush_ev.active) |
1031 | if (want_refresh && !flush_ev.active) |
937 | flush_ev.start (NOW + 0.01); |
1032 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
938 | } |
1033 | } |
939 | |
1034 | |
940 | void |
1035 | void |
941 | rxvt_term::flush_cb (time_watcher &w) |
1036 | rxvt_term::flush_cb (time_watcher &w) |
942 | { |
1037 | { |
… | |
… | |
1006 | { |
1101 | { |
1007 | if (mouse_slip_wheel_speed == 0 |
1102 | if (mouse_slip_wheel_speed == 0 |
1008 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1103 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1009 | : scr_page (UP, mouse_slip_wheel_speed)) |
1104 | : scr_page (UP, mouse_slip_wheel_speed)) |
1010 | { |
1105 | { |
1011 | if (TermWin.view_start == TermWin.nscrolled || |
1106 | if (view_start == top_row || view_start == 0) |
1012 | TermWin.view_start == 0) |
|
|
1013 | mouse_slip_wheel_speed = 0; |
1107 | mouse_slip_wheel_speed = 0; |
1014 | |
1108 | |
1015 | refresh_type |= SMOOTH_REFRESH; |
1109 | refresh_type |= SMOOTH_REFRESH; |
1016 | want_refresh = 1; |
1110 | want_refresh = 1; |
1017 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1111 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1018 | } |
1112 | } |
1019 | } |
1113 | } |
1020 | #endif |
1114 | #endif |
1021 | |
1115 | |
|
|
1116 | #if HAVE_SCHED_YIELD |
|
|
1117 | static struct event_handler |
|
|
1118 | { |
|
|
1119 | check_watcher cw_yield; |
|
|
1120 | |
|
|
1121 | void yield (check_watcher &w) |
|
|
1122 | { |
|
|
1123 | sched_yield (); |
|
|
1124 | w.stop (); |
|
|
1125 | } |
|
|
1126 | |
|
|
1127 | event_handler () |
|
|
1128 | : cw_yield (this, &event_handler::yield) |
|
|
1129 | { |
|
|
1130 | } |
|
|
1131 | } event_handler; |
|
|
1132 | #endif |
|
|
1133 | |
1022 | bool |
1134 | bool |
1023 | rxvt_term::pty_fill () |
1135 | rxvt_term::pty_fill () |
1024 | { |
1136 | { |
1025 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1137 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1026 | |
1138 | |
1027 | if (CBUFSIZ == n) |
1139 | if (CBUFSIZ == n) |
1028 | { |
1140 | { |
1029 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1141 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1030 | n = 0; |
1142 | n = 0; |
1031 | } |
1143 | } |
1032 | |
1144 | |
1033 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1145 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1034 | cmdbuf_ptr = cmdbuf_base; |
1146 | cmdbuf_ptr = cmdbuf_base; |
1035 | cmdbuf_endp = cmdbuf_ptr + n; |
1147 | cmdbuf_endp = cmdbuf_ptr + n; |
1036 | |
1148 | |
1037 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1149 | ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1038 | |
1150 | |
1039 | if (n > 0) |
1151 | if (r > 0) |
1040 | { |
1152 | { |
1041 | cmdbuf_endp += n; |
1153 | cmdbuf_endp += r; |
1042 | return true; |
1154 | return true; |
1043 | } |
1155 | } |
1044 | else if (n < 0 && errno != EAGAIN) |
1156 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1157 | { |
|
|
1158 | #if HAVE_SCHED_YIELD |
|
|
1159 | if (display->is_local) |
|
|
1160 | event_handler.cw_yield.start (); |
|
|
1161 | #endif |
|
|
1162 | } |
|
|
1163 | else |
|
|
1164 | { |
|
|
1165 | pty_ev.stop (); |
|
|
1166 | |
|
|
1167 | if (!OPTION (Opt_hold)) |
1045 | destroy (); |
1168 | destroy (); |
|
|
1169 | } |
1046 | |
1170 | |
1047 | return false; |
1171 | return false; |
1048 | } |
1172 | } |
1049 | |
1173 | |
1050 | void |
1174 | void |
… | |
… | |
1064 | } |
1188 | } |
1065 | |
1189 | |
1066 | void |
1190 | void |
1067 | rxvt_term::pointer_unblank () |
1191 | rxvt_term::pointer_unblank () |
1068 | { |
1192 | { |
1069 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1193 | XDefineCursor (display->display, vt, TermWin_cursor); |
1070 | recolour_cursor (); |
1194 | recolour_cursor (); |
1071 | |
1195 | |
1072 | #ifdef POINTER_BLANK |
1196 | #ifdef POINTER_BLANK |
1073 | hidden_pointer = 0; |
1197 | hidden_pointer = 0; |
1074 | |
1198 | |
1075 | if (options & Opt_pointerBlank) |
1199 | if (OPTION (Opt_pointerBlank)) |
1076 | pointer_ev.start (NOW + pointerBlankDelay); |
1200 | pointer_ev.start (NOW + pointerBlankDelay); |
1077 | #endif |
1201 | #endif |
1078 | } |
1202 | } |
1079 | |
1203 | |
1080 | #ifdef POINTER_BLANK |
1204 | #ifdef POINTER_BLANK |
1081 | void |
1205 | void |
1082 | rxvt_term::pointer_blank () |
1206 | rxvt_term::pointer_blank () |
1083 | { |
1207 | { |
1084 | if (! (options & Opt_pointerBlank)) |
1208 | if (!OPTION (Opt_pointerBlank)) |
1085 | return; |
1209 | return; |
1086 | |
1210 | |
1087 | XDefineCursor (display->display, TermWin.vt, display->blank_cursor); |
1211 | XDefineCursor (display->display, vt, display->blank_cursor); |
1088 | XFlush (display->display); |
1212 | XFlush (display->display); |
1089 | |
1213 | |
1090 | hidden_pointer = 1; |
1214 | hidden_pointer = 1; |
1091 | } |
1215 | } |
1092 | |
1216 | |
… | |
… | |
1186 | dDisp; |
1310 | dDisp; |
1187 | |
1311 | |
1188 | SET_R (this); |
1312 | SET_R (this); |
1189 | SET_LOCALE (locale); |
1313 | SET_LOCALE (locale); |
1190 | |
1314 | |
1191 | #if defined(CURSOR_BLINK) |
1315 | if (ev.xany.window == vt |
1192 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
1316 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1193 | { |
1317 | return; |
1194 | if (hidden_cursor) |
|
|
1195 | { |
|
|
1196 | hidden_cursor = 0; |
|
|
1197 | want_refresh = 1; |
|
|
1198 | } |
|
|
1199 | |
1318 | |
1200 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1319 | // for XQueryPointer |
1201 | } |
|
|
1202 | #endif |
|
|
1203 | |
|
|
1204 | #if defined(POINTER_BLANK) |
|
|
1205 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1206 | { |
|
|
1207 | if (ev.type == MotionNotify |
|
|
1208 | || ev.type == ButtonPress |
|
|
1209 | || ev.type == ButtonRelease) |
|
|
1210 | if (hidden_pointer) |
|
|
1211 | pointer_unblank (); |
|
|
1212 | |
|
|
1213 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1214 | pointer_blank (); |
|
|
1215 | } |
|
|
1216 | #endif |
|
|
1217 | |
|
|
1218 | Window unused_root, unused_child; |
1320 | Window unused_root, unused_child; |
1219 | int unused_root_x, unused_root_y; |
1321 | int unused_root_x, unused_root_y; |
1220 | unsigned int unused_mask; |
1322 | unsigned int unused_mask; |
1221 | |
1323 | |
1222 | switch (ev.type) |
1324 | switch (ev.type) |
… | |
… | |
1229 | |
1331 | |
1230 | break; |
1332 | break; |
1231 | |
1333 | |
1232 | case KeyRelease: |
1334 | case KeyRelease: |
1233 | { |
1335 | { |
1234 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1336 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1235 | KeySym ks; |
1337 | KeySym keysym; |
1236 | |
1338 | |
1237 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1339 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1238 | #endif |
1340 | #endif |
1239 | |
1341 | |
1240 | #if ENABLE_FRILLS || ISO_14755 |
1342 | #if ENABLE_FRILLS || ISO_14755 |
1241 | // ISO 14755 support |
1343 | // ISO 14755 support |
1242 | if (iso14755buf) |
1344 | if (iso14755buf) |
… | |
… | |
1247 | # endif |
1349 | # endif |
1248 | # if ISO_14755 |
1350 | # if ISO_14755 |
1249 | // iso14755 part 5.2 handling: release time |
1351 | // iso14755 part 5.2 handling: release time |
1250 | // first: controls |
1352 | // first: controls |
1251 | if ((ev.xkey.state & ControlMask) |
1353 | if ((ev.xkey.state & ControlMask) |
1252 | && ((ks >= 0x40 && ks <= 0x5f) |
1354 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1253 | || (ks >= 0x61 && ks <= 0x7f))) |
1355 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1254 | { |
1356 | { |
1255 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1357 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1256 | commit_iso14755 (); |
1358 | commit_iso14755 (); |
1257 | return; // case-break; |
1359 | goto skip_switch; |
1258 | } |
1360 | } |
1259 | |
1361 | |
1260 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1362 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1261 | if (i[0] == ks) |
1363 | if (i[0] == keysym) |
1262 | { |
1364 | { |
1263 | iso14755buf = ISO_14755_51 | i[1]; |
1365 | iso14755buf = ISO_14755_51 | i[1]; |
1264 | commit_iso14755 (); |
1366 | commit_iso14755 (); |
1265 | return; // case-break; |
1367 | goto skip_switch; |
1266 | } |
1368 | } |
1267 | |
1369 | |
1268 | scr_bell (); |
1370 | scr_bell (); |
1269 | # endif |
1371 | # endif |
1270 | iso14755buf = 0; |
1372 | iso14755buf = 0; |
… | |
… | |
1289 | else |
1391 | else |
1290 | iso14755buf = 0; |
1392 | iso14755buf = 0; |
1291 | } |
1393 | } |
1292 | #endif |
1394 | #endif |
1293 | |
1395 | |
|
|
1396 | if (ev.xany.window == vt |
|
|
1397 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1398 | break; |
|
|
1399 | |
1294 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1400 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1295 | if (!(ev.xkey.state & ControlMask)) |
1401 | if (!(ev.xkey.state & ControlMask)) |
1296 | slip_wheel_ev.stop (); |
1402 | slip_wheel_ev.stop (); |
1297 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1403 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1298 | mouse_slip_wheel_speed = 0; |
1404 | mouse_slip_wheel_speed = 0; |
1299 | #endif |
1405 | #endif |
1300 | break; |
1406 | break; |
1301 | } |
1407 | } |
1302 | |
1408 | |
… | |
… | |
1308 | button_release (ev.xbutton); |
1414 | button_release (ev.xbutton); |
1309 | break; |
1415 | break; |
1310 | |
1416 | |
1311 | case ClientMessage: |
1417 | case ClientMessage: |
1312 | if (ev.xclient.format == 32 |
1418 | if (ev.xclient.format == 32 |
|
|
1419 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1420 | { |
1313 | && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) |
1421 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1314 | destroy (); |
1422 | destroy (); |
|
|
1423 | #if ENABLE_EWMH |
|
|
1424 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
|
|
1425 | XSendEvent (disp, ev.xclient.window = display->root, |
|
|
1426 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
|
|
1427 | &ev); |
|
|
1428 | #endif |
|
|
1429 | } |
|
|
1430 | #if ENABLE_XEMBED |
|
|
1431 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1432 | { |
|
|
1433 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1434 | focus_in (); |
|
|
1435 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1436 | focus_out (); |
|
|
1437 | } |
|
|
1438 | #endif |
1315 | #ifdef OFFIX_DND |
1439 | #ifdef OFFIX_DND |
1316 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1440 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1317 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1441 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1318 | && (ev.xclient.data.l[0] == DndFile |
1442 | && (ev.xclient.data.l[0] == DndFile |
1319 | || ev.xclient.data.l[0] == DndDir |
1443 | || ev.xclient.data.l[0] == DndDir |
1320 | || ev.xclient.data.l[0] == DndLink)) |
1444 | || ev.xclient.data.l[0] == DndLink)) |
1321 | { |
1445 | { |
1322 | /* Get Dnd data */ |
1446 | /* Get Dnd data */ |
1323 | Atom ActualType; |
1447 | Atom ActualType; |
1324 | int ActualFormat; |
1448 | int ActualFormat; |
1325 | unsigned char *data; |
1449 | unsigned char *data; |
… | |
… | |
1368 | break; |
1492 | break; |
1369 | } |
1493 | } |
1370 | break; |
1494 | break; |
1371 | |
1495 | |
1372 | case FocusIn: |
1496 | case FocusIn: |
1373 | if (!TermWin.focus) |
1497 | focus_in (); |
|
|
1498 | break; |
|
|
1499 | |
|
|
1500 | case FocusOut: |
|
|
1501 | focus_out (); |
|
|
1502 | break; |
|
|
1503 | |
|
|
1504 | case ConfigureNotify: |
|
|
1505 | if (ev.xconfigure.window == parent[0]) |
1374 | { |
1506 | { |
1375 | TermWin.focus = 1; |
|
|
1376 | want_refresh = 1; |
|
|
1377 | #ifdef USE_XIM |
|
|
1378 | if (Input_Context != NULL) |
|
|
1379 | { |
|
|
1380 | IMSetStatusPosition (); |
|
|
1381 | XSetICFocus (Input_Context); |
|
|
1382 | } |
|
|
1383 | #endif |
|
|
1384 | #ifdef CURSOR_BLINK |
|
|
1385 | if (options & Opt_cursorBlink) |
|
|
1386 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1387 | #endif |
|
|
1388 | #ifdef OFF_FOCUS_FADING |
|
|
1389 | if (rs[Rs_fade]) |
|
|
1390 | { |
|
|
1391 | pix_colors = pix_colors_focused; |
|
|
1392 | scr_recolour (); |
|
|
1393 | } |
|
|
1394 | #endif |
|
|
1395 | |
|
|
1396 | } |
|
|
1397 | break; |
|
|
1398 | |
|
|
1399 | case FocusOut: |
|
|
1400 | if (TermWin.focus) |
|
|
1401 | { |
|
|
1402 | TermWin.focus = 0; |
|
|
1403 | want_refresh = 1; |
|
|
1404 | |
|
|
1405 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1406 | iso14755buf = 0; |
|
|
1407 | #endif |
|
|
1408 | #if ENABLE_OVERLAY |
|
|
1409 | scr_overlay_off (); |
|
|
1410 | #endif |
|
|
1411 | #ifdef USE_XIM |
|
|
1412 | if (Input_Context != NULL) |
|
|
1413 | XUnsetICFocus (Input_Context); |
|
|
1414 | #endif |
|
|
1415 | #ifdef CURSOR_BLINK |
|
|
1416 | if (options & Opt_cursorBlink) |
|
|
1417 | cursor_blink_ev.stop (); |
|
|
1418 | hidden_cursor = 0; |
|
|
1419 | #endif |
|
|
1420 | #ifdef OFF_FOCUS_FADING |
|
|
1421 | if (rs[Rs_fade]) |
|
|
1422 | { |
|
|
1423 | pix_colors = pix_colors_unfocused; |
|
|
1424 | scr_recolour (); |
|
|
1425 | } |
|
|
1426 | #endif |
|
|
1427 | } |
|
|
1428 | break; |
|
|
1429 | |
|
|
1430 | case ConfigureNotify: |
|
|
1431 | if (ev.xconfigure.window == TermWin.parent[0]) |
|
|
1432 | { |
|
|
1433 | int height, width; |
|
|
1434 | |
|
|
1435 | do |
|
|
1436 | { /* Wrap lots of configures into one */ |
|
|
1437 | width = ev.xconfigure.width; |
|
|
1438 | height = ev.xconfigure.height; |
|
|
1439 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
|
|
1440 | } |
|
|
1441 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); |
1507 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1508 | ; |
1442 | |
1509 | |
1443 | if (szHint.width != width || szHint.height != height) |
1510 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1444 | { |
1511 | { |
1445 | seen_resize = 1; |
1512 | seen_resize = 1; |
1446 | resize_all_windows (width, height, 1); |
1513 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1447 | } |
1514 | } |
1448 | |
1515 | |
1449 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1516 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1450 | if (options & Opt_transparent) |
1517 | if (OPTION (Opt_transparent)) |
1451 | check_our_parents (); |
1518 | check_our_parents (); |
1452 | #endif |
1519 | #endif |
1453 | } |
1520 | } |
1454 | break; |
1521 | break; |
1455 | |
1522 | |
… | |
… | |
1471 | |
1538 | |
1472 | case SelectionRequest: |
1539 | case SelectionRequest: |
1473 | selection_send (ev.xselectionrequest); |
1540 | selection_send (ev.xselectionrequest); |
1474 | break; |
1541 | break; |
1475 | |
1542 | |
|
|
1543 | case MapNotify: |
|
|
1544 | mapped = 1; |
|
|
1545 | #ifdef TEXT_BLINK |
|
|
1546 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1547 | #endif |
|
|
1548 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1549 | break; |
|
|
1550 | |
1476 | case UnmapNotify: |
1551 | case UnmapNotify: |
1477 | TermWin.mapped = 0; |
1552 | mapped = 0; |
1478 | #ifdef TEXT_BLINK |
1553 | #ifdef TEXT_BLINK |
1479 | text_blink_ev.stop (); |
1554 | text_blink_ev.stop (); |
1480 | #endif |
1555 | #endif |
1481 | break; |
1556 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1482 | |
|
|
1483 | case MapNotify: |
|
|
1484 | TermWin.mapped = 1; |
|
|
1485 | #ifdef TEXT_BLINK |
|
|
1486 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1487 | #endif |
|
|
1488 | break; |
1557 | break; |
1489 | |
1558 | |
1490 | #ifdef TRANSPARENT |
1559 | #ifdef TRANSPARENT |
1491 | case ReparentNotify: |
1560 | case ReparentNotify: |
1492 | rootwin_cb (ev); |
1561 | rootwin_cb (ev); |
1493 | break; |
1562 | break; |
1494 | #endif /* TRANSPARENT */ |
1563 | #endif /* TRANSPARENT */ |
1495 | |
1564 | |
1496 | case GraphicsExpose: |
1565 | case GraphicsExpose: |
1497 | case Expose: |
1566 | case Expose: |
1498 | if (ev.xany.window == TermWin.vt) |
1567 | if (ev.xany.window == vt) |
1499 | { |
1568 | { |
1500 | do |
1569 | do |
1501 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1570 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1502 | ev.xexpose.width, ev.xexpose.height, False); |
1571 | ev.xexpose.width, ev.xexpose.height, False); |
1503 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); |
1572 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1504 | |
1573 | |
1505 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1574 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1506 | |
1575 | |
1507 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) |
1576 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1508 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1577 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1509 | ev.xexpose.width, ev.xexpose.height, False); |
1578 | ev.xexpose.width, ev.xexpose.height, False); |
1510 | |
1579 | |
1511 | scr_refresh (refresh_type); |
1580 | want_refresh = 1; |
1512 | } |
1581 | } |
1513 | else |
1582 | else |
1514 | { |
1583 | { |
1515 | XEvent unused_event; |
1584 | XEvent unused_event; |
1516 | |
1585 | |
… | |
… | |
1528 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1597 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1529 | menubar_expose (); |
1598 | menubar_expose (); |
1530 | #endif |
1599 | #endif |
1531 | |
1600 | |
1532 | #ifdef TRANSPARENT |
1601 | #ifdef TRANSPARENT |
1533 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1602 | if (am_transparent && ev.xany.window == parent[0]) |
1534 | XClearWindow (disp, ev.xany.window); |
1603 | XClearWindow (disp, ev.xany.window); |
1535 | #endif |
1604 | #endif |
1536 | } |
1605 | } |
1537 | break; |
1606 | break; |
1538 | |
1607 | |
… | |
… | |
1549 | } |
1618 | } |
1550 | #endif |
1619 | #endif |
1551 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1620 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1552 | break; |
1621 | break; |
1553 | |
1622 | |
1554 | if (ev.xany.window == TermWin.vt) |
1623 | if (ev.xany.window == vt) |
1555 | { |
1624 | { |
|
|
1625 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1626 | ; // nop |
1556 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1627 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1557 | { |
1628 | { |
1558 | while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) |
1629 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1559 | ; |
1630 | ; |
1560 | |
1631 | |
1561 | XQueryPointer (disp, TermWin.vt, |
1632 | XQueryPointer (disp, vt, |
1562 | &unused_root, &unused_child, |
1633 | &unused_root, &unused_child, |
1563 | &unused_root_x, &unused_root_y, |
1634 | &unused_root_x, &unused_root_y, |
1564 | &ev.xbutton.x, &ev.xbutton.y, |
1635 | &ev.xbutton.x, &ev.xbutton.y, |
1565 | &ev.xbutton.state); |
1636 | &ev.xbutton.state); |
1566 | #ifdef MOUSE_THRESHOLD |
1637 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1578 | #endif |
1649 | #endif |
1579 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1650 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1580 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1651 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1581 | |
1652 | |
1582 | #ifdef SELECTION_SCROLLING |
1653 | #ifdef SELECTION_SCROLLING |
1583 | if (ev.xbutton.y < TermWin.int_bwidth |
1654 | if (ev.xbutton.y < int_bwidth |
1584 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1655 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1585 | { |
1656 | { |
1586 | int dist; |
1657 | int dist; |
1587 | |
1658 | |
1588 | /* don't clobber the current delay if we are |
1659 | /* don't clobber the current delay if we are |
1589 | * already in the middle of scrolling. |
1660 | * already in the middle of scrolling. |
… | |
… | |
1597 | selection_save_x = ev.xbutton.x; |
1668 | selection_save_x = ev.xbutton.x; |
1598 | selection_save_y = ev.xbutton.y; |
1669 | selection_save_y = ev.xbutton.y; |
1599 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1670 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1600 | |
1671 | |
1601 | /* calc number of lines to scroll */ |
1672 | /* calc number of lines to scroll */ |
1602 | if (ev.xbutton.y < TermWin.int_bwidth) |
1673 | if (ev.xbutton.y < int_bwidth) |
1603 | { |
1674 | { |
1604 | scroll_selection_dir = UP; |
1675 | scroll_selection_dir = UP; |
1605 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1676 | dist = int_bwidth - ev.xbutton.y; |
1606 | } |
1677 | } |
1607 | else |
1678 | else |
1608 | { |
1679 | { |
1609 | scroll_selection_dir = DN; |
1680 | scroll_selection_dir = DN; |
1610 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1681 | dist = ev.xbutton.y - (int_bwidth + height); |
1611 | } |
1682 | } |
1612 | |
1683 | |
1613 | scroll_selection_lines = Pixel2Height (dist) |
1684 | scroll_selection_lines = Pixel2Height (dist) |
1614 | / SELECTION_SCROLL_LINE_SPEEDUP |
1685 | / SELECTION_SCROLL_LINE_SPEEDUP |
1615 | + 1; |
1686 | + 1; |
1616 | MIN_IT (scroll_selection_lines, |
1687 | min_it (scroll_selection_lines, |
1617 | SELECTION_SCROLL_MAX_LINES); |
1688 | SELECTION_SCROLL_MAX_LINES); |
1618 | } |
1689 | } |
1619 | else |
1690 | else |
1620 | { |
1691 | { |
1621 | /* we are within the text window, so we |
1692 | /* we are within the text window, so we |
… | |
… | |
1641 | &unused_root_x, &unused_root_y, |
1712 | &unused_root_x, &unused_root_y, |
1642 | &ev.xbutton.x, &ev.xbutton.y, |
1713 | &ev.xbutton.x, &ev.xbutton.y, |
1643 | &unused_mask); |
1714 | &unused_mask); |
1644 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1715 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1645 | scrollbar_size ()); |
1716 | scrollbar_size ()); |
1646 | scr_refresh (refresh_type); |
1717 | want_refresh = 1; |
1647 | refresh_limit = 0; |
1718 | refresh_limit = 0; |
1648 | scrollbar_show (1); |
1719 | scrollbar_show (1); |
1649 | } |
1720 | } |
1650 | break; |
1721 | break; |
|
|
1722 | } |
|
|
1723 | |
|
|
1724 | skip_switch: ; |
|
|
1725 | |
|
|
1726 | #if defined(CURSOR_BLINK) |
|
|
1727 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1728 | { |
|
|
1729 | if (hidden_cursor) |
|
|
1730 | { |
|
|
1731 | hidden_cursor = 0; |
|
|
1732 | want_refresh = 1; |
|
|
1733 | } |
|
|
1734 | |
|
|
1735 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1736 | } |
|
|
1737 | #endif |
|
|
1738 | |
|
|
1739 | #if defined(POINTER_BLANK) |
|
|
1740 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1741 | { |
|
|
1742 | if (ev.type == MotionNotify |
|
|
1743 | || ev.type == ButtonPress |
|
|
1744 | || ev.type == ButtonRelease) |
|
|
1745 | if (hidden_pointer) |
|
|
1746 | pointer_unblank (); |
|
|
1747 | |
|
|
1748 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1749 | pointer_blank (); |
|
|
1750 | } |
|
|
1751 | #endif |
|
|
1752 | } |
|
|
1753 | |
|
|
1754 | void |
|
|
1755 | rxvt_term::focus_in () |
|
|
1756 | { |
|
|
1757 | if (!focus) |
|
|
1758 | { |
|
|
1759 | focus = 1; |
|
|
1760 | want_refresh = 1; |
|
|
1761 | |
|
|
1762 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1763 | |
|
|
1764 | #if USE_XIM |
|
|
1765 | if (Input_Context != NULL) |
|
|
1766 | { |
|
|
1767 | IMSetStatusPosition (); |
|
|
1768 | XSetICFocus (Input_Context); |
|
|
1769 | } |
|
|
1770 | #endif |
|
|
1771 | #if CURSOR_BLINK |
|
|
1772 | if (OPTION (Opt_cursorBlink)) |
|
|
1773 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1774 | #endif |
|
|
1775 | #if OFF_FOCUS_FADING |
|
|
1776 | if (rs[Rs_fade]) |
|
|
1777 | { |
|
|
1778 | pix_colors = pix_colors_focused; |
|
|
1779 | scr_recolour (); |
|
|
1780 | } |
|
|
1781 | #endif |
|
|
1782 | } |
|
|
1783 | } |
|
|
1784 | |
|
|
1785 | void |
|
|
1786 | rxvt_term::focus_out () |
|
|
1787 | { |
|
|
1788 | if (focus) |
|
|
1789 | { |
|
|
1790 | focus = 0; |
|
|
1791 | want_refresh = 1; |
|
|
1792 | |
|
|
1793 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1794 | |
|
|
1795 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1796 | if (iso14755buf) |
|
|
1797 | { |
|
|
1798 | iso14755buf = 0; |
|
|
1799 | # if ENABLE_OVERLAY |
|
|
1800 | scr_overlay_off (); |
|
|
1801 | # endif |
|
|
1802 | } |
|
|
1803 | #endif |
|
|
1804 | #if USE_XIM |
|
|
1805 | if (Input_Context != NULL) |
|
|
1806 | XUnsetICFocus (Input_Context); |
|
|
1807 | #endif |
|
|
1808 | #if CURSOR_BLINK |
|
|
1809 | if (OPTION (Opt_cursorBlink)) |
|
|
1810 | cursor_blink_ev.stop (); |
|
|
1811 | hidden_cursor = 0; |
|
|
1812 | #endif |
|
|
1813 | #if OFF_FOCUS_FADING |
|
|
1814 | if (rs[Rs_fade]) |
|
|
1815 | { |
|
|
1816 | pix_colors = pix_colors_unfocused; |
|
|
1817 | scr_recolour (); |
|
|
1818 | } |
|
|
1819 | #endif |
1651 | } |
1820 | } |
1652 | } |
1821 | } |
1653 | |
1822 | |
1654 | #if TRANSPARENT |
1823 | #if TRANSPARENT |
1655 | void |
1824 | void |
… | |
… | |
1669 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1838 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1670 | return; |
1839 | return; |
1671 | |
1840 | |
1672 | /* FALLTHROUGH */ |
1841 | /* FALLTHROUGH */ |
1673 | case ReparentNotify: |
1842 | case ReparentNotify: |
1674 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1843 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1675 | want_refresh = want_full_refresh = 1; |
1844 | want_refresh = want_full_refresh = 1; |
1676 | break; |
1845 | break; |
1677 | } |
1846 | } |
1678 | } |
1847 | } |
1679 | #endif |
1848 | #endif |
… | |
… | |
1682 | rxvt_term::button_press (XButtonEvent &ev) |
1851 | rxvt_term::button_press (XButtonEvent &ev) |
1683 | { |
1852 | { |
1684 | int reportmode = 0, clickintime; |
1853 | int reportmode = 0, clickintime; |
1685 | |
1854 | |
1686 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1855 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1856 | |
1687 | if (!bypass_keystate) |
1857 | if (!bypass_keystate) |
1688 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1858 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1689 | |
1859 | |
1690 | /* |
1860 | /* |
1691 | * VT window processing of button press |
1861 | * VT window processing of button press |
1692 | */ |
1862 | */ |
1693 | if (ev.window == TermWin.vt) |
1863 | if (ev.window == vt) |
1694 | { |
1864 | { |
1695 | #if ISO_14755 |
1865 | #if ISO_14755 |
1696 | // 5.4 |
1866 | // 5.4 |
1697 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1867 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1698 | { |
1868 | { |
… | |
… | |
1711 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1881 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1712 | if (ev.button == MEvent.button && clickintime) |
1882 | if (ev.button == MEvent.button && clickintime) |
1713 | { |
1883 | { |
1714 | /* same button, within alloted time */ |
1884 | /* same button, within alloted time */ |
1715 | MEvent.clicks++; |
1885 | MEvent.clicks++; |
|
|
1886 | |
1716 | if (MEvent.clicks > 1) |
1887 | if (MEvent.clicks > 1) |
1717 | { |
1888 | { |
1718 | /* only report double clicks */ |
1889 | /* only report double clicks */ |
1719 | MEvent.clicks = 2; |
1890 | MEvent.clicks = 2; |
1720 | mouse_report (ev); |
1891 | mouse_report (ev); |
… | |
… | |
1740 | else |
1911 | else |
1741 | { |
1912 | { |
1742 | if (ev.button != MEvent.button) |
1913 | if (ev.button != MEvent.button) |
1743 | MEvent.clicks = 0; |
1914 | MEvent.clicks = 0; |
1744 | |
1915 | |
|
|
1916 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1745 | switch (ev.button) |
1917 | switch (ev.button) |
1746 | { |
1918 | { |
1747 | case Button1: |
1919 | case Button1: |
1748 | /* allow meta + click to select rectangular areas */ |
1920 | /* allow meta + click to select rectangular areas */ |
1749 | /* should be done in screen.C */ |
1921 | /* should be done in screen.C */ |
1750 | #if ENABLE_FRILLS |
1922 | #if ENABLE_FRILLS |
1751 | selection.rect = !!(ev.state & ModMetaMask); |
1923 | selection.rect = !!(ev.state & ModMetaMask); |
1752 | #else |
1924 | #else |
1753 | selection.rect = false; |
1925 | selection.rect = false; |
1754 | #endif |
1926 | #endif |
1755 | |
1927 | |
1756 | /* allow shift+left click to extend selection */ |
1928 | /* allow shift+left click to extend selection */ |
1757 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1929 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1758 | { |
1930 | { |
1759 | if (MEvent.button == Button1 && clickintime) |
1931 | if (MEvent.button == Button1 && clickintime) |
1760 | selection_rotate (ev.x, ev.y); |
1932 | selection_rotate (ev.x, ev.y); |
1761 | else |
1933 | else |
1762 | selection_extend (ev.x, ev.y, 1); |
1934 | selection_extend (ev.x, ev.y, 1); |
1763 | } |
1935 | } |
1764 | else |
1936 | else |
1765 | { |
1937 | { |
1766 | if (MEvent.button == Button1 && clickintime) |
1938 | if (MEvent.button == Button1 && clickintime) |
1767 | MEvent.clicks++; |
1939 | MEvent.clicks++; |
1768 | else |
1940 | else |
1769 | MEvent.clicks = 1; |
1941 | MEvent.clicks = 1; |
1770 | |
1942 | |
1771 | selection_click (MEvent.clicks, ev.x, ev.y); |
1943 | selection_click (MEvent.clicks, ev.x, ev.y); |
1772 | } |
1944 | } |
1773 | |
1945 | |
1774 | MEvent.button = Button1; |
1946 | MEvent.button = Button1; |
1775 | break; |
1947 | break; |
1776 | |
1948 | |
1777 | case Button3: |
1949 | case Button3: |
1778 | if (MEvent.button == Button3 && clickintime) |
1950 | if (MEvent.button == Button3 && clickintime) |
1779 | selection_rotate (ev.x, ev.y); |
1951 | selection_rotate (ev.x, ev.y); |
1780 | else |
1952 | else |
1781 | selection_extend (ev.x, ev.y, 1); |
1953 | selection_extend (ev.x, ev.y, 1); |
1782 | |
1954 | |
1783 | MEvent.button = Button3; |
1955 | MEvent.button = Button3; |
1784 | break; |
1956 | break; |
1785 | } |
1957 | } |
1786 | } |
1958 | } |
1787 | |
1959 | |
1788 | MEvent.time = ev.time; |
1960 | MEvent.time = ev.time; |
1789 | return; |
1961 | return; |
1790 | } |
1962 | } |
1791 | |
1963 | |
… | |
… | |
1903 | case Button3: |
2075 | case Button3: |
1904 | if (scrollBar.style != R_SB_XTERM) |
2076 | if (scrollBar.style != R_SB_XTERM) |
1905 | { |
2077 | { |
1906 | if (scrollbar_above_slider (ev.y)) |
2078 | if (scrollbar_above_slider (ev.y)) |
1907 | # ifdef RXVT_SCROLL_FULL |
2079 | # ifdef RXVT_SCROLL_FULL |
1908 | scr_page (UP, TermWin.nrow - 1); |
2080 | scr_page (UP, nrow - 1); |
1909 | # else |
2081 | # else |
1910 | scr_page (UP, TermWin.nrow / 4); |
2082 | scr_page (UP, nrow / 4); |
1911 | # endif |
2083 | # endif |
1912 | else if (scrollbar_below_slider (ev.y)) |
2084 | else if (scrollbar_below_slider (ev.y)) |
1913 | # ifdef RXVT_SCROLL_FULL |
2085 | # ifdef RXVT_SCROLL_FULL |
1914 | scr_page (DN, TermWin.nrow - 1); |
2086 | scr_page (DN, nrow - 1); |
1915 | # else |
2087 | # else |
1916 | scr_page (DN, TermWin.nrow / 4); |
2088 | scr_page (DN, nrow / 4); |
1917 | # endif |
2089 | # endif |
1918 | else |
2090 | else |
1919 | scrollBar.setMotion (); |
2091 | scrollBar.setMotion (); |
1920 | } |
2092 | } |
1921 | else |
2093 | else |
1922 | { |
2094 | { |
1923 | scr_page ((ev.button == Button1 ? DN : UP), |
2095 | scr_page ((ev.button == Button1 ? DN : UP), |
1924 | (TermWin.nrow |
2096 | (nrow |
1925 | * scrollbar_position (ev.y) |
2097 | * scrollbar_position (ev.y) |
1926 | / scrollbar_size ())); |
2098 | / scrollbar_size ())); |
1927 | } |
2099 | } |
1928 | |
2100 | |
1929 | break; |
2101 | break; |
1930 | } |
2102 | } |
1931 | } |
2103 | } |
|
|
2104 | |
1932 | return; |
2105 | return; |
1933 | } |
2106 | } |
|
|
2107 | |
1934 | #if MENUBAR |
2108 | #if MENUBAR |
1935 | /* |
2109 | /* |
1936 | * Menubar window processing of button press |
2110 | * Menubar window processing of button press |
1937 | */ |
2111 | */ |
1938 | if (isMenuBarWindow (ev.window)) |
2112 | if (isMenuBarWindow (ev.window)) |
… | |
… | |
1961 | #ifdef SELECTION_SCROLLING |
2135 | #ifdef SELECTION_SCROLLING |
1962 | if (sel_scroll_ev.active) |
2136 | if (sel_scroll_ev.active) |
1963 | sel_scroll_ev.stop(); |
2137 | sel_scroll_ev.stop(); |
1964 | #endif |
2138 | #endif |
1965 | |
2139 | |
1966 | if (ev.window == TermWin.vt) |
2140 | if (ev.window == vt) |
1967 | { |
2141 | { |
1968 | #if ISO_14755 |
2142 | #if ISO_14755 |
1969 | // 5.4 |
2143 | // 5.4 |
1970 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2144 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1971 | return; |
2145 | return; |
… | |
… | |
2001 | if (priv_modes & PrivMode_mouse_report |
2175 | if (priv_modes & PrivMode_mouse_report |
2002 | && bypass_keystate |
2176 | && bypass_keystate |
2003 | && ev.button == Button1 && MEvent.clicks <= 1) |
2177 | && ev.button == Button1 && MEvent.clicks <= 1) |
2004 | selection_extend (ev.x, ev.y, 0); |
2178 | selection_extend (ev.x, ev.y, 0); |
2005 | |
2179 | |
|
|
2180 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2181 | return; |
|
|
2182 | |
2006 | switch (ev.button) |
2183 | switch (ev.button) |
2007 | { |
2184 | { |
2008 | case Button1: |
2185 | case Button1: |
2009 | case Button3: |
2186 | case Button3: |
2010 | selection_make (ev.time); |
2187 | selection_make (ev.time); |
… | |
… | |
2021 | |
2198 | |
2022 | v = ev.button == Button4 ? UP : DN; |
2199 | v = ev.button == Button4 ? UP : DN; |
2023 | |
2200 | |
2024 | if (ev.state & ShiftMask) |
2201 | if (ev.state & ShiftMask) |
2025 | i = 1; |
2202 | i = 1; |
2026 | else if (options & Opt_mouseWheelScrollPage) |
2203 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2027 | i = TermWin.nrow - 1; |
2204 | i = nrow - 1; |
2028 | else |
2205 | else |
2029 | i = 5; |
2206 | i = 5; |
2030 | |
2207 | |
2031 | # ifdef MOUSE_SLIP_WHEELING |
2208 | # ifdef MOUSE_SLIP_WHEELING |
2032 | if (ev.state & ControlMask) |
2209 | if (ev.state & ControlMask) |
2033 | { |
2210 | { |
2034 | mouse_slip_wheel_speed += v ? -1 : 1; |
2211 | mouse_slip_wheel_speed += v ? -1 : 1; |
2035 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2212 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2036 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2213 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2037 | |
2214 | |
2038 | if (slip_wheel_ev.at < NOW) |
2215 | if (slip_wheel_ev.at < NOW) |
2039 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2216 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2040 | |
2217 | |
2041 | slip_wheel_ev.start (); |
2218 | slip_wheel_ev.start (); |
2042 | } |
2219 | } |
2043 | else |
2220 | else |
2044 | { |
2221 | { |
2045 | # endif |
2222 | # endif |
2046 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2047 | scr_page (v, i); |
2223 | scr_page (v, i); |
2048 | scr_refresh (SMOOTH_REFRESH); |
|
|
2049 | scrollbar_show (1); |
2224 | scrollbar_show (1); |
2050 | # else |
|
|
2051 | while (i--) |
|
|
2052 | { |
|
|
2053 | scr_page (v, 1); |
|
|
2054 | scr_refresh (SMOOTH_REFRESH); |
|
|
2055 | scrollbar_show (1); |
|
|
2056 | } |
|
|
2057 | # endif |
|
|
2058 | # ifdef MOUSE_SLIP_WHEELING |
2225 | # ifdef MOUSE_SLIP_WHEELING |
2059 | } |
2226 | } |
2060 | #endif |
2227 | # endif |
2061 | } |
2228 | } |
2062 | break; |
2229 | break; |
2063 | #endif |
2230 | #endif |
2064 | } |
2231 | } |
2065 | } |
2232 | } |
… | |
… | |
2317 | XWindowAttributes wattr, wrootattr; |
2484 | XWindowAttributes wattr, wrootattr; |
2318 | dDisp; |
2485 | dDisp; |
2319 | |
2486 | |
2320 | pchanged = 0; |
2487 | pchanged = 0; |
2321 | |
2488 | |
2322 | if (!(options & Opt_transparent)) |
2489 | if (!OPTION (Opt_transparent)) |
2323 | return pchanged; /* Don't try any more */ |
2490 | return pchanged; /* Don't try any more */ |
2324 | |
2491 | |
2325 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2492 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2326 | rootdepth = wrootattr.depth; |
2493 | rootdepth = wrootattr.depth; |
2327 | |
2494 | |
2328 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
2495 | XGetWindowAttributes (disp, parent[0], &wattr); |
2329 | |
2496 | |
2330 | if (rootdepth != wattr.depth) |
2497 | if (rootdepth != wattr.depth) |
2331 | { |
2498 | { |
2332 | if (am_transparent) |
2499 | if (am_transparent) |
2333 | { |
2500 | { |
2334 | pchanged = 1; |
2501 | pchanged = 1; |
2335 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2502 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2336 | am_transparent = am_pixmap_trans = 0; |
2503 | am_transparent = am_pixmap_trans = 0; |
2337 | } |
2504 | } |
2338 | |
2505 | |
2339 | return pchanged; /* Don't try any more */ |
2506 | return pchanged; /* Don't try any more */ |
2340 | } |
2507 | } |
… | |
… | |
2381 | Window cr; |
2548 | Window cr; |
2382 | XImage *image; |
2549 | XImage *image; |
2383 | GC gc; |
2550 | GC gc; |
2384 | XGCValues gcvalue; |
2551 | XGCValues gcvalue; |
2385 | |
2552 | |
2386 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
2553 | XTranslateCoordinates (disp, parent[0], display->root, |
2387 | 0, 0, &sx, &sy, &cr); |
2554 | 0, 0, &sx, &sy, &cr); |
2388 | nw = (unsigned int)szHint.width; |
2555 | nw = (unsigned int)szHint.width; |
2389 | nh = (unsigned int)szHint.height; |
2556 | nh = (unsigned int)szHint.height; |
2390 | nx = ny = 0; |
2557 | nx = ny = 0; |
2391 | |
2558 | |
… | |
… | |
2401 | nh += sy; |
2568 | nh += sy; |
2402 | ny = -sy; |
2569 | ny = -sy; |
2403 | sy = 0; |
2570 | sy = 0; |
2404 | } |
2571 | } |
2405 | |
2572 | |
2406 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2573 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2407 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2574 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2408 | |
2575 | |
2409 | XSync (disp, False); |
2576 | XSync (disp, False); |
2410 | allowedxerror = -1; |
2577 | allowedxerror = -1; |
2411 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2578 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2412 | |
2579 | |
… | |
… | |
2417 | if (image == NULL) |
2584 | if (image == NULL) |
2418 | { |
2585 | { |
2419 | if (am_transparent && am_pixmap_trans) |
2586 | if (am_transparent && am_pixmap_trans) |
2420 | { |
2587 | { |
2421 | pchanged = 1; |
2588 | pchanged = 1; |
2422 | if (TermWin.pixmap != None) |
2589 | if (pixmap != None) |
2423 | { |
2590 | { |
2424 | XFreePixmap (disp, TermWin.pixmap); |
2591 | XFreePixmap (disp, pixmap); |
2425 | TermWin.pixmap = None; |
2592 | pixmap = None; |
2426 | } |
2593 | } |
2427 | } |
2594 | } |
2428 | |
2595 | |
2429 | am_pixmap_trans = 0; |
2596 | am_pixmap_trans = 0; |
2430 | } |
2597 | } |
2431 | else |
2598 | else |
2432 | { |
2599 | { |
2433 | if (TermWin.pixmap != None) |
2600 | if (pixmap != None) |
2434 | XFreePixmap (disp, TermWin.pixmap); |
2601 | XFreePixmap (disp, pixmap); |
2435 | |
2602 | |
2436 | #if TINTING |
2603 | #if TINTING |
2437 | if (ISSET_PIXCOLOR (Color_tint)) |
2604 | if (ISSET_PIXCOLOR (Color_tint)) |
2438 | { |
2605 | { |
2439 | unsigned short rm, gm, bm; |
2606 | unsigned short rm, gm, bm; |
… | |
… | |
2443 | |
2610 | |
2444 | ShadeXImage (display, image, shade, rm, gm, bm); |
2611 | ShadeXImage (display, image, shade, rm, gm, bm); |
2445 | } |
2612 | } |
2446 | #endif |
2613 | #endif |
2447 | |
2614 | |
2448 | TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, |
2615 | pixmap = XCreatePixmap (disp, vt, |
2449 | szHint.width, szHint.height, image->depth); |
2616 | szHint.width, szHint.height, image->depth); |
2450 | gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); |
2617 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2451 | XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, |
2618 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2452 | nx, ny, image->width, image->height); |
2619 | nx, ny, image->width, image->height); |
2453 | XFreeGC (disp, gc); |
2620 | XFreeGC (disp, gc); |
2454 | XDestroyImage (image); |
2621 | XDestroyImage (image); |
2455 | XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); |
2622 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2456 | XClearWindow (disp, TermWin.parent[0]); |
2623 | XClearWindow (disp, parent[0]); |
2457 | |
2624 | |
2458 | if (!am_transparent || !am_pixmap_trans) |
2625 | if (!am_transparent || !am_pixmap_trans) |
2459 | pchanged = 1; |
2626 | pchanged = 1; |
2460 | |
2627 | |
2461 | am_transparent = am_pixmap_trans = 1; |
2628 | am_transparent = am_pixmap_trans = 1; |
2462 | } |
2629 | } |
2463 | } |
2630 | } |
2464 | |
2631 | |
2465 | if (am_pixmap_trans) |
2632 | if (am_pixmap_trans) |
2466 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2633 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2467 | else |
2634 | else |
2468 | { |
2635 | { |
2469 | unsigned int n; |
2636 | unsigned int n; |
2470 | /* |
2637 | /* |
2471 | * InheritPixmap transparency |
2638 | * InheritPixmap transparency |
2472 | */ |
2639 | */ |
2473 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2640 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2474 | { |
2641 | { |
2475 | oldp = TermWin.parent[i]; |
2642 | oldp = parent[i]; |
2476 | XQueryTree (disp, TermWin.parent[i - 1], &root, |
2643 | XQueryTree (disp, parent[i - 1], &root, |
2477 | &TermWin.parent[i], &list, &n); |
2644 | &parent[i], &list, &n); |
2478 | XFree (list); |
2645 | XFree (list); |
2479 | |
2646 | |
2480 | if (TermWin.parent[i] == display->root) |
2647 | if (parent[i] == display->root) |
2481 | { |
2648 | { |
2482 | if (oldp != None) |
2649 | if (oldp != None) |
2483 | pchanged = 1; |
2650 | pchanged = 1; |
2484 | |
2651 | |
2485 | break; |
2652 | break; |
2486 | } |
2653 | } |
2487 | |
2654 | |
2488 | if (oldp != TermWin.parent[i]) |
2655 | if (oldp != parent[i]) |
2489 | pchanged = 1; |
2656 | pchanged = 1; |
2490 | } |
2657 | } |
2491 | |
2658 | |
2492 | n = 0; |
2659 | n = 0; |
2493 | |
2660 | |
2494 | if (pchanged) |
2661 | if (pchanged) |
2495 | { |
2662 | { |
2496 | for (; n < (unsigned int)i; n++) |
2663 | for (; n < (unsigned int)i; n++) |
2497 | { |
2664 | { |
2498 | XGetWindowAttributes (disp, TermWin.parent[n], &wattr); |
2665 | XGetWindowAttributes (disp, parent[n], &wattr); |
2499 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2666 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2500 | { |
2667 | { |
2501 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2668 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2502 | break; |
2669 | break; |
2503 | } |
2670 | } |
2504 | } |
2671 | } |
2505 | } |
2672 | } |
2506 | |
2673 | |
2507 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2674 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2508 | { |
2675 | { |
2509 | XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2676 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2510 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2677 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2511 | am_transparent = 0; |
2678 | am_transparent = 0; |
2512 | /* XXX: also turn off Opt_transparent? */ |
2679 | /* XXX: also turn off Opt_transparent? */ |
2513 | } |
2680 | } |
2514 | else |
2681 | else |
2515 | { |
2682 | { |
… | |
… | |
2518 | * needed for fvwm2.2.2 (and before?) */ |
2685 | * needed for fvwm2.2.2 (and before?) */ |
2519 | sleep (1); |
2686 | sleep (1); |
2520 | #endif |
2687 | #endif |
2521 | for (n = 0; n < (unsigned int)i; n++) |
2688 | for (n = 0; n < (unsigned int)i; n++) |
2522 | { |
2689 | { |
2523 | XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); |
2690 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2524 | XClearWindow (disp, TermWin.parent[n]); |
2691 | XClearWindow (disp, parent[n]); |
2525 | } |
2692 | } |
2526 | |
2693 | |
2527 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2694 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2528 | am_transparent = 1; |
2695 | am_transparent = 1; |
2529 | } |
2696 | } |
2530 | |
2697 | |
2531 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2698 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2532 | TermWin.parent[i] = None; |
2699 | parent[i] = None; |
2533 | } |
2700 | } |
2534 | |
2701 | |
2535 | if (scrollBar.win) |
2702 | if (scrollBar.win) |
2536 | { |
2703 | { |
2537 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2704 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
… | |
… | |
2554 | |
2721 | |
2555 | bool |
2722 | bool |
2556 | rxvt_term::cmd_parse () |
2723 | rxvt_term::cmd_parse () |
2557 | { |
2724 | { |
2558 | bool flag = false; |
2725 | bool flag = false; |
2559 | unicode_t ch = NOCHAR; |
2726 | wchar_t ch = NOCHAR; |
2560 | unsigned char *seq_begin; // remember start of esc-sequence here |
2727 | char *seq_begin; // remember start of esc-sequence here |
2561 | |
2728 | |
2562 | for (;;) |
2729 | for (;;) |
2563 | { |
2730 | { |
2564 | if (ch == NOCHAR) |
2731 | if (ch == NOCHAR) |
2565 | { |
2732 | { |
2566 | seq_begin = cmdbuf_ptr; |
2733 | seq_begin = cmdbuf_ptr; |
2567 | ch = next_char (); |
2734 | ch = next_char (); |
2568 | } |
|
|
2569 | |
2735 | |
2570 | if (ch == NOCHAR) // TODO: improve |
2736 | if (ch == NOCHAR) |
2571 | break; |
2737 | break; |
|
|
2738 | } |
2572 | |
2739 | |
2573 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2740 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2574 | { |
2741 | { |
2575 | if (!seen_input) |
2742 | if (!seen_input) |
2576 | { |
2743 | { |
… | |
… | |
2580 | // some window managers resize the window early, and these programs |
2747 | // some window managers resize the window early, and these programs |
2581 | // then sometimes get the size wrong. |
2748 | // then sometimes get the size wrong. |
2582 | // unfortunately other programs are even more buggy and dislike |
2749 | // unfortunately other programs are even more buggy and dislike |
2583 | // being sent SIGWINCH, so only do it when we were in fact being |
2750 | // being sent SIGWINCH, so only do it when we were in fact being |
2584 | // resized. |
2751 | // resized. |
2585 | if (seen_resize) |
2752 | if (seen_resize && cmd_pid) |
2586 | kill (-cmd_pid, SIGWINCH); |
2753 | kill (-cmd_pid, SIGWINCH); |
2587 | } |
2754 | } |
2588 | |
2755 | |
2589 | /* Read a text string from the input buffer */ |
2756 | /* Read a text string from the input buffer */ |
2590 | unicode_t buf[UBUFSIZ]; |
2757 | wchar_t buf[UBUFSIZ]; |
2591 | bool refreshnow = false; |
2758 | bool refreshnow = false; |
2592 | int nlines = 0; |
2759 | int nlines = 0; |
2593 | unicode_t *str = buf; |
2760 | wchar_t *str = buf; |
|
|
2761 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2594 | |
2762 | |
2595 | for (;;) |
2763 | for (;;) |
2596 | { |
2764 | { |
2597 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2765 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2598 | break; |
2766 | break; |
2599 | |
2767 | |
2600 | *str++ = ch; |
2768 | *str++ = ch; |
2601 | |
2769 | |
2602 | if (ch == C0_LF) |
2770 | if (ch == C0_LF || str >= eol) |
2603 | { |
2771 | { |
|
|
2772 | if (ch == C0_LF) |
2604 | nlines++; |
2773 | nlines++; |
|
|
2774 | |
2605 | refresh_count++; |
2775 | refresh_count++; |
2606 | |
2776 | |
2607 | if (!(options & Opt_jumpScroll) |
2777 | if (!OPTION (Opt_jumpScroll) |
2608 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2778 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2609 | { |
2779 | { |
2610 | refreshnow = true; |
2780 | refreshnow = true; |
|
|
2781 | refresh_count = 0; |
2611 | ch = NOCHAR; |
2782 | ch = NOCHAR; |
2612 | break; |
2783 | break; |
2613 | } |
2784 | } |
2614 | |
2785 | |
2615 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2786 | // scr_add_lines only works for nlines <= nrow - 1. |
2616 | if (nlines >= TermWin.nrow - 1) |
2787 | if (nlines >= nrow - 1) |
2617 | { |
2788 | { |
|
|
2789 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2618 | scr_add_lines (buf, nlines, str - buf); |
2790 | scr_add_lines (buf, str - buf, nlines); |
|
|
2791 | |
2619 | nlines = 0; |
2792 | nlines = 0; |
2620 | str = buf; |
2793 | str = buf; |
|
|
2794 | eol = str + min (ncol, UBUFSIZ); |
2621 | } |
2795 | } |
2622 | } |
|
|
2623 | |
2796 | |
2624 | if (str >= buf + UBUFSIZ) |
2797 | if (str >= eol) |
2625 | { |
2798 | { |
|
|
2799 | if (eol >= buf + UBUFSIZ) |
|
|
2800 | { |
2626 | ch = NOCHAR; |
2801 | ch = NOCHAR; |
2627 | break; |
2802 | break; |
|
|
2803 | } |
|
|
2804 | else |
|
|
2805 | eol = min (eol + ncol, buf + UBUFSIZ); |
|
|
2806 | } |
|
|
2807 | |
2628 | } |
2808 | } |
2629 | |
2809 | |
2630 | seq_begin = cmdbuf_ptr; |
2810 | seq_begin = cmdbuf_ptr; |
2631 | ch = next_char (); |
2811 | ch = next_char (); |
2632 | } |
2812 | } |
2633 | |
2813 | |
|
|
2814 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2634 | scr_add_lines (buf, nlines, str - buf); |
2815 | scr_add_lines (buf, str - buf, nlines); |
2635 | |
2816 | |
2636 | /* |
2817 | /* |
2637 | * If there have been a lot of new lines, then update the screen |
2818 | * If there have been a lot of new lines, then update the screen |
2638 | * What the heck I'll cheat and only refresh less than every page-full. |
2819 | * What the heck I'll cheat and only refresh less than every page-full. |
2639 | * the number of pages between refreshes is refresh_limit, which |
2820 | * the number of pages between refreshes is refresh_limit, which |
2640 | * is incremented here because we must be doing flat-out scrolling. |
2821 | * is incremented here because we must be doing flat-out scrolling. |
2641 | */ |
2822 | */ |
2642 | if (refreshnow) |
2823 | if (refreshnow) |
2643 | { |
2824 | { |
2644 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2825 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2645 | refresh_limit++; |
2826 | refresh_limit++; |
2646 | else |
2827 | else |
2647 | { |
2828 | { |
2648 | flag = true; |
2829 | flag = true; |
2649 | scr_refresh (refresh_type); |
2830 | scr_refresh (refresh_type); |
|
|
2831 | want_refresh = 1; |
2650 | } |
2832 | } |
2651 | } |
2833 | } |
2652 | |
2834 | |
2653 | } |
2835 | } |
2654 | else |
2836 | else |
… | |
… | |
2669 | } |
2851 | } |
2670 | |
2852 | |
2671 | return flag; |
2853 | return flag; |
2672 | } |
2854 | } |
2673 | |
2855 | |
2674 | // read the next octet |
|
|
2675 | unicode_t |
|
|
2676 | rxvt_term::next_octet () |
|
|
2677 | { |
|
|
2678 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2679 | ? *cmdbuf_ptr++ |
|
|
2680 | : NOCHAR; |
|
|
2681 | } |
|
|
2682 | |
|
|
2683 | // read the next character |
2856 | // read the next character |
2684 | unicode_t |
2857 | wchar_t |
2685 | rxvt_term::next_char () |
2858 | rxvt_term::next_char () |
2686 | { |
2859 | { |
2687 | while (cmdbuf_ptr < cmdbuf_endp) |
2860 | while (cmdbuf_ptr < cmdbuf_endp) |
2688 | { |
2861 | { |
2689 | // assume 7-bit to be ascii ALWAYS |
2862 | // assume 7-bit to be ascii ALWAYS |
2690 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2863 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2691 | return *cmdbuf_ptr++; |
2864 | return *cmdbuf_ptr++; |
2692 | |
2865 | |
2693 | wchar_t wc; |
2866 | wchar_t wc; |
2694 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2867 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2695 | |
2868 | |
2696 | if (len == (size_t)-2) |
2869 | if (len == (size_t)-2) |
2697 | { |
2870 | { |
2698 | // the mbstate stores incomplete sequences. didn't know this :/ |
2871 | // the mbstate stores incomplete sequences. didn't know this :/ |
2699 | cmdbuf_ptr = cmdbuf_endp; |
2872 | cmdbuf_ptr = cmdbuf_endp; |
2700 | break; |
2873 | break; |
2701 | } |
2874 | } |
2702 | |
2875 | |
2703 | if (len == (size_t)-1) |
2876 | if (len == (size_t)-1) |
2704 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2877 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2705 | |
2878 | |
2706 | // assume wchar == unicode |
2879 | // assume wchar == unicode |
2707 | cmdbuf_ptr += len; |
2880 | cmdbuf_ptr += len; |
2708 | return wc & UNICODE_MASK; |
2881 | return wc & UNICODE_MASK; |
2709 | } |
2882 | } |
2710 | |
2883 | |
2711 | return NOCHAR; |
2884 | return NOCHAR; |
|
|
2885 | } |
|
|
2886 | |
|
|
2887 | // read the next octet |
|
|
2888 | uint32_t |
|
|
2889 | rxvt_term::next_octet () |
|
|
2890 | { |
|
|
2891 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2892 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2893 | : NOCHAR; |
2712 | } |
2894 | } |
2713 | |
2895 | |
2714 | /* rxvt_cmd_getc () - Return next input character */ |
2896 | /* rxvt_cmd_getc () - Return next input character */ |
2715 | /* |
2897 | /* |
2716 | * Return the next input character after first passing any keyboard input |
2898 | * Return the next input character after first passing any keyboard input |
2717 | * to the command. |
2899 | * to the command. |
2718 | */ |
2900 | */ |
2719 | unicode_t |
2901 | wchar_t |
2720 | rxvt_term::cmd_getc () |
2902 | rxvt_term::cmd_getc () |
2721 | { |
2903 | { |
2722 | unicode_t c = next_char (); |
2904 | wchar_t c = next_char (); |
2723 | |
2905 | |
2724 | if (c == NOCHAR) |
2906 | if (c == NOCHAR) |
2725 | throw out_of_input; |
2907 | throw out_of_input; |
2726 | |
2908 | |
2727 | return c; |
2909 | return c; |
2728 | } |
2910 | } |
2729 | |
2911 | |
2730 | unicode_t |
2912 | uint32_t |
2731 | rxvt_term::cmd_get8 () |
2913 | rxvt_term::cmd_get8 () |
2732 | { |
2914 | { |
2733 | unicode_t c = next_octet (); |
2915 | uint32_t c = next_octet (); |
2734 | |
2916 | |
2735 | if (c == NOCHAR) |
2917 | if (c == NOCHAR) |
2736 | throw out_of_input; |
2918 | throw out_of_input; |
2737 | |
2919 | |
2738 | return c; |
2920 | return c; |
… | |
… | |
2838 | case C0_ESC: |
3020 | case C0_ESC: |
2839 | process_escape_seq (); |
3021 | process_escape_seq (); |
2840 | break; |
3022 | break; |
2841 | case C0_ENQ: /* terminal Status */ |
3023 | case C0_ENQ: /* terminal Status */ |
2842 | if (rs[Rs_answerbackstring]) |
3024 | if (rs[Rs_answerbackstring]) |
2843 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
3025 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2844 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2845 | else |
3026 | else |
2846 | tt_write ((unsigned char *)VT100_ANS, |
3027 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2847 | (unsigned int)strlen (VT100_ANS)); |
|
|
2848 | break; |
3028 | break; |
2849 | case C0_BEL: /* bell */ |
3029 | case C0_BEL: /* bell */ |
2850 | scr_bell (); |
3030 | scr_bell (); |
2851 | break; |
3031 | break; |
2852 | case C0_BS: /* backspace */ |
3032 | case C0_BS: /* backspace */ |
… | |
… | |
3007 | break; |
3187 | break; |
3008 | |
3188 | |
3009 | /* 8.3.87: NEXT LINE */ |
3189 | /* 8.3.87: NEXT LINE */ |
3010 | case C1_NEL: /* ESC E */ |
3190 | case C1_NEL: /* ESC E */ |
3011 | { |
3191 | { |
3012 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3192 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3013 | scr_add_lines (nlcr, 1, 2); |
3193 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3014 | } |
3194 | } |
3015 | break; |
3195 | break; |
3016 | |
3196 | |
3017 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3197 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3018 | case C1_ESA: /* ESC G */ |
3198 | case C1_ESA: /* ESC G */ |
… | |
… | |
3040 | process_dcs_seq (); |
3220 | process_dcs_seq (); |
3041 | break; |
3221 | break; |
3042 | |
3222 | |
3043 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3223 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3044 | case C1_SCI: /* ESC Z */ |
3224 | case C1_SCI: /* ESC Z */ |
3045 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3225 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3046 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3047 | break; /* steal obsolete ESC [ c */ |
3226 | break; /* steal obsolete ESC [ c */ |
3048 | |
3227 | |
3049 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3228 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3050 | case C1_CSI: /* ESC [ */ |
3229 | case C1_CSI: /* ESC [ */ |
3051 | process_csi_seq (); |
3230 | process_csi_seq (); |
… | |
… | |
3176 | { |
3355 | { |
3177 | switch (priv) |
3356 | switch (priv) |
3178 | { |
3357 | { |
3179 | case '>': |
3358 | case '>': |
3180 | if (ch == CSI_DA) /* secondary device attributes */ |
3359 | if (ch == CSI_DA) /* secondary device attributes */ |
3181 | tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); |
3360 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3182 | break; |
3361 | break; |
3183 | case '?': |
3362 | case '?': |
3184 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3363 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3185 | process_terminal_mode (ch, priv, nargs, arg); |
3364 | process_terminal_mode (ch, priv, nargs, arg); |
3186 | break; |
3365 | break; |
… | |
… | |
3291 | |
3470 | |
3292 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3471 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3293 | arg[0] = -arg[0]; |
3472 | arg[0] = -arg[0]; |
3294 | /* FALLTHROUGH */ |
3473 | /* FALLTHROUGH */ |
3295 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3474 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3296 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3475 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3297 | break; |
3476 | break; |
3298 | |
3477 | |
3299 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3478 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3300 | tt_write ((const unsigned char *)VT100_ANS, |
3479 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3301 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3302 | break; |
3480 | break; |
3303 | |
3481 | |
3304 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3482 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3305 | process_sgr_mode (nargs, arg); |
3483 | process_sgr_mode (nargs, arg); |
3306 | break; |
3484 | break; |
… | |
… | |
3313 | break; |
3491 | break; |
3314 | case 6: /* CPR requested */ |
3492 | case 6: /* CPR requested */ |
3315 | scr_report_position (); |
3493 | scr_report_position (); |
3316 | break; |
3494 | break; |
3317 | case 7: /* unofficial extension */ |
3495 | case 7: /* unofficial extension */ |
3318 | if (options & Opt_insecure) |
3496 | if (OPTION (Opt_insecure)) |
3319 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3497 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3320 | break; |
3498 | break; |
3321 | case 8: /* unofficial extension */ |
3499 | case 8: /* unofficial extension */ |
3322 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3500 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3323 | break; |
3501 | break; |
… | |
… | |
3426 | { |
3604 | { |
3427 | /* |
3605 | /* |
3428 | * commands |
3606 | * commands |
3429 | */ |
3607 | */ |
3430 | case 1: /* deiconify window */ |
3608 | case 1: /* deiconify window */ |
3431 | XMapWindow (disp, TermWin.parent[0]); |
3609 | XMapWindow (disp, parent[0]); |
3432 | break; |
3610 | break; |
3433 | case 2: /* iconify window */ |
3611 | case 2: /* iconify window */ |
3434 | XIconifyWindow (disp, TermWin.parent[0], display->screen); |
3612 | XIconifyWindow (disp, parent[0], display->screen); |
3435 | break; |
3613 | break; |
3436 | case 3: /* set position (pixels) */ |
3614 | case 3: /* set position (pixels) */ |
3437 | XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); |
3615 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3438 | break; |
3616 | break; |
3439 | case 4: /* set size (pixels) */ |
3617 | case 4: /* set size (pixels) */ |
3440 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3618 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3441 | break; |
3619 | break; |
3442 | case 5: /* raise window */ |
3620 | case 5: /* raise window */ |
3443 | XRaiseWindow (disp, TermWin.parent[0]); |
3621 | XRaiseWindow (disp, parent[0]); |
3444 | break; |
3622 | break; |
3445 | case 6: /* lower window */ |
3623 | case 6: /* lower window */ |
3446 | XLowerWindow (disp, TermWin.parent[0]); |
3624 | XLowerWindow (disp, parent[0]); |
3447 | break; |
3625 | break; |
3448 | case 7: /* refresh window */ |
3626 | case 7: /* refresh window */ |
3449 | scr_touch (true); |
3627 | scr_touch (true); |
3450 | break; |
3628 | break; |
3451 | case 8: /* set size (chars) */ |
3629 | case 8: /* set size (chars) */ |
3452 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3630 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3453 | (unsigned int) (args[1] * TermWin.fheight)); |
3631 | (unsigned int) (args[1] * fheight)); |
3454 | break; |
3632 | break; |
3455 | |
3633 | |
3456 | //case 9: NYI, TODO, restore maximized window or maximize window |
3634 | //case 9: NYI, TODO, restore maximized window or maximize window |
3457 | default: |
3635 | default: |
3458 | if (args[0] >= 24) /* set height (chars) */ |
3636 | if (args[0] >= 24) /* set height (chars) */ |
3459 | set_widthheight ((unsigned int)TermWin.width, |
3637 | set_widthheight ((unsigned int)width, |
3460 | (unsigned int) (args[1] * TermWin.fheight)); |
3638 | (unsigned int) (args[1] * fheight)); |
3461 | break; |
3639 | break; |
3462 | |
3640 | |
3463 | |
3641 | |
3464 | /* |
3642 | /* |
3465 | * reports - some output format copied from XTerm |
3643 | * reports - some output format copied from XTerm |
3466 | */ |
3644 | */ |
3467 | case 11: /* report window state */ |
3645 | case 11: /* report window state */ |
3468 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3646 | XGetWindowAttributes (disp, parent[0], &wattr); |
3469 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3647 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3470 | break; |
3648 | break; |
3471 | case 13: /* report window position */ |
3649 | case 13: /* report window position */ |
3472 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3650 | XGetWindowAttributes (disp, parent[0], &wattr); |
3473 | XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, |
3651 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3474 | -wattr.border_width, -wattr.border_width, |
3652 | -wattr.border_width, -wattr.border_width, |
3475 | &x, &y, &wdummy); |
3653 | &x, &y, &wdummy); |
3476 | tt_printf ("\033[3;%d;%dt", x, y); |
3654 | tt_printf ("\033[3;%d;%dt", x, y); |
3477 | break; |
3655 | break; |
3478 | case 14: /* report window size (pixels) */ |
3656 | case 14: /* report window size (pixels) */ |
3479 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3657 | XGetWindowAttributes (disp, parent[0], &wattr); |
3480 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3658 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3481 | break; |
3659 | break; |
3482 | case 18: /* report text area size (chars) */ |
3660 | case 18: /* report text area size (chars) */ |
3483 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3661 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3484 | break; |
3662 | break; |
3485 | case 19: /* report window size (chars) */ |
3663 | case 19: /* report window size (chars) */ |
3486 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3664 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3487 | break; |
3665 | break; |
3488 | case 20: /* report icon label */ |
3666 | case 20: /* report icon label */ |
3489 | { |
3667 | { |
3490 | char *s; |
3668 | char *s; |
3491 | XGetIconName (disp, TermWin.parent[0], &s); |
3669 | XGetIconName (disp, parent[0], &s); |
3492 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3670 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3493 | XFree (s); |
3671 | XFree (s); |
3494 | } |
3672 | } |
3495 | break; |
3673 | break; |
3496 | case 21: /* report window title */ |
3674 | case 21: /* report window title */ |
3497 | { |
3675 | { |
3498 | char *s; |
3676 | char *s; |
3499 | XFetchName (disp, TermWin.parent[0], &s); |
3677 | XFetchName (disp, parent[0], &s); |
3500 | 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 */ |
3501 | XFree (s); |
3679 | XFree (s); |
3502 | } |
3680 | } |
3503 | break; |
3681 | break; |
3504 | } |
3682 | } |
3505 | } |
3683 | } |
… | |
… | |
3508 | /*----------------------------------------------------------------------*/ |
3686 | /*----------------------------------------------------------------------*/ |
3509 | /* |
3687 | /* |
3510 | * get input up until STRING TERMINATOR (or BEL) |
3688 | * get input up until STRING TERMINATOR (or BEL) |
3511 | * ends_how is terminator used. returned input must be free()'d |
3689 | * ends_how is terminator used. returned input must be free()'d |
3512 | */ |
3690 | */ |
3513 | unsigned char * |
3691 | char * |
3514 | rxvt_term::get_to_st (unicode_t &ends_how) |
3692 | rxvt_term::get_to_st (unicode_t &ends_how) |
3515 | { |
3693 | { |
3516 | unicode_t ch; |
3694 | unicode_t ch; |
3517 | bool seen_esc = false; |
3695 | bool seen_esc = false; |
3518 | unsigned int n = 0; |
3696 | unsigned int n = 0; |
… | |
… | |
3537 | else if (ch < 0x20) |
3715 | else if (ch < 0x20) |
3538 | return NULL; /* other control character - exit */ |
3716 | return NULL; /* other control character - exit */ |
3539 | |
3717 | |
3540 | seen_esc = false; |
3718 | seen_esc = false; |
3541 | |
3719 | |
3542 | if (n >= sizeof (string) - 1) |
3720 | if (n >= STRING_MAX - 1) |
3543 | // stop at some sane length |
3721 | // stop at some sane length |
3544 | return NULL; |
3722 | return NULL; |
3545 | |
3723 | |
3546 | if (ch == C0_SYN) |
3724 | if (ch == C0_SYN) |
3547 | string[n++] = cmd_get8 (); |
3725 | string[n++] = cmd_get8 (); |
… | |
… | |
3551 | |
3729 | |
3552 | string[n++] = '\0'; |
3730 | string[n++] = '\0'; |
3553 | |
3731 | |
3554 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3732 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3555 | |
3733 | |
3556 | return (unsigned char *)rxvt_wcstombs (string); |
3734 | return rxvt_wcstombs (string); |
3557 | } |
3735 | } |
3558 | |
3736 | |
3559 | /*----------------------------------------------------------------------*/ |
3737 | /*----------------------------------------------------------------------*/ |
3560 | /* |
3738 | /* |
3561 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3739 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3562 | */ |
3740 | */ |
3563 | void |
3741 | void |
3564 | rxvt_term::process_dcs_seq () |
3742 | rxvt_term::process_dcs_seq () |
3565 | { |
3743 | { |
3566 | unsigned char *s; |
3744 | char *s; |
3567 | unicode_t eh; |
3745 | unicode_t eh; |
3568 | |
3746 | |
3569 | /* |
3747 | /* |
3570 | * Not handled yet |
3748 | * Not handled yet |
3571 | */ |
3749 | */ |
… | |
… | |
3590 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3768 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3591 | arg = arg * 10 + (ch - '0'); |
3769 | arg = arg * 10 + (ch - '0'); |
3592 | |
3770 | |
3593 | if (ch == ';') |
3771 | if (ch == ';') |
3594 | { |
3772 | { |
3595 | unsigned char *s = get_to_st (eh); |
3773 | char *s = get_to_st (eh); |
3596 | |
3774 | |
3597 | if (s) |
3775 | if (s) |
3598 | { |
3776 | { |
3599 | process_xterm_seq (arg, (char *)s, eh); |
3777 | process_xterm_seq (arg, s, eh); |
3600 | free (s); |
3778 | free (s); |
3601 | } |
3779 | } |
3602 | } |
3780 | } |
3603 | } |
3781 | } |
3604 | |
3782 | |
3605 | void |
3783 | void |
3606 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3784 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3607 | { |
3785 | { |
3608 | if (str[0] == '?' && !str[1]) |
3786 | if (str[0] == '?' && !str[1]) |
3609 | { |
3787 | { |
3610 | unsigned short r, g, b; |
3788 | unsigned short r, g, b; |
3611 | pix_colors_focused[color].get (display, r, g, b); |
3789 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3615 | set_window_color (color, str); |
3793 | set_window_color (color, str); |
3616 | } |
3794 | } |
3617 | |
3795 | |
3618 | /* |
3796 | /* |
3619 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3797 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3620 | * 0 = change iconName/title |
|
|
3621 | * 1 = change iconName |
|
|
3622 | * 2 = change title |
|
|
3623 | * 4 = change color |
|
|
3624 | * 10 = change fg color |
|
|
3625 | * 11 = change bg color |
|
|
3626 | * 12 = change text color |
|
|
3627 | * 13 = change mouse foreground color |
|
|
3628 | * 17 = change highlight character colour |
|
|
3629 | * 18 = change bold character color |
|
|
3630 | * 19 = change underlined character color |
|
|
3631 | * 46 = change logfile (not implemented) |
|
|
3632 | * 50 = change font |
|
|
3633 | * |
|
|
3634 | * rxvt extensions: |
|
|
3635 | * 20 = bg pixmap |
|
|
3636 | * 39 = change default fg color |
|
|
3637 | * 49 = change default bg color |
|
|
3638 | * 55 = dump scrollback buffer and all of screen |
|
|
3639 | * 701 = change locale |
|
|
3640 | * 702 = find font |
|
|
3641 | * 703 = menu |
|
|
3642 | */ |
3798 | */ |
3643 | void |
3799 | void |
3644 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3800 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3645 | { |
3801 | { |
3646 | int changed = 0; |
3802 | int changed = 0; |
3647 | int color; |
3803 | int color; |
3648 | char *buf, *name; |
3804 | char *buf, *name; |
3649 | bool query = str[0] == '?' && !str[1]; |
3805 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
3672 | unsigned long bytes_after; |
3828 | unsigned long bytes_after; |
3673 | unsigned char *value = 0; |
3829 | unsigned char *value = 0; |
3674 | const char *str = ""; |
3830 | const char *str = ""; |
3675 | |
3831 | |
3676 | if (prop |
3832 | if (prop |
3677 | && XGetWindowProperty (disp, TermWin.parent[0], |
3833 | && XGetWindowProperty (disp, parent[0], |
3678 | prop, 0, 1<<16, 0, AnyPropertyType, |
3834 | prop, 0, 1<<16, 0, AnyPropertyType, |
3679 | &actual_type, &actual_format, |
3835 | &actual_type, &actual_format, |
3680 | &nitems, &bytes_after, &value) == Success |
3836 | &nitems, &bytes_after, &value) == Success |
3681 | && actual_type != None |
3837 | && actual_type != None |
3682 | && actual_format == 8) |
3838 | && actual_format == 8) |
… | |
… | |
3694 | { |
3850 | { |
3695 | *eq = 0; |
3851 | *eq = 0; |
3696 | set_utf8_property (display->atom (str), eq + 1); |
3852 | set_utf8_property (display->atom (str), eq + 1); |
3697 | } |
3853 | } |
3698 | else |
3854 | else |
3699 | XDeleteProperty (disp, TermWin.parent[0], |
3855 | XDeleteProperty (disp, parent[0], |
3700 | display->atom (str)); |
3856 | display->atom (str)); |
3701 | } |
3857 | } |
3702 | break; |
3858 | break; |
3703 | |
3859 | |
3704 | case XTerm_Color: |
3860 | case XTerm_Color: |
… | |
… | |
3706 | { |
3862 | { |
3707 | if ((name = strchr (buf, ';')) == NULL) |
3863 | if ((name = strchr (buf, ';')) == NULL) |
3708 | break; |
3864 | break; |
3709 | |
3865 | |
3710 | *name++ = '\0'; |
3866 | *name++ = '\0'; |
3711 | color = atoi (buf); |
3867 | color = atoi (buf) + minCOLOR; |
3712 | |
3868 | |
3713 | if (color < 0 || color >= TOTAL_COLORS) |
3869 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3714 | break; |
3870 | break; |
3715 | |
3871 | |
3716 | if ((buf = strchr (name, ';')) != NULL) |
3872 | if ((buf = strchr (name, ';')) != NULL) |
3717 | *buf++ = '\0'; |
3873 | *buf++ = '\0'; |
3718 | |
3874 | |
3719 | if (name[0] == '?' && !name[1]) |
3875 | if (name[0] == '?' && !name[1]) |
3720 | { |
3876 | { |
3721 | unsigned short r, g, b; |
3877 | unsigned short r, g, b; |
3722 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3878 | pix_colors_focused[color].get (display, r, g, b); |
3723 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3879 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3724 | } |
3880 | } |
3725 | else |
3881 | else |
3726 | set_window_color (color + minCOLOR, name); |
3882 | set_window_color (color, name); |
3727 | } |
3883 | } |
3728 | break; |
3884 | break; |
3729 | case XTerm_Color00: |
3885 | case XTerm_Color00: |
3730 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3886 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3731 | break; |
3887 | break; |
3732 | case XTerm_Color01: |
3888 | case XTerm_Color01: |
3733 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3889 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3734 | break; |
3890 | break; |
3735 | #ifndef NO_CURSORCOLOR |
3891 | #ifndef NO_CURSORCOLOR |
3736 | case XTerm_Color_cursor: |
3892 | case XTerm_Color_cursor: |
3737 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3893 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3738 | break; |
3894 | break; |
… | |
… | |
3742 | break; |
3898 | break; |
3743 | case XTerm_Color_pointer_bg: |
3899 | case XTerm_Color_pointer_bg: |
3744 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3900 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3745 | break; |
3901 | break; |
3746 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3902 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3747 | case XTerm_Color_BD: |
|
|
3748 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3749 | break; |
|
|
3750 | case XTerm_Color_IT: |
|
|
3751 | process_color_seq (XTerm_Color_IT, Color_IT, str, resp); |
|
|
3752 | break; |
|
|
3753 | case XTerm_Color_UL: |
|
|
3754 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3755 | break; |
|
|
3756 | case XTerm_Color_RV: |
3903 | case XTerm_Color_RV: |
3757 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3904 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3758 | break; |
3905 | break; |
|
|
3906 | case Rxvt_Color_BD: |
|
|
3907 | case URxvt_Color_BD: |
|
|
3908 | process_color_seq (op, Color_BD, str, resp); |
|
|
3909 | break; |
|
|
3910 | case Rxvt_Color_UL: |
|
|
3911 | case URxvt_Color_UL: |
|
|
3912 | process_color_seq (op, Color_UL, str, resp); |
|
|
3913 | break; |
|
|
3914 | case URxvt_Color_IT: |
|
|
3915 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
|
|
3916 | break; |
3759 | #endif |
3917 | #endif |
3760 | #if TRANSPARENT && TINTING |
3918 | #if TRANSPARENT && TINTING |
3761 | case XTerm_Color_tint: |
3919 | case URxvt_Color_tint: |
3762 | process_color_seq (XTerm_Color_tint, Color_tint, str, resp); |
3920 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3763 | check_our_parents (); |
3921 | check_our_parents (); |
3764 | if (am_transparent) |
3922 | if (am_transparent) |
3765 | want_full_refresh = want_refresh = 1; |
3923 | want_full_refresh = want_refresh = 1; |
3766 | break; |
3924 | break; |
3767 | #endif |
3925 | #endif |
3768 | |
3926 | |
3769 | case XTerm_Pixmap: |
3927 | case Rxvt_Pixmap: |
3770 | if (*str != ';') |
3928 | if (*str != ';') |
3771 | { |
3929 | { |
3772 | #if XPM_BACKGROUND |
3930 | #if XPM_BACKGROUND |
3773 | scale_pixmap (""); /* reset to default scaling */ |
3931 | scale_pixmap (""); /* reset to default scaling */ |
3774 | set_bgPixmap (str); /* change pixmap */ |
3932 | set_bgPixmap (str); /* change pixmap */ |
3775 | #endif |
|
|
3776 | scr_touch (true); |
3933 | scr_touch (true); |
|
|
3934 | #endif |
3777 | } |
3935 | } |
|
|
3936 | |
3778 | while ((str = strchr (str, ';')) != NULL) |
3937 | while ((str = strchr (str, ';')) != NULL) |
3779 | { |
3938 | { |
3780 | str++; |
3939 | str++; |
3781 | #if XPM_BACKGROUND |
3940 | #if XPM_BACKGROUND |
3782 | changed += scale_pixmap (str); |
3941 | changed += scale_pixmap (str); |
… | |
… | |
3785 | |
3944 | |
3786 | if (changed) |
3945 | if (changed) |
3787 | { |
3946 | { |
3788 | #ifdef XPM_BACKGROUND |
3947 | #ifdef XPM_BACKGROUND |
3789 | resize_pixmap (); |
3948 | resize_pixmap (); |
3790 | #endif |
|
|
3791 | scr_touch (true); |
3949 | scr_touch (true); |
|
|
3950 | #endif |
3792 | } |
3951 | } |
3793 | break; |
3952 | break; |
3794 | |
3953 | |
3795 | case XTerm_restoreFG: |
3954 | case Rxvt_restoreFG: |
3796 | set_window_color (Color_fg, str); |
3955 | set_window_color (Color_fg, str); |
3797 | break; |
3956 | break; |
3798 | case XTerm_restoreBG: |
3957 | case Rxvt_restoreBG: |
3799 | set_window_color (Color_bg, str); |
3958 | set_window_color (Color_bg, str); |
3800 | break; |
3959 | break; |
3801 | |
3960 | |
3802 | case XTerm_logfile: |
3961 | case XTerm_logfile: |
3803 | // TODO, when secure mode? |
3962 | // TODO, when secure mode? |
3804 | break; |
3963 | break; |
3805 | |
3964 | |
|
|
3965 | #ifdef MENUBAR |
|
|
3966 | case URxvt_Menu: |
|
|
3967 | if (OPTION (Opt_insecure)) |
|
|
3968 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3969 | break; |
|
|
3970 | #endif |
|
|
3971 | #if 0 |
|
|
3972 | case Rxvt_dumpscreen: /* no error notices */ |
|
|
3973 | { |
|
|
3974 | int fd; |
|
|
3975 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
|
|
3976 | { |
|
|
3977 | scr_dump (fd); |
|
|
3978 | close (fd); |
|
|
3979 | } |
|
|
3980 | } |
|
|
3981 | break; |
|
|
3982 | #endif |
3806 | case XTerm_font: |
3983 | case XTerm_font: |
3807 | op = URxvt_font; |
3984 | op = URxvt_font; |
3808 | case URxvt_font: |
3985 | case URxvt_font: |
3809 | #if ENABLE_STYLES |
3986 | #if ENABLE_STYLES |
3810 | case URxvt_boldFont: |
3987 | case URxvt_boldFont: |
3811 | case URxvt_italicFont: |
3988 | case URxvt_italicFont: |
3812 | case URxvt_boldItalicFont: |
3989 | case URxvt_boldItalicFont: |
3813 | #endif |
3990 | #endif |
3814 | if (query) |
3991 | if (query) |
3815 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3992 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3816 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3993 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3817 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3994 | ? fontset[op - URxvt_font]->fontdesc : "", |
3818 | resp); |
3995 | resp); |
3819 | else |
3996 | else |
3820 | { |
3997 | { |
3821 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3998 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3822 | |
3999 | |
… | |
… | |
3825 | set_fonts (); |
4002 | set_fonts (); |
3826 | } |
4003 | } |
3827 | break; |
4004 | break; |
3828 | |
4005 | |
3829 | #if ENABLE_FRILLS |
4006 | #if ENABLE_FRILLS |
3830 | case XTerm_locale: |
4007 | case URxvt_locale: |
3831 | if (query) |
4008 | if (query) |
3832 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); |
4009 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3833 | else |
4010 | else |
3834 | { |
4011 | { |
3835 | set_locale (str); |
4012 | set_locale (str); |
3836 | pty.set_utf8_mode (enc_utf8); |
4013 | pty.set_utf8_mode (enc_utf8); |
3837 | # ifdef USE_XIM |
|
|
3838 | im_cb (); |
4014 | init_xlocale (); |
3839 | # endif |
|
|
3840 | } |
4015 | } |
3841 | break; |
4016 | break; |
3842 | #endif |
|
|
3843 | |
4017 | |
3844 | #ifdef MENUBAR |
4018 | case URxvt_view_up: |
3845 | case XTerm_Menu: |
4019 | case URxvt_view_down: |
3846 | if (options & Opt_insecure) |
4020 | { |
3847 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
4021 | int lines = atoi (str); |
|
|
4022 | |
|
|
4023 | if (lines) |
|
|
4024 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
|
|
4025 | else |
|
|
4026 | scr_erase_savelines (); |
|
|
4027 | } |
|
|
4028 | |
3848 | break; |
4029 | break; |
3849 | #endif |
4030 | #endif |
3850 | #if 0 |
4031 | |
3851 | case XTerm_dumpscreen: /* no error notices */ |
4032 | #if ENABLE_PERL |
3852 | { |
4033 | case URxvt_perl: |
3853 | int fd; |
4034 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
3854 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
4035 | ; // no responses yet |
3855 | { |
|
|
3856 | scr_dump (fd); |
|
|
3857 | close (fd); |
|
|
3858 | } |
|
|
3859 | } |
|
|
3860 | break; |
4036 | break; |
3861 | #endif |
4037 | #endif |
3862 | } |
4038 | } |
3863 | } |
4039 | } |
3864 | /*----------------------------------------------------------------------*/ |
4040 | /*----------------------------------------------------------------------*/ |
… | |
… | |
3973 | } |
4149 | } |
3974 | |
4150 | |
3975 | /* extra handling for values with state unkept */ |
4151 | /* extra handling for values with state unkept */ |
3976 | switch (arg[i]) |
4152 | switch (arg[i]) |
3977 | { |
4153 | { |
|
|
4154 | #if ENABLE_STYLES |
|
|
4155 | case 1021: |
|
|
4156 | set_option (Opt_intensityStyles, mode); |
|
|
4157 | |
|
|
4158 | scr_touch (true); |
|
|
4159 | break; |
|
|
4160 | #endif |
3978 | case 1048: /* alternative cursor save */ |
4161 | case 1048: /* alternative cursor save */ |
3979 | case 1049: |
4162 | case 1049: |
3980 | if (options & Opt_secondaryScreen) |
4163 | if (OPTION (Opt_secondaryScreen)) |
3981 | if (mode == 0) |
4164 | if (mode == 0) |
3982 | scr_cursor (RESTORE); |
4165 | scr_cursor (RESTORE); |
3983 | else if (mode == 1) |
4166 | else if (mode == 1) |
3984 | scr_cursor (SAVE); |
4167 | scr_cursor (SAVE); |
3985 | break; |
4168 | break; |
… | |
… | |
3997 | */ |
4180 | */ |
3998 | PrivMode (1, PrivMode_vt52); |
4181 | PrivMode (1, PrivMode_vt52); |
3999 | break; |
4182 | break; |
4000 | case 3: /* 80/132 */ |
4183 | case 3: /* 80/132 */ |
4001 | if (priv_modes & PrivMode_132OK) |
4184 | if (priv_modes & PrivMode_132OK) |
4002 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4185 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4003 | break; |
4186 | break; |
4004 | case 4: /* smooth scrolling */ |
4187 | case 4: /* smooth scrolling */ |
4005 | if (state) |
|
|
4006 | options &= ~Opt_jumpScroll; |
|
|
4007 | else |
|
|
4008 | options |= Opt_jumpScroll; |
4188 | set_option (Opt_jumpScroll, !state); |
4009 | break; |
4189 | break; |
4010 | case 5: /* reverse video */ |
4190 | case 5: /* reverse video */ |
4011 | scr_rvideo_mode (state); |
4191 | scr_rvideo_mode (state); |
4012 | break; |
4192 | break; |
4013 | case 6: /* relative/absolute origins */ |
4193 | case 6: /* relative/absolute origins */ |
… | |
… | |
4054 | #if 0 |
4234 | #if 0 |
4055 | case 1001: |
4235 | case 1001: |
4056 | break; /* X11 mouse highlighting */ |
4236 | break; /* X11 mouse highlighting */ |
4057 | #endif |
4237 | #endif |
4058 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4238 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4059 | if (state) |
|
|
4060 | options &= ~Opt_scrollTtyOutput; |
|
|
4061 | else |
|
|
4062 | options |= Opt_scrollTtyOutput; |
4239 | set_option (Opt_scrollTtyOutput, !state); |
4063 | break; |
4240 | break; |
4064 | case 1011: /* scroll to bottom on key press */ |
4241 | case 1011: /* scroll to bottom on key press */ |
4065 | if (state) |
|
|
4066 | options |= Opt_scrollTtyKeypress; |
4242 | set_option (Opt_scrollTtyKeypress, state); |
4067 | else |
|
|
4068 | options &= ~Opt_scrollTtyKeypress; |
|
|
4069 | break; |
4243 | break; |
4070 | case 1047: /* secondary screen w/ clearing last */ |
4244 | case 1047: /* secondary screen w/ clearing last */ |
4071 | if (options & Opt_secondaryScreen) |
4245 | if (OPTION (Opt_secondaryScreen)) |
4072 | if (current_screen != PRIMARY) |
4246 | if (current_screen != PRIMARY) |
4073 | scr_erase_screen (2); |
4247 | scr_erase_screen (2); |
4074 | scr_change_screen (state); |
4248 | scr_change_screen (state); |
4075 | break; |
4249 | break; |
4076 | case 1049: /* secondary screen w/ clearing first */ |
4250 | case 1049: /* secondary screen w/ clearing first */ |
4077 | scr_change_screen (state); |
4251 | scr_change_screen (state); |
4078 | if (options & Opt_secondaryScreen) |
4252 | if (OPTION (Opt_secondaryScreen)) |
4079 | if (current_screen != PRIMARY) |
4253 | if (current_screen != PRIMARY) |
4080 | scr_erase_screen (2); |
4254 | scr_erase_screen (2); |
4081 | break; |
4255 | break; |
4082 | default: |
4256 | default: |
4083 | break; |
4257 | break; |
… | |
… | |
4211 | scr_color (Color_bg, Color_bg); |
4385 | scr_color (Color_bg, Color_bg); |
4212 | break; |
4386 | break; |
4213 | |
4387 | |
4214 | //case 50: // not variable spacing |
4388 | //case 50: // not variable spacing |
4215 | |
4389 | |
4216 | #ifndef NO_BRIGHTCOLOR |
4390 | #if ENABLE_FRILLS |
4217 | case 90: |
4391 | case 90: |
4218 | case 91: /* set bright fg color */ |
4392 | case 91: /* set bright fg color */ |
4219 | case 92: |
4393 | case 92: |
4220 | case 93: |
4394 | case 93: |
4221 | case 94: |
4395 | case 94: |
… | |
… | |
4233 | case 106: |
4407 | case 106: |
4234 | case 107: |
4408 | case 107: |
4235 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4409 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4236 | break; |
4410 | break; |
4237 | #endif |
4411 | #endif |
4238 | |
|
|
4239 | } |
4412 | } |
4240 | } |
4413 | } |
4241 | } |
4414 | } |
4242 | /*}}} */ |
4415 | /*}}} */ |
4243 | |
4416 | |
… | |
… | |
4267 | */ |
4440 | */ |
4268 | void |
4441 | void |
4269 | rxvt_term::tt_printf (const char *fmt,...) |
4442 | rxvt_term::tt_printf (const char *fmt,...) |
4270 | { |
4443 | { |
4271 | va_list arg_ptr; |
4444 | va_list arg_ptr; |
4272 | unsigned char buf[256]; |
4445 | char buf[256]; |
4273 | |
4446 | |
4274 | va_start (arg_ptr, fmt); |
4447 | va_start (arg_ptr, fmt); |
4275 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4448 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4276 | va_end (arg_ptr); |
4449 | va_end (arg_ptr); |
4277 | tt_write (buf, strlen (buf)); |
4450 | tt_write (buf, strlen (buf)); |
… | |
… | |
4282 | * or generated by us in response to a query ESC sequence. |
4455 | * or generated by us in response to a query ESC sequence. |
4283 | */ |
4456 | */ |
4284 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4457 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4285 | |
4458 | |
4286 | void |
4459 | void |
4287 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4460 | rxvt_term::tt_write (const char *data, unsigned int len) |
4288 | { |
4461 | { |
|
|
4462 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4463 | return; |
|
|
4464 | |
|
|
4465 | if (pty.pty < 0) |
|
|
4466 | return; |
|
|
4467 | |
4289 | if (v_buflen == 0) |
4468 | if (v_buflen == 0) |
4290 | { |
4469 | { |
4291 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4470 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4292 | |
4471 | |
4293 | if ((unsigned int)written == len) |
4472 | if ((unsigned int)written == len) |
… | |
… | |
4295 | |
4474 | |
4296 | data += written; |
4475 | data += written; |
4297 | len -= written; |
4476 | len -= written; |
4298 | } |
4477 | } |
4299 | |
4478 | |
4300 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4479 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4301 | |
4480 | |
4302 | memcpy (v_buffer + v_buflen, data, len); |
4481 | memcpy (v_buffer + v_buflen, data, len); |
4303 | v_buflen += len; |
4482 | v_buflen += len; |
4304 | |
4483 | |
4305 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4484 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
… | |
… | |
4324 | } |
4503 | } |
4325 | |
4504 | |
4326 | memmove (v_buffer, v_buffer + written, v_buflen); |
4505 | memmove (v_buffer, v_buffer + written, v_buflen); |
4327 | } |
4506 | } |
4328 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4507 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4329 | // original code just ignores this... |
4508 | pty_ev.set (EVENT_READ); |
4330 | destroy (); |
|
|
4331 | } |
4509 | } |
4332 | |
4510 | |
4333 | /*----------------------- end-of-file (C source) -----------------------*/ |
4511 | /*----------------------- end-of-file (C source) -----------------------*/ |
4334 | |
4512 | |