1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*----------------------------------------------------------------------* |
2 | * File: command.C |
2 | * File: command.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
… | |
… | |
25 | * - extensive modifications |
25 | * - extensive modifications |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
27 | * Copyright (c) 2001 Marius Gedminas |
27 | * Copyright (c) 2001 Marius Gedminas |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
30 | * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> |
30 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
31 | * |
31 | * |
32 | * This program is free software; you can redistribute it and/or modify |
32 | * This program is free software; you can redistribute it and/or modify |
33 | * it under the terms of the GNU General Public License as published by |
33 | * it under the terms of the GNU General Public License as published by |
34 | * the Free Software Foundation; either version 2 of the License, or |
34 | * the Free Software Foundation; either version 2 of the License, or |
35 | * (at your option) any later version. |
35 | * (at your option) any later version. |
… | |
… | |
43 | * along with this program; if not, write to the Free Software |
43 | * along with this program; if not, write to the Free Software |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
45 | *----------------------------------------------------------------------*/ |
45 | *----------------------------------------------------------------------*/ |
46 | |
46 | |
47 | /*{{{ includes: */ |
47 | /*{{{ includes: */ |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" |
|
|
50 | #include "rxvtperl.h" |
50 | #include "version.h" |
51 | #include "version.h" |
51 | #include "command.h" |
52 | #include "command.h" |
52 | |
53 | |
53 | #ifdef KEYSYM_RESOURCE |
54 | #ifdef KEYSYM_RESOURCE |
54 | # include "keyboard.h" |
55 | # include "keyboard.h" |
55 | #endif |
56 | #endif |
56 | |
57 | |
57 | #include <csignal> |
58 | #include <csignal> |
58 | |
59 | |
|
|
60 | #if LINUX_YIELD_HACK |
|
|
61 | # include <ctime> |
|
|
62 | #endif |
|
|
63 | |
59 | /*----------------------------------------------------------------------*/ |
64 | /*----------------------------------------------------------------------*/ |
60 | |
65 | |
61 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
66 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
62 | |
|
|
63 | // exception thrown when the command parser runs out of input data |
|
|
64 | class out_of_input { } out_of_input; |
|
|
65 | |
67 | |
66 | #if ENABLE_FRILLS || ISO_14755 |
68 | #if ENABLE_FRILLS || ISO_14755 |
67 | |
69 | |
68 | #define ISO_14755_STARTED 0x80000000UL |
70 | #define ISO_14755_STARTED 0x80000000UL |
69 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
71 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
… | |
… | |
135 | rxvt_term::iso14755_54 (int x, int y) |
137 | rxvt_term::iso14755_54 (int x, int y) |
136 | { |
138 | { |
137 | x = Pixel2Col (x); |
139 | x = Pixel2Col (x); |
138 | y = Pixel2Row (y); |
140 | y = Pixel2Row (y); |
139 | |
141 | |
140 | if (x < 0 || x >= TermWin.ncol |
142 | if (!IN_RANGE_EXC (x, 0, ncol) |
141 | || y < 0 || y >= TermWin.nrow) |
143 | || !IN_RANGE_EXC (y, 0, nrow)) |
142 | return; |
144 | return; |
143 | |
145 | |
144 | for (;;) |
146 | for (;;) |
145 | { |
147 | { |
146 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
148 | const line_t &l = ROW(y + view_start); |
|
|
149 | |
|
|
150 | text_t t = l.t[x]; |
147 | |
151 | |
148 | if (t != NOCHAR || !x) |
152 | if (t != NOCHAR || !x) |
149 | { |
153 | { |
150 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
154 | iso14755_51 (l.t[x], l.r[x], x, y); |
151 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
152 | iso14755buf = ISO_14755_54; |
155 | iso14755buf = ISO_14755_54; |
153 | break; |
156 | break; |
154 | } |
157 | } |
155 | |
158 | |
156 | x--; |
159 | x--; |
157 | } |
160 | } |
158 | |
|
|
159 | } |
161 | } |
160 | #endif |
|
|
161 | |
162 | |
162 | #if ENABLE_OVERLAY |
|
|
163 | void |
163 | void |
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) |
165 | { |
165 | { |
166 | rxvt_fontset *fs = FONTSET (r); |
166 | rxvt_fontset *fs = FONTSET (r); |
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
168 | wchar_t *chr, *alloc, ch2; |
168 | wchar_t *chr, *alloc, ch2, *fname; |
169 | int len; |
169 | int len; |
170 | |
170 | |
|
|
171 | fname = rxvt_utf8towcs (f->name); |
|
|
172 | |
171 | #if ENABLE_COMBINING |
173 | # if ENABLE_COMBINING |
172 | if (IS_COMPOSE (ch)) |
174 | if (IS_COMPOSE (ch)) |
173 | { |
175 | { |
174 | len = rxvt_composite.expand (ch, 0); |
176 | len = rxvt_composite.expand (ch, 0); |
175 | alloc = chr = new wchar_t[len]; |
177 | alloc = chr = new wchar_t[len]; |
176 | rxvt_composite.expand (ch, chr); |
178 | rxvt_composite.expand (ch, chr); |
177 | } |
179 | } |
178 | else |
180 | else |
179 | #endif |
181 | # endif |
180 | { |
182 | { |
181 | ch2 = ch; |
183 | ch2 = ch; |
182 | |
184 | |
183 | alloc = 0; |
185 | alloc = 0; |
184 | chr = &ch2; |
186 | chr = &ch2; |
185 | len = 1; |
187 | len = 1; |
186 | } |
188 | } |
187 | |
189 | |
188 | int width = strlen (f->name); |
190 | char attr[80]; // plenty |
189 | |
191 | |
190 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
192 | sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", |
|
|
193 | (int)r, |
|
|
194 | fgcolor_of (r), bgcolor_of (r), |
|
|
195 | r & RS_Bold ? " bold" : "", |
|
|
196 | r & RS_Italic ? " italic" : "", |
|
|
197 | r & RS_Blink ? " blink" : "", |
|
|
198 | r & RS_RVid ? " rvid" : "", |
|
|
199 | r & RS_Uline ? " uline" : "", |
|
|
200 | r & RS_Careful ? " careful" : ""); |
|
|
201 | |
|
|
202 | int width = wcswidth (fname, wcslen (fname)); |
|
|
203 | |
|
|
204 | max_it (width, 8+5); // for char + hey |
|
|
205 | max_it (width, strlen (attr)); |
|
|
206 | |
|
|
207 | if (y >= 0) |
|
|
208 | { |
|
|
209 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
|
|
210 | x = 0; |
|
|
211 | } |
|
|
212 | |
|
|
213 | scr_overlay_new (x, y, width, len + 2); |
191 | |
214 | |
192 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
215 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
193 | |
216 | |
194 | for (int y = 0; y < len; y++) |
217 | for (int y = 0; y < len; y++) |
195 | { |
218 | { |
… | |
… | |
198 | ch = *chr++; |
221 | ch = *chr++; |
199 | |
222 | |
200 | sprintf (buf, "%8x", ch); |
223 | sprintf (buf, "%8x", ch); |
201 | scr_overlay_set (0, y, buf); |
224 | scr_overlay_set (0, y, buf); |
202 | scr_overlay_set (9, y, '='); |
225 | scr_overlay_set (9, y, '='); |
203 | #if !UNICODE3 |
226 | # if !UNICODE3 |
204 | if (ch >= 0x10000) |
227 | if (ch >= 0x10000) |
205 | ch = 0xfffd; |
228 | ch = 0xfffd; |
206 | #endif |
229 | # endif |
207 | scr_overlay_set (11, y, ch, r); |
230 | scr_overlay_set (11, y, ch, r); |
|
|
231 | |
|
|
232 | if (WCWIDTH (ch) >= 2) |
208 | scr_overlay_set (12, y, NOCHAR, r); |
233 | scr_overlay_set (12, y, NOCHAR, r); |
209 | } |
234 | } |
210 | |
235 | |
|
|
236 | // { |
|
|
237 | // char buf[4+4+3+1]; |
|
|
238 | // snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); |
|
|
239 | // scr_overlay_set (0, 0, buf); |
|
|
240 | // } |
|
|
241 | scr_overlay_set (0, len , attr); |
211 | scr_overlay_set (0, len, f->name); |
242 | scr_overlay_set (0, len + 1, fname); |
212 | |
243 | |
|
|
244 | free (fname); |
|
|
245 | |
213 | #if ENABLE_COMBINING |
246 | # if ENABLE_COMBINING |
214 | if (alloc) |
247 | if (alloc) |
215 | delete [] alloc; |
248 | delete [] alloc; |
216 | #endif |
249 | # endif |
217 | } |
250 | } |
218 | #endif |
251 | #endif |
219 | |
252 | |
220 | void |
253 | void |
221 | rxvt_term::commit_iso14755 () |
254 | rxvt_term::commit_iso14755 () |
… | |
… | |
238 | mb[0] = ch[0]; |
271 | mb[0] = ch[0]; |
239 | len = 1; |
272 | len = 1; |
240 | } |
273 | } |
241 | |
274 | |
242 | if (len > 0) |
275 | if (len > 0) |
243 | tt_write ((unsigned char *)mb, len); |
276 | tt_write (mb, len); |
244 | else |
277 | else |
245 | scr_bell (); |
278 | scr_bell (); |
246 | } |
279 | } |
247 | |
280 | |
248 | iso14755buf = 0; |
281 | iso14755buf = 0; |
… | |
… | |
265 | |
298 | |
266 | return -1; |
299 | return -1; |
267 | } |
300 | } |
268 | #endif |
301 | #endif |
269 | |
302 | |
270 | /*{{{ Convert the keypress event into a string */ |
|
|
271 | void |
303 | void |
272 | rxvt_term::lookup_key (XKeyEvent &ev) |
304 | rxvt_term::key_press (XKeyEvent &ev) |
273 | { |
305 | { |
274 | int ctrl, meta, shft, len; |
306 | int ctrl, meta, shft, len; |
275 | unsigned int newlen; |
307 | unsigned int newlen; |
276 | KeySym keysym; |
308 | KeySym keysym; |
277 | #ifdef DEBUG_CMD |
|
|
278 | static int debug_key = 1; /* accessible by a debugger only */ |
|
|
279 | #endif |
|
|
280 | int valid_keysym; |
309 | int valid_keysym; |
281 | unsigned char kbuf[KBUFSZ]; |
310 | char kbuf[KBUFSZ]; |
|
|
311 | |
|
|
312 | #if ISO_14755 |
|
|
313 | if (iso14755buf & ISO_14755_52) |
|
|
314 | return; |
|
|
315 | #endif |
282 | |
316 | |
283 | /* |
317 | /* |
284 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
318 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
285 | * escape sequence to toggle the Keypad. |
319 | * escape sequence to toggle the Keypad. |
286 | * |
320 | * |
… | |
… | |
304 | Status status_return; |
338 | Status status_return; |
305 | |
339 | |
306 | #if 0 |
340 | #if 0 |
307 | #ifdef X_HAVE_UTF8_STRING |
341 | #ifdef X_HAVE_UTF8_STRING |
308 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
342 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
309 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
343 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
310 | KBUFSZ, &keysym, &status_return); |
344 | KBUFSZ, &keysym, &status_return); |
311 | else |
345 | else |
312 | #endif |
346 | #endif |
313 | #endif |
347 | #endif |
314 | { |
348 | { |
… | |
… | |
351 | || status_return == XLookupBoth; |
385 | || status_return == XLookupBoth; |
352 | } |
386 | } |
353 | else |
387 | else |
354 | #endif |
388 | #endif |
355 | { |
389 | { |
356 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
390 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
357 | valid_keysym = keysym != NoSymbol; |
391 | valid_keysym = keysym != NoSymbol; |
358 | } |
392 | } |
359 | |
393 | |
360 | if (valid_keysym) |
394 | if (valid_keysym) |
361 | { |
395 | { |
362 | #ifdef KEYSYM_RESOURCE |
396 | #ifdef KEYSYM_RESOURCE |
363 | if (keyboard->dispatch (this, keysym, ev.state)) |
397 | if (keyboard->dispatch (this, keysym, ev.state)) |
364 | return; |
398 | return; |
365 | #endif |
399 | #endif |
366 | |
400 | |
367 | if (TermWin.saveLines) |
401 | if (saveLines) |
368 | { |
402 | { |
369 | #ifdef UNSHIFTED_SCROLLKEYS |
403 | #ifdef UNSHIFTED_SCROLLKEYS |
370 | if (!ctrl && !meta) |
404 | if (!ctrl && !meta) |
371 | #else |
405 | #else |
372 | if (IS_SCROLL_MOD) |
406 | if (IS_SCROLL_MOD) |
373 | #endif |
407 | #endif |
374 | { |
408 | { |
375 | int lnsppg; |
409 | int lnsppg; |
376 | |
410 | |
377 | #ifdef PAGING_CONTEXT_LINES |
411 | #ifdef PAGING_CONTEXT_LINES |
378 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
412 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
379 | #else |
413 | #else |
380 | lnsppg = TermWin.nrow * 4 / 5; |
414 | lnsppg = nrow * 4 / 5; |
381 | #endif |
415 | #endif |
382 | if (keysym == XK_Prior) |
416 | if (keysym == XK_Prior) |
383 | { |
417 | { |
384 | scr_page (UP, lnsppg); |
418 | scr_page (UP, lnsppg); |
385 | return; |
419 | return; |
… | |
… | |
413 | scr_move_to (0, 1); |
447 | scr_move_to (0, 1); |
414 | return; |
448 | return; |
415 | } |
449 | } |
416 | else if (keysym == XK_End) |
450 | else if (keysym == XK_End) |
417 | { |
451 | { |
418 | scr_move_to (1, 0); |
452 | scr_move_to (1, 1); |
419 | return; |
453 | return; |
420 | } |
454 | } |
421 | } |
455 | } |
422 | #endif |
456 | #endif |
423 | } |
457 | } |
… | |
… | |
434 | { |
468 | { |
435 | switch (keysym) |
469 | switch (keysym) |
436 | { |
470 | { |
437 | /* normal XTerm key bindings */ |
471 | /* normal XTerm key bindings */ |
438 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
472 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
439 | selection_request (ev.time, 0, 0); |
473 | selection_request (ev.time); |
440 | return; |
474 | return; |
441 | #if TODO |
475 | #if TODO |
442 | /* rxvt extras */ |
476 | /* rxvt extras */ |
443 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
477 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
444 | change_font (FONT_UP); |
478 | change_font (FONT_UP); |
… | |
… | |
825 | { |
859 | { |
826 | #ifdef META8_OPTION |
860 | #ifdef META8_OPTION |
827 | /* set 8-bit on */ |
861 | /* set 8-bit on */ |
828 | if (meta && (meta_char == 0x80)) |
862 | if (meta && (meta_char == 0x80)) |
829 | { |
863 | { |
830 | unsigned char *ch; |
864 | char *ch; |
831 | |
865 | |
832 | for (ch = kbuf; ch < kbuf + len; ch++) |
866 | for (ch = kbuf; ch < kbuf + len; ch++) |
833 | *ch |= 0x80; |
867 | *ch |= 0x80; |
834 | |
868 | |
835 | meta = 0; |
869 | meta = 0; |
… | |
… | |
837 | #endif |
871 | #endif |
838 | /* nil */ ; |
872 | /* nil */ ; |
839 | } |
873 | } |
840 | } |
874 | } |
841 | |
875 | |
|
|
876 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
|
|
877 | return; |
|
|
878 | |
842 | if (len <= 0) |
879 | if (len <= 0) |
843 | return; /* not mapped */ |
880 | return; /* not mapped */ |
844 | |
881 | |
845 | if (options & Opt_scrollTtyKeypress) |
882 | if (OPTION (Opt_scrollTtyKeypress)) |
846 | if (TermWin.view_start) |
883 | if (view_start) |
847 | { |
884 | { |
848 | TermWin.view_start = 0; |
885 | view_start = 0; |
849 | want_refresh = 1; |
886 | want_refresh = 1; |
850 | } |
887 | } |
851 | |
888 | |
852 | /* |
889 | /* |
853 | * these modifications only affect the static keybuffer |
890 | * these modifications only affect the static keybuffer |
… | |
… | |
868 | #ifdef META8_OPTION |
905 | #ifdef META8_OPTION |
869 | && meta_char == C0_ESC |
906 | && meta_char == C0_ESC |
870 | #endif |
907 | #endif |
871 | ) |
908 | ) |
872 | { |
909 | { |
873 | const unsigned char ch = C0_ESC; |
910 | const char ch = C0_ESC; |
874 | tt_write (&ch, 1); |
911 | tt_write (&ch, 1); |
875 | } |
912 | } |
876 | |
913 | |
877 | #if defined(DEBUG_CMD) |
|
|
878 | /* Display keyboard buffer contents */ |
|
|
879 | unsigned char *p; |
|
|
880 | int i; |
|
|
881 | |
|
|
882 | fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len); |
|
|
883 | for (i = 0, p = kbuf; i < len; i++, p++) |
|
|
884 | fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p); |
|
|
885 | fprintf (stderr, "'\n"); |
|
|
886 | #endif /* DEBUG_CMD */ |
|
|
887 | tt_write (kbuf, (unsigned int)len); |
914 | tt_write (kbuf, (unsigned int)len); |
888 | } |
915 | } |
889 | /*}}} */ |
|
|
890 | |
916 | |
|
|
917 | void |
|
|
918 | rxvt_term::key_release (XKeyEvent &ev) |
|
|
919 | { |
|
|
920 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
|
|
921 | KeySym keysym; |
|
|
922 | |
|
|
923 | keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
|
|
924 | #endif |
|
|
925 | |
|
|
926 | #if ENABLE_FRILLS || ISO_14755 |
|
|
927 | // ISO 14755 support |
|
|
928 | if (iso14755buf) |
|
|
929 | if (iso14755buf & ISO_14755_52) |
|
|
930 | { |
|
|
931 | # if ENABLE_OVERLAY |
|
|
932 | scr_overlay_off (); |
|
|
933 | # endif |
|
|
934 | # if ISO_14755 |
|
|
935 | // iso14755 part 5.2 handling: release time |
|
|
936 | // first: controls |
|
|
937 | if ((ev.state & ControlMask) |
|
|
938 | && ((keysym >= 0x40 && keysym <= 0x5f) |
|
|
939 | || (keysym >= 0x61 && keysym <= 0x7f))) |
|
|
940 | { |
|
|
941 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
|
|
942 | commit_iso14755 (); |
|
|
943 | |
|
|
944 | return; |
|
|
945 | } |
|
|
946 | |
|
|
947 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
|
|
948 | if (i[0] == keysym) |
|
|
949 | { |
|
|
950 | iso14755buf = ISO_14755_51 | i[1]; |
|
|
951 | commit_iso14755 (); |
|
|
952 | |
|
|
953 | return; |
|
|
954 | } |
|
|
955 | |
|
|
956 | scr_bell (); |
|
|
957 | # endif |
|
|
958 | iso14755buf = 0; |
|
|
959 | |
|
|
960 | return; |
|
|
961 | } |
|
|
962 | else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
|
|
963 | { |
|
|
964 | # if ENABLE_OVERLAY |
|
|
965 | scr_overlay_off (); |
|
|
966 | # endif |
|
|
967 | if (iso14755buf & ISO_14755_51) |
|
|
968 | commit_iso14755 (); |
|
|
969 | #if ISO_14755 |
|
|
970 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
971 | { |
|
|
972 | iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair |
|
|
973 | |
|
|
974 | scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); |
|
|
975 | scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); |
|
|
976 | } |
|
|
977 | # endif |
|
|
978 | else |
|
|
979 | iso14755buf = 0; |
|
|
980 | } |
|
|
981 | #endif |
|
|
982 | |
|
|
983 | if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
984 | return; |
|
|
985 | |
|
|
986 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
987 | if (!(ev.state & ControlMask)) |
|
|
988 | slip_wheel_ev.stop (); |
|
|
989 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
|
|
990 | mouse_slip_wheel_speed = 0; |
|
|
991 | #endif |
|
|
992 | } |
|
|
993 | |
891 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
994 | #if defined (KEYSYM_RESOURCE) |
892 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
|
|
893 | /* attempt to `write' count to the input buffer */ |
|
|
894 | unsigned int |
995 | unsigned int |
895 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
996 | rxvt_term::cmd_write (const char *str, unsigned int count) |
896 | { |
997 | { |
897 | unsigned int n, s; |
998 | unsigned int n, s; |
898 | |
999 | |
899 | n = cmdbuf_ptr - cmdbuf_base; |
1000 | n = cmdbuf_ptr - cmdbuf_base; |
900 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
1001 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
937 | } |
1038 | } |
938 | #endif |
1039 | #endif |
939 | |
1040 | |
940 | if (want_refresh) |
1041 | if (want_refresh) |
941 | { |
1042 | { |
|
|
1043 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
|
|
1044 | { |
|
|
1045 | int row = view_start; |
|
|
1046 | int end_row = row + nrow; |
|
|
1047 | |
|
|
1048 | while (row > top_row && ROW (row - 1).is_longer ()) |
|
|
1049 | --row; |
|
|
1050 | |
|
|
1051 | do |
|
|
1052 | { |
|
|
1053 | int start_row = row; |
|
|
1054 | line_t *l; |
|
|
1055 | |
|
|
1056 | do |
|
|
1057 | { |
|
|
1058 | l = &ROW (row++); |
|
|
1059 | |
|
|
1060 | if (!(l->f & LINE_FILTERED)) |
|
|
1061 | { |
|
|
1062 | // line not filtered, mark it as filtered |
|
|
1063 | l->f |= LINE_FILTERED; |
|
|
1064 | while (l->is_longer ()) |
|
|
1065 | { |
|
|
1066 | l = &ROW (row++); |
|
|
1067 | l->f |= LINE_FILTERED; |
|
|
1068 | } |
|
|
1069 | |
|
|
1070 | // and filter it |
|
|
1071 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1072 | |
|
|
1073 | break; |
|
|
1074 | } |
|
|
1075 | } |
|
|
1076 | while (l->is_longer () && row < end_row); |
|
|
1077 | } |
|
|
1078 | while (row < end_row); |
|
|
1079 | } |
|
|
1080 | |
942 | scr_refresh (refresh_type); |
1081 | scr_refresh (); |
943 | scrollbar_show (1); |
1082 | scrollbar_show (1); |
944 | #ifdef USE_XIM |
1083 | #ifdef USE_XIM |
945 | IMSendSpot (); |
1084 | IMSendSpot (); |
946 | #endif |
1085 | #endif |
947 | } |
1086 | } |
… | |
… | |
950 | } |
1089 | } |
951 | |
1090 | |
952 | void |
1091 | void |
953 | rxvt_term::check_cb (check_watcher &w) |
1092 | rxvt_term::check_cb (check_watcher &w) |
954 | { |
1093 | { |
955 | SET_R (this); |
1094 | make_current (); |
956 | SET_LOCALE (locale); |
|
|
957 | |
1095 | |
958 | display->flush (); |
1096 | display->flush (); |
959 | |
1097 | |
960 | if (want_refresh && !flush_ev.active) |
1098 | if (want_refresh && !flush_ev.active) |
961 | flush_ev.start (NOW + 0.01); |
1099 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
962 | } |
1100 | } |
963 | |
1101 | |
964 | void |
1102 | void |
965 | rxvt_term::flush_cb (time_watcher &w) |
1103 | rxvt_term::flush_cb (time_watcher &w) |
966 | { |
1104 | { |
967 | SET_R (this); |
1105 | make_current (); |
968 | SET_LOCALE (locale); |
|
|
969 | |
1106 | |
970 | refresh_limit = 1; |
1107 | refresh_limit = 1; |
971 | refresh_count = 0; |
1108 | refresh_count = 0; |
972 | flush (); |
1109 | flush (); |
973 | } |
1110 | } |
… | |
… | |
977 | rxvt_term::cursor_blink_cb (time_watcher &w) |
1114 | rxvt_term::cursor_blink_cb (time_watcher &w) |
978 | { |
1115 | { |
979 | hidden_cursor = !hidden_cursor; |
1116 | hidden_cursor = !hidden_cursor; |
980 | want_refresh = 1; |
1117 | want_refresh = 1; |
981 | |
1118 | |
982 | w.start (w.at + BLINK_INTERVAL); |
1119 | w.start (w.at + CURSOR_BLINK_INTERVAL); |
983 | } |
1120 | } |
984 | #endif |
1121 | #endif |
985 | |
1122 | |
986 | #ifdef TEXT_BLINK |
1123 | #ifdef TEXT_BLINK |
987 | void |
1124 | void |
… | |
… | |
1001 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1138 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1002 | { |
1139 | { |
1003 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1140 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1004 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1141 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1005 | { |
1142 | { |
1006 | refresh_type |= SMOOTH_REFRESH; |
|
|
1007 | want_refresh = 1; |
1143 | want_refresh = 1; |
1008 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1144 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1009 | } |
1145 | } |
1010 | } |
1146 | } |
1011 | #endif |
1147 | #endif |
… | |
… | |
1015 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1151 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1016 | { |
1152 | { |
1017 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1153 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1018 | { |
1154 | { |
1019 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1155 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1020 | refresh_type |= SMOOTH_REFRESH; |
|
|
1021 | want_refresh = 1; |
1156 | want_refresh = 1; |
1022 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1157 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1023 | } |
1158 | } |
1024 | } |
1159 | } |
1025 | #endif |
1160 | #endif |
… | |
… | |
1030 | { |
1165 | { |
1031 | if (mouse_slip_wheel_speed == 0 |
1166 | if (mouse_slip_wheel_speed == 0 |
1032 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1167 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1033 | : scr_page (UP, mouse_slip_wheel_speed)) |
1168 | : scr_page (UP, mouse_slip_wheel_speed)) |
1034 | { |
1169 | { |
1035 | if (TermWin.view_start == TermWin.nscrolled || |
1170 | if (view_start == top_row || view_start == 0) |
1036 | TermWin.view_start == 0) |
|
|
1037 | mouse_slip_wheel_speed = 0; |
1171 | mouse_slip_wheel_speed = 0; |
1038 | |
1172 | |
1039 | refresh_type |= SMOOTH_REFRESH; |
|
|
1040 | want_refresh = 1; |
1173 | want_refresh = 1; |
1041 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1174 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1042 | } |
1175 | } |
1043 | } |
1176 | } |
1044 | #endif |
1177 | #endif |
1045 | |
1178 | |
|
|
1179 | #if LINUX_YIELD_HACK |
|
|
1180 | static struct event_handler |
|
|
1181 | { |
|
|
1182 | check_watcher yield_ev; |
|
|
1183 | |
|
|
1184 | void yield_cb (check_watcher &w) |
|
|
1185 | { |
|
|
1186 | // this should really be sched_yield(), but the linux guys thought |
|
|
1187 | // that giving a process calling sched_yield () less cpu time than |
|
|
1188 | // ones with high nice levels is a useful thing to do. It surely is is |
|
|
1189 | // allowed by the sus... as is returning ENOSYS. |
|
|
1190 | |
|
|
1191 | struct timespec ts = { 0, 0 }; |
|
|
1192 | nanosleep (&ts, 0); |
|
|
1193 | |
|
|
1194 | w.stop (); |
|
|
1195 | } |
|
|
1196 | |
|
|
1197 | event_handler () |
|
|
1198 | : yield_ev (this, &event_handler::yield_cb) |
|
|
1199 | { |
|
|
1200 | } |
|
|
1201 | } event_handler; |
|
|
1202 | #endif |
|
|
1203 | |
1046 | bool |
1204 | bool |
1047 | rxvt_term::pty_fill () |
1205 | rxvt_term::pty_fill () |
1048 | { |
1206 | { |
1049 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1207 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1050 | |
1208 | |
1051 | if (CBUFSIZ == n) |
1209 | if (CBUFSIZ == n) |
1052 | { |
1210 | { |
1053 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1211 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1054 | n = 0; |
1212 | n = 0; |
1055 | } |
1213 | } |
1056 | |
1214 | |
1057 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1215 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1058 | cmdbuf_ptr = cmdbuf_base; |
1216 | cmdbuf_ptr = cmdbuf_base; |
1059 | cmdbuf_endp = cmdbuf_ptr + n; |
1217 | cmdbuf_endp = cmdbuf_ptr + n; |
1060 | |
1218 | |
1061 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1219 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1062 | |
1220 | |
1063 | if (n > 0) |
1221 | if (r > 0) |
1064 | { |
1222 | { |
1065 | cmdbuf_endp += n; |
1223 | cmdbuf_endp += r; |
1066 | return true; |
1224 | return true; |
1067 | } |
1225 | } |
1068 | else if (n < 0 && errno != EAGAIN) |
1226 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1227 | { |
|
|
1228 | #if LINUX_YIELD_HACK |
|
|
1229 | if (display->is_local) |
|
|
1230 | event_handler.yield_ev.start (); |
|
|
1231 | #endif |
|
|
1232 | } |
|
|
1233 | else |
|
|
1234 | { |
|
|
1235 | pty_ev.stop (); |
|
|
1236 | |
|
|
1237 | if (!OPTION (Opt_hold)) |
1069 | destroy (); |
1238 | destroy (); |
|
|
1239 | } |
1070 | |
1240 | |
1071 | return false; |
1241 | return false; |
1072 | } |
1242 | } |
1073 | |
1243 | |
1074 | void |
1244 | void |
1075 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1245 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1076 | { |
1246 | { |
1077 | SET_R (this); |
1247 | make_current (); |
1078 | SET_LOCALE (locale); |
|
|
1079 | |
1248 | |
1080 | if (revents & EVENT_READ) |
1249 | if (revents & EVENT_READ) |
1081 | // loop, but don't allow a single term to monopolize us |
1250 | // loop, but don't allow a single term to monopolize us |
1082 | while (pty_fill ()) |
1251 | while (pty_fill ()) |
1083 | if (cmd_parse ()) |
1252 | if (cmd_parse ()) |
… | |
… | |
1088 | } |
1257 | } |
1089 | |
1258 | |
1090 | void |
1259 | void |
1091 | rxvt_term::pointer_unblank () |
1260 | rxvt_term::pointer_unblank () |
1092 | { |
1261 | { |
1093 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1262 | XDefineCursor (dpy, vt, TermWin_cursor); |
1094 | recolour_cursor (); |
1263 | recolour_cursor (); |
1095 | |
1264 | |
1096 | #ifdef POINTER_BLANK |
1265 | #ifdef POINTER_BLANK |
1097 | hidden_pointer = 0; |
1266 | hidden_pointer = 0; |
1098 | |
1267 | |
1099 | if (options & Opt_pointerBlank) |
1268 | if (OPTION (Opt_pointerBlank)) |
1100 | pointer_ev.start (NOW + pointerBlankDelay); |
1269 | pointer_ev.start (NOW + pointerBlankDelay); |
1101 | #endif |
1270 | #endif |
1102 | } |
1271 | } |
1103 | |
1272 | |
1104 | #ifdef POINTER_BLANK |
1273 | #ifdef POINTER_BLANK |
1105 | void |
1274 | void |
1106 | rxvt_term::pointer_blank () |
1275 | rxvt_term::pointer_blank () |
1107 | { |
1276 | { |
1108 | if (! (options & Opt_pointerBlank)) |
1277 | if (!OPTION (Opt_pointerBlank)) |
1109 | return; |
1278 | return; |
1110 | |
1279 | |
1111 | XDefineCursor (display->display, TermWin.vt, display->blank_cursor); |
1280 | XDefineCursor (dpy, vt, display->blank_cursor); |
1112 | XFlush (display->display); |
1281 | XFlush (dpy); |
1113 | |
1282 | |
1114 | hidden_pointer = 1; |
1283 | hidden_pointer = 1; |
1115 | } |
1284 | } |
1116 | |
1285 | |
1117 | void |
1286 | void |
1118 | rxvt_term::pointer_cb (time_watcher &w) |
1287 | rxvt_term::pointer_cb (time_watcher &w) |
1119 | { |
1288 | { |
1120 | SET_R (this); |
1289 | make_current (); |
1121 | SET_LOCALE (locale); |
|
|
1122 | |
1290 | |
1123 | pointer_blank (); |
1291 | pointer_blank (); |
1124 | } |
1292 | } |
1125 | #endif |
1293 | #endif |
1126 | |
1294 | |
… | |
… | |
1191 | (32 + button_number + key_state), |
1359 | (32 + button_number + key_state), |
1192 | (32 + x + 1), |
1360 | (32 + x + 1), |
1193 | (32 + y + 1)); |
1361 | (32 + y + 1)); |
1194 | } |
1362 | } |
1195 | |
1363 | |
1196 | #ifdef USING_W11LIB |
|
|
1197 | void |
|
|
1198 | rxvt_W11_process_x_event (XEvent *ev) |
|
|
1199 | { |
|
|
1200 | rxvt_t *r = rxvt_get_r (); |
|
|
1201 | |
|
|
1202 | x_cb (*ev); |
|
|
1203 | } |
|
|
1204 | #endif |
|
|
1205 | |
|
|
1206 | /*{{{ process an X event */ |
1364 | /*{{{ process an X event */ |
1207 | void |
1365 | void |
1208 | rxvt_term::x_cb (XEvent &ev) |
1366 | rxvt_term::x_cb (XEvent &ev) |
1209 | { |
1367 | { |
1210 | dDisp; |
1368 | make_current (); |
1211 | |
1369 | |
1212 | SET_R (this); |
1370 | dLocal (Display *, dpy); |
1213 | SET_LOCALE (locale); |
|
|
1214 | |
1371 | |
1215 | #if defined(CURSOR_BLINK) |
1372 | if (ev.xany.window == vt |
1216 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
1373 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1217 | { |
1374 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1218 | if (hidden_cursor) |
1375 | return; |
1219 | { |
|
|
1220 | hidden_cursor = 0; |
|
|
1221 | want_refresh = 1; |
|
|
1222 | } |
|
|
1223 | |
1376 | |
1224 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1377 | // for XQueryPointer |
1225 | } |
|
|
1226 | #endif |
|
|
1227 | |
|
|
1228 | #if defined(POINTER_BLANK) |
|
|
1229 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1230 | { |
|
|
1231 | if (ev.type == MotionNotify |
|
|
1232 | || ev.type == ButtonPress |
|
|
1233 | || ev.type == ButtonRelease) |
|
|
1234 | if (hidden_pointer) |
|
|
1235 | pointer_unblank (); |
|
|
1236 | |
|
|
1237 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1238 | pointer_blank (); |
|
|
1239 | } |
|
|
1240 | #endif |
|
|
1241 | |
|
|
1242 | Window unused_root, unused_child; |
1378 | Window unused_root, unused_child; |
1243 | int unused_root_x, unused_root_y; |
1379 | int unused_root_x, unused_root_y; |
1244 | unsigned int unused_mask; |
1380 | unsigned int unused_mask; |
1245 | |
1381 | |
1246 | switch (ev.type) |
1382 | switch (ev.type) |
1247 | { |
1383 | { |
1248 | case KeyPress: |
1384 | case KeyPress: |
1249 | #if ISO_14755 |
1385 | key_press (ev.xkey); |
1250 | if (!(iso14755buf & ISO_14755_52)) |
|
|
1251 | #endif |
|
|
1252 | lookup_key (ev.xkey); |
|
|
1253 | |
|
|
1254 | break; |
1386 | break; |
1255 | |
1387 | |
1256 | case KeyRelease: |
1388 | case KeyRelease: |
1257 | { |
1389 | key_release (ev.xkey); |
1258 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
|
|
1259 | KeySym ks; |
|
|
1260 | |
|
|
1261 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
|
|
1262 | #endif |
|
|
1263 | |
|
|
1264 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1265 | // ISO 14755 support |
|
|
1266 | if (iso14755buf) |
|
|
1267 | if (iso14755buf & ISO_14755_52) |
|
|
1268 | { |
|
|
1269 | # if ENABLE_OVERLAY |
|
|
1270 | scr_overlay_off (); |
|
|
1271 | # endif |
|
|
1272 | # if ISO_14755 |
|
|
1273 | // iso14755 part 5.2 handling: release time |
|
|
1274 | // first: controls |
|
|
1275 | if ((ev.xkey.state & ControlMask) |
|
|
1276 | && ((ks >= 0x40 && ks <= 0x5f) |
|
|
1277 | || (ks >= 0x61 && ks <= 0x7f))) |
|
|
1278 | { |
|
|
1279 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
|
|
1280 | commit_iso14755 (); |
|
|
1281 | return; // case-break; |
|
|
1282 | } |
|
|
1283 | |
|
|
1284 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
|
|
1285 | if (i[0] == ks) |
|
|
1286 | { |
|
|
1287 | iso14755buf = ISO_14755_51 | i[1]; |
|
|
1288 | commit_iso14755 (); |
|
|
1289 | return; // case-break; |
|
|
1290 | } |
|
|
1291 | |
|
|
1292 | scr_bell (); |
|
|
1293 | # endif |
|
|
1294 | iso14755buf = 0; |
|
|
1295 | break; |
|
|
1296 | } |
|
|
1297 | else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
|
|
1298 | { |
|
|
1299 | # if ENABLE_OVERLAY |
|
|
1300 | scr_overlay_off (); |
|
|
1301 | # endif |
|
|
1302 | if (iso14755buf & ISO_14755_51) |
|
|
1303 | commit_iso14755 (); |
|
|
1304 | #if ISO_14755 |
|
|
1305 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
1306 | { |
|
|
1307 | iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair |
|
|
1308 | |
|
|
1309 | scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); |
|
|
1310 | scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); |
|
|
1311 | } |
|
|
1312 | # endif |
|
|
1313 | else |
|
|
1314 | iso14755buf = 0; |
|
|
1315 | } |
|
|
1316 | #endif |
|
|
1317 | |
|
|
1318 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
1319 | if (!(ev.xkey.state & ControlMask)) |
|
|
1320 | slip_wheel_ev.stop (); |
|
|
1321 | else if (ks == XK_Control_L || ks == XK_Control_R) |
|
|
1322 | mouse_slip_wheel_speed = 0; |
|
|
1323 | #endif |
|
|
1324 | break; |
1390 | break; |
1325 | } |
|
|
1326 | |
1391 | |
1327 | case ButtonPress: |
1392 | case ButtonPress: |
1328 | button_press (ev.xbutton); |
1393 | button_press (ev.xbutton); |
1329 | break; |
1394 | break; |
1330 | |
1395 | |
… | |
… | |
1332 | button_release (ev.xbutton); |
1397 | button_release (ev.xbutton); |
1333 | break; |
1398 | break; |
1334 | |
1399 | |
1335 | case ClientMessage: |
1400 | case ClientMessage: |
1336 | if (ev.xclient.format == 32 |
1401 | if (ev.xclient.format == 32 |
1337 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
1402 | && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END))) |
1338 | { |
1403 | { |
|
|
1404 | if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1405 | { |
|
|
1406 | if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END))) |
|
|
1407 | { |
1339 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1408 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
|
|
1409 | { |
|
|
1410 | if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) |
1340 | destroy (); |
1411 | destroy (); |
|
|
1412 | } |
1341 | #if ENABLE_EWMH |
1413 | #if ENABLE_EWMH |
1342 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1414 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
1343 | XSendEvent (disp, ev.xclient.window = display->root, |
1415 | XSendEvent (dpy, ev.xclient.window = display->root, |
1344 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1416 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
1345 | &ev); |
1417 | &ev); |
|
|
1418 | #endif |
|
|
1419 | } |
|
|
1420 | } |
|
|
1421 | #if ENABLE_XEMBED |
|
|
1422 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1423 | { |
|
|
1424 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1425 | focus_in (); |
|
|
1426 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1427 | focus_out (); |
|
|
1428 | } |
1346 | #endif |
1429 | #endif |
1347 | } |
1430 | } |
1348 | #if ENABLE_XEMBED |
|
|
1349 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1350 | { |
|
|
1351 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1352 | focus_in (); |
|
|
1353 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1354 | focus_out (); |
|
|
1355 | } |
|
|
1356 | #endif |
|
|
1357 | #ifdef OFFIX_DND |
|
|
1358 | /* OffiX Dnd (drag 'n' drop) protocol */ |
|
|
1359 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
|
|
1360 | && (ev.xclient.data.l[0] == DndFile |
|
|
1361 | || ev.xclient.data.l[0] == DndDir |
|
|
1362 | || ev.xclient.data.l[0] == DndLink)) |
|
|
1363 | { |
|
|
1364 | /* Get Dnd data */ |
|
|
1365 | Atom ActualType; |
|
|
1366 | int ActualFormat; |
|
|
1367 | unsigned char *data; |
|
|
1368 | unsigned long Size, RemainingBytes; |
|
|
1369 | |
|
|
1370 | XGetWindowProperty (disp, display->root, |
|
|
1371 | xa[XA_DNDSELECTION], |
|
|
1372 | 0L, 1000000L, |
|
|
1373 | False, AnyPropertyType, |
|
|
1374 | &ActualType, &ActualFormat, |
|
|
1375 | &Size, &RemainingBytes, |
|
|
1376 | &data); |
|
|
1377 | set_string_property (XA_CUT_BUFFER0, data); |
|
|
1378 | XFree (data); |
|
|
1379 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
|
|
1380 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
|
|
1381 | } |
|
|
1382 | #endif /* OFFIX_DND */ |
|
|
1383 | break; |
1431 | break; |
1384 | |
1432 | |
1385 | case MappingNotify: |
1433 | case MappingNotify: |
1386 | XRefreshKeyboardMapping (&ev.xmapping); |
1434 | XRefreshKeyboardMapping (&ev.xmapping); |
1387 | break; |
1435 | break; |
… | |
… | |
1418 | case FocusOut: |
1466 | case FocusOut: |
1419 | focus_out (); |
1467 | focus_out (); |
1420 | break; |
1468 | break; |
1421 | |
1469 | |
1422 | case ConfigureNotify: |
1470 | case ConfigureNotify: |
1423 | if (ev.xconfigure.window == TermWin.parent[0]) |
1471 | if (ev.xconfigure.window == parent[0]) |
1424 | { |
1472 | { |
1425 | int height, width; |
|
|
1426 | |
|
|
1427 | do |
|
|
1428 | { /* Wrap lots of configures into one */ |
|
|
1429 | width = ev.xconfigure.width; |
|
|
1430 | height = ev.xconfigure.height; |
|
|
1431 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
|
|
1432 | } |
|
|
1433 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); |
1473 | while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1474 | ; |
1434 | |
1475 | |
1435 | if (szHint.width != width || szHint.height != height) |
1476 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1436 | { |
1477 | { |
1437 | seen_resize = 1; |
1478 | seen_resize = 1; |
1438 | resize_all_windows (width, height, 1); |
1479 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1439 | } |
1480 | } |
1440 | |
1481 | |
|
|
1482 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1483 | |
1441 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1484 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1442 | if (options & Opt_transparent) |
1485 | if (OPTION (Opt_transparent)) |
1443 | check_our_parents (); |
1486 | check_our_parents (); |
1444 | #endif |
1487 | #endif |
1445 | } |
1488 | } |
1446 | break; |
1489 | break; |
1447 | |
1490 | |
1448 | case PropertyNotify: |
1491 | case PropertyNotify: |
|
|
1492 | if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) |
1449 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1493 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
1450 | && ev.xproperty.state == PropertyNewValue) |
1494 | && ev.xproperty.state == PropertyNewValue) |
1451 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1495 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
1452 | |
1496 | |
1453 | break; |
1497 | break; |
1454 | |
1498 | |
1455 | case SelectionClear: |
1499 | case SelectionClear: |
1456 | selection_clear (); |
1500 | selection_clear (); |
… | |
… | |
1463 | |
1507 | |
1464 | case SelectionRequest: |
1508 | case SelectionRequest: |
1465 | selection_send (ev.xselectionrequest); |
1509 | selection_send (ev.xselectionrequest); |
1466 | break; |
1510 | break; |
1467 | |
1511 | |
|
|
1512 | case MapNotify: |
|
|
1513 | mapped = 1; |
|
|
1514 | #ifdef TEXT_BLINK |
|
|
1515 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1516 | #endif |
|
|
1517 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1518 | break; |
|
|
1519 | |
1468 | case UnmapNotify: |
1520 | case UnmapNotify: |
1469 | TermWin.mapped = 0; |
1521 | mapped = 0; |
1470 | #ifdef TEXT_BLINK |
1522 | #ifdef TEXT_BLINK |
1471 | text_blink_ev.stop (); |
1523 | text_blink_ev.stop (); |
1472 | #endif |
1524 | #endif |
1473 | break; |
1525 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1474 | |
|
|
1475 | case MapNotify: |
|
|
1476 | TermWin.mapped = 1; |
|
|
1477 | #ifdef TEXT_BLINK |
|
|
1478 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1479 | #endif |
|
|
1480 | break; |
1526 | break; |
1481 | |
1527 | |
1482 | #ifdef TRANSPARENT |
1528 | #ifdef TRANSPARENT |
1483 | case ReparentNotify: |
1529 | case ReparentNotify: |
1484 | rootwin_cb (ev); |
1530 | rootwin_cb (ev); |
1485 | break; |
1531 | break; |
1486 | #endif /* TRANSPARENT */ |
1532 | #endif /* TRANSPARENT */ |
1487 | |
1533 | |
1488 | case GraphicsExpose: |
1534 | case GraphicsExpose: |
1489 | case Expose: |
1535 | case Expose: |
1490 | if (ev.xany.window == TermWin.vt) |
1536 | if (ev.xany.window == vt) |
1491 | { |
1537 | { |
1492 | do |
1538 | do |
1493 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1539 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1494 | ev.xexpose.width, ev.xexpose.height, False); |
1540 | ev.xexpose.width, ev.xexpose.height, False); |
1495 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); |
1541 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); |
1496 | |
1542 | |
1497 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1543 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1498 | |
1544 | |
1499 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) |
1545 | while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) |
1500 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1546 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1501 | ev.xexpose.width, ev.xexpose.height, False); |
1547 | ev.xexpose.width, ev.xexpose.height, False); |
1502 | |
1548 | |
1503 | scr_refresh (refresh_type); |
1549 | want_refresh = 1; |
1504 | } |
1550 | } |
1505 | else |
1551 | else |
1506 | { |
1552 | { |
1507 | XEvent unused_event; |
1553 | XEvent unused_event; |
1508 | |
1554 | |
1509 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1555 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event)) |
1510 | ; |
1556 | ; |
1511 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1557 | while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) |
1512 | ; |
1558 | ; |
1513 | |
1559 | |
1514 | if (isScrollbarWindow (ev.xany.window)) |
1560 | if (isScrollbarWindow (ev.xany.window)) |
1515 | { |
1561 | { |
1516 | scrollBar.setIdle (); |
1562 | scrollBar.setIdle (); |
1517 | scrollbar_show (0); |
1563 | scrollbar_show (0); |
1518 | } |
1564 | } |
1519 | #ifdef MENUBAR |
|
|
1520 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1521 | menubar_expose (); |
|
|
1522 | #endif |
|
|
1523 | |
1565 | |
1524 | #ifdef TRANSPARENT |
1566 | #ifdef TRANSPARENT |
1525 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1567 | if (am_transparent && ev.xany.window == parent[0]) |
1526 | XClearWindow (disp, ev.xany.window); |
1568 | XClearWindow (dpy, ev.xany.window); |
1527 | #endif |
1569 | #endif |
1528 | } |
1570 | } |
1529 | break; |
1571 | break; |
1530 | |
1572 | |
1531 | case MotionNotify: |
1573 | case MotionNotify: |
1532 | #ifdef POINTER_BLANK |
1574 | #ifdef POINTER_BLANK |
1533 | if (hidden_pointer) |
1575 | if (hidden_pointer) |
1534 | pointer_unblank (); |
1576 | pointer_unblank (); |
1535 | #endif |
1577 | #endif |
1536 | #if MENUBAR |
|
|
1537 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1538 | { |
|
|
1539 | menubar_control (ev.xbutton); |
|
|
1540 | break; |
|
|
1541 | } |
|
|
1542 | #endif |
|
|
1543 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1578 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1544 | break; |
1579 | break; |
1545 | |
1580 | |
1546 | if (ev.xany.window == TermWin.vt) |
1581 | if (ev.xany.window == vt) |
1547 | { |
1582 | { |
|
|
1583 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
|
|
1584 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1585 | ; // nop |
1548 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1586 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1549 | { |
1587 | { |
1550 | while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) |
1588 | while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev)) |
1551 | ; |
1589 | ; |
1552 | |
1590 | |
1553 | XQueryPointer (disp, TermWin.vt, |
1591 | XQueryPointer (dpy, vt, |
1554 | &unused_root, &unused_child, |
1592 | &unused_root, &unused_child, |
1555 | &unused_root_x, &unused_root_y, |
1593 | &unused_root_x, &unused_root_y, |
1556 | &ev.xbutton.x, &ev.xbutton.y, |
1594 | &ev.xbutton.x, &ev.xbutton.y, |
1557 | &ev.xbutton.state); |
1595 | &ev.xbutton.state); |
1558 | #ifdef MOUSE_THRESHOLD |
1596 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1570 | #endif |
1608 | #endif |
1571 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1609 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1572 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1610 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1573 | |
1611 | |
1574 | #ifdef SELECTION_SCROLLING |
1612 | #ifdef SELECTION_SCROLLING |
1575 | if (ev.xbutton.y < TermWin.int_bwidth |
1613 | if (ev.xbutton.y < int_bwidth |
1576 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1614 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1577 | { |
1615 | { |
1578 | int dist; |
1616 | int dist; |
1579 | |
1617 | |
1580 | /* don't clobber the current delay if we are |
1618 | /* don't clobber the current delay if we are |
1581 | * already in the middle of scrolling. |
1619 | * already in the middle of scrolling. |
… | |
… | |
1589 | selection_save_x = ev.xbutton.x; |
1627 | selection_save_x = ev.xbutton.x; |
1590 | selection_save_y = ev.xbutton.y; |
1628 | selection_save_y = ev.xbutton.y; |
1591 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1629 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1592 | |
1630 | |
1593 | /* calc number of lines to scroll */ |
1631 | /* calc number of lines to scroll */ |
1594 | if (ev.xbutton.y < TermWin.int_bwidth) |
1632 | if (ev.xbutton.y < int_bwidth) |
1595 | { |
1633 | { |
1596 | scroll_selection_dir = UP; |
1634 | scroll_selection_dir = UP; |
1597 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1635 | dist = int_bwidth - ev.xbutton.y; |
1598 | } |
1636 | } |
1599 | else |
1637 | else |
1600 | { |
1638 | { |
1601 | scroll_selection_dir = DN; |
1639 | scroll_selection_dir = DN; |
1602 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1640 | dist = ev.xbutton.y - (int_bwidth + height); |
1603 | } |
1641 | } |
1604 | |
1642 | |
1605 | scroll_selection_lines = Pixel2Height (dist) |
1643 | scroll_selection_lines = Pixel2Height (dist) |
1606 | / SELECTION_SCROLL_LINE_SPEEDUP |
1644 | / SELECTION_SCROLL_LINE_SPEEDUP |
1607 | + 1; |
1645 | + 1; |
1608 | MIN_IT (scroll_selection_lines, |
1646 | min_it (scroll_selection_lines, |
1609 | SELECTION_SCROLL_MAX_LINES); |
1647 | SELECTION_SCROLL_MAX_LINES); |
1610 | } |
1648 | } |
1611 | else |
1649 | else |
1612 | { |
1650 | { |
1613 | /* we are within the text window, so we |
1651 | /* we are within the text window, so we |
… | |
… | |
1622 | #endif |
1660 | #endif |
1623 | } |
1661 | } |
1624 | } |
1662 | } |
1625 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1663 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1626 | { |
1664 | { |
1627 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1665 | while (XCheckTypedWindowEvent (dpy, scrollBar.win, |
1628 | MotionNotify, &ev)) |
1666 | MotionNotify, &ev)) |
1629 | ; |
1667 | ; |
1630 | |
1668 | |
1631 | XQueryPointer (disp, scrollBar.win, |
1669 | XQueryPointer (dpy, scrollBar.win, |
1632 | &unused_root, &unused_child, |
1670 | &unused_root, &unused_child, |
1633 | &unused_root_x, &unused_root_y, |
1671 | &unused_root_x, &unused_root_y, |
1634 | &ev.xbutton.x, &ev.xbutton.y, |
1672 | &ev.xbutton.x, &ev.xbutton.y, |
1635 | &unused_mask); |
1673 | &unused_mask); |
1636 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1674 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1637 | scrollbar_size ()); |
1675 | scrollbar_size ()); |
1638 | scr_refresh (refresh_type); |
1676 | want_refresh = 1; |
1639 | refresh_limit = 0; |
1677 | refresh_limit = 0; |
1640 | scrollbar_show (1); |
1678 | scrollbar_show (1); |
1641 | } |
1679 | } |
1642 | break; |
1680 | break; |
1643 | } |
1681 | } |
|
|
1682 | |
|
|
1683 | #if defined(CURSOR_BLINK) |
|
|
1684 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1685 | { |
|
|
1686 | if (hidden_cursor) |
|
|
1687 | { |
|
|
1688 | hidden_cursor = 0; |
|
|
1689 | want_refresh = 1; |
|
|
1690 | } |
|
|
1691 | |
|
|
1692 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
|
|
1693 | } |
|
|
1694 | #endif |
|
|
1695 | |
|
|
1696 | #if defined(POINTER_BLANK) |
|
|
1697 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1698 | { |
|
|
1699 | if (ev.type == MotionNotify |
|
|
1700 | || ev.type == ButtonPress |
|
|
1701 | || ev.type == ButtonRelease) |
|
|
1702 | if (hidden_pointer) |
|
|
1703 | pointer_unblank (); |
|
|
1704 | |
|
|
1705 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1706 | pointer_blank (); |
|
|
1707 | } |
|
|
1708 | #endif |
1644 | } |
1709 | } |
1645 | |
1710 | |
1646 | void |
1711 | void |
1647 | rxvt_term::focus_in () |
1712 | rxvt_term::focus_in () |
1648 | { |
1713 | { |
1649 | if (!TermWin.focus) |
1714 | if (!focus) |
1650 | { |
1715 | { |
1651 | TermWin.focus = 1; |
1716 | focus = 1; |
1652 | want_refresh = 1; |
1717 | want_refresh = 1; |
|
|
1718 | |
|
|
1719 | HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); |
|
|
1720 | |
1653 | #ifdef USE_XIM |
1721 | #if USE_XIM |
1654 | if (Input_Context != NULL) |
1722 | if (Input_Context != NULL) |
1655 | { |
1723 | { |
1656 | IMSetStatusPosition (); |
1724 | IMSetPosition (); |
1657 | XSetICFocus (Input_Context); |
1725 | XSetICFocus (Input_Context); |
1658 | } |
1726 | } |
1659 | #endif |
1727 | #endif |
1660 | #ifdef CURSOR_BLINK |
1728 | #if CURSOR_BLINK |
1661 | if (options & Opt_cursorBlink) |
1729 | if (OPTION (Opt_cursorBlink)) |
1662 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1730 | cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); |
1663 | #endif |
1731 | #endif |
1664 | #ifdef OFF_FOCUS_FADING |
1732 | #if OFF_FOCUS_FADING |
1665 | if (rs[Rs_fade]) |
1733 | if (rs[Rs_fade]) |
1666 | { |
1734 | { |
1667 | pix_colors = pix_colors_focused; |
1735 | pix_colors = pix_colors_focused; |
1668 | scr_recolour (); |
1736 | scr_recolour (); |
1669 | } |
1737 | } |
… | |
… | |
1672 | } |
1740 | } |
1673 | |
1741 | |
1674 | void |
1742 | void |
1675 | rxvt_term::focus_out () |
1743 | rxvt_term::focus_out () |
1676 | { |
1744 | { |
1677 | if (TermWin.focus) |
1745 | if (focus) |
1678 | { |
1746 | { |
1679 | TermWin.focus = 0; |
1747 | focus = 0; |
1680 | want_refresh = 1; |
1748 | want_refresh = 1; |
1681 | |
1749 | |
|
|
1750 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1751 | |
1682 | #if ENABLE_FRILLS || ISO_14755 |
1752 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1753 | if (iso14755buf) |
|
|
1754 | { |
1683 | iso14755buf = 0; |
1755 | iso14755buf = 0; |
1684 | #endif |
|
|
1685 | #if ENABLE_OVERLAY |
1756 | # if ENABLE_OVERLAY |
1686 | scr_overlay_off (); |
1757 | scr_overlay_off (); |
1687 | #endif |
1758 | # endif |
|
|
1759 | } |
|
|
1760 | #endif |
1688 | #ifdef USE_XIM |
1761 | #if USE_XIM |
1689 | if (Input_Context != NULL) |
1762 | if (Input_Context != NULL) |
1690 | XUnsetICFocus (Input_Context); |
1763 | XUnsetICFocus (Input_Context); |
1691 | #endif |
1764 | #endif |
1692 | #ifdef CURSOR_BLINK |
1765 | #if CURSOR_BLINK |
1693 | if (options & Opt_cursorBlink) |
1766 | if (OPTION (Opt_cursorBlink)) |
1694 | cursor_blink_ev.stop (); |
1767 | cursor_blink_ev.stop (); |
1695 | hidden_cursor = 0; |
1768 | hidden_cursor = 0; |
1696 | #endif |
1769 | #endif |
1697 | #ifdef OFF_FOCUS_FADING |
1770 | #if OFF_FOCUS_FADING |
1698 | if (rs[Rs_fade]) |
1771 | if (rs[Rs_fade]) |
1699 | { |
1772 | { |
1700 | pix_colors = pix_colors_unfocused; |
1773 | pix_colors = pix_colors_unfocused; |
1701 | scr_recolour (); |
1774 | scr_recolour (); |
1702 | } |
1775 | } |
… | |
… | |
1706 | |
1779 | |
1707 | #if TRANSPARENT |
1780 | #if TRANSPARENT |
1708 | void |
1781 | void |
1709 | rxvt_term::rootwin_cb (XEvent &ev) |
1782 | rxvt_term::rootwin_cb (XEvent &ev) |
1710 | { |
1783 | { |
1711 | SET_R (this); |
1784 | make_current (); |
1712 | SET_LOCALE (locale); |
|
|
1713 | |
1785 | |
1714 | switch (ev.type) |
1786 | switch (ev.type) |
1715 | { |
1787 | { |
1716 | case PropertyNotify: |
1788 | case PropertyNotify: |
1717 | /* |
1789 | /* |
… | |
… | |
1722 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1794 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1723 | return; |
1795 | return; |
1724 | |
1796 | |
1725 | /* FALLTHROUGH */ |
1797 | /* FALLTHROUGH */ |
1726 | case ReparentNotify: |
1798 | case ReparentNotify: |
1727 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1799 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1728 | want_refresh = want_full_refresh = 1; |
1800 | want_refresh = want_full_refresh = 1; |
1729 | break; |
1801 | break; |
1730 | } |
1802 | } |
1731 | } |
1803 | } |
1732 | #endif |
1804 | #endif |
… | |
… | |
1735 | rxvt_term::button_press (XButtonEvent &ev) |
1807 | rxvt_term::button_press (XButtonEvent &ev) |
1736 | { |
1808 | { |
1737 | int reportmode = 0, clickintime; |
1809 | int reportmode = 0, clickintime; |
1738 | |
1810 | |
1739 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1811 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1812 | |
1740 | if (!bypass_keystate) |
1813 | if (!bypass_keystate) |
1741 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1814 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1742 | |
1815 | |
1743 | /* |
1816 | /* |
1744 | * VT window processing of button press |
1817 | * VT window processing of button press |
1745 | */ |
1818 | */ |
1746 | if (ev.window == TermWin.vt) |
1819 | if (ev.window == vt) |
1747 | { |
1820 | { |
|
|
1821 | if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
|
|
1822 | return; |
|
|
1823 | |
1748 | #if ISO_14755 |
1824 | #if ISO_14755 |
1749 | // 5.4 |
1825 | // 5.4 |
1750 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1826 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1751 | { |
1827 | { |
1752 | iso14755_54 (ev.x, ev.y); |
1828 | iso14755_54 (ev.x, ev.y); |
… | |
… | |
1764 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1840 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1765 | if (ev.button == MEvent.button && clickintime) |
1841 | if (ev.button == MEvent.button && clickintime) |
1766 | { |
1842 | { |
1767 | /* same button, within alloted time */ |
1843 | /* same button, within alloted time */ |
1768 | MEvent.clicks++; |
1844 | MEvent.clicks++; |
|
|
1845 | |
1769 | if (MEvent.clicks > 1) |
1846 | if (MEvent.clicks > 1) |
1770 | { |
1847 | { |
1771 | /* only report double clicks */ |
1848 | /* only report double clicks */ |
1772 | MEvent.clicks = 2; |
1849 | MEvent.clicks = 2; |
1773 | mouse_report (ev); |
1850 | mouse_report (ev); |
… | |
… | |
1805 | #else |
1882 | #else |
1806 | selection.rect = false; |
1883 | selection.rect = false; |
1807 | #endif |
1884 | #endif |
1808 | |
1885 | |
1809 | /* allow shift+left click to extend selection */ |
1886 | /* allow shift+left click to extend selection */ |
1810 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1887 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1811 | { |
1888 | { |
1812 | if (MEvent.button == Button1 && clickintime) |
1889 | if (MEvent.button == Button1 && clickintime) |
1813 | selection_rotate (ev.x, ev.y); |
1890 | selection_rotate (ev.x, ev.y); |
1814 | else |
1891 | else |
1815 | selection_extend (ev.x, ev.y, 1); |
1892 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
1956 | case Button3: |
2033 | case Button3: |
1957 | if (scrollBar.style != R_SB_XTERM) |
2034 | if (scrollBar.style != R_SB_XTERM) |
1958 | { |
2035 | { |
1959 | if (scrollbar_above_slider (ev.y)) |
2036 | if (scrollbar_above_slider (ev.y)) |
1960 | # ifdef RXVT_SCROLL_FULL |
2037 | # ifdef RXVT_SCROLL_FULL |
1961 | scr_page (UP, TermWin.nrow - 1); |
2038 | scr_page (UP, nrow - 1); |
1962 | # else |
2039 | # else |
1963 | scr_page (UP, TermWin.nrow / 4); |
2040 | scr_page (UP, nrow / 4); |
1964 | # endif |
2041 | # endif |
1965 | else if (scrollbar_below_slider (ev.y)) |
2042 | else if (scrollbar_below_slider (ev.y)) |
1966 | # ifdef RXVT_SCROLL_FULL |
2043 | # ifdef RXVT_SCROLL_FULL |
1967 | scr_page (DN, TermWin.nrow - 1); |
2044 | scr_page (DN, nrow - 1); |
1968 | # else |
2045 | # else |
1969 | scr_page (DN, TermWin.nrow / 4); |
2046 | scr_page (DN, nrow / 4); |
1970 | # endif |
2047 | # endif |
1971 | else |
2048 | else |
1972 | scrollBar.setMotion (); |
2049 | scrollBar.setMotion (); |
1973 | } |
2050 | } |
1974 | else |
2051 | else |
1975 | { |
2052 | { |
1976 | scr_page ((ev.button == Button1 ? DN : UP), |
2053 | scr_page ((ev.button == Button1 ? DN : UP), |
1977 | (TermWin.nrow |
2054 | (nrow |
1978 | * scrollbar_position (ev.y) |
2055 | * scrollbar_position (ev.y) |
1979 | / scrollbar_size ())); |
2056 | / scrollbar_size ())); |
1980 | } |
2057 | } |
1981 | |
2058 | |
1982 | break; |
2059 | break; |
1983 | } |
2060 | } |
1984 | } |
2061 | } |
|
|
2062 | |
1985 | return; |
2063 | return; |
1986 | } |
2064 | } |
1987 | #if MENUBAR |
|
|
1988 | /* |
|
|
1989 | * Menubar window processing of button press |
|
|
1990 | */ |
|
|
1991 | if (isMenuBarWindow (ev.window)) |
|
|
1992 | menubar_control (ev); |
|
|
1993 | #endif |
|
|
1994 | } |
2065 | } |
1995 | |
2066 | |
1996 | void |
2067 | void |
1997 | rxvt_term::button_release (XButtonEvent &ev) |
2068 | rxvt_term::button_release (XButtonEvent &ev) |
1998 | { |
2069 | { |
… | |
… | |
2004 | |
2075 | |
2005 | if (scrollbar_isUpDn ()) |
2076 | if (scrollbar_isUpDn ()) |
2006 | { |
2077 | { |
2007 | scrollBar.setIdle (); |
2078 | scrollBar.setIdle (); |
2008 | scrollbar_show (0); |
2079 | scrollbar_show (0); |
2009 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
2010 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
2011 | #endif |
|
|
2012 | } |
2080 | } |
2013 | |
2081 | |
2014 | #ifdef SELECTION_SCROLLING |
2082 | #ifdef SELECTION_SCROLLING |
2015 | if (sel_scroll_ev.active) |
2083 | if (sel_scroll_ev.active) |
2016 | sel_scroll_ev.stop(); |
2084 | sel_scroll_ev.stop(); |
2017 | #endif |
2085 | #endif |
2018 | |
2086 | |
2019 | if (ev.window == TermWin.vt) |
2087 | if (ev.window == vt) |
2020 | { |
2088 | { |
|
|
2089 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2090 | return; |
|
|
2091 | |
2021 | #if ISO_14755 |
2092 | #if ISO_14755 |
2022 | // 5.4 |
2093 | // 5.4 |
2023 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2094 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2024 | return; |
2095 | return; |
2025 | #endif |
2096 | #endif |
|
|
2097 | |
2026 | if (reportmode) |
2098 | if (reportmode) |
2027 | { |
2099 | { |
2028 | /* mouse report from vt window */ |
2100 | /* mouse report from vt window */ |
2029 | /* don't report release of wheel "buttons" */ |
2101 | /* don't report release of wheel "buttons" */ |
2030 | if (ev.button >= 4) |
2102 | if (ev.button >= 4) |
… | |
… | |
2060 | { |
2132 | { |
2061 | case Button1: |
2133 | case Button1: |
2062 | case Button3: |
2134 | case Button3: |
2063 | selection_make (ev.time); |
2135 | selection_make (ev.time); |
2064 | break; |
2136 | break; |
|
|
2137 | |
2065 | case Button2: |
2138 | case Button2: |
2066 | selection_request (ev.time, ev.x, ev.y); |
2139 | if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
|
|
2140 | selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); |
2067 | break; |
2141 | break; |
|
|
2142 | |
2068 | #ifdef MOUSE_WHEEL |
2143 | #ifdef MOUSE_WHEEL |
2069 | case Button4: |
2144 | case Button4: |
2070 | case Button5: |
2145 | case Button5: |
2071 | { |
2146 | { |
2072 | int i; |
2147 | int i; |
… | |
… | |
2074 | |
2149 | |
2075 | v = ev.button == Button4 ? UP : DN; |
2150 | v = ev.button == Button4 ? UP : DN; |
2076 | |
2151 | |
2077 | if (ev.state & ShiftMask) |
2152 | if (ev.state & ShiftMask) |
2078 | i = 1; |
2153 | i = 1; |
2079 | else if (options & Opt_mouseWheelScrollPage) |
2154 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2080 | i = TermWin.nrow - 1; |
2155 | i = nrow - 1; |
2081 | else |
2156 | else |
2082 | i = 5; |
2157 | i = 5; |
2083 | |
2158 | |
2084 | # ifdef MOUSE_SLIP_WHEELING |
2159 | # ifdef MOUSE_SLIP_WHEELING |
2085 | if (ev.state & ControlMask) |
2160 | if (ev.state & ControlMask) |
2086 | { |
2161 | { |
2087 | mouse_slip_wheel_speed += v ? -1 : 1; |
2162 | mouse_slip_wheel_speed += v ? -1 : 1; |
2088 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2163 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2089 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2164 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2090 | |
2165 | |
2091 | if (slip_wheel_ev.at < NOW) |
2166 | if (slip_wheel_ev.at < NOW) |
2092 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2167 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2093 | |
2168 | |
2094 | slip_wheel_ev.start (); |
2169 | slip_wheel_ev.start (); |
2095 | } |
2170 | } |
2096 | else |
2171 | else |
2097 | { |
2172 | { |
2098 | # endif |
2173 | # endif |
2099 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2100 | scr_page (v, i); |
2174 | scr_page (v, i); |
2101 | scr_refresh (SMOOTH_REFRESH); |
|
|
2102 | scrollbar_show (1); |
2175 | scrollbar_show (1); |
2103 | # else |
|
|
2104 | while (i--) |
|
|
2105 | { |
|
|
2106 | scr_page (v, 1); |
|
|
2107 | scr_refresh (SMOOTH_REFRESH); |
|
|
2108 | scrollbar_show (1); |
|
|
2109 | } |
|
|
2110 | # endif |
|
|
2111 | # ifdef MOUSE_SLIP_WHEELING |
2176 | # ifdef MOUSE_SLIP_WHEELING |
2112 | } |
2177 | } |
2113 | #endif |
2178 | # endif |
2114 | } |
2179 | } |
2115 | break; |
2180 | break; |
2116 | #endif |
2181 | #endif |
2117 | } |
2182 | } |
2118 | } |
2183 | } |
2119 | #ifdef MENUBAR |
|
|
2120 | else if (isMenuBarWindow (ev.window)) |
|
|
2121 | menubar_control (ev); |
|
|
2122 | #endif |
|
|
2123 | } |
2184 | } |
2124 | |
2185 | |
2125 | #ifdef TRANSPARENT |
2186 | #ifdef TRANSPARENT |
2126 | #if TINTING |
2187 | #if TINTING |
2127 | /* taken from aterm-0.4.2 */ |
2188 | /* taken from aterm-0.4.2 */ |
2128 | |
2189 | |
2129 | typedef uint32_t RUINT32T; |
2190 | typedef uint32_t RUINT32T; |
2130 | |
2191 | |
2131 | void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) |
2192 | void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) |
2132 | { |
2193 | { |
2133 | int sh_r, sh_g, sh_b; |
2194 | int sh_r, sh_g, sh_b; |
2134 | RUINT32T mask_r, mask_g, mask_b; |
2195 | RUINT32T mask_r, mask_g, mask_b; |
2135 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2196 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2136 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2197 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2137 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2198 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2138 | int i; |
2199 | int i; |
2139 | |
2200 | |
2140 | Visual *visual = display->visual; |
2201 | Visual *visual = term->visual; |
2141 | |
2202 | |
2142 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2203 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2143 | |
2204 | |
2144 | /* for convenience */ |
2205 | /* for convenience */ |
2145 | mask_r = visual->red_mask; |
2206 | mask_r = visual->red_mask; |
… | |
… | |
2366 | Atom atype; |
2427 | Atom atype; |
2367 | unsigned char *prop = NULL; |
2428 | unsigned char *prop = NULL; |
2368 | Window root, oldp, *list; |
2429 | Window root, oldp, *list; |
2369 | Pixmap rootpixmap = None; |
2430 | Pixmap rootpixmap = None; |
2370 | XWindowAttributes wattr, wrootattr; |
2431 | XWindowAttributes wattr, wrootattr; |
2371 | dDisp; |
|
|
2372 | |
2432 | |
2373 | pchanged = 0; |
2433 | pchanged = 0; |
2374 | |
2434 | |
2375 | if (!(options & Opt_transparent)) |
2435 | if (!OPTION (Opt_transparent)) |
2376 | return pchanged; /* Don't try any more */ |
2436 | return pchanged; /* Don't try any more */ |
2377 | |
2437 | |
2378 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2438 | XGetWindowAttributes (dpy, display->root, &wrootattr); |
2379 | rootdepth = wrootattr.depth; |
2439 | rootdepth = wrootattr.depth; |
2380 | |
2440 | |
2381 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
2441 | XGetWindowAttributes (dpy, parent[0], &wattr); |
2382 | |
2442 | |
2383 | if (rootdepth != wattr.depth) |
2443 | if (rootdepth != wattr.depth) |
2384 | { |
2444 | { |
2385 | if (am_transparent) |
2445 | if (am_transparent) |
2386 | { |
2446 | { |
2387 | pchanged = 1; |
2447 | pchanged = 1; |
2388 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2448 | XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); |
2389 | am_transparent = am_pixmap_trans = 0; |
2449 | am_transparent = am_pixmap_trans = 0; |
2390 | } |
2450 | } |
2391 | |
2451 | |
2392 | return pchanged; /* Don't try any more */ |
2452 | return pchanged; /* Don't try any more */ |
2393 | } |
2453 | } |
2394 | |
2454 | |
2395 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2455 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2396 | XSync (disp, False); |
2456 | XSync (dpy, False); |
2397 | |
2457 | |
2398 | /* |
2458 | /* |
2399 | * Make the frame window set by the window manager have |
2459 | * Make the frame window set by the window manager have |
2400 | * the root background. Some window managers put multiple nested frame |
2460 | * the root background. Some window managers put multiple nested frame |
2401 | * windows for each client, so we have to take care about that. |
2461 | * windows for each client, so we have to take care about that. |
2402 | */ |
2462 | */ |
2403 | i = (xa[XA_XROOTPMAP_ID] |
2463 | i = (xa[XA_XROOTPMAP_ID] |
2404 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2464 | && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID], |
2405 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2465 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2406 | &nitems, &bytes_after, &prop) == Success); |
2466 | &nitems, &bytes_after, &prop) == Success); |
2407 | |
2467 | |
2408 | if (!i || prop == NULL) |
2468 | if (!i || prop == NULL) |
2409 | i = (xa[XA_ESETROOT_PMAP_ID] |
2469 | i = (xa[XA_ESETROOT_PMAP_ID] |
2410 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2470 | && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID], |
2411 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2471 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2412 | &nitems, &bytes_after, &prop) == Success); |
2472 | &nitems, &bytes_after, &prop) == Success); |
2413 | |
2473 | |
2414 | if (!i || prop == NULL |
2474 | if (!i || prop == NULL |
2415 | #if TINTING |
2475 | #if TINTING |
2416 | || !rs[Rs_color + Color_tint] |
2476 | || !ISSET_PIXCOLOR (Color_tint) |
2417 | #endif |
2477 | #endif |
2418 | ) |
2478 | ) |
2419 | have_pixmap = 0; |
2479 | have_pixmap = 0; |
2420 | else |
2480 | else |
2421 | { |
2481 | { |
… | |
… | |
2434 | Window cr; |
2494 | Window cr; |
2435 | XImage *image; |
2495 | XImage *image; |
2436 | GC gc; |
2496 | GC gc; |
2437 | XGCValues gcvalue; |
2497 | XGCValues gcvalue; |
2438 | |
2498 | |
2439 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
2499 | XTranslateCoordinates (dpy, parent[0], display->root, |
2440 | 0, 0, &sx, &sy, &cr); |
2500 | 0, 0, &sx, &sy, &cr); |
2441 | nw = (unsigned int)szHint.width; |
2501 | nw = (unsigned int)szHint.width; |
2442 | nh = (unsigned int)szHint.height; |
2502 | nh = (unsigned int)szHint.height; |
2443 | nx = ny = 0; |
2503 | nx = ny = 0; |
2444 | |
2504 | |
… | |
… | |
2454 | nh += sy; |
2514 | nh += sy; |
2455 | ny = -sy; |
2515 | ny = -sy; |
2456 | sy = 0; |
2516 | sy = 0; |
2457 | } |
2517 | } |
2458 | |
2518 | |
2459 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2519 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2460 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2520 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2461 | |
2521 | |
2462 | XSync (disp, False); |
2522 | XSync (dpy, False); |
2463 | allowedxerror = -1; |
2523 | allowedxerror = -1; |
2464 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2524 | image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2465 | |
2525 | |
2466 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2526 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2467 | /* XXX: may need a delay here? */ |
2527 | /* XXX: may need a delay here? */ |
2468 | allowedxerror = 0; |
2528 | allowedxerror = 0; |
2469 | |
2529 | |
2470 | if (image == NULL) |
2530 | if (image == NULL) |
2471 | { |
2531 | { |
2472 | if (am_transparent && am_pixmap_trans) |
2532 | if (am_transparent && am_pixmap_trans) |
2473 | { |
2533 | { |
2474 | pchanged = 1; |
2534 | pchanged = 1; |
2475 | if (TermWin.pixmap != None) |
2535 | if (pixmap != None) |
2476 | { |
2536 | { |
2477 | XFreePixmap (disp, TermWin.pixmap); |
2537 | XFreePixmap (dpy, pixmap); |
2478 | TermWin.pixmap = None; |
2538 | pixmap = None; |
2479 | } |
2539 | } |
2480 | } |
2540 | } |
2481 | |
2541 | |
2482 | am_pixmap_trans = 0; |
2542 | am_pixmap_trans = 0; |
2483 | } |
2543 | } |
2484 | else |
2544 | else |
2485 | { |
2545 | { |
2486 | if (TermWin.pixmap != None) |
2546 | if (pixmap != None) |
2487 | XFreePixmap (disp, TermWin.pixmap); |
2547 | XFreePixmap (dpy, pixmap); |
2488 | |
2548 | |
2489 | #if TINTING |
2549 | #if TINTING |
2490 | if (ISSET_PIXCOLOR (Color_tint)) |
2550 | if (ISSET_PIXCOLOR (Color_tint)) |
2491 | { |
2551 | { |
2492 | unsigned short rm, gm, bm; |
|
|
2493 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2552 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2494 | |
2553 | |
|
|
2554 | rgba c; |
2495 | pix_colors_focused[Color_tint].get (display, rm, gm, bm); |
2555 | pix_colors_focused [Color_tint].get (c); |
2496 | |
2556 | |
2497 | ShadeXImage (display, image, shade, rm, gm, bm); |
2557 | ShadeXImage (this, image, shade, c.r, c.g, c.b); |
2498 | } |
2558 | } |
2499 | #endif |
2559 | #endif |
2500 | |
2560 | |
2501 | TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, |
2561 | pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth); |
2502 | szHint.width, szHint.height, image->depth); |
|
|
2503 | gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); |
2562 | gc = XCreateGC (dpy, vt, 0UL, &gcvalue); |
2504 | XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, |
2563 | XPutImage (dpy, pixmap, gc, image, 0, 0, |
2505 | nx, ny, image->width, image->height); |
2564 | nx, ny, image->width, image->height); |
2506 | XFreeGC (disp, gc); |
2565 | XFreeGC (dpy, gc); |
2507 | XDestroyImage (image); |
2566 | XDestroyImage (image); |
2508 | XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); |
2567 | XSetWindowBackgroundPixmap (dpy, parent[0], pixmap); |
2509 | XClearWindow (disp, TermWin.parent[0]); |
2568 | XClearWindow (dpy, parent[0]); |
2510 | |
2569 | |
2511 | if (!am_transparent || !am_pixmap_trans) |
2570 | if (!am_transparent || !am_pixmap_trans) |
2512 | pchanged = 1; |
2571 | pchanged = 1; |
2513 | |
2572 | |
2514 | am_transparent = am_pixmap_trans = 1; |
2573 | am_transparent = am_pixmap_trans = 1; |
2515 | } |
2574 | } |
2516 | } |
2575 | } |
2517 | |
2576 | |
2518 | if (am_pixmap_trans) |
2577 | if (am_pixmap_trans) |
2519 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2578 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2520 | else |
2579 | else |
2521 | { |
2580 | { |
2522 | unsigned int n; |
2581 | unsigned int n; |
2523 | /* |
2582 | /* |
2524 | * InheritPixmap transparency |
2583 | * InheritPixmap transparency |
2525 | */ |
2584 | */ |
2526 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2585 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2527 | { |
2586 | { |
2528 | oldp = TermWin.parent[i]; |
2587 | oldp = parent[i]; |
2529 | XQueryTree (disp, TermWin.parent[i - 1], &root, |
2588 | XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n); |
2530 | &TermWin.parent[i], &list, &n); |
|
|
2531 | XFree (list); |
2589 | XFree (list); |
2532 | |
2590 | |
2533 | if (TermWin.parent[i] == display->root) |
2591 | if (parent[i] == display->root) |
2534 | { |
2592 | { |
2535 | if (oldp != None) |
2593 | if (oldp != None) |
2536 | pchanged = 1; |
2594 | pchanged = 1; |
2537 | |
2595 | |
2538 | break; |
2596 | break; |
2539 | } |
2597 | } |
2540 | |
2598 | |
2541 | if (oldp != TermWin.parent[i]) |
2599 | if (oldp != parent[i]) |
2542 | pchanged = 1; |
2600 | pchanged = 1; |
2543 | } |
2601 | } |
2544 | |
2602 | |
2545 | n = 0; |
2603 | n = 0; |
2546 | |
2604 | |
2547 | if (pchanged) |
2605 | if (pchanged) |
2548 | { |
|
|
2549 | for (; n < (unsigned int)i; n++) |
2606 | for (; n < (unsigned int)i; n++) |
2550 | { |
2607 | { |
2551 | XGetWindowAttributes (disp, TermWin.parent[n], &wattr); |
2608 | XGetWindowAttributes (dpy, parent[n], &wattr); |
|
|
2609 | |
2552 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2610 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2553 | { |
2611 | { |
2554 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2612 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2555 | break; |
2613 | break; |
2556 | } |
2614 | } |
2557 | } |
2615 | } |
|
|
2616 | |
|
|
2617 | if (n > (sizeof (parent) / sizeof (parent[0]))) |
2558 | } |
2618 | { |
2559 | |
|
|
2560 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
|
|
2561 | { |
|
|
2562 | XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2619 | XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]); |
2563 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2620 | XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]); |
2564 | am_transparent = 0; |
2621 | am_transparent = 0; |
2565 | /* XXX: also turn off Opt_transparent? */ |
2622 | /* XXX: also turn off Opt_transparent? */ |
2566 | } |
2623 | } |
2567 | else |
2624 | else |
2568 | { |
2625 | { |
2569 | #if WAIT_FOR_WM |
|
|
2570 | /* wait (an arbitrary period) for the WM to do its thing |
|
|
2571 | * needed for fvwm2.2.2 (and before?) */ |
|
|
2572 | sleep (1); |
|
|
2573 | #endif |
|
|
2574 | for (n = 0; n < (unsigned int)i; n++) |
2626 | for (n = 0; n < (unsigned int)i; n++) |
2575 | { |
2627 | { |
2576 | XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); |
2628 | XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative); |
2577 | XClearWindow (disp, TermWin.parent[n]); |
2629 | XClearWindow (dpy, parent[n]); |
2578 | } |
2630 | } |
2579 | |
2631 | |
2580 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2632 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
2581 | am_transparent = 1; |
2633 | am_transparent = 1; |
2582 | } |
2634 | } |
2583 | |
2635 | |
2584 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2636 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2585 | TermWin.parent[i] = None; |
2637 | parent[i] = None; |
2586 | } |
2638 | } |
2587 | |
2639 | |
2588 | if (scrollBar.win) |
2640 | if (scrollBar.win) |
2589 | { |
2641 | { |
2590 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2642 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
2591 | scrollBar.setIdle (); |
2643 | scrollBar.setIdle (); |
2592 | scrollbar_show (0); |
2644 | scrollbar_show (0); |
2593 | } |
2645 | } |
2594 | |
2646 | |
2595 | if (am_transparent) |
2647 | if (am_transparent) |
… | |
… | |
2607 | |
2659 | |
2608 | bool |
2660 | bool |
2609 | rxvt_term::cmd_parse () |
2661 | rxvt_term::cmd_parse () |
2610 | { |
2662 | { |
2611 | bool flag = false; |
2663 | bool flag = false; |
2612 | unicode_t ch = NOCHAR; |
2664 | wchar_t ch = NOCHAR; |
2613 | unsigned char *seq_begin; // remember start of esc-sequence here |
2665 | char *seq_begin; // remember start of esc-sequence here |
2614 | |
2666 | |
2615 | for (;;) |
2667 | for (;;) |
2616 | { |
2668 | { |
2617 | if (ch == NOCHAR) |
2669 | if (ch == NOCHAR) |
2618 | { |
2670 | { |
2619 | seq_begin = cmdbuf_ptr; |
2671 | seq_begin = cmdbuf_ptr; |
2620 | ch = next_char (); |
2672 | ch = next_char (); |
2621 | } |
|
|
2622 | |
2673 | |
2623 | if (ch == NOCHAR) // TODO: improve |
2674 | if (ch == NOCHAR) |
2624 | break; |
2675 | break; |
|
|
2676 | } |
2625 | |
2677 | |
2626 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2678 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2627 | { |
2679 | { |
2628 | if (!seen_input) |
2680 | if (!seen_input) |
2629 | { |
2681 | { |
… | |
… | |
2638 | if (seen_resize && cmd_pid) |
2690 | if (seen_resize && cmd_pid) |
2639 | kill (-cmd_pid, SIGWINCH); |
2691 | kill (-cmd_pid, SIGWINCH); |
2640 | } |
2692 | } |
2641 | |
2693 | |
2642 | /* Read a text string from the input buffer */ |
2694 | /* Read a text string from the input buffer */ |
2643 | unicode_t buf[UBUFSIZ]; |
2695 | wchar_t buf[UBUFSIZ]; |
2644 | bool refreshnow = false; |
2696 | bool refreshnow = false; |
2645 | int nlines = 0; |
2697 | int nlines = 0; |
2646 | unicode_t *str = buf; |
2698 | wchar_t *str = buf; |
|
|
2699 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2647 | |
2700 | |
2648 | for (;;) |
2701 | for (;;) |
2649 | { |
2702 | { |
2650 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2703 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2651 | break; |
2704 | break; |
2652 | |
2705 | |
2653 | *str++ = ch; |
2706 | *str++ = ch; |
2654 | |
2707 | |
2655 | if (ch == C0_LF) |
2708 | if (ch == C0_LF || str >= eol) |
2656 | { |
2709 | { |
|
|
2710 | if (ch == C0_LF) |
2657 | nlines++; |
2711 | nlines++; |
|
|
2712 | |
2658 | refresh_count++; |
2713 | refresh_count++; |
2659 | |
2714 | |
2660 | if (!(options & Opt_jumpScroll) |
2715 | if (!OPTION (Opt_jumpScroll) |
2661 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2716 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2662 | { |
2717 | { |
2663 | refreshnow = true; |
2718 | refreshnow = true; |
|
|
2719 | refresh_count = 0; |
2664 | ch = NOCHAR; |
2720 | ch = NOCHAR; |
2665 | break; |
2721 | break; |
2666 | } |
2722 | } |
2667 | |
2723 | |
2668 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2724 | // scr_add_lines only works for nlines <= nrow - 1. |
2669 | if (nlines >= TermWin.nrow - 1) |
2725 | if (nlines >= nrow - 1) |
2670 | { |
2726 | { |
|
|
2727 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2728 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2671 | scr_add_lines (buf, nlines, str - buf); |
2729 | scr_add_lines (buf, str - buf, nlines); |
|
|
2730 | |
2672 | nlines = 0; |
2731 | nlines = 0; |
2673 | str = buf; |
2732 | str = buf; |
|
|
2733 | eol = str + min (ncol, UBUFSIZ); |
2674 | } |
2734 | } |
2675 | } |
|
|
2676 | |
2735 | |
2677 | if (str >= buf + UBUFSIZ) |
2736 | if (str >= eol) |
2678 | { |
2737 | { |
|
|
2738 | if (eol >= buf + UBUFSIZ) |
|
|
2739 | { |
2679 | ch = NOCHAR; |
2740 | ch = NOCHAR; |
2680 | break; |
2741 | break; |
|
|
2742 | } |
|
|
2743 | else |
|
|
2744 | eol = min (eol + ncol, buf + UBUFSIZ); |
|
|
2745 | } |
|
|
2746 | |
2681 | } |
2747 | } |
2682 | |
2748 | |
2683 | seq_begin = cmdbuf_ptr; |
2749 | seq_begin = cmdbuf_ptr; |
2684 | ch = next_char (); |
2750 | ch = next_char (); |
2685 | } |
2751 | } |
2686 | |
2752 | |
|
|
2753 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2754 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2687 | scr_add_lines (buf, nlines, str - buf); |
2755 | scr_add_lines (buf, str - buf, nlines); |
2688 | |
2756 | |
2689 | /* |
2757 | /* |
2690 | * If there have been a lot of new lines, then update the screen |
2758 | * If there have been a lot of new lines, then update the screen |
2691 | * What the heck I'll cheat and only refresh less than every page-full. |
2759 | * What the heck I'll cheat and only refresh less than every page-full. |
2692 | * the number of pages between refreshes is refresh_limit, which |
2760 | * the number of pages between refreshes is refresh_limit, which |
2693 | * is incremented here because we must be doing flat-out scrolling. |
2761 | * is incremented here because we must be doing flat-out scrolling. |
2694 | */ |
2762 | */ |
2695 | if (refreshnow) |
2763 | if (refreshnow) |
2696 | { |
2764 | { |
2697 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2765 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2698 | refresh_limit++; |
2766 | refresh_limit++; |
2699 | else |
2767 | else |
2700 | { |
2768 | { |
2701 | flag = true; |
2769 | flag = true; |
|
|
2770 | //TODO: due to popular request, implement "skipscroll" option here |
2702 | scr_refresh (refresh_type); |
2771 | scr_refresh (); |
|
|
2772 | want_refresh = 1; |
2703 | } |
2773 | } |
2704 | } |
2774 | } |
2705 | |
2775 | |
2706 | } |
2776 | } |
2707 | else |
2777 | else |
… | |
… | |
2722 | } |
2792 | } |
2723 | |
2793 | |
2724 | return flag; |
2794 | return flag; |
2725 | } |
2795 | } |
2726 | |
2796 | |
2727 | // read the next octet |
|
|
2728 | unicode_t |
|
|
2729 | rxvt_term::next_octet () |
|
|
2730 | { |
|
|
2731 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2732 | ? *cmdbuf_ptr++ |
|
|
2733 | : NOCHAR; |
|
|
2734 | } |
|
|
2735 | |
|
|
2736 | // read the next character |
2797 | // read the next character |
2737 | unicode_t |
2798 | wchar_t |
2738 | rxvt_term::next_char () |
2799 | rxvt_term::next_char () NOTHROW |
2739 | { |
2800 | { |
2740 | while (cmdbuf_ptr < cmdbuf_endp) |
2801 | while (cmdbuf_ptr < cmdbuf_endp) |
2741 | { |
2802 | { |
2742 | // assume 7-bit to be ascii ALWAYS |
2803 | // assume 7-bit to be ascii ALWAYS |
2743 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2804 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2744 | return *cmdbuf_ptr++; |
2805 | return *cmdbuf_ptr++; |
2745 | |
2806 | |
2746 | wchar_t wc; |
2807 | wchar_t wc; |
2747 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2808 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2748 | |
2809 | |
2749 | if (len == (size_t)-2) |
2810 | if (len == (size_t)-2) |
2750 | { |
2811 | { |
2751 | // the mbstate stores incomplete sequences. didn't know this :/ |
2812 | // the mbstate stores incomplete sequences. didn't know this :/ |
2752 | cmdbuf_ptr = cmdbuf_endp; |
2813 | cmdbuf_ptr = cmdbuf_endp; |
2753 | break; |
2814 | break; |
2754 | } |
2815 | } |
2755 | |
2816 | |
2756 | if (len == (size_t)-1) |
2817 | if (len == (size_t)-1) |
2757 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2818 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2758 | |
2819 | |
2759 | // assume wchar == unicode |
2820 | // assume wchar == unicode |
2760 | cmdbuf_ptr += len; |
2821 | cmdbuf_ptr += len; |
2761 | return wc & UNICODE_MASK; |
2822 | return wc & UNICODE_MASK; |
2762 | } |
2823 | } |
2763 | |
2824 | |
2764 | return NOCHAR; |
2825 | return NOCHAR; |
2765 | } |
2826 | } |
|
|
2827 | |
|
|
2828 | // read the next octet |
|
|
2829 | uint32_t |
|
|
2830 | rxvt_term::next_octet () NOTHROW |
|
|
2831 | { |
|
|
2832 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2833 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2834 | : NOCHAR; |
|
|
2835 | } |
|
|
2836 | |
|
|
2837 | static class out_of_input out_of_input; |
2766 | |
2838 | |
2767 | /* rxvt_cmd_getc () - Return next input character */ |
2839 | /* rxvt_cmd_getc () - Return next input character */ |
2768 | /* |
2840 | /* |
2769 | * Return the next input character after first passing any keyboard input |
2841 | * Return the next input character after first passing any keyboard input |
2770 | * to the command. |
2842 | * to the command. |
2771 | */ |
2843 | */ |
2772 | unicode_t |
2844 | wchar_t |
2773 | rxvt_term::cmd_getc () |
2845 | rxvt_term::cmd_getc () THROW ((class out_of_input)) |
2774 | { |
2846 | { |
2775 | unicode_t c = next_char (); |
2847 | wchar_t c = next_char (); |
2776 | |
2848 | |
2777 | if (c == NOCHAR) |
2849 | if (c == NOCHAR) |
2778 | throw out_of_input; |
2850 | throw out_of_input; |
2779 | |
2851 | |
2780 | return c; |
2852 | return c; |
2781 | } |
2853 | } |
2782 | |
2854 | |
2783 | unicode_t |
2855 | uint32_t |
2784 | rxvt_term::cmd_get8 () |
2856 | rxvt_term::cmd_get8 () THROW ((class out_of_input)) |
2785 | { |
2857 | { |
2786 | unicode_t c = next_octet (); |
2858 | uint32_t c = next_octet (); |
2787 | |
2859 | |
2788 | if (c == NOCHAR) |
2860 | if (c == NOCHAR) |
2789 | throw out_of_input; |
2861 | throw out_of_input; |
2790 | |
2862 | |
2791 | return c; |
2863 | return c; |
… | |
… | |
2891 | case C0_ESC: |
2963 | case C0_ESC: |
2892 | process_escape_seq (); |
2964 | process_escape_seq (); |
2893 | break; |
2965 | break; |
2894 | case C0_ENQ: /* terminal Status */ |
2966 | case C0_ENQ: /* terminal Status */ |
2895 | if (rs[Rs_answerbackstring]) |
2967 | if (rs[Rs_answerbackstring]) |
2896 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2968 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2897 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2898 | else |
2969 | else |
2899 | tt_write ((unsigned char *)VT100_ANS, |
2970 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2900 | (unsigned int)strlen (VT100_ANS)); |
|
|
2901 | break; |
2971 | break; |
2902 | case C0_BEL: /* bell */ |
2972 | case C0_BEL: /* bell */ |
2903 | scr_bell (); |
2973 | scr_bell (); |
2904 | break; |
2974 | break; |
2905 | case C0_BS: /* backspace */ |
2975 | case C0_BS: /* backspace */ |
… | |
… | |
3029 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3099 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3030 | break; |
3100 | break; |
3031 | case '+': |
3101 | case '+': |
3032 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3102 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3033 | break; |
3103 | break; |
3034 | #if ENABLE_FRILLS |
3104 | #if !ENABLE_MINIMAL |
3035 | case '6': |
3105 | case '6': |
3036 | scr_backindex (); |
3106 | scr_backindex (); |
3037 | break; |
3107 | break; |
3038 | #endif |
3108 | #endif |
3039 | case '7': |
3109 | case '7': |
3040 | scr_cursor (SAVE); |
3110 | scr_cursor (SAVE); |
3041 | break; |
3111 | break; |
3042 | case '8': |
3112 | case '8': |
3043 | scr_cursor (RESTORE); |
3113 | scr_cursor (RESTORE); |
3044 | break; |
3114 | break; |
3045 | #if ENABLE_FRILLS |
3115 | #if !ENABLE_MINIMAL |
3046 | case '9': |
3116 | case '9': |
3047 | scr_forwardindex (); |
3117 | scr_forwardindex (); |
3048 | break; |
3118 | break; |
3049 | #endif |
3119 | #endif |
3050 | case '=': |
3120 | case '=': |
… | |
… | |
3060 | break; |
3130 | break; |
3061 | |
3131 | |
3062 | /* 8.3.87: NEXT LINE */ |
3132 | /* 8.3.87: NEXT LINE */ |
3063 | case C1_NEL: /* ESC E */ |
3133 | case C1_NEL: /* ESC E */ |
3064 | { |
3134 | { |
3065 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3135 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3066 | scr_add_lines (nlcr, 1, 2); |
3136 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3067 | } |
3137 | } |
3068 | break; |
3138 | break; |
3069 | |
3139 | |
3070 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3140 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3071 | case C1_ESA: /* ESC G */ |
3141 | case C1_ESA: /* ESC G */ |
… | |
… | |
3093 | process_dcs_seq (); |
3163 | process_dcs_seq (); |
3094 | break; |
3164 | break; |
3095 | |
3165 | |
3096 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3166 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3097 | case C1_SCI: /* ESC Z */ |
3167 | case C1_SCI: /* ESC Z */ |
3098 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3168 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3099 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3100 | break; /* steal obsolete ESC [ c */ |
3169 | break; /* steal obsolete ESC [ c */ |
3101 | |
3170 | |
3102 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3171 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3103 | case C1_CSI: /* ESC [ */ |
3172 | case C1_CSI: /* ESC [ */ |
3104 | process_csi_seq (); |
3173 | process_csi_seq (); |
… | |
… | |
3213 | ndef = get_byte_array_bit (csi_defaults, i); |
3282 | ndef = get_byte_array_bit (csi_defaults, i); |
3214 | for (p = 0; p < nargs; p++) |
3283 | for (p = 0; p < nargs; p++) |
3215 | if (arg[p] == -1) |
3284 | if (arg[p] == -1) |
3216 | arg[p] = ndef; |
3285 | arg[p] = ndef; |
3217 | |
3286 | |
3218 | #ifdef DEBUG_CMD |
|
|
3219 | fprintf (stderr, "CSI "); |
|
|
3220 | for (p = 0; p < nargs; p++) |
|
|
3221 | fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : ""); |
|
|
3222 | fprintf (stderr, "%c\n", ch); |
|
|
3223 | #endif |
|
|
3224 | |
|
|
3225 | /* |
3287 | /* |
3226 | * private mode handling |
3288 | * private mode handling |
3227 | */ |
3289 | */ |
3228 | if (priv) |
3290 | if (priv) |
3229 | { |
3291 | { |
3230 | switch (priv) |
3292 | switch (priv) |
3231 | { |
3293 | { |
3232 | case '>': |
3294 | case '>': |
3233 | if (ch == CSI_DA) /* secondary device attributes */ |
3295 | if (ch == CSI_DA) /* secondary device attributes */ |
3234 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3296 | { |
|
|
3297 | // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, |
|
|
3298 | // 'U' for rxvt-unicode != 7.[34] (where it was broken). |
|
|
3299 | // |
|
|
3300 | // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt |
|
|
3301 | // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify |
|
|
3302 | // that we do not support xterm mouse reporting (should be 95 when we do). |
|
|
3303 | // |
|
|
3304 | tt_printf ("\033[>%d;94;0c", 'U'); |
|
|
3305 | } |
3235 | break; |
3306 | break; |
3236 | case '?': |
3307 | case '?': |
3237 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3308 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3238 | process_terminal_mode (ch, priv, nargs, arg); |
3309 | process_terminal_mode (ch, priv, nargs, arg); |
3239 | break; |
3310 | break; |
… | |
… | |
3344 | |
3415 | |
3345 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3416 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3346 | arg[0] = -arg[0]; |
3417 | arg[0] = -arg[0]; |
3347 | /* FALLTHROUGH */ |
3418 | /* FALLTHROUGH */ |
3348 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3419 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3349 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3420 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3350 | break; |
3421 | break; |
3351 | |
3422 | |
3352 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3423 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3353 | tt_write ((const unsigned char *)VT100_ANS, |
3424 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3354 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3355 | break; |
3425 | break; |
3356 | |
3426 | |
3357 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3427 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3358 | process_sgr_mode (nargs, arg); |
3428 | process_sgr_mode (nargs, arg); |
3359 | break; |
3429 | break; |
… | |
… | |
3366 | break; |
3436 | break; |
3367 | case 6: /* CPR requested */ |
3437 | case 6: /* CPR requested */ |
3368 | scr_report_position (); |
3438 | scr_report_position (); |
3369 | break; |
3439 | break; |
3370 | case 7: /* unofficial extension */ |
3440 | case 7: /* unofficial extension */ |
3371 | if (options & Opt_insecure) |
3441 | if (OPTION (Opt_insecure)) |
3372 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3442 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3373 | break; |
3443 | break; |
3374 | case 8: /* unofficial extension */ |
3444 | case 8: /* unofficial extension */ |
3375 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3445 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3376 | break; |
3446 | break; |
… | |
… | |
3443 | break; |
3513 | break; |
3444 | case CSI_75: |
3514 | case CSI_75: |
3445 | scr_cursor (RESTORE); |
3515 | scr_cursor (RESTORE); |
3446 | break; |
3516 | break; |
3447 | |
3517 | |
3448 | #if ENABLE_FRILLS |
3518 | #if !ENABLE_MINIMAL |
3449 | case CSI_74: |
3519 | case CSI_74: |
3450 | process_window_ops (arg, nargs); |
3520 | process_window_ops (arg, nargs); |
3451 | break; |
3521 | break; |
3452 | #endif |
3522 | #endif |
3453 | |
3523 | |
… | |
… | |
3460 | break; |
3530 | break; |
3461 | } |
3531 | } |
3462 | } |
3532 | } |
3463 | /*}}} */ |
3533 | /*}}} */ |
3464 | |
3534 | |
3465 | #if ENABLE_FRILLS |
3535 | #if !ENABLE_MINIMAL |
3466 | /* ARGSUSED */ |
3536 | /* ARGSUSED */ |
3467 | void |
3537 | void |
3468 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3538 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3469 | { |
3539 | { |
3470 | int x, y; |
3540 | int x, y; |
3471 | XWindowAttributes wattr; |
3541 | XWindowAttributes wattr; |
3472 | Window wdummy; |
3542 | Window wdummy; |
3473 | dDisp; |
3543 | |
|
|
3544 | dLocal (Display *, dpy); |
3474 | |
3545 | |
3475 | if (nargs == 0) |
3546 | if (nargs == 0) |
3476 | return; |
3547 | return; |
3477 | |
3548 | |
3478 | switch (args[0]) |
3549 | switch (args[0]) |
3479 | { |
3550 | { |
3480 | /* |
3551 | /* |
3481 | * commands |
3552 | * commands |
3482 | */ |
3553 | */ |
3483 | case 1: /* deiconify window */ |
3554 | case 1: /* deiconify window */ |
3484 | XMapWindow (disp, TermWin.parent[0]); |
3555 | XMapWindow (dpy, parent[0]); |
3485 | break; |
3556 | break; |
3486 | case 2: /* iconify window */ |
3557 | case 2: /* iconify window */ |
3487 | XIconifyWindow (disp, TermWin.parent[0], display->screen); |
3558 | XIconifyWindow (dpy, parent[0], display->screen); |
3488 | break; |
3559 | break; |
3489 | case 3: /* set position (pixels) */ |
3560 | case 3: /* set position (pixels) */ |
3490 | XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); |
3561 | XMoveWindow (dpy, parent[0], args[1], args[2]); |
3491 | break; |
3562 | break; |
3492 | case 4: /* set size (pixels) */ |
3563 | case 4: /* set size (pixels) */ |
3493 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3564 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3494 | break; |
3565 | break; |
3495 | case 5: /* raise window */ |
3566 | case 5: /* raise window */ |
3496 | XRaiseWindow (disp, TermWin.parent[0]); |
3567 | XRaiseWindow (dpy, parent[0]); |
3497 | break; |
3568 | break; |
3498 | case 6: /* lower window */ |
3569 | case 6: /* lower window */ |
3499 | XLowerWindow (disp, TermWin.parent[0]); |
3570 | XLowerWindow (dpy, parent[0]); |
3500 | break; |
3571 | break; |
3501 | case 7: /* refresh window */ |
3572 | case 7: /* refresh window */ |
3502 | scr_touch (true); |
3573 | scr_touch (true); |
3503 | break; |
3574 | break; |
3504 | case 8: /* set size (chars) */ |
3575 | case 8: /* set size (chars) */ |
3505 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3576 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3506 | (unsigned int) (args[1] * TermWin.fheight)); |
3577 | (unsigned int) (args[1] * fheight)); |
3507 | break; |
3578 | break; |
3508 | |
3579 | |
3509 | //case 9: NYI, TODO, restore maximized window or maximize window |
3580 | //case 9: NYI, TODO, restore maximized window or maximize window |
3510 | default: |
3581 | default: |
3511 | if (args[0] >= 24) /* set height (chars) */ |
3582 | if (args[0] >= 24) /* set height (chars) */ |
3512 | set_widthheight ((unsigned int)TermWin.width, |
3583 | set_widthheight ((unsigned int)width, |
3513 | (unsigned int) (args[1] * TermWin.fheight)); |
3584 | (unsigned int) (args[1] * fheight)); |
3514 | break; |
3585 | break; |
3515 | |
|
|
3516 | |
3586 | |
3517 | /* |
3587 | /* |
3518 | * reports - some output format copied from XTerm |
3588 | * reports - some output format copied from XTerm |
3519 | */ |
3589 | */ |
3520 | case 11: /* report window state */ |
3590 | case 11: /* report window state */ |
3521 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3591 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3522 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3592 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3523 | break; |
3593 | break; |
3524 | case 13: /* report window position */ |
3594 | case 13: /* report window position */ |
3525 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3595 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3526 | XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, |
3596 | XTranslateCoordinates (dpy, parent[0], wattr.root, |
3527 | -wattr.border_width, -wattr.border_width, |
3597 | -wattr.border_width, -wattr.border_width, |
3528 | &x, &y, &wdummy); |
3598 | &x, &y, &wdummy); |
3529 | tt_printf ("\033[3;%d;%dt", x, y); |
3599 | tt_printf ("\033[3;%d;%dt", x, y); |
3530 | break; |
3600 | break; |
3531 | case 14: /* report window size (pixels) */ |
3601 | case 14: /* report window size (pixels) */ |
3532 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3602 | XGetWindowAttributes (dpy, parent[0], &wattr); |
3533 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3603 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3534 | break; |
3604 | break; |
3535 | case 18: /* report text area size (chars) */ |
3605 | case 18: /* report text area size (chars) */ |
3536 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3606 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3537 | break; |
3607 | break; |
3538 | case 19: /* report window size (chars) */ |
3608 | case 19: /* report window size (chars) */ |
3539 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3609 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3540 | break; |
3610 | break; |
3541 | case 20: /* report icon label */ |
3611 | case 20: /* report icon label */ |
3542 | { |
3612 | { |
3543 | char *s; |
3613 | char *s; |
3544 | XGetIconName (disp, TermWin.parent[0], &s); |
3614 | XGetIconName (dpy, parent[0], &s); |
3545 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3615 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3546 | XFree (s); |
3616 | XFree (s); |
3547 | } |
3617 | } |
3548 | break; |
3618 | break; |
3549 | case 21: /* report window title */ |
3619 | case 21: /* report window title */ |
3550 | { |
3620 | { |
3551 | char *s; |
3621 | char *s; |
3552 | XFetchName (disp, TermWin.parent[0], &s); |
3622 | XFetchName (dpy, parent[0], &s); |
3553 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3623 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3554 | XFree (s); |
3624 | XFree (s); |
3555 | } |
3625 | } |
3556 | break; |
3626 | break; |
3557 | } |
3627 | } |
3558 | } |
3628 | } |
… | |
… | |
3561 | /*----------------------------------------------------------------------*/ |
3631 | /*----------------------------------------------------------------------*/ |
3562 | /* |
3632 | /* |
3563 | * get input up until STRING TERMINATOR (or BEL) |
3633 | * get input up until STRING TERMINATOR (or BEL) |
3564 | * ends_how is terminator used. returned input must be free()'d |
3634 | * ends_how is terminator used. returned input must be free()'d |
3565 | */ |
3635 | */ |
3566 | unsigned char * |
3636 | char * |
3567 | rxvt_term::get_to_st (unicode_t &ends_how) |
3637 | rxvt_term::get_to_st (unicode_t &ends_how) |
3568 | { |
3638 | { |
3569 | unicode_t ch; |
3639 | unicode_t ch; |
3570 | bool seen_esc = false; |
3640 | bool seen_esc = false; |
3571 | unsigned int n = 0; |
3641 | unsigned int n = 0; |
… | |
… | |
3604 | |
3674 | |
3605 | string[n++] = '\0'; |
3675 | string[n++] = '\0'; |
3606 | |
3676 | |
3607 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3677 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3608 | |
3678 | |
3609 | return (unsigned char *)rxvt_wcstombs (string); |
3679 | return rxvt_wcstombs (string); |
3610 | } |
3680 | } |
3611 | |
3681 | |
3612 | /*----------------------------------------------------------------------*/ |
3682 | /*----------------------------------------------------------------------*/ |
3613 | /* |
3683 | /* |
3614 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3684 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3615 | */ |
3685 | */ |
3616 | void |
3686 | void |
3617 | rxvt_term::process_dcs_seq () |
3687 | rxvt_term::process_dcs_seq () |
3618 | { |
3688 | { |
3619 | unsigned char *s; |
3689 | char *s; |
3620 | unicode_t eh; |
3690 | unicode_t eh; |
3621 | |
3691 | |
3622 | /* |
3692 | /* |
3623 | * Not handled yet |
3693 | * Not handled yet |
3624 | */ |
3694 | */ |
… | |
… | |
3643 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3713 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3644 | arg = arg * 10 + (ch - '0'); |
3714 | arg = arg * 10 + (ch - '0'); |
3645 | |
3715 | |
3646 | if (ch == ';') |
3716 | if (ch == ';') |
3647 | { |
3717 | { |
3648 | unsigned char *s = get_to_st (eh); |
3718 | char *s = get_to_st (eh); |
3649 | |
3719 | |
3650 | if (s) |
3720 | if (s) |
3651 | { |
3721 | { |
3652 | process_xterm_seq (arg, (char *)s, eh); |
3722 | process_xterm_seq (arg, s, eh); |
3653 | free (s); |
3723 | free (s); |
3654 | } |
3724 | } |
3655 | } |
3725 | } |
3656 | } |
3726 | } |
3657 | |
3727 | |
3658 | void |
3728 | void |
3659 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3729 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3660 | { |
3730 | { |
3661 | if (str[0] == '?' && !str[1]) |
3731 | if (str[0] == '?' && !str[1]) |
3662 | { |
3732 | { |
3663 | unsigned short r, g, b; |
3733 | rgba c; |
3664 | pix_colors_focused[color].get (display, r, g, b); |
3734 | pix_colors_focused[color].get (c); |
|
|
3735 | |
|
|
3736 | #if XFT |
|
|
3737 | if (c.a != rgba::MAX_CC) |
|
|
3738 | tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); |
|
|
3739 | else |
|
|
3740 | #endif |
3665 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3741 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); |
3666 | } |
3742 | } |
3667 | else |
3743 | else |
3668 | set_window_color (color, str); |
3744 | set_window_color (color, str); |
3669 | } |
3745 | } |
3670 | |
3746 | |
3671 | /* |
3747 | /* |
3672 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3748 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3673 | */ |
3749 | */ |
3674 | void |
3750 | void |
3675 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3751 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3676 | { |
3752 | { |
3677 | int changed = 0; |
|
|
3678 | int color; |
3753 | int color; |
3679 | char *buf, *name; |
3754 | char *buf, *name; |
3680 | bool query = str[0] == '?' && !str[1]; |
3755 | bool query = str[0] == '?' && !str[1]; |
3681 | int saveop = op; |
3756 | int saveop = op; |
3682 | dDisp; |
3757 | |
|
|
3758 | dLocal (Display *, dpy); |
3683 | |
3759 | |
3684 | assert (str != NULL); |
3760 | assert (str != NULL); |
|
|
3761 | |
|
|
3762 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) |
|
|
3763 | ; // no responses yet |
|
|
3764 | |
3685 | switch (op) |
3765 | switch (op) |
3686 | { |
3766 | { |
3687 | case XTerm_name: |
3767 | case XTerm_name: |
3688 | set_title (str); |
3768 | set_title (str); |
3689 | /* FALLTHROUGH */ |
3769 | /* FALLTHROUGH */ |
… | |
… | |
3703 | unsigned long bytes_after; |
3783 | unsigned long bytes_after; |
3704 | unsigned char *value = 0; |
3784 | unsigned char *value = 0; |
3705 | const char *str = ""; |
3785 | const char *str = ""; |
3706 | |
3786 | |
3707 | if (prop |
3787 | if (prop |
3708 | && XGetWindowProperty (disp, TermWin.parent[0], |
3788 | && XGetWindowProperty (dpy, parent[0], |
3709 | prop, 0, 1<<16, 0, AnyPropertyType, |
3789 | prop, 0, 1<<16, 0, AnyPropertyType, |
3710 | &actual_type, &actual_format, |
3790 | &actual_type, &actual_format, |
3711 | &nitems, &bytes_after, &value) == Success |
3791 | &nitems, &bytes_after, &value) == Success |
3712 | && actual_type != None |
3792 | && actual_type != None |
3713 | && actual_format == 8) |
3793 | && actual_format == 8) |
3714 | str = (const char *)(value); |
3794 | str = (const char *)(value); |
3715 | |
3795 | |
3716 | tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); |
3796 | tt_printf ("\033]%d;%s%c", op, str, resp); |
3717 | |
3797 | |
3718 | XFree (value); |
3798 | XFree (value); |
3719 | } |
3799 | } |
3720 | else |
3800 | else |
3721 | { |
3801 | { |
… | |
… | |
3725 | { |
3805 | { |
3726 | *eq = 0; |
3806 | *eq = 0; |
3727 | set_utf8_property (display->atom (str), eq + 1); |
3807 | set_utf8_property (display->atom (str), eq + 1); |
3728 | } |
3808 | } |
3729 | else |
3809 | else |
3730 | XDeleteProperty (disp, TermWin.parent[0], |
3810 | XDeleteProperty (dpy, parent[0], |
3731 | display->atom (str)); |
3811 | display->atom (str)); |
3732 | } |
3812 | } |
3733 | break; |
3813 | break; |
3734 | |
3814 | |
3735 | case XTerm_Color: |
3815 | case XTerm_Color: |
… | |
… | |
3737 | { |
3817 | { |
3738 | if ((name = strchr (buf, ';')) == NULL) |
3818 | if ((name = strchr (buf, ';')) == NULL) |
3739 | break; |
3819 | break; |
3740 | |
3820 | |
3741 | *name++ = '\0'; |
3821 | *name++ = '\0'; |
3742 | color = atoi (buf); |
3822 | color = atoi (buf) + minCOLOR; |
3743 | |
3823 | |
3744 | if (color < 0 || color >= TOTAL_COLORS) |
3824 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3745 | break; |
3825 | break; |
3746 | |
3826 | |
3747 | if ((buf = strchr (name, ';')) != NULL) |
3827 | if ((buf = strchr (name, ';')) != NULL) |
3748 | *buf++ = '\0'; |
3828 | *buf++ = '\0'; |
3749 | |
3829 | |
3750 | if (name[0] == '?' && !name[1]) |
3830 | process_color_seq (op, color, name, resp); |
3751 | { |
|
|
3752 | unsigned short r, g, b; |
|
|
3753 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
|
|
3754 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
|
|
3755 | } |
|
|
3756 | else |
|
|
3757 | set_window_color (color + minCOLOR, name); |
|
|
3758 | } |
3831 | } |
3759 | break; |
3832 | break; |
3760 | case XTerm_Color00: |
3833 | case XTerm_Color00: |
3761 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3834 | process_color_seq (op, Color_fg, str, resp); |
3762 | break; |
3835 | break; |
3763 | case XTerm_Color01: |
3836 | case XTerm_Color01: |
3764 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3837 | process_color_seq (op, Color_bg, str, resp); |
3765 | break; |
3838 | break; |
3766 | #ifndef NO_CURSORCOLOR |
3839 | #ifndef NO_CURSORCOLOR |
3767 | case XTerm_Color_cursor: |
3840 | case XTerm_Color_cursor: |
3768 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3841 | process_color_seq (op, Color_cursor, str, resp); |
3769 | break; |
3842 | break; |
3770 | #endif |
3843 | #endif |
3771 | case XTerm_Color_pointer_fg: |
3844 | case XTerm_Color_pointer_fg: |
3772 | process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); |
3845 | process_color_seq (op, Color_pointer_fg, str, resp); |
3773 | break; |
3846 | break; |
3774 | case XTerm_Color_pointer_bg: |
3847 | case XTerm_Color_pointer_bg: |
3775 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3848 | process_color_seq (op, Color_pointer_bg, str, resp); |
3776 | break; |
3849 | break; |
3777 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3850 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3778 | case XTerm_Color_BD: |
|
|
3779 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3780 | break; |
|
|
3781 | case XTerm_Color_UL: |
|
|
3782 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3783 | break; |
|
|
3784 | case XTerm_Color_RV: |
3851 | case XTerm_Color_RV: |
3785 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3852 | process_color_seq (op, Color_RV, str, resp); |
|
|
3853 | break; |
|
|
3854 | case Rxvt_Color_BD: |
|
|
3855 | case URxvt_Color_BD: |
|
|
3856 | process_color_seq (op, Color_BD, str, resp); |
|
|
3857 | break; |
|
|
3858 | case Rxvt_Color_UL: |
|
|
3859 | case URxvt_Color_UL: |
|
|
3860 | process_color_seq (op, Color_UL, str, resp); |
3786 | break; |
3861 | break; |
3787 | case URxvt_Color_IT: |
3862 | case URxvt_Color_IT: |
3788 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3863 | process_color_seq (op, Color_IT, str, resp); |
3789 | break; |
3864 | break; |
3790 | #endif |
3865 | #endif |
3791 | #if TRANSPARENT && TINTING |
3866 | #if TRANSPARENT && TINTING |
3792 | case URxvt_Color_tint: |
3867 | case URxvt_Color_tint: |
3793 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3868 | process_color_seq (op, Color_tint, str, resp); |
|
|
3869 | |
3794 | check_our_parents (); |
3870 | check_our_parents (); |
|
|
3871 | |
3795 | if (am_transparent) |
3872 | if (am_transparent) |
3796 | want_full_refresh = want_refresh = 1; |
3873 | want_full_refresh = want_refresh = 1; |
3797 | break; |
|
|
3798 | #endif |
|
|
3799 | |
3874 | |
|
|
3875 | break; |
|
|
3876 | #endif |
|
|
3877 | |
3800 | case XTerm_Pixmap: |
3878 | case Rxvt_Pixmap: |
|
|
3879 | { |
3801 | if (*str != ';') |
3880 | if (*str != ';') |
3802 | { |
3881 | { |
3803 | #if XPM_BACKGROUND |
3882 | #if XPM_BACKGROUND |
3804 | scale_pixmap (""); /* reset to default scaling */ |
3883 | scale_pixmap (""); /* reset to default scaling */ |
3805 | set_bgPixmap (str); /* change pixmap */ |
3884 | set_bgPixmap (str); /* change pixmap */ |
3806 | #endif |
|
|
3807 | scr_touch (true); |
3885 | scr_touch (true); |
|
|
3886 | #endif |
3808 | } |
3887 | } |
|
|
3888 | |
|
|
3889 | int changed = 0; |
|
|
3890 | |
3809 | while ((str = strchr (str, ';')) != NULL) |
3891 | while ((str = strchr (str, ';')) != NULL) |
3810 | { |
3892 | { |
3811 | str++; |
3893 | str++; |
3812 | #if XPM_BACKGROUND |
3894 | #if XPM_BACKGROUND |
3813 | changed += scale_pixmap (str); |
3895 | changed += scale_pixmap (str); |
3814 | #endif |
3896 | #endif |
3815 | } |
3897 | } |
3816 | |
3898 | |
3817 | if (changed) |
3899 | if (changed) |
3818 | { |
3900 | { |
3819 | #ifdef XPM_BACKGROUND |
3901 | #ifdef XPM_BACKGROUND |
3820 | resize_pixmap (); |
3902 | resize_pixmap (); |
3821 | #endif |
|
|
3822 | scr_touch (true); |
3903 | scr_touch (true); |
|
|
3904 | #endif |
3823 | } |
3905 | } |
|
|
3906 | } |
3824 | break; |
3907 | break; |
3825 | |
3908 | |
3826 | case XTerm_restoreFG: |
3909 | case Rxvt_restoreFG: |
3827 | set_window_color (Color_fg, str); |
3910 | set_window_color (Color_fg, str); |
3828 | break; |
3911 | break; |
3829 | case XTerm_restoreBG: |
3912 | case Rxvt_restoreBG: |
3830 | set_window_color (Color_bg, str); |
3913 | set_window_color (Color_bg, str); |
3831 | break; |
3914 | break; |
3832 | |
3915 | |
3833 | case XTerm_logfile: |
3916 | case XTerm_logfile: |
3834 | // TODO, when secure mode? |
3917 | // TODO, when secure mode? |
3835 | break; |
3918 | break; |
3836 | |
3919 | |
3837 | #ifdef MENUBAR |
|
|
3838 | case URxvt_Menu: |
|
|
3839 | if (options & Opt_insecure) |
|
|
3840 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3841 | break; |
|
|
3842 | #endif |
|
|
3843 | #if 0 |
3920 | #if 0 |
3844 | case XTerm_dumpscreen: /* no error notices */ |
3921 | case Rxvt_dumpscreen: /* no error notices */ |
3845 | { |
3922 | { |
3846 | int fd; |
3923 | int fd; |
3847 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3924 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3848 | { |
3925 | { |
3849 | scr_dump (fd); |
3926 | scr_dump (fd); |
… | |
… | |
3860 | case URxvt_italicFont: |
3937 | case URxvt_italicFont: |
3861 | case URxvt_boldItalicFont: |
3938 | case URxvt_boldItalicFont: |
3862 | #endif |
3939 | #endif |
3863 | if (query) |
3940 | if (query) |
3864 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3941 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3865 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3942 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3866 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3943 | ? fontset[op - URxvt_font]->fontdesc : "", |
3867 | resp); |
3944 | resp); |
3868 | else |
3945 | else |
3869 | { |
3946 | { |
3870 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3947 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3871 | |
3948 | |
… | |
… | |
3873 | allocated.push_back ((void *)res); |
3950 | allocated.push_back ((void *)res); |
3874 | set_fonts (); |
3951 | set_fonts (); |
3875 | } |
3952 | } |
3876 | break; |
3953 | break; |
3877 | |
3954 | |
3878 | #if ENABLE_FRILLS |
3955 | case URxvt_version: |
|
|
3956 | if (query) |
|
|
3957 | tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c", |
|
|
3958 | op, |
|
|
3959 | rs[Rs_name], VERSION[0], VERSION[2], |
|
|
3960 | resp); |
|
|
3961 | break; |
|
|
3962 | |
|
|
3963 | #if !ENABLE_MINIMAL |
3879 | case URxvt_locale: |
3964 | case URxvt_locale: |
3880 | if (query) |
3965 | if (query) |
3881 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); |
3966 | tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); |
3882 | else |
3967 | else |
3883 | { |
3968 | { |
3884 | set_locale (str); |
3969 | set_locale (str); |
3885 | pty.set_utf8_mode (enc_utf8); |
3970 | pty->set_utf8_mode (enc_utf8); |
3886 | init_xlocale (); |
3971 | init_xlocale (); |
3887 | } |
3972 | } |
3888 | break; |
3973 | break; |
3889 | |
3974 | |
3890 | case URxvt_view_up: |
3975 | case URxvt_view_up: |
3891 | case URxvt_view_down: |
3976 | case URxvt_view_down: |
|
|
3977 | { |
3892 | int lines = atoi (str); |
3978 | int lines = atoi (str); |
3893 | |
3979 | |
3894 | if (lines) |
3980 | if (lines) |
3895 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3981 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3896 | else |
3982 | else |
3897 | { |
|
|
3898 | scr_erase_savelines (); |
3983 | scr_erase_savelines (); |
3899 | } |
3984 | } |
3900 | |
3985 | |
|
|
3986 | break; |
|
|
3987 | #endif |
|
|
3988 | |
|
|
3989 | #if ENABLE_PERL |
|
|
3990 | case URxvt_perl: |
|
|
3991 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END))) |
|
|
3992 | ; // no responses yet |
3901 | break; |
3993 | break; |
3902 | #endif |
3994 | #endif |
3903 | } |
3995 | } |
3904 | } |
3996 | } |
3905 | /*----------------------------------------------------------------------*/ |
3997 | /*----------------------------------------------------------------------*/ |
… | |
… | |
3936 | return state; |
4028 | return state; |
3937 | } |
4029 | } |
3938 | |
4030 | |
3939 | /* we're not using priv _yet_ */ |
4031 | /* we're not using priv _yet_ */ |
3940 | void |
4032 | void |
3941 | rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) |
4033 | rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) |
3942 | { |
4034 | { |
3943 | unsigned int i, j; |
4035 | unsigned int i, j; |
3944 | int state; |
4036 | int state; |
3945 | |
4037 | |
3946 | static const struct |
4038 | static const struct |
… | |
… | |
3957 | { 5, PrivMode_rVideo }, |
4049 | { 5, PrivMode_rVideo }, |
3958 | { 6, PrivMode_relOrigin }, |
4050 | { 6, PrivMode_relOrigin }, |
3959 | { 7, PrivMode_Autowrap }, |
4051 | { 7, PrivMode_Autowrap }, |
3960 | // 8, bi-directional support mode |
4052 | // 8, bi-directional support mode |
3961 | { 9, PrivMode_MouseX10 }, |
4053 | { 9, PrivMode_MouseX10 }, |
3962 | #ifdef menuBar_esc |
|
|
3963 | { menuBar_esc, PrivMode_menuBar }, |
|
|
3964 | #endif |
|
|
3965 | // 18, 19 printing-related |
4054 | // 18, 19 printing-related |
3966 | { 25, PrivMode_VisibleCursor }, |
4055 | { 25, PrivMode_VisibleCursor }, |
3967 | #ifdef scrollBar_esc |
4056 | #ifdef scrollBar_esc |
3968 | { scrollBar_esc, PrivMode_scrollBar }, |
4057 | { scrollBar_esc, PrivMode_scrollBar }, |
3969 | #endif |
4058 | #endif |
… | |
… | |
4014 | } |
4103 | } |
4015 | |
4104 | |
4016 | /* extra handling for values with state unkept */ |
4105 | /* extra handling for values with state unkept */ |
4017 | switch (arg[i]) |
4106 | switch (arg[i]) |
4018 | { |
4107 | { |
|
|
4108 | #if ENABLE_STYLES |
|
|
4109 | case 1021: |
|
|
4110 | set_option (Opt_intensityStyles, mode); |
|
|
4111 | |
|
|
4112 | scr_touch (true); |
|
|
4113 | break; |
|
|
4114 | #endif |
4019 | case 1048: /* alternative cursor save */ |
4115 | case 1048: /* alternative cursor save */ |
4020 | case 1049: |
4116 | case 1049: |
4021 | if (options & Opt_secondaryScreen) |
4117 | if (OPTION (Opt_secondaryScreen)) |
4022 | if (mode == 0) |
4118 | if (mode == 0) |
4023 | scr_cursor (RESTORE); |
4119 | scr_cursor (RESTORE); |
4024 | else if (mode == 1) |
4120 | else if (mode == 1) |
4025 | scr_cursor (SAVE); |
4121 | scr_cursor (SAVE); |
4026 | break; |
4122 | break; |
… | |
… | |
4038 | */ |
4134 | */ |
4039 | PrivMode (1, PrivMode_vt52); |
4135 | PrivMode (1, PrivMode_vt52); |
4040 | break; |
4136 | break; |
4041 | case 3: /* 80/132 */ |
4137 | case 3: /* 80/132 */ |
4042 | if (priv_modes & PrivMode_132OK) |
4138 | if (priv_modes & PrivMode_132OK) |
4043 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4139 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4044 | break; |
4140 | break; |
4045 | case 4: /* smooth scrolling */ |
4141 | case 4: /* smooth scrolling */ |
4046 | if (state) |
|
|
4047 | options &= ~Opt_jumpScroll; |
|
|
4048 | else |
|
|
4049 | options |= Opt_jumpScroll; |
4142 | set_option (Opt_jumpScroll, !state); |
4050 | break; |
4143 | break; |
4051 | case 5: /* reverse video */ |
4144 | case 5: /* reverse video */ |
4052 | scr_rvideo_mode (state); |
4145 | scr_rvideo_mode (state); |
4053 | break; |
4146 | break; |
4054 | case 6: /* relative/absolute origins */ |
4147 | case 6: /* relative/absolute origins */ |
… | |
… | |
4060 | /* case 8: - auto repeat, can't do on a per window basis */ |
4153 | /* case 8: - auto repeat, can't do on a per window basis */ |
4061 | case 9: /* X10 mouse reporting */ |
4154 | case 9: /* X10 mouse reporting */ |
4062 | if (state) /* orthogonal */ |
4155 | if (state) /* orthogonal */ |
4063 | priv_modes &= ~PrivMode_MouseX11; |
4156 | priv_modes &= ~PrivMode_MouseX11; |
4064 | break; |
4157 | break; |
4065 | #ifdef menuBar_esc |
|
|
4066 | case menuBar_esc: |
|
|
4067 | #ifdef MENUBAR |
|
|
4068 | map_menuBar (state); |
|
|
4069 | #endif |
|
|
4070 | break; |
|
|
4071 | #endif |
|
|
4072 | #ifdef scrollBar_esc |
4158 | #ifdef scrollBar_esc |
4073 | case scrollBar_esc: |
4159 | case scrollBar_esc: |
4074 | if (scrollbar_mapping (state)) |
4160 | if (scrollbar_mapping (state)) |
4075 | { |
4161 | { |
4076 | resize_all_windows (0, 0, 0); |
4162 | resize_all_windows (0, 0, 0); |
… | |
… | |
4095 | #if 0 |
4181 | #if 0 |
4096 | case 1001: |
4182 | case 1001: |
4097 | break; /* X11 mouse highlighting */ |
4183 | break; /* X11 mouse highlighting */ |
4098 | #endif |
4184 | #endif |
4099 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4185 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4100 | if (state) |
|
|
4101 | options &= ~Opt_scrollTtyOutput; |
|
|
4102 | else |
|
|
4103 | options |= Opt_scrollTtyOutput; |
4186 | set_option (Opt_scrollTtyOutput, !state); |
4104 | break; |
4187 | break; |
4105 | case 1011: /* scroll to bottom on key press */ |
4188 | case 1011: /* scroll to bottom on key press */ |
4106 | if (state) |
|
|
4107 | options |= Opt_scrollTtyKeypress; |
4189 | set_option (Opt_scrollTtyKeypress, state); |
4108 | else |
|
|
4109 | options &= ~Opt_scrollTtyKeypress; |
|
|
4110 | break; |
4190 | break; |
4111 | case 1047: /* secondary screen w/ clearing last */ |
4191 | case 1047: /* secondary screen w/ clearing last */ |
4112 | if (options & Opt_secondaryScreen) |
4192 | if (OPTION (Opt_secondaryScreen)) |
4113 | if (current_screen != PRIMARY) |
4193 | if (current_screen != PRIMARY) |
4114 | scr_erase_screen (2); |
4194 | scr_erase_screen (2); |
4115 | scr_change_screen (state); |
4195 | scr_change_screen (state); |
4116 | break; |
4196 | break; |
4117 | case 1049: /* secondary screen w/ clearing first */ |
4197 | case 1049: /* secondary screen w/ clearing first */ |
4118 | scr_change_screen (state); |
4198 | scr_change_screen (state); |
4119 | if (options & Opt_secondaryScreen) |
4199 | if (OPTION (Opt_secondaryScreen)) |
4120 | if (current_screen != PRIMARY) |
4200 | if (current_screen != PRIMARY) |
4121 | scr_erase_screen (2); |
4201 | scr_erase_screen (2); |
4122 | break; |
4202 | break; |
4123 | default: |
4203 | default: |
4124 | break; |
4204 | break; |
… | |
… | |
4252 | scr_color (Color_bg, Color_bg); |
4332 | scr_color (Color_bg, Color_bg); |
4253 | break; |
4333 | break; |
4254 | |
4334 | |
4255 | //case 50: // not variable spacing |
4335 | //case 50: // not variable spacing |
4256 | |
4336 | |
4257 | #ifndef NO_BRIGHTCOLOR |
4337 | #if !ENABLE_MINIMAL |
4258 | case 90: |
4338 | case 90: |
4259 | case 91: /* set bright fg color */ |
4339 | case 91: /* set bright fg color */ |
4260 | case 92: |
4340 | case 92: |
4261 | case 93: |
4341 | case 93: |
4262 | case 94: |
4342 | case 94: |
… | |
… | |
4274 | case 106: |
4354 | case 106: |
4275 | case 107: |
4355 | case 107: |
4276 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4356 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4277 | break; |
4357 | break; |
4278 | #endif |
4358 | #endif |
4279 | |
|
|
4280 | } |
4359 | } |
4281 | } |
4360 | } |
4282 | } |
4361 | } |
4283 | /*}}} */ |
4362 | /*}}} */ |
4284 | |
4363 | |
… | |
… | |
4308 | */ |
4387 | */ |
4309 | void |
4388 | void |
4310 | rxvt_term::tt_printf (const char *fmt,...) |
4389 | rxvt_term::tt_printf (const char *fmt,...) |
4311 | { |
4390 | { |
4312 | va_list arg_ptr; |
4391 | va_list arg_ptr; |
4313 | unsigned char buf[256]; |
4392 | char buf[256]; |
4314 | |
4393 | |
4315 | va_start (arg_ptr, fmt); |
4394 | va_start (arg_ptr, fmt); |
4316 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4395 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4317 | va_end (arg_ptr); |
4396 | va_end (arg_ptr); |
4318 | tt_write (buf, strlen (buf)); |
4397 | tt_write (buf, strlen (buf)); |
… | |
… | |
4323 | * or generated by us in response to a query ESC sequence. |
4402 | * or generated by us in response to a query ESC sequence. |
4324 | */ |
4403 | */ |
4325 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4404 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4326 | |
4405 | |
4327 | void |
4406 | void |
4328 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4407 | rxvt_term::tt_write (const char *data, unsigned int len) |
4329 | { |
4408 | { |
|
|
4409 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4410 | return; |
|
|
4411 | |
|
|
4412 | if (pty->pty < 0) |
|
|
4413 | return; |
|
|
4414 | |
4330 | if (v_buflen == 0) |
4415 | if (v_buflen == 0) |
4331 | { |
4416 | { |
4332 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4417 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4333 | |
4418 | |
4334 | if ((unsigned int)written == len) |
4419 | if ((unsigned int)written == len) |
4335 | return; |
4420 | return; |
4336 | |
4421 | |
4337 | data += written; |
4422 | data += written; |
4338 | len -= written; |
4423 | len -= written; |
4339 | } |
4424 | } |
4340 | |
4425 | |
4341 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4426 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4342 | |
4427 | |
4343 | memcpy (v_buffer + v_buflen, data, len); |
4428 | memcpy (v_buffer + v_buflen, data, len); |
4344 | v_buflen += len; |
4429 | v_buflen += len; |
4345 | |
4430 | |
4346 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4431 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4347 | } |
4432 | } |
4348 | |
4433 | |
4349 | void rxvt_term::pty_write () |
4434 | void rxvt_term::pty_write () |
4350 | { |
4435 | { |
4351 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4436 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4352 | |
4437 | |
4353 | if (written > 0) |
4438 | if (written > 0) |
4354 | { |
4439 | { |
4355 | v_buflen -= written; |
4440 | v_buflen -= written; |
4356 | |
4441 | |
… | |
… | |
4365 | } |
4450 | } |
4366 | |
4451 | |
4367 | memmove (v_buffer, v_buffer + written, v_buflen); |
4452 | memmove (v_buffer, v_buffer + written, v_buflen); |
4368 | } |
4453 | } |
4369 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4454 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4370 | // original code just ignores this... |
4455 | pty_ev.set (EVENT_READ); |
4371 | destroy (); |
|
|
4372 | } |
4456 | } |
4373 | |
4457 | |
4374 | /*----------------------- end-of-file (C source) -----------------------*/ |
4458 | /*----------------------- end-of-file (C source) -----------------------*/ |
4375 | |
4459 | |