… | |
… | |
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; |
61 | |
65 | |
62 | #ifndef NO_FRILLS |
66 | #if ENABLE_FRILLS || ISO_14755 |
63 | |
67 | |
64 | #define ISO_14755_KEYCODE_VALID 0x80000000UL |
|
|
65 | #define ISO_14755_ACTIVE 0x40000000UL |
68 | #define ISO_14755_STARTED 0x80000000UL |
66 | #define ISO_14755_ESCAPE_NEXT 0x20000000UL |
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 |
67 | |
73 | |
|
|
74 | #if ISO_14755 |
68 | static unsigned short iso14755_symtab[] = { |
75 | static unsigned short iso14755_symtab[] = { |
69 | // keysym, unicode |
76 | // keysym, unicode |
70 | XK_Left, 0x2190, |
77 | XK_Left, 0x2190, |
71 | XK_KP_Left, 0x2190, |
78 | XK_KP_Left, 0x2190, |
72 | XK_Up, 0x2191, |
79 | XK_Up, 0x2191, |
… | |
… | |
110 | XK_Escape, 0x238b, |
117 | XK_Escape, 0x238b, |
111 | XK_Undo, 0x238c, |
118 | XK_Undo, 0x238c, |
112 | XK_Print, 0x2399, |
119 | XK_Print, 0x2399, |
113 | |
120 | |
114 | XK_space, 0x2423, |
121 | XK_space, 0x2423, |
|
|
122 | |
|
|
123 | #ifdef XK_KP_Begin |
|
|
124 | XK_KP_Prior, 0x21de, |
|
|
125 | XK_KP_Next, 0x21df, |
|
|
126 | XK_KP_Begin, 0x2320, |
|
|
127 | XK_KP_Insert, 0x2380, |
|
|
128 | XK_KP_Delete, 0x2326, |
115 | XK_KP_Space, 0x2422, |
129 | XK_KP_Space, 0x2422, |
|
|
130 | #endif |
116 | 0, |
131 | 0, |
117 | }; |
132 | }; |
118 | |
133 | |
119 | void |
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 |
120 | rxvt_term::commit_iso14755 () |
221 | rxvt_term::commit_iso14755 () |
121 | { |
222 | { |
122 | wchar_t ch[2]; |
223 | wchar_t ch[2]; |
123 | |
224 | |
124 | ch[0] = iso14755buf & 0x1fffffffUL; // actually, unicode needs a 0x1fffff mask |
225 | ch[0] = iso14755buf & ISO_14755_MASK; |
125 | ch[1] = 0; |
226 | ch[1] = 0; |
126 | |
227 | |
127 | if (iso14755buf & ISO_14755_KEYCODE_VALID) |
228 | if (iso14755buf & ISO_14755_51) |
128 | { |
229 | { |
129 | char mb[16]; |
230 | char mb[16]; |
130 | int len; |
231 | int len; |
131 | |
232 | |
132 | // allow verbatim 0-bytes and control-bytes to be entered |
233 | // allow verbatim 0-bytes and control-bytes to be entered |
… | |
… | |
183 | * 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 |
184 | * escape sequence to toggle the Keypad. |
285 | * escape sequence to toggle the Keypad. |
185 | * |
286 | * |
186 | * Always permit `shift' to override the current setting |
287 | * Always permit `shift' to override the current setting |
187 | */ |
288 | */ |
188 | shft = (ev.state & ShiftMask); |
289 | shft = ev.state & ShiftMask; |
189 | ctrl = (ev.state & ControlMask); |
290 | ctrl = ev.state & ControlMask; |
190 | meta = (ev.state & ModMetaMask); |
291 | meta = ev.state & ModMetaMask; |
191 | |
292 | |
192 | if (numlock_state || (ev.state & ModNumLockMask)) |
293 | if (numlock_state || (ev.state & ModNumLockMask)) |
193 | { |
294 | { |
194 | numlock_state = (ev.state & ModNumLockMask); |
295 | numlock_state = (ev.state & ModNumLockMask); |
195 | PrivMode ((!numlock_state), PrivMode_aplKP); |
296 | PrivMode ((!numlock_state), PrivMode_aplKP); |
… | |
… | |
254 | valid_keysym = keysym != NoSymbol; |
355 | valid_keysym = keysym != NoSymbol; |
255 | } |
356 | } |
256 | |
357 | |
257 | if (valid_keysym) |
358 | if (valid_keysym) |
258 | { |
359 | { |
|
|
360 | #ifdef KEYSYM_RESOURCE |
|
|
361 | if (keyboard->dispatch (this, keysym, ev.state)) |
|
|
362 | return; |
|
|
363 | #endif |
|
|
364 | |
259 | if (TermWin.saveLines) |
365 | if (TermWin.saveLines) |
260 | { |
366 | { |
261 | #ifdef UNSHIFTED_SCROLLKEYS |
367 | #ifdef UNSHIFTED_SCROLLKEYS |
262 | if (!ctrl && !meta) |
368 | if (!ctrl && !meta) |
263 | #else |
369 | #else |
… | |
… | |
320 | if (keysym >= XK_F1 && keysym <= XK_F10) |
426 | if (keysym >= XK_F1 && keysym <= XK_F10) |
321 | { |
427 | { |
322 | keysym += (XK_F11 - XK_F1); |
428 | keysym += (XK_F11 - XK_F1); |
323 | shft = 0; /* turn off Shift */ |
429 | shft = 0; /* turn off Shift */ |
324 | } |
430 | } |
325 | else if (!ctrl && !meta && (PrivateModes & PrivMode_ShiftKeys)) |
431 | else if (!ctrl && !meta && (priv_modes & PrivMode_ShiftKeys)) |
326 | { |
432 | { |
327 | switch (keysym) |
433 | switch (keysym) |
328 | { |
434 | { |
329 | /* normal XTerm key bindings */ |
435 | /* normal XTerm key bindings */ |
330 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
436 | case XK_Insert: /* Shift+Insert = paste mouse selection */ |
331 | selection_request (ev.time, 0, 0); |
437 | selection_request (ev.time, 0, 0); |
332 | return; |
438 | return; |
333 | #if TODO // TODO |
439 | #if TODO |
334 | /* rxvt extras */ |
440 | /* rxvt extras */ |
335 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
441 | case XK_KP_Add: /* Shift+KP_Add = bigger font */ |
336 | change_font (FONT_UP); |
442 | change_font (FONT_UP); |
337 | return; |
443 | return; |
338 | case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ |
444 | case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ |
… | |
… | |
341 | #endif |
447 | #endif |
342 | } |
448 | } |
343 | } |
449 | } |
344 | } |
450 | } |
345 | |
451 | |
346 | #ifndef NO_FRILLS |
452 | #if ENABLE_FRILLS || ISO_14755 |
347 | // ISO 14755 support |
453 | // ISO 14755 support |
348 | if (shft && ctrl) |
454 | if (shft && ctrl) |
349 | { |
455 | { |
350 | int hv; |
456 | int hv; |
351 | |
457 | |
|
|
458 | if (iso14755buf & ISO_14755_51 |
352 | if (keysym == XK_space || keysym == XK_KP_Space |
459 | && (keysym == XK_space || keysym == XK_KP_Space |
353 | || keysym == XK_Return || keysym == XK_KP_Enter) |
460 | || keysym == XK_Return || keysym == XK_KP_Enter)) |
354 | { |
461 | { |
355 | commit_iso14755 (); |
462 | commit_iso14755 (); |
|
|
463 | iso14755buf = ISO_14755_51; |
|
|
464 | # if ISO_14755 |
|
|
465 | iso14755_51 (0); |
|
|
466 | # endif |
356 | return; |
467 | return; |
357 | } |
468 | } |
358 | else if ((hv = hex_keyval (ev)) >= 0) |
469 | else if ((hv = hex_keyval (ev)) >= 0) |
359 | { |
470 | { |
360 | iso14755buf = (iso14755buf << 4) | hv | ISO_14755_KEYCODE_VALID; |
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 |
361 | return; |
476 | return; |
362 | } |
477 | } |
363 | else |
478 | else |
|
|
479 | { |
|
|
480 | # if ENABLE_OVERLAY |
|
|
481 | scr_overlay_off (); |
|
|
482 | # endif |
364 | iso14755buf = 0; |
483 | iso14755buf = 0; |
|
|
484 | } |
365 | } |
485 | } |
366 | else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) |
486 | else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) |
367 | || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) |
487 | || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) |
|
|
488 | if (!(iso14755buf & ISO_14755_STARTED)) |
|
|
489 | { |
368 | iso14755buf |= ISO_14755_ACTIVE; |
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 | } |
369 | #endif |
496 | #endif |
370 | |
497 | |
371 | #ifdef PRINTPIPE |
498 | #ifdef PRINTPIPE |
372 | if (keysym == XK_Print) |
499 | if (keysym == XK_Print) |
373 | { |
500 | { |
… | |
… | |
376 | } |
503 | } |
377 | #endif |
504 | #endif |
378 | |
505 | |
379 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
506 | if (keysym >= 0xFF00 && keysym <= 0xFFFF) |
380 | { |
507 | { |
381 | #ifdef KEYSYM_RESOURCE |
|
|
382 | if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL) |
|
|
383 | { |
|
|
384 | unsigned int l; |
|
|
385 | const unsigned char *kbuf0; |
|
|
386 | |
|
|
387 | kbuf0 = (Keysym_map[keysym & 0xFF]); |
|
|
388 | l = (unsigned int)*kbuf0++; |
|
|
389 | |
|
|
390 | /* escape prefix */ |
|
|
391 | if (meta |
|
|
392 | # ifdef META8_OPTION |
|
|
393 | && meta_char == C0_ESC |
|
|
394 | # endif |
|
|
395 | ) |
|
|
396 | { |
|
|
397 | const unsigned char ch = C0_ESC; |
|
|
398 | tt_write (&ch, 1); |
|
|
399 | } |
|
|
400 | |
|
|
401 | tt_write (kbuf0, l); |
|
|
402 | return; |
|
|
403 | } |
|
|
404 | else |
|
|
405 | #endif |
|
|
406 | { |
508 | { |
407 | newlen = 1; |
509 | newlen = 1; |
408 | switch (keysym) |
510 | switch (keysym) |
409 | { |
511 | { |
410 | #ifndef NO_BACKSPACE_KEY |
512 | #ifndef NO_BACKSPACE_KEY |
411 | case XK_BackSpace: |
513 | case XK_BackSpace: |
412 | if (PrivateModes & PrivMode_HaveBackSpace) |
514 | if (priv_modes & PrivMode_HaveBackSpace) |
413 | { |
515 | { |
414 | kbuf[0] = (!! (PrivateModes & PrivMode_BackSpace) |
516 | kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) |
415 | ^ !!ctrl) ? '\b' : '\177'; |
517 | ^ !!ctrl) ? '\b' : '\177'; |
416 | kbuf[1] = '\0'; |
518 | kbuf[1] = '\0'; |
417 | } |
519 | } |
418 | else |
520 | else |
419 | STRCPY (kbuf, key_backspace); |
521 | strcpy (kbuf, key_backspace); |
420 | break; |
522 | break; |
421 | #endif |
523 | #endif |
422 | #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 |
423 | case XK_Delete: |
535 | case XK_Delete: |
424 | STRCPY (kbuf, key_delete); |
536 | strcpy (kbuf, key_delete); |
425 | break; |
537 | break; |
426 | #endif |
538 | #endif |
427 | case XK_Tab: |
539 | case XK_Tab: |
428 | if (shft) |
540 | if (shft) |
429 | STRCPY (kbuf, "\033[Z"); |
541 | strcpy (kbuf, "\033[Z"); |
430 | else |
542 | else |
431 | { |
543 | { |
432 | #ifdef CTRL_TAB_MAKES_META |
544 | #ifdef CTRL_TAB_MAKES_META |
433 | if (ctrl) |
545 | if (ctrl) |
434 | meta = 1; |
546 | meta = 1; |
… | |
… | |
444 | #ifdef XK_KP_Left |
556 | #ifdef XK_KP_Left |
445 | case XK_KP_Up: /* \033Ox or standard */ |
557 | case XK_KP_Up: /* \033Ox or standard */ |
446 | case XK_KP_Down: /* \033Or or standard */ |
558 | case XK_KP_Down: /* \033Or or standard */ |
447 | case XK_KP_Right: /* \033Ov or standard */ |
559 | case XK_KP_Right: /* \033Ov or standard */ |
448 | case XK_KP_Left: /* \033Ot or standard */ |
560 | case XK_KP_Left: /* \033Ot or standard */ |
449 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
561 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
450 | { |
562 | { |
451 | STRCPY (kbuf, "\033OZ"); |
563 | strcpy (kbuf, "\033OZ"); |
452 | kbuf[2] = "txvr"[keysym - XK_KP_Left]; |
564 | kbuf[2] = "txvr"[keysym - XK_KP_Left]; |
453 | break; |
565 | break; |
454 | } |
566 | } |
455 | else |
567 | else |
456 | /* translate to std. cursor key */ |
568 | /* translate to std. cursor key */ |
… | |
… | |
459 | #endif |
571 | #endif |
460 | case XK_Up: /* "\033[A" */ |
572 | case XK_Up: /* "\033[A" */ |
461 | case XK_Down: /* "\033[B" */ |
573 | case XK_Down: /* "\033[B" */ |
462 | case XK_Right: /* "\033[C" */ |
574 | case XK_Right: /* "\033[C" */ |
463 | case XK_Left: /* "\033[D" */ |
575 | case XK_Left: /* "\033[D" */ |
464 | STRCPY (kbuf, "\033[Z"); |
576 | strcpy (kbuf, "\033[Z"); |
465 | kbuf[2] = "DACB"[keysym - XK_Left]; |
577 | kbuf[2] = "DACB"[keysym - XK_Left]; |
466 | /* do Shift first */ |
578 | /* do Shift first */ |
467 | if (shft) |
579 | if (shft) |
468 | kbuf[2] = "dacb"[keysym - XK_Left]; |
580 | kbuf[2] = "dacb"[keysym - XK_Left]; |
469 | else if (ctrl) |
581 | else if (ctrl) |
470 | { |
582 | { |
471 | kbuf[1] = 'O'; |
583 | kbuf[1] = 'O'; |
472 | kbuf[2] = "dacb"[keysym - XK_Left]; |
584 | kbuf[2] = "dacb"[keysym - XK_Left]; |
473 | } |
585 | } |
474 | else if (PrivateModes & PrivMode_aplCUR) |
586 | else if (priv_modes & PrivMode_aplCUR) |
475 | kbuf[1] = 'O'; |
587 | kbuf[1] = 'O'; |
476 | break; |
588 | break; |
477 | |
589 | |
478 | #ifndef UNSHIFTED_SCROLLKEYS |
590 | #ifndef UNSHIFTED_SCROLLKEYS |
479 | # ifdef XK_KP_Prior |
591 | # ifdef XK_KP_Prior |
480 | case XK_KP_Prior: |
592 | case XK_KP_Prior: |
481 | /* allow shift to override */ |
593 | /* allow shift to override */ |
482 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
594 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
483 | { |
595 | { |
484 | STRCPY (kbuf, "\033Oy"); |
596 | strcpy (kbuf, "\033Oy"); |
485 | break; |
597 | break; |
486 | } |
598 | } |
487 | /* FALLTHROUGH */ |
599 | /* FALLTHROUGH */ |
488 | # endif |
600 | # endif |
489 | case XK_Prior: |
601 | case XK_Prior: |
490 | STRCPY (kbuf, "\033[5~"); |
602 | strcpy (kbuf, "\033[5~"); |
491 | break; |
603 | break; |
492 | # ifdef XK_KP_Next |
604 | # ifdef XK_KP_Next |
493 | case XK_KP_Next: |
605 | case XK_KP_Next: |
494 | /* allow shift to override */ |
606 | /* allow shift to override */ |
495 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
607 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
496 | { |
608 | { |
497 | STRCPY (kbuf, "\033Os"); |
609 | strcpy (kbuf, "\033Os"); |
498 | break; |
610 | break; |
499 | } |
611 | } |
500 | /* FALLTHROUGH */ |
612 | /* FALLTHROUGH */ |
501 | # endif |
613 | # endif |
502 | case XK_Next: |
614 | case XK_Next: |
503 | STRCPY (kbuf, "\033[6~"); |
615 | strcpy (kbuf, "\033[6~"); |
504 | break; |
616 | break; |
505 | #endif |
617 | #endif |
506 | case XK_KP_Enter: |
618 | case XK_KP_Enter: |
507 | /* allow shift to override */ |
619 | /* allow shift to override */ |
508 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
620 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
509 | { |
621 | { |
510 | 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'; |
511 | } |
634 | } |
512 | else |
635 | else |
513 | { |
636 | { |
514 | kbuf[0] = '\r'; |
637 | kbuf[0] = '\015'; |
515 | kbuf[1] = '\0'; |
638 | kbuf[1] = '\0'; |
516 | } |
639 | } |
517 | break; |
640 | break; |
518 | |
641 | |
519 | #ifdef XK_KP_Begin |
642 | #ifdef XK_KP_Begin |
520 | case XK_KP_Begin: |
643 | case XK_KP_Begin: |
521 | STRCPY (kbuf, "\033Ou"); |
644 | strcpy (kbuf, "\033Ou"); |
522 | break; |
645 | break; |
523 | |
646 | |
524 | case XK_KP_Insert: |
|
|
525 | STRCPY (kbuf, "\033Op"); |
|
|
526 | break; |
|
|
527 | |
|
|
528 | case XK_KP_Delete: |
|
|
529 | STRCPY (kbuf, "\033On"); |
|
|
530 | break; |
|
|
531 | #endif |
647 | #endif |
532 | case XK_KP_F1: /* "\033OP" */ |
648 | case XK_KP_F1: /* "\033OP" */ |
533 | case XK_KP_F2: /* "\033OQ" */ |
649 | case XK_KP_F2: /* "\033OQ" */ |
534 | case XK_KP_F3: /* "\033OR" */ |
650 | case XK_KP_F3: /* "\033OR" */ |
535 | case XK_KP_F4: /* "\033OS" */ |
651 | case XK_KP_F4: /* "\033OS" */ |
536 | STRCPY (kbuf, "\033OP"); |
652 | strcpy (kbuf, "\033OP"); |
537 | kbuf[2] += (keysym - XK_KP_F1); |
653 | kbuf[2] += (keysym - XK_KP_F1); |
538 | break; |
654 | break; |
539 | |
655 | |
540 | case XK_KP_Multiply: /* "\033Oj" : "*" */ |
656 | case XK_KP_Multiply: /* "\033Oj" : "*" */ |
541 | case XK_KP_Add: /* "\033Ok" : "+" */ |
657 | case XK_KP_Add: /* "\033Ok" : "+" */ |
… | |
… | |
552 | case XK_KP_6: /* "\033Ov" : "6" */ |
668 | case XK_KP_6: /* "\033Ov" : "6" */ |
553 | case XK_KP_7: /* "\033Ow" : "7" */ |
669 | case XK_KP_7: /* "\033Ow" : "7" */ |
554 | case XK_KP_8: /* "\033Ox" : "8" */ |
670 | case XK_KP_8: /* "\033Ox" : "8" */ |
555 | case XK_KP_9: /* "\033Oy" : "9" */ |
671 | case XK_KP_9: /* "\033Oy" : "9" */ |
556 | /* allow shift to override */ |
672 | /* allow shift to override */ |
557 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
673 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
558 | { |
674 | { |
559 | STRCPY (kbuf, "\033Oj"); |
675 | strcpy (kbuf, "\033Oj"); |
560 | kbuf[2] += (keysym - XK_KP_Multiply); |
676 | kbuf[2] += (keysym - XK_KP_Multiply); |
561 | } |
677 | } |
562 | else |
678 | else |
563 | { |
679 | { |
564 | kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); |
680 | kbuf[0] = ('*' + (keysym - XK_KP_Multiply)); |
565 | kbuf[1] = '\0'; |
681 | kbuf[1] = '\0'; |
566 | } |
682 | } |
567 | break; |
683 | break; |
568 | |
684 | |
569 | case XK_Find: |
685 | case XK_Find: |
570 | STRCPY (kbuf, "\033[1~"); |
686 | strcpy (kbuf, "\033[1~"); |
571 | 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 |
572 | case XK_Insert: |
699 | case XK_Insert: |
573 | STRCPY (kbuf, "\033[2~"); |
700 | strcpy (kbuf, "\033[2~"); |
574 | break; |
701 | break; |
575 | #ifdef DXK_Remove /* support for DEC remove like key */ |
702 | #ifdef DXK_Remove /* support for DEC remove like key */ |
576 | case DXK_Remove: |
703 | case DXK_Remove: |
577 | /* FALLTHROUGH */ |
704 | /* FALLTHROUGH */ |
578 | #endif |
705 | #endif |
579 | case XK_Execute: |
706 | case XK_Execute: |
580 | STRCPY (kbuf, "\033[3~"); |
707 | strcpy (kbuf, "\033[3~"); |
581 | break; |
708 | break; |
582 | case XK_Select: |
709 | case XK_Select: |
583 | STRCPY (kbuf, "\033[4~"); |
710 | strcpy (kbuf, "\033[4~"); |
584 | break; |
711 | break; |
585 | #ifdef XK_KP_End |
712 | #ifdef XK_KP_End |
586 | case XK_KP_End: |
713 | case XK_KP_End: |
587 | /* allow shift to override */ |
714 | /* allow shift to override */ |
588 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
715 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
589 | { |
716 | { |
590 | STRCPY (kbuf, "\033Oq"); |
717 | strcpy (kbuf, "\033Oq"); |
591 | break; |
718 | break; |
592 | } |
719 | } |
593 | /* FALLTHROUGH */ |
720 | /* FALLTHROUGH */ |
594 | #endif |
721 | #endif |
595 | case XK_End: |
722 | case XK_End: |
596 | STRCPY (kbuf, KS_END); |
723 | strcpy (kbuf, KS_END); |
597 | break; |
724 | break; |
598 | #ifdef XK_KP_Home |
725 | #ifdef XK_KP_Home |
599 | case XK_KP_Home: |
726 | case XK_KP_Home: |
600 | /* allow shift to override */ |
727 | /* allow shift to override */ |
601 | if ((PrivateModes & PrivMode_aplKP) ? !shft : shft) |
728 | if ((priv_modes & PrivMode_aplKP) ? !shft : shft) |
602 | { |
729 | { |
603 | STRCPY (kbuf, "\033Ow"); |
730 | strcpy (kbuf, "\033Ow"); |
604 | break; |
731 | break; |
605 | } |
732 | } |
606 | /* FALLTHROUGH */ |
733 | /* FALLTHROUGH */ |
607 | #endif |
734 | #endif |
608 | case XK_Home: |
735 | case XK_Home: |
609 | STRCPY (kbuf, KS_HOME); |
736 | strcpy (kbuf, KS_HOME); |
610 | break; |
737 | break; |
611 | |
738 | |
612 | #define FKEY(n, fkey) \ |
739 | #define FKEY(n, fkey) \ |
613 | sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) |
740 | sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey))) |
614 | |
741 | |
… | |
… | |
666 | #undef FKEY |
793 | #undef FKEY |
667 | default: |
794 | default: |
668 | newlen = 0; |
795 | newlen = 0; |
669 | break; |
796 | break; |
670 | } |
797 | } |
|
|
798 | |
671 | if (newlen) |
799 | if (newlen) |
672 | len = STRLEN (kbuf); |
800 | len = strlen (kbuf); |
673 | } |
801 | } |
674 | |
802 | |
675 | /* |
803 | /* |
676 | * Pass meta for all function keys, if 'meta' option set |
804 | * Pass meta for all function keys, if 'meta' option set |
677 | */ |
805 | */ |
… | |
… | |
684 | else if (ctrl && keysym == XK_minus) |
812 | else if (ctrl && keysym == XK_minus) |
685 | { |
813 | { |
686 | len = 1; |
814 | len = 1; |
687 | kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ |
815 | kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ |
688 | } |
816 | } |
|
|
817 | else if (keysym == XK_ISO_Left_Tab) |
|
|
818 | { |
|
|
819 | strcpy (kbuf, "\033[Z"); |
|
|
820 | len = 3; |
|
|
821 | } |
689 | else |
822 | else |
690 | { |
823 | { |
691 | #ifdef META8_OPTION |
824 | #ifdef META8_OPTION |
692 | /* set 8-bit on */ |
825 | /* set 8-bit on */ |
693 | if (meta && (meta_char == 0x80)) |
826 | if (meta && (meta_char == 0x80)) |
… | |
… | |
705 | } |
838 | } |
706 | |
839 | |
707 | if (len <= 0) |
840 | if (len <= 0) |
708 | return; /* not mapped */ |
841 | return; /* not mapped */ |
709 | |
842 | |
710 | if (Options & Opt_scrollTtyKeypress) |
843 | if (options & Opt_scrollTtyKeypress) |
711 | if (TermWin.view_start) |
844 | if (TermWin.view_start) |
712 | { |
845 | { |
713 | TermWin.view_start = 0; |
846 | TermWin.view_start = 0; |
714 | want_refresh = 1; |
847 | want_refresh = 1; |
715 | } |
848 | } |
… | |
… | |
751 | #endif /* DEBUG_CMD */ |
884 | #endif /* DEBUG_CMD */ |
752 | tt_write (kbuf, (unsigned int)len); |
885 | tt_write (kbuf, (unsigned int)len); |
753 | } |
886 | } |
754 | /*}}} */ |
887 | /*}}} */ |
755 | |
888 | |
756 | #if (MENUBAR_MAX) |
889 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
757 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
890 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
758 | /* attempt to `write' count to the input buffer */ |
891 | /* attempt to `write' count to the input buffer */ |
759 | unsigned int |
892 | unsigned int |
760 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
893 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
761 | { |
894 | { |
… | |
… | |
764 | n = cmdbuf_ptr - cmdbuf_base; |
897 | n = cmdbuf_ptr - cmdbuf_base; |
765 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
898 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
766 | |
899 | |
767 | if (n > 0 && s < count) |
900 | if (n > 0 && s < count) |
768 | { |
901 | { |
769 | MEMMOVE (cmdbuf_base, cmdbuf_ptr, |
902 | memmove (cmdbuf_base, cmdbuf_ptr, |
770 | (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); |
903 | (unsigned int) (cmdbuf_endp - cmdbuf_ptr)); |
771 | cmdbuf_ptr = cmdbuf_base; |
904 | cmdbuf_ptr = cmdbuf_base; |
772 | cmdbuf_endp -= n; |
905 | cmdbuf_endp -= n; |
773 | s += n; |
906 | s += n; |
774 | } |
907 | } |
… | |
… | |
784 | |
917 | |
785 | cmd_parse (); |
918 | cmd_parse (); |
786 | |
919 | |
787 | return 0; |
920 | return 0; |
788 | } |
921 | } |
789 | #endif /* MENUBAR_MAX */ |
922 | #endif |
790 | |
923 | |
791 | void |
924 | void |
792 | rxvt_term::flush () |
925 | rxvt_term::flush () |
793 | { |
926 | { |
|
|
927 | flush_ev.stop (); |
|
|
928 | |
794 | #ifdef TRANSPARENT |
929 | #ifdef TRANSPARENT |
795 | if (want_full_refresh) |
930 | if (want_full_refresh) |
796 | { |
931 | { |
797 | want_full_refresh = 0; |
932 | want_full_refresh = 0; |
798 | scr_clear (); |
933 | scr_clear (); |
… | |
… | |
808 | IMSendSpot (); |
943 | IMSendSpot (); |
809 | #endif |
944 | #endif |
810 | } |
945 | } |
811 | |
946 | |
812 | display->flush (); |
947 | display->flush (); |
813 | |
|
|
814 | flush_ev.stop (); |
|
|
815 | } |
948 | } |
816 | |
949 | |
817 | void |
950 | void |
818 | rxvt_term::check_cb (check_watcher &w) |
951 | rxvt_term::check_cb (check_watcher &w) |
819 | { |
952 | { |
… | |
… | |
895 | { |
1028 | { |
896 | if (mouse_slip_wheel_speed == 0 |
1029 | if (mouse_slip_wheel_speed == 0 |
897 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
1030 | || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) |
898 | : scr_page (UP, mouse_slip_wheel_speed)) |
1031 | : scr_page (UP, mouse_slip_wheel_speed)) |
899 | { |
1032 | { |
|
|
1033 | if (TermWin.view_start == TermWin.nscrolled || |
|
|
1034 | TermWin.view_start == 0) |
|
|
1035 | mouse_slip_wheel_speed = 0; |
|
|
1036 | |
900 | refresh_type |= SMOOTH_REFRESH; |
1037 | refresh_type |= SMOOTH_REFRESH; |
901 | want_refresh = 1; |
1038 | want_refresh = 1; |
902 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1039 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
903 | } |
1040 | } |
904 | } |
1041 | } |
… | |
… | |
917 | |
1054 | |
918 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1055 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
919 | cmdbuf_ptr = cmdbuf_base; |
1056 | cmdbuf_ptr = cmdbuf_base; |
920 | cmdbuf_endp = cmdbuf_ptr + n; |
1057 | cmdbuf_endp = cmdbuf_ptr + n; |
921 | |
1058 | |
922 | n = read (cmd_fd, cmdbuf_endp, CBUFSIZ - n); |
1059 | n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); |
923 | |
1060 | |
924 | if (n > 0) |
1061 | if (n > 0) |
925 | { |
1062 | { |
926 | cmdbuf_endp += n; |
1063 | cmdbuf_endp += n; |
927 | return true; |
1064 | return true; |
… | |
… | |
936 | rxvt_term::pty_cb (io_watcher &w, short revents) |
1073 | rxvt_term::pty_cb (io_watcher &w, short revents) |
937 | { |
1074 | { |
938 | SET_R (this); |
1075 | SET_R (this); |
939 | SET_LOCALE (locale); |
1076 | SET_LOCALE (locale); |
940 | |
1077 | |
941 | if (revents & EVENT_WRITE) |
|
|
942 | tt_write (0, 0); |
|
|
943 | else if (revents & EVENT_READ) |
1078 | if (revents & EVENT_READ) |
944 | // loop, but don't allow a single term to monopolize us |
1079 | // loop, but don't allow a single term to monopolize us |
945 | while (pty_fill ()) |
1080 | while (pty_fill ()) |
946 | if (cmd_parse ()) |
1081 | if (cmd_parse ()) |
947 | break; |
1082 | break; |
|
|
1083 | |
|
|
1084 | if (revents & EVENT_WRITE) |
|
|
1085 | pty_write (); |
948 | } |
1086 | } |
949 | |
1087 | |
950 | void |
1088 | void |
951 | rxvt_term::pointer_unblank () |
1089 | rxvt_term::pointer_unblank () |
952 | { |
1090 | { |
… | |
… | |
954 | recolour_cursor (); |
1092 | recolour_cursor (); |
955 | |
1093 | |
956 | #ifdef POINTER_BLANK |
1094 | #ifdef POINTER_BLANK |
957 | hidden_pointer = 0; |
1095 | hidden_pointer = 0; |
958 | |
1096 | |
959 | if (Options & Opt_pointerBlank) |
1097 | if (options & Opt_pointerBlank) |
960 | pointer_ev.start (NOW + pointerBlankDelay); |
1098 | pointer_ev.start (NOW + pointerBlankDelay); |
961 | #endif |
1099 | #endif |
962 | } |
1100 | } |
963 | |
1101 | |
964 | #ifdef POINTER_BLANK |
1102 | #ifdef POINTER_BLANK |
965 | void |
1103 | void |
966 | rxvt_term::pointer_blank () |
1104 | rxvt_term::pointer_blank () |
967 | { |
1105 | { |
968 | if (! (Options & Opt_pointerBlank)) |
1106 | if (! (options & Opt_pointerBlank)) |
969 | return; |
1107 | return; |
970 | |
1108 | |
971 | XDefineCursor (display->display, TermWin.vt, blank_cursor); |
1109 | XDefineCursor (display->display, TermWin.vt, display->blank_cursor); |
972 | XFlush (display->display); |
1110 | XFlush (display->display); |
973 | |
1111 | |
974 | hidden_pointer = 1; |
1112 | hidden_pointer = 1; |
975 | } |
1113 | } |
976 | |
1114 | |
… | |
… | |
993 | x = ev.x; |
1131 | x = ev.x; |
994 | y = ev.y; |
1132 | y = ev.y; |
995 | pixel_position (&x, &y); |
1133 | pixel_position (&x, &y); |
996 | |
1134 | |
997 | if (MEvent.button == AnyButton) |
1135 | if (MEvent.button == AnyButton) |
998 | { |
|
|
999 | button_number = 3; |
1136 | button_number = 3; |
1000 | } |
|
|
1001 | else |
1137 | else |
1002 | { |
1138 | { |
1003 | button_number = MEvent.button - Button1; |
1139 | button_number = MEvent.button - Button1; |
1004 | /* add 0x3D for wheel events, like xterm does */ |
1140 | /* add 0x3D for wheel events, like xterm does */ |
1005 | if (button_number >= 3) |
1141 | if (button_number >= 3) |
1006 | button_number += (64 - 3); |
1142 | button_number += (64 - 3); |
1007 | } |
1143 | } |
1008 | |
1144 | |
1009 | if (PrivateModes & PrivMode_MouseX10) |
1145 | if (priv_modes & PrivMode_MouseX10) |
1010 | { |
1146 | { |
1011 | /* |
1147 | /* |
1012 | * do not report ButtonRelease |
1148 | * do not report ButtonRelease |
1013 | * no state info allowed |
1149 | * no state info allowed |
1014 | */ |
1150 | */ |
… | |
… | |
1029 | + ((MEvent.state & ModMetaMask) ? 8 : 0) |
1165 | + ((MEvent.state & ModMetaMask) ? 8 : 0) |
1030 | + ((MEvent.state & ControlMask) ? 16 : 0); |
1166 | + ((MEvent.state & ControlMask) ? 16 : 0); |
1031 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1167 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1032 | key_state += ((MEvent.clicks > 1) ? 32 : 0); |
1168 | key_state += ((MEvent.clicks > 1) ? 32 : 0); |
1033 | #endif |
1169 | #endif |
1034 | |
|
|
1035 | } |
1170 | } |
1036 | |
1171 | |
1037 | #ifdef DEBUG_MOUSEREPORT |
1172 | #if DEBUG_MOUSEREPORT |
1038 | fprintf (stderr, "Mouse ["); |
1173 | fprintf (stderr, "Mouse ["); |
1039 | if (key_state & 16) |
1174 | if (key_state & 16) |
1040 | fputc ('C', stderr); |
1175 | fputc ('C', stderr); |
1041 | if (key_state & 4) |
1176 | if (key_state & 4) |
1042 | fputc ('S', stderr); |
1177 | fputc ('S', stderr); |
… | |
… | |
1046 | fputc ('2', stderr); |
1181 | fputc ('2', stderr); |
1047 | fprintf (stderr, "]: <%d>, %d/%d\n", |
1182 | fprintf (stderr, "]: <%d>, %d/%d\n", |
1048 | button_number, |
1183 | button_number, |
1049 | x + 1, |
1184 | x + 1, |
1050 | y + 1); |
1185 | y + 1); |
1051 | #else |
1186 | #endif |
|
|
1187 | |
1052 | tt_printf ("\033[M%c%c%c", |
1188 | tt_printf ("\033[M%c%c%c", |
1053 | (32 + button_number + key_state), |
1189 | (32 + button_number + key_state), |
1054 | (32 + x + 1), |
1190 | (32 + x + 1), |
1055 | (32 + y + 1)); |
1191 | (32 + y + 1)); |
1056 | #endif |
|
|
1057 | } |
1192 | } |
1058 | |
1193 | |
1059 | #ifdef USING_W11LIB |
1194 | #ifdef USING_W11LIB |
1060 | void |
1195 | void |
1061 | rxvt_W11_process_x_event (XEvent *ev) |
1196 | rxvt_W11_process_x_event (XEvent *ev) |
… | |
… | |
1068 | |
1203 | |
1069 | /*{{{ process an X event */ |
1204 | /*{{{ process an X event */ |
1070 | void |
1205 | void |
1071 | rxvt_term::x_cb (XEvent &ev) |
1206 | rxvt_term::x_cb (XEvent &ev) |
1072 | { |
1207 | { |
|
|
1208 | dDisp; |
|
|
1209 | |
1073 | SET_R (this); |
1210 | SET_R (this); |
1074 | SET_LOCALE (locale); |
1211 | SET_LOCALE (locale); |
1075 | |
1212 | |
1076 | #if defined(CURSOR_BLINK) |
1213 | #if defined(CURSOR_BLINK) |
1077 | if ((Options & Opt_cursorBlink) && ev.type == KeyPress) |
1214 | if ((options & Opt_cursorBlink) && ev.type == KeyPress) |
1078 | { |
1215 | { |
1079 | if (hidden_cursor) |
1216 | if (hidden_cursor) |
1080 | { |
1217 | { |
1081 | hidden_cursor = 0; |
1218 | hidden_cursor = 0; |
1082 | want_refresh = 1; |
1219 | want_refresh = 1; |
… | |
… | |
1085 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1222 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1086 | } |
1223 | } |
1087 | #endif |
1224 | #endif |
1088 | |
1225 | |
1089 | #if defined(POINTER_BLANK) |
1226 | #if defined(POINTER_BLANK) |
1090 | if ((Options & Opt_pointerBlank) && pointerBlankDelay > 0) |
1227 | if ((options & Opt_pointerBlank) && pointerBlankDelay > 0) |
1091 | { |
1228 | { |
1092 | if (ev.type == MotionNotify |
1229 | if (ev.type == MotionNotify |
1093 | || ev.type == ButtonPress |
1230 | || ev.type == ButtonPress |
1094 | || ev.type == ButtonRelease) |
1231 | || ev.type == ButtonRelease) |
1095 | if (hidden_pointer) |
1232 | if (hidden_pointer) |
… | |
… | |
1098 | if (ev.type == KeyPress && hidden_pointer == 0) |
1235 | if (ev.type == KeyPress && hidden_pointer == 0) |
1099 | pointer_blank (); |
1236 | pointer_blank (); |
1100 | } |
1237 | } |
1101 | #endif |
1238 | #endif |
1102 | |
1239 | |
1103 | #ifdef USE_XIM |
|
|
1104 | if (XFilterEvent (&ev, None)) |
|
|
1105 | return; |
|
|
1106 | #endif |
|
|
1107 | |
|
|
1108 | Window unused_root, unused_child; |
1240 | Window unused_root, unused_child; |
1109 | int unused_root_x, unused_root_y; |
1241 | int unused_root_x, unused_root_y; |
1110 | unsigned int unused_mask; |
1242 | unsigned int unused_mask; |
1111 | |
|
|
1112 | #ifdef DEBUG_X |
|
|
1113 | const char *const eventnames[] = |
|
|
1114 | { /* mason - this matches my system */ |
|
|
1115 | "", |
|
|
1116 | "", |
|
|
1117 | "KeyPress", |
|
|
1118 | "KeyRelease", |
|
|
1119 | "ButtonPress", |
|
|
1120 | "ButtonRelease", |
|
|
1121 | "MotionNotify", |
|
|
1122 | "EnterNotify", |
|
|
1123 | "LeaveNotify", |
|
|
1124 | "FocusIn", |
|
|
1125 | "FocusOut", |
|
|
1126 | "KeymapNotify", |
|
|
1127 | "Expose", |
|
|
1128 | "GraphicsExpose", |
|
|
1129 | "NoExpose", |
|
|
1130 | "VisibilityNotify", |
|
|
1131 | "CreateNotify", |
|
|
1132 | "DestroyNotify", |
|
|
1133 | "UnmapNotify", |
|
|
1134 | "MapNotify", |
|
|
1135 | "MapRequest", |
|
|
1136 | "ReparentNotify", |
|
|
1137 | "ConfigureNotify", |
|
|
1138 | "ConfigureRequest", |
|
|
1139 | "GravityNotify", |
|
|
1140 | "ResizeRequest", |
|
|
1141 | "CirculateNotify", |
|
|
1142 | "CirculateRequest", |
|
|
1143 | "PropertyNotify", |
|
|
1144 | "SelectionClear", |
|
|
1145 | "SelectionRequest", |
|
|
1146 | "SelectionNotify", |
|
|
1147 | "ColormapNotify", |
|
|
1148 | "ClientMessage", |
|
|
1149 | "MappingNotify" |
|
|
1150 | }; |
|
|
1151 | #endif |
|
|
1152 | |
|
|
1153 | #ifdef DEBUG_X |
|
|
1154 | struct timeval tp; |
|
|
1155 | struct tm *ltt; |
|
|
1156 | (void)gettimeofday (&tp, NULL); |
|
|
1157 | ltt = localtime (& (tp.tv_sec)); |
|
|
1158 | 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)); |
|
|
1159 | #endif |
|
|
1160 | |
1243 | |
1161 | switch (ev.type) |
1244 | switch (ev.type) |
1162 | { |
1245 | { |
1163 | case KeyPress: |
1246 | case KeyPress: |
|
|
1247 | #if ISO_14755 |
1164 | if (!(iso14755buf & ISO_14755_ESCAPE_NEXT)) |
1248 | if (!(iso14755buf & ISO_14755_52)) |
|
|
1249 | #endif |
1165 | lookup_key (ev.xkey); |
1250 | lookup_key (ev.xkey); |
1166 | |
1251 | |
1167 | break; |
1252 | break; |
1168 | |
1253 | |
1169 | case KeyRelease: |
1254 | case KeyRelease: |
1170 | { |
1255 | { |
1171 | #if (defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)) || !defined (NO_FRILLS) |
1256 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1172 | KeySym ks; |
1257 | KeySym ks; |
1173 | |
1258 | |
1174 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1259 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1175 | #endif |
1260 | #endif |
1176 | |
1261 | |
1177 | #ifndef NO_FRILLS |
1262 | #if ENABLE_FRILLS || ISO_14755 |
1178 | // ISO 14755 support |
1263 | // ISO 14755 support |
1179 | if (iso14755buf) |
1264 | if (iso14755buf) |
1180 | if (iso14755buf & ISO_14755_ESCAPE_NEXT) |
1265 | if (iso14755buf & ISO_14755_52) |
1181 | { |
1266 | { |
|
|
1267 | # if ENABLE_OVERLAY |
|
|
1268 | scr_overlay_off (); |
|
|
1269 | # endif |
|
|
1270 | # if ISO_14755 |
1182 | // iso14755 part 5.2 handling: release time |
1271 | // iso14755 part 5.2 handling: release time |
1183 | // first: controls |
1272 | // first: controls |
1184 | if ((ev.xkey.state & ControlMask) |
1273 | if ((ev.xkey.state & ControlMask) |
1185 | && ((ks >= 0x40 && ks <= 0x5f) |
1274 | && ((ks >= 0x40 && ks <= 0x5f) |
1186 | || (ks >= 0x61 && ks <= 0x7f))) |
1275 | || (ks >= 0x61 && ks <= 0x7f))) |
1187 | { |
1276 | { |
1188 | iso14755buf = ISO_14755_KEYCODE_VALID | 0x2400 | (ks & 0x1f); |
1277 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1189 | commit_iso14755 (); |
1278 | commit_iso14755 (); |
1190 | return; // case-break; |
1279 | return; // case-break; |
1191 | } |
1280 | } |
1192 | |
1281 | |
1193 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1282 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1194 | if (i[0] == ks) |
1283 | if (i[0] == ks) |
1195 | { |
1284 | { |
1196 | iso14755buf = ISO_14755_KEYCODE_VALID | i[1]; |
1285 | iso14755buf = ISO_14755_51 | i[1]; |
1197 | commit_iso14755 (); |
1286 | commit_iso14755 (); |
1198 | return; // case-break; |
1287 | return; // case-break; |
1199 | } |
1288 | } |
1200 | |
1289 | |
|
|
1290 | scr_bell (); |
|
|
1291 | # endif |
1201 | iso14755buf = 0; |
1292 | iso14755buf = 0; |
1202 | scr_bell (); |
|
|
1203 | break; |
1293 | break; |
1204 | } |
1294 | } |
1205 | else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
1295 | else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) |
1206 | { |
1296 | { |
|
|
1297 | # if ENABLE_OVERLAY |
|
|
1298 | scr_overlay_off (); |
|
|
1299 | # endif |
1207 | if (iso14755buf & ISO_14755_KEYCODE_VALID) |
1300 | if (iso14755buf & ISO_14755_51) |
1208 | commit_iso14755 (); |
1301 | commit_iso14755 (); |
|
|
1302 | #if ISO_14755 |
1209 | else if (iso14755buf & ISO_14755_ACTIVE) |
1303 | else if (iso14755buf & ISO_14755_STARTED) |
|
|
1304 | { |
1210 | iso14755buf = ISO_14755_ESCAPE_NEXT; // iso14755 part 5.2: remember empty begin/end pair |
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; |
1211 | } |
1313 | } |
1212 | #endif |
1314 | #endif |
1213 | |
1315 | |
1214 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1316 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1215 | if (!(ev.xkey.state & ControlMask)) |
1317 | if (!(ev.xkey.state & ControlMask)) |
… | |
… | |
1228 | button_release (ev.xbutton); |
1330 | button_release (ev.xbutton); |
1229 | break; |
1331 | break; |
1230 | |
1332 | |
1231 | case ClientMessage: |
1333 | case ClientMessage: |
1232 | if (ev.xclient.format == 32 |
1334 | if (ev.xclient.format == 32 |
|
|
1335 | && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) |
|
|
1336 | { |
1233 | && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) |
1337 | if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) |
1234 | destroy (); |
1338 | destroy (); |
|
|
1339 | #if ENABLE_EWMH |
|
|
1340 | else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) |
|
|
1341 | XSendEvent (disp, ev.xclient.window = display->root, |
|
|
1342 | False, SubstructureRedirectMask | SubstructureNotifyMask, |
|
|
1343 | &ev); |
|
|
1344 | #endif |
|
|
1345 | } |
|
|
1346 | #if ENABLE_XEMBED |
|
|
1347 | else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED]) |
|
|
1348 | { |
|
|
1349 | if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN) |
|
|
1350 | focus_in (); |
|
|
1351 | else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) |
|
|
1352 | focus_out (); |
|
|
1353 | } |
|
|
1354 | #endif |
1235 | #ifdef OFFIX_DND |
1355 | #ifdef OFFIX_DND |
1236 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1356 | /* OffiX Dnd (drag 'n' drop) protocol */ |
1237 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1357 | else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] |
1238 | && (ev.xclient.data.l[0] == DndFile |
1358 | && (ev.xclient.data.l[0] == DndFile |
1239 | || ev.xclient.data.l[0] == DndDir |
1359 | || ev.xclient.data.l[0] == DndDir |
1240 | || ev.xclient.data.l[0] == DndLink)) |
1360 | || ev.xclient.data.l[0] == DndLink)) |
1241 | { |
1361 | { |
1242 | /* Get Dnd data */ |
1362 | /* Get Dnd data */ |
1243 | Atom ActualType; |
1363 | Atom ActualType; |
1244 | int ActualFormat; |
1364 | int ActualFormat; |
1245 | unsigned char *data; |
1365 | unsigned char *data; |
1246 | unsigned long Size, RemainingBytes; |
1366 | unsigned long Size, RemainingBytes; |
1247 | |
1367 | |
1248 | XGetWindowProperty (display->display, display->root, |
1368 | XGetWindowProperty (disp, display->root, |
1249 | xa[XA_DNDSELECTION], |
1369 | xa[XA_DNDSELECTION], |
1250 | 0L, 1000000L, |
1370 | 0L, 1000000L, |
1251 | False, AnyPropertyType, |
1371 | False, AnyPropertyType, |
1252 | &ActualType, &ActualFormat, |
1372 | &ActualType, &ActualFormat, |
1253 | &Size, &RemainingBytes, |
1373 | &Size, &RemainingBytes, |
1254 | &data); |
1374 | &data); |
1255 | XChangeProperty (display->display, display->root, |
1375 | set_string_property (XA_CUT_BUFFER0, data); |
1256 | XA_CUT_BUFFER0, XA_STRING, |
|
|
1257 | 8, PropModeReplace, |
|
|
1258 | data, STRLEN (data)); |
|
|
1259 | XFree (data); |
1376 | XFree (data); |
1260 | selection_paste (display->root, XA_CUT_BUFFER0, True); |
1377 | selection_paste (display->root, XA_CUT_BUFFER0, true); |
1261 | XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); |
1378 | XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); |
1262 | } |
1379 | } |
1263 | #endif /* OFFIX_DND */ |
1380 | #endif /* OFFIX_DND */ |
1264 | break; |
1381 | break; |
1265 | |
1382 | |
1266 | case MappingNotify: |
1383 | case MappingNotify: |
… | |
… | |
1291 | break; |
1408 | break; |
1292 | } |
1409 | } |
1293 | break; |
1410 | break; |
1294 | |
1411 | |
1295 | case FocusIn: |
1412 | case FocusIn: |
1296 | if (!TermWin.focus) |
1413 | focus_in (); |
1297 | { |
|
|
1298 | TermWin.focus = 1; |
|
|
1299 | want_refresh = 1; |
|
|
1300 | #ifdef USE_XIM |
|
|
1301 | if (Input_Context != NULL) |
|
|
1302 | XSetICFocus (Input_Context); |
|
|
1303 | #endif |
|
|
1304 | #ifdef CURSOR_BLINK |
|
|
1305 | if (Options & Opt_cursorBlink) |
|
|
1306 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1307 | #endif |
|
|
1308 | #ifdef OFF_FOCUS_FADING |
|
|
1309 | if (rs[Rs_fade]) |
|
|
1310 | { |
|
|
1311 | PixColors = PixColorsFocused; |
|
|
1312 | set_colorfgbg (); |
|
|
1313 | scr_clear (); |
|
|
1314 | scr_touch (true); |
|
|
1315 | } |
|
|
1316 | #endif |
|
|
1317 | |
|
|
1318 | } |
|
|
1319 | break; |
1414 | break; |
1320 | |
1415 | |
1321 | case FocusOut: |
1416 | case FocusOut: |
1322 | if (TermWin.focus) |
1417 | focus_out (); |
1323 | { |
|
|
1324 | TermWin.focus = 0; |
|
|
1325 | want_refresh = 1; |
|
|
1326 | #ifdef USE_XIM |
|
|
1327 | if (Input_Context != NULL) |
|
|
1328 | XUnsetICFocus (Input_Context); |
|
|
1329 | #endif |
|
|
1330 | #ifdef CURSOR_BLINK |
|
|
1331 | if (Options & Opt_cursorBlink) |
|
|
1332 | cursor_blink_ev.stop (); |
|
|
1333 | hidden_cursor = 0; |
|
|
1334 | #endif |
|
|
1335 | #ifdef OFF_FOCUS_FADING |
|
|
1336 | if (rs[Rs_fade]) |
|
|
1337 | { |
|
|
1338 | PixColors = PixColorsUnFocused; |
|
|
1339 | set_colorfgbg (); |
|
|
1340 | scr_clear (); |
|
|
1341 | scr_touch (true); |
|
|
1342 | } |
|
|
1343 | #endif |
|
|
1344 | |
|
|
1345 | } |
|
|
1346 | break; |
1418 | break; |
1347 | |
1419 | |
1348 | case ConfigureNotify: |
1420 | case ConfigureNotify: |
1349 | if (ev.xconfigure.window == TermWin.parent[0]) |
1421 | if (ev.xconfigure.window == TermWin.parent[0]) |
1350 | { |
1422 | { |
… | |
… | |
1354 | { /* Wrap lots of configures into one */ |
1426 | { /* Wrap lots of configures into one */ |
1355 | width = ev.xconfigure.width; |
1427 | width = ev.xconfigure.width; |
1356 | height = ev.xconfigure.height; |
1428 | height = ev.xconfigure.height; |
1357 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
1429 | D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height)); |
1358 | } |
1430 | } |
1359 | while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); |
1431 | while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); |
1360 | |
1432 | |
1361 | if (szHint.width != width || szHint.height != height) |
1433 | if (szHint.width != width || szHint.height != height) |
|
|
1434 | { |
|
|
1435 | seen_resize = 1; |
1362 | resize_all_windows (width, height, 1); |
1436 | resize_all_windows (width, height, 1); |
|
|
1437 | } |
1363 | |
1438 | |
1364 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1439 | #ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ |
1365 | if (Options & Opt_transparent) |
1440 | if (options & Opt_transparent) |
1366 | { |
|
|
1367 | check_our_parents (); |
1441 | check_our_parents (); |
1368 | if (am_transparent) |
|
|
1369 | want_refresh = want_full_refresh = 1; |
|
|
1370 | } |
|
|
1371 | #endif |
1442 | #endif |
1372 | } |
1443 | } |
1373 | break; |
1444 | break; |
1374 | |
1445 | |
1375 | case PropertyNotify: |
1446 | case PropertyNotify: |
… | |
… | |
1383 | selection_clear (); |
1454 | selection_clear (); |
1384 | break; |
1455 | break; |
1385 | |
1456 | |
1386 | case SelectionNotify: |
1457 | case SelectionNotify: |
1387 | if (selection_wait == Sel_normal) |
1458 | if (selection_wait == Sel_normal) |
1388 | selection_paste (ev.xselection.requestor, |
1459 | selection_paste (ev.xselection.requestor, ev.xselection.property, true); |
1389 | ev.xselection.property, True); |
|
|
1390 | break; |
1460 | break; |
1391 | |
1461 | |
1392 | case SelectionRequest: |
1462 | case SelectionRequest: |
1393 | selection_send (ev.xselectionrequest); |
1463 | selection_send (ev.xselectionrequest); |
1394 | break; |
1464 | break; |
… | |
… | |
1418 | if (ev.xany.window == TermWin.vt) |
1488 | if (ev.xany.window == TermWin.vt) |
1419 | { |
1489 | { |
1420 | do |
1490 | do |
1421 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1491 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1422 | ev.xexpose.width, ev.xexpose.height, False); |
1492 | ev.xexpose.width, ev.xexpose.height, False); |
1423 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); |
1493 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); |
1424 | |
1494 | |
1425 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1495 | ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; |
1426 | |
1496 | |
1427 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) |
1497 | while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) |
1428 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1498 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1429 | ev.xexpose.width, ev.xexpose.height, False); |
1499 | ev.xexpose.width, ev.xexpose.height, False); |
1430 | |
1500 | |
1431 | scr_refresh (refresh_type); |
1501 | scr_refresh (refresh_type); |
1432 | } |
1502 | } |
1433 | else |
1503 | else |
1434 | { |
1504 | { |
1435 | XEvent unused_event; |
1505 | XEvent unused_event; |
1436 | |
1506 | |
1437 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) |
1507 | while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) |
1438 | ; |
1508 | ; |
1439 | while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) |
1509 | while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) |
1440 | ; |
1510 | ; |
1441 | |
1511 | |
1442 | if (isScrollbarWindow (ev.xany.window)) |
1512 | if (isScrollbarWindow (ev.xany.window)) |
1443 | { |
1513 | { |
1444 | scrollBar.setIdle (); |
1514 | scrollBar.setIdle (); |
… | |
… | |
1449 | menubar_expose (); |
1519 | menubar_expose (); |
1450 | #endif |
1520 | #endif |
1451 | |
1521 | |
1452 | #ifdef TRANSPARENT |
1522 | #ifdef TRANSPARENT |
1453 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1523 | if (am_transparent && ev.xany.window == TermWin.parent[0]) |
1454 | XClearWindow (display->display, ev.xany.window); |
1524 | XClearWindow (disp, ev.xany.window); |
1455 | #endif |
1525 | #endif |
1456 | } |
1526 | } |
1457 | break; |
1527 | break; |
1458 | |
1528 | |
1459 | case MotionNotify: |
1529 | case MotionNotify: |
… | |
… | |
1466 | { |
1536 | { |
1467 | menubar_control (ev.xbutton); |
1537 | menubar_control (ev.xbutton); |
1468 | break; |
1538 | break; |
1469 | } |
1539 | } |
1470 | #endif |
1540 | #endif |
1471 | if ((PrivateModes & PrivMode_mouse_report) && ! (bypass_keystate)) |
1541 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1472 | break; |
1542 | break; |
1473 | |
1543 | |
1474 | if (ev.xany.window == TermWin.vt) |
1544 | if (ev.xany.window == TermWin.vt) |
1475 | { |
1545 | { |
1476 | if ((ev.xbutton.state & (Button1Mask | Button3Mask))) |
1546 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1477 | { |
1547 | { |
1478 | while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) |
1548 | while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) |
1479 | ; |
1549 | ; |
1480 | |
1550 | |
1481 | XQueryPointer (display->display, TermWin.vt, |
1551 | XQueryPointer (disp, TermWin.vt, |
1482 | &unused_root, &unused_child, |
1552 | &unused_root, &unused_child, |
1483 | &unused_root_x, &unused_root_y, |
1553 | &unused_root_x, &unused_root_y, |
1484 | & (ev.xbutton.x), & (ev.xbutton.y), |
1554 | &ev.xbutton.x, &ev.xbutton.y, |
1485 | &unused_mask); |
1555 | &ev.xbutton.state); |
1486 | #ifdef MOUSE_THRESHOLD |
1556 | #ifdef MOUSE_THRESHOLD |
1487 | /* deal with a `jumpy' mouse */ |
1557 | /* deal with a `jumpy' mouse */ |
1488 | if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) |
1558 | if ((ev.xmotion.time - MEvent.time) > MOUSE_THRESHOLD) |
1489 | { |
1559 | { |
1490 | #endif |
1560 | #endif |
|
|
1561 | #if ISO_14755 |
|
|
1562 | // 5.4 |
|
|
1563 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
|
|
1564 | { |
|
|
1565 | iso14755_54 (ev.xbutton.x, ev.xbutton.y); |
|
|
1566 | break; |
|
|
1567 | } |
|
|
1568 | #endif |
1491 | selection_extend ((ev.xbutton.x), (ev.xbutton.y), |
1569 | selection_extend (ev.xbutton.x, ev.xbutton.y, |
1492 | (ev.xbutton.state & Button3Mask) ? 2 : 0); |
1570 | ev.xbutton.state & Button3Mask ? 2 : 0); |
|
|
1571 | |
1493 | #ifdef SELECTION_SCROLLING |
1572 | #ifdef SELECTION_SCROLLING |
1494 | if (ev.xbutton.y < TermWin.int_bwidth |
1573 | if (ev.xbutton.y < TermWin.int_bwidth |
1495 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1574 | || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) |
1496 | { |
1575 | { |
1497 | int dist; |
1576 | int dist; |
… | |
… | |
1503 | sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); |
1582 | sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); |
1504 | |
1583 | |
1505 | /* save the event params so we can highlight |
1584 | /* save the event params so we can highlight |
1506 | * the selection in the pending-scroll loop |
1585 | * the selection in the pending-scroll loop |
1507 | */ |
1586 | */ |
1508 | selection_save_x=ev.xbutton.x; |
1587 | selection_save_x = ev.xbutton.x; |
1509 | selection_save_y=ev.xbutton.y; |
1588 | selection_save_y = ev.xbutton.y; |
1510 | selection_save_state= |
|
|
1511 | (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1589 | selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; |
1512 | |
1590 | |
1513 | /* calc number of lines to scroll */ |
1591 | /* calc number of lines to scroll */ |
1514 | if (ev.xbutton.y<TermWin.int_bwidth) |
1592 | if (ev.xbutton.y < TermWin.int_bwidth) |
1515 | { |
1593 | { |
1516 | scroll_selection_dir = UP; |
1594 | scroll_selection_dir = UP; |
1517 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1595 | dist = TermWin.int_bwidth - ev.xbutton.y; |
1518 | } |
1596 | } |
1519 | else |
1597 | else |
1520 | { |
1598 | { |
1521 | scroll_selection_dir = DN; |
1599 | scroll_selection_dir = DN; |
1522 | dist = ev.xbutton.y - |
|
|
1523 | (TermWin.int_bwidth + TermWin.height); |
1600 | dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); |
1524 | } |
1601 | } |
|
|
1602 | |
1525 | scroll_selection_lines= (Pixel2Height (dist)/ |
1603 | scroll_selection_lines = Pixel2Height (dist) |
1526 | SELECTION_SCROLL_LINE_SPEEDUP)+1; |
1604 | / SELECTION_SCROLL_LINE_SPEEDUP |
|
|
1605 | + 1; |
1527 | MIN_IT (scroll_selection_lines, |
1606 | MIN_IT (scroll_selection_lines, |
1528 | SELECTION_SCROLL_MAX_LINES); |
1607 | SELECTION_SCROLL_MAX_LINES); |
1529 | } |
1608 | } |
1530 | else |
1609 | else |
1531 | { |
1610 | { |
1532 | /* we are within the text window, so we |
1611 | /* we are within the text window, so we |
1533 | * shouldn't be scrolling |
1612 | * shouldn't be scrolling |
… | |
… | |
1535 | if (sel_scroll_ev.active) |
1614 | if (sel_scroll_ev.active) |
1536 | sel_scroll_ev.stop(); |
1615 | sel_scroll_ev.stop(); |
1537 | } |
1616 | } |
1538 | #endif |
1617 | #endif |
1539 | #ifdef MOUSE_THRESHOLD |
1618 | #ifdef MOUSE_THRESHOLD |
1540 | |
|
|
1541 | } |
1619 | } |
1542 | #endif |
1620 | #endif |
1543 | |
|
|
1544 | } |
1621 | } |
1545 | } |
1622 | } |
1546 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1623 | else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) |
1547 | { |
1624 | { |
1548 | while (XCheckTypedWindowEvent (display->display, scrollBar.win, |
1625 | while (XCheckTypedWindowEvent (disp, scrollBar.win, |
1549 | MotionNotify, &ev)) ; |
1626 | MotionNotify, &ev)) |
|
|
1627 | ; |
|
|
1628 | |
1550 | XQueryPointer (display->display, scrollBar.win, |
1629 | XQueryPointer (disp, scrollBar.win, |
1551 | &unused_root, &unused_child, |
1630 | &unused_root, &unused_child, |
1552 | &unused_root_x, &unused_root_y, |
1631 | &unused_root_x, &unused_root_y, |
1553 | & (ev.xbutton.x), & (ev.xbutton.y), |
1632 | &ev.xbutton.x, &ev.xbutton.y, |
1554 | &unused_mask); |
1633 | &unused_mask); |
1555 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1634 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1556 | scrollbar_size ()); |
1635 | scrollbar_size ()); |
1557 | scr_refresh (refresh_type); |
1636 | scr_refresh (refresh_type); |
1558 | refresh_limit = 0; |
1637 | refresh_limit = 0; |
… | |
… | |
1560 | } |
1639 | } |
1561 | break; |
1640 | break; |
1562 | } |
1641 | } |
1563 | } |
1642 | } |
1564 | |
1643 | |
|
|
1644 | void |
|
|
1645 | rxvt_term::focus_in () |
|
|
1646 | { |
|
|
1647 | if (!TermWin.focus) |
|
|
1648 | { |
|
|
1649 | TermWin.focus = 1; |
|
|
1650 | want_refresh = 1; |
|
|
1651 | #ifdef USE_XIM |
|
|
1652 | if (Input_Context != NULL) |
|
|
1653 | { |
|
|
1654 | IMSetStatusPosition (); |
|
|
1655 | XSetICFocus (Input_Context); |
|
|
1656 | } |
|
|
1657 | #endif |
|
|
1658 | #ifdef CURSOR_BLINK |
|
|
1659 | if (options & Opt_cursorBlink) |
|
|
1660 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1661 | #endif |
|
|
1662 | #ifdef OFF_FOCUS_FADING |
|
|
1663 | if (rs[Rs_fade]) |
|
|
1664 | { |
|
|
1665 | pix_colors = pix_colors_focused; |
|
|
1666 | scr_recolour (); |
|
|
1667 | } |
|
|
1668 | #endif |
|
|
1669 | } |
|
|
1670 | } |
|
|
1671 | |
|
|
1672 | void |
|
|
1673 | rxvt_term::focus_out () |
|
|
1674 | { |
|
|
1675 | if (TermWin.focus) |
|
|
1676 | { |
|
|
1677 | TermWin.focus = 0; |
|
|
1678 | want_refresh = 1; |
|
|
1679 | |
|
|
1680 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1681 | iso14755buf = 0; |
|
|
1682 | #endif |
|
|
1683 | #if ENABLE_OVERLAY |
|
|
1684 | scr_overlay_off (); |
|
|
1685 | #endif |
|
|
1686 | #ifdef USE_XIM |
|
|
1687 | if (Input_Context != NULL) |
|
|
1688 | XUnsetICFocus (Input_Context); |
|
|
1689 | #endif |
|
|
1690 | #ifdef CURSOR_BLINK |
|
|
1691 | if (options & Opt_cursorBlink) |
|
|
1692 | cursor_blink_ev.stop (); |
|
|
1693 | hidden_cursor = 0; |
|
|
1694 | #endif |
|
|
1695 | #ifdef OFF_FOCUS_FADING |
|
|
1696 | if (rs[Rs_fade]) |
|
|
1697 | { |
|
|
1698 | pix_colors = pix_colors_unfocused; |
|
|
1699 | scr_recolour (); |
|
|
1700 | } |
|
|
1701 | #endif |
|
|
1702 | } |
|
|
1703 | } |
|
|
1704 | |
1565 | #if TRANSPARENT |
1705 | #if TRANSPARENT |
1566 | void |
1706 | void |
1567 | rxvt_term::rootwin_cb (XEvent &ev) |
1707 | rxvt_term::rootwin_cb (XEvent &ev) |
1568 | { |
1708 | { |
1569 | SET_R (this); |
1709 | SET_R (this); |
… | |
… | |
1574 | case PropertyNotify: |
1714 | case PropertyNotify: |
1575 | /* |
1715 | /* |
1576 | * if user used some Esetroot compatible prog to set the root bg, |
1716 | * if user used some Esetroot compatible prog to set the root bg, |
1577 | * use the property to determine the pixmap. We use it later on. |
1717 | * use the property to determine the pixmap. We use it later on. |
1578 | */ |
1718 | */ |
1579 | if (xa[XA_XROOTPMAPID] == 0) |
|
|
1580 | xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False); |
|
|
1581 | |
|
|
1582 | if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) |
1719 | if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] |
|
|
1720 | && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) |
1583 | return; |
1721 | return; |
1584 | |
1722 | |
1585 | /* FALLTHROUGH */ |
1723 | /* FALLTHROUGH */ |
1586 | case ReparentNotify: |
1724 | case ReparentNotify: |
1587 | if ((Options & Opt_transparent) && check_our_parents () && am_transparent) |
1725 | if ((options & Opt_transparent) && check_our_parents () && am_transparent) |
1588 | want_refresh = want_full_refresh = 1; |
1726 | want_refresh = want_full_refresh = 1; |
1589 | break; |
1727 | break; |
1590 | } |
1728 | } |
1591 | } |
1729 | } |
1592 | #endif |
1730 | #endif |
… | |
… | |
1596 | { |
1734 | { |
1597 | int reportmode = 0, clickintime; |
1735 | int reportmode = 0, clickintime; |
1598 | |
1736 | |
1599 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1737 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1600 | if (!bypass_keystate) |
1738 | if (!bypass_keystate) |
1601 | reportmode = !! (PrivateModes & PrivMode_mouse_report); |
1739 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
|
|
1740 | |
1602 | /* |
1741 | /* |
1603 | * VT window processing of button press |
1742 | * VT window processing of button press |
1604 | */ |
1743 | */ |
1605 | if (ev.window == TermWin.vt) |
1744 | if (ev.window == TermWin.vt) |
1606 | { |
1745 | { |
|
|
1746 | #if ISO_14755 |
|
|
1747 | // 5.4 |
|
|
1748 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
|
|
1749 | { |
|
|
1750 | iso14755_54 (ev.x, ev.y); |
|
|
1751 | return; |
|
|
1752 | } |
|
|
1753 | #endif |
|
|
1754 | |
1607 | clickintime = ev.time - MEvent.time < MULTICLICK_TIME; |
1755 | clickintime = ev.time - MEvent.time < MULTICLICK_TIME; |
|
|
1756 | |
1608 | if (reportmode) |
1757 | if (reportmode) |
1609 | { |
1758 | { |
1610 | /* mouse report from vt window */ |
1759 | /* mouse report from vt window */ |
1611 | /* save the xbutton state (for ButtonRelease) */ |
1760 | /* save the xbutton state (for ButtonRelease) */ |
1612 | MEvent.state = ev.state; |
1761 | MEvent.state = ev.state; |
… | |
… | |
1641 | } |
1790 | } |
1642 | else |
1791 | else |
1643 | { |
1792 | { |
1644 | if (ev.button != MEvent.button) |
1793 | if (ev.button != MEvent.button) |
1645 | MEvent.clicks = 0; |
1794 | MEvent.clicks = 0; |
|
|
1795 | |
1646 | switch (ev.button) |
1796 | switch (ev.button) |
1647 | { |
1797 | { |
1648 | case Button1: |
1798 | case Button1: |
|
|
1799 | /* allow meta + click to select rectangular areas */ |
|
|
1800 | /* should be done in screen.C */ |
|
|
1801 | #if ENABLE_FRILLS |
|
|
1802 | selection.rect = !!(ev.state & ModMetaMask); |
|
|
1803 | #else |
|
|
1804 | selection.rect = false; |
|
|
1805 | #endif |
|
|
1806 | |
1649 | /* allow shift+left click to extend selection */ |
1807 | /* allow shift+left click to extend selection */ |
1650 | if (ev.state & ShiftMask && ! (PrivateModes & PrivMode_mouse_report)) |
1808 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1651 | { |
1809 | { |
1652 | if (MEvent.button == Button1 && clickintime) |
1810 | if (MEvent.button == Button1 && clickintime) |
1653 | selection_rotate (ev.x, ev.y); |
1811 | selection_rotate (ev.x, ev.y); |
1654 | else |
1812 | else |
1655 | selection_extend (ev.x, ev.y, 1); |
1813 | selection_extend (ev.x, ev.y, 1); |
… | |
… | |
1670 | case Button3: |
1828 | case Button3: |
1671 | if (MEvent.button == Button3 && clickintime) |
1829 | if (MEvent.button == Button3 && clickintime) |
1672 | selection_rotate (ev.x, ev.y); |
1830 | selection_rotate (ev.x, ev.y); |
1673 | else |
1831 | else |
1674 | selection_extend (ev.x, ev.y, 1); |
1832 | selection_extend (ev.x, ev.y, 1); |
|
|
1833 | |
1675 | MEvent.button = Button3; |
1834 | MEvent.button = Button3; |
1676 | break; |
1835 | break; |
1677 | } |
1836 | } |
1678 | } |
1837 | } |
|
|
1838 | |
1679 | MEvent.time = ev.time; |
1839 | MEvent.time = ev.time; |
1680 | return; |
1840 | return; |
1681 | } |
1841 | } |
1682 | |
1842 | |
1683 | /* |
1843 | /* |
… | |
… | |
1836 | { |
1996 | { |
1837 | int reportmode = 0; |
1997 | int reportmode = 0; |
1838 | |
1998 | |
1839 | csrO = 0; /* reset csr Offset */ |
1999 | csrO = 0; /* reset csr Offset */ |
1840 | if (!bypass_keystate) |
2000 | if (!bypass_keystate) |
1841 | reportmode = !! (PrivateModes & PrivMode_mouse_report); |
2001 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1842 | |
2002 | |
1843 | if (scrollbar_isUpDn ()) |
2003 | if (scrollbar_isUpDn ()) |
1844 | { |
2004 | { |
1845 | scrollBar.setIdle (); |
2005 | scrollBar.setIdle (); |
1846 | scrollbar_show (0); |
2006 | scrollbar_show (0); |
1847 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
2007 | #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING |
1848 | refresh_type &= ~SMOOTH_REFRESH; |
2008 | refresh_type &= ~SMOOTH_REFRESH; |
1849 | #endif |
2009 | #endif |
1850 | |
|
|
1851 | } |
2010 | } |
|
|
2011 | |
1852 | #ifdef SELECTION_SCROLLING |
2012 | #ifdef SELECTION_SCROLLING |
1853 | if (sel_scroll_ev.active) |
2013 | if (sel_scroll_ev.active) |
1854 | sel_scroll_ev.stop(); |
2014 | sel_scroll_ev.stop(); |
1855 | #endif |
2015 | #endif |
|
|
2016 | |
1856 | if (ev.window == TermWin.vt) |
2017 | if (ev.window == TermWin.vt) |
1857 | { |
2018 | { |
|
|
2019 | #if ISO_14755 |
|
|
2020 | // 5.4 |
|
|
2021 | if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) |
|
|
2022 | return; |
|
|
2023 | #endif |
1858 | if (reportmode) |
2024 | if (reportmode) |
1859 | { |
2025 | { |
1860 | /* mouse report from vt window */ |
2026 | /* mouse report from vt window */ |
1861 | /* don't report release of wheel "buttons" */ |
2027 | /* don't report release of wheel "buttons" */ |
1862 | if (ev.button >= 4) |
2028 | if (ev.button >= 4) |
… | |
… | |
1876 | MEvent.button = AnyButton; |
2042 | MEvent.button = AnyButton; |
1877 | mouse_report (ev); |
2043 | mouse_report (ev); |
1878 | #endif /* MOUSE_REPORT_DOUBLECLICK */ |
2044 | #endif /* MOUSE_REPORT_DOUBLECLICK */ |
1879 | return; |
2045 | return; |
1880 | } |
2046 | } |
|
|
2047 | |
1881 | /* |
2048 | /* |
1882 | * dumb hack to compensate for the failure of click-and-drag |
2049 | * dumb hack to compensate for the failure of click-and-drag |
1883 | * when overriding mouse reporting |
2050 | * when overriding mouse reporting |
1884 | */ |
2051 | */ |
1885 | if (PrivateModes & PrivMode_mouse_report |
2052 | if (priv_modes & PrivMode_mouse_report |
1886 | && bypass_keystate |
2053 | && bypass_keystate |
1887 | && ev.button == Button1 && MEvent.clicks <= 1) |
2054 | && ev.button == Button1 && MEvent.clicks <= 1) |
1888 | selection_extend (ev.x, ev.y, 0); |
2055 | selection_extend (ev.x, ev.y, 0); |
1889 | |
2056 | |
1890 | switch (ev.button) |
2057 | switch (ev.button) |
… | |
… | |
1905 | |
2072 | |
1906 | v = ev.button == Button4 ? UP : DN; |
2073 | v = ev.button == Button4 ? UP : DN; |
1907 | |
2074 | |
1908 | if (ev.state & ShiftMask) |
2075 | if (ev.state & ShiftMask) |
1909 | i = 1; |
2076 | i = 1; |
1910 | else if (Options & Opt_mouseWheelScrollPage) |
2077 | else if (options & Opt_mouseWheelScrollPage) |
1911 | i = TermWin.nrow - 1; |
2078 | i = TermWin.nrow - 1; |
1912 | else |
2079 | else |
1913 | i = 5; |
2080 | i = 5; |
1914 | |
2081 | |
1915 | # ifdef MOUSE_SLIP_WHEELING |
2082 | # ifdef MOUSE_SLIP_WHEELING |
… | |
… | |
1966 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
2133 | RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; |
1967 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
2134 | unsigned int lower_lim_r, lower_lim_g, lower_lim_b; |
1968 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
2135 | unsigned int upper_lim_r, upper_lim_g, upper_lim_b; |
1969 | int i; |
2136 | int i; |
1970 | |
2137 | |
1971 | Visual* visual = display->visual; |
2138 | Visual *visual = display->visual; |
1972 | |
2139 | |
1973 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
2140 | if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; |
1974 | |
2141 | |
1975 | /* for convenience */ |
2142 | /* for convenience */ |
1976 | mask_r = visual->red_mask; |
2143 | mask_r = visual->red_mask; |
… | |
… | |
2197 | Atom atype; |
2364 | Atom atype; |
2198 | unsigned char *prop = NULL; |
2365 | unsigned char *prop = NULL; |
2199 | Window root, oldp, *list; |
2366 | Window root, oldp, *list; |
2200 | Pixmap rootpixmap = None; |
2367 | Pixmap rootpixmap = None; |
2201 | XWindowAttributes wattr, wrootattr; |
2368 | XWindowAttributes wattr, wrootattr; |
|
|
2369 | dDisp; |
2202 | |
2370 | |
2203 | pchanged = 0; |
2371 | pchanged = 0; |
2204 | |
2372 | |
2205 | if (!(Options & Opt_transparent)) |
2373 | if (!(options & Opt_transparent)) |
2206 | return pchanged; /* Don't try any more */ |
2374 | return pchanged; /* Don't try any more */ |
2207 | |
2375 | |
2208 | XGetWindowAttributes (display->display, display->root, &wrootattr); |
2376 | XGetWindowAttributes (disp, display->root, &wrootattr); |
2209 | rootdepth = wrootattr.depth; |
2377 | rootdepth = wrootattr.depth; |
2210 | |
2378 | |
2211 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
2379 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
2212 | |
2380 | |
2213 | if (rootdepth != wattr.depth) |
2381 | if (rootdepth != wattr.depth) |
2214 | { |
2382 | { |
2215 | if (am_transparent) |
2383 | if (am_transparent) |
2216 | { |
2384 | { |
2217 | pchanged = 1; |
2385 | pchanged = 1; |
2218 | XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); |
2386 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2219 | am_transparent = am_pixmap_trans = 0; |
2387 | am_transparent = am_pixmap_trans = 0; |
2220 | } |
2388 | } |
2221 | |
2389 | |
2222 | return pchanged; /* Don't try any more */ |
2390 | return pchanged; /* Don't try any more */ |
2223 | } |
2391 | } |
2224 | |
2392 | |
2225 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2393 | /* Get all X ops out of the queue so that our information is up-to-date. */ |
2226 | XSync (display->display, False); |
2394 | XSync (disp, False); |
2227 | |
2395 | |
2228 | /* |
2396 | /* |
2229 | * Make the frame window set by the window manager have |
2397 | * Make the frame window set by the window manager have |
2230 | * the root background. Some window managers put multiple nested frame |
2398 | * the root background. Some window managers put multiple nested frame |
2231 | * windows for each client, so we have to take care about that. |
2399 | * windows for each client, so we have to take care about that. |
2232 | */ |
2400 | */ |
2233 | i = (xa[XA_XROOTPMAPID] |
2401 | i = (xa[XA_XROOTPMAP_ID] |
2234 | && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], |
2402 | && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], |
2235 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2403 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2236 | &nitems, &bytes_after, &prop) == Success); |
2404 | &nitems, &bytes_after, &prop) == Success); |
2237 | |
2405 | |
2238 | if (!i || prop == NULL) |
2406 | if (!i || prop == NULL) |
2239 | i = (xa[XA_XSETROOTID] |
2407 | i = (xa[XA_ESETROOT_PMAP_ID] |
2240 | && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], |
2408 | && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], |
2241 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2409 | 0L, 1L, False, XA_PIXMAP, &atype, &aformat, |
2242 | &nitems, &bytes_after, &prop) == Success); |
2410 | &nitems, &bytes_after, &prop) == Success); |
2243 | |
2411 | |
2244 | if (!i || prop == NULL |
2412 | if (!i || prop == NULL |
2245 | #if TINTING |
2413 | #if TINTING |
… | |
… | |
2264 | Window cr; |
2432 | Window cr; |
2265 | XImage *image; |
2433 | XImage *image; |
2266 | GC gc; |
2434 | GC gc; |
2267 | XGCValues gcvalue; |
2435 | XGCValues gcvalue; |
2268 | |
2436 | |
2269 | XTranslateCoordinates (display->display, TermWin.parent[0], display->root, |
2437 | XTranslateCoordinates (disp, TermWin.parent[0], display->root, |
2270 | 0, 0, &sx, &sy, &cr); |
2438 | 0, 0, &sx, &sy, &cr); |
2271 | nw = (unsigned int)szHint.width; |
2439 | nw = (unsigned int)szHint.width; |
2272 | nh = (unsigned int)szHint.height; |
2440 | nh = (unsigned int)szHint.height; |
2273 | nx = ny = 0; |
2441 | nx = ny = 0; |
2274 | |
2442 | |
… | |
… | |
2286 | sy = 0; |
2454 | sy = 0; |
2287 | } |
2455 | } |
2288 | |
2456 | |
2289 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2457 | MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); |
2290 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
2458 | MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); |
|
|
2459 | |
|
|
2460 | XSync (disp, False); |
2291 | allowedxerror = -1; |
2461 | allowedxerror = -1; |
2292 | image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2462 | image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); |
2293 | |
2463 | |
2294 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2464 | /* XXX: handle BadMatch - usually because we're outside the pixmap */ |
2295 | /* XXX: may need a delay here? */ |
2465 | /* XXX: may need a delay here? */ |
2296 | allowedxerror = 0; |
2466 | allowedxerror = 0; |
2297 | |
2467 | |
… | |
… | |
2300 | if (am_transparent && am_pixmap_trans) |
2470 | if (am_transparent && am_pixmap_trans) |
2301 | { |
2471 | { |
2302 | pchanged = 1; |
2472 | pchanged = 1; |
2303 | if (TermWin.pixmap != None) |
2473 | if (TermWin.pixmap != None) |
2304 | { |
2474 | { |
2305 | XFreePixmap (display->display, TermWin.pixmap); |
2475 | XFreePixmap (disp, TermWin.pixmap); |
2306 | TermWin.pixmap = None; |
2476 | TermWin.pixmap = None; |
2307 | } |
2477 | } |
2308 | } |
2478 | } |
2309 | |
2479 | |
2310 | am_pixmap_trans = 0; |
2480 | am_pixmap_trans = 0; |
2311 | } |
2481 | } |
2312 | else |
2482 | else |
2313 | { |
2483 | { |
2314 | if (TermWin.pixmap != None) |
2484 | if (TermWin.pixmap != None) |
2315 | XFreePixmap (display->display, TermWin.pixmap); |
2485 | XFreePixmap (disp, TermWin.pixmap); |
2316 | |
2486 | |
2317 | #if TINTING |
2487 | #if TINTING |
2318 | if (ISSET_PIXCOLOR (Color_tint)) |
2488 | if (ISSET_PIXCOLOR (Color_tint)) |
2319 | { |
2489 | { |
2320 | unsigned short rm, gm, bm; |
2490 | unsigned short rm, gm, bm; |
2321 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2491 | int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; |
2322 | |
2492 | |
2323 | PixColorsFocused[Color_tint].get (display, rm, gm, bm); |
2493 | pix_colors_focused[Color_tint].get (display, rm, gm, bm); |
2324 | |
2494 | |
2325 | ShadeXImage (display, image, shade, rm, gm, bm); |
2495 | ShadeXImage (display, image, shade, rm, gm, bm); |
2326 | } |
2496 | } |
2327 | #endif |
2497 | #endif |
2328 | |
2498 | |
2329 | TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, |
2499 | TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, |
2330 | szHint.width, szHint.height, image->depth); |
2500 | szHint.width, szHint.height, image->depth); |
2331 | gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); |
2501 | gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); |
2332 | XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, |
2502 | XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, |
2333 | nx, ny, image->width, image->height); |
2503 | nx, ny, image->width, image->height); |
2334 | XFreeGC (display->display, gc); |
2504 | XFreeGC (disp, gc); |
2335 | XDestroyImage (image); |
2505 | XDestroyImage (image); |
2336 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); |
2506 | XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); |
2337 | XClearWindow (display->display, TermWin.parent[0]); |
2507 | XClearWindow (disp, TermWin.parent[0]); |
2338 | |
2508 | |
2339 | if (!am_transparent || !am_pixmap_trans) |
2509 | if (!am_transparent || !am_pixmap_trans) |
2340 | pchanged = 1; |
2510 | pchanged = 1; |
2341 | |
2511 | |
2342 | am_transparent = am_pixmap_trans = 1; |
2512 | am_transparent = am_pixmap_trans = 1; |
2343 | } |
2513 | } |
2344 | } |
2514 | } |
2345 | |
2515 | |
2346 | if (!am_pixmap_trans) |
2516 | if (am_pixmap_trans) |
|
|
2517 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
|
|
2518 | else |
2347 | { |
2519 | { |
2348 | unsigned int n; |
2520 | unsigned int n; |
2349 | /* |
2521 | /* |
2350 | * InheritPixmap transparency |
2522 | * InheritPixmap transparency |
2351 | */ |
2523 | */ |
2352 | D_X ((stderr, "InheritPixmap Seeking to %08lx", display->root)); |
|
|
2353 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2524 | for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2354 | { |
2525 | { |
2355 | oldp = TermWin.parent[i]; |
2526 | oldp = TermWin.parent[i]; |
2356 | XQueryTree (display->display, TermWin.parent[i - 1], &root, |
2527 | XQueryTree (disp, TermWin.parent[i - 1], &root, |
2357 | &TermWin.parent[i], &list, &n); |
2528 | &TermWin.parent[i], &list, &n); |
2358 | XFree (list); |
2529 | XFree (list); |
2359 | D_X ((stderr, "InheritPixmap Parent[%d] = %08lx", i, TermWin.parent[i])); |
|
|
2360 | |
2530 | |
2361 | if (TermWin.parent[i] == display->root) |
2531 | if (TermWin.parent[i] == display->root) |
2362 | { |
2532 | { |
2363 | if (oldp != None) |
2533 | if (oldp != None) |
2364 | pchanged = 1; |
2534 | pchanged = 1; |
… | |
… | |
2374 | |
2544 | |
2375 | if (pchanged) |
2545 | if (pchanged) |
2376 | { |
2546 | { |
2377 | for (; n < (unsigned int)i; n++) |
2547 | for (; n < (unsigned int)i; n++) |
2378 | { |
2548 | { |
2379 | XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); |
2549 | XGetWindowAttributes (disp, TermWin.parent[n], &wattr); |
2380 | D_X ((stderr, "InheritPixmap Checking Parent[%d]: %s", n, (wattr.depth == rootdepth && wattr.class != InputOnly) ? "OK" : "FAIL")); |
|
|
2381 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2550 | if (wattr.depth != rootdepth || wattr.c_class == InputOnly) |
2382 | { |
2551 | { |
2383 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2552 | n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; |
2384 | break; |
2553 | break; |
2385 | } |
2554 | } |
2386 | } |
2555 | } |
2387 | } |
2556 | } |
2388 | |
2557 | |
2389 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2558 | if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) |
2390 | { |
2559 | { |
2391 | D_X ((stderr, "InheritPixmap Turning off")); |
|
|
2392 | XSetWindowBackground (display->display, TermWin.parent[0], PixColorsFocused[Color_fg]); |
2560 | XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); |
2393 | XSetWindowBackground (display->display, TermWin.vt, PixColorsFocused[Color_bg]); |
2561 | XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); |
2394 | am_transparent = 0; |
2562 | am_transparent = 0; |
2395 | /* XXX: also turn off Opt_transparent? */ |
2563 | /* XXX: also turn off Opt_transparent? */ |
2396 | } |
2564 | } |
2397 | else |
2565 | else |
2398 | { |
2566 | { |
2399 | #if WAIT_FOR_WM |
2567 | #if WAIT_FOR_WM |
2400 | /* wait (an arbitrary period) for the WM to do its thing |
2568 | /* wait (an arbitrary period) for the WM to do its thing |
2401 | * needed for fvwm2.2.2 (and before?) */ |
2569 | * needed for fvwm2.2.2 (and before?) */ |
2402 | sleep (1); |
2570 | sleep (1); |
2403 | #endif |
2571 | #endif |
2404 | D_X ((stderr, "InheritPixmap Turning on (%d parents)", i - 1)); |
|
|
2405 | for (n = 0; n < (unsigned int)i; n++) |
2572 | for (n = 0; n < (unsigned int)i; n++) |
2406 | { |
2573 | { |
2407 | XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); |
2574 | XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); |
2408 | XClearWindow (display->display, TermWin.parent[n]); |
2575 | XClearWindow (disp, TermWin.parent[n]); |
2409 | } |
2576 | } |
2410 | |
2577 | |
2411 | XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); |
2578 | XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); |
2412 | am_transparent = 1; |
2579 | am_transparent = 1; |
2413 | } |
2580 | } |
2414 | |
2581 | |
2415 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2582 | for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) |
2416 | TermWin.parent[i] = None; |
2583 | TermWin.parent[i] = None; |
2417 | } |
2584 | } |
2418 | |
2585 | |
2419 | // this is experimental |
|
|
2420 | if (scrollBar.win) |
2586 | if (scrollBar.win) |
2421 | { |
2587 | { |
2422 | XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); |
2588 | XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); |
2423 | XClearWindow (display->display, scrollBar.win); |
|
|
2424 | scrollBar.setIdle (); |
2589 | scrollBar.setIdle (); |
2425 | scrollbar_show (0); |
2590 | scrollbar_show (0); |
|
|
2591 | } |
|
|
2592 | |
|
|
2593 | if (am_transparent) |
|
|
2594 | { |
|
|
2595 | want_refresh = want_full_refresh = 1; |
|
|
2596 | if (am_pixmap_trans) |
|
|
2597 | flush (); |
2426 | } |
2598 | } |
2427 | |
2599 | |
2428 | return pchanged; |
2600 | return pchanged; |
2429 | } |
2601 | } |
2430 | #endif |
2602 | #endif |
… | |
… | |
2449 | if (ch == NOCHAR) // TODO: improve |
2621 | if (ch == NOCHAR) // TODO: improve |
2450 | break; |
2622 | break; |
2451 | |
2623 | |
2452 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2624 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2453 | { |
2625 | { |
|
|
2626 | if (!seen_input) |
|
|
2627 | { |
|
|
2628 | seen_input = 1; |
|
|
2629 | // many badly-written programs (e.g. jed) contain a race condition: |
|
|
2630 | // they first read the screensize and then install a SIGWINCH handler. |
|
|
2631 | // some window managers resize the window early, and these programs |
|
|
2632 | // then sometimes get the size wrong. |
|
|
2633 | // unfortunately other programs are even more buggy and dislike |
|
|
2634 | // being sent SIGWINCH, so only do it when we were in fact being |
|
|
2635 | // resized. |
|
|
2636 | if (seen_resize && cmd_pid) |
|
|
2637 | kill (-cmd_pid, SIGWINCH); |
|
|
2638 | } |
|
|
2639 | |
2454 | /* Read a text string from the input buffer */ |
2640 | /* Read a text string from the input buffer */ |
2455 | unicode_t buf[UBUFSIZ]; |
2641 | unicode_t buf[UBUFSIZ]; |
2456 | bool refreshnow = false; |
2642 | bool refreshnow = false; |
2457 | int nlines = 0; |
2643 | int nlines = 0; |
2458 | unicode_t *str = buf; |
2644 | unicode_t *str = buf; |
… | |
… | |
2467 | if (ch == C0_LF) |
2653 | if (ch == C0_LF) |
2468 | { |
2654 | { |
2469 | nlines++; |
2655 | nlines++; |
2470 | refresh_count++; |
2656 | refresh_count++; |
2471 | |
2657 | |
2472 | if (!(Options & Opt_jumpScroll) |
2658 | if (!(options & Opt_jumpScroll) |
2473 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2659 | || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) |
2474 | { |
2660 | { |
2475 | refreshnow = true; |
2661 | refreshnow = true; |
2476 | ch = NOCHAR; |
2662 | ch = NOCHAR; |
2477 | break; |
2663 | break; |
… | |
… | |
2504 | * the number of pages between refreshes is refresh_limit, which |
2690 | * the number of pages between refreshes is refresh_limit, which |
2505 | * is incremented here because we must be doing flat-out scrolling. |
2691 | * is incremented here because we must be doing flat-out scrolling. |
2506 | */ |
2692 | */ |
2507 | if (refreshnow) |
2693 | if (refreshnow) |
2508 | { |
2694 | { |
2509 | if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2695 | if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) |
2510 | refresh_limit++; |
2696 | refresh_limit++; |
2511 | else |
2697 | else |
2512 | { |
2698 | { |
2513 | flag = true; |
2699 | flag = true; |
2514 | scr_refresh (refresh_type); |
2700 | scr_refresh (refresh_type); |
… | |
… | |
2568 | if (len == (size_t)-1) |
2754 | if (len == (size_t)-1) |
2569 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2755 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2570 | |
2756 | |
2571 | // assume wchar == unicode |
2757 | // assume wchar == unicode |
2572 | cmdbuf_ptr += len; |
2758 | cmdbuf_ptr += len; |
2573 | return wc; |
2759 | return wc & UNICODE_MASK; |
2574 | } |
2760 | } |
2575 | |
2761 | |
2576 | return NOCHAR; |
2762 | return NOCHAR; |
2577 | } |
2763 | } |
2578 | |
2764 | |
… | |
… | |
2704 | process_escape_seq (); |
2890 | process_escape_seq (); |
2705 | break; |
2891 | break; |
2706 | case C0_ENQ: /* terminal Status */ |
2892 | case C0_ENQ: /* terminal Status */ |
2707 | if (rs[Rs_answerbackstring]) |
2893 | if (rs[Rs_answerbackstring]) |
2708 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2894 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
2709 | (unsigned int)STRLEN (rs[Rs_answerbackstring])); |
2895 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
2710 | else |
2896 | else |
2711 | tt_write ((unsigned char *)VT100_ANS, |
2897 | tt_write ((unsigned char *)VT100_ANS, |
2712 | (unsigned int)STRLEN (VT100_ANS)); |
2898 | (unsigned int)strlen (VT100_ANS)); |
2713 | break; |
2899 | break; |
2714 | case C0_BEL: /* bell */ |
2900 | case C0_BEL: /* bell */ |
2715 | scr_bell (); |
2901 | scr_bell (); |
2716 | break; |
2902 | break; |
2717 | case C0_BS: /* backspace */ |
2903 | case C0_BS: /* backspace */ |
… | |
… | |
2816 | void |
3002 | void |
2817 | rxvt_term::process_escape_seq () |
3003 | rxvt_term::process_escape_seq () |
2818 | { |
3004 | { |
2819 | unicode_t ch = cmd_getc (); |
3005 | unicode_t ch = cmd_getc (); |
2820 | |
3006 | |
2821 | if (PrivateModes & PrivMode_vt52) |
3007 | if (priv_modes & PrivMode_vt52) |
2822 | { |
3008 | { |
2823 | process_escape_vt52 (ch); |
3009 | process_escape_vt52 (ch); |
2824 | return; |
3010 | return; |
2825 | } |
3011 | } |
2826 | |
3012 | |
… | |
… | |
2841 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
3027 | scr_charset_set (2, (unsigned int)cmd_getc ()); |
2842 | break; |
3028 | break; |
2843 | case '+': |
3029 | case '+': |
2844 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
3030 | scr_charset_set (3, (unsigned int)cmd_getc ()); |
2845 | break; |
3031 | break; |
2846 | #ifndef NO_FRILLS |
3032 | #if ENABLE_FRILLS |
2847 | case '6': |
3033 | case '6': |
2848 | scr_backindex (); |
3034 | scr_backindex (); |
2849 | break; |
3035 | break; |
2850 | #endif |
3036 | #endif |
2851 | case '7': |
3037 | case '7': |
2852 | scr_cursor (SAVE); |
3038 | scr_cursor (SAVE); |
2853 | break; |
3039 | break; |
2854 | case '8': |
3040 | case '8': |
2855 | scr_cursor (RESTORE); |
3041 | scr_cursor (RESTORE); |
2856 | break; |
3042 | break; |
2857 | #ifndef NO_FRILLS |
3043 | #if ENABLE_FRILLS |
2858 | case '9': |
3044 | case '9': |
2859 | scr_forwardindex (); |
3045 | scr_forwardindex (); |
2860 | break; |
3046 | break; |
2861 | #endif |
3047 | #endif |
2862 | case '=': |
3048 | case '=': |
… | |
… | |
3041 | { |
3227 | { |
3042 | switch (priv) |
3228 | switch (priv) |
3043 | { |
3229 | { |
3044 | case '>': |
3230 | case '>': |
3045 | if (ch == CSI_DA) /* secondary device attributes */ |
3231 | if (ch == CSI_DA) /* secondary device attributes */ |
3046 | tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); |
3232 | tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); |
3047 | break; |
3233 | break; |
3048 | case '?': |
3234 | case '?': |
3049 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3235 | if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') |
3050 | process_terminal_mode (ch, priv, nargs, arg); |
3236 | process_terminal_mode (ch, priv, nargs, arg); |
3051 | break; |
3237 | break; |
… | |
… | |
3161 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3347 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); |
3162 | break; |
3348 | break; |
3163 | |
3349 | |
3164 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3350 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3165 | tt_write ((const unsigned char *)VT100_ANS, |
3351 | tt_write ((const unsigned char *)VT100_ANS, |
3166 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
3352 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
3167 | break; |
3353 | break; |
3168 | |
3354 | |
3169 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3355 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3170 | process_sgr_mode (nargs, arg); |
3356 | process_sgr_mode (nargs, arg); |
3171 | break; |
3357 | break; |
… | |
… | |
3178 | break; |
3364 | break; |
3179 | case 6: /* CPR requested */ |
3365 | case 6: /* CPR requested */ |
3180 | scr_report_position (); |
3366 | scr_report_position (); |
3181 | break; |
3367 | break; |
3182 | case 7: /* unofficial extension */ |
3368 | case 7: /* unofficial extension */ |
3183 | if (Options & Opt_insecure) |
3369 | if (options & Opt_insecure) |
3184 | tt_printf ("%-.250s\n", rs[Rs_display_name]); |
3370 | tt_printf ("%-.250s\012", rs[Rs_display_name]); |
3185 | break; |
3371 | break; |
3186 | case 8: /* unofficial extension */ |
3372 | case 8: /* unofficial extension */ |
3187 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3373 | process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); |
3188 | break; |
3374 | break; |
3189 | } |
3375 | } |
… | |
… | |
3225 | break; |
3411 | break; |
3226 | |
3412 | |
3227 | case CSI_RM: /* 8.3.107: RESET MODE */ |
3413 | case CSI_RM: /* 8.3.107: RESET MODE */ |
3228 | if (arg[0] == 4) |
3414 | if (arg[0] == 4) |
3229 | scr_insert_mode (0); |
3415 | scr_insert_mode (0); |
|
|
3416 | else if (arg[0] == 20) |
|
|
3417 | priv_modes &= ~PrivMode_LFNL; |
3230 | break; |
3418 | break; |
3231 | |
3419 | |
3232 | case CSI_SM: /* 8.3.126: SET MODE */ |
3420 | case CSI_SM: /* 8.3.126: SET MODE */ |
3233 | if (arg[0] == 4) |
3421 | if (arg[0] == 4) |
3234 | scr_insert_mode (1); |
3422 | scr_insert_mode (1); |
|
|
3423 | else if (arg[0] == 20) |
|
|
3424 | priv_modes |= PrivMode_LFNL; |
3235 | break; |
3425 | break; |
3236 | |
3426 | |
3237 | /* |
3427 | /* |
3238 | * PRIVATE USE beyond this point. All CSI_7? sequences here |
3428 | * PRIVATE USE beyond this point. All CSI_7? sequences here |
3239 | */ |
3429 | */ |
… | |
… | |
3251 | break; |
3441 | break; |
3252 | case CSI_75: |
3442 | case CSI_75: |
3253 | scr_cursor (RESTORE); |
3443 | scr_cursor (RESTORE); |
3254 | break; |
3444 | break; |
3255 | |
3445 | |
3256 | #ifndef NO_FRILLS |
3446 | #if ENABLE_FRILLS |
3257 | case CSI_74: |
3447 | case CSI_74: |
3258 | process_window_ops (arg, nargs); |
3448 | process_window_ops (arg, nargs); |
3259 | break; |
3449 | break; |
3260 | #endif |
3450 | #endif |
3261 | |
3451 | |
… | |
… | |
3268 | break; |
3458 | break; |
3269 | } |
3459 | } |
3270 | } |
3460 | } |
3271 | /*}}} */ |
3461 | /*}}} */ |
3272 | |
3462 | |
3273 | #ifndef NO_FRILLS |
3463 | #if ENABLE_FRILLS |
3274 | /* ARGSUSED */ |
3464 | /* ARGSUSED */ |
3275 | void |
3465 | void |
3276 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3466 | rxvt_term::process_window_ops (const int *args, unsigned int nargs) |
3277 | { |
3467 | { |
3278 | int x, y; |
3468 | int x, y; |
3279 | XWindowAttributes wattr; |
3469 | XWindowAttributes wattr; |
3280 | Window wdummy; |
3470 | Window wdummy; |
|
|
3471 | dDisp; |
3281 | |
3472 | |
3282 | if (nargs == 0) |
3473 | if (nargs == 0) |
3283 | return; |
3474 | return; |
3284 | |
3475 | |
3285 | switch (args[0]) |
3476 | switch (args[0]) |
3286 | { |
3477 | { |
3287 | /* |
3478 | /* |
3288 | * commands |
3479 | * commands |
3289 | */ |
3480 | */ |
3290 | case 1: /* deiconify window */ |
3481 | case 1: /* deiconify window */ |
3291 | XMapWindow (display->display, TermWin.parent[0]); |
3482 | XMapWindow (disp, TermWin.parent[0]); |
3292 | break; |
3483 | break; |
3293 | case 2: /* iconify window */ |
3484 | case 2: /* iconify window */ |
3294 | XIconifyWindow (display->display, TermWin.parent[0], |
3485 | XIconifyWindow (disp, TermWin.parent[0], display->screen); |
3295 | DefaultScreen (display->display)); |
|
|
3296 | break; |
3486 | break; |
3297 | case 3: /* set position (pixels) */ |
3487 | case 3: /* set position (pixels) */ |
3298 | XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); |
3488 | XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); |
3299 | break; |
3489 | break; |
3300 | case 4: /* set size (pixels) */ |
3490 | case 4: /* set size (pixels) */ |
3301 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3491 | set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); |
3302 | break; |
3492 | break; |
3303 | case 5: /* raise window */ |
3493 | case 5: /* raise window */ |
3304 | XRaiseWindow (display->display, TermWin.parent[0]); |
3494 | XRaiseWindow (disp, TermWin.parent[0]); |
3305 | break; |
3495 | break; |
3306 | case 6: /* lower window */ |
3496 | case 6: /* lower window */ |
3307 | XLowerWindow (display->display, TermWin.parent[0]); |
3497 | XLowerWindow (disp, TermWin.parent[0]); |
3308 | break; |
3498 | break; |
3309 | case 7: /* refresh window */ |
3499 | case 7: /* refresh window */ |
3310 | scr_touch (true); |
3500 | scr_touch (true); |
3311 | break; |
3501 | break; |
3312 | case 8: /* set size (chars) */ |
3502 | case 8: /* set size (chars) */ |
… | |
… | |
3324 | |
3514 | |
3325 | /* |
3515 | /* |
3326 | * reports - some output format copied from XTerm |
3516 | * reports - some output format copied from XTerm |
3327 | */ |
3517 | */ |
3328 | case 11: /* report window state */ |
3518 | case 11: /* report window state */ |
3329 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3519 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3330 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3520 | tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); |
3331 | break; |
3521 | break; |
3332 | case 13: /* report window position */ |
3522 | case 13: /* report window position */ |
3333 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3523 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3334 | XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, |
3524 | XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, |
3335 | -wattr.border_width, -wattr.border_width, |
3525 | -wattr.border_width, -wattr.border_width, |
3336 | &x, &y, &wdummy); |
3526 | &x, &y, &wdummy); |
3337 | tt_printf ("\033[3;%d;%dt", x, y); |
3527 | tt_printf ("\033[3;%d;%dt", x, y); |
3338 | break; |
3528 | break; |
3339 | case 14: /* report window size (pixels) */ |
3529 | case 14: /* report window size (pixels) */ |
3340 | XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); |
3530 | XGetWindowAttributes (disp, TermWin.parent[0], &wattr); |
3341 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3531 | tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); |
3342 | break; |
3532 | break; |
3343 | case 18: /* report text area size (chars) */ |
3533 | case 18: /* report text area size (chars) */ |
3344 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3534 | tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); |
3345 | break; |
3535 | break; |
… | |
… | |
3347 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3537 | tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); |
3348 | break; |
3538 | break; |
3349 | case 20: /* report icon label */ |
3539 | case 20: /* report icon label */ |
3350 | { |
3540 | { |
3351 | char *s; |
3541 | char *s; |
3352 | XGetIconName (display->display, TermWin.parent[0], &s); |
3542 | XGetIconName (disp, TermWin.parent[0], &s); |
3353 | tt_printf ("\033]L%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3543 | tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3354 | XFree (s); |
3544 | XFree (s); |
3355 | } |
3545 | } |
3356 | break; |
3546 | break; |
3357 | case 21: /* report window title */ |
3547 | case 21: /* report window title */ |
3358 | { |
3548 | { |
3359 | char *s; |
3549 | char *s; |
3360 | XFetchName (display->display, TermWin.parent[0], &s); |
3550 | XFetchName (disp, TermWin.parent[0], &s); |
3361 | tt_printf ("\033]l%-.250s\234", (Options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3551 | tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ |
3362 | XFree (s); |
3552 | XFree (s); |
3363 | } |
3553 | } |
3364 | break; |
3554 | break; |
3365 | } |
3555 | } |
3366 | } |
3556 | } |
… | |
… | |
3372 | * ends_how is terminator used. returned input must be free()'d |
3562 | * ends_how is terminator used. returned input must be free()'d |
3373 | */ |
3563 | */ |
3374 | unsigned char * |
3564 | unsigned char * |
3375 | rxvt_term::get_to_st (unicode_t &ends_how) |
3565 | rxvt_term::get_to_st (unicode_t &ends_how) |
3376 | { |
3566 | { |
3377 | unicode_t prev = 0, ch; |
3567 | unicode_t ch; |
|
|
3568 | bool seen_esc = false; |
3378 | unsigned int n = 0; |
3569 | unsigned int n = 0; |
3379 | unsigned char *s; |
|
|
3380 | unsigned char string[STRING_MAX]; |
3570 | wchar_t string[STRING_MAX]; |
3381 | |
3571 | |
3382 | while ((ch = cmd_getc ()) != NOCHAR) |
3572 | while ((ch = cmd_getc ()) != NOCHAR) |
3383 | { |
3573 | { |
3384 | if (prev == C0_ESC) |
3574 | if (seen_esc) |
3385 | { |
3575 | { |
3386 | if (ch == 0x5c) /* 7bit ST */ |
3576 | if (ch == 0x5c) /* 7bit ST */ |
3387 | break; |
3577 | break; |
3388 | else |
3578 | else |
3389 | return NULL; |
3579 | return NULL; |
3390 | } |
3580 | } |
|
|
3581 | else if (ch == C0_ESC) |
|
|
3582 | { |
|
|
3583 | seen_esc = true; |
|
|
3584 | continue; |
|
|
3585 | } |
3391 | else if (ch == C0_BEL || ch == CHAR_ST) |
3586 | else if (ch == C0_BEL || ch == CHAR_ST) |
3392 | break; |
3587 | break; |
3393 | else if (ch < 0x20) |
3588 | else if (ch < 0x20) |
3394 | return NULL; /* other control character - exit */ |
3589 | return NULL; /* other control character - exit */ |
|
|
3590 | |
|
|
3591 | seen_esc = false; |
3395 | |
3592 | |
3396 | if (n >= sizeof (string) - 1) |
3593 | if (n >= sizeof (string) - 1) |
3397 | // stop at some sane length |
3594 | // stop at some sane length |
3398 | return NULL; |
3595 | return NULL; |
3399 | |
3596 | |
3400 | if (ch == C0_SYN) |
3597 | if (ch == C0_SYN) |
3401 | { |
|
|
3402 | string[n++] = cmd_get8 (); |
3598 | string[n++] = cmd_get8 (); |
3403 | prev = 0; |
|
|
3404 | } |
|
|
3405 | else |
3599 | else |
3406 | string[n++] = prev = ch; |
3600 | string[n++] = ch; |
3407 | } |
3601 | } |
3408 | |
3602 | |
3409 | string[n++] = '\0'; |
3603 | string[n++] = '\0'; |
3410 | |
3604 | |
3411 | if ((s = (unsigned char *)rxvt_malloc (n)) == NULL) |
|
|
3412 | return NULL; |
|
|
3413 | |
|
|
3414 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3605 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3415 | STRNCPY (s, string, n); |
3606 | |
3416 | return s; |
3607 | return (unsigned char *)rxvt_wcstombs (string); |
3417 | } |
3608 | } |
3418 | |
3609 | |
3419 | /*----------------------------------------------------------------------*/ |
3610 | /*----------------------------------------------------------------------*/ |
3420 | /* |
3611 | /* |
3421 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3612 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
… | |
… | |
3466 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3657 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3467 | { |
3658 | { |
3468 | if (str[0] == '?' && !str[1]) |
3659 | if (str[0] == '?' && !str[1]) |
3469 | { |
3660 | { |
3470 | unsigned short r, g, b; |
3661 | unsigned short r, g, b; |
3471 | PixColorsFocused[color].get (display, r, g, b); |
3662 | pix_colors_focused[color].get (display, r, g, b); |
3472 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3663 | tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); |
3473 | } |
3664 | } |
3474 | else |
3665 | else |
3475 | set_window_color (color, str); |
3666 | set_window_color (color, str); |
3476 | } |
3667 | } |
… | |
… | |
3505 | { |
3696 | { |
3506 | int changed = 0; |
3697 | int changed = 0; |
3507 | int color; |
3698 | int color; |
3508 | char *buf, *name; |
3699 | char *buf, *name; |
3509 | bool query = str[0] == '?' && !str[1]; |
3700 | bool query = str[0] == '?' && !str[1]; |
|
|
3701 | int saveop = op; |
|
|
3702 | dDisp; |
3510 | |
3703 | |
3511 | assert (str != NULL); |
3704 | assert (str != NULL); |
3512 | switch (op) |
3705 | switch (op) |
3513 | { |
3706 | { |
3514 | case XTerm_name: |
3707 | case XTerm_name: |
… | |
… | |
3521 | set_title (str); |
3714 | set_title (str); |
3522 | break; |
3715 | break; |
3523 | case XTerm_property: |
3716 | case XTerm_property: |
3524 | if (str[0] == '?') |
3717 | if (str[0] == '?') |
3525 | { |
3718 | { |
3526 | Atom prop = XInternAtom (display->display, str + 1, True); |
3719 | Atom prop = display->atom (str + 1); |
3527 | Atom actual_type; |
3720 | Atom actual_type; |
3528 | int actual_format; |
3721 | int actual_format; |
3529 | unsigned long nitems; |
3722 | unsigned long nitems; |
3530 | unsigned long bytes_after; |
3723 | unsigned long bytes_after; |
3531 | unsigned char *value = 0; |
3724 | unsigned char *value = 0; |
3532 | const char *str = ""; |
3725 | const char *str = ""; |
3533 | |
3726 | |
3534 | if (prop |
3727 | if (prop |
3535 | && XGetWindowProperty (display->display, TermWin.parent[0], |
3728 | && XGetWindowProperty (disp, TermWin.parent[0], |
3536 | prop, 0, 1<<16, 0, AnyPropertyType, |
3729 | prop, 0, 1<<16, 0, AnyPropertyType, |
3537 | &actual_type, &actual_format, |
3730 | &actual_type, &actual_format, |
3538 | &nitems, &bytes_after, &value) == Success |
3731 | &nitems, &bytes_after, &value) == Success |
3539 | && actual_type != None |
3732 | && actual_type != None |
3540 | && actual_format == 8) |
3733 | && actual_format == 8) |
… | |
… | |
3549 | char *eq = strchr (str, '='); // constness lost, but verified to be ok |
3742 | char *eq = strchr (str, '='); // constness lost, but verified to be ok |
3550 | |
3743 | |
3551 | if (eq) |
3744 | if (eq) |
3552 | { |
3745 | { |
3553 | *eq = 0; |
3746 | *eq = 0; |
3554 | XChangeProperty (display->display, TermWin.parent[0], |
3747 | set_utf8_property (display->atom (str), eq + 1); |
3555 | display->atom (str), XA_STRING, 8, |
|
|
3556 | PropModeReplace, (unsigned char *)eq + 1, |
|
|
3557 | strlen (eq + 1)); |
|
|
3558 | } |
3748 | } |
3559 | else |
3749 | else |
3560 | XDeleteProperty (display->display, TermWin.parent[0], |
3750 | XDeleteProperty (disp, TermWin.parent[0], |
3561 | display->atom (str)); |
3751 | display->atom (str)); |
3562 | } |
3752 | } |
3563 | break; |
3753 | break; |
3564 | |
3754 | |
3565 | case XTerm_Color: |
3755 | case XTerm_Color: |
3566 | for (buf = (char *)str; buf && *buf;) |
3756 | for (buf = (char *)str; buf && *buf;) |
3567 | { |
3757 | { |
3568 | if ((name = STRCHR (buf, ';')) == NULL) |
3758 | if ((name = strchr (buf, ';')) == NULL) |
3569 | break; |
3759 | break; |
3570 | |
3760 | |
3571 | *name++ = '\0'; |
3761 | *name++ = '\0'; |
3572 | color = atoi (buf); |
3762 | color = atoi (buf); |
3573 | |
3763 | |
3574 | if (color < 0 || color >= TOTAL_COLORS) |
3764 | if (color < 0 || color >= TOTAL_COLORS) |
3575 | break; |
3765 | break; |
3576 | |
3766 | |
3577 | if ((buf = STRCHR (name, ';')) != NULL) |
3767 | if ((buf = strchr (name, ';')) != NULL) |
3578 | *buf++ = '\0'; |
3768 | *buf++ = '\0'; |
3579 | |
3769 | |
3580 | if (name[0] == '?' && !name[1]) |
3770 | if (name[0] == '?' && !name[1]) |
3581 | { |
3771 | { |
3582 | unsigned short r, g, b; |
3772 | unsigned short r, g, b; |
3583 | PixColorsFocused[color + minCOLOR].get (display, r, g, b); |
3773 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3584 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3774 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3585 | } |
3775 | } |
3586 | else |
3776 | else |
3587 | set_window_color (color + minCOLOR, name); |
3777 | set_window_color (color + minCOLOR, name); |
3588 | } |
3778 | } |
… | |
… | |
3606 | break; |
3796 | break; |
3607 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3797 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3608 | case XTerm_Color_BD: |
3798 | case XTerm_Color_BD: |
3609 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
3799 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
3610 | break; |
3800 | break; |
|
|
3801 | case XTerm_Color_IT: |
|
|
3802 | process_color_seq (XTerm_Color_IT, Color_IT, str, resp); |
|
|
3803 | break; |
3611 | case XTerm_Color_UL: |
3804 | case XTerm_Color_UL: |
3612 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
3805 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
3613 | break; |
3806 | break; |
3614 | case XTerm_Color_RV: |
3807 | case XTerm_Color_RV: |
3615 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3808 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3809 | break; |
|
|
3810 | #endif |
|
|
3811 | #if TRANSPARENT && TINTING |
|
|
3812 | case XTerm_Color_tint: |
|
|
3813 | process_color_seq (XTerm_Color_tint, Color_tint, str, resp); |
|
|
3814 | check_our_parents (); |
|
|
3815 | if (am_transparent) |
|
|
3816 | want_full_refresh = want_refresh = 1; |
3616 | break; |
3817 | break; |
3617 | #endif |
3818 | #endif |
3618 | |
3819 | |
3619 | case XTerm_Pixmap: |
3820 | case XTerm_Pixmap: |
3620 | if (*str != ';') |
3821 | if (*str != ';') |
… | |
… | |
3623 | scale_pixmap (""); /* reset to default scaling */ |
3824 | scale_pixmap (""); /* reset to default scaling */ |
3624 | set_bgPixmap (str); /* change pixmap */ |
3825 | set_bgPixmap (str); /* change pixmap */ |
3625 | #endif |
3826 | #endif |
3626 | scr_touch (true); |
3827 | scr_touch (true); |
3627 | } |
3828 | } |
3628 | while ((str = STRCHR (str, ';')) != NULL) |
3829 | while ((str = strchr (str, ';')) != NULL) |
3629 | { |
3830 | { |
3630 | str++; |
3831 | str++; |
3631 | #if XPM_BACKGROUND |
3832 | #if XPM_BACKGROUND |
3632 | changed += scale_pixmap (str); |
3833 | changed += scale_pixmap (str); |
3633 | #endif |
3834 | #endif |
3634 | |
|
|
3635 | } |
3835 | } |
|
|
3836 | |
3636 | if (changed) |
3837 | if (changed) |
3637 | { |
3838 | { |
3638 | #ifdef XPM_BACKGROUND |
3839 | #ifdef XPM_BACKGROUND |
3639 | resize_pixmap (); |
3840 | resize_pixmap (); |
3640 | #endif |
3841 | #endif |
… | |
… | |
3652 | case XTerm_logfile: |
3853 | case XTerm_logfile: |
3653 | // TODO, when secure mode? |
3854 | // TODO, when secure mode? |
3654 | break; |
3855 | break; |
3655 | |
3856 | |
3656 | case XTerm_font: |
3857 | case XTerm_font: |
|
|
3858 | op = URxvt_font; |
|
|
3859 | case URxvt_font: |
|
|
3860 | #if ENABLE_STYLES |
|
|
3861 | case URxvt_boldFont: |
|
|
3862 | case URxvt_italicFont: |
|
|
3863 | case URxvt_boldItalicFont: |
|
|
3864 | #endif |
3657 | if (query) |
3865 | if (query) |
3658 | tt_printf ("\33]%d;%-.250s%c", XTerm_font, |
3866 | tt_printf ("\33]%d;%-.250s%c", saveop, |
3659 | (Options & Opt_insecure) && TermWin.fontset->fontdesc |
3867 | (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc |
3660 | ? TermWin.fontset->fontdesc : "", |
3868 | ? TermWin.fontset[op - URxvt_font]->fontdesc : "", |
3661 | resp); |
3869 | resp); |
3662 | else |
3870 | else |
|
|
3871 | { |
|
|
3872 | const char *&res = rs[Rs_font + (op - URxvt_font)]; |
|
|
3873 | |
|
|
3874 | res = strdup (str); |
|
|
3875 | allocated.push_back ((void *)res); |
3663 | change_font (str); |
3876 | set_fonts (); |
|
|
3877 | } |
3664 | break; |
3878 | break; |
3665 | |
3879 | |
3666 | #ifndef NO_FRILLS |
3880 | #if ENABLE_FRILLS |
3667 | case XTerm_locale: |
3881 | case XTerm_locale: |
3668 | if (query) |
3882 | if (query) |
3669 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (Options & Opt_insecure) ? locale : "", resp); |
3883 | tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); |
3670 | else |
3884 | else |
3671 | { |
3885 | { |
3672 | set_locale (str); |
3886 | set_locale (str); |
3673 | # ifdef USE_XIM |
3887 | pty.set_utf8_mode (enc_utf8); |
3674 | im_cb (); |
3888 | init_xlocale (); |
3675 | # endif |
|
|
3676 | } |
3889 | } |
3677 | break; |
|
|
3678 | |
|
|
3679 | case XTerm_findfont: |
|
|
3680 | { |
|
|
3681 | int fid = TermWin.fontset->find_font (atoi (str)); |
|
|
3682 | tt_printf ("\33]%d;%d;%-.250s%c", XTerm_findfont, |
|
|
3683 | fid, |
|
|
3684 | (Options & Opt_insecure) ? (*TermWin.fontset)[fid]->name : "", |
|
|
3685 | resp); |
|
|
3686 | } |
|
|
3687 | break; |
3890 | break; |
3688 | #endif |
3891 | #endif |
3689 | |
3892 | |
3690 | #ifdef MENUBAR |
3893 | #ifdef MENUBAR |
3691 | case XTerm_Menu: |
3894 | case XTerm_Menu: |
3692 | if (Options & Opt_insecure) |
3895 | if (options & Opt_insecure) |
3693 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3896 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3694 | break; |
3897 | break; |
3695 | #endif |
3898 | #endif |
3696 | #if 0 |
3899 | #if 0 |
3697 | case XTerm_dumpscreen: /* no error notices */ |
3900 | case XTerm_dumpscreen: /* no error notices */ |
… | |
… | |
3724 | { |
3927 | { |
3725 | int state; |
3928 | int state; |
3726 | |
3929 | |
3727 | if (mode == 's') |
3930 | if (mode == 's') |
3728 | { |
3931 | { |
3729 | SavedModes |= (PrivateModes & bit); |
3932 | SavedModes |= (priv_modes & bit); |
3730 | return -1; |
3933 | return -1; |
3731 | } |
3934 | } |
3732 | else |
3935 | else |
3733 | { |
3936 | { |
3734 | if (mode == 'r') |
3937 | if (mode == 'r') |
3735 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3938 | state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ |
3736 | else |
3939 | else |
3737 | state = (mode == 't') ? ! (PrivateModes & bit) : mode; |
3940 | state = (mode == 't') ? ! (priv_modes & bit) : mode; |
3738 | PrivMode (state, bit); |
3941 | PrivMode (state, bit); |
3739 | } |
3942 | } |
3740 | |
3943 | |
3741 | return state; |
3944 | return state; |
3742 | } |
3945 | } |
… | |
… | |
3760 | { 3, PrivMode_132 }, |
3963 | { 3, PrivMode_132 }, |
3761 | { 4, PrivMode_smoothScroll }, |
3964 | { 4, PrivMode_smoothScroll }, |
3762 | { 5, PrivMode_rVideo }, |
3965 | { 5, PrivMode_rVideo }, |
3763 | { 6, PrivMode_relOrigin }, |
3966 | { 6, PrivMode_relOrigin }, |
3764 | { 7, PrivMode_Autowrap }, |
3967 | { 7, PrivMode_Autowrap }, |
|
|
3968 | // 8, bi-directional support mode |
3765 | { 9, PrivMode_MouseX10 }, |
3969 | { 9, PrivMode_MouseX10 }, |
3766 | #ifdef menuBar_esc |
3970 | #ifdef menuBar_esc |
3767 | { menuBar_esc, PrivMode_menuBar }, |
3971 | { menuBar_esc, PrivMode_menuBar }, |
3768 | #endif |
3972 | #endif |
|
|
3973 | // 18, 19 printing-related |
|
|
3974 | { 25, PrivMode_VisibleCursor }, |
3769 | #ifdef scrollBar_esc |
3975 | #ifdef scrollBar_esc |
3770 | { scrollBar_esc, PrivMode_scrollBar }, |
3976 | { scrollBar_esc, PrivMode_scrollBar }, |
3771 | #endif |
3977 | #endif |
3772 | // 18, 19 printing-related |
|
|
3773 | { 25, PrivMode_VisibleCursor }, |
|
|
3774 | // 30 show scrollbar rxvt. extension |
|
|
3775 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3978 | { 35, PrivMode_ShiftKeys }, // rxvt extension |
3776 | { 40, PrivMode_132OK }, |
3979 | { 40, PrivMode_132OK }, |
3777 | // 41 xterm more fixes NYI |
3980 | // 41 xterm more fixes NYI |
3778 | // 45 margin bell NYI |
3981 | // 45 margin bell NYI |
3779 | // 46 start logging |
3982 | // 46 start logging |
… | |
… | |
3820 | |
4023 | |
3821 | /* extra handling for values with state unkept */ |
4024 | /* extra handling for values with state unkept */ |
3822 | switch (arg[i]) |
4025 | switch (arg[i]) |
3823 | { |
4026 | { |
3824 | case 1048: /* alternative cursor save */ |
4027 | case 1048: /* alternative cursor save */ |
|
|
4028 | case 1049: |
3825 | if (Options & Opt_secondaryScreen) |
4029 | if (options & Opt_secondaryScreen) |
3826 | if (mode == 0) |
4030 | if (mode == 0) |
3827 | scr_cursor (RESTORE); |
4031 | scr_cursor (RESTORE); |
3828 | else if (mode == 1) |
4032 | else if (mode == 1) |
3829 | scr_cursor (SAVE); |
4033 | scr_cursor (SAVE); |
3830 | break; |
4034 | break; |
… | |
… | |
3841 | * within VT52 mode |
4045 | * within VT52 mode |
3842 | */ |
4046 | */ |
3843 | PrivMode (1, PrivMode_vt52); |
4047 | PrivMode (1, PrivMode_vt52); |
3844 | break; |
4048 | break; |
3845 | case 3: /* 80/132 */ |
4049 | case 3: /* 80/132 */ |
3846 | if (PrivateModes & PrivMode_132OK) |
4050 | if (priv_modes & PrivMode_132OK) |
3847 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
4051 | set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); |
3848 | break; |
4052 | break; |
3849 | case 4: /* smooth scrolling */ |
4053 | case 4: /* smooth scrolling */ |
3850 | if (state) |
4054 | if (state) |
3851 | Options &= ~Opt_jumpScroll; |
4055 | options &= ~Opt_jumpScroll; |
3852 | else |
4056 | else |
3853 | Options |= Opt_jumpScroll; |
4057 | options |= Opt_jumpScroll; |
3854 | break; |
4058 | break; |
3855 | case 5: /* reverse video */ |
4059 | case 5: /* reverse video */ |
3856 | scr_rvideo_mode (state); |
4060 | scr_rvideo_mode (state); |
3857 | break; |
4061 | break; |
3858 | case 6: /* relative/absolute origins */ |
4062 | case 6: /* relative/absolute origins */ |
… | |
… | |
3862 | scr_autowrap (state); |
4066 | scr_autowrap (state); |
3863 | break; |
4067 | break; |
3864 | /* case 8: - auto repeat, can't do on a per window basis */ |
4068 | /* case 8: - auto repeat, can't do on a per window basis */ |
3865 | case 9: /* X10 mouse reporting */ |
4069 | case 9: /* X10 mouse reporting */ |
3866 | if (state) /* orthogonal */ |
4070 | if (state) /* orthogonal */ |
3867 | PrivateModes &= ~PrivMode_MouseX11; |
4071 | priv_modes &= ~PrivMode_MouseX11; |
3868 | break; |
4072 | break; |
3869 | #ifdef menuBar_esc |
4073 | #ifdef menuBar_esc |
3870 | case menuBar_esc: |
4074 | case menuBar_esc: |
3871 | #ifdef MENUBAR |
4075 | #ifdef MENUBAR |
3872 | map_menuBar (state); |
4076 | map_menuBar (state); |
… | |
… | |
3892 | break; |
4096 | break; |
3893 | /* case 66: - application key pad */ |
4097 | /* case 66: - application key pad */ |
3894 | /* case 67: - backspace key */ |
4098 | /* case 67: - backspace key */ |
3895 | case 1000: /* X11 mouse reporting */ |
4099 | case 1000: /* X11 mouse reporting */ |
3896 | if (state) /* orthogonal */ |
4100 | if (state) /* orthogonal */ |
3897 | PrivateModes &= ~PrivMode_MouseX10; |
4101 | priv_modes &= ~PrivMode_MouseX10; |
3898 | break; |
4102 | break; |
3899 | #if 0 |
4103 | #if 0 |
3900 | case 1001: |
4104 | case 1001: |
3901 | break; /* X11 mouse highlighting */ |
4105 | break; /* X11 mouse highlighting */ |
3902 | #endif |
4106 | #endif |
3903 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4107 | case 1010: /* scroll to bottom on TTY output inhibit */ |
3904 | if (state) |
4108 | if (state) |
3905 | Options &= ~Opt_scrollTtyOutput; |
4109 | options &= ~Opt_scrollTtyOutput; |
3906 | else |
4110 | else |
3907 | Options |= Opt_scrollTtyOutput; |
4111 | options |= Opt_scrollTtyOutput; |
3908 | break; |
4112 | break; |
3909 | case 1011: /* scroll to bottom on key press */ |
4113 | case 1011: /* scroll to bottom on key press */ |
3910 | if (state) |
4114 | if (state) |
3911 | Options |= Opt_scrollTtyKeypress; |
4115 | options |= Opt_scrollTtyKeypress; |
3912 | else |
4116 | else |
3913 | Options &= ~Opt_scrollTtyKeypress; |
4117 | options &= ~Opt_scrollTtyKeypress; |
3914 | break; |
4118 | break; |
3915 | case 1047: /* secondary screen w/ clearing last */ |
4119 | case 1047: /* secondary screen w/ clearing last */ |
3916 | if (Options & Opt_secondaryScreen) |
4120 | if (options & Opt_secondaryScreen) |
3917 | if (current_screen != PRIMARY) |
4121 | if (current_screen != PRIMARY) |
3918 | scr_erase_screen (2); |
4122 | scr_erase_screen (2); |
3919 | scr_change_screen (state); |
4123 | scr_change_screen (state); |
3920 | break; |
4124 | break; |
3921 | case 1049: /* secondary screen w/ clearing first */ |
4125 | case 1049: /* secondary screen w/ clearing first */ |
3922 | scr_change_screen (state); |
4126 | scr_change_screen (state); |
3923 | if (Options & Opt_secondaryScreen) |
4127 | if (options & Opt_secondaryScreen) |
3924 | if (current_screen != PRIMARY) |
4128 | if (current_screen != PRIMARY) |
3925 | scr_erase_screen (2); |
4129 | scr_erase_screen (2); |
3926 | break; |
4130 | break; |
3927 | default: |
4131 | default: |
3928 | break; |
4132 | break; |
… | |
… | |
3954 | rendset = 0, rendstyle = ~RS_None; |
4158 | rendset = 0, rendstyle = ~RS_None; |
3955 | break; |
4159 | break; |
3956 | case 1: |
4160 | case 1: |
3957 | rendset = 1, rendstyle = RS_Bold; |
4161 | rendset = 1, rendstyle = RS_Bold; |
3958 | break; |
4162 | break; |
3959 | //case 2: // faint or second colour |
4163 | //case 2: // low intensity |
|
|
4164 | case 3: |
|
|
4165 | rendset = 1, rendstyle = RS_Italic; |
|
|
4166 | break; |
3960 | case 4: |
4167 | case 4: |
3961 | rendset = 1, rendstyle = RS_Uline; |
4168 | rendset = 1, rendstyle = RS_Uline; |
3962 | break; |
4169 | break; |
3963 | case 5: // slowly blinking |
4170 | case 5: // slowly blinking |
3964 | case 6: // rapidly blinking |
4171 | case 6: // rapidly blinking |
… | |
… | |
3976 | //case 11: // scoansi acs on, first alt font |
4183 | //case 11: // scoansi acs on, first alt font |
3977 | //case 12: // scoansi acs on, |0x80, second alt font |
4184 | //case 12: // scoansi acs on, |0x80, second alt font |
3978 | //... |
4185 | //... |
3979 | //case 19: // ninth alt font |
4186 | //case 19: // ninth alt font |
3980 | //case 20: // gothic |
4187 | //case 20: // gothic |
3981 | case 21: // disable bold, faint |
4188 | case 21: // disable bold, faint, sometimes doubly underlined (iso 8613) |
3982 | rendset = 0, rendstyle = RS_Bold; |
4189 | rendset = 0, rendstyle = RS_Bold; |
3983 | break; |
4190 | break; |
3984 | case 22: |
4191 | case 22: // normal intensity |
3985 | rendset = 0, rendstyle = RS_Bold; |
4192 | rendset = 0, rendstyle = RS_Bold; |
3986 | break; |
4193 | break; |
3987 | //case 23: disable italic |
4194 | case 23: // disable italic |
|
|
4195 | rendset = 0, rendstyle = RS_Italic; |
|
|
4196 | break; |
3988 | case 24: |
4197 | case 24: |
3989 | rendset = 0, rendstyle = RS_Uline; |
4198 | rendset = 0, rendstyle = RS_Uline; |
3990 | break; |
4199 | break; |
3991 | case 25: |
4200 | case 25: |
|
|
4201 | rendset = 0, rendstyle = RS_Blink; |
|
|
4202 | break; |
|
|
4203 | case 26: // variable spacing (iso 8613) |
3992 | rendset = 0, rendstyle = RS_Blink; |
4204 | rendset = 0, rendstyle = RS_Blink; |
3993 | break; |
4205 | break; |
3994 | case 27: |
4206 | case 27: |
3995 | rendset = 0, rendstyle = RS_RVid; |
4207 | rendset = 0, rendstyle = RS_RVid; |
3996 | break; |
4208 | break; |
… | |
… | |
4014 | case 35: |
4226 | case 35: |
4015 | case 36: |
4227 | case 36: |
4016 | case 37: |
4228 | case 37: |
4017 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); |
4229 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 30)), Color_fg); |
4018 | break; |
4230 | break; |
4019 | #ifdef TTY_256COLOR |
4231 | case 38: // set fg color, ISO 8613-6 |
4020 | case 38: |
|
|
4021 | if (nargs > i + 2 && arg[i + 1] == 5) |
4232 | if (nargs > i + 2 && arg[i + 1] == 5) |
4022 | { |
4233 | { |
4023 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); |
4234 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_fg); |
4024 | i += 2; |
4235 | i += 2; |
4025 | } |
4236 | } |
4026 | break; |
4237 | break; |
4027 | #endif |
|
|
4028 | case 39: /* default fg */ |
4238 | case 39: /* default fg */ |
4029 | scr_color (Color_fg, Color_fg); |
4239 | scr_color (Color_fg, Color_fg); |
4030 | break; |
4240 | break; |
4031 | |
4241 | |
4032 | case 40: |
4242 | case 40: |
… | |
… | |
4037 | case 45: |
4247 | case 45: |
4038 | case 46: |
4248 | case 46: |
4039 | case 47: |
4249 | case 47: |
4040 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); |
4250 | scr_color ((unsigned int) (minCOLOR + (arg[i] - 40)), Color_bg); |
4041 | break; |
4251 | break; |
4042 | #ifdef TTY_256COLOR |
4252 | case 48: // set bg color, ISO 8613-6 |
4043 | case 48: |
|
|
4044 | if (nargs > i + 2 && arg[i + 1] == 5) |
4253 | if (nargs > i + 2 && arg[i + 1] == 5) |
4045 | { |
4254 | { |
4046 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); |
4255 | scr_color ((unsigned int) (minCOLOR + arg[i + 2]), Color_bg); |
4047 | i += 2; |
4256 | i += 2; |
4048 | } |
4257 | } |
4049 | break; |
4258 | break; |
4050 | #endif |
|
|
4051 | case 49: /* default bg */ |
4259 | case 49: /* default bg */ |
4052 | scr_color (Color_bg, Color_bg); |
4260 | scr_color (Color_bg, Color_bg); |
4053 | break; |
4261 | break; |
|
|
4262 | |
|
|
4263 | //case 50: // not variable spacing |
4054 | |
4264 | |
4055 | #ifndef NO_BRIGHTCOLOR |
4265 | #ifndef NO_BRIGHTCOLOR |
4056 | case 90: |
4266 | case 90: |
4057 | case 91: /* set bright fg color */ |
4267 | case 91: /* set bright fg color */ |
4058 | case 92: |
4268 | case 92: |
4059 | case 93: |
4269 | case 93: |
4060 | case 94: |
4270 | case 94: |
4061 | case 95: |
4271 | case 95: |
4062 | case 96: |
4272 | case 96: |
4063 | case 97: |
4273 | case 97: |
4064 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), |
4274 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 90)), Color_fg); |
4065 | Color_fg); |
|
|
4066 | break; |
4275 | break; |
4067 | case 100: |
4276 | case 100: |
4068 | case 101: /* set bright bg color */ |
4277 | case 101: /* set bright bg color */ |
4069 | case 102: |
4278 | case 102: |
4070 | case 103: |
4279 | case 103: |
4071 | case 104: |
4280 | case 104: |
4072 | case 105: |
4281 | case 105: |
4073 | case 106: |
4282 | case 106: |
4074 | case 107: |
4283 | case 107: |
4075 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), |
4284 | scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); |
4076 | Color_bg); |
|
|
4077 | break; |
4285 | break; |
4078 | #endif |
4286 | #endif |
4079 | |
4287 | |
4080 | } |
4288 | } |
4081 | } |
4289 | } |
… | |
… | |
4088 | { |
4296 | { |
4089 | unicode_t ch, cmd = cmd_getc (); |
4297 | unicode_t ch, cmd = cmd_getc (); |
4090 | |
4298 | |
4091 | if (cmd == 'Q') |
4299 | if (cmd == 'Q') |
4092 | { /* query graphics */ |
4300 | { /* query graphics */ |
4093 | tt_printf ("\033G0\n"); /* no graphics */ |
4301 | tt_printf ("\033G0\012"); /* no graphics */ |
4094 | return; |
4302 | return; |
4095 | } |
4303 | } |
4096 | /* swallow other graphics sequences until terminating ':' */ |
4304 | /* swallow other graphics sequences until terminating ':' */ |
4097 | do |
4305 | do |
4098 | ch = cmd_getc (); |
4306 | ch = cmd_getc (); |
… | |
… | |
4113 | unsigned char buf[256]; |
4321 | unsigned char buf[256]; |
4114 | |
4322 | |
4115 | va_start (arg_ptr, fmt); |
4323 | va_start (arg_ptr, fmt); |
4116 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4324 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4117 | va_end (arg_ptr); |
4325 | va_end (arg_ptr); |
4118 | tt_write (buf, STRLEN (buf)); |
4326 | tt_write (buf, strlen (buf)); |
4119 | } |
4327 | } |
4120 | |
4328 | |
4121 | /* ---------------------------------------------------------------------- */ |
4329 | /* ---------------------------------------------------------------------- */ |
4122 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4330 | /* Write data to the pty as typed by the user, pasted with the mouse, |
4123 | * or generated by us in response to a query ESC sequence. |
4331 | * or generated by us in response to a query ESC sequence. |
4124 | */ |
4332 | */ |
|
|
4333 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
|
|
4334 | |
4125 | void |
4335 | void |
4126 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4336 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4127 | { |
4337 | { |
4128 | enum { MAX_PTY_WRITE = 255 }; // minimum MAX_INPUT |
4338 | if (v_buflen == 0) |
|
|
4339 | { |
|
|
4340 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4129 | |
4341 | |
4130 | if (len) |
4342 | if ((unsigned int)written == len) |
|
|
4343 | return; |
|
|
4344 | |
|
|
4345 | data += written; |
|
|
4346 | len -= written; |
4131 | { |
4347 | } |
|
|
4348 | |
|
|
4349 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
|
|
4350 | |
|
|
4351 | memcpy (v_buffer + v_buflen, data, len); |
|
|
4352 | v_buflen += len; |
|
|
4353 | |
|
|
4354 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
4355 | } |
|
|
4356 | |
|
|
4357 | void rxvt_term::pty_write () |
|
|
4358 | { |
|
|
4359 | int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); |
|
|
4360 | |
|
|
4361 | if (written > 0) |
|
|
4362 | { |
|
|
4363 | v_buflen -= written; |
|
|
4364 | |
4132 | if (v_buflen == 0) |
4365 | if (v_buflen == 0) |
4133 | { |
4366 | { |
4134 | ssize_t written = write (cmd_fd, data, min (MAX_PTY_WRITE, len)); |
|
|
4135 | |
|
|
4136 | if ((unsigned int)written == len) |
|
|
4137 | return; |
|
|
4138 | |
|
|
4139 | data += written; |
|
|
4140 | len -= written; |
|
|
4141 | } |
|
|
4142 | |
|
|
4143 | |
|
|
4144 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
|
|
4145 | |
|
|
4146 | memcpy (v_buffer + v_buflen, data, len); |
|
|
4147 | v_buflen += len; |
|
|
4148 | } |
|
|
4149 | |
|
|
4150 | for (;;) |
|
|
4151 | { |
|
|
4152 | int written = write (cmd_fd, v_buffer, min (MAX_PTY_WRITE, v_buflen)); |
|
|
4153 | |
|
|
4154 | if (written > 0) |
|
|
4155 | { |
|
|
4156 | v_buflen -= written; |
|
|
4157 | |
|
|
4158 | if (v_buflen == 0) |
|
|
4159 | { |
|
|
4160 | free (v_buffer); |
4367 | free (v_buffer); |
4161 | v_buffer = 0; |
4368 | v_buffer = 0; |
4162 | v_buflen = 0; |
4369 | v_buflen = 0; |
4163 | |
4370 | |
4164 | pty_ev.set (EVENT_READ); |
4371 | pty_ev.set (EVENT_READ); |
4165 | return; |
|
|
4166 | } |
|
|
4167 | |
|
|
4168 | memmove (v_buffer, v_buffer + written, v_buflen); |
|
|
4169 | } |
|
|
4170 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
4171 | // original code just ignores this... |
|
|
4172 | destroy (); |
|
|
4173 | else |
|
|
4174 | { |
|
|
4175 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
|
|
4176 | return; |
4372 | return; |
4177 | } |
4373 | } |
|
|
4374 | |
|
|
4375 | memmove (v_buffer, v_buffer + written, v_buflen); |
4178 | } |
4376 | } |
|
|
4377 | else if (written != -1 || (errno != EAGAIN && errno != EINTR)) |
|
|
4378 | // original code just ignores this... |
|
|
4379 | destroy (); |
4179 | } |
4380 | } |
4180 | |
4381 | |
4181 | /*----------------------- end-of-file (C source) -----------------------*/ |
4382 | /*----------------------- end-of-file (C source) -----------------------*/ |
4182 | |
4383 | |