… | |
… | |
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-2005 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. |
… | |
… | |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" /* NECESSARY */ |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" /* NECESSARY */ |
50 | #include "version.h" |
50 | #include "version.h" |
51 | #include "command.h" |
51 | #include "command.h" |
52 | |
52 | |
53 | #include <wchar.h> |
53 | #ifdef KEYSYM_RESOURCE |
|
|
54 | # include "keyboard.h" |
|
|
55 | #endif |
|
|
56 | |
|
|
57 | #include <csignal> |
54 | |
58 | |
55 | /*----------------------------------------------------------------------*/ |
59 | /*----------------------------------------------------------------------*/ |
56 | |
60 | |
57 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
61 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
58 | |
62 | |
… | |
… | |
113 | XK_Escape, 0x238b, |
117 | XK_Escape, 0x238b, |
114 | XK_Undo, 0x238c, |
118 | XK_Undo, 0x238c, |
115 | XK_Print, 0x2399, |
119 | XK_Print, 0x2399, |
116 | |
120 | |
117 | XK_space, 0x2423, |
121 | XK_space, 0x2423, |
|
|
122 | |
|
|
123 | #ifdef XK_KP_Begin |
|
|
124 | XK_KP_Prior, 0x21de, |
|
|
125 | XK_KP_Next, 0x21df, |
|
|
126 | XK_KP_Begin, 0x2320, |
|
|
127 | XK_KP_Insert, 0x2380, |
|
|
128 | XK_KP_Delete, 0x2326, |
118 | XK_KP_Space, 0x2422, |
129 | XK_KP_Space, 0x2422, |
|
|
130 | #endif |
119 | 0, |
131 | 0, |
120 | }; |
132 | }; |
121 | |
133 | |
122 | void |
134 | void |
123 | rxvt_term::iso14755_54 (int x, int y) |
135 | rxvt_term::iso14755_54 (int x, int y) |
124 | { |
136 | { |
125 | x = Pixel2Col (x); |
137 | x = Pixel2Col (x); |
126 | y = Pixel2Row (y); |
138 | y = Pixel2Row (y); |
127 | |
139 | |
128 | if (x < 0 || x >= TermWin.ncol |
140 | if (!IN_RANGE_EXC (x, 0, ncol) |
129 | || y < 0 || y >= TermWin.nrow) |
141 | || !IN_RANGE_EXC (y, 0, nrow)) |
130 | return; |
142 | return; |
131 | |
143 | |
132 | for (;;) |
144 | for (;;) |
133 | { |
145 | { |
134 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
146 | const line_t &l = ROW(y - view_start); |
|
|
147 | |
|
|
148 | text_t t = l.t[x]; |
135 | |
149 | |
136 | if (t != NOCHAR || !x) |
150 | if (t != NOCHAR || !x) |
137 | { |
151 | { |
138 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
152 | iso14755_51 (l.t[x], l.r[x], x, y); |
139 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
140 | iso14755buf = ISO_14755_54; |
153 | iso14755buf = ISO_14755_54; |
141 | break; |
154 | break; |
142 | } |
155 | } |
143 | |
156 | |
144 | x--; |
157 | x--; |
145 | } |
158 | } |
146 | |
|
|
147 | } |
159 | } |
148 | #endif |
|
|
149 | |
160 | |
150 | #if ENABLE_OVERLAY |
|
|
151 | void |
161 | void |
152 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
162 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) |
153 | { |
163 | { |
154 | rxvt_fontset *fs = FONTSET (r); |
164 | rxvt_fontset *fs = FONTSET (r); |
155 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
165 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
156 | wchar_t *chr, *alloc, ch2; |
166 | wchar_t *chr, *alloc, ch2, *fname; |
157 | int len; |
167 | int len; |
158 | |
168 | |
|
|
169 | fname = rxvt_utf8towcs (f->name); |
|
|
170 | |
159 | #if ENABLE_COMBINING |
171 | # if ENABLE_COMBINING |
160 | if (IS_COMPOSE (ch)) |
172 | if (IS_COMPOSE (ch)) |
161 | { |
173 | { |
162 | len = rxvt_composite.expand (ch, 0); |
174 | len = rxvt_composite.expand (ch, 0); |
163 | alloc = chr = new wchar_t[len]; |
175 | alloc = chr = new wchar_t[len]; |
164 | rxvt_composite.expand (ch, chr); |
176 | rxvt_composite.expand (ch, chr); |
165 | } |
177 | } |
166 | else |
178 | else |
167 | #endif |
179 | # endif |
168 | { |
180 | { |
169 | ch2 = ch; |
181 | ch2 = ch; |
170 | |
182 | |
171 | alloc = 0; |
183 | alloc = 0; |
172 | chr = &ch2; |
184 | chr = &ch2; |
173 | len = 1; |
185 | len = 1; |
174 | } |
186 | } |
175 | |
187 | |
176 | int width = strlen (f->name); |
188 | char attr[80]; // plenty |
177 | |
189 | |
178 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
190 | sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", |
|
|
191 | (int)r, |
|
|
192 | fgcolor_of (r), bgcolor_of (r), |
|
|
193 | r & RS_Bold ? " bold" : "", |
|
|
194 | r & RS_Italic ? " italic" : "", |
|
|
195 | r & RS_Blink ? " blink" : "", |
|
|
196 | r & RS_RVid ? " rvid" : "", |
|
|
197 | r & RS_Uline ? " uline" : "", |
|
|
198 | r & RS_Careful ? " careful" : ""); |
|
|
199 | |
|
|
200 | int width = wcswidth (fname, wcslen (fname)); |
|
|
201 | |
|
|
202 | max_it (width, 8+5); // for char + hey |
|
|
203 | max_it (width, strlen (attr)); |
|
|
204 | |
|
|
205 | if (y >= 0) |
|
|
206 | { |
|
|
207 | y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; |
|
|
208 | x = 0; |
|
|
209 | } |
|
|
210 | |
|
|
211 | scr_overlay_new (x, y, width, len + 2); |
179 | |
212 | |
180 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
213 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
181 | |
214 | |
182 | for (int y = 0; y < len; y++) |
215 | for (int y = 0; y < len; y++) |
183 | { |
216 | { |
… | |
… | |
186 | ch = *chr++; |
219 | ch = *chr++; |
187 | |
220 | |
188 | sprintf (buf, "%8x", ch); |
221 | sprintf (buf, "%8x", ch); |
189 | scr_overlay_set (0, y, buf); |
222 | scr_overlay_set (0, y, buf); |
190 | scr_overlay_set (9, y, '='); |
223 | scr_overlay_set (9, y, '='); |
191 | #if !UNICODE3 |
224 | # if !UNICODE3 |
192 | if (ch >= 0x10000) |
225 | if (ch >= 0x10000) |
193 | ch = 0xfffd; |
226 | ch = 0xfffd; |
194 | #endif |
227 | # endif |
195 | scr_overlay_set (11, y, ch, r); |
228 | scr_overlay_set (11, y, ch, r); |
196 | scr_overlay_set (12, y, NOCHAR, r); |
229 | scr_overlay_set (12, y, NOCHAR, r); |
197 | } |
230 | } |
198 | |
231 | |
|
|
232 | scr_overlay_set (0, len , attr); |
199 | scr_overlay_set (0, len, f->name); |
233 | scr_overlay_set (0, len + 1, fname); |
200 | |
234 | |
|
|
235 | free (fname); |
|
|
236 | |
201 | #if ENABLE_COMBINING |
237 | # if ENABLE_COMBINING |
202 | if (alloc) |
238 | if (alloc) |
203 | delete [] alloc; |
239 | delete [] alloc; |
204 | #endif |
240 | # endif |
205 | } |
241 | } |
206 | #endif |
242 | #endif |
207 | |
243 | |
208 | void |
244 | void |
209 | rxvt_term::commit_iso14755 () |
245 | rxvt_term::commit_iso14755 () |
… | |
… | |
272 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
308 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
273 | * escape sequence to toggle the Keypad. |
309 | * escape sequence to toggle the Keypad. |
274 | * |
310 | * |
275 | * Always permit `shift' to override the current setting |
311 | * Always permit `shift' to override the current setting |
276 | */ |
312 | */ |
277 | shft = (ev.state & ShiftMask); |
313 | shft = ev.state & ShiftMask; |
278 | ctrl = (ev.state & ControlMask); |
314 | ctrl = ev.state & ControlMask; |
279 | meta = (ev.state & ModMetaMask); |
315 | meta = ev.state & ModMetaMask; |
280 | |
316 | |
281 | if (numlock_state || (ev.state & ModNumLockMask)) |
317 | if (numlock_state || (ev.state & ModNumLockMask)) |
282 | { |
318 | { |
283 | numlock_state = (ev.state & ModNumLockMask); |
319 | numlock_state = (ev.state & ModNumLockMask); |
284 | PrivMode ((!numlock_state), PrivMode_aplKP); |
320 | PrivMode ((!numlock_state), PrivMode_aplKP); |
… | |
… | |
304 | |
340 | |
305 | // the XOpenIM manpage lies about hardcoding the locale |
341 | // the XOpenIM manpage lies about hardcoding the locale |
306 | // at the point of XOpenIM, so temporarily switch locales |
342 | // at the point of XOpenIM, so temporarily switch locales |
307 | if (rs[Rs_imLocale]) |
343 | if (rs[Rs_imLocale]) |
308 | SET_LOCALE (rs[Rs_imLocale]); |
344 | SET_LOCALE (rs[Rs_imLocale]); |
|
|
345 | |
309 | // assume wchar_t == unicode or better |
346 | // assume wchar_t == unicode or better |
310 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
347 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
311 | KBUFSZ, &keysym, &status_return); |
348 | KBUFSZ, &keysym, &status_return); |
|
|
349 | |
312 | if (rs[Rs_imLocale]) |
350 | if (rs[Rs_imLocale]) |
313 | SET_LOCALE (locale); |
351 | SET_LOCALE (locale); |
314 | |
352 | |
315 | if (status_return == XLookupChars |
353 | if (status_return == XLookupChars |
316 | || status_return == XLookupBoth) |
354 | || status_return == XLookupBoth) |
… | |
… | |
343 | valid_keysym = keysym != NoSymbol; |
381 | valid_keysym = keysym != NoSymbol; |
344 | } |
382 | } |
345 | |
383 | |
346 | if (valid_keysym) |
384 | if (valid_keysym) |
347 | { |
385 | { |
|
|
386 | #ifdef KEYSYM_RESOURCE |
|
|
387 | if (keyboard->dispatch (this, keysym, ev.state)) |
|
|
388 | return; |
|
|
389 | #endif |
|
|
390 | |
348 | if (TermWin.saveLines) |
391 | if (saveLines) |
349 | { |
392 | { |
350 | #ifdef UNSHIFTED_SCROLLKEYS |
393 | #ifdef UNSHIFTED_SCROLLKEYS |
351 | if (!ctrl && !meta) |
394 | if (!ctrl && !meta) |
352 | #else |
395 | #else |
353 | if (IS_SCROLL_MOD) |
396 | if (IS_SCROLL_MOD) |
354 | #endif |
397 | #endif |
355 | { |
398 | { |
356 | int lnsppg; |
399 | int lnsppg; |
357 | |
400 | |
358 | #ifdef PAGING_CONTEXT_LINES |
401 | #ifdef PAGING_CONTEXT_LINES |
359 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
402 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
360 | #else |
403 | #else |
361 | lnsppg = TermWin.nrow * 4 / 5; |
404 | lnsppg = nrow * 4 / 5; |
362 | #endif |
405 | #endif |
363 | if (keysym == XK_Prior) |
406 | if (keysym == XK_Prior) |
364 | { |
407 | { |
365 | scr_page (UP, lnsppg); |
408 | scr_page (UP, lnsppg); |
366 | return; |
409 | return; |
… | |
… | |
417 | { |
460 | { |
418 | /* normal XTerm key bindings */ |
461 | /* normal XTerm key bindings */ |
419 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
462 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
420 | selection_request (ev.time, 0, 0); |
463 | selection_request (ev.time, 0, 0); |
421 | return; |
464 | return; |
422 | #if TODO // TODO |
465 | #if TODO |
423 | /* rxvt extras */ |
466 | /* rxvt extras */ |
424 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
467 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
425 | change_font (FONT_UP); |
468 | change_font (FONT_UP); |
426 | return; |
469 | return; |
427 | case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ |
470 | case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ |
… | |
… | |
486 | } |
529 | } |
487 | #endif |
530 | #endif |
488 | |
531 | |
489 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
532 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
490 | { |
533 | { |
491 | #ifdef KEYSYM_RESOURCE |
|
|
492 | if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) |
|
|
493 | { |
|
|
494 | unsigned int l; |
|
|
495 | const unsigned char *kbuf0; |
|
|
496 | |
|
|
497 | kbuf0 = (Keysym_map[keysym & 0xFF]); |
|
|
498 | l = (unsigned int)*kbuf0++; |
|
|
499 | |
|
|
500 | /* escape prefix */ |
|
|
501 | if (meta |
|
|
502 | # ifdef META8_OPTION |
|
|
503 | && meta_char == C0_ESC |
|
|
504 | # endif |
|
|
505 | ) |
|
|
506 | { |
|
|
507 | const unsigned char ch = C0_ESC; |
|
|
508 | tt_write (&ch, 1); |
|
|
509 | } |
|
|
510 | |
|
|
511 | tt_write (kbuf0, l); |
|
|
512 | return; |
|
|
513 | } |
|
|
514 | else |
|
|
515 | #endif |
|
|
516 | { |
534 | { |
517 | newlen = 1; |
535 | newlen = 1; |
518 | switch (keysym) |
536 | switch (keysym) |
519 | { |
537 | { |
520 | #ifndef NO_BACKSPACE_KEY |
538 | #ifndef NO_BACKSPACE_KEY |
… | |
… | |
528 | else |
546 | else |
529 | strcpy (kbuf, key_backspace); |
547 | strcpy (kbuf, key_backspace); |
530 | break; |
548 | break; |
531 | #endif |
549 | #endif |
532 | #ifndef NO_DELETE_KEY |
550 | #ifndef NO_DELETE_KEY |
|
|
551 | # ifdef XK_KP_Prior |
|
|
552 | case XK_KP_Delete: |
|
|
553 | /* allow shift to override */ |
|
|
554 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
555 | { |
|
|
556 | strcpy (kbuf, "\033On"); |
|
|
557 | break; |
|
|
558 | } |
|
|
559 | /* FALLTHROUGH */ |
|
|
560 | # endif |
533 | case XK_Delete: |
561 | case XK_Delete: |
534 | strcpy (kbuf, key_delete); |
562 | strcpy (kbuf, key_delete); |
535 | break; |
563 | break; |
536 | #endif |
564 | #endif |
537 | case XK_Tab: |
565 | case XK_Tab: |
… | |
… | |
640 | #ifdef XK_KP_Begin |
668 | #ifdef XK_KP_Begin |
641 | case XK_KP_Begin: |
669 | case XK_KP_Begin: |
642 | strcpy (kbuf, "\033Ou"); |
670 | strcpy (kbuf, "\033Ou"); |
643 | break; |
671 | break; |
644 | |
672 | |
645 | case XK_KP_Insert: |
|
|
646 | strcpy (kbuf, "\033Op"); |
|
|
647 | break; |
|
|
648 | |
|
|
649 | case XK_KP_Delete: |
|
|
650 | strcpy (kbuf, "\033On"); |
|
|
651 | break; |
|
|
652 | #endif |
673 | #endif |
653 | case XK_KP_F1: /* "\033OP" */ |
674 | case XK_KP_F1: /* "\033OP" */ |
654 | case XK_KP_F2: /* "\033OQ" */ |
675 | case XK_KP_F2: /* "\033OQ" */ |
655 | case XK_KP_F3: /* "\033OR" */ |
676 | case XK_KP_F3: /* "\033OR" */ |
656 | case XK_KP_F4: /* "\033OS" */ |
677 | case XK_KP_F4: /* "\033OS" */ |
… | |
… | |
688 | break; |
709 | break; |
689 | |
710 | |
690 | case XK_Find: |
711 | case XK_Find: |
691 | strcpy (kbuf, "\033[1~"); |
712 | strcpy (kbuf, "\033[1~"); |
692 | break; |
713 | break; |
|
|
714 | |
|
|
715 | #ifdef XK_KP_End |
|
|
716 | case XK_KP_Insert: |
|
|
717 | /* allow shift to override */ |
|
|
718 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
719 | { |
|
|
720 | strcpy (kbuf, "\033Op"); |
|
|
721 | break; |
|
|
722 | } |
|
|
723 | /* FALLTHROUGH */ |
|
|
724 | #endif |
693 | case XK_Insert: |
725 | case XK_Insert: |
694 | strcpy (kbuf, "\033[2~"); |
726 | strcpy (kbuf, "\033[2~"); |
695 | break; |
727 | break; |
696 | #ifdef DXK_Remove /* support for DEC remove like key */ |
728 | #ifdef DXK_Remove /* support for DEC remove like key */ |
697 | case DXK_Remove: |
729 | case DXK_Remove: |
… | |
… | |
787 | #undef FKEY |
819 | #undef FKEY |
788 | default: |
820 | default: |
789 | newlen = 0; |
821 | newlen = 0; |
790 | break; |
822 | break; |
791 | } |
823 | } |
|
|
824 | |
792 | if (newlen) |
825 | if (newlen) |
793 | len = strlen (kbuf); |
826 | len = strlen (kbuf); |
794 | } |
827 | } |
795 | |
828 | |
796 | /* |
829 | /* |
… | |
… | |
805 | else if (ctrl && keysym == XK_minus) |
838 | else if (ctrl && keysym == XK_minus) |
806 | { |
839 | { |
807 | len = 1; |
840 | len = 1; |
808 | kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ |
841 | kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ |
809 | } |
842 | } |
|
|
843 | else if (keysym == XK_ISO_Left_Tab) |
|
|
844 | { |
|
|
845 | strcpy (kbuf, "\033[Z"); |
|
|
846 | len = 3; |
|
|
847 | } |
810 | else |
848 | else |
811 | { |
849 | { |
812 | #ifdef META8_OPTION |
850 | #ifdef META8_OPTION |
813 | /* set 8-bit on */ |
851 | /* set 8-bit on */ |
814 | if (meta && (meta_char == 0x80)) |
852 | if (meta && (meta_char == 0x80)) |
… | |
… | |
826 | } |
864 | } |
827 | |
865 | |
828 | if (len <= 0) |
866 | if (len <= 0) |
829 | return; /* not mapped */ |
867 | return; /* not mapped */ |
830 | |
868 | |
831 | if (options & Opt_scrollTtyKeypress) |
869 | if (OPTION (Opt_scrollTtyKeypress)) |
832 | if (TermWin.view_start) |
870 | if (view_start) |
833 | { |
871 | { |
834 | TermWin.view_start = 0; |
872 | view_start = 0; |
835 | want_refresh = 1; |
873 | want_refresh = 1; |
836 | } |
874 | } |
837 | |
875 | |
838 | /* |
876 | /* |
839 | * these modifications only affect the static keybuffer |
877 | * these modifications only affect the static keybuffer |
… | |
… | |
872 | #endif /* DEBUG_CMD */ |
910 | #endif /* DEBUG_CMD */ |
873 | tt_write (kbuf, (unsigned int)len); |
911 | tt_write (kbuf, (unsigned int)len); |
874 | } |
912 | } |
875 | /*}}} */ |
913 | /*}}} */ |
876 | |
914 | |
877 | #if (MENUBAR_MAX) |
915 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
878 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
916 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
879 | /* attempt to `write' count to the input buffer */ |
917 | /* attempt to `write' count to the input buffer */ |
880 | unsigned int |
918 | unsigned int |
881 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
919 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
882 | { |
920 | { |
… | |
… | |
905 | |
943 | |
906 | cmd_parse (); |
944 | cmd_parse (); |
907 | |
945 | |
908 | return 0; |
946 | return 0; |
909 | } |
947 | } |
910 | #endif /* MENUBAR_MAX */ |
948 | #endif |
911 | |
949 | |
912 | void |
950 | void |
913 | rxvt_term::flush () |
951 | rxvt_term::flush () |
914 | { |
952 | { |
|
|
953 | flush_ev.stop (); |
|
|
954 | |
915 | #ifdef TRANSPARENT |
955 | #ifdef TRANSPARENT |
916 | if (want_full_refresh) |
956 | if (want_full_refresh) |
917 | { |
957 | { |
918 | want_full_refresh = 0; |
958 | want_full_refresh = 0; |
919 | scr_clear (); |
959 | scr_clear (); |
… | |
… | |
929 | IMSendSpot (); |
969 | IMSendSpot (); |
930 | #endif |
970 | #endif |
931 | } |
971 | } |
932 | |
972 | |
933 | display->flush (); |
973 | display->flush (); |
934 | |
|
|
935 | flush_ev.stop (); |
|
|
936 | } |
974 | } |
937 | |
975 | |
938 | void |
976 | void |
939 | rxvt_term::check_cb (check_watcher &w) |
977 | rxvt_term::check_cb (check_watcher &w) |
940 | { |
978 | { |
… | |
… | |
1016 | { |
1054 | { |
1017 | if (mouse_slip_wheel_speed == 0 |
1055 | if (mouse_slip_wheel_speed == 0 |
1018 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1056 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1019 | : scr_page (UP, mouse_slip_wheel_speed)) |
1057 | : scr_page (UP, mouse_slip_wheel_speed)) |
1020 | { |
1058 | { |
|
|
1059 | if (view_start == nsaved || |
|
|
1060 | view_start == 0) |
|
|
1061 | mouse_slip_wheel_speed = 0; |
|
|
1062 | |
1021 | refresh_type |= SMOOTH_REFRESH; |
1063 | refresh_type |= SMOOTH_REFRESH; |
1022 | want_refresh = 1; |
1064 | want_refresh = 1; |
1023 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1065 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1024 | } |
1066 | } |
1025 | } |
1067 | } |
… | |
… | |
1045 | if (n > 0) |
1087 | if (n > 0) |
1046 | { |
1088 | { |
1047 | cmdbuf_endp += n; |
1089 | cmdbuf_endp += n; |
1048 | return true; |
1090 | return true; |
1049 | } |
1091 | } |
1050 | else if (n < 0 && errno != EAGAIN) |
1092 | else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) |
|
|
1093 | { |
|
|
1094 | pty_ev.stop (); |
|
|
1095 | |
|
|
1096 | if (!OPTION (Opt_hold)) |
1051 | destroy (); |
1097 | destroy (); |
|
|
1098 | } |
1052 | |
1099 | |
1053 | return false; |
1100 | return false; |
1054 | } |
1101 | } |
1055 | |
1102 | |
1056 | void |
1103 | void |
1057 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1104 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1058 | { |
1105 | { |
1059 | SET_R (this); |
1106 | SET_R (this); |
1060 | SET_LOCALE (locale); |
1107 | SET_LOCALE (locale); |
1061 | |
1108 | |
1062 | if (revents & EVENT_WRITE) |
|
|
1063 | tt_write (0, 0); |
|
|
1064 | else if (revents & EVENT_READ) |
1109 | if (revents & EVENT_READ) |
1065 | // loop, but don't allow a single term to monopolize us |
1110 | // loop, but don't allow a single term to monopolize us |
1066 | while (pty_fill ()) |
1111 | while (pty_fill ()) |
1067 | if (cmd_parse ()) |
1112 | if (cmd_parse ()) |
1068 | break; |
1113 | break; |
|
|
1114 | |
|
|
1115 | if (revents & EVENT_WRITE) |
|
|
1116 | pty_write (); |
1069 | } |
1117 | } |
1070 | |
1118 | |
1071 | void |
1119 | void |
1072 | rxvt_term::pointer_unblank () |
1120 | rxvt_term::pointer_unblank () |
1073 | { |
1121 | { |
1074 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1122 | XDefineCursor (display->display, vt, TermWin_cursor); |
1075 | recolour_cursor (); |
1123 | recolour_cursor (); |
1076 | |
1124 | |
1077 | #ifdef POINTER_BLANK |
1125 | #ifdef POINTER_BLANK |
1078 | hidden_pointer = 0; |
1126 | hidden_pointer = 0; |
1079 | |
1127 | |
1080 | if (options & Opt_pointerBlank) |
1128 | if (OPTION (Opt_pointerBlank)) |
1081 | pointer_ev.start (NOW + pointerBlankDelay); |
1129 | pointer_ev.start (NOW + pointerBlankDelay); |
1082 | #endif |
1130 | #endif |
1083 | } |
1131 | } |
1084 | |
1132 | |
1085 | #ifdef POINTER_BLANK |
1133 | #ifdef POINTER_BLANK |
1086 | void |
1134 | void |
1087 | rxvt_term::pointer_blank () |
1135 | rxvt_term::pointer_blank () |
1088 | { |
1136 | { |
1089 | if (! (options & Opt_pointerBlank)) |
1137 | if (! OPTION (Opt_pointerBlank)) |
1090 | return; |
1138 | return; |
1091 | |
1139 | |
1092 | XDefineCursor (display->display, TermWin.vt, blank_cursor); |
1140 | XDefineCursor (display->display, vt, display->blank_cursor); |
1093 | XFlush (display->display); |
1141 | XFlush (display->display); |
1094 | |
1142 | |
1095 | hidden_pointer = 1; |
1143 | hidden_pointer = 1; |
1096 | } |
1144 | } |
1097 | |
1145 | |
… | |
… | |
1186 | |
1234 | |
1187 | /*{{{ process an X event */ |
1235 | /*{{{ process an X event */ |
1188 | void |
1236 | void |
1189 | rxvt_term::x_cb (XEvent &ev) |
1237 | rxvt_term::x_cb (XEvent &ev) |
1190 | { |
1238 | { |
|
|
1239 | dDisp; |
|
|
1240 | |
1191 | SET_R (this); |
1241 | SET_R (this); |
1192 | SET_LOCALE (locale); |
1242 | SET_LOCALE (locale); |
1193 | |
1243 | |
1194 | #if defined(CURSOR_BLINK) |
1244 | #if defined(CURSOR_BLINK) |
1195 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
1245 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1196 | { |
1246 | { |
1197 | if (hidden_cursor) |
1247 | if (hidden_cursor) |
1198 | { |
1248 | { |
1199 | hidden_cursor = 0; |
1249 | hidden_cursor = 0; |
1200 | want_refresh = 1; |
1250 | want_refresh = 1; |
… | |
… | |
1203 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1253 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1204 | } |
1254 | } |
1205 | #endif |
1255 | #endif |
1206 | |
1256 | |
1207 | #if defined(POINTER_BLANK) |
1257 | #if defined(POINTER_BLANK) |
1208 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
1258 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
1209 | { |
1259 | { |
1210 | if (ev.type == MotionNotify |
1260 | if (ev.type == MotionNotify |
1211 | || ev.type == ButtonPress |
1261 | || ev.type == ButtonPress |
1212 | || ev.type == ButtonRelease) |
1262 | || ev.type == ButtonRelease) |
1213 | if (hidden_pointer) |
1263 | if (hidden_pointer) |
… | |
… | |
1216 | if (ev.type == KeyPress && hidden_pointer == 0) |
1266 | if (ev.type == KeyPress && hidden_pointer == 0) |
1217 | pointer_blank (); |
1267 | pointer_blank (); |
1218 | } |
1268 | } |
1219 | #endif |
1269 | #endif |
1220 | |
1270 | |
1221 | #ifdef USE_XIM |
|
|
1222 | if (XFilterEvent (&ev, None)) |
|
|
1223 | return; |
|
|
1224 | #endif |
|
|
1225 | |
|
|
1226 | Window unused_root, unused_child; |
1271 | Window unused_root, unused_child; |
1227 | int unused_root_x, unused_root_y; |
1272 | int unused_root_x, unused_root_y; |
1228 | unsigned int unused_mask; |
1273 | unsigned int unused_mask; |
1229 | |
1274 | |
1230 | switch (ev.type) |
1275 | switch (ev.type) |
1231 | { |
1276 | { |
1232 | case KeyPress: |
1277 | case KeyPress: |
1233 | #if ISO_14755 |
1278 | #if ISO_14755 |
… | |
… | |
1316 | button_release (ev.xbutton); |
1361 | button_release (ev.xbutton); |
1317 | break; |
1362 | break; |
1318 | |
1363 | |
1319 | case ClientMessage: |
1364 | case ClientMessage: |
1320 | if (ev.xclient.format == 32 |
1365 | if (ev.xclient.format == 32 |
|
|
1366 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1367 | { |
1321 | && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) |
1368 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1322 | destroy (); |
1369 | destroy (); |
|
|
1370 | #if ENABLE_EWMH |
|
|
1371 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
|
|
1372 | XSendEvent (disp, ev.xclient.window = display->root, |
|
|
1373 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
|
|
1374 | &ev); |
|
|
1375 | #endif |
|
|
1376 | } |
|
|
1377 | #if ENABLE_XEMBED |
|
|
1378 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1379 | { |
|
|
1380 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1381 | focus_in (); |
|
|
1382 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1383 | focus_out (); |
|
|
1384 | } |
|
|
1385 | #endif |
1323 | #ifdef OFFIX_DND |
1386 | #ifdef OFFIX_DND |
1324 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1387 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1325 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1388 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1326 | && (ev.xclient.data.l[0] == DndFile |
1389 | && (ev.xclient.data.l[0] == DndFile |
1327 | || ev.xclient.data.l[0] == DndDir |
1390 | || ev.xclient.data.l[0] == DndDir |
1328 | || ev.xclient.data.l[0] == DndLink)) |
1391 | || ev.xclient.data.l[0] == DndLink)) |
1329 | { |
1392 | { |
1330 | /* Get Dnd data */ |
1393 | /* Get Dnd data */ |
1331 | Atom ActualType; |
1394 | Atom ActualType; |
1332 | int ActualFormat; |
1395 | int ActualFormat; |
1333 | unsigned char *data; |
1396 | unsigned char *data; |
1334 | unsigned long Size, RemainingBytes; |
1397 | unsigned long Size, RemainingBytes; |
1335 | |
1398 | |
1336 | XGetWindowProperty (display->display, display->root, |
1399 | XGetWindowProperty (disp, display->root, |
1337 | xa[XA_DNDSELECTION], |
1400 | xa[XA_DNDSELECTION], |
1338 | 0L, 1000000L, |
1401 | 0L, 1000000L, |
1339 | False, AnyPropertyType, |
1402 | False, AnyPropertyType, |
1340 | &ActualType, &ActualFormat, |
1403 | &ActualType, &ActualFormat, |
1341 | &Size, &RemainingBytes, |
1404 | &Size, &RemainingBytes, |
1342 | &data); |
1405 | &data); |
1343 | XChangeProperty (display->display, display->root, |
1406 | set_string_property (XA_CUT_BUFFER0, data); |
1344 | XA_CUT_BUFFER0, XA_STRING, |
|
|
1345 | 8, PropModeReplace, |
|
|
1346 | data, strlen (data)); |
|
|
1347 | XFree (data); |
1407 | XFree (data); |
1348 | selection_paste (display->root, XA_CUT_BUFFER0, True); |
1408 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
1349 | XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); |
1409 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
1350 | } |
1410 | } |
1351 | #endif /* OFFIX_DND */ |
1411 | #endif /* OFFIX_DND */ |
1352 | break; |
1412 | break; |
1353 | |
1413 | |
1354 | case MappingNotify: |
1414 | case MappingNotify: |
… | |
… | |
1379 | break; |
1439 | break; |
1380 | } |
1440 | } |
1381 | break; |
1441 | break; |
1382 | |
1442 | |
1383 | case FocusIn: |
1443 | case FocusIn: |
1384 | if (!TermWin.focus) |
1444 | focus_in (); |
|
|
1445 | break; |
|
|
1446 | |
|
|
1447 | case FocusOut: |
|
|
1448 | focus_out (); |
|
|
1449 | break; |
|
|
1450 | |
|
|
1451 | case ConfigureNotify: |
|
|
1452 | if (ev.xconfigure.window == parent[0]) |
1385 | { |
1453 | { |
1386 | TermWin.focus = 1; |
|
|
1387 | want_refresh = 1; |
|
|
1388 | #ifdef USE_XIM |
|
|
1389 | if (Input_Context != NULL) |
|
|
1390 | { |
|
|
1391 | IMSetStatusPosition (); |
|
|
1392 | XSetICFocus (Input_Context); |
|
|
1393 | } |
|
|
1394 | #endif |
|
|
1395 | #ifdef CURSOR_BLINK |
|
|
1396 | if (options & Opt_cursorBlink) |
|
|
1397 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1398 | #endif |
|
|
1399 | #ifdef OFF_FOCUS_FADING |
|
|
1400 | if (rs[Rs_fade]) |
|
|
1401 | { |
|
|
1402 | pix_colors = pix_colors_focused; |
|
|
1403 | scr_recolour (); |
|
|
1404 | } |
|
|
1405 | #endif |
|
|
1406 | |
|
|
1407 | } |
|
|
1408 | break; |
|
|
1409 | |
|
|
1410 | case FocusOut: |
|
|
1411 | if (TermWin.focus) |
|
|
1412 | { |
|
|
1413 | TermWin.focus = 0; |
|
|
1414 | want_refresh = 1; |
|
|
1415 | |
|
|
1416 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1417 | iso14755buf = 0; |
|
|
1418 | #endif |
|
|
1419 | #if ENABLE_OVERLAY |
|
|
1420 | scr_overlay_off (); |
|
|
1421 | #endif |
|
|
1422 | #ifdef USE_XIM |
|
|
1423 | if (Input_Context != NULL) |
|
|
1424 | XUnsetICFocus (Input_Context); |
|
|
1425 | #endif |
|
|
1426 | #ifdef CURSOR_BLINK |
|
|
1427 | if (options & Opt_cursorBlink) |
|
|
1428 | cursor_blink_ev.stop (); |
|
|
1429 | hidden_cursor = 0; |
|
|
1430 | #endif |
|
|
1431 | #ifdef OFF_FOCUS_FADING |
|
|
1432 | if (rs[Rs_fade]) |
|
|
1433 | { |
|
|
1434 | pix_colors = pix_colors_unfocused; |
|
|
1435 | scr_recolour (); |
|
|
1436 | } |
|
|
1437 | #endif |
|
|
1438 | } |
|
|
1439 | break; |
|
|
1440 | |
|
|
1441 | case ConfigureNotify: |
|
|
1442 | if (ev.xconfigure.window == TermWin.parent[0]) |
|
|
1443 | { |
|
|
1444 | int height, width; |
|
|
1445 | |
|
|
1446 | do |
|
|
1447 | { /* Wrap lots of configures into one */ |
|
|
1448 | width = ev.xconfigure.width; |
|
|
1449 | height = ev.xconfigure.height; |
|
|
1450 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
|
|
1451 | } |
|
|
1452 | while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); |
1454 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1455 | ; |
1453 | |
1456 | |
1454 | if (szHint.width != width || szHint.height != height) |
1457 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1455 | { |
1458 | { |
1456 | seen_resize = 1; |
1459 | seen_resize = 1; |
1457 | resize_all_windows (width, height, 1); |
1460 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1458 | } |
1461 | } |
1459 | |
1462 | |
1460 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1463 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1461 | if (options & Opt_transparent) |
1464 | if (OPTION (Opt_transparent)) |
1462 | { |
|
|
1463 | check_our_parents (); |
1465 | check_our_parents (); |
1464 | if (am_transparent) |
|
|
1465 | want_refresh = want_full_refresh = 1; |
|
|
1466 | } |
|
|
1467 | #endif |
1466 | #endif |
1468 | } |
1467 | } |
1469 | break; |
1468 | break; |
1470 | |
1469 | |
1471 | case PropertyNotify: |
1470 | case PropertyNotify: |
… | |
… | |
1479 | selection_clear (); |
1478 | selection_clear (); |
1480 | break; |
1479 | break; |
1481 | |
1480 | |
1482 | case SelectionNotify: |
1481 | case SelectionNotify: |
1483 | if (selection_wait == Sel_normal) |
1482 | if (selection_wait == Sel_normal) |
1484 | selection_paste (ev.xselection.requestor, |
1483 | selection_paste (ev.xselection.requestor, ev.xselection.property, true); |
1485 | ev.xselection.property, True); |
|
|
1486 | break; |
1484 | break; |
1487 | |
1485 | |
1488 | case SelectionRequest: |
1486 | case SelectionRequest: |
1489 | selection_send (ev.xselectionrequest); |
1487 | selection_send (ev.xselectionrequest); |
1490 | break; |
1488 | break; |
1491 | |
1489 | |
1492 | case UnmapNotify: |
1490 | case UnmapNotify: |
1493 | TermWin.mapped = 0; |
1491 | mapped = 0; |
1494 | #ifdef TEXT_BLINK |
1492 | #ifdef TEXT_BLINK |
1495 | text_blink_ev.stop (); |
1493 | text_blink_ev.stop (); |
1496 | #endif |
1494 | #endif |
1497 | break; |
1495 | break; |
1498 | |
1496 | |
1499 | case MapNotify: |
1497 | case MapNotify: |
1500 | TermWin.mapped = 1; |
1498 | mapped = 1; |
1501 | #ifdef TEXT_BLINK |
1499 | #ifdef TEXT_BLINK |
1502 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
1500 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
1503 | #endif |
1501 | #endif |
1504 | break; |
1502 | break; |
1505 | |
1503 | |
… | |
… | |
1509 | break; |
1507 | break; |
1510 | #endif /* TRANSPARENT */ |
1508 | #endif /* TRANSPARENT */ |
1511 | |
1509 | |
1512 | case GraphicsExpose: |
1510 | case GraphicsExpose: |
1513 | case Expose: |
1511 | case Expose: |
1514 | if (ev.xany.window == TermWin.vt) |
1512 | if (ev.xany.window == vt) |
1515 | { |
1513 | { |
1516 | do |
1514 | do |
1517 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1515 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1518 | ev.xexpose.width, ev.xexpose.height, False); |
1516 | ev.xexpose.width, ev.xexpose.height, False); |
1519 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); |
1517 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1520 | |
1518 | |
1521 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1519 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1522 | |
1520 | |
1523 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) |
1521 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1524 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1522 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1525 | ev.xexpose.width, ev.xexpose.height, False); |
1523 | ev.xexpose.width, ev.xexpose.height, False); |
1526 | |
1524 | |
1527 | scr_refresh (refresh_type); |
1525 | scr_refresh (refresh_type); |
1528 | } |
1526 | } |
1529 | else |
1527 | else |
1530 | { |
1528 | { |
1531 | XEvent unused_event; |
1529 | XEvent unused_event; |
1532 | |
1530 | |
1533 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) |
1531 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1534 | ; |
1532 | ; |
1535 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) |
1533 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1536 | ; |
1534 | ; |
1537 | |
1535 | |
1538 | if (isScrollbarWindow (ev.xany.window)) |
1536 | if (isScrollbarWindow (ev.xany.window)) |
1539 | { |
1537 | { |
1540 | scrollBar.setIdle (); |
1538 | scrollBar.setIdle (); |
… | |
… | |
1544 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1542 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1545 | menubar_expose (); |
1543 | menubar_expose (); |
1546 | #endif |
1544 | #endif |
1547 | |
1545 | |
1548 | #ifdef TRANSPARENT |
1546 | #ifdef TRANSPARENT |
1549 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1547 | if (am_transparent && ev.xany.window == parent[0]) |
1550 | XClearWindow (display->display, ev.xany.window); |
1548 | XClearWindow (disp, ev.xany.window); |
1551 | #endif |
1549 | #endif |
1552 | } |
1550 | } |
1553 | break; |
1551 | break; |
1554 | |
1552 | |
1555 | case MotionNotify: |
1553 | case MotionNotify: |
… | |
… | |
1562 | { |
1560 | { |
1563 | menubar_control (ev.xbutton); |
1561 | menubar_control (ev.xbutton); |
1564 | break; |
1562 | break; |
1565 | } |
1563 | } |
1566 | #endif |
1564 | #endif |
1567 | if ((priv_modes & PrivMode_mouse_report) && ! (bypass_keystate)) |
1565 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1568 | break; |
1566 | break; |
1569 | |
1567 | |
1570 | if (ev.xany.window == TermWin.vt) |
1568 | if (ev.xany.window == vt) |
1571 | { |
1569 | { |
1572 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1570 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1573 | { |
1571 | { |
1574 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) |
1572 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1575 | ; |
1573 | ; |
1576 | |
1574 | |
1577 | XQueryPointer (display->display, TermWin.vt, |
1575 | XQueryPointer (disp, vt, |
1578 | &unused_root, &unused_child, |
1576 | &unused_root, &unused_child, |
1579 | &unused_root_x, &unused_root_y, |
1577 | &unused_root_x, &unused_root_y, |
1580 | & (ev.xbutton.x), & (ev.xbutton.y), |
1578 | &ev.xbutton.x, &ev.xbutton.y, |
1581 | &unused_mask); |
1579 | &ev.xbutton.state); |
1582 | #ifdef MOUSE_THRESHOLD |
1580 | #ifdef MOUSE_THRESHOLD |
1583 | /* deal with a `jumpy' mouse */ |
1581 | /* deal with a `jumpy' mouse */ |
1584 | if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) |
1582 | if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) |
1585 | { |
1583 | { |
1586 | #endif |
1584 | #endif |
… | |
… | |
1591 | iso14755_54 (ev.xbutton.x, ev.xbutton.y); |
1589 | iso14755_54 (ev.xbutton.x, ev.xbutton.y); |
1592 | break; |
1590 | break; |
1593 | } |
1591 | } |
1594 | #endif |
1592 | #endif |
1595 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1593 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1596 | (ev.xbutton.state & Button3Mask) ? 2 : 0); |
1594 | ev.xbutton.state & Button3Mask ? 2 : 0); |
|
|
1595 | |
1597 | #ifdef SELECTION_SCROLLING |
1596 | #ifdef SELECTION_SCROLLING |
1598 | if (ev.xbutton.y < TermWin.int_bwidth |
1597 | if (ev.xbutton.y < int_bwidth |
1599 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1598 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1600 | { |
1599 | { |
1601 | int dist; |
1600 | int dist; |
1602 | |
1601 | |
1603 | /* don't clobber the current delay if we are |
1602 | /* don't clobber the current delay if we are |
1604 | * already in the middle of scrolling. |
1603 | * already in the middle of scrolling. |
… | |
… | |
1612 | selection_save_x = ev.xbutton.x; |
1611 | selection_save_x = ev.xbutton.x; |
1613 | selection_save_y = ev.xbutton.y; |
1612 | selection_save_y = ev.xbutton.y; |
1614 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1613 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1615 | |
1614 | |
1616 | /* calc number of lines to scroll */ |
1615 | /* calc number of lines to scroll */ |
1617 | if (ev.xbutton.y<TermWin.int_bwidth) |
1616 | if (ev.xbutton.y < int_bwidth) |
1618 | { |
1617 | { |
1619 | scroll_selection_dir = UP; |
1618 | scroll_selection_dir = UP; |
1620 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1619 | dist = int_bwidth - ev.xbutton.y; |
1621 | } |
1620 | } |
1622 | else |
1621 | else |
1623 | { |
1622 | { |
1624 | scroll_selection_dir = DN; |
1623 | scroll_selection_dir = DN; |
1625 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1624 | dist = ev.xbutton.y - (int_bwidth + height); |
1626 | } |
1625 | } |
1627 | |
1626 | |
1628 | scroll_selection_lines = Pixel2Height (dist) |
1627 | scroll_selection_lines = Pixel2Height (dist) |
1629 | / SELECTION_SCROLL_LINE_SPEEDUP |
1628 | / SELECTION_SCROLL_LINE_SPEEDUP |
1630 | + 1; |
1629 | + 1; |
1631 | MIN_IT (scroll_selection_lines, |
1630 | min_it (scroll_selection_lines, |
1632 | SELECTION_SCROLL_MAX_LINES); |
1631 | SELECTION_SCROLL_MAX_LINES); |
1633 | } |
1632 | } |
1634 | else |
1633 | else |
1635 | { |
1634 | { |
1636 | /* we are within the text window, so we |
1635 | /* we are within the text window, so we |
… | |
… | |
1645 | #endif |
1644 | #endif |
1646 | } |
1645 | } |
1647 | } |
1646 | } |
1648 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1647 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1649 | { |
1648 | { |
1650 | while (XCheckTypedWindowEvent (display->display, scrollBar.win, |
1649 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1651 | MotionNotify, &ev)) ; |
1650 | MotionNotify, &ev)) |
|
|
1651 | ; |
|
|
1652 | |
1652 | XQueryPointer (display->display, scrollBar.win, |
1653 | XQueryPointer (disp, scrollBar.win, |
1653 | &unused_root, &unused_child, |
1654 | &unused_root, &unused_child, |
1654 | &unused_root_x, &unused_root_y, |
1655 | &unused_root_x, &unused_root_y, |
1655 | & (ev.xbutton.x), & (ev.xbutton.y), |
1656 | &ev.xbutton.x, &ev.xbutton.y, |
1656 | &unused_mask); |
1657 | &unused_mask); |
1657 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1658 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1658 | scrollbar_size ()); |
1659 | scrollbar_size ()); |
1659 | scr_refresh (refresh_type); |
1660 | scr_refresh (refresh_type); |
1660 | refresh_limit = 0; |
1661 | refresh_limit = 0; |
… | |
… | |
1662 | } |
1663 | } |
1663 | break; |
1664 | break; |
1664 | } |
1665 | } |
1665 | } |
1666 | } |
1666 | |
1667 | |
|
|
1668 | void |
|
|
1669 | rxvt_term::focus_in () |
|
|
1670 | { |
|
|
1671 | if (!focus) |
|
|
1672 | { |
|
|
1673 | focus = 1; |
|
|
1674 | want_refresh = 1; |
|
|
1675 | #if USE_XIM |
|
|
1676 | if (Input_Context != NULL) |
|
|
1677 | { |
|
|
1678 | IMSetStatusPosition (); |
|
|
1679 | XSetICFocus (Input_Context); |
|
|
1680 | } |
|
|
1681 | #endif |
|
|
1682 | #if CURSOR_BLINK |
|
|
1683 | if (OPTION (Opt_cursorBlink)) |
|
|
1684 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1685 | #endif |
|
|
1686 | #if OFF_FOCUS_FADING |
|
|
1687 | if (rs[Rs_fade]) |
|
|
1688 | { |
|
|
1689 | pix_colors = pix_colors_focused; |
|
|
1690 | scr_recolour (); |
|
|
1691 | } |
|
|
1692 | #endif |
|
|
1693 | } |
|
|
1694 | } |
|
|
1695 | |
|
|
1696 | void |
|
|
1697 | rxvt_term::focus_out () |
|
|
1698 | { |
|
|
1699 | if (focus) |
|
|
1700 | { |
|
|
1701 | focus = 0; |
|
|
1702 | want_refresh = 1; |
|
|
1703 | |
|
|
1704 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1705 | iso14755buf = 0; |
|
|
1706 | #endif |
|
|
1707 | #if ENABLE_OVERLAY |
|
|
1708 | scr_overlay_off (); |
|
|
1709 | #endif |
|
|
1710 | #if USE_XIM |
|
|
1711 | if (Input_Context != NULL) |
|
|
1712 | XUnsetICFocus (Input_Context); |
|
|
1713 | #endif |
|
|
1714 | #if CURSOR_BLINK |
|
|
1715 | if (OPTION (Opt_cursorBlink)) |
|
|
1716 | cursor_blink_ev.stop (); |
|
|
1717 | hidden_cursor = 0; |
|
|
1718 | #endif |
|
|
1719 | #if OFF_FOCUS_FADING |
|
|
1720 | if (rs[Rs_fade]) |
|
|
1721 | { |
|
|
1722 | pix_colors = pix_colors_unfocused; |
|
|
1723 | scr_recolour (); |
|
|
1724 | } |
|
|
1725 | #endif |
|
|
1726 | } |
|
|
1727 | } |
|
|
1728 | |
1667 | #if TRANSPARENT |
1729 | #if TRANSPARENT |
1668 | void |
1730 | void |
1669 | rxvt_term::rootwin_cb (XEvent &ev) |
1731 | rxvt_term::rootwin_cb (XEvent &ev) |
1670 | { |
1732 | { |
1671 | SET_R (this); |
1733 | SET_R (this); |
… | |
… | |
1676 | case PropertyNotify: |
1738 | case PropertyNotify: |
1677 | /* |
1739 | /* |
1678 | * if user used some Esetroot compatible prog to set the root bg, |
1740 | * if user used some Esetroot compatible prog to set the root bg, |
1679 | * use the property to determine the pixmap. We use it later on. |
1741 | * use the property to determine the pixmap. We use it later on. |
1680 | */ |
1742 | */ |
1681 | if (xa[XA_XROOTPMAPID] == 0) |
|
|
1682 | xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); |
|
|
1683 | |
|
|
1684 | if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) |
1743 | if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] |
|
|
1744 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1685 | return; |
1745 | return; |
1686 | |
1746 | |
1687 | /* FALLTHROUGH */ |
1747 | /* FALLTHROUGH */ |
1688 | case ReparentNotify: |
1748 | case ReparentNotify: |
1689 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1749 | if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) |
1690 | want_refresh = want_full_refresh = 1; |
1750 | want_refresh = want_full_refresh = 1; |
1691 | break; |
1751 | break; |
1692 | } |
1752 | } |
1693 | } |
1753 | } |
1694 | #endif |
1754 | #endif |
… | |
… | |
1703 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1763 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1704 | |
1764 | |
1705 | /* |
1765 | /* |
1706 | * VT window processing of button press |
1766 | * VT window processing of button press |
1707 | */ |
1767 | */ |
1708 | if (ev.window == TermWin.vt) |
1768 | if (ev.window == vt) |
1709 | { |
1769 | { |
1710 | #if ISO_14755 |
1770 | #if ISO_14755 |
1711 | // 5.4 |
1771 | // 5.4 |
1712 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1772 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1713 | { |
1773 | { |
… | |
… | |
1715 | return; |
1775 | return; |
1716 | } |
1776 | } |
1717 | #endif |
1777 | #endif |
1718 | |
1778 | |
1719 | clickintime = ev.time - MEvent.time < MULTICLICK_TIME; |
1779 | clickintime = ev.time - MEvent.time < MULTICLICK_TIME; |
|
|
1780 | |
1720 | if (reportmode) |
1781 | if (reportmode) |
1721 | { |
1782 | { |
1722 | /* mouse report from vt window */ |
1783 | /* mouse report from vt window */ |
1723 | /* save the xbutton state (for ButtonRelease) */ |
1784 | /* save the xbutton state (for ButtonRelease) */ |
1724 | MEvent.state = ev.state; |
1785 | MEvent.state = ev.state; |
… | |
… | |
1753 | } |
1814 | } |
1754 | else |
1815 | else |
1755 | { |
1816 | { |
1756 | if (ev.button != MEvent.button) |
1817 | if (ev.button != MEvent.button) |
1757 | MEvent.clicks = 0; |
1818 | MEvent.clicks = 0; |
|
|
1819 | |
1758 | switch (ev.button) |
1820 | switch (ev.button) |
1759 | { |
1821 | { |
1760 | case Button1: |
1822 | case Button1: |
|
|
1823 | /* allow meta + click to select rectangular areas */ |
|
|
1824 | /* should be done in screen.C */ |
|
|
1825 | #if ENABLE_FRILLS |
|
|
1826 | selection.rect = !!(ev.state & ModMetaMask); |
|
|
1827 | #else |
|
|
1828 | selection.rect = false; |
|
|
1829 | #endif |
|
|
1830 | |
1761 | /* allow shift+left click to extend selection */ |
1831 | /* allow shift+left click to extend selection */ |
1762 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1832 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1763 | { |
1833 | { |
1764 | if (MEvent.button == Button1 && clickintime) |
1834 | if (MEvent.button == Button1 && clickintime) |
1765 | selection_rotate (ev.x, ev.y); |
1835 | selection_rotate (ev.x, ev.y); |
… | |
… | |
1908 | case Button3: |
1978 | case Button3: |
1909 | if (scrollBar.style != R_SB_XTERM) |
1979 | if (scrollBar.style != R_SB_XTERM) |
1910 | { |
1980 | { |
1911 | if (scrollbar_above_slider (ev.y)) |
1981 | if (scrollbar_above_slider (ev.y)) |
1912 | # ifdef RXVT_SCROLL_FULL |
1982 | # ifdef RXVT_SCROLL_FULL |
1913 | scr_page (UP, TermWin.nrow - 1); |
1983 | scr_page (UP, nrow - 1); |
1914 | # else |
1984 | # else |
1915 | scr_page (UP, TermWin.nrow / 4); |
1985 | scr_page (UP, nrow / 4); |
1916 | # endif |
1986 | # endif |
1917 | else if (scrollbar_below_slider (ev.y)) |
1987 | else if (scrollbar_below_slider (ev.y)) |
1918 | # ifdef RXVT_SCROLL_FULL |
1988 | # ifdef RXVT_SCROLL_FULL |
1919 | scr_page (DN, TermWin.nrow - 1); |
1989 | scr_page (DN, nrow - 1); |
1920 | # else |
1990 | # else |
1921 | scr_page (DN, TermWin.nrow / 4); |
1991 | scr_page (DN, nrow / 4); |
1922 | # endif |
1992 | # endif |
1923 | else |
1993 | else |
1924 | scrollBar.setMotion (); |
1994 | scrollBar.setMotion (); |
1925 | } |
1995 | } |
1926 | else |
1996 | else |
1927 | { |
1997 | { |
1928 | scr_page ((ev.button == Button1 ? DN : UP), |
1998 | scr_page ((ev.button == Button1 ? DN : UP), |
1929 | (TermWin.nrow |
1999 | (nrow |
1930 | * scrollbar_position (ev.y) |
2000 | * scrollbar_position (ev.y) |
1931 | / scrollbar_size ())); |
2001 | / scrollbar_size ())); |
1932 | } |
2002 | } |
1933 | |
2003 | |
1934 | break; |
2004 | break; |
… | |
… | |
1966 | #ifdef SELECTION_SCROLLING |
2036 | #ifdef SELECTION_SCROLLING |
1967 | if (sel_scroll_ev.active) |
2037 | if (sel_scroll_ev.active) |
1968 | sel_scroll_ev.stop(); |
2038 | sel_scroll_ev.stop(); |
1969 | #endif |
2039 | #endif |
1970 | |
2040 | |
1971 | if (ev.window == TermWin.vt) |
2041 | if (ev.window == vt) |
1972 | { |
2042 | { |
1973 | #if ISO_14755 |
2043 | #if ISO_14755 |
1974 | // 5.4 |
2044 | // 5.4 |
1975 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2045 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1976 | return; |
2046 | return; |
… | |
… | |
2026 | |
2096 | |
2027 | v = ev.button == Button4 ? UP : DN; |
2097 | v = ev.button == Button4 ? UP : DN; |
2028 | |
2098 | |
2029 | if (ev.state & ShiftMask) |
2099 | if (ev.state & ShiftMask) |
2030 | i = 1; |
2100 | i = 1; |
2031 | else if (options & Opt_mouseWheelScrollPage) |
2101 | else if (OPTION (Opt_mouseWheelScrollPage)) |
2032 | i = TermWin.nrow - 1; |
2102 | i = nrow - 1; |
2033 | else |
2103 | else |
2034 | i = 5; |
2104 | i = 5; |
2035 | |
2105 | |
2036 | # ifdef MOUSE_SLIP_WHEELING |
2106 | # ifdef MOUSE_SLIP_WHEELING |
2037 | if (ev.state & ControlMask) |
2107 | if (ev.state & ControlMask) |
2038 | { |
2108 | { |
2039 | mouse_slip_wheel_speed += v ? -1 : 1; |
2109 | mouse_slip_wheel_speed += v ? -1 : 1; |
2040 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2110 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2041 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2111 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2042 | |
2112 | |
2043 | if (slip_wheel_ev.at < NOW) |
2113 | if (slip_wheel_ev.at < NOW) |
2044 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2114 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2045 | |
2115 | |
2046 | slip_wheel_ev.start (); |
2116 | slip_wheel_ev.start (); |
… | |
… | |
2087 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2157 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2088 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2158 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2089 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2159 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2090 | int i; |
2160 | int i; |
2091 | |
2161 | |
2092 | Visual* visual = display->visual; |
2162 | Visual *visual = display->visual; |
2093 | |
2163 | |
2094 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2164 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2095 | |
2165 | |
2096 | /* for convenience */ |
2166 | /* for convenience */ |
2097 | mask_r = visual->red_mask; |
2167 | mask_r = visual->red_mask; |
… | |
… | |
2318 | Atom atype; |
2388 | Atom atype; |
2319 | unsigned char *prop = NULL; |
2389 | unsigned char *prop = NULL; |
2320 | Window root, oldp, *list; |
2390 | Window root, oldp, *list; |
2321 | Pixmap rootpixmap = None; |
2391 | Pixmap rootpixmap = None; |
2322 | XWindowAttributes wattr, wrootattr; |
2392 | XWindowAttributes wattr, wrootattr; |
|
|
2393 | dDisp; |
2323 | |
2394 | |
2324 | pchanged = 0; |
2395 | pchanged = 0; |
2325 | |
2396 | |
2326 | if (!(options & Opt_transparent)) |
2397 | if (!OPTION (Opt_transparent)) |
2327 | return pchanged; /* Don't try any more */ |
2398 | return pchanged; /* Don't try any more */ |
2328 | |
2399 | |
2329 | XGetWindowAttributes (display->display, display->root, &wrootattr); |
2400 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2330 | rootdepth = wrootattr.depth; |
2401 | rootdepth = wrootattr.depth; |
2331 | |
2402 | |
2332 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
2403 | XGetWindowAttributes (disp, parent[0], &wattr); |
2333 | |
2404 | |
2334 | if (rootdepth != wattr.depth) |
2405 | if (rootdepth != wattr.depth) |
2335 | { |
2406 | { |
2336 | if (am_transparent) |
2407 | if (am_transparent) |
2337 | { |
2408 | { |
2338 | pchanged = 1; |
2409 | pchanged = 1; |
2339 | XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); |
2410 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2340 | am_transparent = am_pixmap_trans = 0; |
2411 | am_transparent = am_pixmap_trans = 0; |
2341 | } |
2412 | } |
2342 | |
2413 | |
2343 | return pchanged; /* Don't try any more */ |
2414 | return pchanged; /* Don't try any more */ |
2344 | } |
2415 | } |
2345 | |
2416 | |
2346 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2417 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2347 | XSync (display->display, False); |
2418 | XSync (disp, False); |
2348 | |
2419 | |
2349 | /* |
2420 | /* |
2350 | * Make the frame window set by the window manager have |
2421 | * Make the frame window set by the window manager have |
2351 | * the root background. Some window managers put multiple nested frame |
2422 | * the root background. Some window managers put multiple nested frame |
2352 | * windows for each client, so we have to take care about that. |
2423 | * windows for each client, so we have to take care about that. |
2353 | */ |
2424 | */ |
2354 | i = (xa[XA_XROOTPMAPID] |
2425 | i = (xa[XA_XROOTPMAP_ID] |
2355 | && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], |
2426 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2356 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2427 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2357 | &nitems, &bytes_after, &prop) == Success); |
2428 | &nitems, &bytes_after, &prop) == Success); |
2358 | |
2429 | |
2359 | if (!i || prop == NULL) |
2430 | if (!i || prop == NULL) |
2360 | i = (xa[XA_XSETROOTID] |
2431 | i = (xa[XA_ESETROOT_PMAP_ID] |
2361 | && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], |
2432 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2362 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2433 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2363 | &nitems, &bytes_after, &prop) == Success); |
2434 | &nitems, &bytes_after, &prop) == Success); |
2364 | |
2435 | |
2365 | if (!i || prop == NULL |
2436 | if (!i || prop == NULL |
2366 | #if TINTING |
2437 | #if TINTING |
… | |
… | |
2385 | Window cr; |
2456 | Window cr; |
2386 | XImage *image; |
2457 | XImage *image; |
2387 | GC gc; |
2458 | GC gc; |
2388 | XGCValues gcvalue; |
2459 | XGCValues gcvalue; |
2389 | |
2460 | |
2390 | XTranslateCoordinates (display->display, TermWin.parent[0], display->root, |
2461 | XTranslateCoordinates (disp, parent[0], display->root, |
2391 | 0, 0, &sx, &sy, &cr); |
2462 | 0, 0, &sx, &sy, &cr); |
2392 | nw = (unsigned int)szHint.width; |
2463 | nw = (unsigned int)szHint.width; |
2393 | nh = (unsigned int)szHint.height; |
2464 | nh = (unsigned int)szHint.height; |
2394 | nx = ny = 0; |
2465 | nx = ny = 0; |
2395 | |
2466 | |
… | |
… | |
2405 | nh += sy; |
2476 | nh += sy; |
2406 | ny = -sy; |
2477 | ny = -sy; |
2407 | sy = 0; |
2478 | sy = 0; |
2408 | } |
2479 | } |
2409 | |
2480 | |
2410 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2481 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2411 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2482 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
|
|
2483 | |
|
|
2484 | XSync (disp, False); |
2412 | allowedxerror = -1; |
2485 | allowedxerror = -1; |
2413 | image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2486 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2414 | |
2487 | |
2415 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2488 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2416 | /* XXX: may need a delay here? */ |
2489 | /* XXX: may need a delay here? */ |
2417 | allowedxerror = 0; |
2490 | allowedxerror = 0; |
2418 | |
2491 | |
2419 | if (image == NULL) |
2492 | if (image == NULL) |
2420 | { |
2493 | { |
2421 | if (am_transparent && am_pixmap_trans) |
2494 | if (am_transparent && am_pixmap_trans) |
2422 | { |
2495 | { |
2423 | pchanged = 1; |
2496 | pchanged = 1; |
2424 | if (TermWin.pixmap != None) |
2497 | if (pixmap != None) |
2425 | { |
2498 | { |
2426 | XFreePixmap (display->display, TermWin.pixmap); |
2499 | XFreePixmap (disp, pixmap); |
2427 | TermWin.pixmap = None; |
2500 | pixmap = None; |
2428 | } |
2501 | } |
2429 | } |
2502 | } |
2430 | |
2503 | |
2431 | am_pixmap_trans = 0; |
2504 | am_pixmap_trans = 0; |
2432 | } |
2505 | } |
2433 | else |
2506 | else |
2434 | { |
2507 | { |
2435 | if (TermWin.pixmap != None) |
2508 | if (pixmap != None) |
2436 | XFreePixmap (display->display, TermWin.pixmap); |
2509 | XFreePixmap (disp, pixmap); |
2437 | |
2510 | |
2438 | #if TINTING |
2511 | #if TINTING |
2439 | if (ISSET_PIXCOLOR (Color_tint)) |
2512 | if (ISSET_PIXCOLOR (Color_tint)) |
2440 | { |
2513 | { |
2441 | unsigned short rm, gm, bm; |
2514 | unsigned short rm, gm, bm; |
… | |
… | |
2445 | |
2518 | |
2446 | ShadeXImage (display, image, shade, rm, gm, bm); |
2519 | ShadeXImage (display, image, shade, rm, gm, bm); |
2447 | } |
2520 | } |
2448 | #endif |
2521 | #endif |
2449 | |
2522 | |
2450 | TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, |
2523 | pixmap = XCreatePixmap (disp, vt, |
2451 | szHint.width, szHint.height, image->depth); |
2524 | szHint.width, szHint.height, image->depth); |
2452 | gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); |
2525 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2453 | XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, |
2526 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2454 | nx, ny, image->width, image->height); |
2527 | nx, ny, image->width, image->height); |
2455 | XFreeGC (display->display, gc); |
2528 | XFreeGC (disp, gc); |
2456 | XDestroyImage (image); |
2529 | XDestroyImage (image); |
2457 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); |
2530 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2458 | XClearWindow (display->display, TermWin.parent[0]); |
2531 | XClearWindow (disp, parent[0]); |
2459 | |
2532 | |
2460 | if (!am_transparent || !am_pixmap_trans) |
2533 | if (!am_transparent || !am_pixmap_trans) |
2461 | pchanged = 1; |
2534 | pchanged = 1; |
2462 | |
2535 | |
2463 | am_transparent = am_pixmap_trans = 1; |
2536 | am_transparent = am_pixmap_trans = 1; |
2464 | } |
2537 | } |
2465 | } |
2538 | } |
2466 | |
2539 | |
2467 | if (!am_pixmap_trans) |
2540 | if (am_pixmap_trans) |
|
|
2541 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
|
|
2542 | else |
2468 | { |
2543 | { |
2469 | unsigned int n; |
2544 | unsigned int n; |
2470 | /* |
2545 | /* |
2471 | * InheritPixmap transparency |
2546 | * InheritPixmap transparency |
2472 | */ |
2547 | */ |
2473 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2548 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2474 | { |
2549 | { |
2475 | oldp = TermWin.parent[i]; |
2550 | oldp = parent[i]; |
2476 | XQueryTree (display->display, TermWin.parent[i - 1], &root, |
2551 | XQueryTree (disp, parent[i - 1], &root, |
2477 | &TermWin.parent[i], &list, &n); |
2552 | &parent[i], &list, &n); |
2478 | XFree (list); |
2553 | XFree (list); |
2479 | |
2554 | |
2480 | if (TermWin.parent[i] == display->root) |
2555 | if (parent[i] == display->root) |
2481 | { |
2556 | { |
2482 | if (oldp != None) |
2557 | if (oldp != None) |
2483 | pchanged = 1; |
2558 | pchanged = 1; |
2484 | |
2559 | |
2485 | break; |
2560 | break; |
2486 | } |
2561 | } |
2487 | |
2562 | |
2488 | if (oldp != TermWin.parent[i]) |
2563 | if (oldp != parent[i]) |
2489 | pchanged = 1; |
2564 | pchanged = 1; |
2490 | } |
2565 | } |
2491 | |
2566 | |
2492 | n = 0; |
2567 | n = 0; |
2493 | |
2568 | |
2494 | if (pchanged) |
2569 | if (pchanged) |
2495 | { |
2570 | { |
2496 | for (; n < (unsigned int)i; n++) |
2571 | for (; n < (unsigned int)i; n++) |
2497 | { |
2572 | { |
2498 | XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); |
2573 | XGetWindowAttributes (disp, parent[n], &wattr); |
2499 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2574 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2500 | { |
2575 | { |
2501 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2576 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2502 | break; |
2577 | break; |
2503 | } |
2578 | } |
2504 | } |
2579 | } |
2505 | } |
2580 | } |
2506 | |
2581 | |
2507 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2582 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2508 | { |
2583 | { |
2509 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2584 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2510 | XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); |
2585 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2511 | am_transparent = 0; |
2586 | am_transparent = 0; |
2512 | /* XXX: also turn off Opt_transparent? */ |
2587 | /* XXX: also turn off Opt_transparent? */ |
2513 | } |
2588 | } |
2514 | else |
2589 | else |
2515 | { |
2590 | { |
… | |
… | |
2518 | * needed for fvwm2.2.2 (and before?) */ |
2593 | * needed for fvwm2.2.2 (and before?) */ |
2519 | sleep (1); |
2594 | sleep (1); |
2520 | #endif |
2595 | #endif |
2521 | for (n = 0; n < (unsigned int)i; n++) |
2596 | for (n = 0; n < (unsigned int)i; n++) |
2522 | { |
2597 | { |
2523 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); |
2598 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2524 | XClearWindow (display->display, TermWin.parent[n]); |
2599 | XClearWindow (disp, parent[n]); |
2525 | } |
2600 | } |
2526 | |
2601 | |
2527 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2602 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2528 | am_transparent = 1; |
2603 | am_transparent = 1; |
2529 | } |
2604 | } |
2530 | |
2605 | |
2531 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2606 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2532 | TermWin.parent[i] = None; |
2607 | parent[i] = None; |
2533 | } |
2608 | } |
2534 | |
2609 | |
2535 | if (scrollBar.win) |
2610 | if (scrollBar.win) |
2536 | { |
2611 | { |
2537 | XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); |
2612 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2538 | scrollBar.setIdle (); |
2613 | scrollBar.setIdle (); |
2539 | scrollbar_show (0); |
2614 | scrollbar_show (0); |
|
|
2615 | } |
|
|
2616 | |
|
|
2617 | if (am_transparent) |
|
|
2618 | { |
|
|
2619 | want_refresh = want_full_refresh = 1; |
|
|
2620 | if (am_pixmap_trans) |
|
|
2621 | flush (); |
2540 | } |
2622 | } |
2541 | |
2623 | |
2542 | return pchanged; |
2624 | return pchanged; |
2543 | } |
2625 | } |
2544 | #endif |
2626 | #endif |
… | |
… | |
2573 | // some window managers resize the window early, and these programs |
2655 | // some window managers resize the window early, and these programs |
2574 | // then sometimes get the size wrong. |
2656 | // then sometimes get the size wrong. |
2575 | // unfortunately other programs are even more buggy and dislike |
2657 | // unfortunately other programs are even more buggy and dislike |
2576 | // being sent SIGWINCH, so only do it when we were in fact being |
2658 | // being sent SIGWINCH, so only do it when we were in fact being |
2577 | // resized. |
2659 | // resized. |
2578 | if (seen_resize) |
2660 | if (seen_resize && cmd_pid) |
2579 | kill (-cmd_pid, SIGWINCH); |
2661 | kill (-cmd_pid, SIGWINCH); |
2580 | } |
2662 | } |
2581 | |
2663 | |
2582 | /* Read a text string from the input buffer */ |
2664 | /* Read a text string from the input buffer */ |
2583 | unicode_t buf[UBUFSIZ]; |
2665 | unicode_t buf[UBUFSIZ]; |
2584 | bool refreshnow = false; |
2666 | bool refreshnow = false; |
2585 | int nlines = 0; |
2667 | int nlines = 0; |
2586 | unicode_t *str = buf; |
2668 | unicode_t *str = buf; |
|
|
2669 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2587 | |
2670 | |
2588 | for (;;) |
2671 | for (;;) |
2589 | { |
2672 | { |
2590 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2673 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2591 | break; |
2674 | break; |
2592 | |
2675 | |
2593 | *str++ = ch; |
2676 | *str++ = ch; |
2594 | |
2677 | |
2595 | if (ch == C0_LF) |
2678 | if (ch == C0_LF || str >= eol) |
2596 | { |
2679 | { |
|
|
2680 | if (ch == C0_LF) |
2597 | nlines++; |
2681 | nlines++; |
|
|
2682 | |
2598 | refresh_count++; |
2683 | refresh_count++; |
2599 | |
2684 | |
2600 | if (!(options & Opt_jumpScroll) |
2685 | if (!OPTION (Opt_jumpScroll) |
2601 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2686 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2602 | { |
2687 | { |
2603 | refreshnow = true; |
2688 | refreshnow = true; |
2604 | ch = NOCHAR; |
2689 | ch = NOCHAR; |
2605 | break; |
2690 | break; |
2606 | } |
2691 | } |
2607 | |
2692 | |
2608 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2693 | // scr_add_lines only works for nlines <= nrow - 1. |
2609 | if (nlines >= TermWin.nrow - 1) |
2694 | if (nlines >= nrow - 1) |
2610 | { |
2695 | { |
2611 | scr_add_lines (buf, nlines, str - buf); |
2696 | scr_add_lines (buf, nlines, str - buf); |
2612 | nlines = 0; |
2697 | nlines = 0; |
2613 | str = buf; |
2698 | str = buf; |
|
|
2699 | eol = str + min (ncol, UBUFSIZ); |
2614 | } |
2700 | } |
2615 | } |
|
|
2616 | |
2701 | |
2617 | if (str >= buf + UBUFSIZ) |
2702 | if (str >= eol) |
2618 | { |
2703 | { |
|
|
2704 | if (eol >= buf + UBUFSIZ) |
|
|
2705 | { |
2619 | ch = NOCHAR; |
2706 | ch = NOCHAR; |
2620 | break; |
2707 | break; |
|
|
2708 | } |
|
|
2709 | else |
|
|
2710 | eol = min (eol + ncol, buf + UBUFSIZ); |
|
|
2711 | } |
|
|
2712 | |
2621 | } |
2713 | } |
2622 | |
2714 | |
2623 | seq_begin = cmdbuf_ptr; |
2715 | seq_begin = cmdbuf_ptr; |
2624 | ch = next_char (); |
2716 | ch = next_char (); |
2625 | } |
2717 | } |
… | |
… | |
2632 | * the number of pages between refreshes is refresh_limit, which |
2724 | * the number of pages between refreshes is refresh_limit, which |
2633 | * is incremented here because we must be doing flat-out scrolling. |
2725 | * is incremented here because we must be doing flat-out scrolling. |
2634 | */ |
2726 | */ |
2635 | if (refreshnow) |
2727 | if (refreshnow) |
2636 | { |
2728 | { |
2637 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2729 | if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2638 | refresh_limit++; |
2730 | refresh_limit++; |
2639 | else |
2731 | else |
2640 | { |
2732 | { |
2641 | flag = true; |
2733 | flag = true; |
2642 | scr_refresh (refresh_type); |
2734 | scr_refresh (refresh_type); |
… | |
… | |
2696 | if (len == (size_t)-1) |
2788 | if (len == (size_t)-1) |
2697 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2789 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2698 | |
2790 | |
2699 | // assume wchar == unicode |
2791 | // assume wchar == unicode |
2700 | cmdbuf_ptr += len; |
2792 | cmdbuf_ptr += len; |
2701 | return wc; |
2793 | return wc & UNICODE_MASK; |
2702 | } |
2794 | } |
2703 | |
2795 | |
2704 | return NOCHAR; |
2796 | return NOCHAR; |
2705 | } |
2797 | } |
2706 | |
2798 | |
… | |
… | |
3169 | { |
3261 | { |
3170 | switch (priv) |
3262 | switch (priv) |
3171 | { |
3263 | { |
3172 | case '>': |
3264 | case '>': |
3173 | if (ch == CSI_DA) /* secondary device attributes */ |
3265 | if (ch == CSI_DA) /* secondary device attributes */ |
3174 | tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); |
3266 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3175 | break; |
3267 | break; |
3176 | case '?': |
3268 | case '?': |
3177 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3269 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3178 | process_terminal_mode (ch, priv, nargs, arg); |
3270 | process_terminal_mode (ch, priv, nargs, arg); |
3179 | break; |
3271 | break; |
… | |
… | |
3284 | |
3376 | |
3285 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3377 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3286 | arg[0] = -arg[0]; |
3378 | arg[0] = -arg[0]; |
3287 | /* FALLTHROUGH */ |
3379 | /* FALLTHROUGH */ |
3288 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3380 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3289 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3381 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3290 | break; |
3382 | break; |
3291 | |
3383 | |
3292 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3384 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3293 | tt_write ((const unsigned char *)VT100_ANS, |
3385 | tt_write ((const unsigned char *)VT100_ANS, |
3294 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
3386 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
… | |
… | |
3306 | break; |
3398 | break; |
3307 | case 6: /* CPR requested */ |
3399 | case 6: /* CPR requested */ |
3308 | scr_report_position (); |
3400 | scr_report_position (); |
3309 | break; |
3401 | break; |
3310 | case 7: /* unofficial extension */ |
3402 | case 7: /* unofficial extension */ |
3311 | if (options & Opt_insecure) |
3403 | if (OPTION (Opt_insecure)) |
3312 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3404 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3313 | break; |
3405 | break; |
3314 | case 8: /* unofficial extension */ |
3406 | case 8: /* unofficial extension */ |
3315 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3407 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3316 | break; |
3408 | break; |
… | |
… | |
3408 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3500 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3409 | { |
3501 | { |
3410 | int x, y; |
3502 | int x, y; |
3411 | XWindowAttributes wattr; |
3503 | XWindowAttributes wattr; |
3412 | Window wdummy; |
3504 | Window wdummy; |
|
|
3505 | dDisp; |
3413 | |
3506 | |
3414 | if (nargs == 0) |
3507 | if (nargs == 0) |
3415 | return; |
3508 | return; |
3416 | |
3509 | |
3417 | switch (args[0]) |
3510 | switch (args[0]) |
3418 | { |
3511 | { |
3419 | /* |
3512 | /* |
3420 | * commands |
3513 | * commands |
3421 | */ |
3514 | */ |
3422 | case 1: /* deiconify window */ |
3515 | case 1: /* deiconify window */ |
3423 | XMapWindow (display->display, TermWin.parent[0]); |
3516 | XMapWindow (disp, parent[0]); |
3424 | break; |
3517 | break; |
3425 | case 2: /* iconify window */ |
3518 | case 2: /* iconify window */ |
3426 | XIconifyWindow (display->display, TermWin.parent[0], |
3519 | XIconifyWindow (disp, parent[0], display->screen); |
3427 | DefaultScreen (display->display)); |
|
|
3428 | break; |
3520 | break; |
3429 | case 3: /* set position (pixels) */ |
3521 | case 3: /* set position (pixels) */ |
3430 | XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); |
3522 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3431 | break; |
3523 | break; |
3432 | case 4: /* set size (pixels) */ |
3524 | case 4: /* set size (pixels) */ |
3433 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3525 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3434 | break; |
3526 | break; |
3435 | case 5: /* raise window */ |
3527 | case 5: /* raise window */ |
3436 | XRaiseWindow (display->display, TermWin.parent[0]); |
3528 | XRaiseWindow (disp, parent[0]); |
3437 | break; |
3529 | break; |
3438 | case 6: /* lower window */ |
3530 | case 6: /* lower window */ |
3439 | XLowerWindow (display->display, TermWin.parent[0]); |
3531 | XLowerWindow (disp, parent[0]); |
3440 | break; |
3532 | break; |
3441 | case 7: /* refresh window */ |
3533 | case 7: /* refresh window */ |
3442 | scr_touch (true); |
3534 | scr_touch (true); |
3443 | break; |
3535 | break; |
3444 | case 8: /* set size (chars) */ |
3536 | case 8: /* set size (chars) */ |
3445 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3537 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3446 | (unsigned int) (args[1] * TermWin.fheight)); |
3538 | (unsigned int) (args[1] * fheight)); |
3447 | break; |
3539 | break; |
3448 | |
3540 | |
3449 | //case 9: NYI, TODO, restore maximized window or maximize window |
3541 | //case 9: NYI, TODO, restore maximized window or maximize window |
3450 | default: |
3542 | default: |
3451 | if (args[0] >= 24) /* set height (chars) */ |
3543 | if (args[0] >= 24) /* set height (chars) */ |
3452 | set_widthheight ((unsigned int)TermWin.width, |
3544 | set_widthheight ((unsigned int)width, |
3453 | (unsigned int) (args[1] * TermWin.fheight)); |
3545 | (unsigned int) (args[1] * fheight)); |
3454 | break; |
3546 | break; |
3455 | |
3547 | |
3456 | |
3548 | |
3457 | /* |
3549 | /* |
3458 | * reports - some output format copied from XTerm |
3550 | * reports - some output format copied from XTerm |
3459 | */ |
3551 | */ |
3460 | case 11: /* report window state */ |
3552 | case 11: /* report window state */ |
3461 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3553 | XGetWindowAttributes (disp, parent[0], &wattr); |
3462 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3554 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3463 | break; |
3555 | break; |
3464 | case 13: /* report window position */ |
3556 | case 13: /* report window position */ |
3465 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3557 | XGetWindowAttributes (disp, parent[0], &wattr); |
3466 | XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, |
3558 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3467 | -wattr.border_width, -wattr.border_width, |
3559 | -wattr.border_width, -wattr.border_width, |
3468 | &x, &y, &wdummy); |
3560 | &x, &y, &wdummy); |
3469 | tt_printf ("\033[3;%d;%dt", x, y); |
3561 | tt_printf ("\033[3;%d;%dt", x, y); |
3470 | break; |
3562 | break; |
3471 | case 14: /* report window size (pixels) */ |
3563 | case 14: /* report window size (pixels) */ |
3472 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3564 | XGetWindowAttributes (disp, parent[0], &wattr); |
3473 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3565 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3474 | break; |
3566 | break; |
3475 | case 18: /* report text area size (chars) */ |
3567 | case 18: /* report text area size (chars) */ |
3476 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3568 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3477 | break; |
3569 | break; |
3478 | case 19: /* report window size (chars) */ |
3570 | case 19: /* report window size (chars) */ |
3479 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3571 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3480 | break; |
3572 | break; |
3481 | case 20: /* report icon label */ |
3573 | case 20: /* report icon label */ |
3482 | { |
3574 | { |
3483 | char *s; |
3575 | char *s; |
3484 | XGetIconName (display->display, TermWin.parent[0], &s); |
3576 | XGetIconName (disp, parent[0], &s); |
3485 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3577 | tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3486 | XFree (s); |
3578 | XFree (s); |
3487 | } |
3579 | } |
3488 | break; |
3580 | break; |
3489 | case 21: /* report window title */ |
3581 | case 21: /* report window title */ |
3490 | { |
3582 | { |
3491 | char *s; |
3583 | char *s; |
3492 | XFetchName (display->display, TermWin.parent[0], &s); |
3584 | XFetchName (disp, parent[0], &s); |
3493 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3585 | tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3494 | XFree (s); |
3586 | XFree (s); |
3495 | } |
3587 | } |
3496 | break; |
3588 | break; |
3497 | } |
3589 | } |
3498 | } |
3590 | } |
… | |
… | |
3504 | * ends_how is terminator used. returned input must be free()'d |
3596 | * ends_how is terminator used. returned input must be free()'d |
3505 | */ |
3597 | */ |
3506 | unsigned char * |
3598 | unsigned char * |
3507 | rxvt_term::get_to_st (unicode_t &ends_how) |
3599 | rxvt_term::get_to_st (unicode_t &ends_how) |
3508 | { |
3600 | { |
3509 | unicode_t seen_esc = 0, ch; |
3601 | unicode_t ch; |
|
|
3602 | bool seen_esc = false; |
3510 | unsigned int n = 0; |
3603 | unsigned int n = 0; |
3511 | unsigned char *s; |
|
|
3512 | unsigned char string[STRING_MAX]; |
3604 | wchar_t string[STRING_MAX]; |
3513 | |
3605 | |
3514 | while ((ch = cmd_getc ()) != NOCHAR) |
3606 | while ((ch = cmd_getc ()) != NOCHAR) |
3515 | { |
3607 | { |
3516 | if (seen_esc) |
3608 | if (seen_esc) |
3517 | { |
3609 | { |
… | |
… | |
3520 | else |
3612 | else |
3521 | return NULL; |
3613 | return NULL; |
3522 | } |
3614 | } |
3523 | else if (ch == C0_ESC) |
3615 | else if (ch == C0_ESC) |
3524 | { |
3616 | { |
3525 | seen_esc = 1; |
3617 | seen_esc = true; |
3526 | continue; |
3618 | continue; |
3527 | } |
3619 | } |
3528 | else if (ch == C0_BEL || ch == CHAR_ST) |
3620 | else if (ch == C0_BEL || ch == CHAR_ST) |
3529 | break; |
3621 | break; |
3530 | else if (ch < 0x20) |
3622 | else if (ch < 0x20) |
3531 | return NULL; /* other control character - exit */ |
3623 | return NULL; /* other control character - exit */ |
3532 | |
3624 | |
3533 | seen_esc = 0; |
3625 | seen_esc = false; |
3534 | |
3626 | |
3535 | if (n >= sizeof (string) - 1) |
3627 | if (n >= STRING_MAX - 1) |
3536 | // stop at some sane length |
3628 | // stop at some sane length |
3537 | return NULL; |
3629 | return NULL; |
3538 | |
3630 | |
3539 | if (ch == C0_SYN) |
3631 | if (ch == C0_SYN) |
3540 | string[n++] = cmd_get8 (); |
3632 | string[n++] = cmd_get8 (); |
… | |
… | |
3542 | string[n++] = ch; |
3634 | string[n++] = ch; |
3543 | } |
3635 | } |
3544 | |
3636 | |
3545 | string[n++] = '\0'; |
3637 | string[n++] = '\0'; |
3546 | |
3638 | |
3547 | if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) |
|
|
3548 | return NULL; |
|
|
3549 | |
|
|
3550 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3639 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3551 | strncpy (s, string, n); |
3640 | |
3552 | return s; |
3641 | return (unsigned char *)rxvt_wcstombs (string); |
3553 | } |
3642 | } |
3554 | |
3643 | |
3555 | /*----------------------------------------------------------------------*/ |
3644 | /*----------------------------------------------------------------------*/ |
3556 | /* |
3645 | /* |
3557 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3646 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
… | |
… | |
3611 | set_window_color (color, str); |
3700 | set_window_color (color, str); |
3612 | } |
3701 | } |
3613 | |
3702 | |
3614 | /* |
3703 | /* |
3615 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3704 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3616 | * 0 = change iconName/title |
|
|
3617 | * 1 = change iconName |
|
|
3618 | * 2 = change title |
|
|
3619 | * 4 = change color |
|
|
3620 | * 10 = change fg color |
|
|
3621 | * 11 = change bg color |
|
|
3622 | * 12 = change text color |
|
|
3623 | * 13 = change mouse foreground color |
|
|
3624 | * 17 = change highlight character colour |
|
|
3625 | * 18 = change bold character color |
|
|
3626 | * 19 = change underlined character color |
|
|
3627 | * 46 = change logfile (not implemented) |
|
|
3628 | * 50 = change font |
|
|
3629 | * |
|
|
3630 | * rxvt extensions: |
|
|
3631 | * 20 = bg pixmap |
|
|
3632 | * 39 = change default fg color |
|
|
3633 | * 49 = change default bg color |
|
|
3634 | * 55 = dump scrollback buffer and all of screen |
|
|
3635 | * 701 = change locale |
|
|
3636 | * 702 = find font |
|
|
3637 | * 703 = menu |
|
|
3638 | */ |
3705 | */ |
3639 | void |
3706 | void |
3640 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3707 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3641 | { |
3708 | { |
3642 | int changed = 0; |
3709 | int changed = 0; |
3643 | int color; |
3710 | int color; |
3644 | char *buf, *name; |
3711 | char *buf, *name; |
3645 | bool query = str[0] == '?' && !str[1]; |
3712 | bool query = str[0] == '?' && !str[1]; |
3646 | int saveop = op; |
3713 | int saveop = op; |
|
|
3714 | dDisp; |
3647 | |
3715 | |
3648 | assert (str != NULL); |
3716 | assert (str != NULL); |
3649 | switch (op) |
3717 | switch (op) |
3650 | { |
3718 | { |
3651 | case XTerm_name: |
3719 | case XTerm_name: |
… | |
… | |
3658 | set_title (str); |
3726 | set_title (str); |
3659 | break; |
3727 | break; |
3660 | case XTerm_property: |
3728 | case XTerm_property: |
3661 | if (str[0] == '?') |
3729 | if (str[0] == '?') |
3662 | { |
3730 | { |
3663 | Atom prop = XInternAtom (display->display, str + 1, True); |
3731 | Atom prop = display->atom (str + 1); |
3664 | Atom actual_type; |
3732 | Atom actual_type; |
3665 | int actual_format; |
3733 | int actual_format; |
3666 | unsigned long nitems; |
3734 | unsigned long nitems; |
3667 | unsigned long bytes_after; |
3735 | unsigned long bytes_after; |
3668 | unsigned char *value = 0; |
3736 | unsigned char *value = 0; |
3669 | const char *str = ""; |
3737 | const char *str = ""; |
3670 | |
3738 | |
3671 | if (prop |
3739 | if (prop |
3672 | && XGetWindowProperty (display->display, TermWin.parent[0], |
3740 | && XGetWindowProperty (disp, parent[0], |
3673 | prop, 0, 1<<16, 0, AnyPropertyType, |
3741 | prop, 0, 1<<16, 0, AnyPropertyType, |
3674 | &actual_type, &actual_format, |
3742 | &actual_type, &actual_format, |
3675 | &nitems, &bytes_after, &value) == Success |
3743 | &nitems, &bytes_after, &value) == Success |
3676 | && actual_type != None |
3744 | && actual_type != None |
3677 | && actual_format == 8) |
3745 | && actual_format == 8) |
… | |
… | |
3686 | char *eq = strchr (str, '='); // constness lost, but verified to be ok |
3754 | char *eq = strchr (str, '='); // constness lost, but verified to be ok |
3687 | |
3755 | |
3688 | if (eq) |
3756 | if (eq) |
3689 | { |
3757 | { |
3690 | *eq = 0; |
3758 | *eq = 0; |
3691 | XChangeProperty (display->display, TermWin.parent[0], |
3759 | set_utf8_property (display->atom (str), eq + 1); |
3692 | display->atom (str), XA_STRING, 8, |
|
|
3693 | PropModeReplace, (unsigned char *)eq + 1, |
|
|
3694 | strlen (eq + 1)); |
|
|
3695 | } |
3760 | } |
3696 | else |
3761 | else |
3697 | XDeleteProperty (display->display, TermWin.parent[0], |
3762 | XDeleteProperty (disp, parent[0], |
3698 | display->atom (str)); |
3763 | display->atom (str)); |
3699 | } |
3764 | } |
3700 | break; |
3765 | break; |
3701 | |
3766 | |
3702 | case XTerm_Color: |
3767 | case XTerm_Color: |
… | |
… | |
3743 | break; |
3808 | break; |
3744 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3809 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3745 | case XTerm_Color_BD: |
3810 | case XTerm_Color_BD: |
3746 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
3811 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
3747 | break; |
3812 | break; |
3748 | case XTerm_Color_IT: |
|
|
3749 | process_color_seq (XTerm_Color_IT, Color_IT, str, resp); |
|
|
3750 | break; |
|
|
3751 | case XTerm_Color_UL: |
3813 | case XTerm_Color_UL: |
3752 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
3814 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
3753 | break; |
3815 | break; |
3754 | case XTerm_Color_RV: |
3816 | case XTerm_Color_RV: |
3755 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3817 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3756 | break; |
3818 | break; |
|
|
3819 | case URxvt_Color_IT: |
|
|
3820 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
|
|
3821 | break; |
3757 | #endif |
3822 | #endif |
3758 | #if TRANSPARENT || TINTING |
3823 | #if TRANSPARENT && TINTING |
3759 | case XTerm_Color_tint: |
3824 | case URxvt_Color_tint: |
3760 | process_color_seq (XTerm_Color_tint, Color_tint, str, resp); |
3825 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3761 | check_our_parents (); |
3826 | check_our_parents (); |
3762 | if (am_transparent) |
3827 | if (am_transparent) |
3763 | want_full_refresh = want_refresh = 1; |
3828 | want_full_refresh = want_refresh = 1; |
3764 | break; |
3829 | break; |
3765 | #endif |
3830 | #endif |
… | |
… | |
3777 | { |
3842 | { |
3778 | str++; |
3843 | str++; |
3779 | #if XPM_BACKGROUND |
3844 | #if XPM_BACKGROUND |
3780 | changed += scale_pixmap (str); |
3845 | changed += scale_pixmap (str); |
3781 | #endif |
3846 | #endif |
3782 | |
|
|
3783 | } |
3847 | } |
|
|
3848 | |
3784 | if (changed) |
3849 | if (changed) |
3785 | { |
3850 | { |
3786 | #ifdef XPM_BACKGROUND |
3851 | #ifdef XPM_BACKGROUND |
3787 | resize_pixmap (); |
3852 | resize_pixmap (); |
3788 | #endif |
3853 | #endif |
… | |
… | |
3799 | |
3864 | |
3800 | case XTerm_logfile: |
3865 | case XTerm_logfile: |
3801 | // TODO, when secure mode? |
3866 | // TODO, when secure mode? |
3802 | break; |
3867 | break; |
3803 | |
3868 | |
|
|
3869 | #ifdef MENUBAR |
|
|
3870 | case URxvt_Menu: |
|
|
3871 | if (OPTION (Opt_insecure)) |
|
|
3872 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3873 | break; |
|
|
3874 | #endif |
|
|
3875 | #if 0 |
|
|
3876 | case XTerm_dumpscreen: /* no error notices */ |
|
|
3877 | { |
|
|
3878 | int fd; |
|
|
3879 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
|
|
3880 | { |
|
|
3881 | scr_dump (fd); |
|
|
3882 | close (fd); |
|
|
3883 | } |
|
|
3884 | } |
|
|
3885 | break; |
|
|
3886 | #endif |
3804 | case XTerm_font: |
3887 | case XTerm_font: |
3805 | op = URxvt_font; |
3888 | op = URxvt_font; |
3806 | case URxvt_font: |
3889 | case URxvt_font: |
3807 | #if ENABLE_STYLES |
3890 | #if ENABLE_STYLES |
3808 | case URxvt_boldFont: |
3891 | case URxvt_boldFont: |
3809 | case URxvt_italicFont: |
3892 | case URxvt_italicFont: |
3810 | case URxvt_boldItalicFont: |
3893 | case URxvt_boldItalicFont: |
3811 | #endif |
3894 | #endif |
3812 | if (query) |
3895 | if (query) |
3813 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3896 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3814 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3897 | OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3815 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3898 | ? fontset[op - URxvt_font]->fontdesc : "", |
3816 | resp); |
3899 | resp); |
3817 | else |
3900 | else |
3818 | { |
3901 | { |
3819 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3902 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3820 | |
3903 | |
… | |
… | |
3823 | set_fonts (); |
3906 | set_fonts (); |
3824 | } |
3907 | } |
3825 | break; |
3908 | break; |
3826 | |
3909 | |
3827 | #if ENABLE_FRILLS |
3910 | #if ENABLE_FRILLS |
3828 | case XTerm_locale: |
3911 | case URxvt_locale: |
3829 | if (query) |
3912 | if (query) |
3830 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); |
3913 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); |
3831 | else |
3914 | else |
3832 | { |
3915 | { |
3833 | set_locale (str); |
3916 | set_locale (str); |
3834 | # ifdef USE_XIM |
3917 | pty.set_utf8_mode (enc_utf8); |
3835 | im_cb (); |
3918 | init_xlocale (); |
3836 | # endif |
|
|
3837 | } |
3919 | } |
3838 | break; |
3920 | break; |
3839 | #endif |
|
|
3840 | |
3921 | |
3841 | #ifdef MENUBAR |
3922 | case URxvt_view_up: |
3842 | case XTerm_Menu: |
3923 | case URxvt_view_down: |
3843 | if (options & Opt_insecure) |
3924 | int lines = atoi (str); |
3844 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3925 | |
3845 | break; |
3926 | if (lines) |
3846 | #endif |
3927 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3847 | #if 0 |
|
|
3848 | case XTerm_dumpscreen: /* no error notices */ |
|
|
3849 | { |
3928 | else |
3850 | int fd; |
|
|
3851 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
|
|
3852 | { |
3929 | { |
3853 | scr_dump (fd); |
3930 | scr_erase_savelines (); |
3854 | close (fd); |
|
|
3855 | } |
3931 | } |
3856 | } |
3932 | |
3857 | break; |
3933 | break; |
3858 | #endif |
3934 | #endif |
3859 | } |
3935 | } |
3860 | } |
3936 | } |
3861 | /*----------------------------------------------------------------------*/ |
3937 | /*----------------------------------------------------------------------*/ |
… | |
… | |
3970 | } |
4046 | } |
3971 | |
4047 | |
3972 | /* extra handling for values with state unkept */ |
4048 | /* extra handling for values with state unkept */ |
3973 | switch (arg[i]) |
4049 | switch (arg[i]) |
3974 | { |
4050 | { |
|
|
4051 | #if ENABLE_STYLES |
|
|
4052 | case 1021: |
|
|
4053 | if (mode) |
|
|
4054 | SET_OPTION (Opt_intensityStyles); |
|
|
4055 | else |
|
|
4056 | CLR_OPTION (Opt_intensityStyles); |
|
|
4057 | #endif |
3975 | case 1048: /* alternative cursor save */ |
4058 | case 1048: /* alternative cursor save */ |
3976 | case 1049: |
4059 | case 1049: |
3977 | if (options & Opt_secondaryScreen) |
4060 | if (OPTION (Opt_secondaryScreen)) |
3978 | if (mode == 0) |
4061 | if (mode == 0) |
3979 | scr_cursor (RESTORE); |
4062 | scr_cursor (RESTORE); |
3980 | else if (mode == 1) |
4063 | else if (mode == 1) |
3981 | scr_cursor (SAVE); |
4064 | scr_cursor (SAVE); |
3982 | break; |
4065 | break; |
… | |
… | |
3994 | */ |
4077 | */ |
3995 | PrivMode (1, PrivMode_vt52); |
4078 | PrivMode (1, PrivMode_vt52); |
3996 | break; |
4079 | break; |
3997 | case 3: /* 80/132 */ |
4080 | case 3: /* 80/132 */ |
3998 | if (priv_modes & PrivMode_132OK) |
4081 | if (priv_modes & PrivMode_132OK) |
3999 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4082 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4000 | break; |
4083 | break; |
4001 | case 4: /* smooth scrolling */ |
4084 | case 4: /* smooth scrolling */ |
4002 | if (state) |
4085 | if (!state) |
4003 | options &= ~Opt_jumpScroll; |
4086 | SET_OPTION (Opt_jumpScroll); |
4004 | else |
4087 | else |
4005 | options |= Opt_jumpScroll; |
4088 | CLR_OPTION (Opt_jumpScroll); |
4006 | break; |
4089 | break; |
4007 | case 5: /* reverse video */ |
4090 | case 5: /* reverse video */ |
4008 | scr_rvideo_mode (state); |
4091 | scr_rvideo_mode (state); |
4009 | break; |
4092 | break; |
4010 | case 6: /* relative/absolute origins */ |
4093 | case 6: /* relative/absolute origins */ |
… | |
… | |
4051 | #if 0 |
4134 | #if 0 |
4052 | case 1001: |
4135 | case 1001: |
4053 | break; /* X11 mouse highlighting */ |
4136 | break; /* X11 mouse highlighting */ |
4054 | #endif |
4137 | #endif |
4055 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4138 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4056 | if (state) |
4139 | if (!state) |
4057 | options &= ~Opt_scrollTtyOutput; |
4140 | SET_OPTION (Opt_scrollTtyOutput); |
4058 | else |
4141 | else |
4059 | options |= Opt_scrollTtyOutput; |
4142 | CLR_OPTION (Opt_scrollTtyOutput); |
4060 | break; |
4143 | break; |
4061 | case 1011: /* scroll to bottom on key press */ |
4144 | case 1011: /* scroll to bottom on key press */ |
4062 | if (state) |
4145 | if (state) |
4063 | options |= Opt_scrollTtyKeypress; |
4146 | SET_OPTION (Opt_scrollTtyKeypress); |
4064 | else |
4147 | else |
4065 | options &= ~Opt_scrollTtyKeypress; |
4148 | CLR_OPTION (Opt_scrollTtyKeypress); |
4066 | break; |
4149 | break; |
4067 | case 1047: /* secondary screen w/ clearing last */ |
4150 | case 1047: /* secondary screen w/ clearing last */ |
4068 | if (options & Opt_secondaryScreen) |
4151 | if (OPTION (Opt_secondaryScreen)) |
4069 | if (current_screen != PRIMARY) |
4152 | if (current_screen != PRIMARY) |
4070 | scr_erase_screen (2); |
4153 | scr_erase_screen (2); |
4071 | scr_change_screen (state); |
4154 | scr_change_screen (state); |
4072 | break; |
4155 | break; |
4073 | case 1049: /* secondary screen w/ clearing first */ |
4156 | case 1049: /* secondary screen w/ clearing first */ |
4074 | scr_change_screen (state); |
4157 | scr_change_screen (state); |
4075 | if (options & Opt_secondaryScreen) |
4158 | if (OPTION (Opt_secondaryScreen)) |
4076 | if (current_screen != PRIMARY) |
4159 | if (current_screen != PRIMARY) |
4077 | scr_erase_screen (2); |
4160 | scr_erase_screen (2); |
4078 | break; |
4161 | break; |
4079 | default: |
4162 | default: |
4080 | break; |
4163 | break; |
… | |
… | |
4276 | |
4359 | |
4277 | /* ---------------------------------------------------------------------- */ |
4360 | /* ---------------------------------------------------------------------- */ |
4278 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4361 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4279 | * or generated by us in response to a query ESC sequence. |
4362 | * or generated by us in response to a query ESC sequence. |
4280 | */ |
4363 | */ |
|
|
4364 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
|
|
4365 | |
4281 | void |
4366 | void |
4282 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4367 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4283 | { |
4368 | { |
4284 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4369 | if (v_buflen == 0) |
|
|
4370 | { |
|
|
4371 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4285 | |
4372 | |
4286 | if (len) |
4373 | if ((unsigned int)written == len) |
|
|
4374 | return; |
|
|
4375 | |
|
|
4376 | data += written; |
|
|
4377 | len -= written; |
4287 | { |
4378 | } |
|
|
4379 | |
|
|
4380 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
|
|
4381 | |
|
|
4382 | memcpy (v_buffer + v_buflen, data, len); |
|
|
4383 | v_buflen += len; |
|
|
4384 | |
|
|
4385 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
4386 | } |
|
|
4387 | |
|
|
4388 | void rxvt_term::pty_write () |
|
|
4389 | { |
|
|
4390 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
|
|
4391 | |
|
|
4392 | if (written > 0) |
|
|
4393 | { |
|
|
4394 | v_buflen -= written; |
|
|
4395 | |
4288 | if (v_buflen == 0) |
4396 | if (v_buflen == 0) |
4289 | { |
4397 | { |
4290 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
|
|
4291 | |
|
|
4292 | if ((unsigned int)written == len) |
|
|
4293 | return; |
|
|
4294 | |
|
|
4295 | data += written; |
|
|
4296 | len -= written; |
|
|
4297 | } |
|
|
4298 | |
|
|
4299 | |
|
|
4300 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
|
|
4301 | |
|
|
4302 | memcpy (v_buffer + v_buflen, data, len); |
|
|
4303 | v_buflen += len; |
|
|
4304 | } |
|
|
4305 | |
|
|
4306 | for (;;) |
|
|
4307 | { |
|
|
4308 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
|
|
4309 | |
|
|
4310 | if (written > 0) |
|
|
4311 | { |
|
|
4312 | v_buflen -= written; |
|
|
4313 | |
|
|
4314 | if (v_buflen == 0) |
|
|
4315 | { |
|
|
4316 | free (v_buffer); |
4398 | free (v_buffer); |
4317 | v_buffer = 0; |
4399 | v_buffer = 0; |
4318 | v_buflen = 0; |
4400 | v_buflen = 0; |
4319 | |
4401 | |
4320 | pty_ev.set (EVENT_READ); |
4402 | pty_ev.set (EVENT_READ); |
4321 | return; |
|
|
4322 | } |
|
|
4323 | |
|
|
4324 | memmove (v_buffer, v_buffer + written, v_buflen); |
|
|
4325 | } |
|
|
4326 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
4327 | // original code just ignores this... |
|
|
4328 | destroy (); |
|
|
4329 | else |
|
|
4330 | { |
|
|
4331 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
4332 | return; |
4403 | return; |
4333 | } |
4404 | } |
|
|
4405 | |
|
|
4406 | memmove (v_buffer, v_buffer + written, v_buflen); |
4334 | } |
4407 | } |
|
|
4408 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
4409 | pty_ev.set (EVENT_READ); |
4335 | } |
4410 | } |
4336 | |
4411 | |
4337 | /*----------------------- end-of-file (C source) -----------------------*/ |
4412 | /*----------------------- end-of-file (C source) -----------------------*/ |
4338 | |
4413 | |