… | |
… | |
25 | * - extensive modifications |
25 | * - extensive modifications |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
27 | * Copyright (c) 2001 Marius Gedminas |
27 | * Copyright (c) 2001 Marius Gedminas |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
30 | * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> |
30 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
31 | * |
31 | * |
32 | * This program is free software; you can redistribute it and/or modify |
32 | * This program is free software; you can redistribute it and/or modify |
33 | * it under the terms of the GNU General Public License as published by |
33 | * it under the terms of the GNU General Public License as published by |
34 | * the Free Software Foundation; either version 2 of the License, or |
34 | * the Free Software Foundation; either version 2 of the License, or |
35 | * (at your option) any later version. |
35 | * (at your option) any later version. |
… | |
… | |
43 | * along with this program; if not, write to the Free Software |
43 | * along with this program; if not, write to the Free Software |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
45 | *----------------------------------------------------------------------*/ |
45 | *----------------------------------------------------------------------*/ |
46 | |
46 | |
47 | /*{{{ includes: */ |
47 | /*{{{ includes: */ |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" |
|
|
50 | #include "rxvtperl.h" |
50 | #include "version.h" |
51 | #include "version.h" |
51 | #include "command.h" |
52 | #include "command.h" |
52 | |
53 | |
53 | #include <cwchar> |
54 | #if HAVE_SCHED_YIELD |
|
|
55 | #undef HAVE_SCHED_YIELD // disabled for the time being |
|
|
56 | //# include <sched.h> |
|
|
57 | #endif |
|
|
58 | |
|
|
59 | #ifdef KEYSYM_RESOURCE |
|
|
60 | # include "keyboard.h" |
|
|
61 | #endif |
|
|
62 | |
54 | #include <csignal> |
63 | #include <csignal> |
55 | |
64 | |
56 | /*----------------------------------------------------------------------*/ |
65 | /*----------------------------------------------------------------------*/ |
57 | |
66 | |
58 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
67 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
… | |
… | |
114 | XK_Escape, 0x238b, |
123 | XK_Escape, 0x238b, |
115 | XK_Undo, 0x238c, |
124 | XK_Undo, 0x238c, |
116 | XK_Print, 0x2399, |
125 | XK_Print, 0x2399, |
117 | |
126 | |
118 | XK_space, 0x2423, |
127 | XK_space, 0x2423, |
|
|
128 | |
|
|
129 | #ifdef XK_KP_Begin |
|
|
130 | XK_KP_Prior, 0x21de, |
|
|
131 | XK_KP_Next, 0x21df, |
|
|
132 | XK_KP_Begin, 0x2320, |
|
|
133 | XK_KP_Insert, 0x2380, |
|
|
134 | XK_KP_Delete, 0x2326, |
119 | XK_KP_Space, 0x2422, |
135 | XK_KP_Space, 0x2422, |
|
|
136 | #endif |
120 | 0, |
137 | 0, |
121 | }; |
138 | }; |
122 | |
139 | |
123 | void |
140 | void |
124 | rxvt_term::iso14755_54 (int x, int y) |
141 | rxvt_term::iso14755_54 (int x, int y) |
125 | { |
142 | { |
126 | x = Pixel2Col (x); |
143 | x = Pixel2Col (x); |
127 | y = Pixel2Row (y); |
144 | y = Pixel2Row (y); |
128 | |
145 | |
129 | if (x < 0 || x >= TermWin.ncol |
146 | if (!IN_RANGE_EXC (x, 0, ncol) |
130 | || y < 0 || y >= TermWin.nrow) |
147 | || !IN_RANGE_EXC (y, 0, nrow)) |
131 | return; |
148 | return; |
132 | |
149 | |
133 | for (;;) |
150 | for (;;) |
134 | { |
151 | { |
135 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
152 | const line_t &l = ROW(y + view_start); |
|
|
153 | |
|
|
154 | text_t t = l.t[x]; |
136 | |
155 | |
137 | if (t != NOCHAR || !x) |
156 | if (t != NOCHAR || !x) |
138 | { |
157 | { |
139 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
158 | iso14755_51 (l.t[x], l.r[x], x, y); |
140 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
141 | iso14755buf = ISO_14755_54; |
159 | iso14755buf = ISO_14755_54; |
142 | break; |
160 | break; |
143 | } |
161 | } |
144 | |
162 | |
145 | x--; |
163 | x--; |
146 | } |
164 | } |
147 | |
|
|
148 | } |
165 | } |
149 | #endif |
|
|
150 | |
166 | |
151 | #if ENABLE_OVERLAY |
|
|
152 | void |
167 | void |
153 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
168 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) |
154 | { |
169 | { |
155 | rxvt_fontset *fs = FONTSET (r); |
170 | rxvt_fontset *fs = FONTSET (r); |
156 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
171 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
157 | wchar_t *chr, *alloc, ch2; |
172 | wchar_t *chr, *alloc, ch2, *fname; |
158 | int len; |
173 | int len; |
159 | |
174 | |
|
|
175 | fname = rxvt_utf8towcs (f->name); |
|
|
176 | |
160 | #if ENABLE_COMBINING |
177 | # if ENABLE_COMBINING |
161 | if (IS_COMPOSE (ch)) |
178 | if (IS_COMPOSE (ch)) |
162 | { |
179 | { |
163 | len = rxvt_composite.expand (ch, 0); |
180 | len = rxvt_composite.expand (ch, 0); |
164 | alloc = chr = new wchar_t[len]; |
181 | alloc = chr = new wchar_t[len]; |
165 | rxvt_composite.expand (ch, chr); |
182 | rxvt_composite.expand (ch, chr); |
166 | } |
183 | } |
167 | else |
184 | else |
168 | #endif |
185 | # endif |
169 | { |
186 | { |
170 | ch2 = ch; |
187 | ch2 = ch; |
171 | |
188 | |
172 | alloc = 0; |
189 | alloc = 0; |
173 | chr = &ch2; |
190 | chr = &ch2; |
174 | len = 1; |
191 | len = 1; |
175 | } |
192 | } |
176 | |
193 | |
177 | int width = strlen (f->name); |
194 | char attr[80]; // plenty |
178 | |
195 | |
179 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
196 | sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", |
|
|
197 | (int)r, |
|
|
198 | fgcolor_of (r), bgcolor_of (r), |
|
|
199 | r & RS_Bold ? " bold" : "", |
|
|
200 | r & RS_Italic ? " italic" : "", |
|
|
201 | r & RS_Blink ? " blink" : "", |
|
|
202 | r & RS_RVid ? " rvid" : "", |
|
|
203 | r & RS_Uline ? " uline" : "", |
|
|
204 | r & RS_Careful ? " careful" : ""); |
|
|
205 | |
|
|
206 | int width = wcswidth (fname, wcslen (fname)); |
|
|
207 | |
|
|
208 | max_it (width, 8+5); // for char + hey |
|
|
209 | max_it (width, strlen (attr)); |
|
|
210 | |
|
|
211 | if (y >= 0) |
|
|
212 | { |
|
|
213 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
|
|
214 | x = 0; |
|
|
215 | } |
|
|
216 | |
|
|
217 | scr_overlay_new (x, y, width, len + 2); |
180 | |
218 | |
181 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
219 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
182 | |
220 | |
183 | for (int y = 0; y < len; y++) |
221 | for (int y = 0; y < len; y++) |
184 | { |
222 | { |
… | |
… | |
187 | ch = *chr++; |
225 | ch = *chr++; |
188 | |
226 | |
189 | sprintf (buf, "%8x", ch); |
227 | sprintf (buf, "%8x", ch); |
190 | scr_overlay_set (0, y, buf); |
228 | scr_overlay_set (0, y, buf); |
191 | scr_overlay_set (9, y, '='); |
229 | scr_overlay_set (9, y, '='); |
192 | #if !UNICODE3 |
230 | # if !UNICODE3 |
193 | if (ch >= 0x10000) |
231 | if (ch >= 0x10000) |
194 | ch = 0xfffd; |
232 | ch = 0xfffd; |
195 | #endif |
233 | # endif |
196 | scr_overlay_set (11, y, ch, r); |
234 | scr_overlay_set (11, y, ch, r); |
197 | scr_overlay_set (12, y, NOCHAR, r); |
235 | scr_overlay_set (12, y, NOCHAR, r); |
198 | } |
236 | } |
199 | |
237 | |
|
|
238 | scr_overlay_set (0, len , attr); |
200 | scr_overlay_set (0, len, f->name); |
239 | scr_overlay_set (0, len + 1, fname); |
201 | |
240 | |
|
|
241 | free (fname); |
|
|
242 | |
202 | #if ENABLE_COMBINING |
243 | # if ENABLE_COMBINING |
203 | if (alloc) |
244 | if (alloc) |
204 | delete [] alloc; |
245 | delete [] alloc; |
205 | #endif |
246 | # endif |
206 | } |
247 | } |
207 | #endif |
248 | #endif |
208 | |
249 | |
209 | void |
250 | void |
210 | rxvt_term::commit_iso14755 () |
251 | rxvt_term::commit_iso14755 () |
… | |
… | |
227 | mb[0] = ch[0]; |
268 | mb[0] = ch[0]; |
228 | len = 1; |
269 | len = 1; |
229 | } |
270 | } |
230 | |
271 | |
231 | if (len > 0) |
272 | if (len > 0) |
232 | tt_write ((unsigned char *)mb, len); |
273 | tt_write (mb, len); |
233 | else |
274 | else |
234 | scr_bell (); |
275 | scr_bell (); |
235 | } |
276 | } |
236 | |
277 | |
237 | iso14755buf = 0; |
278 | iso14755buf = 0; |
… | |
… | |
265 | KeySym keysym; |
306 | KeySym keysym; |
266 | #ifdef DEBUG_CMD |
307 | #ifdef DEBUG_CMD |
267 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
268 | #endif |
309 | #endif |
269 | int valid_keysym; |
310 | int valid_keysym; |
270 | unsigned char kbuf[KBUFSZ]; |
311 | char kbuf[KBUFSZ]; |
271 | |
312 | |
272 | /* |
313 | /* |
273 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
314 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
274 | * escape sequence to toggle the Keypad. |
315 | * escape sequence to toggle the Keypad. |
275 | * |
316 | * |
276 | * Always permit `shift' to override the current setting |
317 | * Always permit `shift' to override the current setting |
277 | */ |
318 | */ |
278 | shft = (ev.state & ShiftMask); |
319 | shft = ev.state & ShiftMask; |
279 | ctrl = (ev.state & ControlMask); |
320 | ctrl = ev.state & ControlMask; |
280 | meta = (ev.state & ModMetaMask); |
321 | meta = ev.state & ModMetaMask; |
281 | |
322 | |
282 | if (numlock_state || (ev.state & ModNumLockMask)) |
323 | if (numlock_state || (ev.state & ModNumLockMask)) |
283 | { |
324 | { |
284 | numlock_state = (ev.state & ModNumLockMask); |
325 | numlock_state = (ev.state & ModNumLockMask); |
285 | PrivMode ((!numlock_state), PrivMode_aplKP); |
326 | PrivMode ((!numlock_state), PrivMode_aplKP); |
… | |
… | |
293 | Status status_return; |
334 | Status status_return; |
294 | |
335 | |
295 | #if 0 |
336 | #if 0 |
296 | #ifdef X_HAVE_UTF8_STRING |
337 | #ifdef X_HAVE_UTF8_STRING |
297 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
338 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
298 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
339 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
299 | KBUFSZ, &keysym, &status_return); |
340 | KBUFSZ, &keysym, &status_return); |
300 | else |
341 | else |
301 | #endif |
342 | #endif |
302 | #endif |
343 | #endif |
303 | { |
344 | { |
… | |
… | |
305 | |
346 | |
306 | // the XOpenIM manpage lies about hardcoding the locale |
347 | // the XOpenIM manpage lies about hardcoding the locale |
307 | // at the point of XOpenIM, so temporarily switch locales |
348 | // at the point of XOpenIM, so temporarily switch locales |
308 | if (rs[Rs_imLocale]) |
349 | if (rs[Rs_imLocale]) |
309 | SET_LOCALE (rs[Rs_imLocale]); |
350 | SET_LOCALE (rs[Rs_imLocale]); |
|
|
351 | |
310 | // assume wchar_t == unicode or better |
352 | // assume wchar_t == unicode or better |
311 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
353 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
312 | KBUFSZ, &keysym, &status_return); |
354 | KBUFSZ, &keysym, &status_return); |
|
|
355 | |
313 | if (rs[Rs_imLocale]) |
356 | if (rs[Rs_imLocale]) |
314 | SET_LOCALE (locale); |
357 | SET_LOCALE (locale); |
315 | |
358 | |
316 | if (status_return == XLookupChars |
359 | if (status_return == XLookupChars |
317 | || status_return == XLookupBoth) |
360 | || status_return == XLookupBoth) |
… | |
… | |
338 | || status_return == XLookupBoth; |
381 | || status_return == XLookupBoth; |
339 | } |
382 | } |
340 | else |
383 | else |
341 | #endif |
384 | #endif |
342 | { |
385 | { |
343 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
386 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
344 | valid_keysym = keysym != NoSymbol; |
387 | valid_keysym = keysym != NoSymbol; |
345 | } |
388 | } |
346 | |
389 | |
347 | if (valid_keysym) |
390 | if (valid_keysym) |
348 | { |
391 | { |
|
|
392 | #ifdef KEYSYM_RESOURCE |
|
|
393 | if (keyboard->dispatch (this, keysym, ev.state)) |
|
|
394 | return; |
|
|
395 | #endif |
|
|
396 | |
349 | if (TermWin.saveLines) |
397 | if (saveLines) |
350 | { |
398 | { |
351 | #ifdef UNSHIFTED_SCROLLKEYS |
399 | #ifdef UNSHIFTED_SCROLLKEYS |
352 | if (!ctrl && !meta) |
400 | if (!ctrl && !meta) |
353 | #else |
401 | #else |
354 | if (IS_SCROLL_MOD) |
402 | if (IS_SCROLL_MOD) |
355 | #endif |
403 | #endif |
356 | { |
404 | { |
357 | int lnsppg; |
405 | int lnsppg; |
358 | |
406 | |
359 | #ifdef PAGING_CONTEXT_LINES |
407 | #ifdef PAGING_CONTEXT_LINES |
360 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
408 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
361 | #else |
409 | #else |
362 | lnsppg = TermWin.nrow * 4 / 5; |
410 | lnsppg = nrow * 4 / 5; |
363 | #endif |
411 | #endif |
364 | if (keysym == XK_Prior) |
412 | if (keysym == XK_Prior) |
365 | { |
413 | { |
366 | scr_page (UP, lnsppg); |
414 | scr_page (UP, lnsppg); |
367 | return; |
415 | return; |
… | |
… | |
395 | scr_move_to (0, 1); |
443 | scr_move_to (0, 1); |
396 | return; |
444 | return; |
397 | } |
445 | } |
398 | else if (keysym == XK_End) |
446 | else if (keysym == XK_End) |
399 | { |
447 | { |
400 | scr_move_to (1, 0); |
448 | scr_move_to (1, 1); |
401 | return; |
449 | return; |
402 | } |
450 | } |
403 | } |
451 | } |
404 | #endif |
452 | #endif |
405 | } |
453 | } |
… | |
… | |
416 | { |
464 | { |
417 | switch (keysym) |
465 | switch (keysym) |
418 | { |
466 | { |
419 | /* normal XTerm key bindings */ |
467 | /* normal XTerm key bindings */ |
420 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
468 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
421 | selection_request (ev.time, 0, 0); |
469 | selection_request (ev.time); |
422 | return; |
470 | return; |
423 | #if TODO |
471 | #if TODO |
424 | /* rxvt extras */ |
472 | /* rxvt extras */ |
425 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
473 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
426 | change_font (FONT_UP); |
474 | change_font (FONT_UP); |
… | |
… | |
487 | } |
535 | } |
488 | #endif |
536 | #endif |
489 | |
537 | |
490 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
538 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
491 | { |
539 | { |
492 | #ifdef KEYSYM_RESOURCE |
|
|
493 | if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) |
|
|
494 | { |
|
|
495 | unsigned int l; |
|
|
496 | const unsigned char *kbuf0; |
|
|
497 | |
|
|
498 | kbuf0 = (Keysym_map[keysym & 0xFF]); |
|
|
499 | l = (unsigned int)*kbuf0++; |
|
|
500 | |
|
|
501 | /* escape prefix */ |
|
|
502 | if (meta |
|
|
503 | # ifdef META8_OPTION |
|
|
504 | && meta_char == C0_ESC |
|
|
505 | # endif |
|
|
506 | ) |
|
|
507 | { |
|
|
508 | const unsigned char ch = C0_ESC; |
|
|
509 | tt_write (&ch, 1); |
|
|
510 | } |
|
|
511 | |
|
|
512 | tt_write (kbuf0, l); |
|
|
513 | return; |
|
|
514 | } |
|
|
515 | else |
|
|
516 | #endif |
|
|
517 | { |
540 | { |
518 | newlen = 1; |
541 | newlen = 1; |
519 | switch (keysym) |
542 | switch (keysym) |
520 | { |
543 | { |
521 | #ifndef NO_BACKSPACE_KEY |
544 | #ifndef NO_BACKSPACE_KEY |
… | |
… | |
529 | else |
552 | else |
530 | strcpy (kbuf, key_backspace); |
553 | strcpy (kbuf, key_backspace); |
531 | break; |
554 | break; |
532 | #endif |
555 | #endif |
533 | #ifndef NO_DELETE_KEY |
556 | #ifndef NO_DELETE_KEY |
|
|
557 | # ifdef XK_KP_Prior |
|
|
558 | case XK_KP_Delete: |
|
|
559 | /* allow shift to override */ |
|
|
560 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
561 | { |
|
|
562 | strcpy (kbuf, "\033On"); |
|
|
563 | break; |
|
|
564 | } |
|
|
565 | /* FALLTHROUGH */ |
|
|
566 | # endif |
534 | case XK_Delete: |
567 | case XK_Delete: |
535 | strcpy (kbuf, key_delete); |
568 | strcpy (kbuf, key_delete); |
536 | break; |
569 | break; |
537 | #endif |
570 | #endif |
538 | case XK_Tab: |
571 | case XK_Tab: |
… | |
… | |
641 | #ifdef XK_KP_Begin |
674 | #ifdef XK_KP_Begin |
642 | case XK_KP_Begin: |
675 | case XK_KP_Begin: |
643 | strcpy (kbuf, "\033Ou"); |
676 | strcpy (kbuf, "\033Ou"); |
644 | break; |
677 | break; |
645 | |
678 | |
646 | case XK_KP_Insert: |
|
|
647 | strcpy (kbuf, "\033Op"); |
|
|
648 | break; |
|
|
649 | |
|
|
650 | case XK_KP_Delete: |
|
|
651 | strcpy (kbuf, "\033On"); |
|
|
652 | break; |
|
|
653 | #endif |
679 | #endif |
654 | case XK_KP_F1: /* "\033OP" */ |
680 | case XK_KP_F1: /* "\033OP" */ |
655 | case XK_KP_F2: /* "\033OQ" */ |
681 | case XK_KP_F2: /* "\033OQ" */ |
656 | case XK_KP_F3: /* "\033OR" */ |
682 | case XK_KP_F3: /* "\033OR" */ |
657 | case XK_KP_F4: /* "\033OS" */ |
683 | case XK_KP_F4: /* "\033OS" */ |
… | |
… | |
689 | break; |
715 | break; |
690 | |
716 | |
691 | case XK_Find: |
717 | case XK_Find: |
692 | strcpy (kbuf, "\033[1~"); |
718 | strcpy (kbuf, "\033[1~"); |
693 | break; |
719 | break; |
|
|
720 | |
|
|
721 | #ifdef XK_KP_End |
|
|
722 | case XK_KP_Insert: |
|
|
723 | /* allow shift to override */ |
|
|
724 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
725 | { |
|
|
726 | strcpy (kbuf, "\033Op"); |
|
|
727 | break; |
|
|
728 | } |
|
|
729 | /* FALLTHROUGH */ |
|
|
730 | #endif |
694 | case XK_Insert: |
731 | case XK_Insert: |
695 | strcpy (kbuf, "\033[2~"); |
732 | strcpy (kbuf, "\033[2~"); |
696 | break; |
733 | break; |
697 | #ifdef DXK_Remove /* support for DEC remove like key */ |
734 | #ifdef DXK_Remove /* support for DEC remove like key */ |
698 | case DXK_Remove: |
735 | case DXK_Remove: |
… | |
… | |
785 | case XK_F35: /* "\033[49~" */ |
822 | case XK_F35: /* "\033[49~" */ |
786 | FKEY (31, XK_F17); |
823 | FKEY (31, XK_F17); |
787 | break; |
824 | break; |
788 | #undef FKEY |
825 | #undef FKEY |
789 | default: |
826 | default: |
790 | if (len == 0 |
827 | newlen = 0; |
791 | && (keysym & 0xfff0) != 0xff70 |
828 | break; |
792 | && (keysym & 0xfff0) != 0xffe0) |
|
|
793 | /* generate a keycode for every remaining keypress */ |
|
|
794 | sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym); |
|
|
795 | } |
829 | } |
796 | |
830 | |
797 | if (newlen) |
831 | if (newlen) |
798 | len = strlen (kbuf); |
832 | len = strlen (kbuf); |
799 | } |
833 | } |
… | |
… | |
815 | else if (keysym == XK_ISO_Left_Tab) |
849 | else if (keysym == XK_ISO_Left_Tab) |
816 | { |
850 | { |
817 | strcpy (kbuf, "\033[Z"); |
851 | strcpy (kbuf, "\033[Z"); |
818 | len = 3; |
852 | len = 3; |
819 | } |
853 | } |
820 | else if (len == 0 |
|
|
821 | && (keysym & 0xffe0) != 0xfe00 |
|
|
822 | && (keysym < 0xfe50 || keysym > 0xfe6f)) |
|
|
823 | { |
|
|
824 | /* generate a keycode for every remaining keypress */ |
|
|
825 | len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym); |
|
|
826 | } |
|
|
827 | else |
854 | else |
828 | { |
855 | { |
829 | #ifdef META8_OPTION |
856 | #ifdef META8_OPTION |
830 | /* set 8-bit on */ |
857 | /* set 8-bit on */ |
831 | if (meta && (meta_char == 0x80)) |
858 | if (meta && (meta_char == 0x80)) |
832 | { |
859 | { |
833 | unsigned char *ch; |
860 | char *ch; |
834 | |
861 | |
835 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
836 | *ch |= 0x80; |
863 | *ch |= 0x80; |
837 | |
864 | |
838 | meta = 0; |
865 | meta = 0; |
… | |
… | |
840 | #endif |
867 | #endif |
841 | /* nil */ ; |
868 | /* nil */ ; |
842 | } |
869 | } |
843 | } |
870 | } |
844 | |
871 | |
|
|
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
|
|
873 | return; |
|
|
874 | |
845 | if (len <= 0) |
875 | if (len <= 0) |
846 | return; /* not mapped */ |
876 | return; /* not mapped */ |
847 | |
877 | |
848 | if (options & Opt_scrollTtyKeypress) |
878 | if (OPTION (Opt_scrollTtyKeypress)) |
849 | if (TermWin.view_start) |
879 | if (view_start) |
850 | { |
880 | { |
851 | TermWin.view_start = 0; |
881 | view_start = 0; |
852 | want_refresh = 1; |
882 | want_refresh = 1; |
853 | } |
883 | } |
854 | |
884 | |
855 | /* |
885 | /* |
856 | * these modifications only affect the static keybuffer |
886 | * these modifications only affect the static keybuffer |
… | |
… | |
871 | #ifdef META8_OPTION |
901 | #ifdef META8_OPTION |
872 | && meta_char == C0_ESC |
902 | && meta_char == C0_ESC |
873 | #endif |
903 | #endif |
874 | ) |
904 | ) |
875 | { |
905 | { |
876 | const unsigned char ch = C0_ESC; |
906 | const char ch = C0_ESC; |
877 | tt_write (&ch, 1); |
907 | tt_write (&ch, 1); |
878 | } |
908 | } |
879 | |
909 | |
880 | #if defined(DEBUG_CMD) |
910 | #if defined(DEBUG_CMD) |
881 | /* Display keyboard buffer contents */ |
911 | /* Display keyboard buffer contents */ |
… | |
… | |
889 | #endif /* DEBUG_CMD */ |
919 | #endif /* DEBUG_CMD */ |
890 | tt_write (kbuf, (unsigned int)len); |
920 | tt_write (kbuf, (unsigned int)len); |
891 | } |
921 | } |
892 | /*}}} */ |
922 | /*}}} */ |
893 | |
923 | |
894 | #if (MENUBAR_MAX) |
924 | #if defined (KEYSYM_RESOURCE) |
895 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
|
|
896 | /* attempt to `write' count to the input buffer */ |
|
|
897 | unsigned int |
925 | unsigned int |
898 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
926 | rxvt_term::cmd_write (const char *str, unsigned int count) |
899 | { |
927 | { |
900 | unsigned int n, s; |
928 | unsigned int n, s; |
901 | |
929 | |
902 | n = cmdbuf_ptr - cmdbuf_base; |
930 | n = cmdbuf_ptr - cmdbuf_base; |
903 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
931 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
922 | |
950 | |
923 | cmd_parse (); |
951 | cmd_parse (); |
924 | |
952 | |
925 | return 0; |
953 | return 0; |
926 | } |
954 | } |
927 | #endif /* MENUBAR_MAX */ |
955 | #endif |
928 | |
956 | |
929 | void |
957 | void |
930 | rxvt_term::flush () |
958 | rxvt_term::flush () |
931 | { |
959 | { |
932 | flush_ev.stop (); |
960 | flush_ev.stop (); |
… | |
… | |
940 | } |
968 | } |
941 | #endif |
969 | #endif |
942 | |
970 | |
943 | if (want_refresh) |
971 | if (want_refresh) |
944 | { |
972 | { |
|
|
973 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
|
|
974 | { |
|
|
975 | int row = view_start; |
|
|
976 | int end_row = row + nrow; |
|
|
977 | |
|
|
978 | while (row > top_row && ROW (row - 1).is_longer ()) |
|
|
979 | --row; |
|
|
980 | |
|
|
981 | do |
|
|
982 | { |
|
|
983 | int start_row = row; |
|
|
984 | line_t *l; |
|
|
985 | |
|
|
986 | do |
|
|
987 | { |
|
|
988 | l = &ROW (row++); |
|
|
989 | |
|
|
990 | if (!(l->f & LINE_FILTERED)) |
|
|
991 | { |
|
|
992 | // line not filtered, mark it as filtered |
|
|
993 | l->f |= LINE_FILTERED; |
|
|
994 | while (l->is_longer ()) |
|
|
995 | { |
|
|
996 | l = &ROW (row++); |
|
|
997 | l->f |= LINE_FILTERED; |
|
|
998 | } |
|
|
999 | |
|
|
1000 | // and filter it |
|
|
1001 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1002 | |
|
|
1003 | break; |
|
|
1004 | } |
|
|
1005 | } |
|
|
1006 | while (l->is_longer () && row < end_row); |
|
|
1007 | } |
|
|
1008 | while (row < end_row); |
|
|
1009 | } |
|
|
1010 | |
945 | scr_refresh (refresh_type); |
1011 | scr_refresh (); |
946 | scrollbar_show (1); |
1012 | scrollbar_show (1); |
947 | #ifdef USE_XIM |
1013 | #ifdef USE_XIM |
948 | IMSendSpot (); |
1014 | IMSendSpot (); |
949 | #endif |
1015 | #endif |
950 | } |
1016 | } |
… | |
… | |
953 | } |
1019 | } |
954 | |
1020 | |
955 | void |
1021 | void |
956 | rxvt_term::check_cb (check_watcher &w) |
1022 | rxvt_term::check_cb (check_watcher &w) |
957 | { |
1023 | { |
958 | SET_R (this); |
1024 | make_current (); |
959 | SET_LOCALE (locale); |
|
|
960 | |
1025 | |
961 | display->flush (); |
1026 | display->flush (); |
962 | |
1027 | |
963 | if (want_refresh && !flush_ev.active) |
1028 | if (want_refresh && !flush_ev.active) |
964 | flush_ev.start (NOW + 0.01); |
1029 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
965 | } |
1030 | } |
966 | |
1031 | |
967 | void |
1032 | void |
968 | rxvt_term::flush_cb (time_watcher &w) |
1033 | rxvt_term::flush_cb (time_watcher &w) |
969 | { |
1034 | { |
970 | SET_R (this); |
1035 | make_current (); |
971 | SET_LOCALE (locale); |
|
|
972 | |
1036 | |
973 | refresh_limit = 1; |
1037 | refresh_limit = 1; |
974 | refresh_count = 0; |
1038 | refresh_count = 0; |
975 | flush (); |
1039 | flush (); |
976 | } |
1040 | } |
… | |
… | |
1004 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1068 | rxvt_term::cont_scroll_cb (time_watcher &w) |
1005 | { |
1069 | { |
1006 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1070 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
1007 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1071 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
1008 | { |
1072 | { |
1009 | refresh_type |= SMOOTH_REFRESH; |
|
|
1010 | want_refresh = 1; |
1073 | want_refresh = 1; |
1011 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1074 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1012 | } |
1075 | } |
1013 | } |
1076 | } |
1014 | #endif |
1077 | #endif |
… | |
… | |
1018 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1081 | rxvt_term::sel_scroll_cb (time_watcher &w) |
1019 | { |
1082 | { |
1020 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1083 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
1021 | { |
1084 | { |
1022 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1085 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
1023 | refresh_type |= SMOOTH_REFRESH; |
|
|
1024 | want_refresh = 1; |
1086 | want_refresh = 1; |
1025 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1087 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1026 | } |
1088 | } |
1027 | } |
1089 | } |
1028 | #endif |
1090 | #endif |
… | |
… | |
1033 | { |
1095 | { |
1034 | if (mouse_slip_wheel_speed == 0 |
1096 | if (mouse_slip_wheel_speed == 0 |
1035 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1097 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1036 | : scr_page (UP, mouse_slip_wheel_speed)) |
1098 | : scr_page (UP, mouse_slip_wheel_speed)) |
1037 | { |
1099 | { |
1038 | refresh_type |= SMOOTH_REFRESH; |
1100 | if (view_start == top_row || view_start == 0) |
|
|
1101 | mouse_slip_wheel_speed = 0; |
|
|
1102 | |
1039 | want_refresh = 1; |
1103 | want_refresh = 1; |
1040 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1104 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1041 | } |
1105 | } |
1042 | } |
1106 | } |
1043 | #endif |
1107 | #endif |
1044 | |
1108 | |
|
|
1109 | #if HAVE_SCHED_YIELD |
|
|
1110 | static struct event_handler |
|
|
1111 | { |
|
|
1112 | check_watcher cw_yield; |
|
|
1113 | |
|
|
1114 | void yield (check_watcher &w) |
|
|
1115 | { |
|
|
1116 | sched_yield (); |
|
|
1117 | w.stop (); |
|
|
1118 | } |
|
|
1119 | |
|
|
1120 | event_handler () |
|
|
1121 | : cw_yield (this, &event_handler::yield) |
|
|
1122 | { |
|
|
1123 | } |
|
|
1124 | } event_handler; |
|
|
1125 | #endif |
|
|
1126 | |
1045 | bool |
1127 | bool |
1046 | rxvt_term::pty_fill () |
1128 | rxvt_term::pty_fill () |
1047 | { |
1129 | { |
1048 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1130 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1049 | |
1131 | |
1050 | if (CBUFSIZ == n) |
1132 | if (CBUFSIZ == n) |
1051 | { |
1133 | { |
1052 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1134 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1053 | n = 0; |
1135 | n = 0; |
1054 | } |
1136 | } |
1055 | |
1137 | |
1056 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1138 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1057 | cmdbuf_ptr = cmdbuf_base; |
1139 | cmdbuf_ptr = cmdbuf_base; |
1058 | cmdbuf_endp = cmdbuf_ptr + n; |
1140 | cmdbuf_endp = cmdbuf_ptr + n; |
1059 | |
1141 | |
1060 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
1142 | ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); |
1061 | |
1143 | |
1062 | if (n > 0) |
1144 | if (r > 0) |
1063 | { |
1145 | { |
1064 | cmdbuf_endp += n; |
1146 | cmdbuf_endp += r; |
1065 | return true; |
1147 | return true; |
1066 | } |
1148 | } |
1067 | else if (n < 0 && errno != EAGAIN) |
1149 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
|
|
1150 | { |
|
|
1151 | #if HAVE_SCHED_YIELD |
|
|
1152 | if (display->is_local) |
|
|
1153 | event_handler.cw_yield.start (); |
|
|
1154 | #endif |
|
|
1155 | } |
|
|
1156 | else |
|
|
1157 | { |
|
|
1158 | pty_ev.stop (); |
|
|
1159 | |
|
|
1160 | if (!OPTION (Opt_hold)) |
1068 | destroy (); |
1161 | destroy (); |
|
|
1162 | } |
1069 | |
1163 | |
1070 | return false; |
1164 | return false; |
1071 | } |
1165 | } |
1072 | |
1166 | |
1073 | void |
1167 | void |
1074 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1168 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1075 | { |
1169 | { |
1076 | SET_R (this); |
1170 | make_current (); |
1077 | SET_LOCALE (locale); |
|
|
1078 | |
1171 | |
1079 | if (revents & EVENT_READ) |
1172 | if (revents & EVENT_READ) |
1080 | // loop, but don't allow a single term to monopolize us |
1173 | // loop, but don't allow a single term to monopolize us |
1081 | while (pty_fill ()) |
1174 | while (pty_fill ()) |
1082 | if (cmd_parse ()) |
1175 | if (cmd_parse ()) |
… | |
… | |
1087 | } |
1180 | } |
1088 | |
1181 | |
1089 | void |
1182 | void |
1090 | rxvt_term::pointer_unblank () |
1183 | rxvt_term::pointer_unblank () |
1091 | { |
1184 | { |
1092 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1185 | XDefineCursor (display->display, vt, TermWin_cursor); |
1093 | recolour_cursor (); |
1186 | recolour_cursor (); |
1094 | |
1187 | |
1095 | #ifdef POINTER_BLANK |
1188 | #ifdef POINTER_BLANK |
1096 | hidden_pointer = 0; |
1189 | hidden_pointer = 0; |
1097 | |
1190 | |
1098 | if (options & Opt_pointerBlank) |
1191 | if (OPTION (Opt_pointerBlank)) |
1099 | pointer_ev.start (NOW + pointerBlankDelay); |
1192 | pointer_ev.start (NOW + pointerBlankDelay); |
1100 | #endif |
1193 | #endif |
1101 | } |
1194 | } |
1102 | |
1195 | |
1103 | #ifdef POINTER_BLANK |
1196 | #ifdef POINTER_BLANK |
1104 | void |
1197 | void |
1105 | rxvt_term::pointer_blank () |
1198 | rxvt_term::pointer_blank () |
1106 | { |
1199 | { |
1107 | if (! (options & Opt_pointerBlank)) |
1200 | if (!OPTION (Opt_pointerBlank)) |
1108 | return; |
1201 | return; |
1109 | |
1202 | |
1110 | XDefineCursor (display->display, TermWin.vt, blank_cursor); |
1203 | XDefineCursor (display->display, vt, display->blank_cursor); |
1111 | XFlush (display->display); |
1204 | XFlush (display->display); |
1112 | |
1205 | |
1113 | hidden_pointer = 1; |
1206 | hidden_pointer = 1; |
1114 | } |
1207 | } |
1115 | |
1208 | |
1116 | void |
1209 | void |
1117 | rxvt_term::pointer_cb (time_watcher &w) |
1210 | rxvt_term::pointer_cb (time_watcher &w) |
1118 | { |
1211 | { |
1119 | SET_R (this); |
1212 | make_current (); |
1120 | SET_LOCALE (locale); |
|
|
1121 | |
1213 | |
1122 | pointer_blank (); |
1214 | pointer_blank (); |
1123 | } |
1215 | } |
1124 | #endif |
1216 | #endif |
1125 | |
1217 | |
… | |
… | |
1204 | |
1296 | |
1205 | /*{{{ process an X event */ |
1297 | /*{{{ process an X event */ |
1206 | void |
1298 | void |
1207 | rxvt_term::x_cb (XEvent &ev) |
1299 | rxvt_term::x_cb (XEvent &ev) |
1208 | { |
1300 | { |
1209 | SET_R (this); |
1301 | make_current (); |
1210 | SET_LOCALE (locale); |
|
|
1211 | |
1302 | |
1212 | #if defined(CURSOR_BLINK) |
1303 | dDisp; |
1213 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1214 | { |
|
|
1215 | if (hidden_cursor) |
|
|
1216 | { |
|
|
1217 | hidden_cursor = 0; |
|
|
1218 | want_refresh = 1; |
|
|
1219 | } |
|
|
1220 | |
1304 | |
1221 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1305 | if (ev.xany.window == vt |
1222 | } |
1306 | && SHOULD_INVOKE (HOOK_X_EVENT) |
1223 | #endif |
1307 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
|
|
1308 | return; |
1224 | |
1309 | |
1225 | #if defined(POINTER_BLANK) |
1310 | // for XQueryPointer |
1226 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1227 | { |
|
|
1228 | if (ev.type == MotionNotify |
|
|
1229 | || ev.type == ButtonPress |
|
|
1230 | || ev.type == ButtonRelease) |
|
|
1231 | if (hidden_pointer) |
|
|
1232 | pointer_unblank (); |
|
|
1233 | |
|
|
1234 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1235 | pointer_blank (); |
|
|
1236 | } |
|
|
1237 | #endif |
|
|
1238 | |
|
|
1239 | Window unused_root, unused_child; |
1311 | Window unused_root, unused_child; |
1240 | int unused_root_x, unused_root_y; |
1312 | int unused_root_x, unused_root_y; |
1241 | unsigned int unused_mask; |
1313 | unsigned int unused_mask; |
1242 | |
1314 | |
1243 | switch (ev.type) |
1315 | switch (ev.type) |
… | |
… | |
1250 | |
1322 | |
1251 | break; |
1323 | break; |
1252 | |
1324 | |
1253 | case KeyRelease: |
1325 | case KeyRelease: |
1254 | { |
1326 | { |
1255 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1327 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1256 | KeySym ks; |
1328 | KeySym keysym; |
1257 | |
1329 | |
1258 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1330 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1259 | #endif |
1331 | #endif |
1260 | |
1332 | |
1261 | #if ENABLE_FRILLS || ISO_14755 |
1333 | #if ENABLE_FRILLS || ISO_14755 |
1262 | // ISO 14755 support |
1334 | // ISO 14755 support |
1263 | if (iso14755buf) |
1335 | if (iso14755buf) |
… | |
… | |
1268 | # endif |
1340 | # endif |
1269 | # if ISO_14755 |
1341 | # if ISO_14755 |
1270 | // iso14755 part 5.2 handling: release time |
1342 | // iso14755 part 5.2 handling: release time |
1271 | // first: controls |
1343 | // first: controls |
1272 | if ((ev.xkey.state & ControlMask) |
1344 | if ((ev.xkey.state & ControlMask) |
1273 | && ((ks >= 0x40 && ks <= 0x5f) |
1345 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1274 | || (ks >= 0x61 && ks <= 0x7f))) |
1346 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1275 | { |
1347 | { |
1276 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1348 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1277 | commit_iso14755 (); |
1349 | commit_iso14755 (); |
1278 | return; // case-break; |
1350 | goto skip_switch; |
1279 | } |
1351 | } |
1280 | |
1352 | |
1281 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1353 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1282 | if (i[0] == ks) |
1354 | if (i[0] == keysym) |
1283 | { |
1355 | { |
1284 | iso14755buf = ISO_14755_51 | i[1]; |
1356 | iso14755buf = ISO_14755_51 | i[1]; |
1285 | commit_iso14755 (); |
1357 | commit_iso14755 (); |
1286 | return; // case-break; |
1358 | goto skip_switch; |
1287 | } |
1359 | } |
1288 | |
1360 | |
1289 | scr_bell (); |
1361 | scr_bell (); |
1290 | # endif |
1362 | # endif |
1291 | iso14755buf = 0; |
1363 | iso14755buf = 0; |
… | |
… | |
1310 | else |
1382 | else |
1311 | iso14755buf = 0; |
1383 | iso14755buf = 0; |
1312 | } |
1384 | } |
1313 | #endif |
1385 | #endif |
1314 | |
1386 | |
|
|
1387 | if (ev.xany.window == vt |
|
|
1388 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1389 | break; |
|
|
1390 | |
1315 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1391 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1316 | if (!(ev.xkey.state & ControlMask)) |
1392 | if (!(ev.xkey.state & ControlMask)) |
1317 | slip_wheel_ev.stop (); |
1393 | slip_wheel_ev.stop (); |
1318 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1394 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1319 | mouse_slip_wheel_speed = 0; |
1395 | mouse_slip_wheel_speed = 0; |
1320 | #endif |
1396 | #endif |
1321 | break; |
1397 | break; |
1322 | } |
1398 | } |
1323 | |
1399 | |
… | |
… | |
1329 | button_release (ev.xbutton); |
1405 | button_release (ev.xbutton); |
1330 | break; |
1406 | break; |
1331 | |
1407 | |
1332 | case ClientMessage: |
1408 | case ClientMessage: |
1333 | if (ev.xclient.format == 32 |
1409 | if (ev.xclient.format == 32 |
|
|
1410 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1411 | { |
1334 | && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) |
1412 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1335 | destroy (); |
1413 | destroy (); |
|
|
1414 | #if ENABLE_EWMH |
|
|
1415 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
|
|
1416 | XSendEvent (disp, ev.xclient.window = display->root, |
|
|
1417 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
|
|
1418 | &ev); |
|
|
1419 | #endif |
|
|
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 | } |
|
|
1429 | #endif |
1336 | #ifdef OFFIX_DND |
1430 | #ifdef OFFIX_DND |
1337 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1431 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1338 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1432 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1339 | && (ev.xclient.data.l[0] == DndFile |
1433 | && (ev.xclient.data.l[0] == DndFile |
1340 | || ev.xclient.data.l[0] == DndDir |
1434 | || ev.xclient.data.l[0] == DndDir |
1341 | || ev.xclient.data.l[0] == DndLink)) |
1435 | || ev.xclient.data.l[0] == DndLink)) |
1342 | { |
1436 | { |
1343 | /* Get Dnd data */ |
1437 | /* Get Dnd data */ |
1344 | Atom ActualType; |
1438 | Atom ActualType; |
1345 | int ActualFormat; |
1439 | int ActualFormat; |
1346 | unsigned char *data; |
1440 | unsigned char *data; |
1347 | unsigned long Size, RemainingBytes; |
1441 | unsigned long Size, RemainingBytes; |
1348 | |
1442 | |
1349 | XGetWindowProperty (display->display, display->root, |
1443 | XGetWindowProperty (disp, display->root, |
1350 | xa[XA_DNDSELECTION], |
1444 | xa[XA_DNDSELECTION], |
1351 | 0L, 1000000L, |
1445 | 0L, 1000000L, |
1352 | False, AnyPropertyType, |
1446 | False, AnyPropertyType, |
1353 | &ActualType, &ActualFormat, |
1447 | &ActualType, &ActualFormat, |
1354 | &Size, &RemainingBytes, |
1448 | &Size, &RemainingBytes, |
1355 | &data); |
1449 | &data); |
1356 | set_string_property (XA_CUT_BUFFER0, data); |
1450 | set_string_property (XA_CUT_BUFFER0, data); |
1357 | XFree (data); |
1451 | XFree (data); |
1358 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
1452 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
1359 | XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); |
1453 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
1360 | } |
1454 | } |
1361 | #endif /* OFFIX_DND */ |
1455 | #endif /* OFFIX_DND */ |
1362 | break; |
1456 | break; |
1363 | |
1457 | |
1364 | case MappingNotify: |
1458 | case MappingNotify: |
… | |
… | |
1389 | break; |
1483 | break; |
1390 | } |
1484 | } |
1391 | break; |
1485 | break; |
1392 | |
1486 | |
1393 | case FocusIn: |
1487 | case FocusIn: |
1394 | if (!TermWin.focus) |
1488 | focus_in (); |
|
|
1489 | break; |
|
|
1490 | |
|
|
1491 | case FocusOut: |
|
|
1492 | focus_out (); |
|
|
1493 | break; |
|
|
1494 | |
|
|
1495 | case ConfigureNotify: |
|
|
1496 | if (ev.xconfigure.window == parent[0]) |
1395 | { |
1497 | { |
1396 | TermWin.focus = 1; |
|
|
1397 | want_refresh = 1; |
|
|
1398 | #ifdef USE_XIM |
|
|
1399 | if (Input_Context != NULL) |
|
|
1400 | { |
|
|
1401 | IMSetStatusPosition (); |
|
|
1402 | XSetICFocus (Input_Context); |
|
|
1403 | } |
|
|
1404 | #endif |
|
|
1405 | #ifdef CURSOR_BLINK |
|
|
1406 | if (options & Opt_cursorBlink) |
|
|
1407 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1408 | #endif |
|
|
1409 | #ifdef OFF_FOCUS_FADING |
|
|
1410 | if (rs[Rs_fade]) |
|
|
1411 | { |
|
|
1412 | pix_colors = pix_colors_focused; |
|
|
1413 | scr_recolour (); |
|
|
1414 | } |
|
|
1415 | #endif |
|
|
1416 | |
|
|
1417 | } |
|
|
1418 | break; |
|
|
1419 | |
|
|
1420 | case FocusOut: |
|
|
1421 | if (TermWin.focus) |
|
|
1422 | { |
|
|
1423 | TermWin.focus = 0; |
|
|
1424 | want_refresh = 1; |
|
|
1425 | |
|
|
1426 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1427 | iso14755buf = 0; |
|
|
1428 | #endif |
|
|
1429 | #if ENABLE_OVERLAY |
|
|
1430 | scr_overlay_off (); |
|
|
1431 | #endif |
|
|
1432 | #ifdef USE_XIM |
|
|
1433 | if (Input_Context != NULL) |
|
|
1434 | XUnsetICFocus (Input_Context); |
|
|
1435 | #endif |
|
|
1436 | #ifdef CURSOR_BLINK |
|
|
1437 | if (options & Opt_cursorBlink) |
|
|
1438 | cursor_blink_ev.stop (); |
|
|
1439 | hidden_cursor = 0; |
|
|
1440 | #endif |
|
|
1441 | #ifdef OFF_FOCUS_FADING |
|
|
1442 | if (rs[Rs_fade]) |
|
|
1443 | { |
|
|
1444 | pix_colors = pix_colors_unfocused; |
|
|
1445 | scr_recolour (); |
|
|
1446 | } |
|
|
1447 | #endif |
|
|
1448 | } |
|
|
1449 | break; |
|
|
1450 | |
|
|
1451 | case ConfigureNotify: |
|
|
1452 | if (ev.xconfigure.window == TermWin.parent[0]) |
|
|
1453 | { |
|
|
1454 | int height, width; |
|
|
1455 | |
|
|
1456 | do |
|
|
1457 | { /* Wrap lots of configures into one */ |
|
|
1458 | width = ev.xconfigure.width; |
|
|
1459 | height = ev.xconfigure.height; |
|
|
1460 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
|
|
1461 | } |
|
|
1462 | while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); |
1498 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1499 | ; |
1463 | |
1500 | |
1464 | if (szHint.width != width || szHint.height != height) |
1501 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1465 | { |
1502 | { |
1466 | seen_resize = 1; |
1503 | seen_resize = 1; |
1467 | resize_all_windows (width, height, 1); |
1504 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1468 | } |
1505 | } |
1469 | |
1506 | |
|
|
1507 | HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1508 | |
1470 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1509 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1471 | if (options & Opt_transparent) |
1510 | if (OPTION (Opt_transparent)) |
1472 | check_our_parents (); |
1511 | check_our_parents (); |
1473 | #endif |
1512 | #endif |
1474 | } |
1513 | } |
1475 | break; |
1514 | break; |
1476 | |
1515 | |
… | |
… | |
1492 | |
1531 | |
1493 | case SelectionRequest: |
1532 | case SelectionRequest: |
1494 | selection_send (ev.xselectionrequest); |
1533 | selection_send (ev.xselectionrequest); |
1495 | break; |
1534 | break; |
1496 | |
1535 | |
|
|
1536 | case MapNotify: |
|
|
1537 | mapped = 1; |
|
|
1538 | #ifdef TEXT_BLINK |
|
|
1539 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1540 | #endif |
|
|
1541 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1542 | break; |
|
|
1543 | |
1497 | case UnmapNotify: |
1544 | case UnmapNotify: |
1498 | TermWin.mapped = 0; |
1545 | mapped = 0; |
1499 | #ifdef TEXT_BLINK |
1546 | #ifdef TEXT_BLINK |
1500 | text_blink_ev.stop (); |
1547 | text_blink_ev.stop (); |
1501 | #endif |
1548 | #endif |
1502 | break; |
1549 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1503 | |
|
|
1504 | case MapNotify: |
|
|
1505 | TermWin.mapped = 1; |
|
|
1506 | #ifdef TEXT_BLINK |
|
|
1507 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1508 | #endif |
|
|
1509 | break; |
1550 | break; |
1510 | |
1551 | |
1511 | #ifdef TRANSPARENT |
1552 | #ifdef TRANSPARENT |
1512 | case ReparentNotify: |
1553 | case ReparentNotify: |
1513 | rootwin_cb (ev); |
1554 | rootwin_cb (ev); |
1514 | break; |
1555 | break; |
1515 | #endif /* TRANSPARENT */ |
1556 | #endif /* TRANSPARENT */ |
1516 | |
1557 | |
1517 | case GraphicsExpose: |
1558 | case GraphicsExpose: |
1518 | case Expose: |
1559 | case Expose: |
1519 | if (ev.xany.window == TermWin.vt) |
1560 | if (ev.xany.window == vt) |
1520 | { |
1561 | { |
1521 | do |
1562 | do |
1522 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1563 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1523 | ev.xexpose.width, ev.xexpose.height, False); |
1564 | ev.xexpose.width, ev.xexpose.height, False); |
1524 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); |
1565 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1525 | |
1566 | |
1526 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1567 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1527 | |
1568 | |
1528 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) |
1569 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1529 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1570 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1530 | ev.xexpose.width, ev.xexpose.height, False); |
1571 | ev.xexpose.width, ev.xexpose.height, False); |
1531 | |
1572 | |
1532 | scr_refresh (refresh_type); |
1573 | want_refresh = 1; |
1533 | } |
1574 | } |
1534 | else |
1575 | else |
1535 | { |
1576 | { |
1536 | XEvent unused_event; |
1577 | XEvent unused_event; |
1537 | |
1578 | |
1538 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) |
1579 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1539 | ; |
1580 | ; |
1540 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) |
1581 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1541 | ; |
1582 | ; |
1542 | |
1583 | |
1543 | if (isScrollbarWindow (ev.xany.window)) |
1584 | if (isScrollbarWindow (ev.xany.window)) |
1544 | { |
1585 | { |
1545 | scrollBar.setIdle (); |
1586 | scrollBar.setIdle (); |
1546 | scrollbar_show (0); |
1587 | scrollbar_show (0); |
1547 | } |
1588 | } |
1548 | #ifdef MENUBAR |
|
|
1549 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
|
|
1550 | menubar_expose (); |
|
|
1551 | #endif |
|
|
1552 | |
1589 | |
1553 | #ifdef TRANSPARENT |
1590 | #ifdef TRANSPARENT |
1554 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1591 | if (am_transparent && ev.xany.window == parent[0]) |
1555 | XClearWindow (display->display, ev.xany.window); |
1592 | XClearWindow (disp, ev.xany.window); |
1556 | #endif |
1593 | #endif |
1557 | } |
1594 | } |
1558 | break; |
1595 | break; |
1559 | |
1596 | |
1560 | case MotionNotify: |
1597 | case MotionNotify: |
1561 | #ifdef POINTER_BLANK |
1598 | #ifdef POINTER_BLANK |
1562 | if (hidden_pointer) |
1599 | if (hidden_pointer) |
1563 | pointer_unblank (); |
1600 | pointer_unblank (); |
1564 | #endif |
1601 | #endif |
1565 | #if MENUBAR |
|
|
1566 | if (isMenuBarWindow (ev.xany.window)) |
|
|
1567 | { |
|
|
1568 | menubar_control (ev.xbutton); |
|
|
1569 | break; |
|
|
1570 | } |
|
|
1571 | #endif |
|
|
1572 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1602 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1573 | break; |
1603 | break; |
1574 | |
1604 | |
1575 | if (ev.xany.window == TermWin.vt) |
1605 | if (ev.xany.window == vt) |
1576 | { |
1606 | { |
|
|
1607 | if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) |
|
|
1608 | && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1609 | ; // nop |
1577 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1610 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1578 | { |
1611 | { |
1579 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) |
1612 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1580 | ; |
1613 | ; |
1581 | |
1614 | |
1582 | XQueryPointer (display->display, TermWin.vt, |
1615 | XQueryPointer (disp, vt, |
1583 | &unused_root, &unused_child, |
1616 | &unused_root, &unused_child, |
1584 | &unused_root_x, &unused_root_y, |
1617 | &unused_root_x, &unused_root_y, |
1585 | &ev.xbutton.x, &ev.xbutton.y, |
1618 | &ev.xbutton.x, &ev.xbutton.y, |
1586 | &ev.xbutton.state); |
1619 | &ev.xbutton.state); |
1587 | #ifdef MOUSE_THRESHOLD |
1620 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1599 | #endif |
1632 | #endif |
1600 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1633 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1601 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1634 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1602 | |
1635 | |
1603 | #ifdef SELECTION_SCROLLING |
1636 | #ifdef SELECTION_SCROLLING |
1604 | if (ev.xbutton.y < TermWin.int_bwidth |
1637 | if (ev.xbutton.y < int_bwidth |
1605 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1638 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1606 | { |
1639 | { |
1607 | int dist; |
1640 | int dist; |
1608 | |
1641 | |
1609 | /* don't clobber the current delay if we are |
1642 | /* don't clobber the current delay if we are |
1610 | * already in the middle of scrolling. |
1643 | * already in the middle of scrolling. |
… | |
… | |
1618 | selection_save_x = ev.xbutton.x; |
1651 | selection_save_x = ev.xbutton.x; |
1619 | selection_save_y = ev.xbutton.y; |
1652 | selection_save_y = ev.xbutton.y; |
1620 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1653 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1621 | |
1654 | |
1622 | /* calc number of lines to scroll */ |
1655 | /* calc number of lines to scroll */ |
1623 | if (ev.xbutton.y < TermWin.int_bwidth) |
1656 | if (ev.xbutton.y < int_bwidth) |
1624 | { |
1657 | { |
1625 | scroll_selection_dir = UP; |
1658 | scroll_selection_dir = UP; |
1626 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1659 | dist = int_bwidth - ev.xbutton.y; |
1627 | } |
1660 | } |
1628 | else |
1661 | else |
1629 | { |
1662 | { |
1630 | scroll_selection_dir = DN; |
1663 | scroll_selection_dir = DN; |
1631 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1664 | dist = ev.xbutton.y - (int_bwidth + height); |
1632 | } |
1665 | } |
1633 | |
1666 | |
1634 | scroll_selection_lines = Pixel2Height (dist) |
1667 | scroll_selection_lines = Pixel2Height (dist) |
1635 | / SELECTION_SCROLL_LINE_SPEEDUP |
1668 | / SELECTION_SCROLL_LINE_SPEEDUP |
1636 | + 1; |
1669 | + 1; |
1637 | MIN_IT (scroll_selection_lines, |
1670 | min_it (scroll_selection_lines, |
1638 | SELECTION_SCROLL_MAX_LINES); |
1671 | SELECTION_SCROLL_MAX_LINES); |
1639 | } |
1672 | } |
1640 | else |
1673 | else |
1641 | { |
1674 | { |
1642 | /* we are within the text window, so we |
1675 | /* we are within the text window, so we |
… | |
… | |
1651 | #endif |
1684 | #endif |
1652 | } |
1685 | } |
1653 | } |
1686 | } |
1654 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1687 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1655 | { |
1688 | { |
1656 | while (XCheckTypedWindowEvent (display->display, scrollBar.win, |
1689 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1657 | MotionNotify, &ev)) |
1690 | MotionNotify, &ev)) |
1658 | ; |
1691 | ; |
1659 | |
1692 | |
1660 | XQueryPointer (display->display, scrollBar.win, |
1693 | XQueryPointer (disp, scrollBar.win, |
1661 | &unused_root, &unused_child, |
1694 | &unused_root, &unused_child, |
1662 | &unused_root_x, &unused_root_y, |
1695 | &unused_root_x, &unused_root_y, |
1663 | &ev.xbutton.x, &ev.xbutton.y, |
1696 | &ev.xbutton.x, &ev.xbutton.y, |
1664 | &unused_mask); |
1697 | &unused_mask); |
1665 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1698 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1666 | scrollbar_size ()); |
1699 | scrollbar_size ()); |
1667 | scr_refresh (refresh_type); |
1700 | want_refresh = 1; |
1668 | refresh_limit = 0; |
1701 | refresh_limit = 0; |
1669 | scrollbar_show (1); |
1702 | scrollbar_show (1); |
1670 | } |
1703 | } |
1671 | break; |
1704 | break; |
1672 | } |
1705 | } |
|
|
1706 | |
|
|
1707 | skip_switch: ; |
|
|
1708 | |
|
|
1709 | #if defined(CURSOR_BLINK) |
|
|
1710 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1711 | { |
|
|
1712 | if (hidden_cursor) |
|
|
1713 | { |
|
|
1714 | hidden_cursor = 0; |
|
|
1715 | want_refresh = 1; |
|
|
1716 | } |
|
|
1717 | |
|
|
1718 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1719 | } |
|
|
1720 | #endif |
|
|
1721 | |
|
|
1722 | #if defined(POINTER_BLANK) |
|
|
1723 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1724 | { |
|
|
1725 | if (ev.type == MotionNotify |
|
|
1726 | || ev.type == ButtonPress |
|
|
1727 | || ev.type == ButtonRelease) |
|
|
1728 | if (hidden_pointer) |
|
|
1729 | pointer_unblank (); |
|
|
1730 | |
|
|
1731 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1732 | pointer_blank (); |
|
|
1733 | } |
|
|
1734 | #endif |
|
|
1735 | } |
|
|
1736 | |
|
|
1737 | void |
|
|
1738 | rxvt_term::focus_in () |
|
|
1739 | { |
|
|
1740 | if (!focus) |
|
|
1741 | { |
|
|
1742 | focus = 1; |
|
|
1743 | want_refresh = 1; |
|
|
1744 | |
|
|
1745 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1746 | |
|
|
1747 | #if USE_XIM |
|
|
1748 | if (Input_Context != NULL) |
|
|
1749 | { |
|
|
1750 | IMSetStatusPosition (); |
|
|
1751 | XSetICFocus (Input_Context); |
|
|
1752 | } |
|
|
1753 | #endif |
|
|
1754 | #if CURSOR_BLINK |
|
|
1755 | if (OPTION (Opt_cursorBlink)) |
|
|
1756 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1757 | #endif |
|
|
1758 | #if OFF_FOCUS_FADING |
|
|
1759 | if (rs[Rs_fade]) |
|
|
1760 | { |
|
|
1761 | pix_colors = pix_colors_focused; |
|
|
1762 | scr_recolour (); |
|
|
1763 | } |
|
|
1764 | #endif |
|
|
1765 | } |
|
|
1766 | } |
|
|
1767 | |
|
|
1768 | void |
|
|
1769 | rxvt_term::focus_out () |
|
|
1770 | { |
|
|
1771 | if (focus) |
|
|
1772 | { |
|
|
1773 | focus = 0; |
|
|
1774 | want_refresh = 1; |
|
|
1775 | |
|
|
1776 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1777 | |
|
|
1778 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1779 | if (iso14755buf) |
|
|
1780 | { |
|
|
1781 | iso14755buf = 0; |
|
|
1782 | # if ENABLE_OVERLAY |
|
|
1783 | scr_overlay_off (); |
|
|
1784 | # endif |
|
|
1785 | } |
|
|
1786 | #endif |
|
|
1787 | #if USE_XIM |
|
|
1788 | if (Input_Context != NULL) |
|
|
1789 | XUnsetICFocus (Input_Context); |
|
|
1790 | #endif |
|
|
1791 | #if CURSOR_BLINK |
|
|
1792 | if (OPTION (Opt_cursorBlink)) |
|
|
1793 | cursor_blink_ev.stop (); |
|
|
1794 | hidden_cursor = 0; |
|
|
1795 | #endif |
|
|
1796 | #if OFF_FOCUS_FADING |
|
|
1797 | if (rs[Rs_fade]) |
|
|
1798 | { |
|
|
1799 | pix_colors = pix_colors_unfocused; |
|
|
1800 | scr_recolour (); |
|
|
1801 | } |
|
|
1802 | #endif |
|
|
1803 | } |
1673 | } |
1804 | } |
1674 | |
1805 | |
1675 | #if TRANSPARENT |
1806 | #if TRANSPARENT |
1676 | void |
1807 | void |
1677 | rxvt_term::rootwin_cb (XEvent &ev) |
1808 | rxvt_term::rootwin_cb (XEvent &ev) |
1678 | { |
1809 | { |
1679 | SET_R (this); |
1810 | make_current (); |
1680 | SET_LOCALE (locale); |
|
|
1681 | |
1811 | |
1682 | switch (ev.type) |
1812 | switch (ev.type) |
1683 | { |
1813 | { |
1684 | case PropertyNotify: |
1814 | case PropertyNotify: |
1685 | /* |
1815 | /* |
… | |
… | |
1690 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1820 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1691 | return; |
1821 | return; |
1692 | |
1822 | |
1693 | /* FALLTHROUGH */ |
1823 | /* FALLTHROUGH */ |
1694 | case ReparentNotify: |
1824 | case ReparentNotify: |
1695 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1825 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1696 | want_refresh = want_full_refresh = 1; |
1826 | want_refresh = want_full_refresh = 1; |
1697 | break; |
1827 | break; |
1698 | } |
1828 | } |
1699 | } |
1829 | } |
1700 | #endif |
1830 | #endif |
… | |
… | |
1703 | rxvt_term::button_press (XButtonEvent &ev) |
1833 | rxvt_term::button_press (XButtonEvent &ev) |
1704 | { |
1834 | { |
1705 | int reportmode = 0, clickintime; |
1835 | int reportmode = 0, clickintime; |
1706 | |
1836 | |
1707 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1837 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1838 | |
1708 | if (!bypass_keystate) |
1839 | if (!bypass_keystate) |
1709 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1840 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1710 | |
1841 | |
1711 | /* |
1842 | /* |
1712 | * VT window processing of button press |
1843 | * VT window processing of button press |
1713 | */ |
1844 | */ |
1714 | if (ev.window == TermWin.vt) |
1845 | if (ev.window == vt) |
1715 | { |
1846 | { |
1716 | #if ISO_14755 |
1847 | #if ISO_14755 |
1717 | // 5.4 |
1848 | // 5.4 |
1718 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1849 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1719 | { |
1850 | { |
… | |
… | |
1732 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1863 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1733 | if (ev.button == MEvent.button && clickintime) |
1864 | if (ev.button == MEvent.button && clickintime) |
1734 | { |
1865 | { |
1735 | /* same button, within alloted time */ |
1866 | /* same button, within alloted time */ |
1736 | MEvent.clicks++; |
1867 | MEvent.clicks++; |
|
|
1868 | |
1737 | if (MEvent.clicks > 1) |
1869 | if (MEvent.clicks > 1) |
1738 | { |
1870 | { |
1739 | /* only report double clicks */ |
1871 | /* only report double clicks */ |
1740 | MEvent.clicks = 2; |
1872 | MEvent.clicks = 2; |
1741 | mouse_report (ev); |
1873 | mouse_report (ev); |
… | |
… | |
1761 | else |
1893 | else |
1762 | { |
1894 | { |
1763 | if (ev.button != MEvent.button) |
1895 | if (ev.button != MEvent.button) |
1764 | MEvent.clicks = 0; |
1896 | MEvent.clicks = 0; |
1765 | |
1897 | |
|
|
1898 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1766 | switch (ev.button) |
1899 | switch (ev.button) |
1767 | { |
1900 | { |
1768 | case Button1: |
1901 | case Button1: |
1769 | /* allow meta + click to select rectangular areas */ |
1902 | /* allow meta + click to select rectangular areas */ |
1770 | /* should be done in screen.C */ |
1903 | /* should be done in screen.C */ |
1771 | #if ENABLE_FRILLS |
1904 | #if ENABLE_FRILLS |
1772 | selection.rect = !! (ev.state & ModMetaMask); |
1905 | selection.rect = !!(ev.state & ModMetaMask); |
1773 | #else |
1906 | #else |
1774 | selection.rect = false; |
1907 | selection.rect = false; |
1775 | #endif |
1908 | #endif |
1776 | |
1909 | |
1777 | /* allow shift+left click to extend selection */ |
1910 | /* allow shift+left click to extend selection */ |
1778 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1911 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1779 | { |
1912 | { |
1780 | if (MEvent.button == Button1 && clickintime) |
1913 | if (MEvent.button == Button1 && clickintime) |
1781 | selection_rotate (ev.x, ev.y); |
1914 | selection_rotate (ev.x, ev.y); |
1782 | else |
1915 | else |
1783 | selection_extend (ev.x, ev.y, 1); |
1916 | selection_extend (ev.x, ev.y, 1); |
1784 | } |
1917 | } |
1785 | else |
1918 | else |
1786 | { |
1919 | { |
1787 | if (MEvent.button == Button1 && clickintime) |
1920 | if (MEvent.button == Button1 && clickintime) |
1788 | MEvent.clicks++; |
1921 | MEvent.clicks++; |
1789 | else |
1922 | else |
1790 | MEvent.clicks = 1; |
1923 | MEvent.clicks = 1; |
1791 | |
1924 | |
1792 | selection_click (MEvent.clicks, ev.x, ev.y); |
1925 | selection_click (MEvent.clicks, ev.x, ev.y); |
1793 | } |
1926 | } |
1794 | |
1927 | |
1795 | MEvent.button = Button1; |
1928 | MEvent.button = Button1; |
1796 | break; |
1929 | break; |
1797 | |
1930 | |
1798 | case Button3: |
1931 | case Button3: |
1799 | if (MEvent.button == Button3 && clickintime) |
1932 | if (MEvent.button == Button3 && clickintime) |
1800 | selection_rotate (ev.x, ev.y); |
1933 | selection_rotate (ev.x, ev.y); |
1801 | else |
1934 | else |
1802 | selection_extend (ev.x, ev.y, 1); |
1935 | selection_extend (ev.x, ev.y, 1); |
1803 | |
1936 | |
1804 | MEvent.button = Button3; |
1937 | MEvent.button = Button3; |
1805 | break; |
1938 | break; |
1806 | } |
1939 | } |
1807 | } |
1940 | } |
1808 | |
1941 | |
1809 | MEvent.time = ev.time; |
1942 | MEvent.time = ev.time; |
1810 | return; |
1943 | return; |
1811 | } |
1944 | } |
1812 | |
1945 | |
… | |
… | |
1924 | case Button3: |
2057 | case Button3: |
1925 | if (scrollBar.style != R_SB_XTERM) |
2058 | if (scrollBar.style != R_SB_XTERM) |
1926 | { |
2059 | { |
1927 | if (scrollbar_above_slider (ev.y)) |
2060 | if (scrollbar_above_slider (ev.y)) |
1928 | # ifdef RXVT_SCROLL_FULL |
2061 | # ifdef RXVT_SCROLL_FULL |
1929 | scr_page (UP, TermWin.nrow - 1); |
2062 | scr_page (UP, nrow - 1); |
1930 | # else |
2063 | # else |
1931 | scr_page (UP, TermWin.nrow / 4); |
2064 | scr_page (UP, nrow / 4); |
1932 | # endif |
2065 | # endif |
1933 | else if (scrollbar_below_slider (ev.y)) |
2066 | else if (scrollbar_below_slider (ev.y)) |
1934 | # ifdef RXVT_SCROLL_FULL |
2067 | # ifdef RXVT_SCROLL_FULL |
1935 | scr_page (DN, TermWin.nrow - 1); |
2068 | scr_page (DN, nrow - 1); |
1936 | # else |
2069 | # else |
1937 | scr_page (DN, TermWin.nrow / 4); |
2070 | scr_page (DN, nrow / 4); |
1938 | # endif |
2071 | # endif |
1939 | else |
2072 | else |
1940 | scrollBar.setMotion (); |
2073 | scrollBar.setMotion (); |
1941 | } |
2074 | } |
1942 | else |
2075 | else |
1943 | { |
2076 | { |
1944 | scr_page ((ev.button == Button1 ? DN : UP), |
2077 | scr_page ((ev.button == Button1 ? DN : UP), |
1945 | (TermWin.nrow |
2078 | (nrow |
1946 | * scrollbar_position (ev.y) |
2079 | * scrollbar_position (ev.y) |
1947 | / scrollbar_size ())); |
2080 | / scrollbar_size ())); |
1948 | } |
2081 | } |
1949 | |
2082 | |
1950 | break; |
2083 | break; |
1951 | } |
2084 | } |
1952 | } |
2085 | } |
|
|
2086 | |
1953 | return; |
2087 | return; |
1954 | } |
2088 | } |
1955 | #if MENUBAR |
|
|
1956 | /* |
|
|
1957 | * Menubar window processing of button press |
|
|
1958 | */ |
|
|
1959 | if (isMenuBarWindow (ev.window)) |
|
|
1960 | menubar_control (ev); |
|
|
1961 | #endif |
|
|
1962 | } |
2089 | } |
1963 | |
2090 | |
1964 | void |
2091 | void |
1965 | rxvt_term::button_release (XButtonEvent &ev) |
2092 | rxvt_term::button_release (XButtonEvent &ev) |
1966 | { |
2093 | { |
… | |
… | |
1972 | |
2099 | |
1973 | if (scrollbar_isUpDn ()) |
2100 | if (scrollbar_isUpDn ()) |
1974 | { |
2101 | { |
1975 | scrollBar.setIdle (); |
2102 | scrollBar.setIdle (); |
1976 | scrollbar_show (0); |
2103 | scrollbar_show (0); |
1977 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
1978 | refresh_type &= ~SMOOTH_REFRESH; |
|
|
1979 | #endif |
|
|
1980 | } |
2104 | } |
1981 | |
2105 | |
1982 | #ifdef SELECTION_SCROLLING |
2106 | #ifdef SELECTION_SCROLLING |
1983 | if (sel_scroll_ev.active) |
2107 | if (sel_scroll_ev.active) |
1984 | sel_scroll_ev.stop(); |
2108 | sel_scroll_ev.stop(); |
1985 | #endif |
2109 | #endif |
1986 | |
2110 | |
1987 | if (ev.window == TermWin.vt) |
2111 | if (ev.window == vt) |
1988 | { |
2112 | { |
1989 | #if ISO_14755 |
2113 | #if ISO_14755 |
1990 | // 5.4 |
2114 | // 5.4 |
1991 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2115 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1992 | return; |
2116 | return; |
… | |
… | |
2022 | if (priv_modes & PrivMode_mouse_report |
2146 | if (priv_modes & PrivMode_mouse_report |
2023 | && bypass_keystate |
2147 | && bypass_keystate |
2024 | && ev.button == Button1 && MEvent.clicks <= 1) |
2148 | && ev.button == Button1 && MEvent.clicks <= 1) |
2025 | selection_extend (ev.x, ev.y, 0); |
2149 | selection_extend (ev.x, ev.y, 0); |
2026 | |
2150 | |
|
|
2151 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2152 | return; |
|
|
2153 | |
2027 | switch (ev.button) |
2154 | switch (ev.button) |
2028 | { |
2155 | { |
2029 | case Button1: |
2156 | case Button1: |
2030 | case Button3: |
2157 | case Button3: |
2031 | selection_make (ev.time); |
2158 | selection_make (ev.time); |
2032 | break; |
2159 | break; |
|
|
2160 | |
2033 | case Button2: |
2161 | case Button2: |
|
|
2162 | if (IN_RANGE_EXC (ev.x, 0, width) |
|
|
2163 | && IN_RANGE_EXC (ev.y, 0, height)) // inside window? |
2034 | selection_request (ev.time, ev.x, ev.y); |
2164 | selection_request (ev.time); |
|
|
2165 | |
2035 | break; |
2166 | break; |
|
|
2167 | |
2036 | #ifdef MOUSE_WHEEL |
2168 | #ifdef MOUSE_WHEEL |
2037 | case Button4: |
2169 | case Button4: |
2038 | case Button5: |
2170 | case Button5: |
2039 | { |
2171 | { |
2040 | int i; |
2172 | int i; |
… | |
… | |
2042 | |
2174 | |
2043 | v = ev.button == Button4 ? UP : DN; |
2175 | v = ev.button == Button4 ? UP : DN; |
2044 | |
2176 | |
2045 | if (ev.state & ShiftMask) |
2177 | if (ev.state & ShiftMask) |
2046 | i = 1; |
2178 | i = 1; |
2047 | else if (options & Opt_mouseWheelScrollPage) |
2179 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2048 | i = TermWin.nrow - 1; |
2180 | i = nrow - 1; |
2049 | else |
2181 | else |
2050 | i = 5; |
2182 | i = 5; |
2051 | |
2183 | |
2052 | # ifdef MOUSE_SLIP_WHEELING |
2184 | # ifdef MOUSE_SLIP_WHEELING |
2053 | if (ev.state & ControlMask) |
2185 | if (ev.state & ControlMask) |
2054 | { |
2186 | { |
2055 | mouse_slip_wheel_speed += v ? -1 : 1; |
2187 | mouse_slip_wheel_speed += v ? -1 : 1; |
2056 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2188 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2057 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2189 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2058 | |
2190 | |
2059 | if (slip_wheel_ev.at < NOW) |
2191 | if (slip_wheel_ev.at < NOW) |
2060 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2192 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2061 | |
2193 | |
2062 | slip_wheel_ev.start (); |
2194 | slip_wheel_ev.start (); |
2063 | } |
2195 | } |
2064 | else |
2196 | else |
2065 | { |
2197 | { |
2066 | # endif |
2198 | # endif |
2067 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2068 | scr_page (v, i); |
2199 | scr_page (v, i); |
2069 | scr_refresh (SMOOTH_REFRESH); |
|
|
2070 | scrollbar_show (1); |
2200 | scrollbar_show (1); |
2071 | # else |
|
|
2072 | while (i--) |
|
|
2073 | { |
|
|
2074 | scr_page (v, 1); |
|
|
2075 | scr_refresh (SMOOTH_REFRESH); |
|
|
2076 | scrollbar_show (1); |
|
|
2077 | } |
|
|
2078 | # endif |
|
|
2079 | # ifdef MOUSE_SLIP_WHEELING |
2201 | # ifdef MOUSE_SLIP_WHEELING |
2080 | } |
2202 | } |
2081 | #endif |
2203 | # endif |
2082 | } |
2204 | } |
2083 | break; |
2205 | break; |
2084 | #endif |
2206 | #endif |
2085 | } |
2207 | } |
2086 | } |
2208 | } |
2087 | #ifdef MENUBAR |
|
|
2088 | else if (isMenuBarWindow (ev.window)) |
|
|
2089 | menubar_control (ev); |
|
|
2090 | #endif |
|
|
2091 | } |
2209 | } |
2092 | |
2210 | |
2093 | #ifdef TRANSPARENT |
2211 | #ifdef TRANSPARENT |
2094 | #if TINTING |
2212 | #if TINTING |
2095 | /* taken from aterm-0.4.2 */ |
2213 | /* taken from aterm-0.4.2 */ |
… | |
… | |
2103 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2221 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2104 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2222 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2105 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2223 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2106 | int i; |
2224 | int i; |
2107 | |
2225 | |
2108 | Visual* visual = display->visual; |
2226 | Visual *visual = display->visual; |
2109 | |
2227 | |
2110 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2228 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2111 | |
2229 | |
2112 | /* for convenience */ |
2230 | /* for convenience */ |
2113 | mask_r = visual->red_mask; |
2231 | mask_r = visual->red_mask; |
… | |
… | |
2334 | Atom atype; |
2452 | Atom atype; |
2335 | unsigned char *prop = NULL; |
2453 | unsigned char *prop = NULL; |
2336 | Window root, oldp, *list; |
2454 | Window root, oldp, *list; |
2337 | Pixmap rootpixmap = None; |
2455 | Pixmap rootpixmap = None; |
2338 | XWindowAttributes wattr, wrootattr; |
2456 | XWindowAttributes wattr, wrootattr; |
|
|
2457 | dDisp; |
2339 | |
2458 | |
2340 | pchanged = 0; |
2459 | pchanged = 0; |
2341 | |
2460 | |
2342 | if (!(options & Opt_transparent)) |
2461 | if (!OPTION (Opt_transparent)) |
2343 | return pchanged; /* Don't try any more */ |
2462 | return pchanged; /* Don't try any more */ |
2344 | |
2463 | |
2345 | XGetWindowAttributes (display->display, display->root, &wrootattr); |
2464 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2346 | rootdepth = wrootattr.depth; |
2465 | rootdepth = wrootattr.depth; |
2347 | |
2466 | |
2348 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
2467 | XGetWindowAttributes (disp, parent[0], &wattr); |
2349 | |
2468 | |
2350 | if (rootdepth != wattr.depth) |
2469 | if (rootdepth != wattr.depth) |
2351 | { |
2470 | { |
2352 | if (am_transparent) |
2471 | if (am_transparent) |
2353 | { |
2472 | { |
2354 | pchanged = 1; |
2473 | pchanged = 1; |
2355 | XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); |
2474 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2356 | am_transparent = am_pixmap_trans = 0; |
2475 | am_transparent = am_pixmap_trans = 0; |
2357 | } |
2476 | } |
2358 | |
2477 | |
2359 | return pchanged; /* Don't try any more */ |
2478 | return pchanged; /* Don't try any more */ |
2360 | } |
2479 | } |
2361 | |
2480 | |
2362 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2481 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2363 | XSync (display->display, False); |
2482 | XSync (disp, False); |
2364 | |
2483 | |
2365 | /* |
2484 | /* |
2366 | * Make the frame window set by the window manager have |
2485 | * Make the frame window set by the window manager have |
2367 | * the root background. Some window managers put multiple nested frame |
2486 | * the root background. Some window managers put multiple nested frame |
2368 | * windows for each client, so we have to take care about that. |
2487 | * windows for each client, so we have to take care about that. |
2369 | */ |
2488 | */ |
2370 | i = (xa[XA_XROOTPMAP_ID] |
2489 | i = (xa[XA_XROOTPMAP_ID] |
2371 | && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], |
2490 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2372 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2491 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2373 | &nitems, &bytes_after, &prop) == Success); |
2492 | &nitems, &bytes_after, &prop) == Success); |
2374 | |
2493 | |
2375 | if (!i || prop == NULL) |
2494 | if (!i || prop == NULL) |
2376 | i = (xa[XA_ESETROOT_PMAP_ID] |
2495 | i = (xa[XA_ESETROOT_PMAP_ID] |
2377 | && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], |
2496 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2378 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2497 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2379 | &nitems, &bytes_after, &prop) == Success); |
2498 | &nitems, &bytes_after, &prop) == Success); |
2380 | |
2499 | |
2381 | if (!i || prop == NULL |
2500 | if (!i || prop == NULL |
2382 | #if TINTING |
2501 | #if TINTING |
… | |
… | |
2401 | Window cr; |
2520 | Window cr; |
2402 | XImage *image; |
2521 | XImage *image; |
2403 | GC gc; |
2522 | GC gc; |
2404 | XGCValues gcvalue; |
2523 | XGCValues gcvalue; |
2405 | |
2524 | |
2406 | XTranslateCoordinates (display->display, TermWin.parent[0], display->root, |
2525 | XTranslateCoordinates (disp, parent[0], display->root, |
2407 | 0, 0, &sx, &sy, &cr); |
2526 | 0, 0, &sx, &sy, &cr); |
2408 | nw = (unsigned int)szHint.width; |
2527 | nw = (unsigned int)szHint.width; |
2409 | nh = (unsigned int)szHint.height; |
2528 | nh = (unsigned int)szHint.height; |
2410 | nx = ny = 0; |
2529 | nx = ny = 0; |
2411 | |
2530 | |
… | |
… | |
2421 | nh += sy; |
2540 | nh += sy; |
2422 | ny = -sy; |
2541 | ny = -sy; |
2423 | sy = 0; |
2542 | sy = 0; |
2424 | } |
2543 | } |
2425 | |
2544 | |
2426 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2545 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2427 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2546 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2428 | |
2547 | |
2429 | XSync (display->display, False); |
2548 | XSync (disp, False); |
2430 | allowedxerror = -1; |
2549 | allowedxerror = -1; |
2431 | image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2550 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2432 | |
2551 | |
2433 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2552 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2434 | /* XXX: may need a delay here? */ |
2553 | /* XXX: may need a delay here? */ |
2435 | allowedxerror = 0; |
2554 | allowedxerror = 0; |
2436 | |
2555 | |
2437 | if (image == NULL) |
2556 | if (image == NULL) |
2438 | { |
2557 | { |
2439 | if (am_transparent && am_pixmap_trans) |
2558 | if (am_transparent && am_pixmap_trans) |
2440 | { |
2559 | { |
2441 | pchanged = 1; |
2560 | pchanged = 1; |
2442 | if (TermWin.pixmap != None) |
2561 | if (pixmap != None) |
2443 | { |
2562 | { |
2444 | XFreePixmap (display->display, TermWin.pixmap); |
2563 | XFreePixmap (disp, pixmap); |
2445 | TermWin.pixmap = None; |
2564 | pixmap = None; |
2446 | } |
2565 | } |
2447 | } |
2566 | } |
2448 | |
2567 | |
2449 | am_pixmap_trans = 0; |
2568 | am_pixmap_trans = 0; |
2450 | } |
2569 | } |
2451 | else |
2570 | else |
2452 | { |
2571 | { |
2453 | if (TermWin.pixmap != None) |
2572 | if (pixmap != None) |
2454 | XFreePixmap (display->display, TermWin.pixmap); |
2573 | XFreePixmap (disp, pixmap); |
2455 | |
2574 | |
2456 | #if TINTING |
2575 | #if TINTING |
2457 | if (ISSET_PIXCOLOR (Color_tint)) |
2576 | if (ISSET_PIXCOLOR (Color_tint)) |
2458 | { |
2577 | { |
2459 | unsigned short rm, gm, bm; |
2578 | unsigned short rm, gm, bm; |
… | |
… | |
2463 | |
2582 | |
2464 | ShadeXImage (display, image, shade, rm, gm, bm); |
2583 | ShadeXImage (display, image, shade, rm, gm, bm); |
2465 | } |
2584 | } |
2466 | #endif |
2585 | #endif |
2467 | |
2586 | |
2468 | TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, |
2587 | pixmap = XCreatePixmap (disp, vt, |
2469 | szHint.width, szHint.height, image->depth); |
2588 | szHint.width, szHint.height, image->depth); |
2470 | gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); |
2589 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2471 | XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, |
2590 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2472 | nx, ny, image->width, image->height); |
2591 | nx, ny, image->width, image->height); |
2473 | XFreeGC (display->display, gc); |
2592 | XFreeGC (disp, gc); |
2474 | XDestroyImage (image); |
2593 | XDestroyImage (image); |
2475 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); |
2594 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2476 | XClearWindow (display->display, TermWin.parent[0]); |
2595 | XClearWindow (disp, parent[0]); |
2477 | |
2596 | |
2478 | if (!am_transparent || !am_pixmap_trans) |
2597 | if (!am_transparent || !am_pixmap_trans) |
2479 | pchanged = 1; |
2598 | pchanged = 1; |
2480 | |
2599 | |
2481 | am_transparent = am_pixmap_trans = 1; |
2600 | am_transparent = am_pixmap_trans = 1; |
2482 | } |
2601 | } |
2483 | } |
2602 | } |
2484 | |
2603 | |
2485 | if (am_pixmap_trans) |
2604 | if (am_pixmap_trans) |
2486 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2605 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2487 | else |
2606 | else |
2488 | { |
2607 | { |
2489 | unsigned int n; |
2608 | unsigned int n; |
2490 | /* |
2609 | /* |
2491 | * InheritPixmap transparency |
2610 | * InheritPixmap transparency |
2492 | */ |
2611 | */ |
2493 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2612 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2494 | { |
2613 | { |
2495 | oldp = TermWin.parent[i]; |
2614 | oldp = parent[i]; |
2496 | XQueryTree (display->display, TermWin.parent[i - 1], &root, |
2615 | XQueryTree (disp, parent[i - 1], &root, |
2497 | &TermWin.parent[i], &list, &n); |
2616 | &parent[i], &list, &n); |
2498 | XFree (list); |
2617 | XFree (list); |
2499 | |
2618 | |
2500 | if (TermWin.parent[i] == display->root) |
2619 | if (parent[i] == display->root) |
2501 | { |
2620 | { |
2502 | if (oldp != None) |
2621 | if (oldp != None) |
2503 | pchanged = 1; |
2622 | pchanged = 1; |
2504 | |
2623 | |
2505 | break; |
2624 | break; |
2506 | } |
2625 | } |
2507 | |
2626 | |
2508 | if (oldp != TermWin.parent[i]) |
2627 | if (oldp != parent[i]) |
2509 | pchanged = 1; |
2628 | pchanged = 1; |
2510 | } |
2629 | } |
2511 | |
2630 | |
2512 | n = 0; |
2631 | n = 0; |
2513 | |
2632 | |
2514 | if (pchanged) |
2633 | if (pchanged) |
2515 | { |
2634 | { |
2516 | for (; n < (unsigned int)i; n++) |
2635 | for (; n < (unsigned int)i; n++) |
2517 | { |
2636 | { |
2518 | XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); |
2637 | XGetWindowAttributes (disp, parent[n], &wattr); |
2519 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2638 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2520 | { |
2639 | { |
2521 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2640 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2522 | break; |
2641 | break; |
2523 | } |
2642 | } |
2524 | } |
2643 | } |
2525 | } |
2644 | } |
2526 | |
2645 | |
2527 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2646 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2528 | { |
2647 | { |
2529 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2648 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2530 | XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); |
2649 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2531 | am_transparent = 0; |
2650 | am_transparent = 0; |
2532 | /* XXX: also turn off Opt_transparent? */ |
2651 | /* XXX: also turn off Opt_transparent? */ |
2533 | } |
2652 | } |
2534 | else |
2653 | else |
2535 | { |
2654 | { |
… | |
… | |
2538 | * needed for fvwm2.2.2 (and before?) */ |
2657 | * needed for fvwm2.2.2 (and before?) */ |
2539 | sleep (1); |
2658 | sleep (1); |
2540 | #endif |
2659 | #endif |
2541 | for (n = 0; n < (unsigned int)i; n++) |
2660 | for (n = 0; n < (unsigned int)i; n++) |
2542 | { |
2661 | { |
2543 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); |
2662 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2544 | XClearWindow (display->display, TermWin.parent[n]); |
2663 | XClearWindow (disp, parent[n]); |
2545 | } |
2664 | } |
2546 | |
2665 | |
2547 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2666 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2548 | am_transparent = 1; |
2667 | am_transparent = 1; |
2549 | } |
2668 | } |
2550 | |
2669 | |
2551 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2670 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2552 | TermWin.parent[i] = None; |
2671 | parent[i] = None; |
2553 | } |
2672 | } |
2554 | |
2673 | |
2555 | if (scrollBar.win) |
2674 | if (scrollBar.win) |
2556 | { |
2675 | { |
2557 | XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); |
2676 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2558 | scrollBar.setIdle (); |
2677 | scrollBar.setIdle (); |
2559 | scrollbar_show (0); |
2678 | scrollbar_show (0); |
2560 | } |
2679 | } |
2561 | |
2680 | |
2562 | if (am_transparent) |
2681 | if (am_transparent) |
… | |
… | |
2574 | |
2693 | |
2575 | bool |
2694 | bool |
2576 | rxvt_term::cmd_parse () |
2695 | rxvt_term::cmd_parse () |
2577 | { |
2696 | { |
2578 | bool flag = false; |
2697 | bool flag = false; |
2579 | unicode_t ch = NOCHAR; |
2698 | wchar_t ch = NOCHAR; |
2580 | unsigned char *seq_begin; // remember start of esc-sequence here |
2699 | char *seq_begin; // remember start of esc-sequence here |
2581 | |
2700 | |
2582 | for (;;) |
2701 | for (;;) |
2583 | { |
2702 | { |
2584 | if (ch == NOCHAR) |
2703 | if (ch == NOCHAR) |
2585 | { |
2704 | { |
2586 | seq_begin = cmdbuf_ptr; |
2705 | seq_begin = cmdbuf_ptr; |
2587 | ch = next_char (); |
2706 | ch = next_char (); |
2588 | } |
|
|
2589 | |
2707 | |
2590 | if (ch == NOCHAR) // TODO: improve |
2708 | if (ch == NOCHAR) |
2591 | break; |
2709 | break; |
|
|
2710 | } |
2592 | |
2711 | |
2593 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2712 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2594 | { |
2713 | { |
2595 | if (!seen_input) |
2714 | if (!seen_input) |
2596 | { |
2715 | { |
… | |
… | |
2600 | // some window managers resize the window early, and these programs |
2719 | // some window managers resize the window early, and these programs |
2601 | // then sometimes get the size wrong. |
2720 | // then sometimes get the size wrong. |
2602 | // unfortunately other programs are even more buggy and dislike |
2721 | // unfortunately other programs are even more buggy and dislike |
2603 | // being sent SIGWINCH, so only do it when we were in fact being |
2722 | // being sent SIGWINCH, so only do it when we were in fact being |
2604 | // resized. |
2723 | // resized. |
2605 | if (seen_resize) |
2724 | if (seen_resize && cmd_pid) |
2606 | kill (-cmd_pid, SIGWINCH); |
2725 | kill (-cmd_pid, SIGWINCH); |
2607 | } |
2726 | } |
2608 | |
2727 | |
2609 | /* Read a text string from the input buffer */ |
2728 | /* Read a text string from the input buffer */ |
2610 | unicode_t buf[UBUFSIZ]; |
2729 | wchar_t buf[UBUFSIZ]; |
2611 | bool refreshnow = false; |
2730 | bool refreshnow = false; |
2612 | int nlines = 0; |
2731 | int nlines = 0; |
2613 | unicode_t *str = buf; |
2732 | wchar_t *str = buf; |
|
|
2733 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2614 | |
2734 | |
2615 | for (;;) |
2735 | for (;;) |
2616 | { |
2736 | { |
2617 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2737 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2618 | break; |
2738 | break; |
2619 | |
2739 | |
2620 | *str++ = ch; |
2740 | *str++ = ch; |
2621 | |
2741 | |
2622 | if (ch == C0_LF) |
2742 | if (ch == C0_LF || str >= eol) |
2623 | { |
2743 | { |
|
|
2744 | if (ch == C0_LF) |
2624 | nlines++; |
2745 | nlines++; |
|
|
2746 | |
2625 | refresh_count++; |
2747 | refresh_count++; |
2626 | |
2748 | |
2627 | if (!(options & Opt_jumpScroll) |
2749 | if (!OPTION (Opt_jumpScroll) |
2628 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2750 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2629 | { |
2751 | { |
2630 | refreshnow = true; |
2752 | refreshnow = true; |
|
|
2753 | refresh_count = 0; |
2631 | ch = NOCHAR; |
2754 | ch = NOCHAR; |
2632 | break; |
2755 | break; |
2633 | } |
2756 | } |
2634 | |
2757 | |
2635 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2758 | // scr_add_lines only works for nlines <= nrow - 1. |
2636 | if (nlines >= TermWin.nrow - 1) |
2759 | if (nlines >= nrow - 1) |
2637 | { |
2760 | { |
|
|
2761 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2762 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2638 | scr_add_lines (buf, nlines, str - buf); |
2763 | scr_add_lines (buf, str - buf, nlines); |
|
|
2764 | |
2639 | nlines = 0; |
2765 | nlines = 0; |
2640 | str = buf; |
2766 | str = buf; |
|
|
2767 | eol = str + min (ncol, UBUFSIZ); |
2641 | } |
2768 | } |
2642 | } |
|
|
2643 | |
2769 | |
2644 | if (str >= buf + UBUFSIZ) |
2770 | if (str >= eol) |
2645 | { |
2771 | { |
|
|
2772 | if (eol >= buf + UBUFSIZ) |
|
|
2773 | { |
2646 | ch = NOCHAR; |
2774 | ch = NOCHAR; |
2647 | break; |
2775 | break; |
|
|
2776 | } |
|
|
2777 | else |
|
|
2778 | eol = min (eol + ncol, buf + UBUFSIZ); |
|
|
2779 | } |
|
|
2780 | |
2648 | } |
2781 | } |
2649 | |
2782 | |
2650 | seq_begin = cmdbuf_ptr; |
2783 | seq_begin = cmdbuf_ptr; |
2651 | ch = next_char (); |
2784 | ch = next_char (); |
2652 | } |
2785 | } |
2653 | |
2786 | |
|
|
2787 | if (!(SHOULD_INVOKE (HOOK_ADD_LINES) |
|
|
2788 | && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) |
2654 | scr_add_lines (buf, nlines, str - buf); |
2789 | scr_add_lines (buf, str - buf, nlines); |
2655 | |
2790 | |
2656 | /* |
2791 | /* |
2657 | * If there have been a lot of new lines, then update the screen |
2792 | * If there have been a lot of new lines, then update the screen |
2658 | * What the heck I'll cheat and only refresh less than every page-full. |
2793 | * What the heck I'll cheat and only refresh less than every page-full. |
2659 | * the number of pages between refreshes is refresh_limit, which |
2794 | * the number of pages between refreshes is refresh_limit, which |
2660 | * is incremented here because we must be doing flat-out scrolling. |
2795 | * is incremented here because we must be doing flat-out scrolling. |
2661 | */ |
2796 | */ |
2662 | if (refreshnow) |
2797 | if (refreshnow) |
2663 | { |
2798 | { |
2664 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2799 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2665 | refresh_limit++; |
2800 | refresh_limit++; |
2666 | else |
2801 | else |
2667 | { |
2802 | { |
2668 | flag = true; |
2803 | flag = true; |
2669 | scr_refresh (refresh_type); |
2804 | scr_refresh (); |
|
|
2805 | want_refresh = 1; |
2670 | } |
2806 | } |
2671 | } |
2807 | } |
2672 | |
2808 | |
2673 | } |
2809 | } |
2674 | else |
2810 | else |
… | |
… | |
2689 | } |
2825 | } |
2690 | |
2826 | |
2691 | return flag; |
2827 | return flag; |
2692 | } |
2828 | } |
2693 | |
2829 | |
2694 | // read the next octet |
|
|
2695 | unicode_t |
|
|
2696 | rxvt_term::next_octet () |
|
|
2697 | { |
|
|
2698 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2699 | ? *cmdbuf_ptr++ |
|
|
2700 | : NOCHAR; |
|
|
2701 | } |
|
|
2702 | |
|
|
2703 | // read the next character |
2830 | // read the next character |
2704 | unicode_t |
2831 | wchar_t |
2705 | rxvt_term::next_char () |
2832 | rxvt_term::next_char () |
2706 | { |
2833 | { |
2707 | while (cmdbuf_ptr < cmdbuf_endp) |
2834 | while (cmdbuf_ptr < cmdbuf_endp) |
2708 | { |
2835 | { |
2709 | // assume 7-bit to be ascii ALWAYS |
2836 | // assume 7-bit to be ascii ALWAYS |
2710 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2837 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2711 | return *cmdbuf_ptr++; |
2838 | return *cmdbuf_ptr++; |
2712 | |
2839 | |
2713 | wchar_t wc; |
2840 | wchar_t wc; |
2714 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2841 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2715 | |
2842 | |
2716 | if (len == (size_t)-2) |
2843 | if (len == (size_t)-2) |
2717 | { |
2844 | { |
2718 | // the mbstate stores incomplete sequences. didn't know this :/ |
2845 | // the mbstate stores incomplete sequences. didn't know this :/ |
2719 | cmdbuf_ptr = cmdbuf_endp; |
2846 | cmdbuf_ptr = cmdbuf_endp; |
2720 | break; |
2847 | break; |
2721 | } |
2848 | } |
2722 | |
2849 | |
2723 | if (len == (size_t)-1) |
2850 | if (len == (size_t)-1) |
2724 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2851 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2725 | |
2852 | |
2726 | // assume wchar == unicode |
2853 | // assume wchar == unicode |
2727 | cmdbuf_ptr += len; |
2854 | cmdbuf_ptr += len; |
2728 | return wc & UNICODE_MASK; |
2855 | return wc & UNICODE_MASK; |
2729 | } |
2856 | } |
2730 | |
2857 | |
2731 | return NOCHAR; |
2858 | return NOCHAR; |
|
|
2859 | } |
|
|
2860 | |
|
|
2861 | // read the next octet |
|
|
2862 | uint32_t |
|
|
2863 | rxvt_term::next_octet () |
|
|
2864 | { |
|
|
2865 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2866 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2867 | : NOCHAR; |
2732 | } |
2868 | } |
2733 | |
2869 | |
2734 | /* rxvt_cmd_getc () - Return next input character */ |
2870 | /* rxvt_cmd_getc () - Return next input character */ |
2735 | /* |
2871 | /* |
2736 | * Return the next input character after first passing any keyboard input |
2872 | * Return the next input character after first passing any keyboard input |
2737 | * to the command. |
2873 | * to the command. |
2738 | */ |
2874 | */ |
2739 | unicode_t |
2875 | wchar_t |
2740 | rxvt_term::cmd_getc () |
2876 | rxvt_term::cmd_getc () |
2741 | { |
2877 | { |
2742 | unicode_t c = next_char (); |
2878 | wchar_t c = next_char (); |
2743 | |
2879 | |
2744 | if (c == NOCHAR) |
2880 | if (c == NOCHAR) |
2745 | throw out_of_input; |
2881 | throw out_of_input; |
2746 | |
2882 | |
2747 | return c; |
2883 | return c; |
2748 | } |
2884 | } |
2749 | |
2885 | |
2750 | unicode_t |
2886 | uint32_t |
2751 | rxvt_term::cmd_get8 () |
2887 | rxvt_term::cmd_get8 () |
2752 | { |
2888 | { |
2753 | unicode_t c = next_octet (); |
2889 | uint32_t c = next_octet (); |
2754 | |
2890 | |
2755 | if (c == NOCHAR) |
2891 | if (c == NOCHAR) |
2756 | throw out_of_input; |
2892 | throw out_of_input; |
2757 | |
2893 | |
2758 | return c; |
2894 | return c; |
… | |
… | |
2858 | case C0_ESC: |
2994 | case C0_ESC: |
2859 | process_escape_seq (); |
2995 | process_escape_seq (); |
2860 | break; |
2996 | break; |
2861 | case C0_ENQ: /* terminal Status */ |
2997 | case C0_ENQ: /* terminal Status */ |
2862 | if (rs[Rs_answerbackstring]) |
2998 | if (rs[Rs_answerbackstring]) |
2863 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2999 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2864 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2865 | else |
3000 | else |
2866 | tt_write ((unsigned char *)VT100_ANS, |
3001 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2867 | (unsigned int)strlen (VT100_ANS)); |
|
|
2868 | break; |
3002 | break; |
2869 | case C0_BEL: /* bell */ |
3003 | case C0_BEL: /* bell */ |
2870 | scr_bell (); |
3004 | scr_bell (); |
2871 | break; |
3005 | break; |
2872 | case C0_BS: /* backspace */ |
3006 | case C0_BS: /* backspace */ |
… | |
… | |
3027 | break; |
3161 | break; |
3028 | |
3162 | |
3029 | /* 8.3.87: NEXT LINE */ |
3163 | /* 8.3.87: NEXT LINE */ |
3030 | case C1_NEL: /* ESC E */ |
3164 | case C1_NEL: /* ESC E */ |
3031 | { |
3165 | { |
3032 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3166 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3033 | scr_add_lines (nlcr, 1, 2); |
3167 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3034 | } |
3168 | } |
3035 | break; |
3169 | break; |
3036 | |
3170 | |
3037 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3171 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3038 | case C1_ESA: /* ESC G */ |
3172 | case C1_ESA: /* ESC G */ |
… | |
… | |
3060 | process_dcs_seq (); |
3194 | process_dcs_seq (); |
3061 | break; |
3195 | break; |
3062 | |
3196 | |
3063 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3197 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3064 | case C1_SCI: /* ESC Z */ |
3198 | case C1_SCI: /* ESC Z */ |
3065 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3199 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3066 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3067 | break; /* steal obsolete ESC [ c */ |
3200 | break; /* steal obsolete ESC [ c */ |
3068 | |
3201 | |
3069 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3202 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3070 | case C1_CSI: /* ESC [ */ |
3203 | case C1_CSI: /* ESC [ */ |
3071 | process_csi_seq (); |
3204 | process_csi_seq (); |
… | |
… | |
3196 | { |
3329 | { |
3197 | switch (priv) |
3330 | switch (priv) |
3198 | { |
3331 | { |
3199 | case '>': |
3332 | case '>': |
3200 | if (ch == CSI_DA) /* secondary device attributes */ |
3333 | if (ch == CSI_DA) /* secondary device attributes */ |
3201 | tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); |
3334 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3202 | break; |
3335 | break; |
3203 | case '?': |
3336 | case '?': |
3204 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3337 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3205 | process_terminal_mode (ch, priv, nargs, arg); |
3338 | process_terminal_mode (ch, priv, nargs, arg); |
3206 | break; |
3339 | break; |
… | |
… | |
3311 | |
3444 | |
3312 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3445 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3313 | arg[0] = -arg[0]; |
3446 | arg[0] = -arg[0]; |
3314 | /* FALLTHROUGH */ |
3447 | /* FALLTHROUGH */ |
3315 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3448 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3316 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3449 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3317 | break; |
3450 | break; |
3318 | |
3451 | |
3319 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3452 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3320 | tt_write ((const unsigned char *)VT100_ANS, |
3453 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3321 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3322 | break; |
3454 | break; |
3323 | |
3455 | |
3324 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3456 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3325 | process_sgr_mode (nargs, arg); |
3457 | process_sgr_mode (nargs, arg); |
3326 | break; |
3458 | break; |
… | |
… | |
3333 | break; |
3465 | break; |
3334 | case 6: /* CPR requested */ |
3466 | case 6: /* CPR requested */ |
3335 | scr_report_position (); |
3467 | scr_report_position (); |
3336 | break; |
3468 | break; |
3337 | case 7: /* unofficial extension */ |
3469 | case 7: /* unofficial extension */ |
3338 | if (options & Opt_insecure) |
3470 | if (OPTION (Opt_insecure)) |
3339 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3471 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3340 | break; |
3472 | break; |
3341 | case 8: /* unofficial extension */ |
3473 | case 8: /* unofficial extension */ |
3342 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3474 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3343 | break; |
3475 | break; |
… | |
… | |
3435 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3567 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3436 | { |
3568 | { |
3437 | int x, y; |
3569 | int x, y; |
3438 | XWindowAttributes wattr; |
3570 | XWindowAttributes wattr; |
3439 | Window wdummy; |
3571 | Window wdummy; |
|
|
3572 | dDisp; |
3440 | |
3573 | |
3441 | if (nargs == 0) |
3574 | if (nargs == 0) |
3442 | return; |
3575 | return; |
3443 | |
3576 | |
3444 | switch (args[0]) |
3577 | switch (args[0]) |
3445 | { |
3578 | { |
3446 | /* |
3579 | /* |
3447 | * commands |
3580 | * commands |
3448 | */ |
3581 | */ |
3449 | case 1: /* deiconify window */ |
3582 | case 1: /* deiconify window */ |
3450 | XMapWindow (display->display, TermWin.parent[0]); |
3583 | XMapWindow (disp, parent[0]); |
3451 | break; |
3584 | break; |
3452 | case 2: /* iconify window */ |
3585 | case 2: /* iconify window */ |
3453 | XIconifyWindow (display->display, TermWin.parent[0], |
3586 | XIconifyWindow (disp, parent[0], display->screen); |
3454 | DefaultScreen (display->display)); |
|
|
3455 | break; |
3587 | break; |
3456 | case 3: /* set position (pixels) */ |
3588 | case 3: /* set position (pixels) */ |
3457 | XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); |
3589 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3458 | break; |
3590 | break; |
3459 | case 4: /* set size (pixels) */ |
3591 | case 4: /* set size (pixels) */ |
3460 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3592 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3461 | break; |
3593 | break; |
3462 | case 5: /* raise window */ |
3594 | case 5: /* raise window */ |
3463 | XRaiseWindow (display->display, TermWin.parent[0]); |
3595 | XRaiseWindow (disp, parent[0]); |
3464 | break; |
3596 | break; |
3465 | case 6: /* lower window */ |
3597 | case 6: /* lower window */ |
3466 | XLowerWindow (display->display, TermWin.parent[0]); |
3598 | XLowerWindow (disp, parent[0]); |
3467 | break; |
3599 | break; |
3468 | case 7: /* refresh window */ |
3600 | case 7: /* refresh window */ |
3469 | scr_touch (true); |
3601 | scr_touch (true); |
3470 | break; |
3602 | break; |
3471 | case 8: /* set size (chars) */ |
3603 | case 8: /* set size (chars) */ |
3472 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3604 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3473 | (unsigned int) (args[1] * TermWin.fheight)); |
3605 | (unsigned int) (args[1] * fheight)); |
3474 | break; |
3606 | break; |
3475 | |
3607 | |
3476 | //case 9: NYI, TODO, restore maximized window or maximize window |
3608 | //case 9: NYI, TODO, restore maximized window or maximize window |
3477 | default: |
3609 | default: |
3478 | if (args[0] >= 24) /* set height (chars) */ |
3610 | if (args[0] >= 24) /* set height (chars) */ |
3479 | set_widthheight ((unsigned int)TermWin.width, |
3611 | set_widthheight ((unsigned int)width, |
3480 | (unsigned int) (args[1] * TermWin.fheight)); |
3612 | (unsigned int) (args[1] * fheight)); |
3481 | break; |
3613 | break; |
3482 | |
3614 | |
3483 | |
3615 | |
3484 | /* |
3616 | /* |
3485 | * reports - some output format copied from XTerm |
3617 | * reports - some output format copied from XTerm |
3486 | */ |
3618 | */ |
3487 | case 11: /* report window state */ |
3619 | case 11: /* report window state */ |
3488 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3620 | XGetWindowAttributes (disp, parent[0], &wattr); |
3489 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3621 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3490 | break; |
3622 | break; |
3491 | case 13: /* report window position */ |
3623 | case 13: /* report window position */ |
3492 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3624 | XGetWindowAttributes (disp, parent[0], &wattr); |
3493 | XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, |
3625 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3494 | -wattr.border_width, -wattr.border_width, |
3626 | -wattr.border_width, -wattr.border_width, |
3495 | &x, &y, &wdummy); |
3627 | &x, &y, &wdummy); |
3496 | tt_printf ("\033[3;%d;%dt", x, y); |
3628 | tt_printf ("\033[3;%d;%dt", x, y); |
3497 | break; |
3629 | break; |
3498 | case 14: /* report window size (pixels) */ |
3630 | case 14: /* report window size (pixels) */ |
3499 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3631 | XGetWindowAttributes (disp, parent[0], &wattr); |
3500 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3632 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3501 | break; |
3633 | break; |
3502 | case 18: /* report text area size (chars) */ |
3634 | case 18: /* report text area size (chars) */ |
3503 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3635 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3504 | break; |
3636 | break; |
3505 | case 19: /* report window size (chars) */ |
3637 | case 19: /* report window size (chars) */ |
3506 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3638 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3507 | break; |
3639 | break; |
3508 | case 20: /* report icon label */ |
3640 | case 20: /* report icon label */ |
3509 | { |
3641 | { |
3510 | char *s; |
3642 | char *s; |
3511 | XGetIconName (display->display, TermWin.parent[0], &s); |
3643 | XGetIconName (disp, parent[0], &s); |
3512 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3644 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3513 | XFree (s); |
3645 | XFree (s); |
3514 | } |
3646 | } |
3515 | break; |
3647 | break; |
3516 | case 21: /* report window title */ |
3648 | case 21: /* report window title */ |
3517 | { |
3649 | { |
3518 | char *s; |
3650 | char *s; |
3519 | XFetchName (display->display, TermWin.parent[0], &s); |
3651 | XFetchName (disp, parent[0], &s); |
3520 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3652 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3521 | XFree (s); |
3653 | XFree (s); |
3522 | } |
3654 | } |
3523 | break; |
3655 | break; |
3524 | } |
3656 | } |
3525 | } |
3657 | } |
… | |
… | |
3528 | /*----------------------------------------------------------------------*/ |
3660 | /*----------------------------------------------------------------------*/ |
3529 | /* |
3661 | /* |
3530 | * get input up until STRING TERMINATOR (or BEL) |
3662 | * get input up until STRING TERMINATOR (or BEL) |
3531 | * ends_how is terminator used. returned input must be free()'d |
3663 | * ends_how is terminator used. returned input must be free()'d |
3532 | */ |
3664 | */ |
3533 | unsigned char * |
3665 | char * |
3534 | rxvt_term::get_to_st (unicode_t &ends_how) |
3666 | rxvt_term::get_to_st (unicode_t &ends_how) |
3535 | { |
3667 | { |
3536 | unicode_t ch; |
3668 | unicode_t ch; |
3537 | bool seen_esc = false; |
3669 | bool seen_esc = false; |
3538 | unsigned int n = 0; |
3670 | unsigned int n = 0; |
… | |
… | |
3557 | else if (ch < 0x20) |
3689 | else if (ch < 0x20) |
3558 | return NULL; /* other control character - exit */ |
3690 | return NULL; /* other control character - exit */ |
3559 | |
3691 | |
3560 | seen_esc = false; |
3692 | seen_esc = false; |
3561 | |
3693 | |
3562 | if (n >= sizeof (string) - 1) |
3694 | if (n >= STRING_MAX - 1) |
3563 | // stop at some sane length |
3695 | // stop at some sane length |
3564 | return NULL; |
3696 | return NULL; |
3565 | |
3697 | |
3566 | if (ch == C0_SYN) |
3698 | if (ch == C0_SYN) |
3567 | string[n++] = cmd_get8 (); |
3699 | string[n++] = cmd_get8 (); |
… | |
… | |
3571 | |
3703 | |
3572 | string[n++] = '\0'; |
3704 | string[n++] = '\0'; |
3573 | |
3705 | |
3574 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3706 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3575 | |
3707 | |
3576 | return (unsigned char *)rxvt_wcstombs (string); |
3708 | return rxvt_wcstombs (string); |
3577 | } |
3709 | } |
3578 | |
3710 | |
3579 | /*----------------------------------------------------------------------*/ |
3711 | /*----------------------------------------------------------------------*/ |
3580 | /* |
3712 | /* |
3581 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3713 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3582 | */ |
3714 | */ |
3583 | void |
3715 | void |
3584 | rxvt_term::process_dcs_seq () |
3716 | rxvt_term::process_dcs_seq () |
3585 | { |
3717 | { |
3586 | unsigned char *s; |
3718 | char *s; |
3587 | unicode_t eh; |
3719 | unicode_t eh; |
3588 | |
3720 | |
3589 | /* |
3721 | /* |
3590 | * Not handled yet |
3722 | * Not handled yet |
3591 | */ |
3723 | */ |
… | |
… | |
3610 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3742 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3611 | arg = arg * 10 + (ch - '0'); |
3743 | arg = arg * 10 + (ch - '0'); |
3612 | |
3744 | |
3613 | if (ch == ';') |
3745 | if (ch == ';') |
3614 | { |
3746 | { |
3615 | unsigned char *s = get_to_st (eh); |
3747 | char *s = get_to_st (eh); |
3616 | |
3748 | |
3617 | if (s) |
3749 | if (s) |
3618 | { |
3750 | { |
3619 | process_xterm_seq (arg, (char *)s, eh); |
3751 | process_xterm_seq (arg, s, eh); |
3620 | free (s); |
3752 | free (s); |
3621 | } |
3753 | } |
3622 | } |
3754 | } |
3623 | } |
3755 | } |
3624 | |
3756 | |
3625 | void |
3757 | void |
3626 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3758 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3627 | { |
3759 | { |
3628 | if (str[0] == '?' && !str[1]) |
3760 | if (str[0] == '?' && !str[1]) |
3629 | { |
3761 | { |
3630 | unsigned short r, g, b; |
3762 | unsigned short r, g, b; |
3631 | pix_colors_focused[color].get (display, r, g, b); |
3763 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3635 | set_window_color (color, str); |
3767 | set_window_color (color, str); |
3636 | } |
3768 | } |
3637 | |
3769 | |
3638 | /* |
3770 | /* |
3639 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3771 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3640 | * 0 = change iconName/title |
|
|
3641 | * 1 = change iconName |
|
|
3642 | * 2 = change title |
|
|
3643 | * 4 = change color |
|
|
3644 | * 10 = change fg color |
|
|
3645 | * 11 = change bg color |
|
|
3646 | * 12 = change text color |
|
|
3647 | * 13 = change mouse foreground color |
|
|
3648 | * 17 = change highlight character colour |
|
|
3649 | * 18 = change bold character color |
|
|
3650 | * 19 = change underlined character color |
|
|
3651 | * 46 = change logfile (not implemented) |
|
|
3652 | * 50 = change font |
|
|
3653 | * |
|
|
3654 | * rxvt extensions: |
|
|
3655 | * 20 = bg pixmap |
|
|
3656 | * 39 = change default fg color |
|
|
3657 | * 49 = change default bg color |
|
|
3658 | * 55 = dump scrollback buffer and all of screen |
|
|
3659 | * 701 = change locale |
|
|
3660 | * 702 = find font |
|
|
3661 | * 703 = menu |
|
|
3662 | */ |
3772 | */ |
3663 | void |
3773 | void |
3664 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3774 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3665 | { |
3775 | { |
3666 | int changed = 0; |
|
|
3667 | int color; |
3776 | int color; |
3668 | char *buf, *name; |
3777 | char *buf, *name; |
3669 | bool query = str[0] == '?' && !str[1]; |
3778 | bool query = str[0] == '?' && !str[1]; |
3670 | int saveop = op; |
3779 | int saveop = op; |
|
|
3780 | dDisp; |
3671 | |
3781 | |
3672 | assert (str != NULL); |
3782 | assert (str != NULL); |
3673 | switch (op) |
3783 | switch (op) |
3674 | { |
3784 | { |
3675 | case XTerm_name: |
3785 | case XTerm_name: |
… | |
… | |
3691 | unsigned long bytes_after; |
3801 | unsigned long bytes_after; |
3692 | unsigned char *value = 0; |
3802 | unsigned char *value = 0; |
3693 | const char *str = ""; |
3803 | const char *str = ""; |
3694 | |
3804 | |
3695 | if (prop |
3805 | if (prop |
3696 | && XGetWindowProperty (display->display, TermWin.parent[0], |
3806 | && XGetWindowProperty (disp, parent[0], |
3697 | prop, 0, 1<<16, 0, AnyPropertyType, |
3807 | prop, 0, 1<<16, 0, AnyPropertyType, |
3698 | &actual_type, &actual_format, |
3808 | &actual_type, &actual_format, |
3699 | &nitems, &bytes_after, &value) == Success |
3809 | &nitems, &bytes_after, &value) == Success |
3700 | && actual_type != None |
3810 | && actual_type != None |
3701 | && actual_format == 8) |
3811 | && actual_format == 8) |
… | |
… | |
3713 | { |
3823 | { |
3714 | *eq = 0; |
3824 | *eq = 0; |
3715 | set_utf8_property (display->atom (str), eq + 1); |
3825 | set_utf8_property (display->atom (str), eq + 1); |
3716 | } |
3826 | } |
3717 | else |
3827 | else |
3718 | XDeleteProperty (display->display, TermWin.parent[0], |
3828 | XDeleteProperty (disp, parent[0], |
3719 | display->atom (str)); |
3829 | display->atom (str)); |
3720 | } |
3830 | } |
3721 | break; |
3831 | break; |
3722 | |
3832 | |
3723 | case XTerm_Color: |
3833 | case XTerm_Color: |
… | |
… | |
3725 | { |
3835 | { |
3726 | if ((name = strchr (buf, ';')) == NULL) |
3836 | if ((name = strchr (buf, ';')) == NULL) |
3727 | break; |
3837 | break; |
3728 | |
3838 | |
3729 | *name++ = '\0'; |
3839 | *name++ = '\0'; |
3730 | color = atoi (buf); |
3840 | color = atoi (buf) + minCOLOR; |
3731 | |
3841 | |
3732 | if (color < 0 || color >= TOTAL_COLORS) |
3842 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3733 | break; |
3843 | break; |
3734 | |
3844 | |
3735 | if ((buf = strchr (name, ';')) != NULL) |
3845 | if ((buf = strchr (name, ';')) != NULL) |
3736 | *buf++ = '\0'; |
3846 | *buf++ = '\0'; |
3737 | |
3847 | |
3738 | if (name[0] == '?' && !name[1]) |
3848 | if (name[0] == '?' && !name[1]) |
3739 | { |
3849 | { |
3740 | unsigned short r, g, b; |
3850 | unsigned short r, g, b; |
3741 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3851 | pix_colors_focused[color].get (display, r, g, b); |
3742 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3852 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3743 | } |
3853 | } |
3744 | else |
3854 | else |
3745 | set_window_color (color + minCOLOR, name); |
3855 | set_window_color (color, name); |
3746 | } |
3856 | } |
3747 | break; |
3857 | break; |
3748 | case XTerm_Color00: |
3858 | case XTerm_Color00: |
3749 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3859 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3750 | break; |
3860 | break; |
3751 | case XTerm_Color01: |
3861 | case XTerm_Color01: |
3752 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3862 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3753 | break; |
3863 | break; |
3754 | #ifndef NO_CURSORCOLOR |
3864 | #ifndef NO_CURSORCOLOR |
3755 | case XTerm_Color_cursor: |
3865 | case XTerm_Color_cursor: |
3756 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3866 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3757 | break; |
3867 | break; |
… | |
… | |
3761 | break; |
3871 | break; |
3762 | case XTerm_Color_pointer_bg: |
3872 | case XTerm_Color_pointer_bg: |
3763 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3873 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3764 | break; |
3874 | break; |
3765 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3875 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3766 | case XTerm_Color_BD: |
|
|
3767 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3768 | break; |
|
|
3769 | case XTerm_Color_IT: |
|
|
3770 | process_color_seq (XTerm_Color_IT, Color_IT, str, resp); |
|
|
3771 | break; |
|
|
3772 | case XTerm_Color_UL: |
|
|
3773 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3774 | break; |
|
|
3775 | case XTerm_Color_RV: |
3876 | case XTerm_Color_RV: |
3776 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3877 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3777 | break; |
3878 | break; |
|
|
3879 | case Rxvt_Color_BD: |
|
|
3880 | case URxvt_Color_BD: |
|
|
3881 | process_color_seq (op, Color_BD, str, resp); |
|
|
3882 | break; |
|
|
3883 | case Rxvt_Color_UL: |
|
|
3884 | case URxvt_Color_UL: |
|
|
3885 | process_color_seq (op, Color_UL, str, resp); |
|
|
3886 | break; |
|
|
3887 | case URxvt_Color_IT: |
|
|
3888 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
|
|
3889 | break; |
3778 | #endif |
3890 | #endif |
3779 | #if TRANSPARENT && TINTING |
3891 | #if TRANSPARENT && TINTING |
3780 | case XTerm_Color_tint: |
3892 | case URxvt_Color_tint: |
3781 | process_color_seq (XTerm_Color_tint, Color_tint, str, resp); |
3893 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3782 | check_our_parents (); |
3894 | check_our_parents (); |
3783 | if (am_transparent) |
3895 | if (am_transparent) |
3784 | want_full_refresh = want_refresh = 1; |
3896 | want_full_refresh = want_refresh = 1; |
3785 | break; |
3897 | break; |
3786 | #endif |
3898 | #endif |
3787 | |
3899 | |
3788 | case XTerm_Pixmap: |
3900 | case Rxvt_Pixmap: |
|
|
3901 | { |
3789 | if (*str != ';') |
3902 | if (*str != ';') |
3790 | { |
3903 | { |
3791 | #if XPM_BACKGROUND |
3904 | #if XPM_BACKGROUND |
3792 | scale_pixmap (""); /* reset to default scaling */ |
3905 | scale_pixmap (""); /* reset to default scaling */ |
3793 | set_bgPixmap (str); /* change pixmap */ |
3906 | set_bgPixmap (str); /* change pixmap */ |
3794 | #endif |
|
|
3795 | scr_touch (true); |
3907 | scr_touch (true); |
|
|
3908 | #endif |
3796 | } |
3909 | } |
|
|
3910 | |
|
|
3911 | int changed = 0; |
|
|
3912 | |
3797 | while ((str = strchr (str, ';')) != NULL) |
3913 | while ((str = strchr (str, ';')) != NULL) |
3798 | { |
3914 | { |
3799 | str++; |
3915 | str++; |
3800 | #if XPM_BACKGROUND |
3916 | #if XPM_BACKGROUND |
3801 | changed += scale_pixmap (str); |
3917 | changed += scale_pixmap (str); |
3802 | #endif |
3918 | #endif |
3803 | |
|
|
3804 | } |
3919 | } |
|
|
3920 | |
3805 | if (changed) |
3921 | if (changed) |
3806 | { |
3922 | { |
3807 | #ifdef XPM_BACKGROUND |
3923 | #ifdef XPM_BACKGROUND |
3808 | resize_pixmap (); |
3924 | resize_pixmap (); |
3809 | #endif |
|
|
3810 | scr_touch (true); |
3925 | scr_touch (true); |
|
|
3926 | #endif |
3811 | } |
3927 | } |
|
|
3928 | } |
3812 | break; |
3929 | break; |
3813 | |
3930 | |
3814 | case XTerm_restoreFG: |
3931 | case Rxvt_restoreFG: |
3815 | set_window_color (Color_fg, str); |
3932 | set_window_color (Color_fg, str); |
3816 | break; |
3933 | break; |
3817 | case XTerm_restoreBG: |
3934 | case Rxvt_restoreBG: |
3818 | set_window_color (Color_bg, str); |
3935 | set_window_color (Color_bg, str); |
3819 | break; |
3936 | break; |
3820 | |
3937 | |
3821 | case XTerm_logfile: |
3938 | case XTerm_logfile: |
3822 | // TODO, when secure mode? |
3939 | // TODO, when secure mode? |
3823 | break; |
3940 | break; |
3824 | |
3941 | |
|
|
3942 | #if 0 |
|
|
3943 | case Rxvt_dumpscreen: /* no error notices */ |
|
|
3944 | { |
|
|
3945 | int fd; |
|
|
3946 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
|
|
3947 | { |
|
|
3948 | scr_dump (fd); |
|
|
3949 | close (fd); |
|
|
3950 | } |
|
|
3951 | } |
|
|
3952 | break; |
|
|
3953 | #endif |
3825 | case XTerm_font: |
3954 | case XTerm_font: |
3826 | op = URxvt_font; |
3955 | op = URxvt_font; |
3827 | case URxvt_font: |
3956 | case URxvt_font: |
3828 | #if ENABLE_STYLES |
3957 | #if ENABLE_STYLES |
3829 | case URxvt_boldFont: |
3958 | case URxvt_boldFont: |
3830 | case URxvt_italicFont: |
3959 | case URxvt_italicFont: |
3831 | case URxvt_boldItalicFont: |
3960 | case URxvt_boldItalicFont: |
3832 | #endif |
3961 | #endif |
3833 | if (query) |
3962 | if (query) |
3834 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3963 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3835 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3964 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3836 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3965 | ? fontset[op - URxvt_font]->fontdesc : "", |
3837 | resp); |
3966 | resp); |
3838 | else |
3967 | else |
3839 | { |
3968 | { |
3840 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3969 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3841 | |
3970 | |
… | |
… | |
3844 | set_fonts (); |
3973 | set_fonts (); |
3845 | } |
3974 | } |
3846 | break; |
3975 | break; |
3847 | |
3976 | |
3848 | #if ENABLE_FRILLS |
3977 | #if ENABLE_FRILLS |
3849 | case XTerm_locale: |
3978 | case URxvt_locale: |
3850 | if (query) |
3979 | if (query) |
3851 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); |
3980 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3852 | else |
3981 | else |
3853 | { |
3982 | { |
3854 | set_locale (str); |
3983 | set_locale (str); |
3855 | # ifdef USE_XIM |
3984 | pty->set_utf8_mode (enc_utf8); |
3856 | im_cb (); |
3985 | init_xlocale (); |
3857 | # endif |
|
|
3858 | } |
3986 | } |
3859 | break; |
3987 | break; |
3860 | #endif |
|
|
3861 | |
3988 | |
3862 | #ifdef MENUBAR |
3989 | case URxvt_view_up: |
3863 | case XTerm_Menu: |
3990 | case URxvt_view_down: |
3864 | if (options & Opt_insecure) |
3991 | { |
3865 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3992 | int lines = atoi (str); |
|
|
3993 | |
|
|
3994 | if (lines) |
|
|
3995 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
|
|
3996 | else |
|
|
3997 | scr_erase_savelines (); |
|
|
3998 | } |
|
|
3999 | |
3866 | break; |
4000 | break; |
3867 | #endif |
4001 | #endif |
3868 | #if 0 |
4002 | |
3869 | case XTerm_dumpscreen: /* no error notices */ |
4003 | #if ENABLE_PERL |
3870 | { |
4004 | case URxvt_perl: |
3871 | int fd; |
4005 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
3872 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
4006 | ; // no responses yet |
3873 | { |
|
|
3874 | scr_dump (fd); |
|
|
3875 | close (fd); |
|
|
3876 | } |
|
|
3877 | } |
|
|
3878 | break; |
4007 | break; |
3879 | #endif |
4008 | #endif |
3880 | } |
4009 | } |
3881 | } |
4010 | } |
3882 | /*----------------------------------------------------------------------*/ |
4011 | /*----------------------------------------------------------------------*/ |
… | |
… | |
3934 | { 5, PrivMode_rVideo }, |
4063 | { 5, PrivMode_rVideo }, |
3935 | { 6, PrivMode_relOrigin }, |
4064 | { 6, PrivMode_relOrigin }, |
3936 | { 7, PrivMode_Autowrap }, |
4065 | { 7, PrivMode_Autowrap }, |
3937 | // 8, bi-directional support mode |
4066 | // 8, bi-directional support mode |
3938 | { 9, PrivMode_MouseX10 }, |
4067 | { 9, PrivMode_MouseX10 }, |
3939 | #ifdef menuBar_esc |
|
|
3940 | { menuBar_esc, PrivMode_menuBar }, |
|
|
3941 | #endif |
|
|
3942 | // 18, 19 printing-related |
4068 | // 18, 19 printing-related |
3943 | { 25, PrivMode_VisibleCursor }, |
4069 | { 25, PrivMode_VisibleCursor }, |
3944 | #ifdef scrollBar_esc |
4070 | #ifdef scrollBar_esc |
3945 | { scrollBar_esc, PrivMode_scrollBar }, |
4071 | { scrollBar_esc, PrivMode_scrollBar }, |
3946 | #endif |
4072 | #endif |
… | |
… | |
3991 | } |
4117 | } |
3992 | |
4118 | |
3993 | /* extra handling for values with state unkept */ |
4119 | /* extra handling for values with state unkept */ |
3994 | switch (arg[i]) |
4120 | switch (arg[i]) |
3995 | { |
4121 | { |
|
|
4122 | #if ENABLE_STYLES |
|
|
4123 | case 1021: |
|
|
4124 | set_option (Opt_intensityStyles, mode); |
|
|
4125 | |
|
|
4126 | scr_touch (true); |
|
|
4127 | break; |
|
|
4128 | #endif |
3996 | case 1048: /* alternative cursor save */ |
4129 | case 1048: /* alternative cursor save */ |
3997 | case 1049: |
4130 | case 1049: |
3998 | if (options & Opt_secondaryScreen) |
4131 | if (OPTION (Opt_secondaryScreen)) |
3999 | if (mode == 0) |
4132 | if (mode == 0) |
4000 | scr_cursor (RESTORE); |
4133 | scr_cursor (RESTORE); |
4001 | else if (mode == 1) |
4134 | else if (mode == 1) |
4002 | scr_cursor (SAVE); |
4135 | scr_cursor (SAVE); |
4003 | break; |
4136 | break; |
… | |
… | |
4015 | */ |
4148 | */ |
4016 | PrivMode (1, PrivMode_vt52); |
4149 | PrivMode (1, PrivMode_vt52); |
4017 | break; |
4150 | break; |
4018 | case 3: /* 80/132 */ |
4151 | case 3: /* 80/132 */ |
4019 | if (priv_modes & PrivMode_132OK) |
4152 | if (priv_modes & PrivMode_132OK) |
4020 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4153 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4021 | break; |
4154 | break; |
4022 | case 4: /* smooth scrolling */ |
4155 | case 4: /* smooth scrolling */ |
4023 | if (state) |
|
|
4024 | options &= ~Opt_jumpScroll; |
|
|
4025 | else |
|
|
4026 | options |= Opt_jumpScroll; |
4156 | set_option (Opt_jumpScroll, !state); |
4027 | break; |
4157 | break; |
4028 | case 5: /* reverse video */ |
4158 | case 5: /* reverse video */ |
4029 | scr_rvideo_mode (state); |
4159 | scr_rvideo_mode (state); |
4030 | break; |
4160 | break; |
4031 | case 6: /* relative/absolute origins */ |
4161 | case 6: /* relative/absolute origins */ |
… | |
… | |
4037 | /* case 8: - auto repeat, can't do on a per window basis */ |
4167 | /* case 8: - auto repeat, can't do on a per window basis */ |
4038 | case 9: /* X10 mouse reporting */ |
4168 | case 9: /* X10 mouse reporting */ |
4039 | if (state) /* orthogonal */ |
4169 | if (state) /* orthogonal */ |
4040 | priv_modes &= ~PrivMode_MouseX11; |
4170 | priv_modes &= ~PrivMode_MouseX11; |
4041 | break; |
4171 | break; |
4042 | #ifdef menuBar_esc |
|
|
4043 | case menuBar_esc: |
|
|
4044 | #ifdef MENUBAR |
|
|
4045 | map_menuBar (state); |
|
|
4046 | #endif |
|
|
4047 | break; |
|
|
4048 | #endif |
|
|
4049 | #ifdef scrollBar_esc |
4172 | #ifdef scrollBar_esc |
4050 | case scrollBar_esc: |
4173 | case scrollBar_esc: |
4051 | if (scrollbar_mapping (state)) |
4174 | if (scrollbar_mapping (state)) |
4052 | { |
4175 | { |
4053 | resize_all_windows (0, 0, 0); |
4176 | resize_all_windows (0, 0, 0); |
… | |
… | |
4072 | #if 0 |
4195 | #if 0 |
4073 | case 1001: |
4196 | case 1001: |
4074 | break; /* X11 mouse highlighting */ |
4197 | break; /* X11 mouse highlighting */ |
4075 | #endif |
4198 | #endif |
4076 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4199 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4077 | if (state) |
|
|
4078 | options &= ~Opt_scrollTtyOutput; |
|
|
4079 | else |
|
|
4080 | options |= Opt_scrollTtyOutput; |
4200 | set_option (Opt_scrollTtyOutput, !state); |
4081 | break; |
4201 | break; |
4082 | case 1011: /* scroll to bottom on key press */ |
4202 | case 1011: /* scroll to bottom on key press */ |
4083 | if (state) |
|
|
4084 | options |= Opt_scrollTtyKeypress; |
4203 | set_option (Opt_scrollTtyKeypress, state); |
4085 | else |
|
|
4086 | options &= ~Opt_scrollTtyKeypress; |
|
|
4087 | break; |
4204 | break; |
4088 | case 1047: /* secondary screen w/ clearing last */ |
4205 | case 1047: /* secondary screen w/ clearing last */ |
4089 | if (options & Opt_secondaryScreen) |
4206 | if (OPTION (Opt_secondaryScreen)) |
4090 | if (current_screen != PRIMARY) |
4207 | if (current_screen != PRIMARY) |
4091 | scr_erase_screen (2); |
4208 | scr_erase_screen (2); |
4092 | scr_change_screen (state); |
4209 | scr_change_screen (state); |
4093 | break; |
4210 | break; |
4094 | case 1049: /* secondary screen w/ clearing first */ |
4211 | case 1049: /* secondary screen w/ clearing first */ |
4095 | scr_change_screen (state); |
4212 | scr_change_screen (state); |
4096 | if (options & Opt_secondaryScreen) |
4213 | if (OPTION (Opt_secondaryScreen)) |
4097 | if (current_screen != PRIMARY) |
4214 | if (current_screen != PRIMARY) |
4098 | scr_erase_screen (2); |
4215 | scr_erase_screen (2); |
4099 | break; |
4216 | break; |
4100 | default: |
4217 | default: |
4101 | break; |
4218 | break; |
… | |
… | |
4229 | scr_color (Color_bg, Color_bg); |
4346 | scr_color (Color_bg, Color_bg); |
4230 | break; |
4347 | break; |
4231 | |
4348 | |
4232 | //case 50: // not variable spacing |
4349 | //case 50: // not variable spacing |
4233 | |
4350 | |
4234 | #ifndef NO_BRIGHTCOLOR |
4351 | #if ENABLE_FRILLS |
4235 | case 90: |
4352 | case 90: |
4236 | case 91: /* set bright fg color */ |
4353 | case 91: /* set bright fg color */ |
4237 | case 92: |
4354 | case 92: |
4238 | case 93: |
4355 | case 93: |
4239 | case 94: |
4356 | case 94: |
… | |
… | |
4251 | case 106: |
4368 | case 106: |
4252 | case 107: |
4369 | case 107: |
4253 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4370 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4254 | break; |
4371 | break; |
4255 | #endif |
4372 | #endif |
4256 | |
|
|
4257 | } |
4373 | } |
4258 | } |
4374 | } |
4259 | } |
4375 | } |
4260 | /*}}} */ |
4376 | /*}}} */ |
4261 | |
4377 | |
… | |
… | |
4285 | */ |
4401 | */ |
4286 | void |
4402 | void |
4287 | rxvt_term::tt_printf (const char *fmt,...) |
4403 | rxvt_term::tt_printf (const char *fmt,...) |
4288 | { |
4404 | { |
4289 | va_list arg_ptr; |
4405 | va_list arg_ptr; |
4290 | unsigned char buf[256]; |
4406 | char buf[256]; |
4291 | |
4407 | |
4292 | va_start (arg_ptr, fmt); |
4408 | va_start (arg_ptr, fmt); |
4293 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4409 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4294 | va_end (arg_ptr); |
4410 | va_end (arg_ptr); |
4295 | tt_write (buf, strlen (buf)); |
4411 | tt_write (buf, strlen (buf)); |
… | |
… | |
4300 | * or generated by us in response to a query ESC sequence. |
4416 | * or generated by us in response to a query ESC sequence. |
4301 | */ |
4417 | */ |
4302 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4418 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4303 | |
4419 | |
4304 | void |
4420 | void |
4305 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4421 | rxvt_term::tt_write (const char *data, unsigned int len) |
4306 | { |
4422 | { |
|
|
4423 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4424 | return; |
|
|
4425 | |
|
|
4426 | if (pty->pty < 0) |
|
|
4427 | return; |
|
|
4428 | |
4307 | if (v_buflen == 0) |
4429 | if (v_buflen == 0) |
4308 | { |
4430 | { |
4309 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4431 | ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); |
4310 | |
4432 | |
4311 | if ((unsigned int)written == len) |
4433 | if ((unsigned int)written == len) |
4312 | return; |
4434 | return; |
4313 | |
4435 | |
4314 | data += written; |
4436 | data += written; |
4315 | len -= written; |
4437 | len -= written; |
4316 | } |
4438 | } |
4317 | |
4439 | |
4318 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4440 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4319 | |
4441 | |
4320 | memcpy (v_buffer + v_buflen, data, len); |
4442 | memcpy (v_buffer + v_buflen, data, len); |
4321 | v_buflen += len; |
4443 | v_buflen += len; |
4322 | |
4444 | |
4323 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4445 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4324 | } |
4446 | } |
4325 | |
4447 | |
4326 | void rxvt_term::pty_write () |
4448 | void rxvt_term::pty_write () |
4327 | { |
4449 | { |
4328 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4450 | int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
4329 | |
4451 | |
4330 | if (written > 0) |
4452 | if (written > 0) |
4331 | { |
4453 | { |
4332 | v_buflen -= written; |
4454 | v_buflen -= written; |
4333 | |
4455 | |
… | |
… | |
4342 | } |
4464 | } |
4343 | |
4465 | |
4344 | memmove (v_buffer, v_buffer + written, v_buflen); |
4466 | memmove (v_buffer, v_buffer + written, v_buflen); |
4345 | } |
4467 | } |
4346 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4468 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
4347 | // original code just ignores this... |
4469 | pty_ev.set (EVENT_READ); |
4348 | destroy (); |
|
|
4349 | } |
4470 | } |
4350 | |
4471 | |
4351 | /*----------------------- end-of-file (C source) -----------------------*/ |
4472 | /*----------------------- end-of-file (C source) -----------------------*/ |
4352 | |
4473 | |