ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.277 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.422 by root, Tue Oct 28 04:45:59 2008 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
273 } 279 }
274 280
275 iso14755buf = 0; 281 iso14755buf = 0;
276} 282}
277 283
278int 284static int
279rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
280{ 286{
281 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
284 { 290 {
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
339static inline int
340map_function_key (KeySym keysym)
341{
342 int param = 0;
343
344 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
345 {
346 param = 11 + keysym - XK_F1;
347 if (keysym >= XK_F17)
348 param += 4;
349 else if (keysym >= XK_F15)
350 param += 3;
351 else if (keysym >= XK_F11)
352 param += 2;
353 else if (keysym >= XK_F6)
354 param += 1;
355 }
356 else
357 switch (keysym)
358 {
359 case XK_Find:
360 param = 1;
361 break;
362 case XK_Insert:
363 param = 2;
364 break;
365#ifdef DXK_Remove
366 case DXK_Remove:
367#endif
368 case XK_Execute:
369 param = 3;
370 break;
371 case XK_Select:
372 param = 4;
373 break;
374#ifndef UNSHIFTED_SCROLLKEYS
375 case XK_Prior:
376 param = 5;
377 break;
378 case XK_Next:
379 param = 6;
380 break;
381 case XK_Home:
382 param = 7;
383 break;
384 case XK_End:
385 param = 8;
386 break;
387#endif
388 case XK_Help:
389 param = 28;
390 break;
391 case XK_Menu:
392 param = 29;
393 break;
394 }
395 return param;
396}
397
298void 398void
299rxvt_term::lookup_key (XKeyEvent &ev) 399rxvt_term::key_press (XKeyEvent &ev)
300{ 400{
301 int ctrl, meta, shft, len; 401 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 402 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 403 int valid_keysym;
308 char kbuf[KBUFSZ]; 404 char kbuf[KBUFSZ];
405
406#if ISO_14755
407 if (iso14755buf & ISO_14755_52)
408 return;
409#endif
309 410
310 /* 411 /*
311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 412 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
312 * escape sequence to toggle the Keypad. 413 * escape sequence to toggle the Keypad.
313 * 414 *
… …
318 meta = ev.state & ModMetaMask; 419 meta = ev.state & ModMetaMask;
319 420
320 if (numlock_state || (ev.state & ModNumLockMask)) 421 if (numlock_state || (ev.state & ModNumLockMask))
321 { 422 {
322 numlock_state = (ev.state & ModNumLockMask); 423 numlock_state = (ev.state & ModNumLockMask);
323 PrivMode ((!numlock_state), PrivMode_aplKP); 424 set_privmode (PrivMode_aplKP, !numlock_state);
324 } 425 }
325 426
326 kbuf[0] = 0; 427 kbuf[0] = 0;
327 428
328#ifdef USE_XIM 429#ifdef USE_XIM
… …
493# if ISO_14755 594# if ISO_14755
494 iso14755_51 (0); 595 iso14755_51 (0);
495# endif 596# endif
496 return; 597 return;
497 } 598 }
599 else if (keysym == XK_BackSpace)
600 {
601 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
602# if ISO_14755
603 iso14755_51 (iso14755buf & ISO_14755_MASK);
604# endif
605 return;
606 }
498 else if ((hv = hex_keyval (ev)) >= 0) 607 else if ((hv = hex_keyval (ev)) >= 0)
499 { 608 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 609 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 610 | hv | ISO_14755_51;
502# if ISO_14755 611# if ISO_14755
… …
504# endif 613# endif
505 return; 614 return;
506 } 615 }
507 else 616 else
508 { 617 {
509# if ENABLE_OVERLAY 618# if ISO_14755
510 scr_overlay_off (); 619 scr_overlay_off ();
511# endif 620# endif
512 iso14755buf = 0; 621 iso14755buf = 0;
513 } 622 }
514 } 623 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 624 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 625 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 626 if (!(iso14755buf & ISO_14755_STARTED))
518 { 627 {
519 iso14755buf |= ISO_14755_STARTED; 628 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 629# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 630 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 631 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 632# endif
524 } 633 }
525#endif 634#endif
526 635
527#ifdef PRINTPIPE 636#ifdef PRINTPIPE
528 if (keysym == XK_Print) 637 if (keysym == XK_Print)
529 { 638 {
530 scr_printscreen (ctrl | shft); 639 scr_printscreen (ctrl | shft);
531 return; 640 return;
532 } 641 }
533#endif 642#endif
534 643
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 644 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 645 {
646 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
647 unsigned int newlen = 1;
648
649 switch (translate_keypad (keysym, kp))
537 { 650 {
651#ifndef NO_BACKSPACE_KEY
652 case XK_BackSpace:
653 if (priv_modes & PrivMode_HaveBackSpace)
654 {
655 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
656 ^ !!ctrl) ? '\b' : '\177';
657 kbuf[1] = '\0';
658 }
659 else
660 strcpy (kbuf, rs[Rs_backspace_key]);
661 break;
662#endif
663#ifndef NO_DELETE_KEY
664 case XK_Delete:
665 strcpy (kbuf, rs[Rs_delete_key]);
666 break;
667#endif
668 case XK_Tab:
669 if (shft)
670 strcpy (kbuf, "\033[Z");
671 else
672 {
673#ifdef CTRL_TAB_MAKES_META
674 if (ctrl)
675 meta = 1;
676#endif
677#ifdef MOD4_TAB_MAKES_META
678 if (ev.state & Mod4Mask)
679 meta = 1;
680#endif
538 newlen = 1; 681 newlen = 0;
539 switch (keysym) 682 }
683 break;
684
685 case XK_Up: /* "\033[A" */
686 case XK_Down: /* "\033[B" */
687 case XK_Right: /* "\033[C" */
688 case XK_Left: /* "\033[D" */
689 strcpy (kbuf, "\033[Z");
690 kbuf[2] = "DACB"[keysym - XK_Left];
691 /* do Shift first */
692 if (shft)
693 kbuf[2] = "dacb"[keysym - XK_Left];
694 else if (ctrl)
695 {
696 kbuf[1] = 'O';
697 kbuf[2] = "dacb"[keysym - XK_Left];
698 }
699 else if (priv_modes & PrivMode_aplCUR)
700 kbuf[1] = 'O';
701 break;
702
703 case XK_KP_Enter:
704 /* allow shift to override */
705 if (kp)
706 {
707 strcpy (kbuf, "\033OM");
708 break;
709 }
710
711 /* FALLTHROUGH */
712
713 case XK_Return:
714 if (priv_modes & PrivMode_LFNL)
715 {
716 kbuf[0] = '\015';
717 kbuf[1] = '\012';
718 kbuf[2] = '\0';
719 }
720 else
721 {
722 kbuf[0] = '\015';
723 kbuf[1] = '\0';
724 }
725 break;
726
727 case XK_KP_F1: /* "\033OP" */
728 case XK_KP_F2: /* "\033OQ" */
729 case XK_KP_F3: /* "\033OR" */
730 case XK_KP_F4: /* "\033OS" */
731 strcpy (kbuf, "\033OP");
732 kbuf[2] += (keysym - XK_KP_F1);
733 break;
734
735 case XK_KP_Multiply: /* "\033Oj" : "*" */
736 case XK_KP_Add: /* "\033Ok" : "+" */
737 case XK_KP_Separator: /* "\033Ol" : "," */
738 case XK_KP_Subtract: /* "\033Om" : "-" */
739 case XK_KP_Decimal: /* "\033On" : "." */
740 case XK_KP_Divide: /* "\033Oo" : "/" */
741 case XK_KP_0: /* "\033Op" : "0" */
742 case XK_KP_1: /* "\033Oq" : "1" */
743 case XK_KP_2: /* "\033Or" : "2" */
744 case XK_KP_3: /* "\033Os" : "3" */
745 case XK_KP_4: /* "\033Ot" : "4" */
746 case XK_KP_5: /* "\033Ou" : "5" */
747 case XK_KP_6: /* "\033Ov" : "6" */
748 case XK_KP_7: /* "\033Ow" : "7" */
749 case XK_KP_8: /* "\033Ox" : "8" */
750 case XK_KP_9: /* "\033Oy" : "9" */
751 /* allow shift to override */
752 if (kp)
753 {
754 strcpy (kbuf, "\033Oj");
755 kbuf[2] += (keysym - XK_KP_Multiply);
756 }
757 else
758 {
759 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
760 kbuf[1] = '\0';
761 }
762 break;
763
764 default:
540 { 765 {
541#ifndef NO_BACKSPACE_KEY 766 int param = map_function_key (keysym);
542 case XK_BackSpace: 767 if (param > 0)
543 if (priv_modes & PrivMode_HaveBackSpace) 768 sprintf (kbuf,"\033[%d~", param);
544 {
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0';
548 }
549 else 769 else
550 strcpy (kbuf, key_backspace);
551 break;
552#endif
553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete:
565 strcpy (kbuf, key_delete);
566 break;
567#endif
568 case XK_Tab:
569 if (shft)
570 strcpy (kbuf, "\033[Z");
571 else
572 {
573#ifdef CTRL_TAB_MAKES_META
574 if (ctrl)
575 meta = 1;
576#endif
577#ifdef MOD4_TAB_MAKES_META
578 if (ev.state & Mod4Mask)
579 meta = 1;
580#endif
581 newlen = 0;
582 }
583 break;
584
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z");
606 kbuf[2] = "DACB"[keysym - XK_Left];
607 /* do Shift first */
608 if (shft)
609 kbuf[2] = "dacb"[keysym - XK_Left];
610 else if (ctrl)
611 {
612 kbuf[1] = 'O';
613 kbuf[2] = "dacb"[keysym - XK_Left];
614 }
615 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O';
617 break;
618
619#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior:
631 strcpy (kbuf, "\033[5~");
632 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next:
644 strcpy (kbuf, "\033[6~");
645 break;
646#endif
647 case XK_KP_Enter:
648 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
650 {
651 strcpy (kbuf, "\033OM");
652 break;
653 }
654
655 /* FALLTHROUGH */
656
657 case XK_Return:
658 if (priv_modes & PrivMode_LFNL)
659 {
660 kbuf[0] = '\015';
661 kbuf[1] = '\012';
662 kbuf[2] = '\0';
663 }
664 else
665 {
666 kbuf[0] = '\015';
667 kbuf[1] = '\0';
668 }
669 break;
670
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP");
682 kbuf[2] += (keysym - XK_KP_F1);
683 break;
684
685 case XK_KP_Multiply: /* "\033Oj" : "*" */
686 case XK_KP_Add: /* "\033Ok" : "+" */
687 case XK_KP_Separator: /* "\033Ol" : "," */
688 case XK_KP_Subtract: /* "\033Om" : "-" */
689 case XK_KP_Decimal: /* "\033On" : "." */
690 case XK_KP_Divide: /* "\033Oo" : "/" */
691 case XK_KP_0: /* "\033Op" : "0" */
692 case XK_KP_1: /* "\033Oq" : "1" */
693 case XK_KP_2: /* "\033Or" : "2" */
694 case XK_KP_3: /* "\033Os" : "3" */
695 case XK_KP_4: /* "\033Ot" : "4" */
696 case XK_KP_5: /* "\033Ou" : "5" */
697 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
703 {
704 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply);
706 }
707 else
708 {
709 kbuf[0] = ('*' + (keysym - XK_KP_Multiply));
710 kbuf[1] = '\0';
711 }
712 break;
713
714 case XK_Find:
715 strcpy (kbuf, "\033[1~");
716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert:
729 strcpy (kbuf, "\033[2~");
730 break;
731#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove:
733 /* FALLTHROUGH */
734#endif
735 case XK_Execute:
736 strcpy (kbuf, "\033[3~");
737 break;
738 case XK_Select:
739 strcpy (kbuf, "\033[4~");
740 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End:
752 strcpy (kbuf, KS_END);
753 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home:
765 strcpy (kbuf, KS_HOME);
766 break;
767
768#define FKEY(n, fkey) \
769 sprintf ((char *)kbuf,"\033[%2d~", (int) ((n) + (keysym - fkey)))
770
771 case XK_F1: /* "\033[11~" */
772 case XK_F2: /* "\033[12~" */
773 case XK_F3: /* "\033[13~" */
774 case XK_F4: /* "\033[14~" */
775 case XK_F5: /* "\033[15~" */
776 FKEY (11, XK_F1);
777 break;
778 case XK_F6: /* "\033[17~" */
779 case XK_F7: /* "\033[18~" */
780 case XK_F8: /* "\033[19~" */
781 case XK_F9: /* "\033[20~" */
782 case XK_F10: /* "\033[21~" */
783 FKEY (17, XK_F6);
784 break;
785 case XK_F11: /* "\033[23~" */
786 case XK_F12: /* "\033[24~" */
787 case XK_F13: /* "\033[25~" */
788 case XK_F14: /* "\033[26~" */
789 FKEY (23, XK_F11);
790 break;
791 case XK_F15: /* "\033[28~" */
792 case XK_F16: /* "\033[29~" */
793 FKEY (28, XK_F15);
794 break;
795 case XK_Help: /* "\033[28~" */
796 FKEY (28, XK_Help);
797 break;
798 case XK_Menu: /* "\033[29~" */
799 FKEY (29, XK_Menu);
800 break;
801 case XK_F17: /* "\033[31~" */
802 case XK_F18: /* "\033[32~" */
803 case XK_F19: /* "\033[33~" */
804 case XK_F20: /* "\033[34~" */
805 case XK_F21: /* "\033[35~" */
806 case XK_F22: /* "\033[36~" */
807 case XK_F23: /* "\033[37~" */
808 case XK_F24: /* "\033[38~" */
809 case XK_F25: /* "\033[39~" */
810 case XK_F26: /* "\033[40~" */
811 case XK_F27: /* "\033[41~" */
812 case XK_F28: /* "\033[42~" */
813 case XK_F29: /* "\033[43~" */
814 case XK_F30: /* "\033[44~" */
815 case XK_F31: /* "\033[45~" */
816 case XK_F32: /* "\033[46~" */
817 case XK_F33: /* "\033[47~" */
818 case XK_F34: /* "\033[48~" */
819 case XK_F35: /* "\033[49~" */
820 FKEY (31, XK_F17);
821 break;
822#undef FKEY
823 default:
824 newlen = 0; 770 newlen = 0;
825 break;
826 } 771 }
827 772 break;
828 if (newlen)
829 len = strlen (kbuf);
830 } 773 }
774
775 if (newlen)
776 len = strlen (kbuf);
831 777
832 /* 778 /*
833 * Pass meta for all function keys, if 'meta' option set 779 * Pass meta for all function keys, if 'meta' option set
834 */ 780 */
835#ifdef META8_OPTION 781#ifdef META8_OPTION
… …
870 return; 816 return;
871 817
872 if (len <= 0) 818 if (len <= 0)
873 return; /* not mapped */ 819 return; /* not mapped */
874 820
875 if (OPTION (Opt_scrollTtyKeypress)) 821 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 822 if (view_start)
877 { 823 {
878 view_start = 0; 824 view_start = 0;
879 want_refresh = 1; 825 want_refresh = 1;
880 } 826 }
… …
902 { 848 {
903 const char ch = C0_ESC; 849 const char ch = C0_ESC;
904 tt_write (&ch, 1); 850 tt_write (&ch, 1);
905 } 851 }
906 852
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 853 tt_write (kbuf, (unsigned int)len);
918} 854}
919/*}}} */ 855
856void
857rxvt_term::key_release (XKeyEvent &ev)
858{
859#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
860 KeySym keysym;
861
862 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
863#endif
864
865#if ENABLE_FRILLS || ISO_14755
866 // ISO 14755 support
867 if (iso14755buf)
868 if (iso14755buf & ISO_14755_52)
869 {
870# if ISO_14755
871 scr_overlay_off ();
872# endif
873# if ISO_14755
874 // iso14755 part 5.2 handling: release time
875 // first: controls
876 if ((ev.state & ControlMask)
877 && ((keysym >= 0x40 && keysym <= 0x5f)
878 || (keysym >= 0x61 && keysym <= 0x7f)))
879 {
880 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
881 commit_iso14755 ();
882
883 return;
884 }
885
886 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
887 if (i[0] == keysym)
888 {
889 iso14755buf = ISO_14755_51 | i[1];
890 commit_iso14755 ();
891
892 return;
893 }
894
895 scr_bell ();
896# endif
897 iso14755buf = 0;
898
899 return;
900 }
901 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
902 {
903# if ISO_14755
904 scr_overlay_off ();
905# endif
906 if (iso14755buf & ISO_14755_51)
907 commit_iso14755 ();
908#if ISO_14755
909 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
910 {
911 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
912
913 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
914 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
915 }
916# endif
917 else
918 iso14755buf = 0;
919 }
920#endif
921
922 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
923 return;
924
925#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
926 if (!(ev.state & ControlMask))
927 slip_wheel_ev.stop ();
928 else if (keysym == XK_Control_L || keysym == XK_Control_R)
929 mouse_slip_wheel_speed = 0;
930#endif
931}
920 932
921#if defined (KEYSYM_RESOURCE) 933#if defined (KEYSYM_RESOURCE)
922unsigned int 934unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 935rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 936{
… …
954void 966void
955rxvt_term::flush () 967rxvt_term::flush ()
956{ 968{
957 flush_ev.stop (); 969 flush_ev.stop ();
958 970
959#ifdef TRANSPARENT 971#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 972 if (bgPixmap.check_clearChanged ())
961 { 973 {
962 want_full_refresh = 0; 974// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 975 scr_touch (false);
965 } 976 }
966#endif 977#endif
967 978
968 if (want_refresh) 979 if (want_refresh)
… …
1004 } 1015 }
1005 while (row < end_row); 1016 while (row < end_row);
1006 } 1017 }
1007 1018
1008 scr_refresh (); 1019 scr_refresh ();
1009 scrollbar_show (1); 1020 scrollBar.show (1);
1010#ifdef USE_XIM 1021#ifdef USE_XIM
1011 IMSendSpot (); 1022 IMSendSpot ();
1012#endif 1023#endif
1013 } 1024 }
1014 1025
1015 display->flush (); 1026 display->flush ();
1016} 1027}
1017 1028
1029/* checks wether a refresh is requested and starts the refresh timer */
1018void 1030void
1019rxvt_term::check_cb (check_watcher &w) 1031rxvt_term::refresh_check ()
1032{
1033 if (want_refresh && !flush_ev.is_active ())
1034 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1035
1036 display->flush ();
1037}
1038
1039void
1040rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1041{
1021 make_current (); 1042 make_current ();
1022 1043
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1044 refresh_count = 0;
1036 flush (); 1045 flush ();
1037} 1046}
1038 1047
1039#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1040void 1049void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1050rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1051{
1043 hidden_cursor = !hidden_cursor; 1052 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1053 want_refresh = 1;
1045 1054 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1055}
1048#endif 1056#endif
1049 1057
1050#ifdef TEXT_BLINK 1058#ifdef TEXT_BLINK
1051void 1059void
1052rxvt_term::text_blink_cb (time_watcher &w) 1060rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1061{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1062 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1063 {
1056 hidden_text = !hidden_text; 1064 hidden_text = !hidden_text;
1057 want_refresh = 1; 1065 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1066 refresh_check ();
1059 } 1067 }
1068 else
1069 w.stop ();
1060} 1070}
1061#endif 1071#endif
1062 1072
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1073#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1074void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1075rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1076{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1077 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1078 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1069 { 1079 {
1070 want_refresh = 1; 1080 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1081 refresh_check ();
1072 } 1082 }
1083 else
1084 w.stop ();
1073} 1085}
1074#endif 1086#endif
1075 1087
1076#ifdef SELECTION_SCROLLING 1088#ifdef SELECTION_SCROLLING
1077void 1089void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1090rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1091{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1092 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1093 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1094 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1095 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1085 } 1097 }
1098 else
1099 w.stop ();
1086} 1100}
1087#endif 1101#endif
1088 1102
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1103#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1104void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1105rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1106{
1093 if (mouse_slip_wheel_speed == 0 1107 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1108 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1109 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 refresh_check ();
1111 }
1112
1113 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1114 {
1115 mouse_slip_wheel_speed = 0;
1116 w.stop ();
1117 }
1103} 1118}
1104#endif 1119#endif
1105 1120
1106#if HAVE_SCHED_YIELD 1121#if LINUX_YIELD_HACK
1107static struct event_handler 1122static struct event_handler
1108{ 1123{
1109 check_watcher cw_yield; 1124 ev::prepare yield_ev;
1110 1125
1111 void yield (check_watcher &w) 1126 void yield_cb (ev::prepare &w, int revents)
1112 { 1127 {
1113 sched_yield (); 1128 // this should really be sched_yield(), but the linux guys thought
1129 // that giving a process calling sched_yield () less cpu time than
1130 // ones with high nice levels is a useful thing to do. It surely is is
1131 // allowed by the sus... as is returning ENOSYS.
1132 // since the linux guys additionally thought that breaking the only
1133 // known workaroudn against their unusable sched_yield hack is cool,
1134 // we just nanosleep a bit and hope for the best.
1135
1136 struct timespec ts = { 0, 1000 };
1137 nanosleep (&ts, 0);
1138
1114 w.stop (); 1139 w.stop ();
1115 } 1140 }
1116 1141
1117 event_handler () 1142 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1143 : yield_ev (this, &event_handler::yield_cb)
1119 { 1144 {
1120 } 1145 }
1121} event_handler; 1146} event_handler;
1122#endif 1147#endif
1123 1148
… …
1143 cmdbuf_endp += r; 1168 cmdbuf_endp += r;
1144 return true; 1169 return true;
1145 } 1170 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1171 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1172 {
1148#if HAVE_SCHED_YIELD 1173#if LINUX_YIELD_HACK
1149 if (display->is_local) 1174 if (display->is_local)
1150 event_handler.cw_yield.start (); 1175 event_handler.yield_ev.start ();
1151#endif 1176#endif
1152 } 1177 }
1153 else 1178 else
1154 { 1179 {
1155 pty_ev.stop (); 1180 pty_ev.stop ();
1156 1181
1157 if (!OPTION (Opt_hold)) 1182 if (!option (Opt_hold))
1158 destroy (); 1183 destroy ();
1159 } 1184 }
1160 1185
1161 return false; 1186 return false;
1162} 1187}
1163 1188
1164void 1189void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1190rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1191{
1167 make_current (); 1192 make_current ();
1168 1193
1169 if (revents & EVENT_READ) 1194 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1195 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1196 for (int i = CBUFCNT; i-- && pty_fill (); )
1172 if (cmd_parse ()) 1197 cmd_parse ();
1173 break;
1174 1198
1175 if (revents & EVENT_WRITE) 1199 if (revents & ev::WRITE)
1176 pty_write (); 1200 pty_write ();
1201
1202 refresh_check ();
1177} 1203}
1178 1204
1179void 1205void
1180rxvt_term::pointer_unblank () 1206rxvt_term::pointer_unblank ()
1181{ 1207{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1208 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1209 recolour_cursor ();
1184 1210
1185#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1212 hidden_pointer = 0;
1187 1213
1188 if (OPTION (Opt_pointerBlank)) 1214 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1215 pointer_ev.start (pointerBlankDelay);
1190#endif 1216#endif
1191} 1217}
1192 1218
1193#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1194void 1220void
1195rxvt_term::pointer_blank () 1221rxvt_term::pointer_blank ()
1196{ 1222{
1197 if (!OPTION (Opt_pointerBlank)) 1223 if (!option (Opt_pointerBlank))
1198 return; 1224 return;
1199 1225
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1226 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1227 XFlush (dpy);
1202 1228
1203 hidden_pointer = 1; 1229 hidden_pointer = 1;
1204} 1230}
1205 1231
1206void 1232void
1207rxvt_term::pointer_cb (time_watcher &w) 1233rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1234{
1209 make_current (); 1235 make_current ();
1210 1236
1211 pointer_blank (); 1237 pointer_blank ();
1212} 1238}
… …
1215void 1241void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1242rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1243{
1218 int button_number, key_state = 0; 1244 int button_number, key_state = 0;
1219 int x, y; 1245 int x, y;
1246 int code = 32;
1220 1247
1221 x = ev.x; 1248 x = Pixel2Col (ev.x);
1222 y = ev.y; 1249 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1250 if (ev.type == MotionNotify)
1251 {
1252 if (x == mouse_row && y == mouse_col)
1253 return;
1254 mouse_row = x;
1255 mouse_col = y;
1256 code += 32;
1257 }
1224 1258
1225 if (MEvent.button == AnyButton) 1259 if (MEvent.button == AnyButton)
1226 button_number = 3; 1260 button_number = 3;
1227 else 1261 else
1228 { 1262 {
… …
1274 x + 1, 1308 x + 1,
1275 y + 1); 1309 y + 1);
1276#endif 1310#endif
1277 1311
1278 tt_printf ("\033[M%c%c%c", 1312 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1313 (code + button_number + key_state),
1280 (32 + x + 1), 1314 (32 + x + 1),
1281 (32 + y + 1)); 1315 (32 + y + 1));
1282} 1316}
1283 1317
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293
1294/*{{{ process an X event */ 1318/*{{{ process an X event */
1295void 1319void
1296rxvt_term::x_cb (XEvent &ev) 1320rxvt_term::x_cb (XEvent &ev)
1297{ 1321{
1298 make_current (); 1322 make_current ();
1299 1323
1300 dDisp; 1324 dLocal (Display *, dpy);
1301 1325
1302 if (ev.xany.window == vt 1326 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1327 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1328 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1329 return;
… …
1310 unsigned int unused_mask; 1334 unsigned int unused_mask;
1311 1335
1312 switch (ev.type) 1336 switch (ev.type)
1313 { 1337 {
1314 case KeyPress: 1338 case KeyPress:
1315#if ISO_14755 1339 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1340 break;
1321 1341
1322 case KeyRelease: 1342 case KeyRelease:
1323 { 1343 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1344 break;
1395 }
1396 1345
1397 case ButtonPress: 1346 case ButtonPress:
1398 button_press (ev.xbutton); 1347 button_press (ev.xbutton);
1399 break; 1348 break;
1400 1349
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1364 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1365 destroy ();
1417 } 1366 }
1418#if ENABLE_EWMH 1367#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1368 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1369 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1370 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1371 &ev);
1423#endif 1372#endif
1424 } 1373 }
1425 } 1374 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1380 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1381 focus_out ();
1433 } 1382 }
1434#endif 1383#endif
1435 } 1384 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1385 break;
1441 1386
1442 /* 1387 /*
1443 * XXX: this is not the _current_ arrangement 1388 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1389 * Here's my conclusion:
… …
1463 break; 1408 break;
1464 } 1409 }
1465 break; 1410 break;
1466 1411
1467 case FocusIn: 1412 case FocusIn:
1413 if (ev.xfocus.detail != NotifyInferior
1414 && ev.xfocus.detail != NotifyPointer
1415 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1416 focus_in ();
1469 break; 1417 break;
1470 1418
1471 case FocusOut: 1419 case FocusOut:
1420 if (ev.xfocus.detail != NotifyInferior
1421 && ev.xfocus.detail != NotifyPointer
1422 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1423 focus_out ();
1473 break; 1424 break;
1474 1425
1475 case ConfigureNotify: 1426 case ConfigureNotify:
1427 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1428 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1429 szHint.width, szHint.height);*/
1476 if (ev.xconfigure.window == parent[0]) 1430 if (ev.xconfigure.window == parent[0])
1477 { 1431 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1432 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1433 ;
1480 1434
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1435 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1436 {
1483 seen_resize = 1; 1437 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1438 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1439 }
1440 else
1441 {
1442#ifdef HAVE_BG_PIXMAP
1443 if (bgPixmap.window_position_sensitive ())
1444 {
1445 if (mapped)
1446 update_background ();
1447 else
1448 bgPixmap.invalidate ();
1449 }
1450#endif
1451 }
1486 1452
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1454 }
1494 break; 1455 break;
1495 1456
1496 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500 1462
1501 break; 1463 break;
1502 1464
1503 case SelectionClear: 1465 case SelectionClear:
1504 selection_clear (); 1466 selection_clear ();
… …
1512 case SelectionRequest: 1474 case SelectionRequest:
1513 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1514 break; 1476 break;
1515 1477
1516 case MapNotify: 1478 case MapNotify:
1479#ifdef HAVE_BG_PIXMAP
1480 /* This is needed spcifically to fix the case of no window manager or a
1481 * non-reparenting window manager. In those cases we never get first
1482 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1483 * care of multiplicity of ConfigureNotify events arriwing while WM does
1484 * reparenting.
1485 * We should not render background immidiately, as there could be several
1486 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1487 * by scheduling background redraw as soon as we can, but giving a short
1488 * bit of time for ConfigureNotifies to arrive.
1489 * We should render background PRIOR to drawing any text, but AFTER all
1490 * of ConfigureNotifys for the best results.
1491 */
1492 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1493 update_background_ev.start (0.025);
1494#endif
1517 mapped = 1; 1495 mapped = 1;
1518#ifdef TEXT_BLINK 1496#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1497 text_blink_ev.start ();
1520#endif 1498#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1500 break;
1523 1501
1524 case UnmapNotify: 1502 case UnmapNotify:
… …
1526#ifdef TEXT_BLINK 1504#ifdef TEXT_BLINK
1527 text_blink_ev.stop (); 1505 text_blink_ev.stop ();
1528#endif 1506#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1508 break;
1531
1532#ifdef TRANSPARENT
1533 case ReparentNotify:
1534 rootwin_cb (ev);
1535 break;
1536#endif /* TRANSPARENT */
1537 1509
1538 case GraphicsExpose: 1510 case GraphicsExpose:
1539 case Expose: 1511 case Expose:
1540 if (ev.xany.window == vt) 1512 if (ev.xany.window == vt)
1541 { 1513 {
1542 do 1514 do
1515 {
1543 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1544 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1519 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546 1520
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1521 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548 1522
1549 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1523 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1524 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1525 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1526 ev.xexpose.width, ev.xexpose.height, False);
1527 }
1552 1528
1553 want_refresh = 1; 1529 want_refresh = 1;
1554 } 1530 }
1555 else 1531 else
1556 { 1532 {
1557 XEvent unused_event; 1533 XEvent unused_event;
1558 1534
1559 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1535 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1560 ; 1536 ;
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1537 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1562 ; 1538 ;
1563 1539
1564 if (isScrollbarWindow (ev.xany.window)) 1540 if (scrollBar.state && ev.xany.window == scrollBar.win)
1565 { 1541 {
1566 scrollBar.setIdle (); 1542 scrollBar.state = STATE_IDLE;
1567 scrollbar_show (0); 1543 scrollBar.show (0);
1568 } 1544 }
1569
1570#ifdef TRANSPARENT
1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (disp, ev.xany.window);
1573#endif
1574 } 1545 }
1575 break; 1546 break;
1576 1547
1577 case MotionNotify: 1548 case MotionNotify:
1578#ifdef POINTER_BLANK 1549#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1550 if (hidden_pointer)
1580 pointer_unblank (); 1551 pointer_unblank ();
1581#endif 1552#endif
1553 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1554 || priv_modes & PrivMode_MouseAnyEvent)
1555 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1557 break;
1584 1558
1585 if (ev.xany.window == vt) 1559 if (ev.xany.window == vt)
1586 { 1560 {
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1561 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1562 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589 ; // nop 1563 ; // nop
1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1564 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1591 { 1565 {
1592 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1566 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1593 ; 1567 ;
1594 1568
1595 XQueryPointer (disp, vt, 1569 XQueryPointer (dpy, vt,
1596 &unused_root, &unused_child, 1570 &unused_root, &unused_child,
1597 &unused_root_x, &unused_root_y, 1571 &unused_root_x, &unused_root_y,
1598 &ev.xbutton.x, &ev.xbutton.y, 1572 &ev.xbutton.x, &ev.xbutton.y,
1599 &ev.xbutton.state); 1573 &ev.xbutton.state);
1600#ifdef MOUSE_THRESHOLD 1574#ifdef MOUSE_THRESHOLD
… …
1620 int dist; 1594 int dist;
1621 1595
1622 /* don't clobber the current delay if we are 1596 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1597 * already in the middle of scrolling.
1624 */ 1598 */
1625 if (!sel_scroll_ev.active) 1599 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1600 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1601
1628 /* save the event params so we can highlight 1602 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1603 * the selection in the pending-scroll loop
1630 */ 1604 */
1631 selection_save_x = ev.xbutton.x; 1605 selection_save_x = ev.xbutton.x;
… …
1653 else 1627 else
1654 { 1628 {
1655 /* we are within the text window, so we 1629 /* we are within the text window, so we
1656 * shouldn't be scrolling 1630 * shouldn't be scrolling
1657 */ 1631 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1632 sel_scroll_ev.stop();
1660 } 1633 }
1661#endif 1634#endif
1662#ifdef MOUSE_THRESHOLD 1635#ifdef MOUSE_THRESHOLD
1663 } 1636 }
1664#endif 1637#endif
1665 } 1638 }
1666 } 1639 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1640 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1668 { 1641 {
1669 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1642 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1643 MotionNotify, &ev))
1671 ; 1644 ;
1672 1645
1673 XQueryPointer (disp, scrollBar.win, 1646 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1647 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1648 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1649 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1650 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1651 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1652 scrollBar.size ());
1680 want_refresh = 1; 1653 want_refresh = 1;
1681 refresh_limit = 0;
1682 scrollbar_show (1); 1654 scrollBar.show (1);
1683 } 1655 }
1684 break; 1656 break;
1685 } 1657 }
1686 1658
1687skip_switch: ;
1688
1689#if defined(CURSOR_BLINK) 1659#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1660 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 { 1661 {
1692 if (hidden_cursor) 1662 if (hidden_cursor)
1693 { 1663 {
1694 hidden_cursor = 0; 1664 hidden_cursor = 0;
1695 want_refresh = 1; 1665 want_refresh = 1;
1696 } 1666 }
1697 1667
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1668 cursor_blink_ev.again ();
1699 } 1669 }
1700#endif 1670#endif
1701 1671
1702#if defined(POINTER_BLANK) 1672#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1673 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1674 {
1705 if (ev.type == MotionNotify 1675 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress 1676 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease) 1677 || ev.type == ButtonRelease)
1708 if (hidden_pointer) 1678 if (hidden_pointer)
… …
1710 1680
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1681 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1682 pointer_blank ();
1713 } 1683 }
1714#endif 1684#endif
1685
1686 refresh_check ();
1687}
1688
1689void
1690rxvt_term::set_urgency (bool enable)
1691{
1692 if (enable == urgency_hint)
1693 return;
1694
1695 if (XWMHints *h = XGetWMHints (dpy, parent[0]))
1696 {
1697 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1698 XSetWMHints (dpy, parent[0], h);
1699 urgency_hint = enable;
1700 }
1715} 1701}
1716 1702
1717void 1703void
1718rxvt_term::focus_in () 1704rxvt_term::focus_in ()
1719{ 1705{
1720 if (!focus) 1706 if (!focus)
1721 { 1707 {
1722 focus = 1; 1708 focus = 1;
1723 want_refresh = 1; 1709 want_refresh = 1;
1724 1710
1725 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1726
1727#if USE_XIM 1711#if USE_XIM
1728 if (Input_Context != NULL) 1712 if (Input_Context != NULL)
1729 { 1713 {
1730 IMSetStatusPosition (); 1714 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1715 XSetICFocus (Input_Context);
1732 } 1716 }
1733#endif 1717#endif
1734#if CURSOR_BLINK 1718#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink)) 1719 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1720 cursor_blink_ev.again ();
1737#endif 1721#endif
1738#if OFF_FOCUS_FADING 1722#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1723 if (rs[Rs_fade])
1740 { 1724 {
1741 pix_colors = pix_colors_focused; 1725 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1726 scr_recolour ();
1743 } 1727 }
1744#endif 1728#endif
1729#if ENABLE_FRILLS
1730 if (option (Opt_urgentOnBell))
1731 set_urgency (0);
1732#endif
1733
1734 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1745 } 1735 }
1746} 1736}
1747 1737
1748void 1738void
1749rxvt_term::focus_out () 1739rxvt_term::focus_out ()
… …
1751 if (focus) 1741 if (focus)
1752 { 1742 {
1753 focus = 0; 1743 focus = 0;
1754 want_refresh = 1; 1744 want_refresh = 1;
1755 1745
1756 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746#if ENABLE_FRILLS
1757 1747 if (option (Opt_urgentOnBell))
1748 set_urgency (0);
1749#endif
1758#if ENABLE_FRILLS || ISO_14755 1750#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf) 1751 if (iso14755buf)
1760 { 1752 {
1761 iso14755buf = 0; 1753 iso14755buf = 0;
1762# if ENABLE_OVERLAY 1754# if ISO_14755
1763 scr_overlay_off (); 1755 scr_overlay_off ();
1764# endif 1756# endif
1765 } 1757 }
1766#endif 1758#endif
1767#if USE_XIM 1759#if USE_XIM
1768 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context); 1761 XUnsetICFocus (Input_Context);
1770#endif 1762#endif
1771#if CURSOR_BLINK 1763#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1765 cursor_blink_ev.stop ();
1766
1774 hidden_cursor = 0; 1767 hidden_cursor = 0;
1775#endif 1768#endif
1776#if OFF_FOCUS_FADING 1769#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1770 if (rs[Rs_fade])
1778 { 1771 {
1779 pix_colors = pix_colors_unfocused; 1772 pix_colors = pix_colors_unfocused;
1780 scr_recolour (); 1773 scr_recolour ();
1781 } 1774 }
1782#endif 1775#endif
1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778 }
1779}
1780
1781void
1782rxvt_term::update_fade_color (unsigned int idx)
1783{
1784#if OFF_FOCUS_FADING
1785 if (rs[Rs_fade])
1783 } 1786 {
1787 rgba c;
1788 pix_colors [Color_fade].get (c);
1789 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1790 }
1791#endif
1784} 1792}
1785 1793
1786#if TRANSPARENT 1794#if ENABLE_TRANSPARENCY || ENABLE_PERL
1787void 1795void
1788rxvt_term::rootwin_cb (XEvent &ev) 1796rxvt_term::rootwin_cb (XEvent &ev)
1789{ 1797{
1790 make_current (); 1798 make_current ();
1791 1799
1800 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1801 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1802 return;
1803
1804# if ENABLE_TRANSPARENCY
1792 switch (ev.type) 1805 switch (ev.type)
1793 { 1806 {
1794 case PropertyNotify: 1807 case PropertyNotify:
1795 /* 1808 /*
1796 * if user used some Esetroot compatible prog to set the root bg, 1809 * if user used some Esetroot compatible prog to set the root bg,
1797 * use the property to determine the pixmap. We use it later on. 1810 * use the property to determine the pixmap. We use it later on.
1798 */ 1811 */
1799 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1812 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1800 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1813 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1801 return; 1814 {
1815 bgPixmap.set_root_pixmap ();
1816 update_background ();
1817 }
1802 1818
1803 /* FALLTHROUGH */
1804 case ReparentNotify:
1805 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1806 want_refresh = want_full_refresh = 1;
1807 break; 1819 break;
1808 } 1820 }
1821# endif
1822
1823 refresh_check ();
1809} 1824}
1810#endif 1825#endif
1811 1826
1812void 1827void
1813rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
… …
1822 /* 1837 /*
1823 * VT window processing of button press 1838 * VT window processing of button press
1824 */ 1839 */
1825 if (ev.window == vt) 1840 if (ev.window == vt)
1826 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1827#if ISO_14755 1845#if ISO_14755
1828 // 5.4 1846 // 5.4
1829 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1830 { 1848 {
1831 iso14755_54 (ev.x, ev.y); 1849 iso14755_54 (ev.x, ev.y);
… …
1865 mouse_report (ev); 1883 mouse_report (ev);
1866 } 1884 }
1867#else 1885#else
1868 MEvent.button = ev.button; 1886 MEvent.button = ev.button;
1869 mouse_report (ev); 1887 mouse_report (ev);
1870#endif /* MOUSE_REPORT_DOUBLECLICK */ 1888#endif /* MOUSE_REPORT_DOUBLECLICK */
1871 1889
1872 } 1890 }
1873 else 1891 else
1874 { 1892 {
1875 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1876 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1877 1895
1878 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1879 switch (ev.button) 1896 switch (ev.button)
1880 { 1897 {
1881 case Button1: 1898 case Button1:
1882 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1883 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1884#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1885 selection.rect = !!(ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1886#else 1903#else
1887 selection.rect = false; 1904 selection.rect = false;
1888#endif 1905#endif
1889 1906
1890 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1892 { 1909 {
1893 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1895 else 1912 else
1896 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1897 } 1914 }
1898 else 1915 else
1899 { 1916 {
1900 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1901 MEvent.clicks++; 1918 MEvent.clicks++;
1902 else 1919 else
1903 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1904 1921
1905 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1906 } 1923 }
1907 1924
1908 MEvent.button = Button1; 1925 MEvent.button = Button1;
1909 break; 1926 break;
1910 1927
1911 case Button3: 1928 case Button3:
1912 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1913 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1914 else 1931 else
1915 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1916 1933
1917 MEvent.button = Button3; 1934 MEvent.button = Button3;
1918 break; 1935 break;
1919 } 1936 }
1920 } 1937 }
1921 1938
1922 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1923 return; 1940 return;
1924 } 1941 }
1925 1942
1926 /* 1943 /*
1927 * Scrollbar window processing of button press 1944 * Scrollbar window processing of button press
1928 */ 1945 */
1929 if (isScrollbarWindow (ev.window)) 1946 if (scrollBar.state && ev.window == scrollBar.win)
1930 { 1947 {
1931 scrollBar.setIdle (); 1948 page_dirn direction = NO_DIR;
1949
1950 if (scrollBar.upButton (ev.y))
1951 direction = UP; /* up */
1952 else if (scrollBar.dnButton (ev.y))
1953 direction = DN; /* down */
1954
1955 scrollBar.state = STATE_IDLE;
1932 /* 1956 /*
1933 * Rxvt-style scrollbar: 1957 * Rxvt-style scrollbar:
1934 * move up if mouse is above slider 1958 * move up if mouse is above slider
1935 * move dn if mouse is below slider 1959 * move dn if mouse is below slider
1936 * 1960 *
… …
1945 /* 1969 /*
1946 * Mouse report disabled scrollbar: 1970 * Mouse report disabled scrollbar:
1947 * arrow buttons - send up/down 1971 * arrow buttons - send up/down
1948 * click on scrollbar - send pageup/down 1972 * click on scrollbar - send pageup/down
1949 */ 1973 */
1950 if ((scrollBar.style == R_SB_NEXT 1974 if (direction == UP)
1951 && scrollbarnext_upButton (ev.y))
1952 || (scrollBar.style == R_SB_RXVT
1953 && scrollbarrxvt_upButton (ev.y)))
1954 tt_printf ("\033[A"); 1975 tt_printf ("\033[A");
1955 else if ((scrollBar.style == R_SB_NEXT 1976 else if (direction == DN)
1956 && scrollbarnext_dnButton (ev.y))
1957 || (scrollBar.style == R_SB_RXVT
1958 && scrollbarrxvt_dnButton (ev.y)))
1959 tt_printf ("\033[B"); 1977 tt_printf ("\033[B");
1960 else 1978 else
1961 switch (ev.button) 1979 switch (ev.button)
1962 { 1980 {
1963 case Button2: 1981 case Button2:
… …
1970 tt_printf ("\033[5~"); 1988 tt_printf ("\033[5~");
1971 break; 1989 break;
1972 } 1990 }
1973 } 1991 }
1974 else 1992 else
1975#endif /* NO_SCROLLBAR_REPORT */ 1993#endif /* NO_SCROLLBAR_REPORT */
1976
1977 {
1978 char upordown = 0;
1979
1980 if (scrollBar.style == R_SB_NEXT)
1981 { 1994 {
1982 if (scrollbarnext_upButton (ev.y)) 1995 if (direction != NO_DIR)
1983 upordown = -1; /* up */
1984 else if (scrollbarnext_dnButton (ev.y))
1985 upordown = 1; /* down */
1986 }
1987 else if (scrollBar.style == R_SB_RXVT)
1988 {
1989 if (scrollbarrxvt_upButton (ev.y))
1990 upordown = -1; /* up */
1991 else if (scrollbarrxvt_dnButton (ev.y))
1992 upordown = 1; /* down */
1993 }
1994 if (upordown)
1995 { 1996 {
1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1997#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1998 if (!cont_scroll_ev.is_active ())
1997 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1999 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1998#endif 2000#endif
1999 if (scr_page (upordown < 0 ? UP : DN, 1)) 2001 if (scr_page (direction, 1))
2000 { 2002 {
2001 if (upordown < 0) 2003 if (direction == UP)
2002 scrollBar.setUp (); 2004 scrollBar.state = STATE_UP;
2003 else 2005 else
2004 scrollBar.setDn (); 2006 scrollBar.state = STATE_DOWN;
2005 } 2007 }
2006 } 2008 }
2007 else 2009 else
2008 switch (ev.button) 2010 switch (ev.button)
2009 { 2011 {
2010 case Button2: 2012 case Button2:
2011 switch (scrollbar_align) 2013 switch (scrollBar.align)
2012 { 2014 {
2013 case R_SB_ALIGN_TOP: 2015 case R_SB_ALIGN_TOP:
2014 csrO = 0; 2016 csrO = 0;
2015 break; 2017 break;
2016 case R_SB_ALIGN_CENTRE: 2018 case R_SB_ALIGN_CENTRE:
… …
2022 } 2024 }
2023 2025
2024 if (scrollBar.style == R_SB_XTERM 2026 if (scrollBar.style == R_SB_XTERM
2025 || scrollbar_above_slider (ev.y) 2027 || scrollbar_above_slider (ev.y)
2026 || scrollbar_below_slider (ev.y)) 2028 || scrollbar_below_slider (ev.y))
2027 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2029 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ());
2028 2030
2029 scrollBar.setMotion (); 2031 scrollBar.state = STATE_MOTION;
2030 break; 2032 break;
2031 2033
2032 case Button1: 2034 case Button1:
2033 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2035 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2034 csrO = ev.y - scrollBar.top; 2036 csrO = ev.y - scrollBar.top;
2035 /* FALLTHROUGH */ 2037 /* FALLTHROUGH */
2036 2038
2037 case Button3: 2039 case Button3:
2038 if (scrollBar.style != R_SB_XTERM) 2040 if (scrollBar.style != R_SB_XTERM)
… …
2048 scr_page (DN, nrow - 1); 2050 scr_page (DN, nrow - 1);
2049# else 2051# else
2050 scr_page (DN, nrow / 4); 2052 scr_page (DN, nrow / 4);
2051# endif 2053# endif
2052 else 2054 else
2053 scrollBar.setMotion (); 2055 scrollBar.state = STATE_MOTION;
2054 } 2056 }
2055 else 2057 else
2056 { 2058 {
2057 scr_page ((ev.button == Button1 ? DN : UP), 2059 scr_page ((ev.button == Button1 ? DN : UP),
2058 (nrow 2060 (nrow
2059 * scrollbar_position (ev.y) 2061 * scrollbar_position (ev.y)
2060 / scrollbar_size ())); 2062 / scrollBar.size ()));
2061 } 2063 }
2062 2064
2063 break; 2065 break;
2064 } 2066 }
2065 } 2067 }
… …
2075 2077
2076 csrO = 0; /* reset csr Offset */ 2078 csrO = 0; /* reset csr Offset */
2077 if (!bypass_keystate) 2079 if (!bypass_keystate)
2078 reportmode = !! (priv_modes & PrivMode_mouse_report); 2080 reportmode = !! (priv_modes & PrivMode_mouse_report);
2079 2081
2080 if (scrollbar_isUpDn ()) 2082 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2081 { 2083 {
2082 scrollBar.setIdle (); 2084 scrollBar.state = STATE_IDLE;
2083 scrollbar_show (0); 2085 scrollBar.show (0);
2084 } 2086 }
2085 2087
2086#ifdef SELECTION_SCROLLING 2088#ifdef SELECTION_SCROLLING
2087 if (sel_scroll_ev.active)
2088 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
2089#endif 2090#endif
2090 2091
2091 if (ev.window == vt) 2092 if (ev.window == vt)
2092 { 2093 {
2094 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2095 return;
2096
2093#if ISO_14755 2097#if ISO_14755
2094 // 5.4 2098 // 5.4
2095 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2099 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2096 return; 2100 return;
2097#endif 2101#endif
2102
2098 if (reportmode) 2103 if (reportmode)
2099 { 2104 {
2100 /* mouse report from vt window */ 2105 /* mouse report from vt window */
2101 /* don't report release of wheel "buttons" */ 2106 /* don't report release of wheel "buttons" */
2102 if (ev.button >= 4) 2107 if (ev.button >= 4)
… …
2113 mouse_report (ev); 2118 mouse_report (ev);
2114 } 2119 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2120#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2121 MEvent.button = AnyButton;
2117 mouse_report (ev); 2122 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2123#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2124 return;
2120 } 2125 }
2121 2126
2122 /* 2127 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2128 * dumb hack to compensate for the failure of click-and-drag
… …
2126 if (priv_modes & PrivMode_mouse_report 2131 if (priv_modes & PrivMode_mouse_report
2127 && bypass_keystate 2132 && bypass_keystate
2128 && ev.button == Button1 && MEvent.clicks <= 1) 2133 && ev.button == Button1 && MEvent.clicks <= 1)
2129 selection_extend (ev.x, ev.y, 0); 2134 selection_extend (ev.x, ev.y, 0);
2130 2135
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
2133
2134 switch (ev.button) 2136 switch (ev.button)
2135 { 2137 {
2136 case Button1: 2138 case Button1:
2137 case Button3: 2139 case Button3:
2138 selection_make (ev.time); 2140 selection_make (ev.time);
2139 break; 2141 break;
2140 2142
2141 case Button2: 2143 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2144 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2145 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2146 break;
2145 2147
2146#ifdef MOUSE_WHEEL 2148#ifdef MOUSE_WHEEL
2147 case Button4: 2149 case Button4:
2148 case Button5: 2150 case Button5:
… …
2152 2154
2153 v = ev.button == Button4 ? UP : DN; 2155 v = ev.button == Button4 ? UP : DN;
2154 2156
2155 if (ev.state & ShiftMask) 2157 if (ev.state & ShiftMask)
2156 i = 1; 2158 i = 1;
2157 else if (OPTION (Opt_mouseWheelScrollPage)) 2159 else if (option (Opt_mouseWheelScrollPage))
2158 i = nrow - 1; 2160 i = nrow - 1;
2159 else 2161 else
2160 i = 5; 2162 i = 5;
2161 2163
2162# ifdef MOUSE_SLIP_WHEELING 2164# ifdef MOUSE_SLIP_WHEELING
… …
2164 { 2166 {
2165 mouse_slip_wheel_speed += v ? -1 : 1; 2167 mouse_slip_wheel_speed += v ? -1 : 1;
2166 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2168 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2167 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2169 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2168 2170
2169 if (slip_wheel_ev.at < NOW) 2171 if (!slip_wheel_ev.is_active ())
2170 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2172 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2171
2172 slip_wheel_ev.start ();
2173 } 2173 }
2174 else 2174 else
2175# endif
2175 { 2176 {
2176# endif
2177 scr_page (v, i); 2177 scr_page (v, i);
2178 scrollbar_show (1); 2178 scrollBar.show (1);
2179# ifdef MOUSE_SLIP_WHEELING
2180 } 2179 }
2181# endif
2182 } 2180 }
2183 break; 2181 break;
2184#endif 2182#endif
2185 } 2183 }
2186 } 2184 }
2187} 2185}
2188 2186
2189#ifdef TRANSPARENT
2190#if TINTING
2191/* taken from aterm-0.4.2 */
2192
2193typedef uint32_t RUINT32T;
2194
2195void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2196{
2197 int sh_r, sh_g, sh_b;
2198 RUINT32T mask_r, mask_g, mask_b;
2199 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2200 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2201 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2202 int i;
2203
2204 Visual *visual = display->visual;
2205
2206 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2207
2208 /* for convenience */
2209 mask_r = visual->red_mask;
2210 mask_g = visual->green_mask;
2211 mask_b = visual->blue_mask;
2212
2213 /* boring lookup table pre-initialization */
2214 switch (srcImage->bits_per_pixel) {
2215 case 15:
2216 if ((mask_r != 0x7c00) ||
2217 (mask_g != 0x03e0) ||
2218 (mask_b != 0x001f))
2219 return;
2220 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2221 lookup_r = lookup;
2222 lookup_g = lookup+32;
2223 lookup_b = lookup+32+32;
2224 sh_r = 10;
2225 sh_g = 5;
2226 sh_b = 0;
2227 break;
2228 case 16:
2229 if ((mask_r != 0xf800) ||
2230 (mask_g != 0x07e0) ||
2231 (mask_b != 0x001f))
2232 return;
2233 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2234 lookup_r = lookup;
2235 lookup_g = lookup+32;
2236 lookup_b = lookup+32+64;
2237 sh_r = 11;
2238 sh_g = 5;
2239 sh_b = 0;
2240 break;
2241 case 24:
2242 if ((mask_r != 0xff0000) ||
2243 (mask_g != 0x00ff00) ||
2244 (mask_b != 0x0000ff))
2245 return;
2246 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2247 lookup_r = lookup;
2248 lookup_g = lookup+256;
2249 lookup_b = lookup+256+256;
2250 sh_r = 16;
2251 sh_g = 8;
2252 sh_b = 0;
2253 break;
2254 case 32:
2255 if ((mask_r != 0xff0000) ||
2256 (mask_g != 0x00ff00) ||
2257 (mask_b != 0x0000ff))
2258 return;
2259 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2260 lookup_r = lookup;
2261 lookup_g = lookup+256;
2262 lookup_b = lookup+256+256;
2263 sh_r = 16;
2264 sh_g = 8;
2265 sh_b = 0;
2266 break;
2267 default:
2268 return; /* we do not support this color depth */
2269 }
2270
2271 /* prepare limits for color transformation (each channel is handled separately) */
2272 if (shade < 0) {
2273 shade = -shade;
2274 if (shade < 0) shade = 0;
2275 if (shade > 100) shade = 100;
2276
2277 lower_lim_r = 65535-rm;
2278 lower_lim_g = 65535-gm;
2279 lower_lim_b = 65535-bm;
2280
2281 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2282 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2283 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2284
2285 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2286 } else {
2287 if (shade < 0) shade = 0;
2288 if (shade > 100) shade = 100;
2289
2290 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2291
2292 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2293 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2294 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2295 }
2296
2297 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2298 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2299 {
2300 unsigned int tmp;
2301
2302 tmp = lower_lim_r;
2303 lower_lim_r = lower_lim_b;
2304 lower_lim_b = tmp;
2305
2306 tmp = upper_lim_r;
2307 upper_lim_r = upper_lim_b;
2308 upper_lim_b = tmp;
2309 }
2310
2311 /* fill our lookup tables */
2312 for (i = 0; i <= mask_r>>sh_r; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2316 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2317 lookup_r[i] = (tmp/65535)<<sh_r;
2318 }
2319 for (i = 0; i <= mask_g>>sh_g; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2323 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2324 lookup_g[i] = (tmp/65535)<<sh_g;
2325 }
2326 for (i = 0; i <= mask_b>>sh_b; i++)
2327 {
2328 RUINT32T tmp;
2329 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2330 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2331 lookup_b[i] = (tmp/65535)<<sh_b;
2332 }
2333
2334 /* apply table to input image (replacing colors by newly calculated ones) */
2335 switch (srcImage->bits_per_pixel)
2336 {
2337 case 15:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0x7c00)>>10] |
2349 lookup_g[(*p & 0x03e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 16:
2357 {
2358 unsigned short *p1, *pf, *p, *pl;
2359 p1 = (unsigned short *) srcImage->data;
2360 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width;
2365 for (; p < pl; p++)
2366 {
2367 *p = lookup_r[(*p & 0xf800)>>11] |
2368 lookup_g[(*p & 0x07e0)>> 5] |
2369 lookup_b[(*p & 0x001f)];
2370 }
2371 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 24:
2376 {
2377 unsigned char *p1, *pf, *p, *pl;
2378 p1 = (unsigned char *) srcImage->data;
2379 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380 while (p1 < pf)
2381 {
2382 p = p1;
2383 pl = p1 + srcImage->width * 3;
2384 for (; p < pl; p += 3)
2385 {
2386 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2387 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2388 p[2] = lookup_r[(p[2] & 0x0000ff)];
2389 }
2390 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2391 }
2392 break;
2393 }
2394 case 32:
2395 {
2396 RUINT32T *p1, *pf, *p, *pl;
2397 p1 = (RUINT32T *) srcImage->data;
2398 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width;
2404 for (; p < pl; p++)
2405 {
2406 *p = lookup_r[(*p & 0xff0000)>>16] |
2407 lookup_g[(*p & 0x00ff00)>> 8] |
2408 lookup_b[(*p & 0x0000ff)] |
2409 (*p & ~0xffffff);
2410 }
2411 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2412 }
2413 break;
2414 }
2415 }
2416
2417 free (lookup);
2418}
2419#endif
2420
2421/*
2422 * Check our parents are still who we think they are.
2423 * Do transparency updates if required
2424 */
2425int
2426rxvt_term::check_our_parents ()
2427{
2428 int i, pchanged, aformat, have_pixmap, rootdepth;
2429 unsigned long nitems, bytes_after;
2430 Atom atype;
2431 unsigned char *prop = NULL;
2432 Window root, oldp, *list;
2433 Pixmap rootpixmap = None;
2434 XWindowAttributes wattr, wrootattr;
2435 dDisp;
2436
2437 pchanged = 0;
2438
2439 if (!OPTION (Opt_transparent))
2440 return pchanged; /* Don't try any more */
2441
2442 XGetWindowAttributes (disp, display->root, &wrootattr);
2443 rootdepth = wrootattr.depth;
2444
2445 XGetWindowAttributes (disp, parent[0], &wattr);
2446
2447 if (rootdepth != wattr.depth)
2448 {
2449 if (am_transparent)
2450 {
2451 pchanged = 1;
2452 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2453 am_transparent = am_pixmap_trans = 0;
2454 }
2455
2456 return pchanged; /* Don't try any more */
2457 }
2458
2459 /* Get all X ops out of the queue so that our information is up-to-date. */
2460 XSync (disp, False);
2461
2462 /*
2463 * Make the frame window set by the window manager have
2464 * the root background. Some window managers put multiple nested frame
2465 * windows for each client, so we have to take care about that.
2466 */
2467 i = (xa[XA_XROOTPMAP_ID]
2468 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2469 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2470 &nitems, &bytes_after, &prop) == Success);
2471
2472 if (!i || prop == NULL)
2473 i = (xa[XA_ESETROOT_PMAP_ID]
2474 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2475 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2476 &nitems, &bytes_after, &prop) == Success);
2477
2478 if (!i || prop == NULL
2479#if TINTING
2480 || !rs[Rs_color + Color_tint]
2481#endif
2482 )
2483 have_pixmap = 0;
2484 else
2485 {
2486 have_pixmap = 1;
2487 rootpixmap = *(Pixmap *)prop;
2488 XFree (prop);
2489 }
2490
2491 if (have_pixmap)
2492 {
2493 /*
2494 * Copy display->root pixmap transparency
2495 */
2496 int sx, sy, nx, ny;
2497 unsigned int nw, nh;
2498 Window cr;
2499 XImage *image;
2500 GC gc;
2501 XGCValues gcvalue;
2502
2503 XTranslateCoordinates (disp, parent[0], display->root,
2504 0, 0, &sx, &sy, &cr);
2505 nw = (unsigned int)szHint.width;
2506 nh = (unsigned int)szHint.height;
2507 nx = ny = 0;
2508
2509 if (sx < 0)
2510 {
2511 nw += sx;
2512 nx = -sx;
2513 sx = 0;
2514 }
2515
2516 if (sy < 0)
2517 {
2518 nh += sy;
2519 ny = -sy;
2520 sy = 0;
2521 }
2522
2523 min_it (nw, (unsigned int) (wrootattr.width - sx));
2524 min_it (nh, (unsigned int) (wrootattr.height - sy));
2525
2526 XSync (disp, False);
2527 allowedxerror = -1;
2528 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2529
2530 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2531 /* XXX: may need a delay here? */
2532 allowedxerror = 0;
2533
2534 if (image == NULL)
2535 {
2536 if (am_transparent && am_pixmap_trans)
2537 {
2538 pchanged = 1;
2539 if (pixmap != None)
2540 {
2541 XFreePixmap (disp, pixmap);
2542 pixmap = None;
2543 }
2544 }
2545
2546 am_pixmap_trans = 0;
2547 }
2548 else
2549 {
2550 if (pixmap != None)
2551 XFreePixmap (disp, pixmap);
2552
2553#if TINTING
2554 if (ISSET_PIXCOLOR (Color_tint))
2555 {
2556 unsigned short rm, gm, bm;
2557 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2558
2559 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2560
2561 ShadeXImage (display, image, shade, rm, gm, bm);
2562 }
2563#endif
2564
2565 pixmap = XCreatePixmap (disp, vt,
2566 szHint.width, szHint.height, image->depth);
2567 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2568 XPutImage (disp, pixmap, gc, image, 0, 0,
2569 nx, ny, image->width, image->height);
2570 XFreeGC (disp, gc);
2571 XDestroyImage (image);
2572 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2573 XClearWindow (disp, parent[0]);
2574
2575 if (!am_transparent || !am_pixmap_trans)
2576 pchanged = 1;
2577
2578 am_transparent = am_pixmap_trans = 1;
2579 }
2580 }
2581
2582 if (am_pixmap_trans)
2583 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2584 else
2585 {
2586 unsigned int n;
2587 /*
2588 * InheritPixmap transparency
2589 */
2590 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2591 {
2592 oldp = parent[i];
2593 XQueryTree (disp, parent[i - 1], &root,
2594 &parent[i], &list, &n);
2595 XFree (list);
2596
2597 if (parent[i] == display->root)
2598 {
2599 if (oldp != None)
2600 pchanged = 1;
2601
2602 break;
2603 }
2604
2605 if (oldp != parent[i])
2606 pchanged = 1;
2607 }
2608
2609 n = 0;
2610
2611 if (pchanged)
2612 {
2613 for (; n < (unsigned int)i; n++)
2614 {
2615 XGetWindowAttributes (disp, parent[n], &wattr);
2616 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2617 {
2618 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2619 break;
2620 }
2621 }
2622 }
2623
2624 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2625 {
2626 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2627 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2628 am_transparent = 0;
2629 /* XXX: also turn off Opt_transparent? */
2630 }
2631 else
2632 {
2633#if WAIT_FOR_WM
2634 /* wait (an arbitrary period) for the WM to do its thing
2635 * needed for fvwm2.2.2 (and before?) */
2636 sleep (1);
2637#endif
2638 for (n = 0; n < (unsigned int)i; n++)
2639 {
2640 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2641 XClearWindow (disp, parent[n]);
2642 }
2643
2644 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2645 am_transparent = 1;
2646 }
2647
2648 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649 parent[i] = None;
2650 }
2651
2652 if (scrollBar.win)
2653 {
2654 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2655 scrollBar.setIdle ();
2656 scrollbar_show (0);
2657 }
2658
2659 if (am_transparent)
2660 {
2661 want_refresh = want_full_refresh = 1;
2662 if (am_pixmap_trans)
2663 flush ();
2664 }
2665
2666 return pchanged;
2667}
2668#endif
2669
2670/*}}} */ 2187/*}}} */
2671 2188
2672bool 2189void
2673rxvt_term::cmd_parse () 2190rxvt_term::cmd_parse ()
2674{ 2191{
2675 bool flag = false;
2676 wchar_t ch = NOCHAR; 2192 wchar_t ch = NOCHAR;
2677 char *seq_begin; // remember start of esc-sequence here 2193 char *seq_begin; // remember start of esc-sequence here
2678 2194
2679 for (;;) 2195 for (;;)
2680 { 2196 {
2681 if (ch == NOCHAR) 2197 if (expect_false (ch == NOCHAR))
2682 { 2198 {
2683 seq_begin = cmdbuf_ptr; 2199 seq_begin = cmdbuf_ptr;
2684 ch = next_char (); 2200 ch = next_char ();
2685 2201
2686 if (ch == NOCHAR) 2202 if (ch == NOCHAR)
2687 break; 2203 break;
2688 } 2204 }
2689 2205
2690 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2206 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2691 { 2207 {
2692 if (!seen_input) 2208 if (expect_false (!seen_input))
2693 { 2209 {
2694 seen_input = 1; 2210 seen_input = 1;
2695 // many badly-written programs (e.g. jed) contain a race condition: 2211 // many badly-written programs (e.g. jed) contain a race condition:
2696 // they first read the screensize and then install a SIGWINCH handler. 2212 // they first read the screensize and then install a SIGWINCH handler.
2697 // some window managers resize the window early, and these programs 2213 // some window managers resize the window early, and these programs
… …
2710 wchar_t *str = buf; 2226 wchar_t *str = buf;
2711 wchar_t *eol = str + min (ncol, UBUFSIZ); 2227 wchar_t *eol = str + min (ncol, UBUFSIZ);
2712 2228
2713 for (;;) 2229 for (;;)
2714 { 2230 {
2715 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2231 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2716 break; 2232 break;
2717 2233
2718 *str++ = ch; 2234 *str++ = ch;
2719 2235
2720 if (ch == C0_LF || str >= eol) 2236 if (expect_false (ch == C0_LF || str >= eol))
2721 { 2237 {
2722 if (ch == C0_LF) 2238 if (ch == C0_LF)
2723 nlines++; 2239 nlines++;
2724 2240
2725 refresh_count++; 2241 refresh_count++;
2726 2242
2727 if (!OPTION (Opt_jumpScroll) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2728 || (refresh_count >= refresh_limit * (nrow - 1)))
2729 { 2244 {
2730 refreshnow = true;
2731 refresh_count = 0; 2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2732 ch = NOCHAR; 2250 ch = NOCHAR;
2733 break; 2251 break;
2252 }
2734 } 2253 }
2735 2254
2736 // scr_add_lines only works for nlines <= nrow - 1. 2255 // scr_add_lines only works for nlines <= nrow - 1.
2737 if (nlines >= nrow - 1) 2256 if (nlines >= nrow - 1)
2738 { 2257 {
… …
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2767 scr_add_lines (buf, str - buf, nlines); 2286 scr_add_lines (buf, str - buf, nlines);
2768 2287
2769 /* 2288 /*
2770 * If there have been a lot of new lines, then update the screen 2289 * If there have been a lot of new lines, then update the screen
2771 * What the heck I'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2772 * the number of pages between refreshes is refresh_limit, which 2291 * if skipScroll is enabled.
2773 * is incremented here because we must be doing flat-out scrolling.
2774 */ 2292 */
2775 if (refreshnow) 2293 if (refreshnow)
2776 { 2294 {
2777 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2778 refresh_limit++;
2779 else
2780 {
2781 flag = true;
2782 scr_refresh (); 2295 scr_refresh ();
2783 want_refresh = 1; 2296 want_refresh = 1;
2784 }
2785 } 2297 }
2786
2787 } 2298 }
2788 else 2299 else
2789 { 2300 {
2790 try 2301 try
2791 { 2302 {
… …
2799 } 2310 }
2800 2311
2801 ch = NOCHAR; 2312 ch = NOCHAR;
2802 } 2313 }
2803 } 2314 }
2804
2805 return flag;
2806} 2315}
2807 2316
2808// read the next character 2317// read the next character
2809wchar_t 2318wchar_t
2810rxvt_term::next_char () NOTHROW 2319rxvt_term::next_char () NOTHROW
2811{ 2320{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2321 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2322 {
2814 // assume 7-bit to be ascii ALWAYS 2323 // assume 7-bit to be ascii ALWAYS
2815 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2324 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2816 return *cmdbuf_ptr++; 2325 return *cmdbuf_ptr++;
2817 2326
2818 wchar_t wc; 2327 wchar_t wc;
2819 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2328 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820 2329
… …
2824 cmdbuf_ptr = cmdbuf_endp; 2333 cmdbuf_ptr = cmdbuf_endp;
2825 break; 2334 break;
2826 } 2335 }
2827 2336
2828 if (len == (size_t)-1) 2337 if (len == (size_t)-1)
2338 {
2339 mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
2829 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2340 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2341 }
2830 2342
2831 // assume wchar == unicode 2343 // assume wchar == unicode
2832 cmdbuf_ptr += len; 2344 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK; 2345 return wc & UNICODE_MASK;
2834 } 2346 }
… …
2878/*----------------------------------------------------------------------*/ 2390/*----------------------------------------------------------------------*/
2879#ifdef PRINTPIPE 2391#ifdef PRINTPIPE
2880FILE * 2392FILE *
2881rxvt_term::popen_printer () 2393rxvt_term::popen_printer ()
2882{ 2394{
2883 FILE *stream = popen (rs[Rs_print_pipe], "w"); 2395 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2884 2396
2885 if (stream == NULL) 2397 if (stream == NULL)
2886 rxvt_warn ("can't open printer pipe, not printing.\n"); 2398 rxvt_warn ("can't open printer pipe, not printing.\n");
2887 2399
2888 return stream; 2400 return stream;
… …
2899 * simulate attached vt100 printer 2411 * simulate attached vt100 printer
2900 */ 2412 */
2901void 2413void
2902rxvt_term::process_print_pipe () 2414rxvt_term::process_print_pipe ()
2903{ 2415{
2904 int done; 2416 FILE *fd = popen_printer ();
2905 FILE *fd;
2906 2417
2907 if ((fd = popen_printer ()) == NULL) 2418 if (!fd)
2908 return; 2419 return;
2909 2420
2910 /* 2421 /*
2911 * Send all input to the printer until either ESC[4i or ESC[?4i 2422 * Send all input to the printer until either ESC[4i or ESC[?4i
2912 * is received. 2423 * is received.
2913 */ 2424 */
2914 for (done = 0; !done;) 2425 for (int done = 0; !done; )
2915 { 2426 {
2916 unsigned char buf[8]; 2427 unsigned char buf[8];
2917 unicode_t ch; 2428 unicode_t ch;
2918 unsigned int i, len; 2429 unsigned int i, len;
2919 2430
… …
2938 { 2449 {
2939 if ((buf[len++] = cmd_getc ()) == 'i') 2450 if ((buf[len++] = cmd_getc ()) == 'i')
2940 break; /* done = 1 */ 2451 break; /* done = 1 */
2941 } 2452 }
2942 } 2453 }
2943 2454
2944 for (i = 0; i < len; i++) 2455 for (i = 0; i < len; i++)
2945 if (putc (buf[i], fd) == EOF) 2456 if (putc (buf[i], fd) == EOF)
2946 { 2457 {
2947 done = 1; 2458 done = 1;
2948 break; 2459 break;
… …
2950 } 2461 }
2951 } 2462 }
2952 2463
2953 pclose_printer (fd); 2464 pclose_printer (fd);
2954} 2465}
2955#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2956/*}}} */ 2467/*}}} */
2957 2468
2958/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2959enum { 2470enum {
2960 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
3010 process_dcs_seq (); 2521 process_dcs_seq ();
3011 break; 2522 break;
3012 case 0x9b: /* CSI */ 2523 case 0x9b: /* CSI */
3013 process_csi_seq (); 2524 process_csi_seq ();
3014 break; 2525 break;
3015 case 0x9d: /* CSI */ 2526 case 0x9d: /* OSC */
3016 process_osc_seq (); 2527 process_osc_seq ();
3017 break; 2528 break;
3018#endif 2529#endif
3019 } 2530 }
3020} 2531}
… …
3064 break; 2575 break;
3065 case 'Z': /* identify the terminal type */ 2576 case 'Z': /* identify the terminal type */
3066 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2577 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
3067 break; 2578 break;
3068 case '<': /* turn off VT52 mode */ 2579 case '<': /* turn off VT52 mode */
3069 PrivMode (0, PrivMode_vt52); 2580 set_privmode (PrivMode_vt52, 0);
3070 break; 2581 break;
3071 case 'F': /* use special graphics character set */ 2582 case 'F': /* use special graphics character set */
3072 case 'G': /* use regular character set */ 2583 case 'G': /* use regular character set */
3073 /* unimplemented */ 2584 /* unimplemented */
3074 break; 2585 break;
… …
3110 scr_charset_set (2, (unsigned int)cmd_getc ()); 2621 scr_charset_set (2, (unsigned int)cmd_getc ());
3111 break; 2622 break;
3112 case '+': 2623 case '+':
3113 scr_charset_set (3, (unsigned int)cmd_getc ()); 2624 scr_charset_set (3, (unsigned int)cmd_getc ());
3114 break; 2625 break;
3115#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3116 case '6': 2627 case '6':
3117 scr_backindex (); 2628 scr_backindex ();
3118 break; 2629 break;
3119#endif 2630#endif
3120 case '7': 2631 case '7':
3121 scr_cursor (SAVE); 2632 scr_cursor (SAVE);
3122 break; 2633 break;
3123 case '8': 2634 case '8':
3124 scr_cursor (RESTORE); 2635 scr_cursor (RESTORE);
3125 break; 2636 break;
3126#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3127 case '9': 2638 case '9':
3128 scr_forwardindex (); 2639 scr_forwardindex ();
3129 break; 2640 break;
3130#endif 2641#endif
3131 case '=': 2642 case '=':
3132 case '>': 2643 case '>':
3133 PrivMode ((ch == '='), PrivMode_aplKP); 2644 set_privmode (PrivMode_aplKP, ch == '=');
3134 break; 2645 break;
3135 2646
3136 case C1_40: 2647 case C1_40:
3137 cmd_getc (); 2648 cmd_getc ();
3138 break; 2649 break;
… …
3191 2702
3192 /* 8.3.106: RESET TO INITIAL STATE */ 2703 /* 8.3.106: RESET TO INITIAL STATE */
3193 case 'c': 2704 case 'c':
3194 mbstate.reset (); 2705 mbstate.reset ();
3195 scr_poweron (); 2706 scr_poweron ();
3196 scrollbar_show (1); 2707 scrollBar.show (1);
3197 break; 2708 break;
3198 2709
3199 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */ 2710 /* 8.3.79: LOCKING-SHIFT TWO (see ISO2022) */
3200 case 'n': 2711 case 'n':
3201 scr_charset_choose (2); 2712 scr_charset_choose (2);
… …
3246rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
3247{ 2758{
3248 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
3249 unsigned int nargs, p; 2760 unsigned int nargs, p;
3250 int n, ndef; 2761 int n, ndef;
3251 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
3252 2763
3253 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
3254 arg[--nargs] = 0;
3255 2765
3256 priv = 0; 2766 priv = 0;
3257 ch = cmd_getc (); 2767 ch = cmd_getc ();
3258 if (ch >= '<' && ch <= '?') 2768 if (ch >= '<' && ch <= '?')
2769 {
3259 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' */
3260 priv = ch; 2771 priv = ch;
3261 ch = cmd_getc (); 2772 ch = cmd_getc ();
3262 } 2773 }
3263 2774
3264 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
3293 ndef = get_byte_array_bit (csi_defaults, i); 2804 ndef = get_byte_array_bit (csi_defaults, i);
3294 for (p = 0; p < nargs; p++) 2805 for (p = 0; p < nargs; p++)
3295 if (arg[p] == -1) 2806 if (arg[p] == -1)
3296 arg[p] = ndef; 2807 arg[p] = ndef;
3297 2808
3298#ifdef DEBUG_CMD
3299 fprintf (stderr, "CSI ");
3300 for (p = 0; p < nargs; p++)
3301 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3302 fprintf (stderr, "%c\n", ch);
3303#endif
3304
3305 /* 2809 /*
3306 * private mode handling 2810 * private mode handling
3307 */ 2811 */
3308 if (priv) 2812 if (priv)
3309 { 2813 {
3310 switch (priv) 2814 switch (priv)
3311 { 2815 {
3312 case '>': 2816 case '>':
3313 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
3314 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2818 {
2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2821 //
2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2824 // versions.
2825 //
2826 tt_printf ("\033[>%d;95;0c", 'U');
2827 }
3315 break; 2828 break;
2829
3316 case '?': 2830 case '?':
3317 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2831 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3318 process_terminal_mode (ch, priv, nargs, arg); 2832 process_terminal_mode (ch, priv, nargs, arg);
3319 break; 2833 break;
3320 } 2834 }
… …
3445 break; 2959 break;
3446 case 6: /* CPR requested */ 2960 case 6: /* CPR requested */
3447 scr_report_position (); 2961 scr_report_position ();
3448 break; 2962 break;
3449 case 7: /* unofficial extension */ 2963 case 7: /* unofficial extension */
3450 if (OPTION (Opt_insecure)) 2964 if (option (Opt_insecure))
3451 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2965 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3452 break; 2966 break;
3453 case 8: /* unofficial extension */ 2967 case 8: /* unofficial extension */
3454 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2968 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3455 break; 2969 break;
… …
3522 break; 3036 break;
3523 case CSI_75: 3037 case CSI_75:
3524 scr_cursor (RESTORE); 3038 scr_cursor (RESTORE);
3525 break; 3039 break;
3526 3040
3527#if ENABLE_FRILLS 3041#if !ENABLE_MINIMAL
3528 case CSI_74: 3042 case CSI_74:
3529 process_window_ops (arg, nargs); 3043 process_window_ops (arg, nargs);
3530 break; 3044 break;
3531#endif 3045#endif
3532 3046
… …
3539 break; 3053 break;
3540 } 3054 }
3541} 3055}
3542/*}}} */ 3056/*}}} */
3543 3057
3544#if ENABLE_FRILLS 3058#if !ENABLE_MINIMAL
3545/* ARGSUSED */ 3059/* ARGSUSED */
3546void 3060void
3547rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3061rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3548{ 3062{
3549 int x, y; 3063 int x, y;
3550 XWindowAttributes wattr; 3064 XWindowAttributes wattr;
3551 Window wdummy; 3065 Window wdummy;
3552 dDisp; 3066
3067 dLocal (Display *, dpy);
3553 3068
3554 if (nargs == 0) 3069 if (nargs == 0)
3555 return; 3070 return;
3556 3071
3557 switch (args[0]) 3072 switch (args[0])
3558 { 3073 {
3559 /* 3074 /*
3560 * commands 3075 * commands
3561 */ 3076 */
3562 case 1: /* deiconify window */ 3077 case 1: /* deiconify window */
3563 XMapWindow (disp, parent[0]); 3078 XMapWindow (dpy, parent[0]);
3564 break; 3079 break;
3565 case 2: /* iconify window */ 3080 case 2: /* iconify window */
3566 XIconifyWindow (disp, parent[0], display->screen); 3081 XIconifyWindow (dpy, parent[0], display->screen);
3567 break; 3082 break;
3568 case 3: /* set position (pixels) */ 3083 case 3: /* set position (pixels) */
3569 XMoveWindow (disp, parent[0], args[1], args[2]); 3084 XMoveWindow (dpy, parent[0], args[1], args[2]);
3570 break; 3085 break;
3571 case 4: /* set size (pixels) */ 3086 case 4: /* set size (pixels) */
3572 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3087 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3573 break; 3088 break;
3574 case 5: /* raise window */ 3089 case 5: /* raise window */
3575 XRaiseWindow (disp, parent[0]); 3090 XRaiseWindow (dpy, parent[0]);
3576 break; 3091 break;
3577 case 6: /* lower window */ 3092 case 6: /* lower window */
3578 XLowerWindow (disp, parent[0]); 3093 XLowerWindow (dpy, parent[0]);
3579 break; 3094 break;
3580 case 7: /* refresh window */ 3095 case 7: /* refresh window */
3581 scr_touch (true); 3096 scr_touch (true);
3582 break; 3097 break;
3583 case 8: /* set size (chars) */ 3098 case 8: /* set size (chars) */
… …
3590 if (args[0] >= 24) /* set height (chars) */ 3105 if (args[0] >= 24) /* set height (chars) */
3591 set_widthheight ((unsigned int)width, 3106 set_widthheight ((unsigned int)width,
3592 (unsigned int) (args[1] * fheight)); 3107 (unsigned int) (args[1] * fheight));
3593 break; 3108 break;
3594 3109
3595
3596 /* 3110 /*
3597 * reports - some output format copied from XTerm 3111 * reports - some output format copied from XTerm
3598 */ 3112 */
3599 case 11: /* report window state */ 3113 case 11: /* report window state */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3114 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3115 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3602 break; 3116 break;
3603 case 13: /* report window position */ 3117 case 13: /* report window position */
3604 XGetWindowAttributes (disp, parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
3605 XTranslateCoordinates (disp, parent[0], wattr.root, 3119 XTranslateCoordinates (dpy, parent[0], wattr.root,
3606 -wattr.border_width, -wattr.border_width, 3120 -wattr.border_width, -wattr.border_width,
3607 &x, &y, &wdummy); 3121 &x, &y, &wdummy);
3608 tt_printf ("\033[3;%d;%dt", x, y); 3122 tt_printf ("\033[3;%d;%dt", x, y);
3609 break; 3123 break;
3610 case 14: /* report window size (pixels) */ 3124 case 14: /* report window size (pixels) */
3611 XGetWindowAttributes (disp, parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3612 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3126 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3613 break; 3127 break;
3614 case 18: /* report text area size (chars) */ 3128 case 18: /* report text area size (chars) */
3615 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3129 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3616 break; 3130 break;
… …
3618 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3132 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3619 break; 3133 break;
3620 case 20: /* report icon label */ 3134 case 20: /* report icon label */
3621 { 3135 {
3622 char *s; 3136 char *s;
3623 XGetIconName (disp, parent[0], &s); 3137 XGetIconName (dpy, parent[0], &s);
3624 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3138 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3139 XFree (s);
3626 } 3140 }
3627 break; 3141 break;
3628 case 21: /* report window title */ 3142 case 21: /* report window title */
3629 { 3143 {
3630 char *s; 3144 char *s;
3631 XFetchName (disp, parent[0], &s); 3145 XFetchName (dpy, parent[0], &s);
3632 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3146 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s); 3147 XFree (s);
3634 } 3148 }
3635 break; 3149 break;
3636 } 3150 }
3637} 3151}
… …
3664 seen_esc = true; 3178 seen_esc = true;
3665 continue; 3179 continue;
3666 } 3180 }
3667 else if (ch == C0_BEL || ch == CHAR_ST) 3181 else if (ch == C0_BEL || ch == CHAR_ST)
3668 break; 3182 break;
3183 else if (ch == C0_SYN)
3184 ch = cmd_get8 ();
3669 else if (ch < 0x20) 3185 else if (ch < 0x20)
3670 return NULL; /* other control character - exit */ 3186 return NULL; /* other control character - exit */
3671 3187
3672 seen_esc = false; 3188 seen_esc = false;
3673 3189
3674 if (n >= STRING_MAX - 1) 3190 if (n >= STRING_MAX - 1)
3675 // stop at some sane length 3191 // stop at some sane length
3676 return NULL; 3192 return NULL;
3677 3193
3678 if (ch == C0_SYN)
3679 string[n++] = cmd_get8 ();
3680 else
3681 string[n++] = ch; 3194 string[n++] = ch;
3682 } 3195 }
3683 3196
3684 string[n++] = '\0'; 3197 string[n++] = '\0';
3685 3198
3686 ends_how = (ch == 0x5c ? C0_ESC : ch); 3199 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3737void 3250void
3738rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3251rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3739{ 3252{
3740 if (str[0] == '?' && !str[1]) 3253 if (str[0] == '?' && !str[1])
3741 { 3254 {
3742 unsigned short r, g, b; 3255 rgba c;
3743 pix_colors_focused[color].get (display, r, g, b); 3256 pix_colors_focused[color].get (c);
3257
3258#if XFT
3259 if (c.a != rgba::MAX_CC)
3260 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3261 else
3262#endif
3744 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3263 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3745 } 3264 }
3746 else 3265 else
3747 set_window_color (color, str); 3266 set_window_color (color, str);
3748} 3267}
3749 3268
… …
3755{ 3274{
3756 int color; 3275 int color;
3757 char *buf, *name; 3276 char *buf, *name;
3758 bool query = str[0] == '?' && !str[1]; 3277 bool query = str[0] == '?' && !str[1];
3759 int saveop = op; 3278 int saveop = op;
3760 dDisp; 3279
3280 dLocal (Display *, dpy);
3761 3281
3762 assert (str != NULL); 3282 assert (str != NULL);
3283
3284 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3285 return;
3286
3763 switch (op) 3287 switch (op)
3764 { 3288 {
3765 case XTerm_name: 3289 case XTerm_name:
3766 set_title (str); 3290 set_title (str);
3767 /* FALLTHROUGH */ 3291 /* FALLTHROUGH */
… …
3781 unsigned long bytes_after; 3305 unsigned long bytes_after;
3782 unsigned char *value = 0; 3306 unsigned char *value = 0;
3783 const char *str = ""; 3307 const char *str = "";
3784 3308
3785 if (prop 3309 if (prop
3786 && XGetWindowProperty (disp, parent[0], 3310 && XGetWindowProperty (dpy, parent[0],
3787 prop, 0, 1<<16, 0, AnyPropertyType, 3311 prop, 0, 1<<16, 0, AnyPropertyType,
3788 &actual_type, &actual_format, 3312 &actual_type, &actual_format,
3789 &nitems, &bytes_after, &value) == Success 3313 &nitems, &bytes_after, &value) == Success
3790 && actual_type != None 3314 && actual_type != None
3791 && actual_format == 8) 3315 && actual_format == 8)
3792 str = (const char *)(value); 3316 str = (const char *)(value);
3793 3317
3794 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3318 tt_printf ("\033]%d;%s%c", op, str, resp);
3795 3319
3796 XFree (value); 3320 XFree (value);
3797 } 3321 }
3798 else 3322 else
3799 { 3323 {
… …
3803 { 3327 {
3804 *eq = 0; 3328 *eq = 0;
3805 set_utf8_property (display->atom (str), eq + 1); 3329 set_utf8_property (display->atom (str), eq + 1);
3806 } 3330 }
3807 else 3331 else
3808 XDeleteProperty (disp, parent[0], 3332 XDeleteProperty (dpy, parent[0],
3809 display->atom (str)); 3333 display->atom (str));
3810 } 3334 }
3811 break; 3335 break;
3812 3336
3813 case XTerm_Color: 3337 case XTerm_Color:
… …
3823 break; 3347 break;
3824 3348
3825 if ((buf = strchr (name, ';')) != NULL) 3349 if ((buf = strchr (name, ';')) != NULL)
3826 *buf++ = '\0'; 3350 *buf++ = '\0';
3827 3351
3828 if (name[0] == '?' && !name[1]) 3352 process_color_seq (op, color, name, resp);
3829 {
3830 unsigned short r, g, b;
3831 pix_colors_focused[color].get (display, r, g, b);
3832 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3833 }
3834 else
3835 set_window_color (color, name);
3836 } 3353 }
3837 break; 3354 break;
3355 case Rxvt_restoreFG:
3838 case XTerm_Color00: 3356 case XTerm_Color00:
3839 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3357 process_color_seq (op, Color_fg, str, resp);
3840 break; 3358 break;
3359 case Rxvt_restoreBG:
3841 case XTerm_Color01: 3360 case XTerm_Color01:
3842 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3361 process_color_seq (op, Color_bg, str, resp);
3843 break; 3362 break;
3844#ifndef NO_CURSORCOLOR 3363#ifndef NO_CURSORCOLOR
3845 case XTerm_Color_cursor: 3364 case XTerm_Color_cursor:
3846 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3365 process_color_seq (op, Color_cursor, str, resp);
3847 break; 3366 break;
3848#endif 3367#endif
3849 case XTerm_Color_pointer_fg: 3368 case XTerm_Color_pointer_fg:
3850 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3369 process_color_seq (op, Color_pointer_fg, str, resp);
3851 break; 3370 break;
3852 case XTerm_Color_pointer_bg: 3371 case XTerm_Color_pointer_bg:
3853 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3372 process_color_seq (op, Color_pointer_bg, str, resp);
3854 break; 3373 break;
3855#ifndef NO_BOLD_UNDERLINE_REVERSE 3374#ifndef NO_BOLD_UNDERLINE_REVERSE
3856 case XTerm_Color_RV: 3375 case XTerm_Color_RV:
3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3376 process_color_seq (op, Color_RV, str, resp);
3858 break; 3377 break;
3859 case Rxvt_Color_BD: 3378 case Rxvt_Color_BD:
3860 case URxvt_Color_BD: 3379 case URxvt_Color_BD:
3861 process_color_seq (op, Color_BD, str, resp); 3380 process_color_seq (op, Color_BD, str, resp);
3862 break; 3381 break;
3863 case Rxvt_Color_UL: 3382 case Rxvt_Color_UL:
3864 case URxvt_Color_UL: 3383 case URxvt_Color_UL:
3865 process_color_seq (op, Color_UL, str, resp); 3384 process_color_seq (op, Color_UL, str, resp);
3866 break; 3385 break;
3867 case URxvt_Color_IT: 3386 case URxvt_Color_IT:
3868 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3387 process_color_seq (op, Color_IT, str, resp);
3869 break; 3388 break;
3870#endif 3389#endif
3871#if TRANSPARENT && TINTING 3390#if ENABLE_TRANSPARENCY
3872 case URxvt_Color_tint: 3391 case URxvt_Color_tint:
3873 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3392 process_color_seq (op, Color_tint, str, resp);
3874 check_our_parents (); 3393 {
3875 if (am_transparent) 3394 bool changed = false;
3876 want_full_refresh = want_refresh = 1;
3877 break;
3878#endif
3879 3395
3396 if (ISSET_PIXCOLOR (Color_tint))
3397 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3398 else
3399 changed = bgPixmap.unset_tint ();
3400
3401 if (changed)
3402 update_background ();
3403 }
3404
3405 break;
3406#endif
3407
3408#if BG_IMAGE_FROM_FILE
3880 case Rxvt_Pixmap: 3409 case Rxvt_Pixmap:
3881 { 3410 if (!strcmp (str, "?"))
3882 if (*str != ';')
3883 { 3411 {
3884#if XPM_BACKGROUND 3412 char str[256];
3885 scale_pixmap (""); /* reset to default scaling */ 3413
3886 set_bgPixmap (str); /* change pixmap */ 3414 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3887 scr_touch (true); 3415 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3888#endif 3416 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3417 process_xterm_seq (XTerm_title, str, CHAR_ST);
3889 } 3418 }
3890 3419 else
3420 {
3891 int changed = 0; 3421 int changed = 0;
3892 3422
3893 while ((str = strchr (str, ';')) != NULL) 3423 if (*str != ';')
3894 { 3424 {
3425 /* reset to default scaling :*/
3426 bgPixmap.unset_geometry ();
3427 if (bgPixmap.set_file (str)) /* change pixmap */
3428 changed++;
3429 str = strchr (str, ';');
3430 if (str == NULL)
3431 bgPixmap.set_defaultGeometry ();
3432 }
3433
3434 while (str)
3435 {
3895 str++; 3436 str++;
3896#if XPM_BACKGROUND 3437 if (bgPixmap.set_geometry (str))
3897 changed += scale_pixmap (str); 3438 changed++;
3898#endif 3439 str = strchr (str, ';');
3899 } 3440 }
3900 3441
3901 if (changed) 3442 if (changed)
3902 { 3443 update_background ();
3903#ifdef XPM_BACKGROUND
3904 resize_pixmap ();
3905 scr_touch (true);
3906#endif
3907 } 3444 }
3908 }
3909 break; 3445 break;
3910 3446#endif
3911 case Rxvt_restoreFG:
3912 set_window_color (Color_fg, str);
3913 break;
3914 case Rxvt_restoreBG:
3915 set_window_color (Color_bg, str);
3916 break;
3917 3447
3918 case XTerm_logfile: 3448 case XTerm_logfile:
3919 // TODO, when secure mode? 3449 // TODO, when secure mode?
3920 break; 3450 break;
3921 3451
… …
3939 case URxvt_italicFont: 3469 case URxvt_italicFont:
3940 case URxvt_boldItalicFont: 3470 case URxvt_boldItalicFont:
3941#endif 3471#endif
3942 if (query) 3472 if (query)
3943 tt_printf ("\33]%d;%-.250s%c", saveop, 3473 tt_printf ("\33]%d;%-.250s%c", saveop,
3944 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3474 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3945 ? fontset[op - URxvt_font]->fontdesc : "", 3475 ? fontset[op - URxvt_font]->fontdesc : "",
3946 resp); 3476 resp);
3947 else 3477 else
3948 { 3478 {
3949 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3479 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 allocated.push_back ((void *)res); 3482 allocated.push_back ((void *)res);
3953 set_fonts (); 3483 set_fonts ();
3954 } 3484 }
3955 break; 3485 break;
3956 3486
3957#if ENABLE_FRILLS 3487 case URxvt_version:
3488 if (query)
3489 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3490 op,
3491 rs[Rs_name], VERSION[0], VERSION[2],
3492 resp);
3493 break;
3494
3495#if !ENABLE_MINIMAL
3958 case URxvt_locale: 3496 case URxvt_locale:
3959 if (query) 3497 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3498 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3961 else 3499 else
3962 { 3500 {
3963 set_locale (str); 3501 set_locale (str);
3964 pty->set_utf8_mode (enc_utf8); 3502 pty->set_utf8_mode (enc_utf8);
3965 init_xlocale (); 3503 init_xlocale ();
… …
3980 break; 3518 break;
3981#endif 3519#endif
3982 3520
3983#if ENABLE_PERL 3521#if ENABLE_PERL
3984 case URxvt_perl: 3522 case URxvt_perl:
3985 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3523 HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_STR_LEN, &resp, 1, DT_END));
3986 ; // no responses yet
3987 break; 3524 break;
3988#endif 3525#endif
3989 } 3526 }
3990} 3527}
3991/*----------------------------------------------------------------------*/ 3528/*----------------------------------------------------------------------*/
… …
4014 { 3551 {
4015 if (mode == 'r') 3552 if (mode == 'r')
4016 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3553 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
4017 else 3554 else
4018 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3555 state = (mode == 't') ? ! (priv_modes & bit) : mode;
4019 PrivMode (state, bit); 3556 set_privmode (bit, state);
4020 } 3557 }
4021 3558
4022 return state; 3559 return state;
4023} 3560}
4024 3561
… …
4028{ 3565{
4029 unsigned int i, j; 3566 unsigned int i, j;
4030 int state; 3567 int state;
4031 3568
4032 static const struct 3569 static const struct
4033 { 3570 {
4034 const int argval; 3571 const int argval;
4035 const unsigned long bit; 3572 const unsigned long bit;
4036 }
4037
4038 argtopriv[] = { 3573 } argtopriv[] = {
4039 { 1, PrivMode_aplCUR }, 3574 { 1, PrivMode_aplCUR },
4040 { 2, PrivMode_vt52 }, 3575 { 2, PrivMode_vt52 },
4041 { 3, PrivMode_132 }, 3576 { 3, PrivMode_132 },
4042 { 4, PrivMode_smoothScroll }, 3577 { 4, PrivMode_smoothScroll },
4043 { 5, PrivMode_rVideo }, 3578 { 5, PrivMode_rVideo },
… …
4059 { 66, PrivMode_aplKP }, 3594 { 66, PrivMode_aplKP },
4060#ifndef NO_BACKSPACE_KEY 3595#ifndef NO_BACKSPACE_KEY
4061 { 67, PrivMode_BackSpace }, 3596 { 67, PrivMode_BackSpace },
4062#endif 3597#endif
4063 { 1000, PrivMode_MouseX11 }, 3598 { 1000, PrivMode_MouseX11 },
4064 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3599 { 1002, PrivMode_MouseBtnEvent },
4065 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3600 { 1003, PrivMode_MouseAnyEvent },
4066 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4067 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3601 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4068 { 1011, PrivMode_Keypress }, // rxvt extension 3602 { 1011, PrivMode_Keypress }, // rxvt extension
4069 // 1035 enable modifiers for alt, numlock NYI 3603 // 1035 enable modifiers for alt, numlock NYI
4070 // 1036 send ESC for meta keys NYI 3604 // 1036 send ESC for meta keys NYI
4071 // 1037 send DEL for keypad delete NYI 3605 // 1037 send DEL for keypad delete NYI
4072 { 1047, PrivMode_Screen }, 3606 { 1047, PrivMode_Screen },
4073 // 1048 save and restore cursor 3607 // 1048 save and restore cursor
4074 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3608 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4075 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3609 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3610 { 2004, PrivMode_BracketPaste },
4076 }; 3611 };
4077 3612
4078 if (nargs == 0) 3613 if (nargs == 0)
4079 return; 3614 return;
4080 3615
… …
4106 scr_touch (true); 3641 scr_touch (true);
4107 break; 3642 break;
4108#endif 3643#endif
4109 case 1048: /* alternative cursor save */ 3644 case 1048: /* alternative cursor save */
4110 case 1049: 3645 case 1049:
4111 if (OPTION (Opt_secondaryScreen)) 3646 if (option (Opt_secondaryScreen))
4112 if (mode == 0) 3647 if (mode == 0)
4113 scr_cursor (RESTORE); 3648 scr_cursor (RESTORE);
4114 else if (mode == 1) 3649 else if (mode == 1)
4115 scr_cursor (SAVE); 3650 scr_cursor (SAVE);
4116 break; 3651 break;
… …
4124 case 2: /* VT52 mode */ 3659 case 2: /* VT52 mode */
4125 /* oddball mode. should be set regardless of set/reset 3660 /* oddball mode. should be set regardless of set/reset
4126 * parameter. Return from VT52 mode with an ESC < from 3661 * parameter. Return from VT52 mode with an ESC < from
4127 * within VT52 mode 3662 * within VT52 mode
4128 */ 3663 */
4129 PrivMode (1, PrivMode_vt52); 3664 set_privmode (PrivMode_vt52, 1);
4130 break; 3665 break;
4131 case 3: /* 80/132 */ 3666 case 3: /* 80/132 */
4132 if (priv_modes & PrivMode_132OK) 3667 if (priv_modes & PrivMode_132OK)
3668 {
3669 scr_poweron ();
4133 set_widthheight (((state ? 132 : 80) * fwidth), height); 3670 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3671 }
4134 break; 3672 break;
4135 case 4: /* smooth scrolling */ 3673 case 4: /* smooth scrolling */
4136 set_option (Opt_jumpScroll, !state); 3674 set_option (Opt_jumpScroll, !state);
4137 break; 3675 break;
4138 case 5: /* reverse video */ 3676 case 5: /* reverse video */
… …
4145 scr_autowrap (state); 3683 scr_autowrap (state);
4146 break; 3684 break;
4147 /* case 8: - auto repeat, can't do on a per window basis */ 3685 /* case 8: - auto repeat, can't do on a per window basis */
4148 case 9: /* X10 mouse reporting */ 3686 case 9: /* X10 mouse reporting */
4149 if (state) /* orthogonal */ 3687 if (state) /* orthogonal */
4150 priv_modes &= ~PrivMode_MouseX11; 3688 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4151 break; 3689 break;
4152#ifdef scrollBar_esc 3690#ifdef scrollBar_esc
4153 case scrollBar_esc: 3691 case scrollBar_esc:
4154 if (scrollbar_mapping (state)) 3692 if (scrollBar.map (state))
4155 { 3693 {
4156 resize_all_windows (0, 0, 0); 3694 resize_all_windows (0, 0, 0);
4157 scr_touch (true); 3695 scr_touch (true);
4158 } 3696 }
4159 break; 3697 break;
… …
4168 break; 3706 break;
4169 /* case 66: - application key pad */ 3707 /* case 66: - application key pad */
4170 /* case 67: - backspace key */ 3708 /* case 67: - backspace key */
4171 case 1000: /* X11 mouse reporting */ 3709 case 1000: /* X11 mouse reporting */
4172 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
4173 priv_modes &= ~PrivMode_MouseX10; 3711 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4174 break; 3712 break;
4175#if 0
4176 case 1001: 3713 case 1002:
4177 break; /* X11 mouse highlighting */ 3714 case 1003:
4178#endif 3715 if (state)
3716 {
3717 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3718 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3719 vt_emask_mouse = PointerMotionMask;
3720 }
3721 else
3722 vt_emask_mouse = NoEventMask;
3723 vt_select_input ();
3724 break;
4179 case 1010: /* scroll to bottom on TTY output inhibit */ 3725 case 1010: /* scroll to bottom on TTY output inhibit */
4180 set_option (Opt_scrollTtyOutput, !state); 3726 set_option (Opt_scrollTtyOutput, !state);
4181 break; 3727 break;
4182 case 1011: /* scroll to bottom on key press */ 3728 case 1011: /* scroll to bottom on key press */
4183 set_option (Opt_scrollTtyKeypress, state); 3729 set_option (Opt_scrollTtyKeypress, state);
4184 break; 3730 break;
4185 case 1047: /* secondary screen w/ clearing last */ 3731 case 1047: /* secondary screen w/ clearing last */
4186 if (OPTION (Opt_secondaryScreen)) 3732 if (option (Opt_secondaryScreen))
4187 if (current_screen != PRIMARY) 3733 if (current_screen != PRIMARY)
4188 scr_erase_screen (2); 3734 scr_erase_screen (2);
4189 scr_change_screen (state); 3735 scr_change_screen (state);
4190 break; 3736 break;
4191 case 1049: /* secondary screen w/ clearing first */ 3737 case 1049: /* secondary screen w/ clearing first */
4192 scr_change_screen (state); 3738 scr_change_screen (state);
4193 if (OPTION (Opt_secondaryScreen)) 3739 if (option (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY) 3740 if (current_screen != PRIMARY)
4195 scr_erase_screen (2); 3741 scr_erase_screen (2);
4196 break; 3742 break;
4197 default: 3743 default:
4198 break; 3744 break;
… …
4326 scr_color (Color_bg, Color_bg); 3872 scr_color (Color_bg, Color_bg);
4327 break; 3873 break;
4328 3874
4329 //case 50: // not variable spacing 3875 //case 50: // not variable spacing
4330 3876
4331#if ENABLE_FRILLS 3877#if !ENABLE_MINIMAL
4332 case 90: 3878 case 90:
4333 case 91: /* set bright fg color */ 3879 case 91: /* set bright fg color */
4334 case 92: 3880 case 92:
4335 case 93: 3881 case 93:
4336 case 94: 3882 case 94:
… …
4360rxvt_term::process_graphics () 3906rxvt_term::process_graphics ()
4361{ 3907{
4362 unicode_t ch, cmd = cmd_getc (); 3908 unicode_t ch, cmd = cmd_getc ();
4363 3909
4364 if (cmd == 'Q') 3910 if (cmd == 'Q')
3911 {
4365 { /* query graphics */ 3912 /* query graphics */
4366 tt_printf ("\033G0\012"); /* no graphics */ 3913 tt_printf ("\033G0\012"); /* no graphics */
4367 return; 3914 return;
4368 } 3915 }
4369 /* swallow other graphics sequences until terminating ':' */ 3916 /* swallow other graphics sequences until terminating ':' */
4370 do 3917 do
… …
4420 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3967 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4421 3968
4422 memcpy (v_buffer + v_buflen, data, len); 3969 memcpy (v_buffer + v_buflen, data, len);
4423 v_buflen += len; 3970 v_buflen += len;
4424 3971
4425 pty_ev.set (EVENT_READ | EVENT_WRITE); 3972 pty_ev.set (ev::READ | ev::WRITE);
4426} 3973}
4427 3974
4428void rxvt_term::pty_write () 3975void rxvt_term::pty_write ()
4429{ 3976{
4430 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3977 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4435 3982
4436 if (v_buflen == 0) 3983 if (v_buflen == 0)
4437 { 3984 {
4438 free (v_buffer); 3985 free (v_buffer);
4439 v_buffer = 0; 3986 v_buffer = 0;
4440 v_buflen = 0;
4441 3987
4442 pty_ev.set (EVENT_READ); 3988 pty_ev.set (ev::READ);
4443 return; 3989 return;
4444 } 3990 }
4445 3991
4446 memmove (v_buffer, v_buffer + written, v_buflen); 3992 memmove (v_buffer, v_buffer + written, v_buflen);
4447 } 3993 }
4448 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3994 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4449 pty_ev.set (EVENT_READ); 3995 pty_ev.set (ev::READ);
4450} 3996}
4451 3997
4452/*----------------------- end-of-file (C source) -----------------------*/ 3998/*----------------------- end-of-file (C source) -----------------------*/
4453 3999

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines