1 | /*--------------------------------*-C-*---------------------------------* |
1 | /*--------------------------------*-C-*---------------------------------* |
2 | * File: command.c |
2 | * File: command.C |
3 | *----------------------------------------------------------------------* |
3 | *----------------------------------------------------------------------* |
4 | * |
4 | * |
5 | * All portions of code are copyright by their respective author/s. |
5 | * All portions of code are copyright by their respective author/s. |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
6 | * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> |
7 | * - original version |
7 | * - original version |
… | |
… | |
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 | |
59 | // exception thrown when the command parser runs out of input data |
63 | // exception thrown when the command parser runs out of input data |
60 | class out_of_input { } out_of_input; |
64 | class out_of_input { } out_of_input; |
|
|
65 | |
|
|
66 | #if ENABLE_FRILLS || ISO_14755 |
|
|
67 | |
|
|
68 | #define ISO_14755_STARTED 0x80000000UL |
|
|
69 | #define ISO_14755_51 0x40000000UL // basic (section 5.1) |
|
|
70 | #define ISO_14755_52 0x20000000UL // keycap (section 5.2) |
|
|
71 | #define ISO_14755_54 0x10000000UL // code feedback (section 5.4) |
|
|
72 | #define ISO_14755_MASK 0x0fffffffUL |
|
|
73 | |
|
|
74 | #if ISO_14755 |
|
|
75 | static unsigned short iso14755_symtab[] = { |
|
|
76 | // keysym, unicode |
|
|
77 | XK_Left, 0x2190, |
|
|
78 | XK_KP_Left, 0x2190, |
|
|
79 | XK_Up, 0x2191, |
|
|
80 | XK_KP_Up, 0x2191, |
|
|
81 | XK_Right, 0x2192, |
|
|
82 | XK_KP_Right, 0x2192, |
|
|
83 | XK_Down, 0x2193, |
|
|
84 | XK_KP_Down, 0x2193, |
|
|
85 | XK_Linefeed, 0x21b4, |
|
|
86 | XK_Return, 0x21b5, |
|
|
87 | XK_KP_Enter, 0x21b5, |
|
|
88 | |
|
|
89 | XK_Prior, 0x21de, |
|
|
90 | XK_Next, 0x21df, |
|
|
91 | XK_Tab, 0x21e5, |
|
|
92 | XK_ISO_Left_Tab, 0x21e6, |
|
|
93 | XK_Shift_L, 0x21e7, |
|
|
94 | XK_Shift_R, 0x21e7, |
|
|
95 | |
|
|
96 | XK_Shift_Lock, 0x21eb, |
|
|
97 | XK_ISO_Lock, 0x21eb, |
|
|
98 | XK_ISO_Lock, 0x21eb, |
|
|
99 | XK_Caps_Lock, 0x21ec, |
|
|
100 | XK_Num_Lock, 0x21ed, |
|
|
101 | XK_ISO_Level3_Shift, 0x21ee, |
|
|
102 | XK_ISO_Level3_Lock, 0x21ef, |
|
|
103 | XK_ISO_Group_Lock, 0x21f0, |
|
|
104 | XK_Home, 0x21f1, |
|
|
105 | XK_End, 0x21f2, |
|
|
106 | |
|
|
107 | XK_Execute, 0x2318, |
|
|
108 | XK_Begin, 0x2320, |
|
|
109 | XK_Delete, 0x2326, |
|
|
110 | XK_Clear, 0x2327, |
|
|
111 | XK_BackSpace, 0x232b, |
|
|
112 | XK_Insert, 0x2380, |
|
|
113 | XK_Control_L, 0x2388, |
|
|
114 | XK_Control_R, 0x2388, |
|
|
115 | XK_Pause, 0x2389, |
|
|
116 | XK_Break, 0x238a, |
|
|
117 | XK_Escape, 0x238b, |
|
|
118 | XK_Undo, 0x238c, |
|
|
119 | XK_Print, 0x2399, |
|
|
120 | |
|
|
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, |
|
|
129 | XK_KP_Space, 0x2422, |
|
|
130 | #endif |
|
|
131 | 0, |
|
|
132 | }; |
|
|
133 | |
|
|
134 | void |
|
|
135 | rxvt_term::iso14755_54 (int x, int y) |
|
|
136 | { |
|
|
137 | x = Pixel2Col (x); |
|
|
138 | y = Pixel2Row (y); |
|
|
139 | |
|
|
140 | if (x < 0 || x >= TermWin.ncol |
|
|
141 | || y < 0 || y >= TermWin.nrow) |
|
|
142 | return; |
|
|
143 | |
|
|
144 | for (;;) |
|
|
145 | { |
|
|
146 | text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; |
|
|
147 | |
|
|
148 | if (t != NOCHAR || !x) |
|
|
149 | { |
|
|
150 | iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], |
|
|
151 | screen.rend[y + TermWin.saveLines - TermWin.view_start][x]); |
|
|
152 | iso14755buf = ISO_14755_54; |
|
|
153 | break; |
|
|
154 | } |
|
|
155 | |
|
|
156 | x--; |
|
|
157 | } |
|
|
158 | |
|
|
159 | } |
|
|
160 | #endif |
|
|
161 | |
|
|
162 | #if ENABLE_OVERLAY |
|
|
163 | void |
|
|
164 | rxvt_term::iso14755_51 (unicode_t ch, rend_t r) |
|
|
165 | { |
|
|
166 | rxvt_fontset *fs = FONTSET (r); |
|
|
167 | rxvt_font *f = (*fs)[fs->find_font (ch)]; |
|
|
168 | wchar_t *chr, *alloc, ch2; |
|
|
169 | int len; |
|
|
170 | |
|
|
171 | #if ENABLE_COMBINING |
|
|
172 | if (IS_COMPOSE (ch)) |
|
|
173 | { |
|
|
174 | len = rxvt_composite.expand (ch, 0); |
|
|
175 | alloc = chr = new wchar_t[len]; |
|
|
176 | rxvt_composite.expand (ch, chr); |
|
|
177 | } |
|
|
178 | else |
|
|
179 | #endif |
|
|
180 | { |
|
|
181 | ch2 = ch; |
|
|
182 | |
|
|
183 | alloc = 0; |
|
|
184 | chr = &ch2; |
|
|
185 | len = 1; |
|
|
186 | } |
|
|
187 | |
|
|
188 | int width = strlen (f->name); |
|
|
189 | |
|
|
190 | scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); |
|
|
191 | |
|
|
192 | r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); |
|
|
193 | |
|
|
194 | for (int y = 0; y < len; y++) |
|
|
195 | { |
|
|
196 | char buf[9]; |
|
|
197 | |
|
|
198 | ch = *chr++; |
|
|
199 | |
|
|
200 | sprintf (buf, "%8x", ch); |
|
|
201 | scr_overlay_set (0, y, buf); |
|
|
202 | scr_overlay_set (9, y, '='); |
|
|
203 | #if !UNICODE3 |
|
|
204 | if (ch >= 0x10000) |
|
|
205 | ch = 0xfffd; |
|
|
206 | #endif |
|
|
207 | scr_overlay_set (11, y, ch, r); |
|
|
208 | scr_overlay_set (12, y, NOCHAR, r); |
|
|
209 | } |
|
|
210 | |
|
|
211 | scr_overlay_set (0, len, f->name); |
|
|
212 | |
|
|
213 | #if ENABLE_COMBINING |
|
|
214 | if (alloc) |
|
|
215 | delete [] alloc; |
|
|
216 | #endif |
|
|
217 | } |
|
|
218 | #endif |
|
|
219 | |
|
|
220 | void |
|
|
221 | rxvt_term::commit_iso14755 () |
|
|
222 | { |
|
|
223 | wchar_t ch[2]; |
|
|
224 | |
|
|
225 | ch[0] = iso14755buf & ISO_14755_MASK; |
|
|
226 | ch[1] = 0; |
|
|
227 | |
|
|
228 | if (iso14755buf & ISO_14755_51) |
|
|
229 | { |
|
|
230 | char mb[16]; |
|
|
231 | int len; |
|
|
232 | |
|
|
233 | // allow verbatim 0-bytes and control-bytes to be entered |
|
|
234 | if (ch[0] >= 0x20) |
|
|
235 | len = wcstombs (mb, ch, 16); |
|
|
236 | else |
|
|
237 | { |
|
|
238 | mb[0] = ch[0]; |
|
|
239 | len = 1; |
|
|
240 | } |
|
|
241 | |
|
|
242 | if (len > 0) |
|
|
243 | tt_write ((unsigned char *)mb, len); |
|
|
244 | else |
|
|
245 | scr_bell (); |
|
|
246 | } |
|
|
247 | |
|
|
248 | iso14755buf = 0; |
|
|
249 | } |
|
|
250 | |
|
|
251 | int |
|
|
252 | rxvt_term::hex_keyval (XKeyEvent &ev) |
|
|
253 | { |
|
|
254 | // check wether this event corresponds to a hex digit |
|
|
255 | // if the modifiers had not been pressed. |
|
|
256 | for (int index = 0; index < 8; index++) |
|
|
257 | { |
|
|
258 | KeySym k = XLookupKeysym (&ev, index); |
|
|
259 | |
|
|
260 | if (k >= XK_KP_0 && k <= XK_KP_9) return k - XK_KP_0; |
|
|
261 | else if (k >= XK_0 && k <= XK_9) return k - XK_0; |
|
|
262 | else if (k >= XK_a && k <= XK_f) return k - XK_a + 10; |
|
|
263 | else if (k >= XK_A && k <= XK_F) return k - XK_A + 10; |
|
|
264 | } |
|
|
265 | |
|
|
266 | return -1; |
|
|
267 | } |
|
|
268 | #endif |
61 | |
269 | |
62 | /*{{{ Convert the keypress event into a string */ |
270 | /*{{{ Convert the keypress event into a string */ |
63 | void |
271 | void |
64 | rxvt_term::lookup_key (XKeyEvent &ev) |
272 | rxvt_term::lookup_key (XKeyEvent &ev) |
65 | { |
273 | { |
… | |
… | |
76 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
284 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
77 | * escape sequence to toggle the Keypad. |
285 | * escape sequence to toggle the Keypad. |
78 | * |
286 | * |
79 | * Always permit `shift' to override the current setting |
287 | * Always permit `shift' to override the current setting |
80 | */ |
288 | */ |
81 | shft = (ev.state & ShiftMask); |
289 | shft = ev.state & ShiftMask; |
82 | ctrl = (ev.state & ControlMask); |
290 | ctrl = ev.state & ControlMask; |
83 | meta = (ev.state & ModMetaMask); |
291 | meta = ev.state & ModMetaMask; |
84 | |
292 | |
85 | if (numlock_state || (ev.state & ModNumLockMask)) |
293 | if (numlock_state || (ev.state & ModNumLockMask)) |
86 | { |
294 | { |
87 | numlock_state = (ev.state & ModNumLockMask); |
295 | numlock_state = (ev.state & ModNumLockMask); |
88 | PrivMode ((!numlock_state), PrivMode_aplKP); |
296 | PrivMode ((!numlock_state), PrivMode_aplKP); |
… | |
… | |
147 | valid_keysym = keysym != NoSymbol; |
355 | valid_keysym = keysym != NoSymbol; |
148 | } |
356 | } |
149 | |
357 | |
150 | if (valid_keysym) |
358 | if (valid_keysym) |
151 | { |
359 | { |
|
|
360 | #ifdef KEYSYM_RESOURCE |
|
|
361 | if (keyboard->dispatch (this, keysym, ev.state)) |
|
|
362 | return; |
|
|
363 | #endif |
|
|
364 | |
152 | if (TermWin.saveLines) |
365 | if (TermWin.saveLines) |
153 | { |
366 | { |
154 | #ifdef UNSHIFTED_SCROLLKEYS |
367 | #ifdef UNSHIFTED_SCROLLKEYS |
155 | if (!ctrl && !meta) |
368 | if (!ctrl && !meta) |
156 | { |
|
|
157 | #else |
369 | #else |
158 | if (IS_SCROLL_MOD) |
370 | if (IS_SCROLL_MOD) |
|
|
371 | #endif |
159 | { |
372 | { |
160 | #endif |
|
|
161 | int lnsppg; |
373 | int lnsppg; |
162 | |
374 | |
163 | #ifdef PAGING_CONTEXT_LINES |
375 | #ifdef PAGING_CONTEXT_LINES |
164 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
376 | lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; |
165 | #else |
377 | #else |
… | |
… | |
214 | if (keysym >= XK_F1 && keysym <= XK_F10) |
426 | if (keysym >= XK_F1 && keysym <= XK_F10) |
215 | { |
427 | { |
216 | keysym += (XK_F11 - XK_F1); |
428 | keysym += (XK_F11 - XK_F1); |
217 | shft = 0; /* turn off Shift */ |
429 | shft = 0; /* turn off Shift */ |
218 | } |
430 | } |
219 | else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) |
431 | else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) |
220 | { |
432 | { |
221 | switch (keysym) |
433 | switch (keysym) |
222 | { |
434 | { |
223 | /* normal XTerm key bindings */ |
435 | /* normal XTerm key bindings */ |
224 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
436 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
225 | selection_request (ev.time, 0, 0); |
437 | selection_request (ev.time, 0, 0); |
226 | return; |
438 | return; |
|
|
439 | #if TODO |
227 | /* rxvt extras */ |
440 | /* rxvt extras */ |
228 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
441 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
229 | change_font (FONT_UP); |
442 | change_font (FONT_UP); |
230 | return; |
443 | return; |
231 | case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ |
444 | case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ |
232 | change_font (FONT_DN); |
445 | change_font (FONT_DN); |
233 | return; |
446 | return; |
|
|
447 | #endif |
234 | } |
448 | } |
235 | } |
449 | } |
236 | } |
450 | } |
237 | #ifdef PRINTPIPE |
451 | |
238 | if (keysym == XK_Print) |
452 | #if ENABLE_FRILLS || ISO_14755 |
239 | { |
453 | // ISO 14755 support |
240 | scr_printscreen (ctrl | shft); |
454 | if (shft && ctrl) |
241 | return; |
|
|
242 | } |
455 | { |
243 | #endif |
456 | int hv; |
244 | |
457 | |
245 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
458 | if (iso14755buf & ISO_14755_51 |
246 | { |
459 | && (keysym == XK_space || keysym == XK_KP_Space |
247 | #ifdef KEYSYM_RESOURCE |
460 | || keysym == XK_Return || keysym == XK_KP_Enter)) |
248 | if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) |
|
|
249 | { |
461 | { |
250 | unsigned int l; |
462 | commit_iso14755 (); |
251 | const unsigned char *kbuf0; |
463 | iso14755buf = ISO_14755_51; |
252 | |
464 | # if ISO_14755 |
253 | kbuf0 = (Keysym_map[keysym & 0xFF]); |
465 | iso14755_51 (0); |
254 | l = (unsigned int)*kbuf0++; |
|
|
255 | |
|
|
256 | /* escape prefix */ |
|
|
257 | if (meta |
|
|
258 | # ifdef META8_OPTION |
|
|
259 | && meta_char == C0_ESC |
|
|
260 | # endif |
466 | # endif |
261 | ) |
467 | return; |
262 | { |
|
|
263 | const unsigned char ch = C0_ESC; |
|
|
264 | tt_write (&ch, 1); |
|
|
265 | } |
468 | } |
266 | |
469 | else if ((hv = hex_keyval (ev)) >= 0) |
267 | tt_write (kbuf0, l); |
470 | { |
|
|
471 | iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) |
|
|
472 | | hv | ISO_14755_51; |
|
|
473 | # if ISO_14755 |
|
|
474 | iso14755_51 (iso14755buf & ISO_14755_MASK); |
|
|
475 | # endif |
268 | return; |
476 | return; |
269 | } |
477 | } |
270 | else |
478 | else |
|
|
479 | { |
|
|
480 | # if ENABLE_OVERLAY |
|
|
481 | scr_overlay_off (); |
271 | #endif |
482 | # endif |
|
|
483 | iso14755buf = 0; |
|
|
484 | } |
|
|
485 | } |
|
|
486 | else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) |
|
|
487 | || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) |
|
|
488 | if (!(iso14755buf & ISO_14755_STARTED)) |
|
|
489 | { |
|
|
490 | iso14755buf |= ISO_14755_STARTED; |
|
|
491 | # if ENABLE_OVERLAY |
|
|
492 | scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); |
|
|
493 | scr_overlay_set (0, 0, "ISO 14755 mode"); |
|
|
494 | # endif |
|
|
495 | } |
|
|
496 | #endif |
|
|
497 | |
|
|
498 | #ifdef PRINTPIPE |
|
|
499 | if (keysym == XK_Print) |
|
|
500 | { |
|
|
501 | scr_printscreen (ctrl | shft); |
|
|
502 | return; |
|
|
503 | } |
|
|
504 | #endif |
|
|
505 | |
|
|
506 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
|
|
507 | { |
272 | { |
508 | { |
273 | newlen = 1; |
509 | newlen = 1; |
274 | switch (keysym) |
510 | switch (keysym) |
275 | { |
511 | { |
276 | #ifndef NO_BACKSPACE_KEY |
512 | #ifndef NO_BACKSPACE_KEY |
277 | case XK_BackSpace: |
513 | case XK_BackSpace: |
278 | if (PrivateModes & PrivMode_HaveBackSpace) |
514 | if (priv_modes & PrivMode_HaveBackSpace) |
279 | { |
515 | { |
280 | kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) |
516 | kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) |
281 | ^ !!ctrl) ? '\b' : '\177'; |
517 | ^ !!ctrl) ? '\b' : '\177'; |
282 | kbuf[1] = '\0'; |
518 | kbuf[1] = '\0'; |
283 | } |
519 | } |
284 | else |
520 | else |
285 | STRCPY (kbuf, key_backspace); |
521 | strcpy (kbuf, key_backspace); |
286 | break; |
522 | break; |
287 | #endif |
523 | #endif |
288 | #ifndef NO_DELETE_KEY |
524 | #ifndef NO_DELETE_KEY |
|
|
525 | # ifdef XK_KP_Prior |
|
|
526 | case XK_KP_Delete: |
|
|
527 | /* allow shift to override */ |
|
|
528 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
529 | { |
|
|
530 | strcpy (kbuf, "\033On"); |
|
|
531 | break; |
|
|
532 | } |
|
|
533 | /* FALLTHROUGH */ |
|
|
534 | # endif |
289 | case XK_Delete: |
535 | case XK_Delete: |
290 | STRCPY (kbuf, key_delete); |
536 | strcpy (kbuf, key_delete); |
291 | break; |
537 | break; |
292 | #endif |
538 | #endif |
293 | case XK_Tab: |
539 | case XK_Tab: |
294 | if (shft) |
540 | if (shft) |
295 | STRCPY (kbuf, "\033[Z"); |
541 | strcpy (kbuf, "\033[Z"); |
296 | else |
542 | else |
297 | { |
543 | { |
298 | #ifdef CTRL_TAB_MAKES_META |
544 | #ifdef CTRL_TAB_MAKES_META |
299 | if (ctrl) |
545 | if (ctrl) |
300 | meta = 1; |
546 | meta = 1; |
… | |
… | |
306 | newlen = 0; |
552 | newlen = 0; |
307 | } |
553 | } |
308 | break; |
554 | break; |
309 | |
555 | |
310 | #ifdef XK_KP_Left |
556 | #ifdef XK_KP_Left |
311 | case XK_KP_Up: /* \033Ox or standard */ |
557 | case XK_KP_Up: /* \033Ox or standard */ |
312 | case XK_KP_Down: /* \033Or or standard */ |
558 | case XK_KP_Down: /* \033Or or standard */ |
313 | case XK_KP_Right: /* \033Ov or standard */ |
559 | case XK_KP_Right: /* \033Ov or standard */ |
314 | case XK_KP_Left: /* \033Ot or standard */ |
560 | case XK_KP_Left: /* \033Ot or standard */ |
315 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
561 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
316 | { |
562 | { |
317 | STRCPY (kbuf, "\033OZ"); |
563 | strcpy (kbuf, "\033OZ"); |
318 | kbuf[2] = "txvr"[keysym - XK_KP_Left]; |
564 | kbuf[2] = "txvr"[keysym - XK_KP_Left]; |
319 | break; |
565 | break; |
320 | } |
566 | } |
321 | else |
567 | else |
322 | /* translate to std. cursor key */ |
568 | /* translate to std. cursor key */ |
… | |
… | |
325 | #endif |
571 | #endif |
326 | case XK_Up: /* "\033[A" */ |
572 | case XK_Up: /* "\033[A" */ |
327 | case XK_Down: /* "\033[B" */ |
573 | case XK_Down: /* "\033[B" */ |
328 | case XK_Right: /* "\033[C" */ |
574 | case XK_Right: /* "\033[C" */ |
329 | case XK_Left: /* "\033[D" */ |
575 | case XK_Left: /* "\033[D" */ |
330 | STRCPY (kbuf, "\033[Z"); |
576 | strcpy (kbuf, "\033[Z"); |
331 | kbuf[2] = "DACB"[keysym - XK_Left]; |
577 | kbuf[2] = "DACB"[keysym - XK_Left]; |
332 | /* do Shift first */ |
578 | /* do Shift first */ |
333 | if (shft) |
579 | if (shft) |
334 | kbuf[2] = "dacb"[keysym - XK_Left]; |
580 | kbuf[2] = "dacb"[keysym - XK_Left]; |
335 | else if (ctrl) |
581 | else if (ctrl) |
336 | { |
582 | { |
337 | kbuf[1] = 'O'; |
583 | kbuf[1] = 'O'; |
338 | kbuf[2] = "dacb"[keysym - XK_Left]; |
584 | kbuf[2] = "dacb"[keysym - XK_Left]; |
339 | } |
585 | } |
340 | else if (PrivateModes & PrivMode_aplCUR) |
586 | else if (priv_modes & PrivMode_aplCUR) |
341 | kbuf[1] = 'O'; |
587 | kbuf[1] = 'O'; |
342 | break; |
588 | break; |
343 | |
589 | |
344 | #ifndef UNSHIFTED_SCROLLKEYS |
590 | #ifndef UNSHIFTED_SCROLLKEYS |
345 | # ifdef XK_KP_Prior |
591 | # ifdef XK_KP_Prior |
346 | case XK_KP_Prior: |
592 | case XK_KP_Prior: |
347 | /* allow shift to override */ |
593 | /* allow shift to override */ |
348 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
594 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
349 | { |
595 | { |
350 | STRCPY (kbuf, "\033Oy"); |
596 | strcpy (kbuf, "\033Oy"); |
351 | break; |
597 | break; |
352 | } |
598 | } |
353 | /* FALLTHROUGH */ |
599 | /* FALLTHROUGH */ |
354 | # endif |
600 | # endif |
355 | case XK_Prior: |
601 | case XK_Prior: |
356 | STRCPY (kbuf, "\033[5~"); |
602 | strcpy (kbuf, "\033[5~"); |
357 | break; |
603 | break; |
358 | # ifdef XK_KP_Next |
604 | # ifdef XK_KP_Next |
359 | case XK_KP_Next: |
605 | case XK_KP_Next: |
360 | /* allow shift to override */ |
606 | /* allow shift to override */ |
361 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
607 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
362 | { |
608 | { |
363 | STRCPY (kbuf, "\033Os"); |
609 | strcpy (kbuf, "\033Os"); |
364 | break; |
610 | break; |
365 | } |
611 | } |
366 | /* FALLTHROUGH */ |
612 | /* FALLTHROUGH */ |
367 | # endif |
613 | # endif |
368 | case XK_Next: |
614 | case XK_Next: |
369 | STRCPY (kbuf, "\033[6~"); |
615 | strcpy (kbuf, "\033[6~"); |
370 | break; |
616 | break; |
371 | #endif |
617 | #endif |
372 | case XK_KP_Enter: |
618 | case XK_KP_Enter: |
373 | /* allow shift to override */ |
619 | /* allow shift to override */ |
374 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
620 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
375 | { |
621 | { |
376 | STRCPY (kbuf, "\033OM"); |
622 | strcpy (kbuf, "\033OM"); |
|
|
623 | break; |
|
|
624 | } |
|
|
625 | |
|
|
626 | /* FALLTHROUGH */ |
|
|
627 | |
|
|
628 | case XK_Return: |
|
|
629 | if (priv_modes & PrivMode_LFNL) |
|
|
630 | { |
|
|
631 | kbuf[0] = '\015'; |
|
|
632 | kbuf[1] = '\012'; |
|
|
633 | kbuf[2] = '\0'; |
377 | } |
634 | } |
378 | else |
635 | else |
379 | { |
636 | { |
380 | kbuf[0] = '\r'; |
637 | kbuf[0] = '\015'; |
381 | kbuf[1] = '\0'; |
638 | kbuf[1] = '\0'; |
382 | } |
639 | } |
383 | break; |
640 | break; |
384 | |
641 | |
385 | #ifdef XK_KP_Begin |
642 | #ifdef XK_KP_Begin |
386 | case XK_KP_Begin: |
643 | case XK_KP_Begin: |
387 | STRCPY (kbuf, "\033Ou"); |
644 | strcpy (kbuf, "\033Ou"); |
388 | break; |
645 | break; |
389 | |
646 | |
390 | case XK_KP_Insert: |
|
|
391 | STRCPY (kbuf, "\033Op"); |
|
|
392 | break; |
|
|
393 | |
|
|
394 | case XK_KP_Delete: |
|
|
395 | STRCPY (kbuf, "\033On"); |
|
|
396 | break; |
|
|
397 | #endif |
647 | #endif |
398 | case XK_KP_F1: /* "\033OP" */ |
648 | case XK_KP_F1: /* "\033OP" */ |
399 | case XK_KP_F2: /* "\033OQ" */ |
649 | case XK_KP_F2: /* "\033OQ" */ |
400 | case XK_KP_F3: /* "\033OR" */ |
650 | case XK_KP_F3: /* "\033OR" */ |
401 | case XK_KP_F4: /* "\033OS" */ |
651 | case XK_KP_F4: /* "\033OS" */ |
402 | STRCPY (kbuf, "\033OP"); |
652 | strcpy (kbuf, "\033OP"); |
403 | kbuf[2] += (keysym - XK_KP_F1); |
653 | kbuf[2] += (keysym - XK_KP_F1); |
404 | break; |
654 | break; |
405 | |
655 | |
406 | case XK_KP_Multiply: /* "\033Oj" : "*" */ |
656 | case XK_KP_Multiply: /* "\033Oj" : "*" */ |
407 | case XK_KP_Add: /* "\033Ok" : "+" */ |
657 | case XK_KP_Add: /* "\033Ok" : "+" */ |
… | |
… | |
418 | case XK_KP_6: /* "\033Ov" : "6" */ |
668 | case XK_KP_6: /* "\033Ov" : "6" */ |
419 | case XK_KP_7: /* "\033Ow" : "7" */ |
669 | case XK_KP_7: /* "\033Ow" : "7" */ |
420 | case XK_KP_8: /* "\033Ox" : "8" */ |
670 | case XK_KP_8: /* "\033Ox" : "8" */ |
421 | case XK_KP_9: /* "\033Oy" : "9" */ |
671 | case XK_KP_9: /* "\033Oy" : "9" */ |
422 | /* allow shift to override */ |
672 | /* allow shift to override */ |
423 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
673 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
424 | { |
674 | { |
425 | STRCPY (kbuf, "\033Oj"); |
675 | strcpy (kbuf, "\033Oj"); |
426 | kbuf[2] += (keysym - XK_KP_Multiply); |
676 | kbuf[2] += (keysym - XK_KP_Multiply); |
427 | } |
677 | } |
428 | else |
678 | else |
429 | { |
679 | { |
430 | kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); |
680 | kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); |
431 | kbuf[1] = '\0'; |
681 | kbuf[1] = '\0'; |
432 | } |
682 | } |
433 | break; |
683 | break; |
434 | |
684 | |
435 | case XK_Find: |
685 | case XK_Find: |
436 | STRCPY (kbuf, "\033[1~"); |
686 | strcpy (kbuf, "\033[1~"); |
437 | break; |
687 | break; |
|
|
688 | |
|
|
689 | #ifdef XK_KP_End |
|
|
690 | case XK_KP_Insert: |
|
|
691 | /* allow shift to override */ |
|
|
692 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
|
|
693 | { |
|
|
694 | strcpy (kbuf, "\033Op"); |
|
|
695 | break; |
|
|
696 | } |
|
|
697 | /* FALLTHROUGH */ |
|
|
698 | #endif |
438 | case XK_Insert: |
699 | case XK_Insert: |
439 | STRCPY (kbuf, "\033[2~"); |
700 | strcpy (kbuf, "\033[2~"); |
440 | break; |
701 | break; |
441 | #ifdef DXK_Remove /* support for DEC remove like key */ |
702 | #ifdef DXK_Remove /* support for DEC remove like key */ |
442 | case DXK_Remove: |
703 | case DXK_Remove: |
443 | /* FALLTHROUGH */ |
704 | /* FALLTHROUGH */ |
444 | #endif |
705 | #endif |
445 | case XK_Execute: |
706 | case XK_Execute: |
446 | STRCPY (kbuf, "\033[3~"); |
707 | strcpy (kbuf, "\033[3~"); |
447 | break; |
708 | break; |
448 | case XK_Select: |
709 | case XK_Select: |
449 | STRCPY (kbuf, "\033[4~"); |
710 | strcpy (kbuf, "\033[4~"); |
450 | break; |
711 | break; |
451 | #ifdef XK_KP_End |
712 | #ifdef XK_KP_End |
452 | case XK_KP_End: |
713 | case XK_KP_End: |
453 | /* allow shift to override */ |
714 | /* allow shift to override */ |
454 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
715 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
455 | { |
716 | { |
456 | STRCPY (kbuf, "\033Oq"); |
717 | strcpy (kbuf, "\033Oq"); |
457 | break; |
718 | break; |
458 | } |
719 | } |
459 | /* FALLTHROUGH */ |
720 | /* FALLTHROUGH */ |
460 | #endif |
721 | #endif |
461 | case XK_End: |
722 | case XK_End: |
462 | STRCPY (kbuf, KS_END); |
723 | strcpy (kbuf, KS_END); |
463 | break; |
724 | break; |
464 | #ifdef XK_KP_Home |
725 | #ifdef XK_KP_Home |
465 | case XK_KP_Home: |
726 | case XK_KP_Home: |
466 | /* allow shift to override */ |
727 | /* allow shift to override */ |
467 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
728 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
468 | { |
729 | { |
469 | STRCPY (kbuf, "\033Ow"); |
730 | strcpy (kbuf, "\033Ow"); |
470 | break; |
731 | break; |
471 | } |
732 | } |
472 | /* FALLTHROUGH */ |
733 | /* FALLTHROUGH */ |
473 | #endif |
734 | #endif |
474 | case XK_Home: |
735 | case XK_Home: |
475 | STRCPY (kbuf, KS_HOME); |
736 | strcpy (kbuf, KS_HOME); |
476 | break; |
737 | break; |
477 | |
738 | |
478 | #define FKEY(n, fkey) \ |
739 | #define FKEY(n, fkey) \ |
479 | sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) |
740 | sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) |
480 | |
741 | |
… | |
… | |
532 | #undef FKEY |
793 | #undef FKEY |
533 | default: |
794 | default: |
534 | newlen = 0; |
795 | newlen = 0; |
535 | break; |
796 | break; |
536 | } |
797 | } |
|
|
798 | |
537 | if (newlen) |
799 | if (newlen) |
538 | len = STRLEN (kbuf); |
800 | len = strlen (kbuf); |
539 | } |
801 | } |
540 | |
802 | |
541 | /* |
803 | /* |
542 | * Pass meta for all function keys, if 'meta' option set |
804 | * Pass meta for all function keys, if 'meta' option set |
543 | */ |
805 | */ |
… | |
… | |
550 | else if (ctrl && keysym == XK_minus) |
812 | else if (ctrl && keysym == XK_minus) |
551 | { |
813 | { |
552 | len = 1; |
814 | len = 1; |
553 | kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ |
815 | kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ |
554 | } |
816 | } |
|
|
817 | else if (keysym == XK_ISO_Left_Tab) |
|
|
818 | { |
|
|
819 | strcpy (kbuf, "\033[Z"); |
|
|
820 | len = 3; |
|
|
821 | } |
555 | else |
822 | else |
556 | { |
823 | { |
557 | #ifdef META8_OPTION |
824 | #ifdef META8_OPTION |
558 | /* set 8-bit on */ |
825 | /* set 8-bit on */ |
559 | if (meta && (meta_char == 0x80)) |
826 | if (meta && (meta_char == 0x80)) |
… | |
… | |
571 | } |
838 | } |
572 | |
839 | |
573 | if (len <= 0) |
840 | if (len <= 0) |
574 | return; /* not mapped */ |
841 | return; /* not mapped */ |
575 | |
842 | |
576 | if (Options & Opt_scrollTtyKeypress) |
843 | if (options & Opt_scrollTtyKeypress) |
577 | if (TermWin.view_start) |
844 | if (TermWin.view_start) |
578 | { |
845 | { |
579 | TermWin.view_start = 0; |
846 | TermWin.view_start = 0; |
580 | want_refresh = 1; |
847 | want_refresh = 1; |
581 | } |
848 | } |
… | |
… | |
617 | #endif /* DEBUG_CMD */ |
884 | #endif /* DEBUG_CMD */ |
618 | tt_write (kbuf, (unsigned int)len); |
885 | tt_write (kbuf, (unsigned int)len); |
619 | } |
886 | } |
620 | /*}}} */ |
887 | /*}}} */ |
621 | |
888 | |
622 | #if (MENUBAR_MAX) |
889 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
623 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
890 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
624 | /* attempt to `write' count to the input buffer */ |
891 | /* attempt to `write' count to the input buffer */ |
625 | unsigned int |
892 | unsigned int |
626 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
893 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
627 | { |
894 | { |
… | |
… | |
630 | n = cmdbuf_ptr - cmdbuf_base; |
897 | n = cmdbuf_ptr - cmdbuf_base; |
631 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
898 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
632 | |
899 | |
633 | if (n > 0 && s < count) |
900 | if (n > 0 && s < count) |
634 | { |
901 | { |
635 | MEMMOVE (cmdbuf_base, cmdbuf_ptr, |
902 | memmove (cmdbuf_base, cmdbuf_ptr, |
636 | (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); |
903 | (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); |
637 | cmdbuf_ptr = cmdbuf_base; |
904 | cmdbuf_ptr = cmdbuf_base; |
638 | cmdbuf_endp -= n; |
905 | cmdbuf_endp -= n; |
639 | s += n; |
906 | s += n; |
640 | } |
907 | } |
… | |
… | |
650 | |
917 | |
651 | cmd_parse (); |
918 | cmd_parse (); |
652 | |
919 | |
653 | return 0; |
920 | return 0; |
654 | } |
921 | } |
655 | #endif /* MENUBAR_MAX */ |
922 | #endif |
656 | |
923 | |
657 | void |
924 | void |
658 | rxvt_term::flush () |
925 | rxvt_term::flush () |
659 | { |
926 | { |
|
|
927 | flush_ev.stop (); |
|
|
928 | |
660 | #ifdef TRANSPARENT |
929 | #ifdef TRANSPARENT |
661 | if (want_full_refresh) |
930 | if (want_full_refresh) |
662 | { |
931 | { |
663 | want_full_refresh = 0; |
932 | want_full_refresh = 0; |
664 | scr_clear (); |
933 | scr_clear (); |
665 | scr_touch (false); |
934 | scr_touch (false); |
666 | want_refresh = 1; |
|
|
667 | } |
935 | } |
668 | #endif |
936 | #endif |
669 | |
937 | |
670 | if (want_refresh) |
938 | if (want_refresh) |
671 | { |
939 | { |
672 | scr_refresh (refresh_type); |
940 | scr_refresh (refresh_type); |
673 | scrollbar_show (1); |
941 | scrollbar_show (1); |
674 | #ifdef USE_XIM |
942 | #ifdef USE_XIM |
675 | IMSendSpot (); |
943 | IMSendSpot (); |
676 | #endif |
944 | #endif |
677 | |
|
|
678 | } |
945 | } |
679 | |
946 | |
680 | display->flush (); |
947 | display->flush (); |
681 | } |
948 | } |
682 | |
949 | |
… | |
… | |
684 | rxvt_term::check_cb (check_watcher &w) |
951 | rxvt_term::check_cb (check_watcher &w) |
685 | { |
952 | { |
686 | SET_R (this); |
953 | SET_R (this); |
687 | SET_LOCALE (locale); |
954 | SET_LOCALE (locale); |
688 | |
955 | |
|
|
956 | display->flush (); |
|
|
957 | |
|
|
958 | if (want_refresh && !flush_ev.active) |
|
|
959 | flush_ev.start (NOW + 0.01); |
|
|
960 | } |
|
|
961 | |
|
|
962 | void |
|
|
963 | rxvt_term::flush_cb (time_watcher &w) |
|
|
964 | { |
|
|
965 | SET_R (this); |
|
|
966 | SET_LOCALE (locale); |
|
|
967 | |
|
|
968 | refresh_limit = 1; |
|
|
969 | refresh_count = 0; |
689 | flush (); |
970 | flush (); |
690 | } |
971 | } |
691 | |
972 | |
692 | #ifdef CURSOR_BLINK |
973 | #ifdef CURSOR_BLINK |
693 | void |
974 | void |
… | |
… | |
711 | w.start (w.at + TEXT_BLINK_INTERVAL); |
992 | w.start (w.at + TEXT_BLINK_INTERVAL); |
712 | } |
993 | } |
713 | } |
994 | } |
714 | #endif |
995 | #endif |
715 | |
996 | |
|
|
997 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
|
|
998 | void |
|
|
999 | rxvt_term::cont_scroll_cb (time_watcher &w) |
|
|
1000 | { |
|
|
1001 | if ((scrollbar_isUp() || scrollbar_isDn()) && |
|
|
1002 | scr_page (scrollbar_isUp() ? UP : DN, 1)) |
|
|
1003 | { |
|
|
1004 | refresh_type |= SMOOTH_REFRESH; |
|
|
1005 | want_refresh = 1; |
|
|
1006 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
|
|
1007 | } |
|
|
1008 | } |
|
|
1009 | #endif |
|
|
1010 | |
|
|
1011 | #ifdef SELECTION_SCROLLING |
|
|
1012 | void |
|
|
1013 | rxvt_term::sel_scroll_cb (time_watcher &w) |
|
|
1014 | { |
|
|
1015 | if (scr_page (scroll_selection_dir, scroll_selection_lines)) |
|
|
1016 | { |
|
|
1017 | selection_extend (selection_save_x, selection_save_y, selection_save_state); |
|
|
1018 | refresh_type |= SMOOTH_REFRESH; |
|
|
1019 | want_refresh = 1; |
|
|
1020 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
|
|
1021 | } |
|
|
1022 | } |
|
|
1023 | #endif |
|
|
1024 | |
|
|
1025 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
|
|
1026 | void |
|
|
1027 | rxvt_term::slip_wheel_cb (time_watcher &w) |
|
|
1028 | { |
|
|
1029 | if (mouse_slip_wheel_speed == 0 |
|
|
1030 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
|
|
1031 | : scr_page (UP, mouse_slip_wheel_speed)) |
|
|
1032 | { |
|
|
1033 | if (TermWin.view_start == TermWin.nscrolled || |
|
|
1034 | TermWin.view_start == 0) |
|
|
1035 | mouse_slip_wheel_speed = 0; |
|
|
1036 | |
|
|
1037 | refresh_type |= SMOOTH_REFRESH; |
|
|
1038 | want_refresh = 1; |
|
|
1039 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
|
|
1040 | } |
|
|
1041 | } |
|
|
1042 | #endif |
|
|
1043 | |
716 | bool |
1044 | bool |
717 | rxvt_term::pty_fill () |
1045 | rxvt_term::pty_fill () |
718 | { |
1046 | { |
719 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1047 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
|
|
1048 | |
|
|
1049 | if (CBUFSIZ == n) |
|
|
1050 | { |
|
|
1051 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
|
|
1052 | n = 0; |
|
|
1053 | } |
720 | |
1054 | |
721 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1055 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
722 | cmdbuf_ptr = cmdbuf_base; |
1056 | cmdbuf_ptr = cmdbuf_base; |
723 | cmdbuf_endp = cmdbuf_ptr + n; |
1057 | cmdbuf_endp = cmdbuf_ptr + n; |
724 | |
1058 | |
725 | n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); |
1059 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
726 | |
1060 | |
727 | if (n > 0) |
1061 | if (n > 0) |
728 | { |
1062 | { |
729 | cmdbuf_endp += n; |
1063 | cmdbuf_endp += n; |
730 | return true; |
1064 | return true; |
… | |
… | |
739 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1073 | rxvt_term::pty_cb (io_watcher &w, short revents) |
740 | { |
1074 | { |
741 | SET_R (this); |
1075 | SET_R (this); |
742 | SET_LOCALE (locale); |
1076 | SET_LOCALE (locale); |
743 | |
1077 | |
|
|
1078 | if (revents & EVENT_READ) |
|
|
1079 | // loop, but don't allow a single term to monopolize us |
|
|
1080 | while (pty_fill ()) |
|
|
1081 | if (cmd_parse ()) |
|
|
1082 | break; |
|
|
1083 | |
744 | if (revents & EVENT_WRITE) |
1084 | if (revents & EVENT_WRITE) |
745 | tt_write (0, 0); |
1085 | pty_write (); |
746 | else if (revents & EVENT_READ) |
1086 | } |
747 | { |
|
|
748 | // loop, but don't allow a single term to monopolize us |
|
|
749 | // the number of loops is fully arbitrary, and thus wrong |
|
|
750 | while (pty_fill ()) |
|
|
751 | { |
|
|
752 | if (!seen_input) |
|
|
753 | { |
|
|
754 | seen_input = 1; |
|
|
755 | /* once we know the shell is running, send the screen size. Again! */ |
|
|
756 | // I don't know why, btw. |
|
|
757 | tt_winch (); |
|
|
758 | } |
|
|
759 | |
1087 | |
760 | if (cmd_parse ()) |
1088 | void |
761 | break; |
1089 | rxvt_term::pointer_unblank () |
762 | } |
1090 | { |
763 | } |
1091 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
|
|
1092 | recolour_cursor (); |
|
|
1093 | |
|
|
1094 | #ifdef POINTER_BLANK |
|
|
1095 | hidden_pointer = 0; |
|
|
1096 | |
|
|
1097 | if (options & Opt_pointerBlank) |
|
|
1098 | pointer_ev.start (NOW + pointerBlankDelay); |
|
|
1099 | #endif |
764 | } |
1100 | } |
765 | |
1101 | |
766 | #ifdef POINTER_BLANK |
1102 | #ifdef POINTER_BLANK |
767 | void |
1103 | void |
768 | rxvt_term::pointer_unblank () |
|
|
769 | { |
|
|
770 | XDefineCursor (display->display, TermWin.vt, TermWin_cursor); |
|
|
771 | recolour_cursor (); |
|
|
772 | |
|
|
773 | hidden_pointer = 0; |
|
|
774 | |
|
|
775 | if (Options & Opt_pointerBlank) |
|
|
776 | pointer_ev.start (NOW + pointerBlankDelay); |
|
|
777 | } |
|
|
778 | |
|
|
779 | void |
|
|
780 | rxvt_term::pointer_blank () |
1104 | rxvt_term::pointer_blank () |
781 | { |
1105 | { |
782 | if (! (Options & Opt_pointerBlank)) |
1106 | if (! (options & Opt_pointerBlank)) |
783 | return; |
1107 | return; |
784 | |
1108 | |
785 | XDefineCursor (display->display, TermWin.vt, blank_cursor); |
1109 | XDefineCursor (display->display, TermWin.vt, display->blank_cursor); |
786 | XFlush (display->display); |
1110 | XFlush (display->display); |
787 | |
1111 | |
788 | hidden_pointer = 1; |
1112 | hidden_pointer = 1; |
789 | } |
1113 | } |
790 | |
1114 | |
… | |
… | |
807 | x = ev.x; |
1131 | x = ev.x; |
808 | y = ev.y; |
1132 | y = ev.y; |
809 | pixel_position (&x, &y); |
1133 | pixel_position (&x, &y); |
810 | |
1134 | |
811 | if (MEvent.button == AnyButton) |
1135 | if (MEvent.button == AnyButton) |
812 | { |
|
|
813 | button_number = 3; |
1136 | button_number = 3; |
814 | } |
|
|
815 | else |
1137 | else |
816 | { |
1138 | { |
817 | button_number = MEvent.button - Button1; |
1139 | button_number = MEvent.button - Button1; |
818 | /* add 0x3D for wheel events, like xterm does */ |
1140 | /* add 0x3D for wheel events, like xterm does */ |
819 | if (button_number >= 3) |
1141 | if (button_number >= 3) |
820 | button_number += (64 - 3); |
1142 | button_number += (64 - 3); |
821 | } |
1143 | } |
822 | |
1144 | |
823 | if (PrivateModes & PrivMode_MouseX10) |
1145 | if (priv_modes & PrivMode_MouseX10) |
824 | { |
1146 | { |
825 | /* |
1147 | /* |
826 | * do not report ButtonRelease |
1148 | * do not report ButtonRelease |
827 | * no state info allowed |
1149 | * no state info allowed |
828 | */ |
1150 | */ |
… | |
… | |
843 | + ((MEvent.state & ModMetaMask) ? 8 : 0) |
1165 | + ((MEvent.state & ModMetaMask) ? 8 : 0) |
844 | + ((MEvent.state & ControlMask) ? 16 : 0); |
1166 | + ((MEvent.state & ControlMask) ? 16 : 0); |
845 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1167 | #ifdef MOUSE_REPORT_DOUBLECLICK |
846 | key_state += ((MEvent.clicks > 1) ? 32 : 0); |
1168 | key_state += ((MEvent.clicks > 1) ? 32 : 0); |
847 | #endif |
1169 | #endif |
848 | |
|
|
849 | } |
1170 | } |
850 | |
1171 | |
851 | #ifdef DEBUG_MOUSEREPORT |
1172 | #if DEBUG_MOUSEREPORT |
852 | fprintf (stderr, "Mouse ["); |
1173 | fprintf (stderr, "Mouse ["); |
853 | if (key_state & 16) |
1174 | if (key_state & 16) |
854 | fputc ('C', stderr); |
1175 | fputc ('C', stderr); |
855 | if (key_state & 4) |
1176 | if (key_state & 4) |
856 | fputc ('S', stderr); |
1177 | fputc ('S', stderr); |
… | |
… | |
860 | fputc ('2', stderr); |
1181 | fputc ('2', stderr); |
861 | fprintf (stderr, "]: <%d>, %d/%d\n", |
1182 | fprintf (stderr, "]: <%d>, %d/%d\n", |
862 | button_number, |
1183 | button_number, |
863 | x + 1, |
1184 | x + 1, |
864 | y + 1); |
1185 | y + 1); |
865 | #else |
1186 | #endif |
|
|
1187 | |
866 | tt_printf ("\033[M%c%c%c", |
1188 | tt_printf ("\033[M%c%c%c", |
867 | (32 + button_number + key_state), |
1189 | (32 + button_number + key_state), |
868 | (32 + x + 1), |
1190 | (32 + x + 1), |
869 | (32 + y + 1)); |
1191 | (32 + y + 1)); |
870 | #endif |
|
|
871 | } |
1192 | } |
872 | |
1193 | |
873 | #ifdef USING_W11LIB |
1194 | #ifdef USING_W11LIB |
874 | void |
1195 | void |
875 | rxvt_W11_process_x_event (XEvent *ev) |
1196 | rxvt_W11_process_x_event (XEvent *ev) |
… | |
… | |
882 | |
1203 | |
883 | /*{{{ process an X event */ |
1204 | /*{{{ process an X event */ |
884 | void |
1205 | void |
885 | rxvt_term::x_cb (XEvent &ev) |
1206 | rxvt_term::x_cb (XEvent &ev) |
886 | { |
1207 | { |
|
|
1208 | dDisp; |
|
|
1209 | |
887 | SET_R (this); |
1210 | SET_R (this); |
888 | SET_LOCALE (locale); |
1211 | SET_LOCALE (locale); |
889 | |
1212 | |
890 | #if defined(CURSOR_BLINK) |
1213 | #if defined(CURSOR_BLINK) |
891 | if ((Options & Opt_cursorBlink) && ev.type == KeyPress) |
1214 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
892 | { |
1215 | { |
893 | if (hidden_cursor) |
1216 | if (hidden_cursor) |
894 | { |
1217 | { |
895 | hidden_cursor = 0; |
1218 | hidden_cursor = 0; |
896 | want_refresh = 1; |
1219 | want_refresh = 1; |
… | |
… | |
899 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1222 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
900 | } |
1223 | } |
901 | #endif |
1224 | #endif |
902 | |
1225 | |
903 | #if defined(POINTER_BLANK) |
1226 | #if defined(POINTER_BLANK) |
904 | if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) |
1227 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
905 | { |
1228 | { |
906 | if (ev.type == MotionNotify |
1229 | if (ev.type == MotionNotify |
907 | || ev.type == ButtonPress |
1230 | || ev.type == ButtonPress |
908 | || ev.type == ButtonRelease) |
1231 | || ev.type == ButtonRelease) |
909 | if (hidden_pointer) |
1232 | if (hidden_pointer) |
… | |
… | |
912 | if (ev.type == KeyPress && hidden_pointer == 0) |
1235 | if (ev.type == KeyPress && hidden_pointer == 0) |
913 | pointer_blank (); |
1236 | pointer_blank (); |
914 | } |
1237 | } |
915 | #endif |
1238 | #endif |
916 | |
1239 | |
917 | #ifdef USE_XIM |
|
|
918 | if (XFilterEvent (&ev, None)) |
|
|
919 | return; |
|
|
920 | #endif |
|
|
921 | |
|
|
922 | Window unused_root, unused_child; |
1240 | Window unused_root, unused_child; |
923 | int unused_root_x, unused_root_y; |
1241 | int unused_root_x, unused_root_y; |
924 | unsigned int unused_mask; |
1242 | unsigned int unused_mask; |
925 | |
|
|
926 | #ifdef DEBUG_X |
|
|
927 | const char *const eventnames[] = |
|
|
928 | { /* mason - this matches my system */ |
|
|
929 | "", |
|
|
930 | "", |
|
|
931 | "KeyPress", |
|
|
932 | "KeyRelease", |
|
|
933 | "ButtonPress", |
|
|
934 | "ButtonRelease", |
|
|
935 | "MotionNotify", |
|
|
936 | "EnterNotify", |
|
|
937 | "LeaveNotify", |
|
|
938 | "FocusIn", |
|
|
939 | "FocusOut", |
|
|
940 | "KeymapNotify", |
|
|
941 | "Expose", |
|
|
942 | "GraphicsExpose", |
|
|
943 | "NoExpose", |
|
|
944 | "VisibilityNotify", |
|
|
945 | "CreateNotify", |
|
|
946 | "DestroyNotify", |
|
|
947 | "UnmapNotify", |
|
|
948 | "MapNotify", |
|
|
949 | "MapRequest", |
|
|
950 | "ReparentNotify", |
|
|
951 | "ConfigureNotify", |
|
|
952 | "ConfigureRequest", |
|
|
953 | "GravityNotify", |
|
|
954 | "ResizeRequest", |
|
|
955 | "CirculateNotify", |
|
|
956 | "CirculateRequest", |
|
|
957 | "PropertyNotify", |
|
|
958 | "SelectionClear", |
|
|
959 | "SelectionRequest", |
|
|
960 | "SelectionNotify", |
|
|
961 | "ColormapNotify", |
|
|
962 | "ClientMessage", |
|
|
963 | "MappingNotify" |
|
|
964 | }; |
|
|
965 | #endif |
|
|
966 | |
|
|
967 | #ifdef DEBUG_X |
|
|
968 | struct timeval tp; |
|
|
969 | struct tm *ltt; |
|
|
970 | (void)gettimeofday (&tp, NULL); |
|
|
971 | ltt = localtime (& (tp.tv_sec)); |
|
|
972 | D_X ((stderr, "Event: %-16s %-7s %08lx (%4d-%02d-%02d %02d:%02d:%02d.%.6ld) %s %lu", eventnames[ev.type], (ev.xany.window == TermWin.parent[0] ? "parent" : (ev.xany.window == TermWin.vt ? "vt" : (ev.xany.window == scrollBar.win ? "scroll" : (ev.xany.window == menuBar.win ? "menubar" : "UNKNOWN")))), (ev.xany.window == TermWin.parent[0] ? TermWin.parent[0] : (ev.xany.window == TermWin.vt ? TermWin.vt : (ev.xany.window == scrollBar.win ? scrollBar.win : (ev.xany.window == menuBar.win ? menuBar.win : 0)))), ltt->tm_year + 1900, ltt->tm_mon + 1, ltt->tm_mday, ltt->tm_hour, ltt->tm_min, ltt->tm_sec, tp.tv_usec, ev.xany.send_event ? "S" : " ", ev.xany.serial)); |
|
|
973 | #endif |
|
|
974 | |
1243 | |
975 | switch (ev.type) |
1244 | switch (ev.type) |
976 | { |
1245 | { |
977 | case KeyPress: |
1246 | case KeyPress: |
|
|
1247 | #if ISO_14755 |
|
|
1248 | if (!(iso14755buf & ISO_14755_52)) |
|
|
1249 | #endif |
978 | lookup_key (ev.xkey); |
1250 | lookup_key (ev.xkey); |
|
|
1251 | |
|
|
1252 | break; |
|
|
1253 | |
|
|
1254 | case KeyRelease: |
|
|
1255 | { |
|
|
1256 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
|
|
1257 | KeySym ks; |
|
|
1258 | |
|
|
1259 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
|
|
1260 | #endif |
|
|
1261 | |
|
|
1262 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1263 | // ISO 14755 support |
|
|
1264 | if (iso14755buf) |
|
|
1265 | if (iso14755buf & ISO_14755_52) |
|
|
1266 | { |
|
|
1267 | # if ENABLE_OVERLAY |
|
|
1268 | scr_overlay_off (); |
|
|
1269 | # endif |
|
|
1270 | # if ISO_14755 |
|
|
1271 | // iso14755 part 5.2 handling: release time |
|
|
1272 | // first: controls |
|
|
1273 | if ((ev.xkey.state & ControlMask) |
|
|
1274 | && ((ks >= 0x40 && ks <= 0x5f) |
|
|
1275 | || (ks >= 0x61 && ks <= 0x7f))) |
|
|
1276 | { |
|
|
1277 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
|
|
1278 | commit_iso14755 (); |
|
|
1279 | return; // case-break; |
|
|
1280 | } |
|
|
1281 | |
|
|
1282 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
|
|
1283 | if (i[0] == ks) |
|
|
1284 | { |
|
|
1285 | iso14755buf = ISO_14755_51 | i[1]; |
|
|
1286 | commit_iso14755 (); |
|
|
1287 | return; // case-break; |
|
|
1288 | } |
|
|
1289 | |
|
|
1290 | scr_bell (); |
|
|
1291 | # endif |
|
|
1292 | iso14755buf = 0; |
979 | break; |
1293 | break; |
|
|
1294 | } |
|
|
1295 | else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
|
|
1296 | { |
|
|
1297 | # if ENABLE_OVERLAY |
|
|
1298 | scr_overlay_off (); |
|
|
1299 | # endif |
|
|
1300 | if (iso14755buf & ISO_14755_51) |
|
|
1301 | commit_iso14755 (); |
|
|
1302 | #if ISO_14755 |
|
|
1303 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
1304 | { |
|
|
1305 | iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair |
|
|
1306 | |
|
|
1307 | scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); |
|
|
1308 | scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); |
|
|
1309 | } |
|
|
1310 | # endif |
|
|
1311 | else |
|
|
1312 | iso14755buf = 0; |
|
|
1313 | } |
|
|
1314 | #endif |
980 | |
1315 | |
981 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1316 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
982 | case KeyRelease: |
|
|
983 | { |
|
|
984 | if (! (ev.xkey.state & ControlMask)) |
1317 | if (!(ev.xkey.state & ControlMask)) |
|
|
1318 | slip_wheel_ev.stop (); |
|
|
1319 | else if (ks == XK_Control_L || ks == XK_Control_R) |
985 | mouse_slip_wheel_speed = 0; |
1320 | mouse_slip_wheel_speed = 0; |
986 | else |
1321 | #endif |
987 | { |
|
|
988 | KeySym ks; |
|
|
989 | |
|
|
990 | ks = XKeycodeToKeysym (display->display, ev.xkey.keycode, 0); |
|
|
991 | if (ks == XK_Control_L || ks == XK_Control_R) |
|
|
992 | mouse_slip_wheel_speed = 0; |
|
|
993 | } |
|
|
994 | break; |
1322 | break; |
995 | } |
1323 | } |
996 | #endif |
|
|
997 | |
1324 | |
998 | case ButtonPress: |
1325 | case ButtonPress: |
999 | button_press (ev.xbutton); |
1326 | button_press (ev.xbutton); |
1000 | break; |
1327 | break; |
1001 | |
1328 | |
… | |
… | |
1003 | button_release (ev.xbutton); |
1330 | button_release (ev.xbutton); |
1004 | break; |
1331 | break; |
1005 | |
1332 | |
1006 | case ClientMessage: |
1333 | case ClientMessage: |
1007 | if (ev.xclient.format == 32 |
1334 | if (ev.xclient.format == 32 |
|
|
1335 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS] |
1008 | && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) |
1336 | && ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1009 | destroy (); |
1337 | destroy (); |
|
|
1338 | #if ENABLE_XEMBED |
|
|
1339 | else if (ev.xclient.format == 32 |
|
|
1340 | && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1341 | { |
|
|
1342 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1343 | focus_in (); |
|
|
1344 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1345 | focus_out (); |
|
|
1346 | } |
|
|
1347 | #endif |
1010 | #ifdef OFFIX_DND |
1348 | #ifdef OFFIX_DND |
1011 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1349 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1012 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1350 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1013 | && (ev.xclient.data.l[0] == DndFile |
1351 | && (ev.xclient.data.l[0] == DndFile |
1014 | || ev.xclient.data.l[0] == DndDir |
1352 | || ev.xclient.data.l[0] == DndDir |
1015 | || ev.xclient.data.l[0] == DndLink)) |
1353 | || ev.xclient.data.l[0] == DndLink)) |
1016 | { |
1354 | { |
1017 | /* Get Dnd data */ |
1355 | /* Get Dnd data */ |
1018 | Atom ActualType; |
1356 | Atom ActualType; |
1019 | int ActualFormat; |
1357 | int ActualFormat; |
1020 | unsigned char *data; |
1358 | unsigned char *data; |
1021 | unsigned long Size, RemainingBytes; |
1359 | unsigned long Size, RemainingBytes; |
1022 | |
1360 | |
1023 | XGetWindowProperty (display->display, display->root, |
1361 | XGetWindowProperty (disp, display->root, |
1024 | xa[XA_DNDSELECTION], |
1362 | xa[XA_DNDSELECTION], |
1025 | 0L, 1000000L, |
1363 | 0L, 1000000L, |
1026 | False, AnyPropertyType, |
1364 | False, AnyPropertyType, |
1027 | &ActualType, &ActualFormat, |
1365 | &ActualType, &ActualFormat, |
1028 | &Size, &RemainingBytes, |
1366 | &Size, &RemainingBytes, |
1029 | &data); |
1367 | &data); |
1030 | XChangeProperty (display->display, display->root, |
1368 | set_string_property (XA_CUT_BUFFER0, data); |
1031 | XA_CUT_BUFFER0, XA_STRING, |
1369 | XFree (data); |
1032 | 8, PropModeReplace, |
|
|
1033 | data, STRLEN (data)); |
|
|
1034 | selection_paste (display->root, XA_CUT_BUFFER0, True); |
1370 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
1035 | XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); |
1371 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
1036 | } |
1372 | } |
1037 | #endif /* OFFIX_DND */ |
1373 | #endif /* OFFIX_DND */ |
1038 | break; |
1374 | break; |
1039 | |
1375 | |
1040 | case MappingNotify: |
1376 | case MappingNotify: |
1041 | XRefreshKeyboardMapping (& (ev.xmapping)); |
1377 | XRefreshKeyboardMapping (&ev.xmapping); |
1042 | break; |
1378 | break; |
1043 | |
1379 | |
1044 | /* |
1380 | /* |
1045 | * XXX: this is not the _current_ arrangement |
1381 | * XXX: this is not the _current_ arrangement |
1046 | * Here's my conclusion: |
1382 | * Here's my conclusion: |
… | |
… | |
1065 | break; |
1401 | break; |
1066 | } |
1402 | } |
1067 | break; |
1403 | break; |
1068 | |
1404 | |
1069 | case FocusIn: |
1405 | case FocusIn: |
1070 | if (!TermWin.focus) |
1406 | focus_in (); |
1071 | { |
|
|
1072 | TermWin.focus = 1; |
|
|
1073 | want_refresh = 1; |
|
|
1074 | #ifdef USE_XIM |
|
|
1075 | if (Input_Context != NULL) |
|
|
1076 | XSetICFocus (Input_Context); |
|
|
1077 | #endif |
|
|
1078 | #ifdef CURSOR_BLINK |
|
|
1079 | if (Options & Opt_cursorBlink) |
|
|
1080 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1081 | #endif |
|
|
1082 | |
|
|
1083 | } |
|
|
1084 | break; |
1407 | break; |
1085 | |
1408 | |
1086 | case FocusOut: |
1409 | case FocusOut: |
1087 | if (TermWin.focus) |
1410 | focus_out (); |
1088 | { |
|
|
1089 | TermWin.focus = 0; |
|
|
1090 | want_refresh = 1; |
|
|
1091 | #ifdef USE_XIM |
|
|
1092 | if (Input_Context != NULL) |
|
|
1093 | XUnsetICFocus (Input_Context); |
|
|
1094 | #endif |
|
|
1095 | #ifdef CURSOR_BLINK |
|
|
1096 | if (Options & Opt_cursorBlink) |
|
|
1097 | cursor_blink_ev.stop (); |
|
|
1098 | hidden_cursor = 0; |
|
|
1099 | #endif |
|
|
1100 | |
|
|
1101 | } |
|
|
1102 | break; |
1411 | break; |
1103 | |
1412 | |
1104 | case ConfigureNotify: |
1413 | case ConfigureNotify: |
1105 | if (ev.xconfigure.window == TermWin.parent[0]) |
1414 | if (ev.xconfigure.window == TermWin.parent[0]) |
1106 | { |
1415 | { |
… | |
… | |
1110 | { /* Wrap lots of configures into one */ |
1419 | { /* Wrap lots of configures into one */ |
1111 | width = ev.xconfigure.width; |
1420 | width = ev.xconfigure.width; |
1112 | height = ev.xconfigure.height; |
1421 | height = ev.xconfigure.height; |
1113 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
1422 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
1114 | } |
1423 | } |
1115 | while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); |
1424 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); |
1116 | |
1425 | |
1117 | if (szHint.width != width || szHint.height != height) |
1426 | if (szHint.width != width || szHint.height != height) |
1118 | { |
1427 | { |
1119 | D_SIZE ((stderr, "Size: Resizing from: %4d x %4d", szHint.width, szHint.height)); |
1428 | seen_resize = 1; |
1120 | resize_all_windows (width, height, 1); |
1429 | resize_all_windows (width, height, 1); |
1121 | } |
1430 | } |
1122 | #ifdef DEBUG_SIZE |
1431 | |
1123 | else |
|
|
1124 | { |
|
|
1125 | D_SIZE ((stderr, "Size: Not resizing")); |
|
|
1126 | } |
|
|
1127 | #endif |
|
|
1128 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1432 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1129 | if (Options & Opt_transparent) |
1433 | if (options & Opt_transparent) |
1130 | { |
|
|
1131 | check_our_parents (); |
1434 | check_our_parents (); |
1132 | if (am_transparent) |
|
|
1133 | want_full_refresh = 1; |
|
|
1134 | } |
|
|
1135 | #endif |
1435 | #endif |
1136 | } |
1436 | } |
|
|
1437 | break; |
|
|
1438 | |
|
|
1439 | case PropertyNotify: |
|
|
1440 | if (ev.xproperty.atom == xa[XA_VT_SELECTION] |
|
|
1441 | && ev.xproperty.state == PropertyNewValue) |
|
|
1442 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
|
|
1443 | |
1137 | break; |
1444 | break; |
1138 | |
1445 | |
1139 | case SelectionClear: |
1446 | case SelectionClear: |
1140 | selection_clear (); |
1447 | selection_clear (); |
1141 | break; |
1448 | break; |
1142 | |
1449 | |
1143 | case SelectionNotify: |
1450 | case SelectionNotify: |
1144 | if (selection_wait == Sel_normal) |
1451 | if (selection_wait == Sel_normal) |
1145 | selection_paste (ev.xselection.requestor, |
1452 | selection_paste (ev.xselection.requestor, ev.xselection.property, true); |
1146 | ev.xselection.property, True); |
|
|
1147 | break; |
1453 | break; |
1148 | |
1454 | |
1149 | case SelectionRequest: |
1455 | case SelectionRequest: |
1150 | selection_send (ev.xselectionrequest); |
1456 | selection_send (ev.xselectionrequest); |
1151 | break; |
1457 | break; |
… | |
… | |
1172 | |
1478 | |
1173 | case GraphicsExpose: |
1479 | case GraphicsExpose: |
1174 | case Expose: |
1480 | case Expose: |
1175 | if (ev.xany.window == TermWin.vt) |
1481 | if (ev.xany.window == TermWin.vt) |
1176 | { |
1482 | { |
1177 | #ifdef NO_SLOW_LINK_SUPPORT |
1483 | do |
1178 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1484 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1179 | ev.xexpose.width, ev.xexpose.height, False); |
1485 | ev.xexpose.width, ev.xexpose.height, False); |
1180 | #else |
1486 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); |
1181 | // don't understand this, so commented it out |
1487 | |
|
|
1488 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
|
|
1489 | |
|
|
1490 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) |
1182 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1491 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1183 | ev.xexpose.width, ev.xexpose.height, False); |
1492 | ev.xexpose.width, ev.xexpose.height, False); |
1184 | //scr_expose (ev.xexpose.x, 0, |
1493 | |
1185 | // ev.xexpose.width, TermWin.height, False); |
1494 | scr_refresh (refresh_type); |
1186 | #endif |
|
|
1187 | want_refresh = 1; |
|
|
1188 | } |
1495 | } |
1189 | else |
1496 | else |
1190 | { |
1497 | { |
1191 | XEvent unused_event; |
1498 | XEvent unused_event; |
1192 | |
1499 | |
1193 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, |
1500 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1194 | Expose, |
1501 | ; |
1195 | &unused_event)) ; |
1502 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1196 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, |
1503 | ; |
1197 | GraphicsExpose, |
1504 | |
1198 | &unused_event)) ; |
|
|
1199 | if (isScrollbarWindow (ev.xany.window)) |
1505 | if (isScrollbarWindow (ev.xany.window)) |
1200 | { |
1506 | { |
1201 | scrollBar.setIdle (); |
1507 | scrollBar.setIdle (); |
1202 | scrollbar_show (0); |
1508 | scrollbar_show (0); |
1203 | } |
1509 | } |
1204 | #ifdef MENUBAR |
1510 | #ifdef MENUBAR |
1205 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1511 | if (menubar_visible () && isMenuBarWindow (ev.xany.window)) |
1206 | menubar_expose (); |
1512 | menubar_expose (); |
1207 | #endif |
1513 | #endif |
|
|
1514 | |
|
|
1515 | #ifdef TRANSPARENT |
|
|
1516 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
|
|
1517 | XClearWindow (disp, ev.xany.window); |
|
|
1518 | #endif |
1208 | } |
1519 | } |
1209 | break; |
1520 | break; |
1210 | |
1521 | |
1211 | case MotionNotify: |
1522 | case MotionNotify: |
1212 | #ifdef POINTER_BLANK |
1523 | #ifdef POINTER_BLANK |
… | |
… | |
1218 | { |
1529 | { |
1219 | menubar_control (ev.xbutton); |
1530 | menubar_control (ev.xbutton); |
1220 | break; |
1531 | break; |
1221 | } |
1532 | } |
1222 | #endif |
1533 | #endif |
1223 | if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) |
1534 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1224 | break; |
1535 | break; |
1225 | |
1536 | |
1226 | if (ev.xany.window == TermWin.vt) |
1537 | if (ev.xany.window == TermWin.vt) |
1227 | { |
1538 | { |
1228 | if ((ev.xbutton.state & (Button1Mask | Button3Mask))) |
1539 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1229 | { |
1540 | { |
1230 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) |
1541 | while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) |
1231 | ; |
1542 | ; |
1232 | |
1543 | |
1233 | XQueryPointer (display->display, TermWin.vt, |
1544 | XQueryPointer (disp, TermWin.vt, |
1234 | &unused_root, &unused_child, |
1545 | &unused_root, &unused_child, |
1235 | &unused_root_x, &unused_root_y, |
1546 | &unused_root_x, &unused_root_y, |
1236 | & (ev.xbutton.x), & (ev.xbutton.y), |
1547 | &ev.xbutton.x, &ev.xbutton.y, |
1237 | &unused_mask); |
1548 | &ev.xbutton.state); |
1238 | #ifdef MOUSE_THRESHOLD |
1549 | #ifdef MOUSE_THRESHOLD |
1239 | /* deal with a `jumpy' mouse */ |
1550 | /* deal with a `jumpy' mouse */ |
1240 | if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) |
1551 | if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) |
1241 | { |
1552 | { |
1242 | #endif |
1553 | #endif |
|
|
1554 | #if ISO_14755 |
|
|
1555 | // 5.4 |
|
|
1556 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
|
|
1557 | { |
|
|
1558 | iso14755_54 (ev.xbutton.x, ev.xbutton.y); |
|
|
1559 | break; |
|
|
1560 | } |
|
|
1561 | #endif |
1243 | selection_extend ((ev.xbutton.x), (ev.xbutton.y), |
1562 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1244 | (ev.xbutton.state & Button3Mask) ? 2 : 0); |
1563 | ev.xbutton.state & Button3Mask ? 2 : 0); |
|
|
1564 | |
1245 | #ifdef SELECTION_SCROLLING |
1565 | #ifdef SELECTION_SCROLLING |
1246 | if (ev.xbutton.y < TermWin.int_bwidth |
1566 | if (ev.xbutton.y < TermWin.int_bwidth |
1247 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1567 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1248 | { |
1568 | { |
1249 | int dist; |
1569 | int dist; |
1250 | |
1570 | |
1251 | pending_scroll_selection=1; |
|
|
1252 | |
|
|
1253 | /* don't clobber the current delay if we are |
1571 | /* don't clobber the current delay if we are |
1254 | * already in the middle of scrolling. |
1572 | * already in the middle of scrolling. |
1255 | */ |
1573 | */ |
1256 | if (scroll_selection_delay<=0) |
1574 | if (!sel_scroll_ev.active) |
1257 | scroll_selection_delay=SCROLLBAR_CONTINUOUS_DELAY; |
1575 | sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); |
1258 | |
1576 | |
1259 | /* save the event params so we can highlight |
1577 | /* save the event params so we can highlight |
1260 | * the selection in the pending-scroll loop |
1578 | * the selection in the pending-scroll loop |
1261 | */ |
1579 | */ |
1262 | selection_save_x=ev.xbutton.x; |
1580 | selection_save_x = ev.xbutton.x; |
1263 | selection_save_y=ev.xbutton.y; |
1581 | selection_save_y = ev.xbutton.y; |
1264 | selection_save_state= |
|
|
1265 | (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1582 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1266 | |
1583 | |
1267 | /* calc number of lines to scroll */ |
1584 | /* calc number of lines to scroll */ |
1268 | if (ev.xbutton.y<TermWin.int_bwidth) |
1585 | if (ev.xbutton.y < TermWin.int_bwidth) |
1269 | { |
1586 | { |
1270 | scroll_selection_dir = UP; |
1587 | scroll_selection_dir = UP; |
1271 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1588 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1272 | } |
1589 | } |
1273 | else |
1590 | else |
1274 | { |
1591 | { |
1275 | scroll_selection_dir = DN; |
1592 | scroll_selection_dir = DN; |
1276 | dist = ev.xbutton.y - |
|
|
1277 | (TermWin.int_bwidth + TermWin.height); |
1593 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1278 | } |
1594 | } |
|
|
1595 | |
1279 | scroll_selection_lines= (Pixel2Height (dist)/ |
1596 | scroll_selection_lines = Pixel2Height (dist) |
1280 | SELECTION_SCROLL_LINE_SPEEDUP)+1; |
1597 | / SELECTION_SCROLL_LINE_SPEEDUP |
|
|
1598 | + 1; |
1281 | MIN_IT (scroll_selection_lines, |
1599 | MIN_IT (scroll_selection_lines, |
1282 | SELECTION_SCROLL_MAX_LINES); |
1600 | SELECTION_SCROLL_MAX_LINES); |
1283 | } |
1601 | } |
1284 | else |
1602 | else |
1285 | { |
1603 | { |
1286 | /* we are within the text window, so we |
1604 | /* we are within the text window, so we |
1287 | * shouldn't be scrolling |
1605 | * shouldn't be scrolling |
1288 | */ |
1606 | */ |
1289 | pending_scroll_selection = 0; |
1607 | if (sel_scroll_ev.active) |
|
|
1608 | sel_scroll_ev.stop(); |
1290 | } |
1609 | } |
1291 | #endif |
1610 | #endif |
1292 | #ifdef MOUSE_THRESHOLD |
1611 | #ifdef MOUSE_THRESHOLD |
1293 | |
|
|
1294 | } |
1612 | } |
1295 | #endif |
1613 | #endif |
1296 | |
|
|
1297 | } |
1614 | } |
1298 | } |
1615 | } |
1299 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1616 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1300 | { |
1617 | { |
1301 | while (XCheckTypedWindowEvent (display->display, scrollBar.win, |
1618 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1302 | MotionNotify, &ev)) ; |
1619 | MotionNotify, &ev)) |
|
|
1620 | ; |
|
|
1621 | |
1303 | XQueryPointer (display->display, scrollBar.win, |
1622 | XQueryPointer (disp, scrollBar.win, |
1304 | &unused_root, &unused_child, |
1623 | &unused_root, &unused_child, |
1305 | &unused_root_x, &unused_root_y, |
1624 | &unused_root_x, &unused_root_y, |
1306 | & (ev.xbutton.x), & (ev.xbutton.y), |
1625 | &ev.xbutton.x, &ev.xbutton.y, |
1307 | &unused_mask); |
1626 | &unused_mask); |
1308 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1627 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1309 | scrollbar_size ()); |
1628 | scrollbar_size ()); |
1310 | scr_refresh (refresh_type); |
1629 | scr_refresh (refresh_type); |
1311 | refresh_limit = 0; |
1630 | refresh_limit = 0; |
… | |
… | |
1314 | break; |
1633 | break; |
1315 | } |
1634 | } |
1316 | } |
1635 | } |
1317 | |
1636 | |
1318 | void |
1637 | void |
|
|
1638 | rxvt_term::focus_in () |
|
|
1639 | { |
|
|
1640 | if (!TermWin.focus) |
|
|
1641 | { |
|
|
1642 | TermWin.focus = 1; |
|
|
1643 | want_refresh = 1; |
|
|
1644 | #ifdef USE_XIM |
|
|
1645 | if (Input_Context != NULL) |
|
|
1646 | { |
|
|
1647 | IMSetStatusPosition (); |
|
|
1648 | XSetICFocus (Input_Context); |
|
|
1649 | } |
|
|
1650 | #endif |
|
|
1651 | #ifdef CURSOR_BLINK |
|
|
1652 | if (options & Opt_cursorBlink) |
|
|
1653 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1654 | #endif |
|
|
1655 | #ifdef OFF_FOCUS_FADING |
|
|
1656 | if (rs[Rs_fade]) |
|
|
1657 | { |
|
|
1658 | pix_colors = pix_colors_focused; |
|
|
1659 | scr_recolour (); |
|
|
1660 | } |
|
|
1661 | #endif |
|
|
1662 | } |
|
|
1663 | } |
|
|
1664 | |
|
|
1665 | void |
|
|
1666 | rxvt_term::focus_out () |
|
|
1667 | { |
|
|
1668 | if (TermWin.focus) |
|
|
1669 | { |
|
|
1670 | TermWin.focus = 0; |
|
|
1671 | want_refresh = 1; |
|
|
1672 | |
|
|
1673 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1674 | iso14755buf = 0; |
|
|
1675 | #endif |
|
|
1676 | #if ENABLE_OVERLAY |
|
|
1677 | scr_overlay_off (); |
|
|
1678 | #endif |
|
|
1679 | #ifdef USE_XIM |
|
|
1680 | if (Input_Context != NULL) |
|
|
1681 | XUnsetICFocus (Input_Context); |
|
|
1682 | #endif |
|
|
1683 | #ifdef CURSOR_BLINK |
|
|
1684 | if (options & Opt_cursorBlink) |
|
|
1685 | cursor_blink_ev.stop (); |
|
|
1686 | hidden_cursor = 0; |
|
|
1687 | #endif |
|
|
1688 | #ifdef OFF_FOCUS_FADING |
|
|
1689 | if (rs[Rs_fade]) |
|
|
1690 | { |
|
|
1691 | pix_colors = pix_colors_unfocused; |
|
|
1692 | scr_recolour (); |
|
|
1693 | } |
|
|
1694 | #endif |
|
|
1695 | } |
|
|
1696 | } |
|
|
1697 | |
|
|
1698 | #if TRANSPARENT |
|
|
1699 | void |
1319 | rxvt_term::rootwin_cb (XEvent &ev) |
1700 | rxvt_term::rootwin_cb (XEvent &ev) |
1320 | { |
1701 | { |
1321 | SET_R (this); |
1702 | SET_R (this); |
1322 | SET_LOCALE (locale); |
1703 | SET_LOCALE (locale); |
1323 | |
1704 | |
1324 | switch (ev.type) |
1705 | switch (ev.type) |
1325 | { |
1706 | { |
1326 | case PropertyNotify: |
1707 | case PropertyNotify: |
1327 | if (ev.xproperty.atom == xa[XA_VT_SELECTION]) |
|
|
1328 | { |
|
|
1329 | if (ev.xproperty.state == PropertyNewValue) |
|
|
1330 | selection_property (ev.xproperty.window, ev.xproperty.atom); |
|
|
1331 | break; |
|
|
1332 | } |
|
|
1333 | #ifdef TRANSPARENT |
|
|
1334 | else |
|
|
1335 | { |
|
|
1336 | /* |
1708 | /* |
1337 | * if user used some Esetroot compatible prog to set the root bg, |
1709 | * if user used some Esetroot compatible prog to set the root bg, |
1338 | * use the property to determine the pixmap. We use it later on. |
1710 | * use the property to determine the pixmap. We use it later on. |
1339 | */ |
1711 | */ |
1340 | if (xa[XA_XROOTPMAPID] == 0) |
|
|
1341 | xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); |
|
|
1342 | |
|
|
1343 | if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) |
1712 | if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] |
|
|
1713 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1344 | return; |
1714 | return; |
1345 | } |
|
|
1346 | |
1715 | |
1347 | /* FALLTHROUGH */ |
1716 | /* FALLTHROUGH */ |
1348 | case ReparentNotify: |
1717 | case ReparentNotify: |
1349 | if ((Options & Opt_transparent) && check_our_parents () && am_transparent) |
1718 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1350 | want_full_refresh = 1; |
1719 | want_refresh = want_full_refresh = 1; |
1351 | break; |
1720 | break; |
1352 | #endif |
|
|
1353 | } |
1721 | } |
1354 | } |
1722 | } |
|
|
1723 | #endif |
1355 | |
1724 | |
1356 | void |
1725 | void |
1357 | rxvt_term::button_press (XButtonEvent &ev) |
1726 | rxvt_term::button_press (XButtonEvent &ev) |
1358 | { |
1727 | { |
1359 | int reportmode = 0, clickintime; |
1728 | int reportmode = 0, clickintime; |
1360 | |
1729 | |
1361 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1730 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1362 | if (!bypass_keystate) |
1731 | if (!bypass_keystate) |
1363 | reportmode = !! (PrivateModes & PrivMode_mouse_report); |
1732 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
|
|
1733 | |
1364 | /* |
1734 | /* |
1365 | * VT window processing of button press |
1735 | * VT window processing of button press |
1366 | */ |
1736 | */ |
1367 | if (ev.window == TermWin.vt) |
1737 | if (ev.window == TermWin.vt) |
1368 | { |
1738 | { |
|
|
1739 | #if ISO_14755 |
|
|
1740 | // 5.4 |
|
|
1741 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
|
|
1742 | { |
|
|
1743 | iso14755_54 (ev.x, ev.y); |
|
|
1744 | return; |
|
|
1745 | } |
|
|
1746 | #endif |
|
|
1747 | |
1369 | clickintime = ev.time - MEvent.time < MULTICLICK_TIME; |
1748 | clickintime = ev.time - MEvent.time < MULTICLICK_TIME; |
|
|
1749 | |
1370 | if (reportmode) |
1750 | if (reportmode) |
1371 | { |
1751 | { |
1372 | /* mouse report from vt window */ |
1752 | /* mouse report from vt window */ |
1373 | /* save the xbutton state (for ButtonRelease) */ |
1753 | /* save the xbutton state (for ButtonRelease) */ |
1374 | MEvent.state = ev.state; |
1754 | MEvent.state = ev.state; |
… | |
… | |
1403 | } |
1783 | } |
1404 | else |
1784 | else |
1405 | { |
1785 | { |
1406 | if (ev.button != MEvent.button) |
1786 | if (ev.button != MEvent.button) |
1407 | MEvent.clicks = 0; |
1787 | MEvent.clicks = 0; |
|
|
1788 | |
1408 | switch (ev.button) |
1789 | switch (ev.button) |
1409 | { |
1790 | { |
1410 | case Button1: |
1791 | case Button1: |
|
|
1792 | /* allow meta + click to select rectangular areas */ |
|
|
1793 | /* should be done in screen.C */ |
|
|
1794 | #if ENABLE_FRILLS |
|
|
1795 | selection.rect = !!(ev.state & ModMetaMask); |
|
|
1796 | #else |
|
|
1797 | selection.rect = false; |
|
|
1798 | #endif |
|
|
1799 | |
1411 | /* allow shift+left click to extend selection */ |
1800 | /* allow shift+left click to extend selection */ |
1412 | if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) |
1801 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1413 | { |
1802 | { |
1414 | if (MEvent.button == Button1 && clickintime) |
1803 | if (MEvent.button == Button1 && clickintime) |
1415 | selection_rotate (ev.x, ev.y); |
1804 | selection_rotate (ev.x, ev.y); |
1416 | else |
1805 | else |
1417 | selection_extend (ev.x, ev.y, 1); |
1806 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
1432 | case Button3: |
1821 | case Button3: |
1433 | if (MEvent.button == Button3 && clickintime) |
1822 | if (MEvent.button == Button3 && clickintime) |
1434 | selection_rotate (ev.x, ev.y); |
1823 | selection_rotate (ev.x, ev.y); |
1435 | else |
1824 | else |
1436 | selection_extend (ev.x, ev.y, 1); |
1825 | selection_extend (ev.x, ev.y, 1); |
|
|
1826 | |
1437 | MEvent.button = Button3; |
1827 | MEvent.button = Button3; |
1438 | break; |
1828 | break; |
1439 | } |
1829 | } |
1440 | } |
1830 | } |
|
|
1831 | |
1441 | MEvent.time = ev.time; |
1832 | MEvent.time = ev.time; |
1442 | return; |
1833 | return; |
1443 | } |
1834 | } |
1444 | |
1835 | |
1445 | /* |
1836 | /* |
… | |
… | |
1511 | upordown = 1; /* down */ |
1902 | upordown = 1; /* down */ |
1512 | } |
1903 | } |
1513 | if (upordown) |
1904 | if (upordown) |
1514 | { |
1905 | { |
1515 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1906 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1516 | scroll_arrow_delay = SCROLLBAR_INITIAL_DELAY; |
1907 | cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); |
1517 | #endif |
1908 | #endif |
1518 | if (scr_page (upordown < 0 ? UP : DN, 1)) |
1909 | if (scr_page (upordown < 0 ? UP : DN, 1)) |
1519 | { |
1910 | { |
1520 | if (upordown < 0) |
1911 | if (upordown < 0) |
1521 | scrollBar.setUp (); |
1912 | scrollBar.setUp (); |
… | |
… | |
1537 | break; |
1928 | break; |
1538 | case R_SB_ALIGN_BOTTOM: |
1929 | case R_SB_ALIGN_BOTTOM: |
1539 | csrO = scrollBar.bot - scrollBar.top; |
1930 | csrO = scrollBar.bot - scrollBar.top; |
1540 | break; |
1931 | break; |
1541 | } |
1932 | } |
|
|
1933 | |
1542 | if (scrollBar.style == R_SB_XTERM |
1934 | if (scrollBar.style == R_SB_XTERM |
1543 | || scrollbar_above_slider (ev.y) |
1935 | || scrollbar_above_slider (ev.y) |
1544 | || scrollbar_below_slider (ev.y)) |
1936 | || scrollbar_below_slider (ev.y)) |
1545 | scr_move_to ( scrollbar_position (ev.y) - csrO, |
1937 | scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); |
1546 | scrollbar_size ()); |
1938 | |
1547 | scrollBar.setMotion (); |
1939 | scrollBar.setMotion (); |
1548 | break; |
1940 | break; |
1549 | |
1941 | |
1550 | case Button1: |
1942 | case Button1: |
1551 | if (scrollbar_align == R_SB_ALIGN_CENTRE) |
1943 | if (scrollbar_align == R_SB_ALIGN_CENTRE) |
… | |
… | |
1575 | scr_page ((ev.button == Button1 ? DN : UP), |
1967 | scr_page ((ev.button == Button1 ? DN : UP), |
1576 | (TermWin.nrow |
1968 | (TermWin.nrow |
1577 | * scrollbar_position (ev.y) |
1969 | * scrollbar_position (ev.y) |
1578 | / scrollbar_size ())); |
1970 | / scrollbar_size ())); |
1579 | } |
1971 | } |
|
|
1972 | |
1580 | break; |
1973 | break; |
1581 | } |
1974 | } |
1582 | } |
1975 | } |
1583 | return; |
1976 | return; |
1584 | } |
1977 | } |
… | |
… | |
1596 | { |
1989 | { |
1597 | int reportmode = 0; |
1990 | int reportmode = 0; |
1598 | |
1991 | |
1599 | csrO = 0; /* reset csr Offset */ |
1992 | csrO = 0; /* reset csr Offset */ |
1600 | if (!bypass_keystate) |
1993 | if (!bypass_keystate) |
1601 | reportmode = !! (PrivateModes & PrivMode_mouse_report); |
1994 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1602 | |
1995 | |
1603 | if (scrollbar_isUpDn ()) |
1996 | if (scrollbar_isUpDn ()) |
1604 | { |
1997 | { |
1605 | scrollBar.setIdle (); |
1998 | scrollBar.setIdle (); |
1606 | scrollbar_show (0); |
1999 | scrollbar_show (0); |
1607 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
2000 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1608 | refresh_type &= ~SMOOTH_REFRESH; |
2001 | refresh_type &= ~SMOOTH_REFRESH; |
1609 | #endif |
2002 | #endif |
1610 | |
|
|
1611 | } |
2003 | } |
|
|
2004 | |
1612 | #ifdef SELECTION_SCROLLING |
2005 | #ifdef SELECTION_SCROLLING |
1613 | pending_scroll_selection=0; |
2006 | if (sel_scroll_ev.active) |
|
|
2007 | sel_scroll_ev.stop(); |
1614 | #endif |
2008 | #endif |
|
|
2009 | |
1615 | if (ev.window == TermWin.vt) |
2010 | if (ev.window == TermWin.vt) |
1616 | { |
2011 | { |
|
|
2012 | #if ISO_14755 |
|
|
2013 | // 5.4 |
|
|
2014 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
|
|
2015 | return; |
|
|
2016 | #endif |
1617 | if (reportmode) |
2017 | if (reportmode) |
1618 | { |
2018 | { |
1619 | /* mouse report from vt window */ |
2019 | /* mouse report from vt window */ |
1620 | /* don't report release of wheel "buttons" */ |
2020 | /* don't report release of wheel "buttons" */ |
1621 | if (ev.button >= 4) |
2021 | if (ev.button >= 4) |
… | |
… | |
1635 | MEvent.button = AnyButton; |
2035 | MEvent.button = AnyButton; |
1636 | mouse_report (ev); |
2036 | mouse_report (ev); |
1637 | #endif /* MOUSE_REPORT_DOUBLECLICK */ |
2037 | #endif /* MOUSE_REPORT_DOUBLECLICK */ |
1638 | return; |
2038 | return; |
1639 | } |
2039 | } |
|
|
2040 | |
1640 | /* |
2041 | /* |
1641 | * dumb hack to compensate for the failure of click-and-drag |
2042 | * dumb hack to compensate for the failure of click-and-drag |
1642 | * when overriding mouse reporting |
2043 | * when overriding mouse reporting |
1643 | */ |
2044 | */ |
1644 | if (PrivateModes & PrivMode_mouse_report |
2045 | if (priv_modes & PrivMode_mouse_report |
1645 | && bypass_keystate |
2046 | && bypass_keystate |
1646 | && ev.button == Button1 && MEvent.clicks <= 1) |
2047 | && ev.button == Button1 && MEvent.clicks <= 1) |
1647 | selection_extend (ev.x, ev.y, 0); |
2048 | selection_extend (ev.x, ev.y, 0); |
1648 | |
2049 | |
1649 | switch (ev.button) |
2050 | switch (ev.button) |
… | |
… | |
1660 | case Button5: |
2061 | case Button5: |
1661 | { |
2062 | { |
1662 | int i; |
2063 | int i; |
1663 | page_dirn v; |
2064 | page_dirn v; |
1664 | |
2065 | |
1665 | v = (ev.button == Button4) ? UP : DN; |
2066 | v = ev.button == Button4 ? UP : DN; |
|
|
2067 | |
1666 | if (ev.state & ShiftMask) |
2068 | if (ev.state & ShiftMask) |
1667 | i = 1; |
2069 | i = 1; |
1668 | else if ((Options & Opt_mouseWheelScrollPage)) |
2070 | else if (options & Opt_mouseWheelScrollPage) |
1669 | i = TermWin.nrow - 1; |
2071 | i = TermWin.nrow - 1; |
1670 | else |
2072 | else |
1671 | i = 5; |
2073 | i = 5; |
|
|
2074 | |
1672 | # ifdef MOUSE_SLIP_WHEELING |
2075 | # ifdef MOUSE_SLIP_WHEELING |
1673 | if (ev.state & ControlMask) |
2076 | if (ev.state & ControlMask) |
1674 | { |
2077 | { |
1675 | mouse_slip_wheel_speed += (v ? -1 : 1); |
2078 | mouse_slip_wheel_speed += v ? -1 : 1; |
|
|
2079 | if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; |
|
|
2080 | if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; |
|
|
2081 | |
|
|
2082 | if (slip_wheel_ev.at < NOW) |
1676 | mouse_slip_wheel_delay = SCROLLBAR_CONTINUOUS_DELAY; |
2083 | slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; |
|
|
2084 | |
|
|
2085 | slip_wheel_ev.start (); |
1677 | } |
2086 | } |
|
|
2087 | else |
|
|
2088 | { |
1678 | # endif |
2089 | # endif |
1679 | # ifdef JUMP_MOUSE_WHEEL |
2090 | # ifdef JUMP_MOUSE_WHEEL |
1680 | scr_page (v, i); |
|
|
1681 | scr_refresh (SMOOTH_REFRESH); |
|
|
1682 | scrollbar_show (1); |
|
|
1683 | # else |
|
|
1684 | while (i--) |
|
|
1685 | { |
|
|
1686 | scr_page (v, 1); |
2091 | scr_page (v, i); |
1687 | scr_refresh (SMOOTH_REFRESH); |
2092 | scr_refresh (SMOOTH_REFRESH); |
1688 | scrollbar_show (1); |
2093 | scrollbar_show (1); |
|
|
2094 | # else |
|
|
2095 | while (i--) |
|
|
2096 | { |
|
|
2097 | scr_page (v, 1); |
|
|
2098 | scr_refresh (SMOOTH_REFRESH); |
|
|
2099 | scrollbar_show (1); |
|
|
2100 | } |
|
|
2101 | # endif |
|
|
2102 | # ifdef MOUSE_SLIP_WHEELING |
1689 | } |
2103 | } |
1690 | # endif |
2104 | #endif |
1691 | |
|
|
1692 | } |
2105 | } |
1693 | break; |
2106 | break; |
1694 | #endif |
2107 | #endif |
1695 | |
|
|
1696 | } |
2108 | } |
1697 | } |
2109 | } |
1698 | #ifdef MENUBAR |
2110 | #ifdef MENUBAR |
1699 | else if (isMenuBarWindow (ev.window)) |
2111 | else if (isMenuBarWindow (ev.window)) |
1700 | menubar_control (ev); |
2112 | menubar_control (ev); |
1701 | #endif |
2113 | #endif |
1702 | } |
2114 | } |
1703 | |
2115 | |
1704 | #ifdef TRANSPARENT |
2116 | #ifdef TRANSPARENT |
1705 | #if TINTING |
2117 | #if TINTING |
1706 | /* shading taken from eterm-0.9.2 */ |
2118 | /* taken from aterm-0.4.2 */ |
1707 | /* RGB 15 */ |
|
|
1708 | |
2119 | |
1709 | static void |
2120 | typedef uint32_t RUINT32T; |
1710 | shade_ximage_15(void *data, int bpl, int w, int h, int rm, int gm, int bm) |
|
|
1711 | { |
|
|
1712 | unsigned char *ptr; |
|
|
1713 | int x, y; |
|
|
1714 | |
2121 | |
1715 | ptr = (unsigned char *)data + (w * sizeof(uint16_t)); |
2122 | void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) |
1716 | if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { |
2123 | { |
1717 | /* No saturation */ |
2124 | int sh_r, sh_g, sh_b; |
1718 | for (y = h; --y >= 0;) { |
2125 | RUINT32T mask_r, mask_g, mask_b; |
1719 | for (x = -w; x < 0; x++) { |
2126 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
1720 | int r, g, b; |
2127 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
|
|
2128 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
|
|
2129 | int i; |
1721 | |
2130 | |
1722 | b = ((uint16_t *) ptr)[x]; |
2131 | Visual *visual = display->visual; |
1723 | r = (b & 0x7c00) * rm; |
2132 | |
1724 | g = (b & 0x3e0) * gm; |
2133 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
1725 | b = (b & 0x1f) * bm; |
2134 | |
1726 | ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) |
2135 | /* for convenience */ |
1727 | | ((g >> 8) & 0x3e0) |
2136 | mask_r = visual->red_mask; |
1728 | | ((b >> 8) & 0x1f); |
2137 | mask_g = visual->green_mask; |
1729 | } |
2138 | mask_b = visual->blue_mask; |
1730 | ptr += bpl; |
2139 | |
1731 | } |
2140 | /* boring lookup table pre-initialization */ |
|
|
2141 | switch (srcImage->bits_per_pixel) { |
|
|
2142 | case 15: |
|
|
2143 | if ((mask_r != 0x7c00) || |
|
|
2144 | (mask_g != 0x03e0) || |
|
|
2145 | (mask_b != 0x001f)) |
|
|
2146 | return; |
|
|
2147 | lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); |
|
|
2148 | lookup_r = lookup; |
|
|
2149 | lookup_g = lookup+32; |
|
|
2150 | lookup_b = lookup+32+32; |
|
|
2151 | sh_r = 10; |
|
|
2152 | sh_g = 5; |
|
|
2153 | sh_b = 0; |
|
|
2154 | break; |
|
|
2155 | case 16: |
|
|
2156 | if ((mask_r != 0xf800) || |
|
|
2157 | (mask_g != 0x07e0) || |
|
|
2158 | (mask_b != 0x001f)) |
|
|
2159 | return; |
|
|
2160 | lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); |
|
|
2161 | lookup_r = lookup; |
|
|
2162 | lookup_g = lookup+32; |
|
|
2163 | lookup_b = lookup+32+64; |
|
|
2164 | sh_r = 11; |
|
|
2165 | sh_g = 5; |
|
|
2166 | sh_b = 0; |
|
|
2167 | break; |
|
|
2168 | case 24: |
|
|
2169 | if ((mask_r != 0xff0000) || |
|
|
2170 | (mask_g != 0x00ff00) || |
|
|
2171 | (mask_b != 0x0000ff)) |
|
|
2172 | return; |
|
|
2173 | lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); |
|
|
2174 | lookup_r = lookup; |
|
|
2175 | lookup_g = lookup+256; |
|
|
2176 | lookup_b = lookup+256+256; |
|
|
2177 | sh_r = 16; |
|
|
2178 | sh_g = 8; |
|
|
2179 | sh_b = 0; |
|
|
2180 | break; |
|
|
2181 | case 32: |
|
|
2182 | if ((mask_r != 0xff0000) || |
|
|
2183 | (mask_g != 0x00ff00) || |
|
|
2184 | (mask_b != 0x0000ff)) |
|
|
2185 | return; |
|
|
2186 | lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); |
|
|
2187 | lookup_r = lookup; |
|
|
2188 | lookup_g = lookup+256; |
|
|
2189 | lookup_b = lookup+256+256; |
|
|
2190 | sh_r = 16; |
|
|
2191 | sh_g = 8; |
|
|
2192 | sh_b = 0; |
|
|
2193 | break; |
|
|
2194 | default: |
|
|
2195 | return; /* we do not support this color depth */ |
|
|
2196 | } |
|
|
2197 | |
|
|
2198 | /* prepare limits for color transformation (each channel is handled separately) */ |
|
|
2199 | if (shade < 0) { |
|
|
2200 | shade = -shade; |
|
|
2201 | if (shade < 0) shade = 0; |
|
|
2202 | if (shade > 100) shade = 100; |
|
|
2203 | |
|
|
2204 | lower_lim_r = 65535-rm; |
|
|
2205 | lower_lim_g = 65535-gm; |
|
|
2206 | lower_lim_b = 65535-bm; |
|
|
2207 | |
|
|
2208 | lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); |
|
|
2209 | lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); |
|
|
2210 | lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); |
|
|
2211 | |
|
|
2212 | upper_lim_r = upper_lim_g = upper_lim_b = 65535; |
1732 | } else { |
2213 | } else { |
1733 | for (y = h; --y >= 0;) { |
2214 | if (shade < 0) shade = 0; |
1734 | for (x = -w; x < 0; x++) { |
2215 | if (shade > 100) shade = 100; |
1735 | int r, g, b; |
|
|
1736 | |
2216 | |
1737 | b = ((uint16_t *) ptr)[x]; |
2217 | lower_lim_r = lower_lim_g = lower_lim_b = 0; |
1738 | r = (b & 0x7c00) * rm; |
2218 | |
1739 | g = (b & 0x3e0) * gm; |
2219 | upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); |
1740 | b = (b & 0x1f) * bm; |
2220 | upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); |
1741 | r |= (!(r >> 15) - 1); |
2221 | upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100); |
1742 | g |= (!(g >> 10) - 1); |
2222 | } |
1743 | b |= (!(b >> 5) - 1); |
2223 | |
1744 | ((uint16_t *) ptr)[x] = ((r >> 8) & 0x7c00) |
2224 | /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */ |
1745 | | ((g >> 8) & 0x3e0) |
2225 | if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 )) |
1746 | | ((b >> 8) & 0x1f); |
2226 | { |
1747 | } |
2227 | unsigned int tmp; |
1748 | ptr += bpl; |
2228 | |
|
|
2229 | tmp = lower_lim_r; |
|
|
2230 | lower_lim_r = lower_lim_b; |
|
|
2231 | lower_lim_b = tmp; |
|
|
2232 | |
|
|
2233 | tmp = upper_lim_r; |
|
|
2234 | upper_lim_r = upper_lim_b; |
|
|
2235 | upper_lim_b = tmp; |
|
|
2236 | } |
|
|
2237 | |
|
|
2238 | /* fill our lookup tables */ |
|
|
2239 | for (i = 0; i <= mask_r>>sh_r; i++) |
|
|
2240 | { |
|
|
2241 | RUINT32T tmp; |
|
|
2242 | tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); |
|
|
2243 | tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); |
|
|
2244 | lookup_r[i] = (tmp/65535)<<sh_r; |
|
|
2245 | } |
|
|
2246 | for (i = 0; i <= mask_g>>sh_g; i++) |
|
|
2247 | { |
|
|
2248 | RUINT32T tmp; |
|
|
2249 | tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); |
|
|
2250 | tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); |
|
|
2251 | lookup_g[i] = (tmp/65535)<<sh_g; |
|
|
2252 | } |
|
|
2253 | for (i = 0; i <= mask_b>>sh_b; i++) |
|
|
2254 | { |
|
|
2255 | RUINT32T tmp; |
|
|
2256 | tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); |
|
|
2257 | tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); |
|
|
2258 | lookup_b[i] = (tmp/65535)<<sh_b; |
|
|
2259 | } |
|
|
2260 | |
|
|
2261 | /* apply table to input image (replacing colors by newly calculated ones) */ |
|
|
2262 | switch (srcImage->bits_per_pixel) |
|
|
2263 | { |
|
|
2264 | case 15: |
|
|
2265 | { |
|
|
2266 | unsigned short *p1, *pf, *p, *pl; |
|
|
2267 | p1 = (unsigned short *) srcImage->data; |
|
|
2268 | pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); |
|
|
2269 | while (p1 < pf) |
|
|
2270 | { |
|
|
2271 | p = p1; |
|
|
2272 | pl = p1 + srcImage->width; |
|
|
2273 | for (; p < pl; p++) |
1749 | } |
2274 | { |
|
|
2275 | *p = lookup_r[(*p & 0x7c00)>>10] | |
|
|
2276 | lookup_g[(*p & 0x03e0)>> 5] | |
|
|
2277 | lookup_b[(*p & 0x001f)]; |
|
|
2278 | } |
|
|
2279 | p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); |
1750 | } |
2280 | } |
1751 | } |
2281 | break; |
1752 | |
2282 | } |
1753 | /* RGB 16 */ |
2283 | case 16: |
1754 | static void |
2284 | { |
1755 | shade_ximage_16(void *data, int bpl, int w, int h, int rm, int gm, int bm) |
2285 | unsigned short *p1, *pf, *p, *pl; |
1756 | { |
2286 | p1 = (unsigned short *) srcImage->data; |
1757 | unsigned char *ptr; |
2287 | pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); |
1758 | int x, y; |
2288 | while (p1 < pf) |
1759 | |
2289 | { |
1760 | ptr = (unsigned char *)data + (w * sizeof(uint16_t)); |
2290 | p = p1; |
1761 | if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { |
2291 | pl = p1 + srcImage->width; |
1762 | /* No saturation */ |
2292 | for (; p < pl; p++) |
1763 | for (y = h; --y >= 0;) { |
|
|
1764 | for (x = -w; x < 0; x++) { |
|
|
1765 | int r, g, b; |
|
|
1766 | |
|
|
1767 | b = ((uint16_t *) ptr)[x]; |
|
|
1768 | r = (b & 0xf800) * rm; |
|
|
1769 | g = (b & 0x7e0) * gm; |
|
|
1770 | b = (b & 0x1f) * bm; |
|
|
1771 | ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800) |
|
|
1772 | | ((g >> 8) & 0x7e0) |
|
|
1773 | | ((b >> 8) & 0x1f); |
|
|
1774 | } |
|
|
1775 | ptr += bpl; |
|
|
1776 | } |
2293 | { |
1777 | } else { |
2294 | *p = lookup_r[(*p & 0xf800)>>11] | |
1778 | for (y = h; --y >= 0;) { |
2295 | lookup_g[(*p & 0x07e0)>> 5] | |
1779 | for (x = -w; x < 0; x++) { |
2296 | lookup_b[(*p & 0x001f)]; |
1780 | int r, g, b; |
|
|
1781 | |
|
|
1782 | b = ((uint16_t *) ptr)[x]; |
|
|
1783 | r = (b & 0xf800) * rm; |
|
|
1784 | g = (b & 0x7e0) * gm; |
|
|
1785 | b = (b & 0x1f) * bm; |
|
|
1786 | r |= (!(r >> 16) - 1); |
|
|
1787 | g |= (!(g >> 11) - 1); |
|
|
1788 | b |= (!(b >> 5) - 1); |
|
|
1789 | ((uint16_t *) ptr)[x] = ((r >> 8) & 0xf800) |
|
|
1790 | | ((g >> 8) & 0x7e0) |
|
|
1791 | | ((b >> 8) & 0x1f); |
|
|
1792 | } |
2297 | } |
1793 | ptr += bpl; |
2298 | p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line); |
|
|
2299 | } |
|
|
2300 | break; |
|
|
2301 | } |
|
|
2302 | case 24: |
|
|
2303 | { |
|
|
2304 | unsigned char *p1, *pf, *p, *pl; |
|
|
2305 | p1 = (unsigned char *) srcImage->data; |
|
|
2306 | pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); |
|
|
2307 | while (p1 < pf) |
|
|
2308 | { |
|
|
2309 | p = p1; |
|
|
2310 | pl = p1 + srcImage->width * 3; |
|
|
2311 | for (; p < pl; p += 3) |
1794 | } |
2312 | { |
|
|
2313 | p[0] = lookup_r[(p[0] & 0xff0000)>>16]; |
|
|
2314 | p[1] = lookup_r[(p[1] & 0x00ff00)>> 8]; |
|
|
2315 | p[2] = lookup_r[(p[2] & 0x0000ff)]; |
|
|
2316 | } |
|
|
2317 | p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line); |
1795 | } |
2318 | } |
1796 | } |
2319 | break; |
|
|
2320 | } |
|
|
2321 | case 32: |
|
|
2322 | { |
|
|
2323 | RUINT32T *p1, *pf, *p, *pl; |
|
|
2324 | p1 = (RUINT32T *) srcImage->data; |
|
|
2325 | pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); |
1797 | |
2326 | |
1798 | /* RGB 24 */ |
2327 | while (p1 < pf) |
1799 | static void |
2328 | { |
1800 | shade_ximage_24(void *data, int bpl, int w, int h, int rm, int gm, int bm) |
2329 | p = p1; |
1801 | { |
2330 | pl = p1 + srcImage->width; |
1802 | unsigned char *ptr; |
2331 | for (; p < pl; p++) |
1803 | int x, y; |
|
|
1804 | |
|
|
1805 | ptr = (unsigned char *)data + (w * 3); |
|
|
1806 | if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { |
|
|
1807 | /* No saturation */ |
|
|
1808 | for (y = h; --y >= 0;) { |
|
|
1809 | for (x = -(w * 3); x < 0; x += 3) { |
|
|
1810 | int r, g, b; |
|
|
1811 | |
|
|
1812 | if (byteorder.big_endian()) { |
|
|
1813 | r = (ptr[x + 0] * rm) >> 8; |
|
|
1814 | g = (ptr[x + 1] * gm) >> 8; |
|
|
1815 | b = (ptr[x + 2] * bm) >> 8; |
|
|
1816 | ptr[x + 0] = r; |
|
|
1817 | ptr[x + 1] = g; |
|
|
1818 | ptr[x + 2] = b; |
|
|
1819 | } else { |
|
|
1820 | r = (ptr[x + 2] * rm) >> 8; |
|
|
1821 | g = (ptr[x + 1] * gm) >> 8; |
|
|
1822 | b = (ptr[x + 0] * bm) >> 8; |
|
|
1823 | ptr[x + 2] = r; |
|
|
1824 | ptr[x + 1] = g; |
|
|
1825 | ptr[x + 0] = b; |
|
|
1826 | } |
|
|
1827 | } |
|
|
1828 | ptr += bpl; |
|
|
1829 | } |
2332 | { |
1830 | } else { |
2333 | *p = lookup_r[(*p & 0xff0000)>>16] | |
1831 | for (y = h; --y >= 0;) { |
2334 | lookup_g[(*p & 0x00ff00)>> 8] | |
1832 | for (x = -(w * 3); x < 0; x += 3) { |
2335 | lookup_b[(*p & 0x0000ff)] | |
1833 | int r, g, b; |
2336 | (*p & ~0xffffff); |
1834 | |
|
|
1835 | if (byteorder.big_endian()) { |
|
|
1836 | r = (ptr[x + 0] * rm) >> 8; |
|
|
1837 | g = (ptr[x + 1] * gm) >> 8; |
|
|
1838 | b = (ptr[x + 2] * bm) >> 8; |
|
|
1839 | |
|
|
1840 | r |= (!(r >> 8) - 1); |
|
|
1841 | g |= (!(g >> 8) - 1); |
|
|
1842 | b |= (!(b >> 8) - 1); |
|
|
1843 | |
|
|
1844 | ptr[x + 0] = r; |
|
|
1845 | ptr[x + 1] = g; |
|
|
1846 | ptr[x + 2] = b; |
|
|
1847 | } else { |
|
|
1848 | r = (ptr[x + 2] * rm) >> 8; |
|
|
1849 | g = (ptr[x + 1] * gm) >> 8; |
|
|
1850 | b = (ptr[x + 0] * bm) >> 8; |
|
|
1851 | |
|
|
1852 | r |= (!(r >> 8) - 1); |
|
|
1853 | g |= (!(g >> 8) - 1); |
|
|
1854 | b |= (!(b >> 8) - 1); |
|
|
1855 | |
|
|
1856 | ptr[x + 2] = r; |
|
|
1857 | ptr[x + 1] = g; |
|
|
1858 | ptr[x + 0] = b; |
|
|
1859 | } |
|
|
1860 | } |
2337 | } |
1861 | ptr += bpl; |
2338 | p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line); |
1862 | } |
2339 | } |
|
|
2340 | break; |
|
|
2341 | } |
1863 | } |
2342 | } |
1864 | } |
|
|
1865 | |
2343 | |
1866 | /* RGB 32 */ |
2344 | free (lookup); |
1867 | static void |
|
|
1868 | shade_ximage_32(void *data, int bpl, int w, int h, int rm, int gm, int bm) |
|
|
1869 | { |
|
|
1870 | unsigned char *ptr; |
|
|
1871 | int x, y; |
|
|
1872 | |
|
|
1873 | ptr = (unsigned char *)data + (w * 4); |
|
|
1874 | if ((rm <= 256) && (gm <= 256) && (bm <= 256)) { |
|
|
1875 | /* No saturation */ |
|
|
1876 | for (y = h; --y >= 0;) { |
|
|
1877 | if (byteorder.big_endian()) { |
|
|
1878 | for (x = -(w * 4); x < 0; x += 4) { |
|
|
1879 | int r, g, b; |
|
|
1880 | |
|
|
1881 | r = (ptr[x + 1] * rm) >> 8; |
|
|
1882 | g = (ptr[x + 2] * gm) >> 8; |
|
|
1883 | b = (ptr[x + 3] * bm) >> 8; |
|
|
1884 | ptr[x + 1] = r; |
|
|
1885 | ptr[x + 2] = g; |
|
|
1886 | ptr[x + 3] = b; |
|
|
1887 | } |
|
|
1888 | } else { |
|
|
1889 | for (x = -(w * 4); x < 0; x += 4) { |
|
|
1890 | int r, g, b; |
|
|
1891 | |
|
|
1892 | r = (ptr[x + 2] * rm) >> 8; |
|
|
1893 | g = (ptr[x + 1] * gm) >> 8; |
|
|
1894 | b = (ptr[x + 0] * bm) >> 8; |
|
|
1895 | ptr[x + 2] = r; |
|
|
1896 | ptr[x + 1] = g; |
|
|
1897 | ptr[x + 0] = b; |
|
|
1898 | } |
|
|
1899 | } |
|
|
1900 | ptr += bpl; |
|
|
1901 | } |
|
|
1902 | } else { |
|
|
1903 | for (y = h; --y >= 0;) { |
|
|
1904 | for (x = -(w * 4); x < 0; x += 4) { |
|
|
1905 | int r, g, b; |
|
|
1906 | |
|
|
1907 | if (byteorder.big_endian()) { |
|
|
1908 | r = (ptr[x + 1] * rm) >> 8; |
|
|
1909 | g = (ptr[x + 2] * gm) >> 8; |
|
|
1910 | b = (ptr[x + 3] * bm) >> 8; |
|
|
1911 | |
|
|
1912 | r |= (!(r >> 8) - 1); |
|
|
1913 | g |= (!(g >> 8) - 1); |
|
|
1914 | b |= (!(b >> 8) - 1); |
|
|
1915 | |
|
|
1916 | ptr[x + 1] = r; |
|
|
1917 | ptr[x + 2] = g; |
|
|
1918 | ptr[x + 3] = b; |
|
|
1919 | } else { |
|
|
1920 | r = (ptr[x + 2] * rm) >> 8; |
|
|
1921 | g = (ptr[x + 1] * gm) >> 8; |
|
|
1922 | b = (ptr[x + 0] * bm) >> 8; |
|
|
1923 | |
|
|
1924 | r |= (!(r >> 8) - 1); |
|
|
1925 | g |= (!(g >> 8) - 1); |
|
|
1926 | b |= (!(b >> 8) - 1); |
|
|
1927 | |
|
|
1928 | ptr[x + 2] = r; |
|
|
1929 | ptr[x + 1] = g; |
|
|
1930 | ptr[x + 0] = b; |
|
|
1931 | } |
|
|
1932 | } |
|
|
1933 | ptr += bpl; |
|
|
1934 | } |
|
|
1935 | } |
|
|
1936 | } |
2345 | } |
1937 | |
|
|
1938 | #endif |
2346 | #endif |
1939 | |
2347 | |
1940 | /* |
2348 | /* |
1941 | * Check our parents are still who we think they are. |
2349 | * Check our parents are still who we think they are. |
1942 | * Do transparency updates if required |
2350 | * Do transparency updates if required |
… | |
… | |
1949 | Atom atype; |
2357 | Atom atype; |
1950 | unsigned char *prop = NULL; |
2358 | unsigned char *prop = NULL; |
1951 | Window root, oldp, *list; |
2359 | Window root, oldp, *list; |
1952 | Pixmap rootpixmap = None; |
2360 | Pixmap rootpixmap = None; |
1953 | XWindowAttributes wattr, wrootattr; |
2361 | XWindowAttributes wattr, wrootattr; |
|
|
2362 | dDisp; |
1954 | |
2363 | |
1955 | pchanged = 0; |
2364 | pchanged = 0; |
1956 | |
2365 | |
1957 | if (!(Options & Opt_transparent)) |
2366 | if (!(options & Opt_transparent)) |
1958 | return pchanged; /* Don't try any more */ |
2367 | return pchanged; /* Don't try any more */ |
1959 | |
2368 | |
1960 | XGetWindowAttributes (display->display, display->root, &wrootattr); |
2369 | XGetWindowAttributes (disp, display->root, &wrootattr); |
1961 | rootdepth = wrootattr.depth; |
2370 | rootdepth = wrootattr.depth; |
1962 | |
2371 | |
1963 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
2372 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
1964 | |
2373 | |
1965 | if (rootdepth != wattr.depth) |
2374 | if (rootdepth != wattr.depth) |
1966 | { |
2375 | { |
1967 | if (am_transparent) |
2376 | if (am_transparent) |
1968 | { |
2377 | { |
1969 | pchanged = 1; |
2378 | pchanged = 1; |
1970 | XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); |
2379 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
1971 | am_transparent = am_pixmap_trans = 0; |
2380 | am_transparent = am_pixmap_trans = 0; |
1972 | } |
2381 | } |
1973 | |
2382 | |
1974 | return pchanged; /* Don't try any more */ |
2383 | return pchanged; /* Don't try any more */ |
1975 | } |
2384 | } |
1976 | |
2385 | |
1977 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2386 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
1978 | XSync (display->display, False); |
2387 | XSync (disp, False); |
1979 | |
2388 | |
1980 | /* |
2389 | /* |
1981 | * Make the frame window set by the window manager have |
2390 | * Make the frame window set by the window manager have |
1982 | * the root background. Some window managers put multiple nested frame |
2391 | * the root background. Some window managers put multiple nested frame |
1983 | * windows for each client, so we have to take care about that. |
2392 | * windows for each client, so we have to take care about that. |
1984 | */ |
2393 | */ |
1985 | i = (xa[XA_XROOTPMAPID] |
2394 | i = (xa[XA_XROOTPMAP_ID] |
1986 | && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], |
2395 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
1987 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2396 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
1988 | &nitems, &bytes_after, &prop) == Success); |
2397 | &nitems, &bytes_after, &prop) == Success); |
1989 | |
2398 | |
1990 | if (!i || prop == NULL) |
2399 | if (!i || prop == NULL) |
1991 | i = (xa[XA_XSETROOTID] |
2400 | i = (xa[XA_ESETROOT_PMAP_ID] |
1992 | && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], |
2401 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
1993 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2402 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
1994 | &nitems, &bytes_after, &prop) == Success); |
2403 | &nitems, &bytes_after, &prop) == Success); |
1995 | |
2404 | |
1996 | if (!i || prop == NULL) |
2405 | if (!i || prop == NULL |
|
|
2406 | #if TINTING |
|
|
2407 | || !rs[Rs_color + Color_tint] |
|
|
2408 | #endif |
|
|
2409 | ) |
1997 | have_pixmap = 0; |
2410 | have_pixmap = 0; |
1998 | else |
2411 | else |
1999 | { |
2412 | { |
2000 | have_pixmap = 1; |
2413 | have_pixmap = 1; |
2001 | rootpixmap = * ((Pixmap *)prop); |
2414 | rootpixmap = *(Pixmap *)prop; |
2002 | XFree (prop); |
2415 | XFree (prop); |
2003 | } |
2416 | } |
2004 | |
2417 | |
2005 | if (have_pixmap) |
2418 | if (have_pixmap) |
2006 | { |
2419 | { |
… | |
… | |
2012 | Window cr; |
2425 | Window cr; |
2013 | XImage *image; |
2426 | XImage *image; |
2014 | GC gc; |
2427 | GC gc; |
2015 | XGCValues gcvalue; |
2428 | XGCValues gcvalue; |
2016 | |
2429 | |
2017 | XTranslateCoordinates (display->display, TermWin.parent[0], display->root, |
2430 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
2018 | 0, 0, &sx, &sy, &cr); |
2431 | 0, 0, &sx, &sy, &cr); |
2019 | nw = (unsigned int)szHint.width; |
2432 | nw = (unsigned int)szHint.width; |
2020 | nh = (unsigned int)szHint.height; |
2433 | nh = (unsigned int)szHint.height; |
2021 | nx = ny = 0; |
2434 | nx = ny = 0; |
2022 | |
2435 | |
… | |
… | |
2034 | sy = 0; |
2447 | sy = 0; |
2035 | } |
2448 | } |
2036 | |
2449 | |
2037 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2450 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2038 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2451 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
|
|
2452 | |
|
|
2453 | XSync (disp, False); |
2039 | allowedxerror = -1; |
2454 | allowedxerror = -1; |
2040 | image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2455 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2041 | |
2456 | |
2042 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2457 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2043 | /* XXX: may need a delay here? */ |
2458 | /* XXX: may need a delay here? */ |
2044 | allowedxerror = 0; |
2459 | allowedxerror = 0; |
2045 | |
2460 | |
… | |
… | |
2048 | if (am_transparent && am_pixmap_trans) |
2463 | if (am_transparent && am_pixmap_trans) |
2049 | { |
2464 | { |
2050 | pchanged = 1; |
2465 | pchanged = 1; |
2051 | if (TermWin.pixmap != None) |
2466 | if (TermWin.pixmap != None) |
2052 | { |
2467 | { |
2053 | XFreePixmap (display->display, TermWin.pixmap); |
2468 | XFreePixmap (disp, TermWin.pixmap); |
2054 | TermWin.pixmap = None; |
2469 | TermWin.pixmap = None; |
2055 | } |
2470 | } |
2056 | } |
2471 | } |
2057 | |
2472 | |
2058 | am_pixmap_trans = 0; |
2473 | am_pixmap_trans = 0; |
2059 | } |
2474 | } |
2060 | else |
2475 | else |
2061 | { |
2476 | { |
2062 | if (TermWin.pixmap != None) |
2477 | if (TermWin.pixmap != None) |
2063 | XFreePixmap (display->display, TermWin.pixmap); |
2478 | XFreePixmap (disp, TermWin.pixmap); |
2064 | |
2479 | |
2065 | #if TINTING |
2480 | #if TINTING |
2066 | if (ISSET_PIXCOLOR (Color_tint)) |
2481 | if (ISSET_PIXCOLOR (Color_tint)) |
2067 | { |
2482 | { |
2068 | unsigned short shade, rm, gm, bm; |
2483 | unsigned short rm, gm, bm; |
|
|
2484 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2069 | |
2485 | |
2070 | PixColors[Color_tint].get (display, rm, gm, bm); |
2486 | pix_colors_focused[Color_tint].get (display, rm, gm, bm); |
2071 | |
2487 | |
2072 | rm >>= 8; gm >>= 8; bm >>= 8; // not 100% correct, but... |
2488 | ShadeXImage (display, image, shade, rm, gm, bm); |
2073 | |
|
|
2074 | /* Determine bitshift and bitmask values */ |
|
|
2075 | switch (image->bits_per_pixel) |
|
|
2076 | { |
|
|
2077 | case 15: shade_ximage_15 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break; |
|
|
2078 | case 16: shade_ximage_16 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break; |
|
|
2079 | case 24: shade_ximage_24 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break; |
|
|
2080 | case 32: shade_ximage_32 (image->data, image->bytes_per_line, image->width, image->height, rm, gm, bm); break; |
|
|
2081 | } |
|
|
2082 | } |
2489 | } |
2083 | #endif |
2490 | #endif |
2084 | |
2491 | |
2085 | TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, |
2492 | TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, |
2086 | szHint.width, szHint.height, image->depth); |
2493 | szHint.width, szHint.height, image->depth); |
2087 | gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); |
2494 | gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); |
2088 | XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, |
2495 | XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, |
2089 | nx, ny, image->width, image->height); |
2496 | nx, ny, image->width, image->height); |
2090 | XFreeGC (display->display, gc); |
2497 | XFreeGC (disp, gc); |
2091 | XDestroyImage (image); |
2498 | XDestroyImage (image); |
2092 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, |
2499 | XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); |
2093 | TermWin.pixmap); |
2500 | XClearWindow (disp, TermWin.parent[0]); |
2094 | |
2501 | |
2095 | if (!am_transparent || !am_pixmap_trans) |
2502 | if (!am_transparent || !am_pixmap_trans) |
2096 | pchanged = 1; |
2503 | pchanged = 1; |
2097 | |
2504 | |
2098 | am_transparent = am_pixmap_trans = 1; |
2505 | am_transparent = am_pixmap_trans = 1; |
2099 | } |
2506 | } |
2100 | } |
2507 | } |
2101 | |
2508 | |
2102 | if (!am_pixmap_trans) |
2509 | if (am_pixmap_trans) |
|
|
2510 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
|
|
2511 | else |
2103 | { |
2512 | { |
2104 | unsigned int n; |
2513 | unsigned int n; |
2105 | /* |
2514 | /* |
2106 | * InheritPixmap transparency |
2515 | * InheritPixmap transparency |
2107 | */ |
2516 | */ |
2108 | D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); |
|
|
2109 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2517 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2110 | { |
2518 | { |
2111 | oldp = TermWin.parent[i]; |
2519 | oldp = TermWin.parent[i]; |
2112 | XQueryTree (display->display, TermWin.parent[i - 1], &root, |
2520 | XQueryTree (disp, TermWin.parent[i - 1], &root, |
2113 | &TermWin.parent[i], &list, &n); |
2521 | &TermWin.parent[i], &list, &n); |
2114 | XFree (list); |
2522 | XFree (list); |
2115 | D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); |
|
|
2116 | |
2523 | |
2117 | if (TermWin.parent[i] == display->root) |
2524 | if (TermWin.parent[i] == display->root) |
2118 | { |
2525 | { |
2119 | if (oldp != None) |
2526 | if (oldp != None) |
2120 | pchanged = 1; |
2527 | pchanged = 1; |
… | |
… | |
2130 | |
2537 | |
2131 | if (pchanged) |
2538 | if (pchanged) |
2132 | { |
2539 | { |
2133 | for (; n < (unsigned int)i; n++) |
2540 | for (; n < (unsigned int)i; n++) |
2134 | { |
2541 | { |
2135 | XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); |
2542 | XGetWindowAttributes (disp, TermWin.parent[n], &wattr); |
2136 | D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); |
|
|
2137 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2543 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2138 | { |
2544 | { |
2139 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2545 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2140 | break; |
2546 | break; |
2141 | } |
2547 | } |
2142 | } |
2548 | } |
2143 | } |
2549 | } |
2144 | |
2550 | |
2145 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2551 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2146 | { |
2552 | { |
2147 | D_X ((stderr, "InheritPixmap Turning off")); |
|
|
2148 | XSetWindowBackground (display->display, TermWin.parent[0], PixColors[Color_fg]); |
2553 | XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2149 | XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]); |
2554 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2150 | am_transparent = 0; |
2555 | am_transparent = 0; |
2151 | /* XXX: also turn off Opt_transparent? */ |
2556 | /* XXX: also turn off Opt_transparent? */ |
2152 | } |
2557 | } |
2153 | else |
2558 | else |
2154 | { |
2559 | { |
2155 | #if WAIT_FOR_WM |
2560 | #if WAIT_FOR_WM |
2156 | /* wait (an arbitrary period) for the WM to do its thing |
2561 | /* wait (an arbitrary period) for the WM to do its thing |
2157 | * needed for fvwm2.2.2 (and before?) */ |
2562 | * needed for fvwm2.2.2 (and before?) */ |
2158 | sleep (1); |
2563 | sleep (1); |
2159 | #endif |
2564 | #endif |
2160 | D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); |
|
|
2161 | for (n = 0; n < (unsigned int)i; n++) |
2565 | for (n = 0; n < (unsigned int)i; n++) |
|
|
2566 | { |
2162 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); |
2567 | XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); |
|
|
2568 | XClearWindow (disp, TermWin.parent[n]); |
|
|
2569 | } |
2163 | |
2570 | |
2164 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2571 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2165 | am_transparent = 1; |
2572 | am_transparent = 1; |
2166 | } |
2573 | } |
2167 | |
2574 | |
2168 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2575 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2169 | TermWin.parent[i] = None; |
2576 | TermWin.parent[i] = None; |
|
|
2577 | } |
|
|
2578 | |
|
|
2579 | if (scrollBar.win) |
|
|
2580 | { |
|
|
2581 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
|
|
2582 | scrollBar.setIdle (); |
|
|
2583 | scrollbar_show (0); |
|
|
2584 | } |
|
|
2585 | |
|
|
2586 | if (am_transparent) |
|
|
2587 | { |
|
|
2588 | want_refresh = want_full_refresh = 1; |
|
|
2589 | if (am_pixmap_trans) |
|
|
2590 | flush (); |
2170 | } |
2591 | } |
2171 | |
2592 | |
2172 | return pchanged; |
2593 | return pchanged; |
2173 | } |
2594 | } |
2174 | #endif |
2595 | #endif |
… | |
… | |
2191 | } |
2612 | } |
2192 | |
2613 | |
2193 | if (ch == NOCHAR) // TODO: improve |
2614 | if (ch == NOCHAR) // TODO: improve |
2194 | break; |
2615 | break; |
2195 | |
2616 | |
2196 | if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') |
2617 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
|
|
2618 | { |
|
|
2619 | if (!seen_input) |
2197 | { |
2620 | { |
|
|
2621 | seen_input = 1; |
|
|
2622 | // many badly-written programs (e.g. jed) contain a race condition: |
|
|
2623 | // they first read the screensize and then install a SIGWINCH handler. |
|
|
2624 | // some window managers resize the window early, and these programs |
|
|
2625 | // then sometimes get the size wrong. |
|
|
2626 | // unfortunately other programs are even more buggy and dislike |
|
|
2627 | // being sent SIGWINCH, so only do it when we were in fact being |
|
|
2628 | // resized. |
|
|
2629 | if (seen_resize && cmd_pid) |
|
|
2630 | kill (-cmd_pid, SIGWINCH); |
|
|
2631 | } |
|
|
2632 | |
2198 | /* Read a text string from the input buffer */ |
2633 | /* Read a text string from the input buffer */ |
2199 | unicode_t buf[UBUFSIZ]; |
2634 | unicode_t buf[UBUFSIZ]; |
2200 | bool refreshnow = false; |
2635 | bool refreshnow = false; |
2201 | int nlines = 0; |
2636 | int nlines = 0; |
2202 | unicode_t *str = buf; |
2637 | unicode_t *str = buf; |
2203 | |
2638 | |
2204 | *str++ = ch; |
|
|
2205 | |
|
|
2206 | for (;;) |
2639 | for (;;) |
2207 | { |
2640 | { |
2208 | seq_begin = cmdbuf_ptr; |
|
|
2209 | ch = next_char (); |
|
|
2210 | |
|
|
2211 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) |
2641 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2212 | break; |
2642 | break; |
2213 | |
2643 | |
2214 | *str++ = ch; |
2644 | *str++ = ch; |
2215 | |
2645 | |
2216 | if (ch == '\n') |
2646 | if (ch == C0_LF) |
2217 | { |
2647 | { |
2218 | nlines++; |
2648 | nlines++; |
2219 | refresh_count++; |
2649 | refresh_count++; |
2220 | |
2650 | |
2221 | if (! (Options & Opt_jumpScroll) |
2651 | if (!(options & Opt_jumpScroll) |
2222 | || (refresh_count >= (refresh_limit * (TermWin.nrow - 1)))) |
2652 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2223 | { |
2653 | { |
2224 | refreshnow = true; |
2654 | refreshnow = true; |
2225 | flag = true; |
|
|
2226 | ch = NOCHAR; |
2655 | ch = NOCHAR; |
2227 | break; |
2656 | break; |
2228 | } |
2657 | } |
2229 | |
2658 | |
2230 | // scr_add_lines only works for nlines < TermWin.nrow - 1. |
2659 | // scr_add_lines only works for nlines <= TermWin.nrow - 1. |
2231 | if (nlines >= TermWin.nrow - 1) |
2660 | if (nlines >= TermWin.nrow - 1) |
2232 | { |
2661 | { |
2233 | scr_add_lines (buf, nlines, str - buf); |
2662 | scr_add_lines (buf, nlines, str - buf); |
2234 | nlines = 0; |
2663 | nlines = 0; |
2235 | str = buf; |
2664 | str = buf; |
… | |
… | |
2239 | if (str >= buf + UBUFSIZ) |
2668 | if (str >= buf + UBUFSIZ) |
2240 | { |
2669 | { |
2241 | ch = NOCHAR; |
2670 | ch = NOCHAR; |
2242 | break; |
2671 | break; |
2243 | } |
2672 | } |
|
|
2673 | |
|
|
2674 | seq_begin = cmdbuf_ptr; |
|
|
2675 | ch = next_char (); |
2244 | } |
2676 | } |
2245 | |
2677 | |
2246 | scr_add_lines (buf, nlines, str - buf); |
2678 | scr_add_lines (buf, nlines, str - buf); |
2247 | |
2679 | |
2248 | /* |
2680 | /* |
2249 | * If there have been a lot of new lines, then update the screen |
2681 | * If there have been a lot of new lines, then update the screen |
2250 | * What the heck I'll cheat and only refresh less than every page-full. |
2682 | * What the heck I'll cheat and only refresh less than every page-full. |
2251 | * the number of pages between refreshes is refresh_limit, which |
2683 | * the number of pages between refreshes is refresh_limit, which |
2252 | * is incremented here because we must be doing flat-out scrolling. |
2684 | * is incremented here because we must be doing flat-out scrolling. |
2253 | * |
|
|
2254 | * refreshing should be correct for small scrolls, because of the |
|
|
2255 | * time-out |
|
|
2256 | */ |
2685 | */ |
2257 | if (refreshnow) |
2686 | if (refreshnow) |
2258 | { |
2687 | { |
2259 | if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2688 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2260 | refresh_limit++; |
2689 | refresh_limit++; |
2261 | |
2690 | else |
|
|
2691 | { |
|
|
2692 | flag = true; |
2262 | scr_refresh (refresh_type); |
2693 | scr_refresh (refresh_type); |
|
|
2694 | } |
2263 | } |
2695 | } |
2264 | |
2696 | |
2265 | } |
2697 | } |
2266 | else |
2698 | else |
2267 | { |
2699 | { |
… | |
… | |
2281 | } |
2713 | } |
2282 | |
2714 | |
2283 | return flag; |
2715 | return flag; |
2284 | } |
2716 | } |
2285 | |
2717 | |
|
|
2718 | // read the next octet |
|
|
2719 | unicode_t |
|
|
2720 | rxvt_term::next_octet () |
|
|
2721 | { |
|
|
2722 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2723 | ? *cmdbuf_ptr++ |
|
|
2724 | : NOCHAR; |
|
|
2725 | } |
|
|
2726 | |
2286 | // read the next character |
2727 | // read the next character |
2287 | unicode_t |
2728 | unicode_t |
2288 | rxvt_term::next_char () |
2729 | rxvt_term::next_char () |
2289 | { |
2730 | { |
2290 | while (cmdbuf_ptr < cmdbuf_endp) |
2731 | while (cmdbuf_ptr < cmdbuf_endp) |
… | |
… | |
2306 | if (len == (size_t)-1) |
2747 | if (len == (size_t)-1) |
2307 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2748 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2308 | |
2749 | |
2309 | // assume wchar == unicode |
2750 | // assume wchar == unicode |
2310 | cmdbuf_ptr += len; |
2751 | cmdbuf_ptr += len; |
2311 | return wc; |
2752 | return wc & UNICODE_MASK; |
2312 | } |
2753 | } |
2313 | |
2754 | |
2314 | return NOCHAR; |
2755 | return NOCHAR; |
2315 | } |
2756 | } |
2316 | |
2757 | |
… | |
… | |
2321 | */ |
2762 | */ |
2322 | unicode_t |
2763 | unicode_t |
2323 | rxvt_term::cmd_getc () |
2764 | rxvt_term::cmd_getc () |
2324 | { |
2765 | { |
2325 | unicode_t c = next_char (); |
2766 | unicode_t c = next_char (); |
|
|
2767 | |
|
|
2768 | if (c == NOCHAR) |
|
|
2769 | throw out_of_input; |
|
|
2770 | |
|
|
2771 | return c; |
|
|
2772 | } |
|
|
2773 | |
|
|
2774 | unicode_t |
|
|
2775 | rxvt_term::cmd_get8 () |
|
|
2776 | { |
|
|
2777 | unicode_t c = next_octet (); |
2326 | |
2778 | |
2327 | if (c == NOCHAR) |
2779 | if (c == NOCHAR) |
2328 | throw out_of_input; |
2780 | throw out_of_input; |
2329 | |
2781 | |
2330 | return c; |
2782 | return c; |
… | |
… | |
2431 | process_escape_seq (); |
2883 | process_escape_seq (); |
2432 | break; |
2884 | break; |
2433 | case C0_ENQ: /* terminal Status */ |
2885 | case C0_ENQ: /* terminal Status */ |
2434 | if (rs[Rs_answerbackstring]) |
2886 | if (rs[Rs_answerbackstring]) |
2435 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2887 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2436 | (unsigned int)STRLEN (rs[Rs_answerbackstring])); |
2888 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
2437 | else |
2889 | else |
2438 | tt_write ((unsigned char *)VT100_ANS, |
2890 | tt_write ((unsigned char *)VT100_ANS, |
2439 | (unsigned int)STRLEN (VT100_ANS)); |
2891 | (unsigned int)strlen (VT100_ANS)); |
2440 | break; |
2892 | break; |
2441 | case C0_BEL: /* bell */ |
2893 | case C0_BEL: /* bell */ |
2442 | scr_bell (); |
2894 | scr_bell (); |
2443 | break; |
2895 | break; |
2444 | case C0_BS: /* backspace */ |
2896 | case C0_BS: /* backspace */ |
… | |
… | |
2460 | break; |
2912 | break; |
2461 | case C0_SI: /* shift in - acs */ |
2913 | case C0_SI: /* shift in - acs */ |
2462 | scr_charset_choose (0); |
2914 | scr_charset_choose (0); |
2463 | break; |
2915 | break; |
2464 | |
2916 | |
|
|
2917 | #ifdef EIGHT_BIT_CONTROLS |
2465 | // 8-bit controls |
2918 | // 8-bit controls |
2466 | case 0x90: /* DCS */ |
2919 | case 0x90: /* DCS */ |
2467 | process_dcs_seq (); |
2920 | process_dcs_seq (); |
2468 | break; |
2921 | break; |
2469 | case 0x9b: /* CSI */ |
2922 | case 0x9b: /* CSI */ |
2470 | process_csi_seq (); |
2923 | process_csi_seq (); |
2471 | break; |
2924 | break; |
2472 | case 0x9d: /* CSI */ |
2925 | case 0x9d: /* CSI */ |
2473 | process_osc_seq (); |
2926 | process_osc_seq (); |
2474 | break; |
2927 | break; |
|
|
2928 | #endif |
2475 | } |
2929 | } |
2476 | } |
2930 | } |
2477 | /*}}} */ |
2931 | /*}}} */ |
2478 | |
2932 | |
2479 | |
2933 | |
… | |
… | |
2541 | void |
2995 | void |
2542 | rxvt_term::process_escape_seq () |
2996 | rxvt_term::process_escape_seq () |
2543 | { |
2997 | { |
2544 | unicode_t ch = cmd_getc (); |
2998 | unicode_t ch = cmd_getc (); |
2545 | |
2999 | |
2546 | if (PrivateModes & PrivMode_vt52) |
3000 | if (priv_modes & PrivMode_vt52) |
2547 | { |
3001 | { |
2548 | process_escape_vt52 (ch); |
3002 | process_escape_vt52 (ch); |
2549 | return; |
3003 | return; |
2550 | } |
3004 | } |
2551 | |
3005 | |
… | |
… | |
2566 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3020 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
2567 | break; |
3021 | break; |
2568 | case '+': |
3022 | case '+': |
2569 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3023 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
2570 | break; |
3024 | break; |
2571 | #ifndef NO_FRILLS |
3025 | #if ENABLE_FRILLS |
2572 | case '6': |
3026 | case '6': |
2573 | scr_backindex (); |
3027 | scr_backindex (); |
2574 | break; |
3028 | break; |
2575 | #endif |
3029 | #endif |
2576 | case '7': |
3030 | case '7': |
2577 | scr_cursor (SAVE); |
3031 | scr_cursor (SAVE); |
2578 | break; |
3032 | break; |
2579 | case '8': |
3033 | case '8': |
2580 | scr_cursor (RESTORE); |
3034 | scr_cursor (RESTORE); |
2581 | break; |
3035 | break; |
2582 | #ifndef NO_FRILLS |
3036 | #if ENABLE_FRILLS |
2583 | case '9': |
3037 | case '9': |
2584 | scr_forwardindex (); |
3038 | scr_forwardindex (); |
2585 | break; |
3039 | break; |
2586 | #endif |
3040 | #endif |
2587 | case '=': |
3041 | case '=': |
… | |
… | |
2597 | break; |
3051 | break; |
2598 | |
3052 | |
2599 | /* 8.3.87: NEXT LINE */ |
3053 | /* 8.3.87: NEXT LINE */ |
2600 | case C1_NEL: /* ESC E */ |
3054 | case C1_NEL: /* ESC E */ |
2601 | { |
3055 | { |
2602 | unicode_t nlcr[] = { L'\n', L'\r' }; |
3056 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
2603 | scr_add_lines (nlcr, 1, 2); |
3057 | scr_add_lines (nlcr, 1, 2); |
2604 | } |
3058 | } |
2605 | break; |
3059 | break; |
2606 | |
3060 | |
2607 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3061 | /* kidnapped escape sequence: Should be 8.3.48 */ |
… | |
… | |
2668 | |
3122 | |
2669 | /*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ |
3123 | /*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ |
2670 | /* *INDENT-OFF* */ |
3124 | /* *INDENT-OFF* */ |
2671 | enum { |
3125 | enum { |
2672 | CSI_ICH = 0x40, |
3126 | CSI_ICH = 0x40, |
2673 | CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, |
3127 | CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, |
2674 | CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , |
3128 | CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , |
2675 | CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, |
3129 | CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, |
2676 | CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, |
3130 | CSI_ECH, CSI_CVT, CSI_CBT, CSI_SRS, CSI_PTX, CSI_SDS, CSI_SIMD, CSI_5F, |
2677 | CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, |
3131 | CSI_HPA, CSI_HPR, CSI_REP, CSI_DA , CSI_VPA, CSI_VPR, CSI_HVP, CSI_TBC, |
2678 | CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, |
3132 | CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, |
… | |
… | |
2766 | { |
3220 | { |
2767 | switch (priv) |
3221 | switch (priv) |
2768 | { |
3222 | { |
2769 | case '>': |
3223 | case '>': |
2770 | if (ch == CSI_DA) /* secondary device attributes */ |
3224 | if (ch == CSI_DA) /* secondary device attributes */ |
2771 | tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); |
3225 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
2772 | break; |
3226 | break; |
2773 | case '?': |
3227 | case '?': |
2774 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3228 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
2775 | process_terminal_mode (ch, priv, nargs, arg); |
3229 | process_terminal_mode (ch, priv, nargs, arg); |
2776 | break; |
3230 | break; |
… | |
… | |
2886 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3340 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
2887 | break; |
3341 | break; |
2888 | |
3342 | |
2889 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3343 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
2890 | tt_write ((const unsigned char *)VT100_ANS, |
3344 | tt_write ((const unsigned char *)VT100_ANS, |
2891 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
3345 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
2892 | break; |
3346 | break; |
2893 | |
3347 | |
2894 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3348 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
2895 | process_sgr_mode (nargs, arg); |
3349 | process_sgr_mode (nargs, arg); |
2896 | break; |
3350 | break; |
… | |
… | |
2903 | break; |
3357 | break; |
2904 | case 6: /* CPR requested */ |
3358 | case 6: /* CPR requested */ |
2905 | scr_report_position (); |
3359 | scr_report_position (); |
2906 | break; |
3360 | break; |
2907 | case 7: /* unofficial extension */ |
3361 | case 7: /* unofficial extension */ |
2908 | if (Options & Opt_insecure) |
3362 | if (options & Opt_insecure) |
2909 | tt_printf ("%-.250s\n", rs[Rs_display_name]); |
3363 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
2910 | break; |
3364 | break; |
2911 | case 8: /* unofficial extension */ |
3365 | case 8: /* unofficial extension */ |
2912 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3366 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
2913 | break; |
3367 | break; |
2914 | } |
3368 | } |
… | |
… | |
2950 | break; |
3404 | break; |
2951 | |
3405 | |
2952 | case CSI_RM: /* 8.3.107: RESET MODE */ |
3406 | case CSI_RM: /* 8.3.107: RESET MODE */ |
2953 | if (arg[0] == 4) |
3407 | if (arg[0] == 4) |
2954 | scr_insert_mode (0); |
3408 | scr_insert_mode (0); |
|
|
3409 | else if (arg[0] == 20) |
|
|
3410 | priv_modes &= ~PrivMode_LFNL; |
2955 | break; |
3411 | break; |
2956 | |
3412 | |
2957 | case CSI_SM: /* 8.3.126: SET MODE */ |
3413 | case CSI_SM: /* 8.3.126: SET MODE */ |
2958 | if (arg[0] == 4) |
3414 | if (arg[0] == 4) |
2959 | scr_insert_mode (1); |
3415 | scr_insert_mode (1); |
|
|
3416 | else if (arg[0] == 20) |
|
|
3417 | priv_modes |= PrivMode_LFNL; |
2960 | break; |
3418 | break; |
2961 | |
3419 | |
2962 | /* |
3420 | /* |
2963 | * PRIVATE USE beyond this point. All CSI_7? sequences here |
3421 | * PRIVATE USE beyond this point. All CSI_7? sequences here |
2964 | */ |
3422 | */ |
… | |
… | |
2976 | break; |
3434 | break; |
2977 | case CSI_75: |
3435 | case CSI_75: |
2978 | scr_cursor (RESTORE); |
3436 | scr_cursor (RESTORE); |
2979 | break; |
3437 | break; |
2980 | |
3438 | |
2981 | #ifndef NO_FRILLS |
3439 | #if ENABLE_FRILLS |
2982 | case CSI_74: |
3440 | case CSI_74: |
2983 | process_window_ops (arg, nargs); |
3441 | process_window_ops (arg, nargs); |
2984 | break; |
3442 | break; |
2985 | #endif |
3443 | #endif |
2986 | |
3444 | |
… | |
… | |
2993 | break; |
3451 | break; |
2994 | } |
3452 | } |
2995 | } |
3453 | } |
2996 | /*}}} */ |
3454 | /*}}} */ |
2997 | |
3455 | |
2998 | #ifndef NO_FRILLS |
3456 | #if ENABLE_FRILLS |
2999 | /* ARGSUSED */ |
3457 | /* ARGSUSED */ |
3000 | void |
3458 | void |
3001 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3459 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3002 | { |
3460 | { |
3003 | int x, y; |
3461 | int x, y; |
3004 | XWindowAttributes wattr; |
3462 | XWindowAttributes wattr; |
3005 | Window wdummy; |
3463 | Window wdummy; |
|
|
3464 | dDisp; |
3006 | |
3465 | |
3007 | if (nargs == 0) |
3466 | if (nargs == 0) |
3008 | return; |
3467 | return; |
3009 | |
3468 | |
3010 | switch (args[0]) |
3469 | switch (args[0]) |
3011 | { |
3470 | { |
3012 | /* |
3471 | /* |
3013 | * commands |
3472 | * commands |
3014 | */ |
3473 | */ |
3015 | case 1: /* deiconify window */ |
3474 | case 1: /* deiconify window */ |
3016 | XMapWindow (display->display, TermWin.parent[0]); |
3475 | XMapWindow (disp, TermWin.parent[0]); |
3017 | break; |
3476 | break; |
3018 | case 2: /* iconify window */ |
3477 | case 2: /* iconify window */ |
3019 | XIconifyWindow (display->display, TermWin.parent[0], |
3478 | XIconifyWindow (disp, TermWin.parent[0], display->screen); |
3020 | DefaultScreen (display->display)); |
|
|
3021 | break; |
3479 | break; |
3022 | case 3: /* set position (pixels) */ |
3480 | case 3: /* set position (pixels) */ |
3023 | XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); |
3481 | XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); |
3024 | break; |
3482 | break; |
3025 | case 4: /* set size (pixels) */ |
3483 | case 4: /* set size (pixels) */ |
3026 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3484 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3027 | break; |
3485 | break; |
3028 | case 5: /* raise window */ |
3486 | case 5: /* raise window */ |
3029 | XRaiseWindow (display->display, TermWin.parent[0]); |
3487 | XRaiseWindow (disp, TermWin.parent[0]); |
3030 | break; |
3488 | break; |
3031 | case 6: /* lower window */ |
3489 | case 6: /* lower window */ |
3032 | XLowerWindow (display->display, TermWin.parent[0]); |
3490 | XLowerWindow (disp, TermWin.parent[0]); |
3033 | break; |
3491 | break; |
3034 | case 7: /* refresh window */ |
3492 | case 7: /* refresh window */ |
3035 | scr_touch (true); |
3493 | scr_touch (true); |
3036 | break; |
3494 | break; |
3037 | case 8: /* set size (chars) */ |
3495 | case 8: /* set size (chars) */ |
… | |
… | |
3049 | |
3507 | |
3050 | /* |
3508 | /* |
3051 | * reports - some output format copied from XTerm |
3509 | * reports - some output format copied from XTerm |
3052 | */ |
3510 | */ |
3053 | case 11: /* report window state */ |
3511 | case 11: /* report window state */ |
3054 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3512 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3055 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3513 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3056 | break; |
3514 | break; |
3057 | case 13: /* report window position */ |
3515 | case 13: /* report window position */ |
3058 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3516 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3059 | XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, |
3517 | XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, |
3060 | -wattr.border_width, -wattr.border_width, |
3518 | -wattr.border_width, -wattr.border_width, |
3061 | &x, &y, &wdummy); |
3519 | &x, &y, &wdummy); |
3062 | tt_printf ("\033[3;%d;%dt", x, y); |
3520 | tt_printf ("\033[3;%d;%dt", x, y); |
3063 | break; |
3521 | break; |
3064 | case 14: /* report window size (pixels) */ |
3522 | case 14: /* report window size (pixels) */ |
3065 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3523 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3066 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3524 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3067 | break; |
3525 | break; |
3068 | case 18: /* report text area size (chars) */ |
3526 | case 18: /* report text area size (chars) */ |
3069 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3527 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3070 | break; |
3528 | break; |
3071 | case 19: /* report window size (chars) */ |
3529 | case 19: /* report window size (chars) */ |
3072 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3530 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3073 | break; |
3531 | break; |
3074 | case 20: /* report icon label */ |
3532 | case 20: /* report icon label */ |
3075 | if (Options & Opt_insecure) |
|
|
3076 | { |
3533 | { |
3077 | char *s; |
3534 | char *s; |
3078 | XGetIconName (display->display, TermWin.parent[0], &s); |
3535 | XGetIconName (disp, TermWin.parent[0], &s); |
3079 | tt_printf ("\033]L%-.200s\234", s ? s : ""); /* 8bit ST */ |
3536 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
|
|
3537 | XFree (s); |
3080 | } |
3538 | } |
3081 | break; |
3539 | break; |
3082 | case 21: /* report window title */ |
3540 | case 21: /* report window title */ |
3083 | if (Options & Opt_insecure) |
|
|
3084 | { |
3541 | { |
3085 | char *s; |
3542 | char *s; |
3086 | XFetchName (display->display, TermWin.parent[0], &s); |
3543 | XFetchName (disp, TermWin.parent[0], &s); |
3087 | tt_printf ("\033]l%-.200s\234", s ? s : ""); /* 8bit ST */ |
3544 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
|
|
3545 | XFree (s); |
3088 | } |
3546 | } |
3089 | break; |
3547 | break; |
3090 | } |
3548 | } |
3091 | } |
3549 | } |
3092 | #endif |
3550 | #endif |
3093 | |
3551 | |
3094 | /*----------------------------------------------------------------------*/ |
3552 | /*----------------------------------------------------------------------*/ |
3095 | /* |
3553 | /* |
3096 | * get input up until STRING TERMINATOR (or BEL) |
3554 | * get input up until STRING TERMINATOR (or BEL) |
3097 | * ends_how is terminator used. returned input must be free ()d |
3555 | * ends_how is terminator used. returned input must be free()'d |
3098 | */ |
3556 | */ |
3099 | unsigned char * |
3557 | unsigned char * |
3100 | rxvt_term::get_to_st (unicode_t &ends_how) |
3558 | rxvt_term::get_to_st (unicode_t &ends_how) |
3101 | { |
3559 | { |
3102 | int seen_esc = 0; /* seen escape? */ |
3560 | unicode_t ch; |
|
|
3561 | bool seen_esc = false; |
3103 | unsigned int n = 0; |
3562 | unsigned int n = 0; |
3104 | unsigned char *s; |
|
|
3105 | unicode_t ch; |
|
|
3106 | unsigned char string[STRING_MAX]; |
3563 | wchar_t string[STRING_MAX]; |
3107 | |
3564 | |
3108 | while ((ch = cmd_getc ())) |
3565 | while ((ch = cmd_getc ()) != NOCHAR) |
3109 | { |
3566 | { |
3110 | if (ch == C0_BEL || ch == CHAR_ST) |
|
|
3111 | break; |
|
|
3112 | |
|
|
3113 | if (seen_esc) |
3567 | if (seen_esc) |
|
|
3568 | { |
3114 | if (ch == 0x5c) /* 7bit ST */ |
3569 | if (ch == 0x5c) /* 7bit ST */ |
3115 | break; |
3570 | break; |
3116 | else |
3571 | else |
3117 | return NULL; |
3572 | return NULL; |
3118 | |
3573 | } |
3119 | if (ch == C0_ESC) |
3574 | else if (ch == C0_ESC) |
3120 | { |
3575 | { |
3121 | seen_esc = 1; |
3576 | seen_esc = true; |
3122 | continue; |
3577 | continue; |
3123 | } |
3578 | } |
3124 | else if (ch == '\t') |
3579 | else if (ch == C0_BEL || ch == CHAR_ST) |
3125 | ch = ' '; /* translate '\t' to space */ |
3580 | break; |
3126 | else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) |
3581 | else if (ch < 0x20) |
3127 | return NULL; /* other control character - exit */ |
3582 | return NULL; /* other control character - exit */ |
|
|
3583 | |
|
|
3584 | seen_esc = false; |
3128 | |
3585 | |
3129 | if (n >= sizeof (string) - 1) |
3586 | if (n >= sizeof (string) - 1) |
3130 | // stop at some sane length |
3587 | // stop at some sane length |
3131 | return NULL; |
3588 | return NULL; |
3132 | |
3589 | |
|
|
3590 | if (ch == C0_SYN) |
|
|
3591 | string[n++] = cmd_get8 (); |
|
|
3592 | else |
3133 | string[n++] = ch; |
3593 | string[n++] = ch; |
3134 | seen_esc = 0; |
|
|
3135 | } |
3594 | } |
3136 | |
3595 | |
3137 | string[n++] = '\0'; |
3596 | string[n++] = '\0'; |
3138 | |
3597 | |
3139 | if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) |
|
|
3140 | return NULL; |
|
|
3141 | |
|
|
3142 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3598 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3143 | STRNCPY (s, string, n); |
3599 | |
3144 | return s; |
3600 | return (unsigned char *)rxvt_wcstombs (string); |
3145 | } |
3601 | } |
3146 | |
3602 | |
3147 | /*----------------------------------------------------------------------*/ |
3603 | /*----------------------------------------------------------------------*/ |
3148 | /* |
3604 | /* |
3149 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3605 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
… | |
… | |
3193 | void |
3649 | void |
3194 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3650 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3195 | { |
3651 | { |
3196 | if (str[0] == '?' && !str[1]) |
3652 | if (str[0] == '?' && !str[1]) |
3197 | { |
3653 | { |
3198 | if (Options & Opt_insecure) |
|
|
3199 | { |
|
|
3200 | unsigned short r, g, b; |
3654 | unsigned short r, g, b; |
3201 | PixColors[color].get (display, r, g, b); |
3655 | pix_colors_focused[color].get (display, r, g, b); |
3202 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3656 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3203 | } |
|
|
3204 | } |
3657 | } |
3205 | else |
3658 | else |
3206 | set_window_color (color, str); |
3659 | set_window_color (color, str); |
3207 | } |
3660 | } |
3208 | |
3661 | |
… | |
… | |
3236 | { |
3689 | { |
3237 | int changed = 0; |
3690 | int changed = 0; |
3238 | int color; |
3691 | int color; |
3239 | char *buf, *name; |
3692 | char *buf, *name; |
3240 | bool query = str[0] == '?' && !str[1]; |
3693 | bool query = str[0] == '?' && !str[1]; |
|
|
3694 | int saveop = op; |
|
|
3695 | dDisp; |
3241 | |
3696 | |
3242 | assert (str != NULL); |
3697 | assert (str != NULL); |
3243 | switch (op) |
3698 | switch (op) |
3244 | { |
3699 | { |
3245 | case XTerm_name: |
3700 | case XTerm_name: |
… | |
… | |
3252 | set_title (str); |
3707 | set_title (str); |
3253 | break; |
3708 | break; |
3254 | case XTerm_property: |
3709 | case XTerm_property: |
3255 | if (str[0] == '?') |
3710 | if (str[0] == '?') |
3256 | { |
3711 | { |
3257 | Atom prop = XInternAtom (display->display, str + 1, True); |
3712 | Atom prop = display->atom (str + 1); |
3258 | Atom actual_type; |
3713 | Atom actual_type; |
3259 | int actual_format; |
3714 | int actual_format; |
3260 | unsigned long nitems; |
3715 | unsigned long nitems; |
3261 | unsigned long bytes_after; |
3716 | unsigned long bytes_after; |
3262 | unsigned char *value = 0; |
3717 | unsigned char *value = 0; |
3263 | const char *str = ""; |
3718 | const char *str = ""; |
3264 | |
3719 | |
3265 | if (prop |
3720 | if (prop |
3266 | && XGetWindowProperty (display->display, TermWin.parent[0], |
3721 | && XGetWindowProperty (disp, TermWin.parent[0], |
3267 | prop, 0, 1<<16, 0, AnyPropertyType, |
3722 | prop, 0, 1<<16, 0, AnyPropertyType, |
3268 | &actual_type, &actual_format, |
3723 | &actual_type, &actual_format, |
3269 | &nitems, &bytes_after, &value) == Success |
3724 | &nitems, &bytes_after, &value) == Success |
3270 | && actual_type != None |
3725 | && actual_type != None |
3271 | && actual_format == 8) |
3726 | && actual_format == 8) |
… | |
… | |
3280 | char *eq = strchr (str, '='); // constness lost, but verified to be ok |
3735 | char *eq = strchr (str, '='); // constness lost, but verified to be ok |
3281 | |
3736 | |
3282 | if (eq) |
3737 | if (eq) |
3283 | { |
3738 | { |
3284 | *eq = 0; |
3739 | *eq = 0; |
3285 | XChangeProperty (display->display, TermWin.parent[0], |
3740 | set_utf8_property (display->atom (str), eq + 1); |
3286 | display->atom (str), XA_STRING, 8, |
|
|
3287 | PropModeReplace, (unsigned char *)eq + 1, |
|
|
3288 | strlen (eq + 1)); |
|
|
3289 | } |
3741 | } |
3290 | else |
3742 | else |
3291 | XDeleteProperty (display->display, TermWin.parent[0], |
3743 | XDeleteProperty (disp, TermWin.parent[0], |
3292 | display->atom (str)); |
3744 | display->atom (str)); |
3293 | } |
3745 | } |
3294 | break; |
3746 | break; |
3295 | |
3747 | |
3296 | case XTerm_Color: |
3748 | case XTerm_Color: |
3297 | for (buf = (char *)str; buf && *buf;) |
3749 | for (buf = (char *)str; buf && *buf;) |
3298 | { |
3750 | { |
3299 | if ((name = STRCHR (buf, ';')) == NULL) |
3751 | if ((name = strchr (buf, ';')) == NULL) |
3300 | break; |
3752 | break; |
3301 | |
3753 | |
3302 | *name++ = '\0'; |
3754 | *name++ = '\0'; |
3303 | color = atoi (buf); |
3755 | color = atoi (buf); |
3304 | |
3756 | |
3305 | if (color < 0 || color >= TOTAL_COLORS) |
3757 | if (color < 0 || color >= TOTAL_COLORS) |
3306 | break; |
3758 | break; |
3307 | |
3759 | |
3308 | if ((buf = STRCHR (name, ';')) != NULL) |
3760 | if ((buf = strchr (name, ';')) != NULL) |
3309 | *buf++ = '\0'; |
3761 | *buf++ = '\0'; |
3310 | |
3762 | |
3311 | if (name[0] == '?' && !name[1]) |
3763 | if (name[0] == '?' && !name[1]) |
3312 | { |
3764 | { |
3313 | if (Options & Opt_insecure) |
|
|
3314 | { |
|
|
3315 | unsigned short r, g, b; |
3765 | unsigned short r, g, b; |
3316 | PixColors[color + minCOLOR].get (display, r, g, b); |
3766 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3317 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3767 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3318 | } |
|
|
3319 | } |
3768 | } |
3320 | else |
3769 | else |
3321 | set_window_color (color + minCOLOR, name); |
3770 | set_window_color (color + minCOLOR, name); |
3322 | } |
3771 | } |
3323 | break; |
3772 | break; |
… | |
… | |
3340 | break; |
3789 | break; |
3341 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3790 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3342 | case XTerm_Color_BD: |
3791 | case XTerm_Color_BD: |
3343 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
3792 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
3344 | break; |
3793 | break; |
|
|
3794 | case XTerm_Color_IT: |
|
|
3795 | process_color_seq (XTerm_Color_IT, Color_IT, str, resp); |
|
|
3796 | break; |
3345 | case XTerm_Color_UL: |
3797 | case XTerm_Color_UL: |
3346 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
3798 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
3347 | break; |
3799 | break; |
3348 | case XTerm_Color_RV: |
3800 | case XTerm_Color_RV: |
3349 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3801 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3802 | break; |
|
|
3803 | #endif |
|
|
3804 | #if TRANSPARENT && TINTING |
|
|
3805 | case XTerm_Color_tint: |
|
|
3806 | process_color_seq (XTerm_Color_tint, Color_tint, str, resp); |
|
|
3807 | check_our_parents (); |
|
|
3808 | if (am_transparent) |
|
|
3809 | want_full_refresh = want_refresh = 1; |
3350 | break; |
3810 | break; |
3351 | #endif |
3811 | #endif |
3352 | |
3812 | |
3353 | case XTerm_Pixmap: |
3813 | case XTerm_Pixmap: |
3354 | if (*str != ';') |
3814 | if (*str != ';') |
… | |
… | |
3357 | scale_pixmap (""); /* reset to default scaling */ |
3817 | scale_pixmap (""); /* reset to default scaling */ |
3358 | set_bgPixmap (str); /* change pixmap */ |
3818 | set_bgPixmap (str); /* change pixmap */ |
3359 | #endif |
3819 | #endif |
3360 | scr_touch (true); |
3820 | scr_touch (true); |
3361 | } |
3821 | } |
3362 | while ((str = STRCHR (str, ';')) != NULL) |
3822 | while ((str = strchr (str, ';')) != NULL) |
3363 | { |
3823 | { |
3364 | str++; |
3824 | str++; |
3365 | #if XPM_BACKGROUND |
3825 | #if XPM_BACKGROUND |
3366 | changed += scale_pixmap (str); |
3826 | changed += scale_pixmap (str); |
3367 | #endif |
3827 | #endif |
3368 | |
|
|
3369 | } |
3828 | } |
|
|
3829 | |
3370 | if (changed) |
3830 | if (changed) |
3371 | { |
3831 | { |
3372 | #ifdef XPM_BACKGROUND |
3832 | #ifdef XPM_BACKGROUND |
3373 | resize_pixmap (); |
3833 | resize_pixmap (); |
3374 | #endif |
3834 | #endif |
… | |
… | |
3386 | case XTerm_logfile: |
3846 | case XTerm_logfile: |
3387 | // TODO, when secure mode? |
3847 | // TODO, when secure mode? |
3388 | break; |
3848 | break; |
3389 | |
3849 | |
3390 | case XTerm_font: |
3850 | case XTerm_font: |
|
|
3851 | op = URxvt_font; |
|
|
3852 | case URxvt_font: |
|
|
3853 | #if ENABLE_STYLES |
|
|
3854 | case URxvt_boldFont: |
|
|
3855 | case URxvt_italicFont: |
|
|
3856 | case URxvt_boldItalicFont: |
|
|
3857 | #endif |
3391 | if (query) |
3858 | if (query) |
|
|
3859 | tt_printf ("\33]%d;%-.250s%c", saveop, |
|
|
3860 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
|
|
3861 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
|
|
3862 | resp); |
|
|
3863 | else |
3392 | { |
3864 | { |
3393 | if (Options & Opt_insecure) |
3865 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
3394 | tt_printf ("\33]%d;%-.250s%c", XTerm_font, |
3866 | |
3395 | TermWin.fontset->fontdesc |
3867 | res = strdup (str); |
3396 | ? TermWin.fontset->fontdesc |
3868 | allocated.push_back ((void *)res); |
3397 | : "", |
3869 | set_fonts (); |
3398 | resp); |
|
|
3399 | } |
3870 | } |
3400 | else |
|
|
3401 | change_font (str); |
|
|
3402 | break; |
3871 | break; |
3403 | |
3872 | |
3404 | #ifndef NO_FRILLS |
3873 | #if ENABLE_FRILLS |
3405 | case XTerm_locale: |
3874 | case XTerm_locale: |
3406 | if (query) |
3875 | if (query) |
3407 | { |
|
|
3408 | if (Options & Opt_insecure) |
|
|
3409 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, locale, resp); |
3876 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); |
3410 | } |
|
|
3411 | else |
3877 | else |
3412 | { |
3878 | { |
3413 | set_locale (str); |
3879 | set_locale (str); |
|
|
3880 | pty.set_utf8_mode (enc_utf8); |
3414 | # ifdef USE_XIM |
3881 | # ifdef USE_XIM |
3415 | im_cb (); |
3882 | im_cb (); |
3416 | # endif |
3883 | # endif |
3417 | } |
3884 | } |
3418 | break; |
3885 | break; |
3419 | |
|
|
3420 | case XTerm_findfont: |
|
|
3421 | if (Options & Opt_insecure) |
|
|
3422 | { |
|
|
3423 | int fid = TermWin.fontset->find_font (atoi (str)); |
|
|
3424 | tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, |
|
|
3425 | fid, (*TermWin.fontset)[fid]->name, resp); |
|
|
3426 | } |
|
|
3427 | break; |
|
|
3428 | #endif |
3886 | #endif |
3429 | |
3887 | |
3430 | #ifdef MENUBAR |
3888 | #ifdef MENUBAR |
3431 | case XTerm_Menu: |
3889 | case XTerm_Menu: |
3432 | if (Options & Opt_insecure) |
3890 | if (options & Opt_insecure) |
3433 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3891 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3434 | break; |
3892 | break; |
3435 | #endif |
3893 | #endif |
3436 | #if 0 |
3894 | #if 0 |
3437 | case XTerm_dumpscreen: /* no error notices */ |
3895 | case XTerm_dumpscreen: /* no error notices */ |
… | |
… | |
3464 | { |
3922 | { |
3465 | int state; |
3923 | int state; |
3466 | |
3924 | |
3467 | if (mode == 's') |
3925 | if (mode == 's') |
3468 | { |
3926 | { |
3469 | SavedModes |= (PrivateModes & bit); |
3927 | SavedModes |= (priv_modes & bit); |
3470 | return -1; |
3928 | return -1; |
3471 | } |
3929 | } |
3472 | else |
3930 | else |
3473 | { |
3931 | { |
3474 | if (mode == 'r') |
3932 | if (mode == 'r') |
3475 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3933 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3476 | else |
3934 | else |
3477 | state = (mode == 't') ? ! (PrivateModes & bit) : mode; |
3935 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
3478 | PrivMode (state, bit); |
3936 | PrivMode (state, bit); |
3479 | } |
3937 | } |
3480 | |
3938 | |
3481 | return state; |
3939 | return state; |
3482 | } |
3940 | } |
… | |
… | |
3500 | { 3, PrivMode_132 }, |
3958 | { 3, PrivMode_132 }, |
3501 | { 4, PrivMode_smoothScroll }, |
3959 | { 4, PrivMode_smoothScroll }, |
3502 | { 5, PrivMode_rVideo }, |
3960 | { 5, PrivMode_rVideo }, |
3503 | { 6, PrivMode_relOrigin }, |
3961 | { 6, PrivMode_relOrigin }, |
3504 | { 7, PrivMode_Autowrap }, |
3962 | { 7, PrivMode_Autowrap }, |
|
|
3963 | // 8, bi-directional support mode |
3505 | { 9, PrivMode_MouseX10 }, |
3964 | { 9, PrivMode_MouseX10 }, |
3506 | #ifdef menuBar_esc |
3965 | #ifdef menuBar_esc |
3507 | { menuBar_esc, PrivMode_menuBar }, |
3966 | { menuBar_esc, PrivMode_menuBar }, |
3508 | #endif |
3967 | #endif |
|
|
3968 | // 18, 19 printing-related |
|
|
3969 | { 25, PrivMode_VisibleCursor }, |
3509 | #ifdef scrollBar_esc |
3970 | #ifdef scrollBar_esc |
3510 | { scrollBar_esc, PrivMode_scrollBar }, |
3971 | { scrollBar_esc, PrivMode_scrollBar }, |
3511 | #endif |
3972 | #endif |
3512 | // 18, 19 printing-related |
|
|
3513 | { 25, PrivMode_VisibleCursor }, |
|
|
3514 | // 30 show scrollbar rxvt. extension |
|
|
3515 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3973 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3516 | { 40, PrivMode_132OK }, |
3974 | { 40, PrivMode_132OK }, |
3517 | // 41 xterm more fixes NYI |
3975 | // 41 xterm more fixes NYI |
3518 | // 45 margin bell NYI |
3976 | // 45 margin bell NYI |
3519 | // 46 start logging |
3977 | // 46 start logging |
… | |
… | |
3560 | |
4018 | |
3561 | /* extra handling for values with state unkept */ |
4019 | /* extra handling for values with state unkept */ |
3562 | switch (arg[i]) |
4020 | switch (arg[i]) |
3563 | { |
4021 | { |
3564 | case 1048: /* alternative cursor save */ |
4022 | case 1048: /* alternative cursor save */ |
|
|
4023 | case 1049: |
3565 | if (Options & Opt_secondaryScreen) |
4024 | if (options & Opt_secondaryScreen) |
3566 | if (mode == 0) |
4025 | if (mode == 0) |
3567 | scr_cursor (RESTORE); |
4026 | scr_cursor (RESTORE); |
3568 | else if (mode == 1) |
4027 | else if (mode == 1) |
3569 | scr_cursor (SAVE); |
4028 | scr_cursor (SAVE); |
3570 | break; |
4029 | break; |
… | |
… | |
3581 | * within VT52 mode |
4040 | * within VT52 mode |
3582 | */ |
4041 | */ |
3583 | PrivMode (1, PrivMode_vt52); |
4042 | PrivMode (1, PrivMode_vt52); |
3584 | break; |
4043 | break; |
3585 | case 3: /* 80/132 */ |
4044 | case 3: /* 80/132 */ |
3586 | if (PrivateModes & PrivMode_132OK) |
4045 | if (priv_modes & PrivMode_132OK) |
3587 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4046 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
3588 | break; |
4047 | break; |
3589 | case 4: /* smooth scrolling */ |
4048 | case 4: /* smooth scrolling */ |
3590 | if (state) |
4049 | if (state) |
3591 | Options &= ~Opt_jumpScroll; |
4050 | options &= ~Opt_jumpScroll; |
3592 | else |
4051 | else |
3593 | Options |= Opt_jumpScroll; |
4052 | options |= Opt_jumpScroll; |
3594 | break; |
4053 | break; |
3595 | case 5: /* reverse video */ |
4054 | case 5: /* reverse video */ |
3596 | scr_rvideo_mode (state); |
4055 | scr_rvideo_mode (state); |
3597 | break; |
4056 | break; |
3598 | case 6: /* relative/absolute origins */ |
4057 | case 6: /* relative/absolute origins */ |
… | |
… | |
3602 | scr_autowrap (state); |
4061 | scr_autowrap (state); |
3603 | break; |
4062 | break; |
3604 | /* case 8: - auto repeat, can't do on a per window basis */ |
4063 | /* case 8: - auto repeat, can't do on a per window basis */ |
3605 | case 9: /* X10 mouse reporting */ |
4064 | case 9: /* X10 mouse reporting */ |
3606 | if (state) /* orthogonal */ |
4065 | if (state) /* orthogonal */ |
3607 | PrivateModes &= ~PrivMode_MouseX11; |
4066 | priv_modes &= ~PrivMode_MouseX11; |
3608 | break; |
4067 | break; |
3609 | #ifdef menuBar_esc |
4068 | #ifdef menuBar_esc |
3610 | case menuBar_esc: |
4069 | case menuBar_esc: |
3611 | #ifdef MENUBAR |
4070 | #ifdef MENUBAR |
3612 | map_menuBar (state); |
4071 | map_menuBar (state); |
… | |
… | |
3632 | break; |
4091 | break; |
3633 | /* case 66: - application key pad */ |
4092 | /* case 66: - application key pad */ |
3634 | /* case 67: - backspace key */ |
4093 | /* case 67: - backspace key */ |
3635 | case 1000: /* X11 mouse reporting */ |
4094 | case 1000: /* X11 mouse reporting */ |
3636 | if (state) /* orthogonal */ |
4095 | if (state) /* orthogonal */ |
3637 | PrivateModes &= ~PrivMode_MouseX10; |
4096 | priv_modes &= ~PrivMode_MouseX10; |
3638 | break; |
4097 | break; |
3639 | #if 0 |
4098 | #if 0 |
3640 | case 1001: |
4099 | case 1001: |
3641 | break; /* X11 mouse highlighting */ |
4100 | break; /* X11 mouse highlighting */ |
3642 | #endif |
4101 | #endif |
3643 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4102 | case 1010: /* scroll to bottom on TTY output inhibit */ |
3644 | if (state) |
4103 | if (state) |
3645 | Options &= ~Opt_scrollTtyOutput; |
4104 | options &= ~Opt_scrollTtyOutput; |
3646 | else |
4105 | else |
3647 | Options |= Opt_scrollTtyOutput; |
4106 | options |= Opt_scrollTtyOutput; |
3648 | break; |
4107 | break; |
3649 | case 1011: /* scroll to bottom on key press */ |
4108 | case 1011: /* scroll to bottom on key press */ |
3650 | if (state) |
4109 | if (state) |
3651 | Options |= Opt_scrollTtyKeypress; |
4110 | options |= Opt_scrollTtyKeypress; |
3652 | else |
4111 | else |
3653 | Options &= ~Opt_scrollTtyKeypress; |
4112 | options &= ~Opt_scrollTtyKeypress; |
3654 | break; |
4113 | break; |
3655 | case 1047: /* secondary screen w/ clearing last */ |
4114 | case 1047: /* secondary screen w/ clearing last */ |
3656 | if (Options & Opt_secondaryScreen) |
4115 | if (options & Opt_secondaryScreen) |
3657 | if (current_screen != PRIMARY) |
4116 | if (current_screen != PRIMARY) |
3658 | scr_erase_screen (2); |
4117 | scr_erase_screen (2); |
3659 | scr_change_screen (state); |
4118 | scr_change_screen (state); |
3660 | break; |
4119 | break; |
3661 | case 1049: /* secondary screen w/ clearing first */ |
4120 | case 1049: /* secondary screen w/ clearing first */ |
3662 | scr_change_screen (state); |
4121 | scr_change_screen (state); |
3663 | if (Options & Opt_secondaryScreen) |
4122 | if (options & Opt_secondaryScreen) |
3664 | if (current_screen != PRIMARY) |
4123 | if (current_screen != PRIMARY) |
3665 | scr_erase_screen (2); |
4124 | scr_erase_screen (2); |
3666 | break; |
4125 | break; |
3667 | default: |
4126 | default: |
3668 | break; |
4127 | break; |
… | |
… | |
3694 | rendset = 0, rendstyle = ~RS_None; |
4153 | rendset = 0, rendstyle = ~RS_None; |
3695 | break; |
4154 | break; |
3696 | case 1: |
4155 | case 1: |
3697 | rendset = 1, rendstyle = RS_Bold; |
4156 | rendset = 1, rendstyle = RS_Bold; |
3698 | break; |
4157 | break; |
|
|
4158 | //case 2: // low intensity |
|
|
4159 | case 3: |
|
|
4160 | rendset = 1, rendstyle = RS_Italic; |
|
|
4161 | break; |
3699 | case 4: |
4162 | case 4: |
3700 | rendset = 1, rendstyle = RS_Uline; |
4163 | rendset = 1, rendstyle = RS_Uline; |
3701 | break; |
4164 | break; |
3702 | case 5: |
4165 | case 5: // slowly blinking |
|
|
4166 | case 6: // rapidly blinking |
3703 | rendset = 1, rendstyle = RS_Blink; |
4167 | rendset = 1, rendstyle = RS_Blink; |
3704 | break; |
4168 | break; |
|
|
4169 | //case 6: // scoansi light background |
3705 | case 7: |
4170 | case 7: |
3706 | rendset = 1, rendstyle = RS_RVid; |
4171 | rendset = 1, rendstyle = RS_RVid; |
3707 | break; |
4172 | break; |
3708 | case 8: |
4173 | case 8: |
3709 | // invisible. NYI |
4174 | // invisible. NYI |
3710 | break; |
4175 | break; |
3711 | case 22: |
4176 | //case 9: // crossed out |
|
|
4177 | //case 10: // scoansi acs off, primary font |
|
|
4178 | //case 11: // scoansi acs on, first alt font |
|
|
4179 | //case 12: // scoansi acs on, |0x80, second alt font |
|
|
4180 | //... |
|
|
4181 | //case 19: // ninth alt font |
|
|
4182 | //case 20: // gothic |
|
|
4183 | case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) |
3712 | rendset = 0, rendstyle = RS_Bold; |
4184 | rendset = 0, rendstyle = RS_Bold; |
|
|
4185 | break; |
|
|
4186 | case 22: // normal intensity |
|
|
4187 | rendset = 0, rendstyle = RS_Bold; |
|
|
4188 | break; |
|
|
4189 | case 23: // disable italic |
|
|
4190 | rendset = 0, rendstyle = RS_Italic; |
3713 | break; |
4191 | break; |
3714 | case 24: |
4192 | case 24: |
3715 | rendset = 0, rendstyle = RS_Uline; |
4193 | rendset = 0, rendstyle = RS_Uline; |
3716 | break; |
4194 | break; |
3717 | case 25: |
4195 | case 25: |
3718 | rendset = 0, rendstyle = RS_Blink; |
4196 | rendset = 0, rendstyle = RS_Blink; |
3719 | break; |
4197 | break; |
|
|
4198 | case 26: // variable spacing (iso 8613) |
|
|
4199 | rendset = 0, rendstyle = RS_Blink; |
|
|
4200 | break; |
3720 | case 27: |
4201 | case 27: |
3721 | rendset = 0, rendstyle = RS_RVid; |
4202 | rendset = 0, rendstyle = RS_RVid; |
3722 | break; |
4203 | break; |
3723 | case 28: |
|
|
3724 | // visible. NYI |
4204 | //case 28: // visible. NYI |
3725 | break; |
4205 | //case 29: // not crossed-out |
3726 | } |
4206 | } |
3727 | |
4207 | |
3728 | if (rendset != -1) |
4208 | if (rendset != -1) |
3729 | { |
4209 | { |
3730 | scr_rendition (rendset, rendstyle); |
4210 | scr_rendition (rendset, rendstyle); |
… | |
… | |
3741 | case 35: |
4221 | case 35: |
3742 | case 36: |
4222 | case 36: |
3743 | case 37: |
4223 | case 37: |
3744 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); |
4224 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); |
3745 | break; |
4225 | break; |
3746 | #ifdef TTY_256COLOR |
4226 | case 38: // set fg color, ISO 8613-6 |
3747 | case 38: |
|
|
3748 | if (nargs > i + 2 && arg[i + 1] == 5) |
4227 | if (nargs > i + 2 && arg[i + 1] == 5) |
3749 | { |
4228 | { |
3750 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); |
4229 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); |
3751 | i += 2; |
4230 | i += 2; |
3752 | } |
4231 | } |
3753 | break; |
4232 | break; |
3754 | #endif |
|
|
3755 | case 39: /* default fg */ |
4233 | case 39: /* default fg */ |
3756 | scr_color (Color_fg, Color_fg); |
4234 | scr_color (Color_fg, Color_fg); |
3757 | break; |
4235 | break; |
3758 | |
4236 | |
3759 | case 40: |
4237 | case 40: |
… | |
… | |
3764 | case 45: |
4242 | case 45: |
3765 | case 46: |
4243 | case 46: |
3766 | case 47: |
4244 | case 47: |
3767 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); |
4245 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); |
3768 | break; |
4246 | break; |
3769 | #ifdef TTY_256COLOR |
4247 | case 48: // set bg color, ISO 8613-6 |
3770 | case 48: |
|
|
3771 | if (nargs > i + 2 && arg[i + 1] == 5) |
4248 | if (nargs > i + 2 && arg[i + 1] == 5) |
3772 | { |
4249 | { |
3773 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); |
4250 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); |
3774 | i += 2; |
4251 | i += 2; |
3775 | } |
4252 | } |
3776 | break; |
4253 | break; |
3777 | #endif |
|
|
3778 | case 49: /* default bg */ |
4254 | case 49: /* default bg */ |
3779 | scr_color (Color_bg, Color_bg); |
4255 | scr_color (Color_bg, Color_bg); |
3780 | break; |
4256 | break; |
|
|
4257 | |
|
|
4258 | //case 50: // not variable spacing |
3781 | |
4259 | |
3782 | #ifndef NO_BRIGHTCOLOR |
4260 | #ifndef NO_BRIGHTCOLOR |
3783 | case 90: |
4261 | case 90: |
3784 | case 91: /* set bright fg color */ |
4262 | case 91: /* set bright fg color */ |
3785 | case 92: |
4263 | case 92: |
3786 | case 93: |
4264 | case 93: |
3787 | case 94: |
4265 | case 94: |
3788 | case 95: |
4266 | case 95: |
3789 | case 96: |
4267 | case 96: |
3790 | case 97: |
4268 | case 97: |
3791 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), |
4269 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg); |
3792 | Color_fg); |
|
|
3793 | break; |
4270 | break; |
3794 | case 100: |
4271 | case 100: |
3795 | case 101: /* set bright bg color */ |
4272 | case 101: /* set bright bg color */ |
3796 | case 102: |
4273 | case 102: |
3797 | case 103: |
4274 | case 103: |
3798 | case 104: |
4275 | case 104: |
3799 | case 105: |
4276 | case 105: |
3800 | case 106: |
4277 | case 106: |
3801 | case 107: |
4278 | case 107: |
3802 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), |
4279 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
3803 | Color_bg); |
|
|
3804 | break; |
4280 | break; |
3805 | #endif |
4281 | #endif |
3806 | |
4282 | |
3807 | } |
4283 | } |
3808 | } |
4284 | } |
3809 | } |
4285 | } |
3810 | /*}}} */ |
4286 | /*}}} */ |
3811 | |
4287 | |
3812 | /*{{{ process Rob Nation's own graphics mode sequences */ |
4288 | /*{{{ (do not) process Rob Nation's own graphics mode sequences */ |
3813 | void |
4289 | void |
3814 | rxvt_term::process_graphics () |
4290 | rxvt_term::process_graphics () |
3815 | { |
4291 | { |
3816 | unicode_t ch, cmd = cmd_getc (); |
4292 | unicode_t ch, cmd = cmd_getc (); |
3817 | |
4293 | |
3818 | if (cmd == 'Q') |
4294 | if (cmd == 'Q') |
3819 | { /* query graphics */ |
4295 | { /* query graphics */ |
3820 | tt_printf ("\033G0\n"); /* no graphics */ |
4296 | tt_printf ("\033G0\012"); /* no graphics */ |
3821 | return; |
4297 | return; |
3822 | } |
4298 | } |
3823 | /* swallow other graphics sequences until terminating ':' */ |
4299 | /* swallow other graphics sequences until terminating ':' */ |
3824 | do |
4300 | do |
3825 | ch = cmd_getc (); |
4301 | ch = cmd_getc (); |
… | |
… | |
3840 | unsigned char buf[256]; |
4316 | unsigned char buf[256]; |
3841 | |
4317 | |
3842 | va_start (arg_ptr, fmt); |
4318 | va_start (arg_ptr, fmt); |
3843 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4319 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
3844 | va_end (arg_ptr); |
4320 | va_end (arg_ptr); |
3845 | tt_write (buf, STRLEN (buf)); |
4321 | tt_write (buf, strlen (buf)); |
3846 | } |
4322 | } |
3847 | |
4323 | |
3848 | /* ---------------------------------------------------------------------- */ |
4324 | /* ---------------------------------------------------------------------- */ |
3849 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4325 | /* Write data to the pty as typed by the user, pasted with the mouse, |
3850 | * or generated by us in response to a query ESC sequence. |
4326 | * or generated by us in response to a query ESC sequence. |
3851 | */ |
4327 | */ |
|
|
4328 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
|
|
4329 | |
3852 | void |
4330 | void |
3853 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4331 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
3854 | { |
4332 | { |
3855 | enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT |
4333 | if (v_buflen == 0) |
|
|
4334 | { |
|
|
4335 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
3856 | |
4336 | |
3857 | if (len) |
4337 | if ((unsigned int)written == len) |
|
|
4338 | return; |
|
|
4339 | |
|
|
4340 | data += written; |
|
|
4341 | len -= written; |
3858 | { |
4342 | } |
|
|
4343 | |
|
|
4344 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
|
|
4345 | |
|
|
4346 | memcpy (v_buffer + v_buflen, data, len); |
|
|
4347 | v_buflen += len; |
|
|
4348 | |
|
|
4349 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
4350 | } |
|
|
4351 | |
|
|
4352 | void rxvt_term::pty_write () |
|
|
4353 | { |
|
|
4354 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
|
|
4355 | |
|
|
4356 | if (written > 0) |
|
|
4357 | { |
|
|
4358 | v_buflen -= written; |
|
|
4359 | |
3859 | if (v_buflen == 0) |
4360 | if (v_buflen == 0) |
3860 | { |
4361 | { |
3861 | ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); |
|
|
3862 | |
|
|
3863 | if ((unsigned int)written == len) |
|
|
3864 | return; |
|
|
3865 | |
|
|
3866 | data += written; |
|
|
3867 | len -= written; |
|
|
3868 | } |
|
|
3869 | |
|
|
3870 | |
|
|
3871 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
|
|
3872 | |
|
|
3873 | memcpy (v_buffer + v_buflen, data, len); |
|
|
3874 | v_buflen += len; |
|
|
3875 | } |
|
|
3876 | |
|
|
3877 | for (;;) |
|
|
3878 | { |
|
|
3879 | int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); |
|
|
3880 | |
|
|
3881 | if (written > 0) |
|
|
3882 | { |
|
|
3883 | v_buflen -= written; |
|
|
3884 | |
|
|
3885 | if (v_buflen == 0) |
|
|
3886 | { |
|
|
3887 | free (v_buffer); |
4362 | free (v_buffer); |
3888 | v_buffer = 0; |
4363 | v_buffer = 0; |
3889 | v_buflen = 0; |
4364 | v_buflen = 0; |
3890 | |
4365 | |
3891 | pty_ev.set (EVENT_READ); |
4366 | pty_ev.set (EVENT_READ); |
3892 | return; |
|
|
3893 | } |
|
|
3894 | |
|
|
3895 | memmove (v_buffer, v_buffer + written, v_buflen); |
|
|
3896 | } |
|
|
3897 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
3898 | // original code just ignores this... |
|
|
3899 | destroy (); |
|
|
3900 | else |
|
|
3901 | { |
|
|
3902 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
3903 | return; |
4367 | return; |
3904 | } |
4368 | } |
|
|
4369 | |
|
|
4370 | memmove (v_buffer, v_buffer + written, v_buflen); |
3905 | } |
4371 | } |
|
|
4372 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
4373 | // original code just ignores this... |
|
|
4374 | destroy (); |
3906 | } |
4375 | } |
3907 | |
4376 | |
3908 | /*----------------------- end-of-file (C source) -----------------------*/ |
4377 | /*----------------------- end-of-file (C source) -----------------------*/ |
3909 | |
4378 | |