… | |
… | |
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 <cwchar> |
53 | #ifdef KEYSYM_RESOURCE |
|
|
54 | # include "keyboard.h" |
|
|
55 | #endif |
|
|
56 | |
54 | #include <csignal> |
57 | #include <csignal> |
55 | |
58 | |
56 | /*----------------------------------------------------------------------*/ |
59 | /*----------------------------------------------------------------------*/ |
57 | |
60 | |
58 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
61 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
… | |
… | |
114 | XK_Escape, 0x238b, |
117 | XK_Escape, 0x238b, |
115 | XK_Undo, 0x238c, |
118 | XK_Undo, 0x238c, |
116 | XK_Print, 0x2399, |
119 | XK_Print, 0x2399, |
117 | |
120 | |
118 | 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, |
119 | XK_KP_Space, 0x2422, |
129 | XK_KP_Space, 0x2422, |
|
|
130 | #endif |
120 | 0, |
131 | 0, |
121 | }; |
132 | }; |
122 | |
133 | |
123 | void |
134 | void |
124 | rxvt_term::iso14755_54 (int x, int y) |
135 | rxvt_term::iso14755_54 (int x, int y) |
125 | { |
136 | { |
126 | x = Pixel2Col (x); |
137 | x = Pixel2Col (x); |
127 | y = Pixel2Row (y); |
138 | y = Pixel2Row (y); |
128 | |
139 | |
129 | if (x < 0 || x >= TermWin.ncol |
140 | if (!IN_RANGE_EXC (x, 0, ncol) |
130 | || y < 0 || y >= TermWin.nrow) |
141 | || !IN_RANGE_EXC (y, 0, nrow)) |
131 | return; |
142 | return; |
132 | |
143 | |
133 | for (;;) |
144 | for (;;) |
134 | { |
145 | { |
135 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
146 | const line_t &l = ROW(-view_start); |
|
|
147 | |
|
|
148 | text_t t = l.t[x]; |
136 | |
149 | |
137 | if (t != NOCHAR || !x) |
150 | if (t != NOCHAR || !x) |
138 | { |
151 | { |
139 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
152 | iso14755_51 (l.t[x], l.r[x]); |
140 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
141 | iso14755buf = ISO_14755_54; |
153 | iso14755buf = ISO_14755_54; |
142 | break; |
154 | break; |
143 | } |
155 | } |
144 | |
156 | |
145 | x--; |
157 | x--; |
146 | } |
158 | } |
147 | |
|
|
148 | } |
159 | } |
149 | #endif |
160 | #endif |
150 | |
161 | |
151 | #if ENABLE_OVERLAY |
162 | #if ENABLE_OVERLAY |
152 | void |
163 | void |
153 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
154 | { |
165 | { |
155 | rxvt_fontset *fs = FONTSET (r); |
166 | rxvt_fontset *fs = FONTSET (r); |
156 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
157 | wchar_t *chr, *alloc, ch2; |
168 | wchar_t *chr, *alloc, ch2, *fname; |
158 | int len; |
169 | int len; |
|
|
170 | |
|
|
171 | fname = rxvt_utf8towcs (f->name); |
159 | |
172 | |
160 | #if ENABLE_COMBINING |
173 | #if ENABLE_COMBINING |
161 | if (IS_COMPOSE (ch)) |
174 | if (IS_COMPOSE (ch)) |
162 | { |
175 | { |
163 | len = rxvt_composite.expand (ch, 0); |
176 | len = rxvt_composite.expand (ch, 0); |
… | |
… | |
172 | alloc = 0; |
185 | alloc = 0; |
173 | chr = &ch2; |
186 | chr = &ch2; |
174 | len = 1; |
187 | len = 1; |
175 | } |
188 | } |
176 | |
189 | |
177 | int width = strlen (f->name); |
190 | int width = wcswidth (fname, wcslen (fname)); |
178 | |
191 | |
179 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
192 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
180 | |
193 | |
181 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
194 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
182 | |
195 | |
… | |
… | |
195 | #endif |
208 | #endif |
196 | scr_overlay_set (11, y, ch, r); |
209 | scr_overlay_set (11, y, ch, r); |
197 | scr_overlay_set (12, y, NOCHAR, r); |
210 | scr_overlay_set (12, y, NOCHAR, r); |
198 | } |
211 | } |
199 | |
212 | |
200 | scr_overlay_set (0, len, f->name); |
213 | scr_overlay_set (0, len, fname); |
|
|
214 | |
|
|
215 | free (fname); |
201 | |
216 | |
202 | #if ENABLE_COMBINING |
217 | #if ENABLE_COMBINING |
203 | if (alloc) |
218 | if (alloc) |
204 | delete [] alloc; |
219 | delete [] alloc; |
205 | #endif |
220 | #endif |
… | |
… | |
273 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
288 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
274 | * escape sequence to toggle the Keypad. |
289 | * escape sequence to toggle the Keypad. |
275 | * |
290 | * |
276 | * Always permit `shift' to override the current setting |
291 | * Always permit `shift' to override the current setting |
277 | */ |
292 | */ |
278 | shft = (ev.state & ShiftMask); |
293 | shft = ev.state & ShiftMask; |
279 | ctrl = (ev.state & ControlMask); |
294 | ctrl = ev.state & ControlMask; |
280 | meta = (ev.state & ModMetaMask); |
295 | meta = ev.state & ModMetaMask; |
281 | |
296 | |
282 | if (numlock_state || (ev.state & ModNumLockMask)) |
297 | if (numlock_state || (ev.state & ModNumLockMask)) |
283 | { |
298 | { |
284 | numlock_state = (ev.state & ModNumLockMask); |
299 | numlock_state = (ev.state & ModNumLockMask); |
285 | PrivMode ((!numlock_state), PrivMode_aplKP); |
300 | PrivMode ((!numlock_state), PrivMode_aplKP); |
… | |
… | |
305 | |
320 | |
306 | // the XOpenIM manpage lies about hardcoding the locale |
321 | // the XOpenIM manpage lies about hardcoding the locale |
307 | // at the point of XOpenIM, so temporarily switch locales |
322 | // at the point of XOpenIM, so temporarily switch locales |
308 | if (rs[Rs_imLocale]) |
323 | if (rs[Rs_imLocale]) |
309 | SET_LOCALE (rs[Rs_imLocale]); |
324 | SET_LOCALE (rs[Rs_imLocale]); |
|
|
325 | |
310 | // assume wchar_t == unicode or better |
326 | // assume wchar_t == unicode or better |
311 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
327 | len = XwcLookupString (Input_Context, &ev, wkbuf, |
312 | KBUFSZ, &keysym, &status_return); |
328 | KBUFSZ, &keysym, &status_return); |
|
|
329 | |
313 | if (rs[Rs_imLocale]) |
330 | if (rs[Rs_imLocale]) |
314 | SET_LOCALE (locale); |
331 | SET_LOCALE (locale); |
315 | |
332 | |
316 | if (status_return == XLookupChars |
333 | if (status_return == XLookupChars |
317 | || status_return == XLookupBoth) |
334 | || status_return == XLookupBoth) |
… | |
… | |
344 | valid_keysym = keysym != NoSymbol; |
361 | valid_keysym = keysym != NoSymbol; |
345 | } |
362 | } |
346 | |
363 | |
347 | if (valid_keysym) |
364 | if (valid_keysym) |
348 | { |
365 | { |
|
|
366 | #ifdef KEYSYM_RESOURCE |
|
|
367 | if (keyboard->dispatch (this, keysym, ev.state)) |
|
|
368 | return; |
|
|
369 | #endif |
|
|
370 | |
349 | if (TermWin.saveLines) |
371 | if (saveLines) |
350 | { |
372 | { |
351 | #ifdef UNSHIFTED_SCROLLKEYS |
373 | #ifdef UNSHIFTED_SCROLLKEYS |
352 | if (!ctrl && !meta) |
374 | if (!ctrl && !meta) |
353 | #else |
375 | #else |
354 | if (IS_SCROLL_MOD) |
376 | if (IS_SCROLL_MOD) |
355 | #endif |
377 | #endif |
356 | { |
378 | { |
357 | int lnsppg; |
379 | int lnsppg; |
358 | |
380 | |
359 | #ifdef PAGING_CONTEXT_LINES |
381 | #ifdef PAGING_CONTEXT_LINES |
360 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
382 | lnsppg = nrow - PAGING_CONTEXT_LINES; |
361 | #else |
383 | #else |
362 | lnsppg = TermWin.nrow * 4 / 5; |
384 | lnsppg = nrow * 4 / 5; |
363 | #endif |
385 | #endif |
364 | if (keysym == XK_Prior) |
386 | if (keysym == XK_Prior) |
365 | { |
387 | { |
366 | scr_page (UP, lnsppg); |
388 | scr_page (UP, lnsppg); |
367 | return; |
389 | return; |
… | |
… | |
487 | } |
509 | } |
488 | #endif |
510 | #endif |
489 | |
511 | |
490 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
512 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
491 | { |
513 | { |
492 | #ifdef KEYSYM_RESOURCE |
|
|
493 | if (!(shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) |
|
|
494 | { |
|
|
495 | unsigned int l; |
|
|
496 | const unsigned char *kbuf0; |
|
|
497 | |
|
|
498 | kbuf0 = (Keysym_map[keysym & 0xFF]); |
|
|
499 | l = (unsigned int)*kbuf0++; |
|
|
500 | |
|
|
501 | /* escape prefix */ |
|
|
502 | if (meta |
|
|
503 | # ifdef META8_OPTION |
|
|
504 | && meta_char == C0_ESC |
|
|
505 | # endif |
|
|
506 | ) |
|
|
507 | { |
|
|
508 | const unsigned char ch = C0_ESC; |
|
|
509 | tt_write (&ch, 1); |
|
|
510 | } |
|
|
511 | |
|
|
512 | tt_write (kbuf0, l); |
|
|
513 | return; |
|
|
514 | } |
|
|
515 | else |
|
|
516 | #endif |
|
|
517 | { |
514 | { |
518 | newlen = 1; |
515 | newlen = 1; |
519 | switch (keysym) |
516 | switch (keysym) |
520 | { |
517 | { |
521 | #ifndef NO_BACKSPACE_KEY |
518 | #ifndef NO_BACKSPACE_KEY |
… | |
… | |
529 | else |
526 | else |
530 | strcpy (kbuf, key_backspace); |
527 | strcpy (kbuf, key_backspace); |
531 | break; |
528 | break; |
532 | #endif |
529 | #endif |
533 | #ifndef NO_DELETE_KEY |
530 | #ifndef NO_DELETE_KEY |
|
|
531 | # ifdef XK_KP_Prior |
|
|
532 | case XK_KP_Delete: |
|
|
533 | /* allow shift to override */ |
|
|
534 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
535 | { |
|
|
536 | strcpy (kbuf, "\033On"); |
|
|
537 | break; |
|
|
538 | } |
|
|
539 | /* FALLTHROUGH */ |
|
|
540 | # endif |
534 | case XK_Delete: |
541 | case XK_Delete: |
535 | strcpy (kbuf, key_delete); |
542 | strcpy (kbuf, key_delete); |
536 | break; |
543 | break; |
537 | #endif |
544 | #endif |
538 | case XK_Tab: |
545 | case XK_Tab: |
… | |
… | |
641 | #ifdef XK_KP_Begin |
648 | #ifdef XK_KP_Begin |
642 | case XK_KP_Begin: |
649 | case XK_KP_Begin: |
643 | strcpy (kbuf, "\033Ou"); |
650 | strcpy (kbuf, "\033Ou"); |
644 | break; |
651 | break; |
645 | |
652 | |
646 | case XK_KP_Insert: |
|
|
647 | strcpy (kbuf, "\033Op"); |
|
|
648 | break; |
|
|
649 | |
|
|
650 | case XK_KP_Delete: |
|
|
651 | strcpy (kbuf, "\033On"); |
|
|
652 | break; |
|
|
653 | #endif |
653 | #endif |
654 | case XK_KP_F1: /* "\033OP" */ |
654 | case XK_KP_F1: /* "\033OP" */ |
655 | case XK_KP_F2: /* "\033OQ" */ |
655 | case XK_KP_F2: /* "\033OQ" */ |
656 | case XK_KP_F3: /* "\033OR" */ |
656 | case XK_KP_F3: /* "\033OR" */ |
657 | case XK_KP_F4: /* "\033OS" */ |
657 | case XK_KP_F4: /* "\033OS" */ |
… | |
… | |
689 | break; |
689 | break; |
690 | |
690 | |
691 | case XK_Find: |
691 | case XK_Find: |
692 | strcpy (kbuf, "\033[1~"); |
692 | strcpy (kbuf, "\033[1~"); |
693 | break; |
693 | break; |
|
|
694 | |
|
|
695 | #ifdef XK_KP_End |
|
|
696 | case XK_KP_Insert: |
|
|
697 | /* allow shift to override */ |
|
|
698 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
699 | { |
|
|
700 | strcpy (kbuf, "\033Op"); |
|
|
701 | break; |
|
|
702 | } |
|
|
703 | /* FALLTHROUGH */ |
|
|
704 | #endif |
694 | case XK_Insert: |
705 | case XK_Insert: |
695 | strcpy (kbuf, "\033[2~"); |
706 | strcpy (kbuf, "\033[2~"); |
696 | break; |
707 | break; |
697 | #ifdef DXK_Remove /* support for DEC remove like key */ |
708 | #ifdef DXK_Remove /* support for DEC remove like key */ |
698 | case DXK_Remove: |
709 | case DXK_Remove: |
… | |
… | |
785 | case XK_F35: /* "\033[49~" */ |
796 | case XK_F35: /* "\033[49~" */ |
786 | FKEY (31, XK_F17); |
797 | FKEY (31, XK_F17); |
787 | break; |
798 | break; |
788 | #undef FKEY |
799 | #undef FKEY |
789 | default: |
800 | default: |
790 | if (len == 0 |
801 | newlen = 0; |
791 | && (keysym & 0xfff0) != 0xff70 |
802 | break; |
792 | && (keysym & 0xfff0) != 0xffe0) |
|
|
793 | /* generate a keycode for every remaining keypress */ |
|
|
794 | sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym); |
|
|
795 | } |
803 | } |
796 | |
804 | |
797 | if (newlen) |
805 | if (newlen) |
798 | len = strlen (kbuf); |
806 | len = strlen (kbuf); |
799 | } |
807 | } |
… | |
… | |
815 | else if (keysym == XK_ISO_Left_Tab) |
823 | else if (keysym == XK_ISO_Left_Tab) |
816 | { |
824 | { |
817 | strcpy (kbuf, "\033[Z"); |
825 | strcpy (kbuf, "\033[Z"); |
818 | len = 3; |
826 | len = 3; |
819 | } |
827 | } |
820 | else if (len == 0 |
|
|
821 | && (keysym & 0xffe0) != 0xfe00 |
|
|
822 | && (keysym < 0xfe50 || keysym > 0xfe6f)) |
|
|
823 | { |
|
|
824 | /* generate a keycode for every remaining keypress */ |
|
|
825 | len = sprintf ((char *)kbuf, "\033[%x;%xA", (unsigned char)ev.state, (unsigned short)keysym); |
|
|
826 | } |
|
|
827 | else |
828 | else |
828 | { |
829 | { |
829 | #ifdef META8_OPTION |
830 | #ifdef META8_OPTION |
830 | /* set 8-bit on */ |
831 | /* set 8-bit on */ |
831 | if (meta && (meta_char == 0x80)) |
832 | if (meta && (meta_char == 0x80)) |
… | |
… | |
844 | |
845 | |
845 | if (len <= 0) |
846 | if (len <= 0) |
846 | return; /* not mapped */ |
847 | return; /* not mapped */ |
847 | |
848 | |
848 | if (options & Opt_scrollTtyKeypress) |
849 | if (options & Opt_scrollTtyKeypress) |
849 | if (TermWin.view_start) |
850 | if (view_start) |
850 | { |
851 | { |
851 | TermWin.view_start = 0; |
852 | view_start = 0; |
852 | want_refresh = 1; |
853 | want_refresh = 1; |
853 | } |
854 | } |
854 | |
855 | |
855 | /* |
856 | /* |
856 | * these modifications only affect the static keybuffer |
857 | * these modifications only affect the static keybuffer |
… | |
… | |
889 | #endif /* DEBUG_CMD */ |
890 | #endif /* DEBUG_CMD */ |
890 | tt_write (kbuf, (unsigned int)len); |
891 | tt_write (kbuf, (unsigned int)len); |
891 | } |
892 | } |
892 | /*}}} */ |
893 | /*}}} */ |
893 | |
894 | |
894 | #if (MENUBAR_MAX) |
895 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
895 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
896 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
896 | /* attempt to `write' count to the input buffer */ |
897 | /* attempt to `write' count to the input buffer */ |
897 | unsigned int |
898 | unsigned int |
898 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
899 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
899 | { |
900 | { |
… | |
… | |
922 | |
923 | |
923 | cmd_parse (); |
924 | cmd_parse (); |
924 | |
925 | |
925 | return 0; |
926 | return 0; |
926 | } |
927 | } |
927 | #endif /* MENUBAR_MAX */ |
928 | #endif |
928 | |
929 | |
929 | void |
930 | void |
930 | rxvt_term::flush () |
931 | rxvt_term::flush () |
931 | { |
932 | { |
932 | flush_ev.stop (); |
933 | flush_ev.stop (); |
… | |
… | |
1033 | { |
1034 | { |
1034 | if (mouse_slip_wheel_speed == 0 |
1035 | if (mouse_slip_wheel_speed == 0 |
1035 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1036 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1036 | : scr_page (UP, mouse_slip_wheel_speed)) |
1037 | : scr_page (UP, mouse_slip_wheel_speed)) |
1037 | { |
1038 | { |
|
|
1039 | if (view_start == nsaved || |
|
|
1040 | view_start == 0) |
|
|
1041 | mouse_slip_wheel_speed = 0; |
|
|
1042 | |
1038 | refresh_type |= SMOOTH_REFRESH; |
1043 | refresh_type |= SMOOTH_REFRESH; |
1039 | want_refresh = 1; |
1044 | want_refresh = 1; |
1040 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1045 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1041 | } |
1046 | } |
1042 | } |
1047 | } |
… | |
… | |
1087 | } |
1092 | } |
1088 | |
1093 | |
1089 | void |
1094 | void |
1090 | rxvt_term::pointer_unblank () |
1095 | rxvt_term::pointer_unblank () |
1091 | { |
1096 | { |
1092 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
1097 | XDefineCursor (display->display, vt, TermWin_cursor); |
1093 | recolour_cursor (); |
1098 | recolour_cursor (); |
1094 | |
1099 | |
1095 | #ifdef POINTER_BLANK |
1100 | #ifdef POINTER_BLANK |
1096 | hidden_pointer = 0; |
1101 | hidden_pointer = 0; |
1097 | |
1102 | |
… | |
… | |
1105 | rxvt_term::pointer_blank () |
1110 | rxvt_term::pointer_blank () |
1106 | { |
1111 | { |
1107 | if (! (options & Opt_pointerBlank)) |
1112 | if (! (options & Opt_pointerBlank)) |
1108 | return; |
1113 | return; |
1109 | |
1114 | |
1110 | XDefineCursor (display->display, TermWin.vt, blank_cursor); |
1115 | XDefineCursor (display->display, vt, display->blank_cursor); |
1111 | XFlush (display->display); |
1116 | XFlush (display->display); |
1112 | |
1117 | |
1113 | hidden_pointer = 1; |
1118 | hidden_pointer = 1; |
1114 | } |
1119 | } |
1115 | |
1120 | |
… | |
… | |
1204 | |
1209 | |
1205 | /*{{{ process an X event */ |
1210 | /*{{{ process an X event */ |
1206 | void |
1211 | void |
1207 | rxvt_term::x_cb (XEvent &ev) |
1212 | rxvt_term::x_cb (XEvent &ev) |
1208 | { |
1213 | { |
|
|
1214 | dDisp; |
|
|
1215 | |
1209 | SET_R (this); |
1216 | SET_R (this); |
1210 | SET_LOCALE (locale); |
1217 | SET_LOCALE (locale); |
1211 | |
1218 | |
1212 | #if defined(CURSOR_BLINK) |
1219 | #if defined(CURSOR_BLINK) |
1213 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
1220 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
… | |
… | |
1329 | button_release (ev.xbutton); |
1336 | button_release (ev.xbutton); |
1330 | break; |
1337 | break; |
1331 | |
1338 | |
1332 | case ClientMessage: |
1339 | case ClientMessage: |
1333 | if (ev.xclient.format == 32 |
1340 | if (ev.xclient.format == 32 |
|
|
1341 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1342 | { |
1334 | && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) |
1343 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1335 | destroy (); |
1344 | destroy (); |
|
|
1345 | #if ENABLE_EWMH |
|
|
1346 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
|
|
1347 | XSendEvent (disp, ev.xclient.window = display->root, |
|
|
1348 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
|
|
1349 | &ev); |
|
|
1350 | #endif |
|
|
1351 | } |
|
|
1352 | #if ENABLE_XEMBED |
|
|
1353 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1354 | { |
|
|
1355 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1356 | focus_in (); |
|
|
1357 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1358 | focus_out (); |
|
|
1359 | } |
|
|
1360 | #endif |
1336 | #ifdef OFFIX_DND |
1361 | #ifdef OFFIX_DND |
1337 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1362 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1338 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1363 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1339 | && (ev.xclient.data.l[0] == DndFile |
1364 | && (ev.xclient.data.l[0] == DndFile |
1340 | || ev.xclient.data.l[0] == DndDir |
1365 | || ev.xclient.data.l[0] == DndDir |
1341 | || ev.xclient.data.l[0] == DndLink)) |
1366 | || ev.xclient.data.l[0] == DndLink)) |
1342 | { |
1367 | { |
1343 | /* Get Dnd data */ |
1368 | /* Get Dnd data */ |
1344 | Atom ActualType; |
1369 | Atom ActualType; |
1345 | int ActualFormat; |
1370 | int ActualFormat; |
1346 | unsigned char *data; |
1371 | unsigned char *data; |
1347 | unsigned long Size, RemainingBytes; |
1372 | unsigned long Size, RemainingBytes; |
1348 | |
1373 | |
1349 | XGetWindowProperty (display->display, display->root, |
1374 | XGetWindowProperty (disp, display->root, |
1350 | xa[XA_DNDSELECTION], |
1375 | xa[XA_DNDSELECTION], |
1351 | 0L, 1000000L, |
1376 | 0L, 1000000L, |
1352 | False, AnyPropertyType, |
1377 | False, AnyPropertyType, |
1353 | &ActualType, &ActualFormat, |
1378 | &ActualType, &ActualFormat, |
1354 | &Size, &RemainingBytes, |
1379 | &Size, &RemainingBytes, |
1355 | &data); |
1380 | &data); |
1356 | set_string_property (XA_CUT_BUFFER0, data); |
1381 | set_string_property (XA_CUT_BUFFER0, data); |
1357 | XFree (data); |
1382 | XFree (data); |
1358 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
1383 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
1359 | XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); |
1384 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
1360 | } |
1385 | } |
1361 | #endif /* OFFIX_DND */ |
1386 | #endif /* OFFIX_DND */ |
1362 | break; |
1387 | break; |
1363 | |
1388 | |
1364 | case MappingNotify: |
1389 | case MappingNotify: |
… | |
… | |
1389 | break; |
1414 | break; |
1390 | } |
1415 | } |
1391 | break; |
1416 | break; |
1392 | |
1417 | |
1393 | case FocusIn: |
1418 | case FocusIn: |
1394 | if (!TermWin.focus) |
1419 | focus_in (); |
|
|
1420 | break; |
|
|
1421 | |
|
|
1422 | case FocusOut: |
|
|
1423 | focus_out (); |
|
|
1424 | break; |
|
|
1425 | |
|
|
1426 | case ConfigureNotify: |
|
|
1427 | if (ev.xconfigure.window == parent[0]) |
1395 | { |
1428 | { |
1396 | TermWin.focus = 1; |
|
|
1397 | want_refresh = 1; |
|
|
1398 | #ifdef USE_XIM |
|
|
1399 | if (Input_Context != NULL) |
|
|
1400 | { |
|
|
1401 | IMSetStatusPosition (); |
|
|
1402 | XSetICFocus (Input_Context); |
|
|
1403 | } |
|
|
1404 | #endif |
|
|
1405 | #ifdef CURSOR_BLINK |
|
|
1406 | if (options & Opt_cursorBlink) |
|
|
1407 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1408 | #endif |
|
|
1409 | #ifdef OFF_FOCUS_FADING |
|
|
1410 | if (rs[Rs_fade]) |
|
|
1411 | { |
|
|
1412 | pix_colors = pix_colors_focused; |
|
|
1413 | scr_recolour (); |
|
|
1414 | } |
|
|
1415 | #endif |
|
|
1416 | |
|
|
1417 | } |
|
|
1418 | break; |
|
|
1419 | |
|
|
1420 | case FocusOut: |
|
|
1421 | if (TermWin.focus) |
|
|
1422 | { |
|
|
1423 | TermWin.focus = 0; |
|
|
1424 | want_refresh = 1; |
|
|
1425 | |
|
|
1426 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1427 | iso14755buf = 0; |
|
|
1428 | #endif |
|
|
1429 | #if ENABLE_OVERLAY |
|
|
1430 | scr_overlay_off (); |
|
|
1431 | #endif |
|
|
1432 | #ifdef USE_XIM |
|
|
1433 | if (Input_Context != NULL) |
|
|
1434 | XUnsetICFocus (Input_Context); |
|
|
1435 | #endif |
|
|
1436 | #ifdef CURSOR_BLINK |
|
|
1437 | if (options & Opt_cursorBlink) |
|
|
1438 | cursor_blink_ev.stop (); |
|
|
1439 | hidden_cursor = 0; |
|
|
1440 | #endif |
|
|
1441 | #ifdef OFF_FOCUS_FADING |
|
|
1442 | if (rs[Rs_fade]) |
|
|
1443 | { |
|
|
1444 | pix_colors = pix_colors_unfocused; |
|
|
1445 | scr_recolour (); |
|
|
1446 | } |
|
|
1447 | #endif |
|
|
1448 | } |
|
|
1449 | break; |
|
|
1450 | |
|
|
1451 | case ConfigureNotify: |
|
|
1452 | if (ev.xconfigure.window == TermWin.parent[0]) |
|
|
1453 | { |
|
|
1454 | int height, width; |
|
|
1455 | |
|
|
1456 | do |
|
|
1457 | { /* Wrap lots of configures into one */ |
|
|
1458 | width = ev.xconfigure.width; |
|
|
1459 | height = ev.xconfigure.height; |
|
|
1460 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
|
|
1461 | } |
|
|
1462 | while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); |
1429 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) |
|
|
1430 | ; |
1463 | |
1431 | |
1464 | if (szHint.width != width || szHint.height != height) |
1432 | if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) |
1465 | { |
1433 | { |
1466 | seen_resize = 1; |
1434 | seen_resize = 1; |
1467 | resize_all_windows (width, height, 1); |
1435 | resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); |
1468 | } |
1436 | } |
1469 | |
1437 | |
1470 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1438 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1471 | if (options & Opt_transparent) |
1439 | if (options & Opt_transparent) |
1472 | check_our_parents (); |
1440 | check_our_parents (); |
… | |
… | |
1493 | case SelectionRequest: |
1461 | case SelectionRequest: |
1494 | selection_send (ev.xselectionrequest); |
1462 | selection_send (ev.xselectionrequest); |
1495 | break; |
1463 | break; |
1496 | |
1464 | |
1497 | case UnmapNotify: |
1465 | case UnmapNotify: |
1498 | TermWin.mapped = 0; |
1466 | mapped = 0; |
1499 | #ifdef TEXT_BLINK |
1467 | #ifdef TEXT_BLINK |
1500 | text_blink_ev.stop (); |
1468 | text_blink_ev.stop (); |
1501 | #endif |
1469 | #endif |
1502 | break; |
1470 | break; |
1503 | |
1471 | |
1504 | case MapNotify: |
1472 | case MapNotify: |
1505 | TermWin.mapped = 1; |
1473 | mapped = 1; |
1506 | #ifdef TEXT_BLINK |
1474 | #ifdef TEXT_BLINK |
1507 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
1475 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
1508 | #endif |
1476 | #endif |
1509 | break; |
1477 | break; |
1510 | |
1478 | |
… | |
… | |
1514 | break; |
1482 | break; |
1515 | #endif /* TRANSPARENT */ |
1483 | #endif /* TRANSPARENT */ |
1516 | |
1484 | |
1517 | case GraphicsExpose: |
1485 | case GraphicsExpose: |
1518 | case Expose: |
1486 | case Expose: |
1519 | if (ev.xany.window == TermWin.vt) |
1487 | if (ev.xany.window == vt) |
1520 | { |
1488 | { |
1521 | do |
1489 | do |
1522 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1490 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1523 | ev.xexpose.width, ev.xexpose.height, False); |
1491 | ev.xexpose.width, ev.xexpose.height, False); |
1524 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); |
1492 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); |
1525 | |
1493 | |
1526 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1494 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1527 | |
1495 | |
1528 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) |
1496 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1529 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1497 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1530 | ev.xexpose.width, ev.xexpose.height, False); |
1498 | ev.xexpose.width, ev.xexpose.height, False); |
1531 | |
1499 | |
1532 | scr_refresh (refresh_type); |
1500 | scr_refresh (refresh_type); |
1533 | } |
1501 | } |
1534 | else |
1502 | else |
1535 | { |
1503 | { |
1536 | XEvent unused_event; |
1504 | XEvent unused_event; |
1537 | |
1505 | |
1538 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) |
1506 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1539 | ; |
1507 | ; |
1540 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) |
1508 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1541 | ; |
1509 | ; |
1542 | |
1510 | |
1543 | if (isScrollbarWindow (ev.xany.window)) |
1511 | if (isScrollbarWindow (ev.xany.window)) |
1544 | { |
1512 | { |
1545 | scrollBar.setIdle (); |
1513 | scrollBar.setIdle (); |
… | |
… | |
1549 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1517 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1550 | menubar_expose (); |
1518 | menubar_expose (); |
1551 | #endif |
1519 | #endif |
1552 | |
1520 | |
1553 | #ifdef TRANSPARENT |
1521 | #ifdef TRANSPARENT |
1554 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1522 | if (am_transparent && ev.xany.window == parent[0]) |
1555 | XClearWindow (display->display, ev.xany.window); |
1523 | XClearWindow (disp, ev.xany.window); |
1556 | #endif |
1524 | #endif |
1557 | } |
1525 | } |
1558 | break; |
1526 | break; |
1559 | |
1527 | |
1560 | case MotionNotify: |
1528 | case MotionNotify: |
… | |
… | |
1570 | } |
1538 | } |
1571 | #endif |
1539 | #endif |
1572 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1540 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1573 | break; |
1541 | break; |
1574 | |
1542 | |
1575 | if (ev.xany.window == TermWin.vt) |
1543 | if (ev.xany.window == vt) |
1576 | { |
1544 | { |
1577 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1545 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1578 | { |
1546 | { |
1579 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) |
1547 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1580 | ; |
1548 | ; |
1581 | |
1549 | |
1582 | XQueryPointer (display->display, TermWin.vt, |
1550 | XQueryPointer (disp, vt, |
1583 | &unused_root, &unused_child, |
1551 | &unused_root, &unused_child, |
1584 | &unused_root_x, &unused_root_y, |
1552 | &unused_root_x, &unused_root_y, |
1585 | &ev.xbutton.x, &ev.xbutton.y, |
1553 | &ev.xbutton.x, &ev.xbutton.y, |
1586 | &ev.xbutton.state); |
1554 | &ev.xbutton.state); |
1587 | #ifdef MOUSE_THRESHOLD |
1555 | #ifdef MOUSE_THRESHOLD |
… | |
… | |
1599 | #endif |
1567 | #endif |
1600 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1568 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1601 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1569 | ev.xbutton.state & Button3Mask ? 2 : 0); |
1602 | |
1570 | |
1603 | #ifdef SELECTION_SCROLLING |
1571 | #ifdef SELECTION_SCROLLING |
1604 | if (ev.xbutton.y < TermWin.int_bwidth |
1572 | if (ev.xbutton.y < int_bwidth |
1605 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1573 | || Pixel2Row (ev.xbutton.y) > (nrow-1)) |
1606 | { |
1574 | { |
1607 | int dist; |
1575 | int dist; |
1608 | |
1576 | |
1609 | /* don't clobber the current delay if we are |
1577 | /* don't clobber the current delay if we are |
1610 | * already in the middle of scrolling. |
1578 | * already in the middle of scrolling. |
… | |
… | |
1618 | selection_save_x = ev.xbutton.x; |
1586 | selection_save_x = ev.xbutton.x; |
1619 | selection_save_y = ev.xbutton.y; |
1587 | selection_save_y = ev.xbutton.y; |
1620 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1588 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1621 | |
1589 | |
1622 | /* calc number of lines to scroll */ |
1590 | /* calc number of lines to scroll */ |
1623 | if (ev.xbutton.y < TermWin.int_bwidth) |
1591 | if (ev.xbutton.y < int_bwidth) |
1624 | { |
1592 | { |
1625 | scroll_selection_dir = UP; |
1593 | scroll_selection_dir = UP; |
1626 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1594 | dist = int_bwidth - ev.xbutton.y; |
1627 | } |
1595 | } |
1628 | else |
1596 | else |
1629 | { |
1597 | { |
1630 | scroll_selection_dir = DN; |
1598 | scroll_selection_dir = DN; |
1631 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1599 | dist = ev.xbutton.y - (int_bwidth + height); |
1632 | } |
1600 | } |
1633 | |
1601 | |
1634 | scroll_selection_lines = Pixel2Height (dist) |
1602 | scroll_selection_lines = Pixel2Height (dist) |
1635 | / SELECTION_SCROLL_LINE_SPEEDUP |
1603 | / SELECTION_SCROLL_LINE_SPEEDUP |
1636 | + 1; |
1604 | + 1; |
1637 | MIN_IT (scroll_selection_lines, |
1605 | min_it (scroll_selection_lines, |
1638 | SELECTION_SCROLL_MAX_LINES); |
1606 | SELECTION_SCROLL_MAX_LINES); |
1639 | } |
1607 | } |
1640 | else |
1608 | else |
1641 | { |
1609 | { |
1642 | /* we are within the text window, so we |
1610 | /* we are within the text window, so we |
… | |
… | |
1651 | #endif |
1619 | #endif |
1652 | } |
1620 | } |
1653 | } |
1621 | } |
1654 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1622 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1655 | { |
1623 | { |
1656 | while (XCheckTypedWindowEvent (display->display, scrollBar.win, |
1624 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1657 | MotionNotify, &ev)) |
1625 | MotionNotify, &ev)) |
1658 | ; |
1626 | ; |
1659 | |
1627 | |
1660 | XQueryPointer (display->display, scrollBar.win, |
1628 | XQueryPointer (disp, scrollBar.win, |
1661 | &unused_root, &unused_child, |
1629 | &unused_root, &unused_child, |
1662 | &unused_root_x, &unused_root_y, |
1630 | &unused_root_x, &unused_root_y, |
1663 | &ev.xbutton.x, &ev.xbutton.y, |
1631 | &ev.xbutton.x, &ev.xbutton.y, |
1664 | &unused_mask); |
1632 | &unused_mask); |
1665 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1633 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
… | |
… | |
1670 | } |
1638 | } |
1671 | break; |
1639 | break; |
1672 | } |
1640 | } |
1673 | } |
1641 | } |
1674 | |
1642 | |
|
|
1643 | void |
|
|
1644 | rxvt_term::focus_in () |
|
|
1645 | { |
|
|
1646 | if (!focus) |
|
|
1647 | { |
|
|
1648 | focus = 1; |
|
|
1649 | want_refresh = 1; |
|
|
1650 | #if USE_XIM |
|
|
1651 | if (Input_Context != NULL) |
|
|
1652 | { |
|
|
1653 | IMSetStatusPosition (); |
|
|
1654 | XSetICFocus (Input_Context); |
|
|
1655 | } |
|
|
1656 | #endif |
|
|
1657 | #if CURSOR_BLINK |
|
|
1658 | if (options & Opt_cursorBlink) |
|
|
1659 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1660 | #endif |
|
|
1661 | #if OFF_FOCUS_FADING |
|
|
1662 | if (rs[Rs_fade]) |
|
|
1663 | { |
|
|
1664 | pix_colors = pix_colors_focused; |
|
|
1665 | scr_recolour (); |
|
|
1666 | } |
|
|
1667 | #endif |
|
|
1668 | } |
|
|
1669 | } |
|
|
1670 | |
|
|
1671 | void |
|
|
1672 | rxvt_term::focus_out () |
|
|
1673 | { |
|
|
1674 | if (focus) |
|
|
1675 | { |
|
|
1676 | focus = 0; |
|
|
1677 | want_refresh = 1; |
|
|
1678 | |
|
|
1679 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1680 | iso14755buf = 0; |
|
|
1681 | #endif |
|
|
1682 | #if ENABLE_OVERLAY |
|
|
1683 | scr_overlay_off (); |
|
|
1684 | #endif |
|
|
1685 | #if USE_XIM |
|
|
1686 | if (Input_Context != NULL) |
|
|
1687 | XUnsetICFocus (Input_Context); |
|
|
1688 | #endif |
|
|
1689 | #if CURSOR_BLINK |
|
|
1690 | if (options & Opt_cursorBlink) |
|
|
1691 | cursor_blink_ev.stop (); |
|
|
1692 | hidden_cursor = 0; |
|
|
1693 | #endif |
|
|
1694 | #if OFF_FOCUS_FADING |
|
|
1695 | if (rs[Rs_fade]) |
|
|
1696 | { |
|
|
1697 | pix_colors = pix_colors_unfocused; |
|
|
1698 | scr_recolour (); |
|
|
1699 | } |
|
|
1700 | #endif |
|
|
1701 | } |
|
|
1702 | } |
|
|
1703 | |
1675 | #if TRANSPARENT |
1704 | #if TRANSPARENT |
1676 | void |
1705 | void |
1677 | rxvt_term::rootwin_cb (XEvent &ev) |
1706 | rxvt_term::rootwin_cb (XEvent &ev) |
1678 | { |
1707 | { |
1679 | SET_R (this); |
1708 | SET_R (this); |
… | |
… | |
1709 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1738 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1710 | |
1739 | |
1711 | /* |
1740 | /* |
1712 | * VT window processing of button press |
1741 | * VT window processing of button press |
1713 | */ |
1742 | */ |
1714 | if (ev.window == TermWin.vt) |
1743 | if (ev.window == vt) |
1715 | { |
1744 | { |
1716 | #if ISO_14755 |
1745 | #if ISO_14755 |
1717 | // 5.4 |
1746 | // 5.4 |
1718 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1747 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1719 | { |
1748 | { |
… | |
… | |
1767 | { |
1796 | { |
1768 | case Button1: |
1797 | case Button1: |
1769 | /* allow meta + click to select rectangular areas */ |
1798 | /* allow meta + click to select rectangular areas */ |
1770 | /* should be done in screen.C */ |
1799 | /* should be done in screen.C */ |
1771 | #if ENABLE_FRILLS |
1800 | #if ENABLE_FRILLS |
1772 | selection.rect = !! (ev.state & ModMetaMask); |
1801 | selection.rect = !!(ev.state & ModMetaMask); |
1773 | #else |
1802 | #else |
1774 | selection.rect = false; |
1803 | selection.rect = false; |
1775 | #endif |
1804 | #endif |
1776 | |
1805 | |
1777 | /* allow shift+left click to extend selection */ |
1806 | /* allow shift+left click to extend selection */ |
… | |
… | |
1924 | case Button3: |
1953 | case Button3: |
1925 | if (scrollBar.style != R_SB_XTERM) |
1954 | if (scrollBar.style != R_SB_XTERM) |
1926 | { |
1955 | { |
1927 | if (scrollbar_above_slider (ev.y)) |
1956 | if (scrollbar_above_slider (ev.y)) |
1928 | # ifdef RXVT_SCROLL_FULL |
1957 | # ifdef RXVT_SCROLL_FULL |
1929 | scr_page (UP, TermWin.nrow - 1); |
1958 | scr_page (UP, nrow - 1); |
1930 | # else |
1959 | # else |
1931 | scr_page (UP, TermWin.nrow / 4); |
1960 | scr_page (UP, nrow / 4); |
1932 | # endif |
1961 | # endif |
1933 | else if (scrollbar_below_slider (ev.y)) |
1962 | else if (scrollbar_below_slider (ev.y)) |
1934 | # ifdef RXVT_SCROLL_FULL |
1963 | # ifdef RXVT_SCROLL_FULL |
1935 | scr_page (DN, TermWin.nrow - 1); |
1964 | scr_page (DN, nrow - 1); |
1936 | # else |
1965 | # else |
1937 | scr_page (DN, TermWin.nrow / 4); |
1966 | scr_page (DN, nrow / 4); |
1938 | # endif |
1967 | # endif |
1939 | else |
1968 | else |
1940 | scrollBar.setMotion (); |
1969 | scrollBar.setMotion (); |
1941 | } |
1970 | } |
1942 | else |
1971 | else |
1943 | { |
1972 | { |
1944 | scr_page ((ev.button == Button1 ? DN : UP), |
1973 | scr_page ((ev.button == Button1 ? DN : UP), |
1945 | (TermWin.nrow |
1974 | (nrow |
1946 | * scrollbar_position (ev.y) |
1975 | * scrollbar_position (ev.y) |
1947 | / scrollbar_size ())); |
1976 | / scrollbar_size ())); |
1948 | } |
1977 | } |
1949 | |
1978 | |
1950 | break; |
1979 | break; |
… | |
… | |
1982 | #ifdef SELECTION_SCROLLING |
2011 | #ifdef SELECTION_SCROLLING |
1983 | if (sel_scroll_ev.active) |
2012 | if (sel_scroll_ev.active) |
1984 | sel_scroll_ev.stop(); |
2013 | sel_scroll_ev.stop(); |
1985 | #endif |
2014 | #endif |
1986 | |
2015 | |
1987 | if (ev.window == TermWin.vt) |
2016 | if (ev.window == vt) |
1988 | { |
2017 | { |
1989 | #if ISO_14755 |
2018 | #if ISO_14755 |
1990 | // 5.4 |
2019 | // 5.4 |
1991 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
2020 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
1992 | return; |
2021 | return; |
… | |
… | |
2043 | v = ev.button == Button4 ? UP : DN; |
2072 | v = ev.button == Button4 ? UP : DN; |
2044 | |
2073 | |
2045 | if (ev.state & ShiftMask) |
2074 | if (ev.state & ShiftMask) |
2046 | i = 1; |
2075 | i = 1; |
2047 | else if (options & Opt_mouseWheelScrollPage) |
2076 | else if (options & Opt_mouseWheelScrollPage) |
2048 | i = TermWin.nrow - 1; |
2077 | i = nrow - 1; |
2049 | else |
2078 | else |
2050 | i = 5; |
2079 | i = 5; |
2051 | |
2080 | |
2052 | # ifdef MOUSE_SLIP_WHEELING |
2081 | # ifdef MOUSE_SLIP_WHEELING |
2053 | if (ev.state & ControlMask) |
2082 | if (ev.state & ControlMask) |
2054 | { |
2083 | { |
2055 | mouse_slip_wheel_speed += v ? -1 : 1; |
2084 | mouse_slip_wheel_speed += v ? -1 : 1; |
2056 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
2085 | if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; |
2057 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
2086 | if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; |
2058 | |
2087 | |
2059 | if (slip_wheel_ev.at < NOW) |
2088 | if (slip_wheel_ev.at < NOW) |
2060 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2089 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
2061 | |
2090 | |
2062 | slip_wheel_ev.start (); |
2091 | slip_wheel_ev.start (); |
… | |
… | |
2103 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2132 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2104 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2133 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2105 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2134 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2106 | int i; |
2135 | int i; |
2107 | |
2136 | |
2108 | Visual* visual = display->visual; |
2137 | Visual *visual = display->visual; |
2109 | |
2138 | |
2110 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2139 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2111 | |
2140 | |
2112 | /* for convenience */ |
2141 | /* for convenience */ |
2113 | mask_r = visual->red_mask; |
2142 | mask_r = visual->red_mask; |
… | |
… | |
2334 | Atom atype; |
2363 | Atom atype; |
2335 | unsigned char *prop = NULL; |
2364 | unsigned char *prop = NULL; |
2336 | Window root, oldp, *list; |
2365 | Window root, oldp, *list; |
2337 | Pixmap rootpixmap = None; |
2366 | Pixmap rootpixmap = None; |
2338 | XWindowAttributes wattr, wrootattr; |
2367 | XWindowAttributes wattr, wrootattr; |
|
|
2368 | dDisp; |
2339 | |
2369 | |
2340 | pchanged = 0; |
2370 | pchanged = 0; |
2341 | |
2371 | |
2342 | if (!(options & Opt_transparent)) |
2372 | if (!(options & Opt_transparent)) |
2343 | return pchanged; /* Don't try any more */ |
2373 | return pchanged; /* Don't try any more */ |
2344 | |
2374 | |
2345 | XGetWindowAttributes (display->display, display->root, &wrootattr); |
2375 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2346 | rootdepth = wrootattr.depth; |
2376 | rootdepth = wrootattr.depth; |
2347 | |
2377 | |
2348 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
2378 | XGetWindowAttributes (disp, parent[0], &wattr); |
2349 | |
2379 | |
2350 | if (rootdepth != wattr.depth) |
2380 | if (rootdepth != wattr.depth) |
2351 | { |
2381 | { |
2352 | if (am_transparent) |
2382 | if (am_transparent) |
2353 | { |
2383 | { |
2354 | pchanged = 1; |
2384 | pchanged = 1; |
2355 | XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); |
2385 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2356 | am_transparent = am_pixmap_trans = 0; |
2386 | am_transparent = am_pixmap_trans = 0; |
2357 | } |
2387 | } |
2358 | |
2388 | |
2359 | return pchanged; /* Don't try any more */ |
2389 | return pchanged; /* Don't try any more */ |
2360 | } |
2390 | } |
2361 | |
2391 | |
2362 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2392 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2363 | XSync (display->display, False); |
2393 | XSync (disp, False); |
2364 | |
2394 | |
2365 | /* |
2395 | /* |
2366 | * Make the frame window set by the window manager have |
2396 | * Make the frame window set by the window manager have |
2367 | * the root background. Some window managers put multiple nested frame |
2397 | * the root background. Some window managers put multiple nested frame |
2368 | * windows for each client, so we have to take care about that. |
2398 | * windows for each client, so we have to take care about that. |
2369 | */ |
2399 | */ |
2370 | i = (xa[XA_XROOTPMAP_ID] |
2400 | i = (xa[XA_XROOTPMAP_ID] |
2371 | && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], |
2401 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2372 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2402 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2373 | &nitems, &bytes_after, &prop) == Success); |
2403 | &nitems, &bytes_after, &prop) == Success); |
2374 | |
2404 | |
2375 | if (!i || prop == NULL) |
2405 | if (!i || prop == NULL) |
2376 | i = (xa[XA_ESETROOT_PMAP_ID] |
2406 | i = (xa[XA_ESETROOT_PMAP_ID] |
2377 | && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], |
2407 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2378 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2408 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2379 | &nitems, &bytes_after, &prop) == Success); |
2409 | &nitems, &bytes_after, &prop) == Success); |
2380 | |
2410 | |
2381 | if (!i || prop == NULL |
2411 | if (!i || prop == NULL |
2382 | #if TINTING |
2412 | #if TINTING |
… | |
… | |
2401 | Window cr; |
2431 | Window cr; |
2402 | XImage *image; |
2432 | XImage *image; |
2403 | GC gc; |
2433 | GC gc; |
2404 | XGCValues gcvalue; |
2434 | XGCValues gcvalue; |
2405 | |
2435 | |
2406 | XTranslateCoordinates (display->display, TermWin.parent[0], display->root, |
2436 | XTranslateCoordinates (disp, parent[0], display->root, |
2407 | 0, 0, &sx, &sy, &cr); |
2437 | 0, 0, &sx, &sy, &cr); |
2408 | nw = (unsigned int)szHint.width; |
2438 | nw = (unsigned int)szHint.width; |
2409 | nh = (unsigned int)szHint.height; |
2439 | nh = (unsigned int)szHint.height; |
2410 | nx = ny = 0; |
2440 | nx = ny = 0; |
2411 | |
2441 | |
… | |
… | |
2421 | nh += sy; |
2451 | nh += sy; |
2422 | ny = -sy; |
2452 | ny = -sy; |
2423 | sy = 0; |
2453 | sy = 0; |
2424 | } |
2454 | } |
2425 | |
2455 | |
2426 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2456 | min_it (nw, (unsigned int) (wrootattr.width - sx)); |
2427 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2457 | min_it (nh, (unsigned int) (wrootattr.height - sy)); |
2428 | |
2458 | |
2429 | XSync (display->display, False); |
2459 | XSync (disp, False); |
2430 | allowedxerror = -1; |
2460 | allowedxerror = -1; |
2431 | image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2461 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2432 | |
2462 | |
2433 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2463 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2434 | /* XXX: may need a delay here? */ |
2464 | /* XXX: may need a delay here? */ |
2435 | allowedxerror = 0; |
2465 | allowedxerror = 0; |
2436 | |
2466 | |
2437 | if (image == NULL) |
2467 | if (image == NULL) |
2438 | { |
2468 | { |
2439 | if (am_transparent && am_pixmap_trans) |
2469 | if (am_transparent && am_pixmap_trans) |
2440 | { |
2470 | { |
2441 | pchanged = 1; |
2471 | pchanged = 1; |
2442 | if (TermWin.pixmap != None) |
2472 | if (pixmap != None) |
2443 | { |
2473 | { |
2444 | XFreePixmap (display->display, TermWin.pixmap); |
2474 | XFreePixmap (disp, pixmap); |
2445 | TermWin.pixmap = None; |
2475 | pixmap = None; |
2446 | } |
2476 | } |
2447 | } |
2477 | } |
2448 | |
2478 | |
2449 | am_pixmap_trans = 0; |
2479 | am_pixmap_trans = 0; |
2450 | } |
2480 | } |
2451 | else |
2481 | else |
2452 | { |
2482 | { |
2453 | if (TermWin.pixmap != None) |
2483 | if (pixmap != None) |
2454 | XFreePixmap (display->display, TermWin.pixmap); |
2484 | XFreePixmap (disp, pixmap); |
2455 | |
2485 | |
2456 | #if TINTING |
2486 | #if TINTING |
2457 | if (ISSET_PIXCOLOR (Color_tint)) |
2487 | if (ISSET_PIXCOLOR (Color_tint)) |
2458 | { |
2488 | { |
2459 | unsigned short rm, gm, bm; |
2489 | unsigned short rm, gm, bm; |
… | |
… | |
2463 | |
2493 | |
2464 | ShadeXImage (display, image, shade, rm, gm, bm); |
2494 | ShadeXImage (display, image, shade, rm, gm, bm); |
2465 | } |
2495 | } |
2466 | #endif |
2496 | #endif |
2467 | |
2497 | |
2468 | TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, |
2498 | pixmap = XCreatePixmap (disp, vt, |
2469 | szHint.width, szHint.height, image->depth); |
2499 | szHint.width, szHint.height, image->depth); |
2470 | gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); |
2500 | gc = XCreateGC (disp, vt, 0UL, &gcvalue); |
2471 | XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, |
2501 | XPutImage (disp, pixmap, gc, image, 0, 0, |
2472 | nx, ny, image->width, image->height); |
2502 | nx, ny, image->width, image->height); |
2473 | XFreeGC (display->display, gc); |
2503 | XFreeGC (disp, gc); |
2474 | XDestroyImage (image); |
2504 | XDestroyImage (image); |
2475 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); |
2505 | XSetWindowBackgroundPixmap (disp, parent[0], pixmap); |
2476 | XClearWindow (display->display, TermWin.parent[0]); |
2506 | XClearWindow (disp, parent[0]); |
2477 | |
2507 | |
2478 | if (!am_transparent || !am_pixmap_trans) |
2508 | if (!am_transparent || !am_pixmap_trans) |
2479 | pchanged = 1; |
2509 | pchanged = 1; |
2480 | |
2510 | |
2481 | am_transparent = am_pixmap_trans = 1; |
2511 | am_transparent = am_pixmap_trans = 1; |
2482 | } |
2512 | } |
2483 | } |
2513 | } |
2484 | |
2514 | |
2485 | if (am_pixmap_trans) |
2515 | if (am_pixmap_trans) |
2486 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2516 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2487 | else |
2517 | else |
2488 | { |
2518 | { |
2489 | unsigned int n; |
2519 | unsigned int n; |
2490 | /* |
2520 | /* |
2491 | * InheritPixmap transparency |
2521 | * InheritPixmap transparency |
2492 | */ |
2522 | */ |
2493 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2523 | for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2494 | { |
2524 | { |
2495 | oldp = TermWin.parent[i]; |
2525 | oldp = parent[i]; |
2496 | XQueryTree (display->display, TermWin.parent[i - 1], &root, |
2526 | XQueryTree (disp, parent[i - 1], &root, |
2497 | &TermWin.parent[i], &list, &n); |
2527 | &parent[i], &list, &n); |
2498 | XFree (list); |
2528 | XFree (list); |
2499 | |
2529 | |
2500 | if (TermWin.parent[i] == display->root) |
2530 | if (parent[i] == display->root) |
2501 | { |
2531 | { |
2502 | if (oldp != None) |
2532 | if (oldp != None) |
2503 | pchanged = 1; |
2533 | pchanged = 1; |
2504 | |
2534 | |
2505 | break; |
2535 | break; |
2506 | } |
2536 | } |
2507 | |
2537 | |
2508 | if (oldp != TermWin.parent[i]) |
2538 | if (oldp != parent[i]) |
2509 | pchanged = 1; |
2539 | pchanged = 1; |
2510 | } |
2540 | } |
2511 | |
2541 | |
2512 | n = 0; |
2542 | n = 0; |
2513 | |
2543 | |
2514 | if (pchanged) |
2544 | if (pchanged) |
2515 | { |
2545 | { |
2516 | for (; n < (unsigned int)i; n++) |
2546 | for (; n < (unsigned int)i; n++) |
2517 | { |
2547 | { |
2518 | XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); |
2548 | XGetWindowAttributes (disp, parent[n], &wattr); |
2519 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2549 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2520 | { |
2550 | { |
2521 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2551 | n = (int) (sizeof (parent) / sizeof (Window)) + 1; |
2522 | break; |
2552 | break; |
2523 | } |
2553 | } |
2524 | } |
2554 | } |
2525 | } |
2555 | } |
2526 | |
2556 | |
2527 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2557 | if (n > (int) (sizeof (parent) / sizeof (parent[0]))) |
2528 | { |
2558 | { |
2529 | XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2559 | XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); |
2530 | XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); |
2560 | XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); |
2531 | am_transparent = 0; |
2561 | am_transparent = 0; |
2532 | /* XXX: also turn off Opt_transparent? */ |
2562 | /* XXX: also turn off Opt_transparent? */ |
2533 | } |
2563 | } |
2534 | else |
2564 | else |
2535 | { |
2565 | { |
… | |
… | |
2538 | * needed for fvwm2.2.2 (and before?) */ |
2568 | * needed for fvwm2.2.2 (and before?) */ |
2539 | sleep (1); |
2569 | sleep (1); |
2540 | #endif |
2570 | #endif |
2541 | for (n = 0; n < (unsigned int)i; n++) |
2571 | for (n = 0; n < (unsigned int)i; n++) |
2542 | { |
2572 | { |
2543 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); |
2573 | XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); |
2544 | XClearWindow (display->display, TermWin.parent[n]); |
2574 | XClearWindow (disp, parent[n]); |
2545 | } |
2575 | } |
2546 | |
2576 | |
2547 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2577 | XSetWindowBackgroundPixmap (disp, vt, ParentRelative); |
2548 | am_transparent = 1; |
2578 | am_transparent = 1; |
2549 | } |
2579 | } |
2550 | |
2580 | |
2551 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2581 | for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) |
2552 | TermWin.parent[i] = None; |
2582 | parent[i] = None; |
2553 | } |
2583 | } |
2554 | |
2584 | |
2555 | if (scrollBar.win) |
2585 | if (scrollBar.win) |
2556 | { |
2586 | { |
2557 | XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); |
2587 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2558 | scrollBar.setIdle (); |
2588 | scrollBar.setIdle (); |
2559 | scrollbar_show (0); |
2589 | scrollbar_show (0); |
2560 | } |
2590 | } |
2561 | |
2591 | |
2562 | if (am_transparent) |
2592 | if (am_transparent) |
… | |
… | |
2600 | // some window managers resize the window early, and these programs |
2630 | // some window managers resize the window early, and these programs |
2601 | // then sometimes get the size wrong. |
2631 | // then sometimes get the size wrong. |
2602 | // unfortunately other programs are even more buggy and dislike |
2632 | // unfortunately other programs are even more buggy and dislike |
2603 | // being sent SIGWINCH, so only do it when we were in fact being |
2633 | // being sent SIGWINCH, so only do it when we were in fact being |
2604 | // resized. |
2634 | // resized. |
2605 | if (seen_resize) |
2635 | if (seen_resize && cmd_pid) |
2606 | kill (-cmd_pid, SIGWINCH); |
2636 | kill (-cmd_pid, SIGWINCH); |
2607 | } |
2637 | } |
2608 | |
2638 | |
2609 | /* Read a text string from the input buffer */ |
2639 | /* Read a text string from the input buffer */ |
2610 | unicode_t buf[UBUFSIZ]; |
2640 | unicode_t buf[UBUFSIZ]; |
2611 | bool refreshnow = false; |
2641 | bool refreshnow = false; |
2612 | int nlines = 0; |
2642 | int nlines = 0; |
2613 | unicode_t *str = buf; |
2643 | unicode_t *str = buf; |
|
|
2644 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2614 | |
2645 | |
2615 | for (;;) |
2646 | for (;;) |
2616 | { |
2647 | { |
2617 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2648 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2618 | break; |
2649 | break; |
2619 | |
2650 | |
2620 | *str++ = ch; |
2651 | *str++ = ch; |
2621 | |
2652 | |
2622 | if (ch == C0_LF) |
2653 | if (ch == C0_LF || str >= eol) |
2623 | { |
2654 | { |
|
|
2655 | if (ch == C0_LF) |
2624 | nlines++; |
2656 | nlines++; |
|
|
2657 | |
2625 | refresh_count++; |
2658 | refresh_count++; |
2626 | |
2659 | |
2627 | if (!(options & Opt_jumpScroll) |
2660 | if (!(options & Opt_jumpScroll) |
2628 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2661 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2629 | { |
2662 | { |
2630 | refreshnow = true; |
2663 | refreshnow = true; |
2631 | ch = NOCHAR; |
2664 | ch = NOCHAR; |
2632 | break; |
2665 | break; |
2633 | } |
2666 | } |
2634 | |
2667 | |
2635 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2668 | // scr_add_lines only works for nlines <= nrow - 1. |
2636 | if (nlines >= TermWin.nrow - 1) |
2669 | if (nlines >= nrow - 1) |
2637 | { |
2670 | { |
2638 | scr_add_lines (buf, nlines, str - buf); |
2671 | scr_add_lines (buf, nlines, str - buf); |
2639 | nlines = 0; |
2672 | nlines = 0; |
2640 | str = buf; |
2673 | str = buf; |
|
|
2674 | eol = str + min (ncol, UBUFSIZ); |
2641 | } |
2675 | } |
2642 | } |
|
|
2643 | |
2676 | |
2644 | if (str >= buf + UBUFSIZ) |
2677 | if (str >= eol) |
2645 | { |
2678 | { |
|
|
2679 | if (eol >= buf + UBUFSIZ) |
|
|
2680 | { |
2646 | ch = NOCHAR; |
2681 | ch = NOCHAR; |
2647 | break; |
2682 | break; |
|
|
2683 | } |
|
|
2684 | else |
|
|
2685 | eol = min (eol + ncol, buf + UBUFSIZ); |
|
|
2686 | } |
|
|
2687 | |
2648 | } |
2688 | } |
2649 | |
2689 | |
2650 | seq_begin = cmdbuf_ptr; |
2690 | seq_begin = cmdbuf_ptr; |
2651 | ch = next_char (); |
2691 | ch = next_char (); |
2652 | } |
2692 | } |
… | |
… | |
3196 | { |
3236 | { |
3197 | switch (priv) |
3237 | switch (priv) |
3198 | { |
3238 | { |
3199 | case '>': |
3239 | case '>': |
3200 | if (ch == CSI_DA) /* secondary device attributes */ |
3240 | if (ch == CSI_DA) /* secondary device attributes */ |
3201 | tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); |
3241 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3202 | break; |
3242 | break; |
3203 | case '?': |
3243 | case '?': |
3204 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3244 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3205 | process_terminal_mode (ch, priv, nargs, arg); |
3245 | process_terminal_mode (ch, priv, nargs, arg); |
3206 | break; |
3246 | break; |
… | |
… | |
3311 | |
3351 | |
3312 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3352 | case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ |
3313 | arg[0] = -arg[0]; |
3353 | arg[0] = -arg[0]; |
3314 | /* FALLTHROUGH */ |
3354 | /* FALLTHROUGH */ |
3315 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3355 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3316 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3356 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3317 | break; |
3357 | break; |
3318 | |
3358 | |
3319 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3359 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3320 | tt_write ((const unsigned char *)VT100_ANS, |
3360 | tt_write ((const unsigned char *)VT100_ANS, |
3321 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
3361 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
… | |
… | |
3435 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3475 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3436 | { |
3476 | { |
3437 | int x, y; |
3477 | int x, y; |
3438 | XWindowAttributes wattr; |
3478 | XWindowAttributes wattr; |
3439 | Window wdummy; |
3479 | Window wdummy; |
|
|
3480 | dDisp; |
3440 | |
3481 | |
3441 | if (nargs == 0) |
3482 | if (nargs == 0) |
3442 | return; |
3483 | return; |
3443 | |
3484 | |
3444 | switch (args[0]) |
3485 | switch (args[0]) |
3445 | { |
3486 | { |
3446 | /* |
3487 | /* |
3447 | * commands |
3488 | * commands |
3448 | */ |
3489 | */ |
3449 | case 1: /* deiconify window */ |
3490 | case 1: /* deiconify window */ |
3450 | XMapWindow (display->display, TermWin.parent[0]); |
3491 | XMapWindow (disp, parent[0]); |
3451 | break; |
3492 | break; |
3452 | case 2: /* iconify window */ |
3493 | case 2: /* iconify window */ |
3453 | XIconifyWindow (display->display, TermWin.parent[0], |
3494 | XIconifyWindow (disp, parent[0], display->screen); |
3454 | DefaultScreen (display->display)); |
|
|
3455 | break; |
3495 | break; |
3456 | case 3: /* set position (pixels) */ |
3496 | case 3: /* set position (pixels) */ |
3457 | XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); |
3497 | XMoveWindow (disp, parent[0], args[1], args[2]); |
3458 | break; |
3498 | break; |
3459 | case 4: /* set size (pixels) */ |
3499 | case 4: /* set size (pixels) */ |
3460 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3500 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3461 | break; |
3501 | break; |
3462 | case 5: /* raise window */ |
3502 | case 5: /* raise window */ |
3463 | XRaiseWindow (display->display, TermWin.parent[0]); |
3503 | XRaiseWindow (disp, parent[0]); |
3464 | break; |
3504 | break; |
3465 | case 6: /* lower window */ |
3505 | case 6: /* lower window */ |
3466 | XLowerWindow (display->display, TermWin.parent[0]); |
3506 | XLowerWindow (disp, parent[0]); |
3467 | break; |
3507 | break; |
3468 | case 7: /* refresh window */ |
3508 | case 7: /* refresh window */ |
3469 | scr_touch (true); |
3509 | scr_touch (true); |
3470 | break; |
3510 | break; |
3471 | case 8: /* set size (chars) */ |
3511 | case 8: /* set size (chars) */ |
3472 | set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), |
3512 | set_widthheight ((unsigned int) (args[2] * fwidth), |
3473 | (unsigned int) (args[1] * TermWin.fheight)); |
3513 | (unsigned int) (args[1] * fheight)); |
3474 | break; |
3514 | break; |
3475 | |
3515 | |
3476 | //case 9: NYI, TODO, restore maximized window or maximize window |
3516 | //case 9: NYI, TODO, restore maximized window or maximize window |
3477 | default: |
3517 | default: |
3478 | if (args[0] >= 24) /* set height (chars) */ |
3518 | if (args[0] >= 24) /* set height (chars) */ |
3479 | set_widthheight ((unsigned int)TermWin.width, |
3519 | set_widthheight ((unsigned int)width, |
3480 | (unsigned int) (args[1] * TermWin.fheight)); |
3520 | (unsigned int) (args[1] * fheight)); |
3481 | break; |
3521 | break; |
3482 | |
3522 | |
3483 | |
3523 | |
3484 | /* |
3524 | /* |
3485 | * reports - some output format copied from XTerm |
3525 | * reports - some output format copied from XTerm |
3486 | */ |
3526 | */ |
3487 | case 11: /* report window state */ |
3527 | case 11: /* report window state */ |
3488 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3528 | XGetWindowAttributes (disp, parent[0], &wattr); |
3489 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3529 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3490 | break; |
3530 | break; |
3491 | case 13: /* report window position */ |
3531 | case 13: /* report window position */ |
3492 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3532 | XGetWindowAttributes (disp, parent[0], &wattr); |
3493 | XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, |
3533 | XTranslateCoordinates (disp, parent[0], wattr.root, |
3494 | -wattr.border_width, -wattr.border_width, |
3534 | -wattr.border_width, -wattr.border_width, |
3495 | &x, &y, &wdummy); |
3535 | &x, &y, &wdummy); |
3496 | tt_printf ("\033[3;%d;%dt", x, y); |
3536 | tt_printf ("\033[3;%d;%dt", x, y); |
3497 | break; |
3537 | break; |
3498 | case 14: /* report window size (pixels) */ |
3538 | case 14: /* report window size (pixels) */ |
3499 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3539 | XGetWindowAttributes (disp, parent[0], &wattr); |
3500 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3540 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3501 | break; |
3541 | break; |
3502 | case 18: /* report text area size (chars) */ |
3542 | case 18: /* report text area size (chars) */ |
3503 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3543 | tt_printf ("\033[8;%d;%dt", nrow, ncol); |
3504 | break; |
3544 | break; |
3505 | case 19: /* report window size (chars) */ |
3545 | case 19: /* report window size (chars) */ |
3506 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3546 | tt_printf ("\033[9;%d;%dt", nrow, ncol); |
3507 | break; |
3547 | break; |
3508 | case 20: /* report icon label */ |
3548 | case 20: /* report icon label */ |
3509 | { |
3549 | { |
3510 | char *s; |
3550 | char *s; |
3511 | XGetIconName (display->display, TermWin.parent[0], &s); |
3551 | XGetIconName (disp, parent[0], &s); |
3512 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3552 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3513 | XFree (s); |
3553 | XFree (s); |
3514 | } |
3554 | } |
3515 | break; |
3555 | break; |
3516 | case 21: /* report window title */ |
3556 | case 21: /* report window title */ |
3517 | { |
3557 | { |
3518 | char *s; |
3558 | char *s; |
3519 | XFetchName (display->display, TermWin.parent[0], &s); |
3559 | XFetchName (disp, parent[0], &s); |
3520 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3560 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3521 | XFree (s); |
3561 | XFree (s); |
3522 | } |
3562 | } |
3523 | break; |
3563 | break; |
3524 | } |
3564 | } |
… | |
… | |
3557 | else if (ch < 0x20) |
3597 | else if (ch < 0x20) |
3558 | return NULL; /* other control character - exit */ |
3598 | return NULL; /* other control character - exit */ |
3559 | |
3599 | |
3560 | seen_esc = false; |
3600 | seen_esc = false; |
3561 | |
3601 | |
3562 | if (n >= sizeof (string) - 1) |
3602 | if (n >= STRING_MAX - 1) |
3563 | // stop at some sane length |
3603 | // stop at some sane length |
3564 | return NULL; |
3604 | return NULL; |
3565 | |
3605 | |
3566 | if (ch == C0_SYN) |
3606 | if (ch == C0_SYN) |
3567 | string[n++] = cmd_get8 (); |
3607 | string[n++] = cmd_get8 (); |
… | |
… | |
3635 | set_window_color (color, str); |
3675 | set_window_color (color, str); |
3636 | } |
3676 | } |
3637 | |
3677 | |
3638 | /* |
3678 | /* |
3639 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3679 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3640 | * 0 = change iconName/title |
|
|
3641 | * 1 = change iconName |
|
|
3642 | * 2 = change title |
|
|
3643 | * 4 = change color |
|
|
3644 | * 10 = change fg color |
|
|
3645 | * 11 = change bg color |
|
|
3646 | * 12 = change text color |
|
|
3647 | * 13 = change mouse foreground color |
|
|
3648 | * 17 = change highlight character colour |
|
|
3649 | * 18 = change bold character color |
|
|
3650 | * 19 = change underlined character color |
|
|
3651 | * 46 = change logfile (not implemented) |
|
|
3652 | * 50 = change font |
|
|
3653 | * |
|
|
3654 | * rxvt extensions: |
|
|
3655 | * 20 = bg pixmap |
|
|
3656 | * 39 = change default fg color |
|
|
3657 | * 49 = change default bg color |
|
|
3658 | * 55 = dump scrollback buffer and all of screen |
|
|
3659 | * 701 = change locale |
|
|
3660 | * 702 = find font |
|
|
3661 | * 703 = menu |
|
|
3662 | */ |
3680 | */ |
3663 | void |
3681 | void |
3664 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3682 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3665 | { |
3683 | { |
3666 | int changed = 0; |
3684 | int changed = 0; |
3667 | int color; |
3685 | int color; |
3668 | char *buf, *name; |
3686 | char *buf, *name; |
3669 | bool query = str[0] == '?' && !str[1]; |
3687 | bool query = str[0] == '?' && !str[1]; |
3670 | int saveop = op; |
3688 | int saveop = op; |
|
|
3689 | dDisp; |
3671 | |
3690 | |
3672 | assert (str != NULL); |
3691 | assert (str != NULL); |
3673 | switch (op) |
3692 | switch (op) |
3674 | { |
3693 | { |
3675 | case XTerm_name: |
3694 | case XTerm_name: |
… | |
… | |
3691 | unsigned long bytes_after; |
3710 | unsigned long bytes_after; |
3692 | unsigned char *value = 0; |
3711 | unsigned char *value = 0; |
3693 | const char *str = ""; |
3712 | const char *str = ""; |
3694 | |
3713 | |
3695 | if (prop |
3714 | if (prop |
3696 | && XGetWindowProperty (display->display, TermWin.parent[0], |
3715 | && XGetWindowProperty (disp, parent[0], |
3697 | prop, 0, 1<<16, 0, AnyPropertyType, |
3716 | prop, 0, 1<<16, 0, AnyPropertyType, |
3698 | &actual_type, &actual_format, |
3717 | &actual_type, &actual_format, |
3699 | &nitems, &bytes_after, &value) == Success |
3718 | &nitems, &bytes_after, &value) == Success |
3700 | && actual_type != None |
3719 | && actual_type != None |
3701 | && actual_format == 8) |
3720 | && actual_format == 8) |
… | |
… | |
3713 | { |
3732 | { |
3714 | *eq = 0; |
3733 | *eq = 0; |
3715 | set_utf8_property (display->atom (str), eq + 1); |
3734 | set_utf8_property (display->atom (str), eq + 1); |
3716 | } |
3735 | } |
3717 | else |
3736 | else |
3718 | XDeleteProperty (display->display, TermWin.parent[0], |
3737 | XDeleteProperty (disp, parent[0], |
3719 | display->atom (str)); |
3738 | display->atom (str)); |
3720 | } |
3739 | } |
3721 | break; |
3740 | break; |
3722 | |
3741 | |
3723 | case XTerm_Color: |
3742 | case XTerm_Color: |
… | |
… | |
3764 | break; |
3783 | break; |
3765 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3784 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3766 | case XTerm_Color_BD: |
3785 | case XTerm_Color_BD: |
3767 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
3786 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
3768 | break; |
3787 | break; |
3769 | case XTerm_Color_IT: |
|
|
3770 | process_color_seq (XTerm_Color_IT, Color_IT, str, resp); |
|
|
3771 | break; |
|
|
3772 | case XTerm_Color_UL: |
3788 | case XTerm_Color_UL: |
3773 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
3789 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
3774 | break; |
3790 | break; |
3775 | case XTerm_Color_RV: |
3791 | case XTerm_Color_RV: |
3776 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3792 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3777 | break; |
3793 | break; |
|
|
3794 | case URxvt_Color_IT: |
|
|
3795 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
|
|
3796 | break; |
3778 | #endif |
3797 | #endif |
3779 | #if TRANSPARENT && TINTING |
3798 | #if TRANSPARENT && TINTING |
3780 | case XTerm_Color_tint: |
3799 | case URxvt_Color_tint: |
3781 | process_color_seq (XTerm_Color_tint, Color_tint, str, resp); |
3800 | process_color_seq (URxvt_Color_tint, Color_tint, str, resp); |
3782 | check_our_parents (); |
3801 | check_our_parents (); |
3783 | if (am_transparent) |
3802 | if (am_transparent) |
3784 | want_full_refresh = want_refresh = 1; |
3803 | want_full_refresh = want_refresh = 1; |
3785 | break; |
3804 | break; |
3786 | #endif |
3805 | #endif |
… | |
… | |
3798 | { |
3817 | { |
3799 | str++; |
3818 | str++; |
3800 | #if XPM_BACKGROUND |
3819 | #if XPM_BACKGROUND |
3801 | changed += scale_pixmap (str); |
3820 | changed += scale_pixmap (str); |
3802 | #endif |
3821 | #endif |
3803 | |
|
|
3804 | } |
3822 | } |
|
|
3823 | |
3805 | if (changed) |
3824 | if (changed) |
3806 | { |
3825 | { |
3807 | #ifdef XPM_BACKGROUND |
3826 | #ifdef XPM_BACKGROUND |
3808 | resize_pixmap (); |
3827 | resize_pixmap (); |
3809 | #endif |
3828 | #endif |
… | |
… | |
3820 | |
3839 | |
3821 | case XTerm_logfile: |
3840 | case XTerm_logfile: |
3822 | // TODO, when secure mode? |
3841 | // TODO, when secure mode? |
3823 | break; |
3842 | break; |
3824 | |
3843 | |
|
|
3844 | #ifdef MENUBAR |
|
|
3845 | case URxvt_Menu: |
|
|
3846 | if (options & Opt_insecure) |
|
|
3847 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
|
|
3848 | break; |
|
|
3849 | #endif |
|
|
3850 | #if 0 |
|
|
3851 | case XTerm_dumpscreen: /* no error notices */ |
|
|
3852 | { |
|
|
3853 | int fd; |
|
|
3854 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
|
|
3855 | { |
|
|
3856 | scr_dump (fd); |
|
|
3857 | close (fd); |
|
|
3858 | } |
|
|
3859 | } |
|
|
3860 | break; |
|
|
3861 | #endif |
3825 | case XTerm_font: |
3862 | case XTerm_font: |
3826 | op = URxvt_font; |
3863 | op = URxvt_font; |
3827 | case URxvt_font: |
3864 | case URxvt_font: |
3828 | #if ENABLE_STYLES |
3865 | #if ENABLE_STYLES |
3829 | case URxvt_boldFont: |
3866 | case URxvt_boldFont: |
3830 | case URxvt_italicFont: |
3867 | case URxvt_italicFont: |
3831 | case URxvt_boldItalicFont: |
3868 | case URxvt_boldItalicFont: |
3832 | #endif |
3869 | #endif |
3833 | if (query) |
3870 | if (query) |
3834 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3871 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3835 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3872 | (options & Opt_insecure) && fontset[op - URxvt_font]->fontdesc |
3836 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3873 | ? fontset[op - URxvt_font]->fontdesc : "", |
3837 | resp); |
3874 | resp); |
3838 | else |
3875 | else |
3839 | { |
3876 | { |
3840 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3877 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3841 | |
3878 | |
… | |
… | |
3844 | set_fonts (); |
3881 | set_fonts (); |
3845 | } |
3882 | } |
3846 | break; |
3883 | break; |
3847 | |
3884 | |
3848 | #if ENABLE_FRILLS |
3885 | #if ENABLE_FRILLS |
3849 | case XTerm_locale: |
3886 | case URxvt_locale: |
3850 | if (query) |
3887 | if (query) |
3851 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); |
3888 | tt_printf ("\33]%d;%-.250s%c", URxvt_locale, (options & Opt_insecure) ? locale : "", resp); |
3852 | else |
3889 | else |
3853 | { |
3890 | { |
3854 | set_locale (str); |
3891 | set_locale (str); |
3855 | # ifdef USE_XIM |
3892 | pty.set_utf8_mode (enc_utf8); |
3856 | im_cb (); |
3893 | init_xlocale (); |
3857 | # endif |
|
|
3858 | } |
3894 | } |
3859 | break; |
3895 | break; |
3860 | #endif |
|
|
3861 | |
3896 | |
3862 | #ifdef MENUBAR |
3897 | case URxvt_view_up: |
3863 | case XTerm_Menu: |
3898 | case URxvt_view_down: |
3864 | if (options & Opt_insecure) |
3899 | int lines = atoi (str); |
3865 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3900 | |
3866 | break; |
3901 | if (lines) |
3867 | #endif |
3902 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3868 | #if 0 |
|
|
3869 | case XTerm_dumpscreen: /* no error notices */ |
|
|
3870 | { |
3903 | else |
3871 | int fd; |
|
|
3872 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
|
|
3873 | { |
3904 | { |
3874 | scr_dump (fd); |
3905 | scr_erase_savelines (); |
3875 | close (fd); |
|
|
3876 | } |
3906 | } |
3877 | } |
3907 | |
3878 | break; |
3908 | break; |
3879 | #endif |
3909 | #endif |
3880 | } |
3910 | } |
3881 | } |
3911 | } |
3882 | /*----------------------------------------------------------------------*/ |
3912 | /*----------------------------------------------------------------------*/ |
… | |
… | |
4015 | */ |
4045 | */ |
4016 | PrivMode (1, PrivMode_vt52); |
4046 | PrivMode (1, PrivMode_vt52); |
4017 | break; |
4047 | break; |
4018 | case 3: /* 80/132 */ |
4048 | case 3: /* 80/132 */ |
4019 | if (priv_modes & PrivMode_132OK) |
4049 | if (priv_modes & PrivMode_132OK) |
4020 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4050 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4021 | break; |
4051 | break; |
4022 | case 4: /* smooth scrolling */ |
4052 | case 4: /* smooth scrolling */ |
4023 | if (state) |
4053 | if (state) |
4024 | options &= ~Opt_jumpScroll; |
4054 | options &= ~Opt_jumpScroll; |
4025 | else |
4055 | else |