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.294 by root, Mon Jan 30 20:12:37 2006 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 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);
232 231
… …
280 } 279 }
281 280
282 iso14755buf = 0; 281 iso14755buf = 0;
283} 282}
284 283
285int 284static int
286rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
287{ 286{
288 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
289 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
290 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
291 { 290 {
… …
299 298
300 return -1; 299 return -1;
301} 300}
302#endif 301#endif
303 302
304/*{{{ Convert the keypress event into a string */
305void 303void
306rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
307{ 305{
308 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
309 unsigned int newlen;
310 KeySym keysym; 307 KeySym keysym;
311 int valid_keysym; 308 int valid_keysym;
312 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
313 315
314 /* 316 /*
315 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
316 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
317 * 319 *
… …
497# if ISO_14755 499# if ISO_14755
498 iso14755_51 (0); 500 iso14755_51 (0);
499# endif 501# endif
500 return; 502 return;
501 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
502 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
503 { 513 {
504 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
505 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
506# if ISO_14755 516# if ISO_14755
… …
508# endif 518# endif
509 return; 519 return;
510 } 520 }
511 else 521 else
512 { 522 {
513# if ENABLE_OVERLAY 523# if ISO_14755
514 scr_overlay_off (); 524 scr_overlay_off ();
515# endif 525# endif
516 iso14755buf = 0; 526 iso14755buf = 0;
517 } 527 }
518 } 528 }
519 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
520 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
521 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
522 { 532 {
523 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
524# if ENABLE_OVERLAY 534# if ISO_14755
525 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
526 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
527# endif 537# endif
528 } 538 }
529#endif 539#endif
530 540
531#ifdef PRINTPIPE 541#ifdef PRINTPIPE
532 if (keysym == XK_Print) 542 if (keysym == XK_Print)
533 { 543 {
534 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
535 return; 545 return;
536 } 546 }
537#endif 547#endif
538 548
539 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
540 { 550 {
551 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
552 unsigned int newlen = 1;
553#ifdef XK_KP_Home
554 static const KeySym keypadtrans[] = {
555 XK_KP_7, // XK_KP_Home
556 XK_KP_4, // XK_KP_Left
557 XK_KP_8, // XK_KP_Up
558 XK_KP_6, // XK_KP_Right
559 XK_KP_2, // XK_KP_Down
560#ifndef UNSHIFTED_SCROLLKEYS
561 XK_KP_9, // XK_KP_Prior
562 XK_KP_3, // XK_KP_Next
563#else
564 XK_Prior,
565 XK_Next,
566#endif
567 XK_KP_1, // XK_KP_End
568 XK_KP_5, // XK_KP_Begin
569 };
570
571 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
541 { 572 {
542 newlen = 1; 573 unsigned int index = keysym - XK_KP_Home;
574 keysym = kp ? keypadtrans[index] : XK_Home + index;
575 }
576 else if (keysym == XK_KP_Insert)
577 keysym = kp ? XK_KP_0 : XK_Insert;
578#ifndef NO_DELETE_KEY
579 else if (keysym == XK_KP_Delete)
580 keysym = kp ? XK_KP_Decimal : XK_Delete;
581#endif
582#endif
543 switch (keysym) 583 switch (keysym)
544 { 584 {
545#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
546 case XK_BackSpace: 586 case XK_BackSpace:
547 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
… …
549 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
550 ^ !!ctrl) ? '\b' : '\177'; 590 ^ !!ctrl) ? '\b' : '\177';
551 kbuf[1] = '\0'; 591 kbuf[1] = '\0';
552 } 592 }
553 else 593 else
554 strcpy (kbuf, key_backspace); 594 strcpy (kbuf, rs[Rs_backspace_key]);
555 break; 595 break;
556#endif 596#endif
557#ifndef NO_DELETE_KEY 597#ifndef NO_DELETE_KEY
558# ifdef XK_KP_Prior
559 case XK_KP_Delete:
560 /* allow shift to override */
561 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
562 {
563 strcpy (kbuf, "\033On");
564 break;
565 }
566 /* FALLTHROUGH */
567# endif
568 case XK_Delete: 598 case XK_Delete:
569 strcpy (kbuf, key_delete); 599 strcpy (kbuf, rs[Rs_delete_key]);
570 break; 600 break;
571#endif 601#endif
572 case XK_Tab: 602 case XK_Tab:
573 if (shft) 603 if (shft)
574 strcpy (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
… …
584#endif 614#endif
585 newlen = 0; 615 newlen = 0;
586 } 616 }
587 break; 617 break;
588 618
589#ifdef XK_KP_Left
590 case XK_KP_Up: /* \033Ox or standard */
591 case XK_KP_Down: /* \033Or or standard */
592 case XK_KP_Right: /* \033Ov or standard */
593 case XK_KP_Left: /* \033Ot or standard */
594 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
595 {
596 strcpy (kbuf, "\033OZ");
597 kbuf[2] = "txvr"[keysym - XK_KP_Left];
598 break;
599 }
600 else
601 /* translate to std. cursor key */
602 keysym = XK_Left + (keysym - XK_KP_Left);
603 /* FALLTHROUGH */
604#endif
605 case XK_Up: /* "\033[A" */ 619 case XK_Up: /* "\033[A" */
606 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
607 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
608 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
609 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
… …
619 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
620 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
621 break; 635 break;
622 636
623#ifndef UNSHIFTED_SCROLLKEYS 637#ifndef UNSHIFTED_SCROLLKEYS
624# ifdef XK_KP_Prior
625 case XK_KP_Prior:
626 /* allow shift to override */
627 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
628 {
629 strcpy (kbuf, "\033Oy");
630 break;
631 }
632 /* FALLTHROUGH */
633# endif
634 case XK_Prior: 638 case XK_Prior:
635 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
636 break; 640 break;
637# ifdef XK_KP_Next
638 case XK_KP_Next:
639 /* allow shift to override */
640 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
641 {
642 strcpy (kbuf, "\033Os");
643 break;
644 }
645 /* FALLTHROUGH */
646# endif
647 case XK_Next: 641 case XK_Next:
648 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
649 break; 643 break;
650#endif 644#endif
651 case XK_KP_Enter: 645 case XK_KP_Enter:
652 /* allow shift to override */ 646 /* allow shift to override */
653 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 647 if (kp)
654 { 648 {
655 strcpy (kbuf, "\033OM"); 649 strcpy (kbuf, "\033OM");
656 break; 650 break;
657 } 651 }
658 652
… …
670 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
671 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
672 } 666 }
673 break; 667 break;
674 668
675#ifdef XK_KP_Begin
676 case XK_KP_Begin:
677 strcpy (kbuf, "\033Ou");
678 break;
679
680#endif
681 case XK_KP_F1: /* "\033OP" */ 669 case XK_KP_F1: /* "\033OP" */
682 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
683 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
684 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
685 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
… …
701 case XK_KP_6: /* "\033Ov" : "6" */ 689 case XK_KP_6: /* "\033Ov" : "6" */
702 case XK_KP_7: /* "\033Ow" : "7" */ 690 case XK_KP_7: /* "\033Ow" : "7" */
703 case XK_KP_8: /* "\033Ox" : "8" */ 691 case XK_KP_8: /* "\033Ox" : "8" */
704 case XK_KP_9: /* "\033Oy" : "9" */ 692 case XK_KP_9: /* "\033Oy" : "9" */
705 /* allow shift to override */ 693 /* allow shift to override */
706 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 694 if (kp)
707 { 695 {
708 strcpy (kbuf, "\033Oj"); 696 strcpy (kbuf, "\033Oj");
709 kbuf[2] += (keysym - XK_KP_Multiply); 697 kbuf[2] += (keysym - XK_KP_Multiply);
710 } 698 }
711 else 699 else
… …
717 705
718 case XK_Find: 706 case XK_Find:
719 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
720 break; 708 break;
721 709
722#ifdef XK_KP_End
723 case XK_KP_Insert:
724 /* allow shift to override */
725 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
726 {
727 strcpy (kbuf, "\033Op");
728 break;
729 }
730 /* FALLTHROUGH */
731#endif
732 case XK_Insert: 710 case XK_Insert:
733 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
734 break; 712 break;
735#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
736 case DXK_Remove: 714 case DXK_Remove:
… …
740 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
741 break; 719 break;
742 case XK_Select: 720 case XK_Select:
743 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
744 break; 722 break;
745#ifdef XK_KP_End
746 case XK_KP_End:
747 /* allow shift to override */
748 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
749 {
750 strcpy (kbuf, "\033Oq");
751 break;
752 }
753 /* FALLTHROUGH */
754#endif
755 case XK_End: 723 case XK_End:
756 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
757 break; 725 break;
758#ifdef XK_KP_Home
759 case XK_KP_Home:
760 /* allow shift to override */
761 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
762 {
763 strcpy (kbuf, "\033Ow");
764 break;
765 }
766 /* FALLTHROUGH */
767#endif
768 case XK_Home: 726 case XK_Home:
769 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
770 break; 728 break;
771 729
772#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
… …
829 break; 787 break;
830 } 788 }
831 789
832 if (newlen) 790 if (newlen)
833 len = strlen (kbuf); 791 len = strlen (kbuf);
834 }
835 792
836 /* 793 /*
837 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
838 */ 795 */
839#ifdef META8_OPTION 796#ifdef META8_OPTION
… …
874 return; 831 return;
875 832
876 if (len <= 0) 833 if (len <= 0)
877 return; /* not mapped */ 834 return; /* not mapped */
878 835
879 if (OPTION (Opt_scrollTtyKeypress)) 836 if (option (Opt_scrollTtyKeypress))
880 if (view_start) 837 if (view_start)
881 { 838 {
882 view_start = 0; 839 view_start = 0;
883 want_refresh = 1; 840 want_refresh = 1;
884 } 841 }
… …
908 tt_write (&ch, 1); 865 tt_write (&ch, 1);
909 } 866 }
910 867
911 tt_write (kbuf, (unsigned int)len); 868 tt_write (kbuf, (unsigned int)len);
912} 869}
913/*}}} */ 870
871void
872rxvt_term::key_release (XKeyEvent &ev)
873{
874#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
875 KeySym keysym;
876
877 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
878#endif
879
880#if ENABLE_FRILLS || ISO_14755
881 // ISO 14755 support
882 if (iso14755buf)
883 if (iso14755buf & ISO_14755_52)
884 {
885# if ISO_14755
886 scr_overlay_off ();
887# endif
888# if ISO_14755
889 // iso14755 part 5.2 handling: release time
890 // first: controls
891 if ((ev.state & ControlMask)
892 && ((keysym >= 0x40 && keysym <= 0x5f)
893 || (keysym >= 0x61 && keysym <= 0x7f)))
894 {
895 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
896 commit_iso14755 ();
897
898 return;
899 }
900
901 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
902 if (i[0] == keysym)
903 {
904 iso14755buf = ISO_14755_51 | i[1];
905 commit_iso14755 ();
906
907 return;
908 }
909
910 scr_bell ();
911# endif
912 iso14755buf = 0;
913
914 return;
915 }
916 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
917 {
918# if ISO_14755
919 scr_overlay_off ();
920# endif
921 if (iso14755buf & ISO_14755_51)
922 commit_iso14755 ();
923#if ISO_14755
924 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
925 {
926 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
927
928 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
929 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
930 }
931# endif
932 else
933 iso14755buf = 0;
934 }
935#endif
936
937 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
938 return;
939
940#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
941 if (!(ev.state & ControlMask))
942 slip_wheel_ev.stop ();
943 else if (keysym == XK_Control_L || keysym == XK_Control_R)
944 mouse_slip_wheel_speed = 0;
945#endif
946}
914 947
915#if defined (KEYSYM_RESOURCE) 948#if defined (KEYSYM_RESOURCE)
916unsigned int 949unsigned int
917rxvt_term::cmd_write (const char *str, unsigned int count) 950rxvt_term::cmd_write (const char *str, unsigned int count)
918{ 951{
… …
948void 981void
949rxvt_term::flush () 982rxvt_term::flush ()
950{ 983{
951 flush_ev.stop (); 984 flush_ev.stop ();
952 985
953#ifdef TRANSPARENT 986#ifdef HAVE_BG_PIXMAP
954 if (want_full_refresh) 987 if (bgPixmap.check_clearChanged ())
955 { 988 {
956 want_full_refresh = 0; 989// scr_clear (true); This needs to be researched further!
957 scr_clear ();
958 scr_touch (false); 990 scr_touch (false);
959 } 991 }
960#endif 992#endif
961 993
962 if (want_refresh) 994 if (want_refresh)
… …
1007 } 1039 }
1008 1040
1009 display->flush (); 1041 display->flush ();
1010} 1042}
1011 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
1012void 1045void
1013rxvt_term::check_cb (check_watcher &w) 1046rxvt_term::refresh_check ()
1047{
1048 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050
1051 display->flush ();
1052}
1053
1054void
1055rxvt_term::flush_cb (ev::timer &w, int revents)
1014{ 1056{
1015 make_current (); 1057 make_current ();
1016 1058
1017 display->flush ();
1018
1019 if (want_refresh && !flush_ev.active)
1020 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1021}
1022
1023void
1024rxvt_term::flush_cb (time_watcher &w)
1025{
1026 make_current ();
1027
1028 refresh_limit = 1;
1029 refresh_count = 0; 1059 refresh_count = 0;
1030 flush (); 1060 flush ();
1031} 1061}
1032 1062
1033#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1034void 1064void
1035rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1036{ 1066{
1037 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1038 want_refresh = 1; 1068 want_refresh = 1;
1039 1069 refresh_check ();
1040 w.start (w.at + CURSOR_BLINK_INTERVAL);
1041} 1070}
1042#endif 1071#endif
1043 1072
1044#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1045void 1074void
1046rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1047{ 1076{
1048 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1049 { 1078 {
1050 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1051 want_refresh = 1; 1080 want_refresh = 1;
1052 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1053 } 1082 }
1083 else
1084 w.stop ();
1054} 1085}
1055#endif 1086#endif
1056 1087
1057#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1058void 1089void
1059rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1060{ 1091{
1061 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1062 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1063 { 1094 {
1064 want_refresh = 1; 1095 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1066 } 1097 }
1098 else
1099 w.stop ();
1067} 1100}
1068#endif 1101#endif
1069 1102
1070#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1071void 1104void
1072rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1073{ 1106{
1074 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1075 { 1108 {
1076 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1077 want_refresh = 1; 1110 want_refresh = 1;
1078 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1079 } 1112 }
1113 else
1114 w.stop ();
1080} 1115}
1081#endif 1116#endif
1082 1117
1083#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1084void 1119void
1085rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1086{ 1121{
1087 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1088 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1089 : scr_page (UP, mouse_slip_wheel_speed))
1090 { 1123 {
1091 if (view_start == top_row || view_start == 0)
1092 mouse_slip_wheel_speed = 0;
1093
1094 want_refresh = 1; 1124 want_refresh = 1;
1095 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1096 } 1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1132 }
1097} 1133}
1098#endif 1134#endif
1099 1135
1100#if HAVE_SCHED_YIELD 1136#if LINUX_YIELD_HACK
1101static struct event_handler 1137static struct event_handler
1102{ 1138{
1103 check_watcher cw_yield; 1139 ev::prepare yield_ev;
1104 1140
1105 void yield (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1106 { 1142 {
1107 sched_yield (); 1143 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS.
1147
1148 struct timespec ts = { 0, 0 };
1149 nanosleep (&ts, 0);
1150
1108 w.stop (); 1151 w.stop ();
1109 } 1152 }
1110 1153
1111 event_handler () 1154 event_handler ()
1112 : cw_yield (this, &event_handler::yield) 1155 : yield_ev (this, &event_handler::yield_cb)
1113 { 1156 {
1114 } 1157 }
1115} event_handler; 1158} event_handler;
1116#endif 1159#endif
1117 1160
… …
1137 cmdbuf_endp += r; 1180 cmdbuf_endp += r;
1138 return true; 1181 return true;
1139 } 1182 }
1140 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1183 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1141 { 1184 {
1142#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1143 if (display->is_local) 1186 if (display->is_local)
1144 event_handler.cw_yield.start (); 1187 event_handler.yield_ev.start ();
1145#endif 1188#endif
1146 } 1189 }
1147 else 1190 else
1148 { 1191 {
1149 pty_ev.stop (); 1192 pty_ev.stop ();
1150 1193
1151 if (!OPTION (Opt_hold)) 1194 if (!option (Opt_hold))
1152 destroy (); 1195 destroy ();
1153 } 1196 }
1154 1197
1155 return false; 1198 return false;
1156} 1199}
1157 1200
1158void 1201void
1159rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1160{ 1203{
1161 make_current (); 1204 make_current ();
1162 1205
1163 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1164 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1165 while (pty_fill ()) 1208 while (pty_fill ())
1166 if (cmd_parse ()) 1209 if (cmd_parse ())
1167 break; 1210 break;
1168 1211
1169 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1170 pty_write (); 1213 pty_write ();
1214
1215 refresh_check ();
1171} 1216}
1172 1217
1173void 1218void
1174rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1175{ 1220{
1176 XDefineCursor (xdisp, vt, TermWin_cursor); 1221 XDefineCursor (dpy, vt, TermWin_cursor);
1177 recolour_cursor (); 1222 recolour_cursor ();
1178 1223
1179#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1180 hidden_pointer = 0; 1225 hidden_pointer = 0;
1181 1226
1182 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1183 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1184#endif 1229#endif
1185} 1230}
1186 1231
1187#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1188void 1233void
1189rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1190{ 1235{
1191 if (!OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1192 return; 1237 return;
1193 1238
1194 XDefineCursor (xdisp, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1195 XFlush (xdisp); 1240 XFlush (dpy);
1196 1241
1197 hidden_pointer = 1; 1242 hidden_pointer = 1;
1198} 1243}
1199 1244
1200void 1245void
1201rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1202{ 1247{
1203 make_current (); 1248 make_current ();
1204 1249
1205 pointer_blank (); 1250 pointer_blank ();
1206} 1251}
… …
1209void 1254void
1210rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1211{ 1256{
1212 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1213 int x, y; 1258 int x, y;
1259 int code = 32;
1214 1260
1215 x = ev.x; 1261 x = Pixel2Col (ev.x);
1216 y = ev.y; 1262 y = Pixel2Row (ev.y);
1217 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1218 1271
1219 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1220 button_number = 3; 1273 button_number = 3;
1221 else 1274 else
1222 { 1275 {
… …
1268 x + 1, 1321 x + 1,
1269 y + 1); 1322 y + 1);
1270#endif 1323#endif
1271 1324
1272 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1273 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1274 (32 + x + 1), 1327 (32 + x + 1),
1275 (32 + y + 1)); 1328 (32 + y + 1));
1276} 1329}
1277 1330
1278/*{{{ process an X event */ 1331/*{{{ process an X event */
1279void 1332void
1280rxvt_term::x_cb (XEvent &ev) 1333rxvt_term::x_cb (XEvent &ev)
1281{ 1334{
1282 make_current (); 1335 make_current ();
1283 1336
1284 dLocal (Display *, xdisp); 1337 dLocal (Display *, dpy);
1285 1338
1286 if (ev.xany.window == vt 1339 if (ev.xany.window == vt
1287 && SHOULD_INVOKE (HOOK_X_EVENT) 1340 && SHOULD_INVOKE (HOOK_X_EVENT)
1288 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1341 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1289 return; 1342 return;
… …
1294 unsigned int unused_mask; 1347 unsigned int unused_mask;
1295 1348
1296 switch (ev.type) 1349 switch (ev.type)
1297 { 1350 {
1298 case KeyPress: 1351 case KeyPress:
1299#if ISO_14755 1352 key_press (ev.xkey);
1300 if (!(iso14755buf & ISO_14755_52))
1301#endif
1302 lookup_key (ev.xkey);
1303
1304 break; 1353 break;
1305 1354
1306 case KeyRelease: 1355 case KeyRelease:
1307 { 1356 key_release (ev.xkey);
1308#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1309 KeySym keysym;
1310
1311 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1312#endif
1313
1314#if ENABLE_FRILLS || ISO_14755
1315 // ISO 14755 support
1316 if (iso14755buf)
1317 if (iso14755buf & ISO_14755_52)
1318 {
1319# if ENABLE_OVERLAY
1320 scr_overlay_off ();
1321# endif
1322# if ISO_14755
1323 // iso14755 part 5.2 handling: release time
1324 // first: controls
1325 if ((ev.xkey.state & ControlMask)
1326 && ((keysym >= 0x40 && keysym <= 0x5f)
1327 || (keysym >= 0x61 && keysym <= 0x7f)))
1328 {
1329 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1330 commit_iso14755 ();
1331 goto skip_switch;
1332 }
1333
1334 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1335 if (i[0] == keysym)
1336 {
1337 iso14755buf = ISO_14755_51 | i[1];
1338 commit_iso14755 ();
1339 goto skip_switch;
1340 }
1341
1342 scr_bell ();
1343# endif
1344 iso14755buf = 0;
1345 break;
1346 }
1347 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1348 {
1349# if ENABLE_OVERLAY
1350 scr_overlay_off ();
1351# endif
1352 if (iso14755buf & ISO_14755_51)
1353 commit_iso14755 ();
1354#if ISO_14755
1355 else if (iso14755buf & ISO_14755_STARTED)
1356 {
1357 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1358
1359 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1360 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1361 }
1362# endif
1363 else
1364 iso14755buf = 0;
1365 }
1366#endif
1367
1368 if (ev.xany.window == vt
1369 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1370 break;
1371
1372#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1373 if (!(ev.xkey.state & ControlMask))
1374 slip_wheel_ev.stop ();
1375 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1376 mouse_slip_wheel_speed = 0;
1377#endif
1378 break; 1357 break;
1379 }
1380 1358
1381 case ButtonPress: 1359 case ButtonPress:
1382 button_press (ev.xbutton); 1360 button_press (ev.xbutton);
1383 break; 1361 break;
1384 1362
… …
1399 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1377 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1378 destroy ();
1401 } 1379 }
1402#if ENABLE_EWMH 1380#if ENABLE_EWMH
1403 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1404 XSendEvent (xdisp, ev.xclient.window = display->root, 1382 XSendEvent (dpy, ev.xclient.window = display->root,
1405 False, SubstructureRedirectMask | SubstructureNotifyMask, 1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1406 &ev); 1384 &ev);
1407#endif 1385#endif
1408 } 1386 }
1409 } 1387 }
… …
1415 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1416 focus_out (); 1394 focus_out ();
1417 } 1395 }
1418#endif 1396#endif
1419 } 1397 }
1420 break;
1421
1422 case MappingNotify:
1423 XRefreshKeyboardMapping (&ev.xmapping);
1424 break; 1398 break;
1425 1399
1426 /* 1400 /*
1427 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1428 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1447 break; 1421 break;
1448 } 1422 }
1449 break; 1423 break;
1450 1424
1451 case FocusIn: 1425 case FocusIn:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1452 focus_in (); 1429 focus_in ();
1453 break; 1430 break;
1454 1431
1455 case FocusOut: 1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1456 focus_out (); 1436 focus_out ();
1457 break; 1437 break;
1458 1438
1459 case ConfigureNotify: 1439 case ConfigureNotify:
1440 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height);*/
1460 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1461 { 1444 {
1462 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1463 ; 1446 ;
1464 1447
1465 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1466 { 1449 {
1467 seen_resize = 1; 1450 seen_resize = 1;
1468 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1469 } 1452 }
1453 else
1454 {
1455#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped)
1459 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1463#endif
1464 }
1470 1465
1471 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1472
1473#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1474 if (OPTION (Opt_transparent))
1475 check_our_parents ();
1476#endif
1477 } 1467 }
1478 break; 1468 break;
1479 1469
1480 case PropertyNotify: 1470 case PropertyNotify:
1481 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1497 case SelectionRequest: 1487 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1499 break; 1489 break;
1500 1490
1501 case MapNotify: 1491 case MapNotify:
1492#ifdef HAVE_BG_PIXMAP
1493 /* This is needed spcifically to fix the case of no window manager or a
1494 * non-reparenting window manager. In those cases we never get first
1495 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1496 * care of multiplicity of ConfigureNotify events arriwing while WM does
1497 * reparenting.
1498 * We should not render background immidiately, as there could be several
1499 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1500 * by scheduling background redraw as soon as we can, but giving a short
1501 * bit of time for ConfigureNotifies to arrive.
1502 * We should render background PRIOR to drawing any text, but AFTER all
1503 * of ConfigureNotifys for the best results.
1504 */
1505 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1506 update_background_ev.start (0.025);
1507#endif
1502 mapped = 1; 1508 mapped = 1;
1503#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1504 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start ();
1505#endif 1511#endif
1506 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507 break; 1513 break;
1508 1514
1509 case UnmapNotify: 1515 case UnmapNotify:
… …
1511#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1512 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1513#endif 1519#endif
1514 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 break; 1521 break;
1516
1517#ifdef TRANSPARENT
1518 case ReparentNotify:
1519 rootwin_cb (ev);
1520 break;
1521#endif /* TRANSPARENT */
1522 1522
1523 case GraphicsExpose: 1523 case GraphicsExpose:
1524 case Expose: 1524 case Expose:
1525 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1526 { 1526 {
1527 do 1527 do
1528 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1531 }
1530 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1531 1533
1532 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1533 1535
1534 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1540 }
1537 1541
1538 want_refresh = 1; 1542 want_refresh = 1;
1539 } 1543 }
1540 else 1544 else
1541 { 1545 {
1542 XEvent unused_event; 1546 XEvent unused_event;
1543 1547
1544 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1545 ; 1549 ;
1546 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1547 ; 1551 ;
1548 1552
1549 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1550 { 1554 {
1551 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1552 scrollbar_show (0); 1556 scrollbar_show (0);
1553 } 1557 }
1554
1555#ifdef TRANSPARENT
1556 if (am_transparent && ev.xany.window == parent[0])
1557 XClearWindow (xdisp, ev.xany.window);
1558#endif
1559 } 1558 }
1560 break; 1559 break;
1561 1560
1562 case MotionNotify: 1561 case MotionNotify:
1563#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
1564 if (hidden_pointer) 1563 if (hidden_pointer)
1565 pointer_unblank (); 1564 pointer_unblank ();
1566#endif 1565#endif
1566 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1567 || priv_modes & PrivMode_MouseAnyEvent)
1568 mouse_report (ev.xbutton);
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1569 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1570 break;
1569 1571
1570 if (ev.xany.window == vt) 1572 if (ev.xany.window == vt)
1571 { 1573 {
1572 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1574 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1573 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1575 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1574 ; // nop 1576 ; // nop
1575 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1577 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1576 { 1578 {
1577 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1578 ; 1580 ;
1579 1581
1580 XQueryPointer (xdisp, vt, 1582 XQueryPointer (dpy, vt,
1581 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1582 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1583 &ev.xbutton.x, &ev.xbutton.y, 1585 &ev.xbutton.x, &ev.xbutton.y,
1584 &ev.xbutton.state); 1586 &ev.xbutton.state);
1585#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
… …
1605 int dist; 1607 int dist;
1606 1608
1607 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1608 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1609 */ 1611 */
1610 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1611 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1612 1614
1613 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1614 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1615 */ 1617 */
1616 selection_save_x = ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
… …
1638 else 1640 else
1639 { 1641 {
1640 /* we are within the text window, so we 1642 /* we are within the text window, so we
1641 * shouldn't be scrolling 1643 * shouldn't be scrolling
1642 */ 1644 */
1643 if (sel_scroll_ev.active)
1644 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1645 } 1646 }
1646#endif 1647#endif
1647#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1648 } 1649 }
1649#endif 1650#endif
1650 } 1651 }
1651 } 1652 }
1652 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1653 { 1654 {
1654 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1655 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1656 ; 1657 ;
1657 1658
1658 XQueryPointer (xdisp, scrollBar.win, 1659 XQueryPointer (dpy, scrollBar.win,
1659 &unused_root, &unused_child, 1660 &unused_root, &unused_child,
1660 &unused_root_x, &unused_root_y, 1661 &unused_root_x, &unused_root_y,
1661 &ev.xbutton.x, &ev.xbutton.y, 1662 &ev.xbutton.x, &ev.xbutton.y,
1662 &unused_mask); 1663 &unused_mask);
1663 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1664 scrollbar_size ()); 1665 scrollbar_size ());
1665 want_refresh = 1; 1666 want_refresh = 1;
1666 refresh_limit = 0;
1667 scrollbar_show (1); 1667 scrollbar_show (1);
1668 } 1668 }
1669 break; 1669 break;
1670 } 1670 }
1671 1671
1672skip_switch: ;
1673
1674#if defined(CURSOR_BLINK) 1672#if defined(CURSOR_BLINK)
1675 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1673 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1676 { 1674 {
1677 if (hidden_cursor) 1675 if (hidden_cursor)
1678 { 1676 {
1679 hidden_cursor = 0; 1677 hidden_cursor = 0;
1680 want_refresh = 1; 1678 want_refresh = 1;
1681 } 1679 }
1682 1680
1683 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1681 cursor_blink_ev.again ();
1684 } 1682 }
1685#endif 1683#endif
1686 1684
1687#if defined(POINTER_BLANK) 1685#if defined(POINTER_BLANK)
1688 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1689 { 1687 {
1690 if (ev.type == MotionNotify 1688 if (ev.type == MotionNotify
1691 || ev.type == ButtonPress 1689 || ev.type == ButtonPress
1692 || ev.type == ButtonRelease) 1690 || ev.type == ButtonRelease)
1693 if (hidden_pointer) 1691 if (hidden_pointer)
… …
1695 1693
1696 if (ev.type == KeyPress && hidden_pointer == 0) 1694 if (ev.type == KeyPress && hidden_pointer == 0)
1697 pointer_blank (); 1695 pointer_blank ();
1698 } 1696 }
1699#endif 1697#endif
1698
1699 refresh_check ();
1700} 1700}
1701 1701
1702void 1702void
1703rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1704{ 1704{
1705 if (!focus) 1705 if (!focus)
1706 { 1706 {
1707 focus = 1; 1707 focus = 1;
1708 want_refresh = 1; 1708 want_refresh = 1;
1709 1709
1710 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1711 1711
1712#if USE_XIM 1712#if USE_XIM
1713 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1714 { 1714 {
1715 IMSetStatusPosition (); 1715 IMSetPosition ();
1716 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1717 } 1717 }
1718#endif 1718#endif
1719#if CURSOR_BLINK 1719#if CURSOR_BLINK
1720 if (OPTION (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1721 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1722#endif 1722#endif
1723#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1724 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1725 { 1725 {
1726 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1727 scr_recolour (); 1727 scr_recolour ();
1728 } 1728 }
1729#endif 1729#endif
1730#if ENABLE_FRILLS
1731 if (option (Opt_urgentOnBell))
1732 {
1733 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1734 {
1735 h->flags &= ~XUrgencyHint;
1736 XSetWMHints (dpy, parent[0], h);
1737 }
1738 }
1739#endif
1730 } 1740 }
1731} 1741}
1732 1742
1733void 1743void
1734rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1742 1752
1743#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1744 if (iso14755buf) 1754 if (iso14755buf)
1745 { 1755 {
1746 iso14755buf = 0; 1756 iso14755buf = 0;
1747# if ENABLE_OVERLAY 1757# if ISO_14755
1748 scr_overlay_off (); 1758 scr_overlay_off ();
1749# endif 1759# endif
1750 } 1760 }
1751#endif 1761#endif
1752#if USE_XIM 1762#if USE_XIM
1753 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1754 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1755#endif 1765#endif
1756#if CURSOR_BLINK 1766#if CURSOR_BLINK
1757 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1758 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1759 hidden_cursor = 0; 1770 hidden_cursor = 0;
1760#endif 1771#endif
1761#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1763 { 1774 {
… …
1766 } 1777 }
1767#endif 1778#endif
1768 } 1779 }
1769} 1780}
1770 1781
1771#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1772void 1796void
1773rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1774{ 1798{
1775 make_current (); 1799 make_current ();
1776 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if ENABLE_TRANSPARENCY
1777 switch (ev.type) 1806 switch (ev.type)
1778 { 1807 {
1779 case PropertyNotify: 1808 case PropertyNotify:
1780 /* 1809 /*
1781 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1782 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1783 */ 1812 */
1784 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1785 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1786 return; 1815 {
1816 bgPixmap.set_root_pixmap ();
1817 update_background ();
1818 }
1787 1819
1788 /* FALLTHROUGH */
1789 case ReparentNotify:
1790 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1791 want_refresh = want_full_refresh = 1;
1792 break; 1820 break;
1793 } 1821 }
1822# endif
1823
1824 refresh_check ();
1794} 1825}
1795#endif 1826#endif
1796 1827
1797void 1828void
1798rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
1853 mouse_report (ev); 1884 mouse_report (ev);
1854 } 1885 }
1855#else 1886#else
1856 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1857 mouse_report (ev); 1888 mouse_report (ev);
1858#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1859 1890
1860 } 1891 }
1861 else 1892 else
1862 { 1893 {
1863 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
… …
1911 } 1942 }
1912 1943
1913 /* 1944 /*
1914 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1915 */ 1946 */
1916 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1917 { 1948 {
1918 scrollBar.setIdle (); 1949 page_dirn direction = NO_DIR;
1950
1951 if (scrollBar.upButton (ev.y))
1952 direction = UP; /* up */
1953 else if (scrollBar.dnButton (ev.y))
1954 direction = DN; /* down */
1955
1956 scrollBar.state = STATE_IDLE;
1919 /* 1957 /*
1920 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1921 * move up if mouse is above slider 1959 * move up if mouse is above slider
1922 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1923 * 1961 *
… …
1932 /* 1970 /*
1933 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1934 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1935 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1936 */ 1974 */
1937 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1938 && scrollbarnext_upButton (ev.y))
1939 || (scrollBar.style == R_SB_RXVT
1940 && scrollbarrxvt_upButton (ev.y)))
1941 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1942 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1943 && scrollbarnext_dnButton (ev.y))
1944 || (scrollBar.style == R_SB_RXVT
1945 && scrollbarrxvt_dnButton (ev.y)))
1946 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1947 else 1979 else
1948 switch (ev.button) 1980 switch (ev.button)
1949 { 1981 {
1950 case Button2: 1982 case Button2:
… …
1957 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
1958 break; 1990 break;
1959 } 1991 }
1960 } 1992 }
1961 else 1993 else
1962#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
1963
1964 {
1965 char upordown = 0;
1966
1967 if (scrollBar.style == R_SB_NEXT)
1968 { 1995 {
1969 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
1970 upordown = -1; /* up */
1971 else if (scrollbarnext_dnButton (ev.y))
1972 upordown = 1; /* down */
1973 }
1974 else if (scrollBar.style == R_SB_RXVT)
1975 {
1976 if (scrollbarrxvt_upButton (ev.y))
1977 upordown = -1; /* up */
1978 else if (scrollbarrxvt_dnButton (ev.y))
1979 upordown = 1; /* down */
1980 }
1981 if (upordown)
1982 { 1997 {
1983#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
1984 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1985#endif 2001#endif
1986 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
1987 { 2003 {
1988 if (upordown < 0) 2004 if (direction == UP)
1989 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
1990 else 2006 else
1991 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
1992 } 2008 }
1993 } 2009 }
1994 else 2010 else
1995 switch (ev.button) 2011 switch (ev.button)
1996 { 2012 {
1997 case Button2: 2013 case Button2:
1998 switch (scrollbar_align) 2014 switch (scrollBar.align)
1999 { 2015 {
2000 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
2001 csrO = 0; 2017 csrO = 0;
2002 break; 2018 break;
2003 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
… …
2011 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2012 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2013 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2014 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2015 2031
2016 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2017 break; 2033 break;
2018 2034
2019 case Button1: 2035 case Button1:
2020 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2021 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2022 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2023 2039
2024 case Button3: 2040 case Button3:
2025 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
… …
2035 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2036# else 2052# else
2037 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2038# endif 2054# endif
2039 else 2055 else
2040 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2041 } 2057 }
2042 else 2058 else
2043 { 2059 {
2044 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2045 (nrow 2061 (nrow
… …
2062 2078
2063 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2064 if (!bypass_keystate) 2080 if (!bypass_keystate)
2065 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2066 2082
2067 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2068 { 2084 {
2069 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2070 scrollbar_show (0); 2086 scrollbar_show (0);
2071 } 2087 }
2072 2088
2073#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2076#endif 2091#endif
2077 2092
2078 if (ev.window == vt) 2093 if (ev.window == vt)
2079 { 2094 {
2080 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2104 mouse_report (ev); 2119 mouse_report (ev);
2105 } 2120 }
2106#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2107 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2108 mouse_report (ev); 2123 mouse_report (ev);
2109#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2110 return; 2125 return;
2111 } 2126 }
2112 2127
2113 /* 2128 /*
2114 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
… …
2126 selection_make (ev.time); 2141 selection_make (ev.time);
2127 break; 2142 break;
2128 2143
2129 case Button2: 2144 case Button2:
2130 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2131 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2132 break; 2147 break;
2133 2148
2134#ifdef MOUSE_WHEEL 2149#ifdef MOUSE_WHEEL
2135 case Button4: 2150 case Button4:
2136 case Button5: 2151 case Button5:
… …
2140 2155
2141 v = ev.button == Button4 ? UP : DN; 2156 v = ev.button == Button4 ? UP : DN;
2142 2157
2143 if (ev.state & ShiftMask) 2158 if (ev.state & ShiftMask)
2144 i = 1; 2159 i = 1;
2145 else if (OPTION (Opt_mouseWheelScrollPage)) 2160 else if (option (Opt_mouseWheelScrollPage))
2146 i = nrow - 1; 2161 i = nrow - 1;
2147 else 2162 else
2148 i = 5; 2163 i = 5;
2149 2164
2150# ifdef MOUSE_SLIP_WHEELING 2165# ifdef MOUSE_SLIP_WHEELING
… …
2152 { 2167 {
2153 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2154 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2155 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2156 2171
2157 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2158 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2159
2160 slip_wheel_ev.start ();
2161 } 2174 }
2162 else 2175 else
2176# endif
2163 { 2177 {
2164# endif
2165 scr_page (v, i); 2178 scr_page (v, i);
2166 scrollbar_show (1); 2179 scrollbar_show (1);
2167# ifdef MOUSE_SLIP_WHEELING
2168 } 2180 }
2169# endif
2170 } 2181 }
2171 break; 2182 break;
2172#endif 2183#endif
2173 } 2184 }
2174 } 2185 }
2175} 2186}
2176
2177#ifdef TRANSPARENT
2178#if TINTING
2179/* taken from aterm-0.4.2 */
2180
2181typedef uint32_t RUINT32T;
2182
2183void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2184{
2185 int sh_r, sh_g, sh_b;
2186 RUINT32T mask_r, mask_g, mask_b;
2187 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2188 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2189 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2190 int i;
2191
2192 Visual *visual = term->visual;
2193
2194 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2195
2196 /* for convenience */
2197 mask_r = visual->red_mask;
2198 mask_g = visual->green_mask;
2199 mask_b = visual->blue_mask;
2200
2201 /* boring lookup table pre-initialization */
2202 switch (srcImage->bits_per_pixel) {
2203 case 15:
2204 if ((mask_r != 0x7c00) ||
2205 (mask_g != 0x03e0) ||
2206 (mask_b != 0x001f))
2207 return;
2208 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2209 lookup_r = lookup;
2210 lookup_g = lookup+32;
2211 lookup_b = lookup+32+32;
2212 sh_r = 10;
2213 sh_g = 5;
2214 sh_b = 0;
2215 break;
2216 case 16:
2217 if ((mask_r != 0xf800) ||
2218 (mask_g != 0x07e0) ||
2219 (mask_b != 0x001f))
2220 return;
2221 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2222 lookup_r = lookup;
2223 lookup_g = lookup+32;
2224 lookup_b = lookup+32+64;
2225 sh_r = 11;
2226 sh_g = 5;
2227 sh_b = 0;
2228 break;
2229 case 24:
2230 if ((mask_r != 0xff0000) ||
2231 (mask_g != 0x00ff00) ||
2232 (mask_b != 0x0000ff))
2233 return;
2234 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2235 lookup_r = lookup;
2236 lookup_g = lookup+256;
2237 lookup_b = lookup+256+256;
2238 sh_r = 16;
2239 sh_g = 8;
2240 sh_b = 0;
2241 break;
2242 case 32:
2243 if ((mask_r != 0xff0000) ||
2244 (mask_g != 0x00ff00) ||
2245 (mask_b != 0x0000ff))
2246 return;
2247 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2248 lookup_r = lookup;
2249 lookup_g = lookup+256;
2250 lookup_b = lookup+256+256;
2251 sh_r = 16;
2252 sh_g = 8;
2253 sh_b = 0;
2254 break;
2255 default:
2256 return; /* we do not support this color depth */
2257 }
2258
2259 /* prepare limits for color transformation (each channel is handled separately) */
2260 if (shade < 0) {
2261 shade = -shade;
2262 if (shade < 0) shade = 0;
2263 if (shade > 100) shade = 100;
2264
2265 lower_lim_r = 65535-rm;
2266 lower_lim_g = 65535-gm;
2267 lower_lim_b = 65535-bm;
2268
2269 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2270 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2271 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2272
2273 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2274 } else {
2275 if (shade < 0) shade = 0;
2276 if (shade > 100) shade = 100;
2277
2278 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2279
2280 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2281 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2282 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2283 }
2284
2285 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2286 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2287 {
2288 unsigned int tmp;
2289
2290 tmp = lower_lim_r;
2291 lower_lim_r = lower_lim_b;
2292 lower_lim_b = tmp;
2293
2294 tmp = upper_lim_r;
2295 upper_lim_r = upper_lim_b;
2296 upper_lim_b = tmp;
2297 }
2298
2299 /* fill our lookup tables */
2300 for (i = 0; i <= mask_r>>sh_r; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2304 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2305 lookup_r[i] = (tmp/65535)<<sh_r;
2306 }
2307 for (i = 0; i <= mask_g>>sh_g; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2311 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2312 lookup_g[i] = (tmp/65535)<<sh_g;
2313 }
2314 for (i = 0; i <= mask_b>>sh_b; i++)
2315 {
2316 RUINT32T tmp;
2317 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2318 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2319 lookup_b[i] = (tmp/65535)<<sh_b;
2320 }
2321
2322 /* apply table to input image (replacing colors by newly calculated ones) */
2323 switch (srcImage->bits_per_pixel)
2324 {
2325 case 15:
2326 {
2327 unsigned short *p1, *pf, *p, *pl;
2328 p1 = (unsigned short *) srcImage->data;
2329 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2330 while (p1 < pf)
2331 {
2332 p = p1;
2333 pl = p1 + srcImage->width;
2334 for (; p < pl; p++)
2335 {
2336 *p = lookup_r[(*p & 0x7c00)>>10] |
2337 lookup_g[(*p & 0x03e0)>> 5] |
2338 lookup_b[(*p & 0x001f)];
2339 }
2340 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2341 }
2342 break;
2343 }
2344 case 16:
2345 {
2346 unsigned short *p1, *pf, *p, *pl;
2347 p1 = (unsigned short *) srcImage->data;
2348 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2349 while (p1 < pf)
2350 {
2351 p = p1;
2352 pl = p1 + srcImage->width;
2353 for (; p < pl; p++)
2354 {
2355 *p = lookup_r[(*p & 0xf800)>>11] |
2356 lookup_g[(*p & 0x07e0)>> 5] |
2357 lookup_b[(*p & 0x001f)];
2358 }
2359 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2360 }
2361 break;
2362 }
2363 case 24:
2364 {
2365 unsigned char *p1, *pf, *p, *pl;
2366 p1 = (unsigned char *) srcImage->data;
2367 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2368 while (p1 < pf)
2369 {
2370 p = p1;
2371 pl = p1 + srcImage->width * 3;
2372 for (; p < pl; p += 3)
2373 {
2374 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2375 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2376 p[2] = lookup_r[(p[2] & 0x0000ff)];
2377 }
2378 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2379 }
2380 break;
2381 }
2382 case 32:
2383 {
2384 RUINT32T *p1, *pf, *p, *pl;
2385 p1 = (RUINT32T *) srcImage->data;
2386 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2387
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0xff0000)>>16] |
2395 lookup_g[(*p & 0x00ff00)>> 8] |
2396 lookup_b[(*p & 0x0000ff)] |
2397 (*p & ~0xffffff);
2398 }
2399 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2400 }
2401 break;
2402 }
2403 }
2404
2405 free (lookup);
2406}
2407#endif
2408
2409/*
2410 * Check our parents are still who we think they are.
2411 * Do transparency updates if required
2412 */
2413int
2414rxvt_term::check_our_parents ()
2415{
2416 int i, pchanged, aformat, have_pixmap, rootdepth;
2417 unsigned long nitems, bytes_after;
2418 Atom atype;
2419 unsigned char *prop = NULL;
2420 Window root, oldp, *list;
2421 Pixmap rootpixmap = None;
2422 XWindowAttributes wattr, wrootattr;
2423
2424 pchanged = 0;
2425
2426 if (!OPTION (Opt_transparent))
2427 return pchanged; /* Don't try any more */
2428
2429 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2430 rootdepth = wrootattr.depth;
2431
2432 XGetWindowAttributes (xdisp, parent[0], &wattr);
2433
2434 if (rootdepth != wattr.depth)
2435 {
2436 if (am_transparent)
2437 {
2438 pchanged = 1;
2439 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2440 am_transparent = am_pixmap_trans = 0;
2441 }
2442
2443 return pchanged; /* Don't try any more */
2444 }
2445
2446 /* Get all X ops out of the queue so that our information is up-to-date. */
2447 XSync (xdisp, False);
2448
2449 /*
2450 * Make the frame window set by the window manager have
2451 * the root background. Some window managers put multiple nested frame
2452 * windows for each client, so we have to take care about that.
2453 */
2454 i = (xa[XA_XROOTPMAP_ID]
2455 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2456 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2457 &nitems, &bytes_after, &prop) == Success);
2458
2459 if (!i || prop == NULL)
2460 i = (xa[XA_ESETROOT_PMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL
2466#if TINTING
2467 || !rs[Rs_color + Color_tint]
2468#endif
2469 )
2470 have_pixmap = 0;
2471 else
2472 {
2473 have_pixmap = 1;
2474 rootpixmap = *(Pixmap *)prop;
2475 XFree (prop);
2476 }
2477
2478 if (have_pixmap)
2479 {
2480 /*
2481 * Copy display->root pixmap transparency
2482 */
2483 int sx, sy, nx, ny;
2484 unsigned int nw, nh;
2485 Window cr;
2486 XImage *image;
2487 GC gc;
2488 XGCValues gcvalue;
2489
2490 XTranslateCoordinates (xdisp, parent[0], display->root,
2491 0, 0, &sx, &sy, &cr);
2492 nw = (unsigned int)szHint.width;
2493 nh = (unsigned int)szHint.height;
2494 nx = ny = 0;
2495
2496 if (sx < 0)
2497 {
2498 nw += sx;
2499 nx = -sx;
2500 sx = 0;
2501 }
2502
2503 if (sy < 0)
2504 {
2505 nh += sy;
2506 ny = -sy;
2507 sy = 0;
2508 }
2509
2510 min_it (nw, (unsigned int) (wrootattr.width - sx));
2511 min_it (nh, (unsigned int) (wrootattr.height - sy));
2512
2513 XSync (xdisp, False);
2514 allowedxerror = -1;
2515 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2516
2517 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2518 /* XXX: may need a delay here? */
2519 allowedxerror = 0;
2520
2521 if (image == NULL)
2522 {
2523 if (am_transparent && am_pixmap_trans)
2524 {
2525 pchanged = 1;
2526 if (pixmap != None)
2527 {
2528 XFreePixmap (xdisp, pixmap);
2529 pixmap = None;
2530 }
2531 }
2532
2533 am_pixmap_trans = 0;
2534 }
2535 else
2536 {
2537 if (pixmap != None)
2538 XFreePixmap (xdisp, pixmap);
2539
2540#if TINTING
2541 if (ISSET_PIXCOLOR (Color_tint))
2542 {
2543 rxvt_rgba c;
2544 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2545
2546 pix_colors_focused[Color_tint].get (this, c);
2547
2548 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2549 }
2550#endif
2551
2552 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2553 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2554 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2555 nx, ny, image->width, image->height);
2556 XFreeGC (xdisp, gc);
2557 XDestroyImage (image);
2558 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2559 XClearWindow (xdisp, parent[0]);
2560
2561 if (!am_transparent || !am_pixmap_trans)
2562 pchanged = 1;
2563
2564 am_transparent = am_pixmap_trans = 1;
2565 }
2566 }
2567
2568 if (am_pixmap_trans)
2569 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2570 else
2571 {
2572 unsigned int n;
2573 /*
2574 * InheritPixmap transparency
2575 */
2576 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2577 {
2578 oldp = parent[i];
2579 XQueryTree (xdisp, parent[i - 1], &root,
2580 &parent[i], &list, &n);
2581 XFree (list);
2582
2583 if (parent[i] == display->root)
2584 {
2585 if (oldp != None)
2586 pchanged = 1;
2587
2588 break;
2589 }
2590
2591 if (oldp != parent[i])
2592 pchanged = 1;
2593 }
2594
2595 n = 0;
2596
2597 if (pchanged)
2598 {
2599 for (; n < (unsigned int)i; n++)
2600 {
2601 XGetWindowAttributes (xdisp, parent[n], &wattr);
2602 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2603 {
2604 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2605 break;
2606 }
2607 }
2608 }
2609
2610 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2611 {
2612 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2613 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2614 am_transparent = 0;
2615 /* XXX: also turn off Opt_transparent? */
2616 }
2617 else
2618 {
2619 for (n = 0; n < (unsigned int)i; n++)
2620 {
2621 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2622 XClearWindow (xdisp, parent[n]);
2623 }
2624
2625 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2626 am_transparent = 1;
2627 }
2628
2629 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2630 parent[i] = None;
2631 }
2632
2633 if (scrollBar.win)
2634 {
2635 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2636 scrollBar.setIdle ();
2637 scrollbar_show (0);
2638 }
2639
2640 if (am_transparent)
2641 {
2642 want_refresh = want_full_refresh = 1;
2643 if (am_pixmap_trans)
2644 flush ();
2645 }
2646
2647 return pchanged;
2648}
2649#endif
2650 2187
2651/*}}} */ 2188/*}}} */
2652 2189
2653bool 2190bool
2654rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
… …
2703 if (ch == C0_LF) 2240 if (ch == C0_LF)
2704 nlines++; 2241 nlines++;
2705 2242
2706 refresh_count++; 2243 refresh_count++;
2707 2244
2708 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2709 || (refresh_count >= refresh_limit * (nrow - 1)))
2710 { 2246 {
2711 refreshnow = true;
2712 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2713 ch = NOCHAR; 2252 ch = NOCHAR;
2714 break; 2253 break;
2254 }
2715 } 2255 }
2716 2256
2717 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2718 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2719 { 2259 {
… …
2747 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2748 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2749 2289
2750 /* 2290 /*
2751 * If there have been a lot of new lines, then update the screen 2291 * If there have been a lot of new lines, then update the screen
2752 * What the heck I'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2753 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2754 * is incremented here because we must be doing flat-out scrolling.
2755 */ 2294 */
2756 if (refreshnow) 2295 if (refreshnow)
2757 { 2296 {
2758 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2759 refresh_limit++;
2760 else
2761 {
2762 flag = true; 2297 flag = true;
2763 scr_refresh (); 2298 scr_refresh ();
2764 want_refresh = 1; 2299 want_refresh = 1;
2765 }
2766 } 2300 }
2767 2301
2768 } 2302 }
2769 else 2303 else
2770 { 2304 {
… …
2919 { 2453 {
2920 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2921 break; /* done = 1 */ 2455 break; /* done = 1 */
2922 } 2456 }
2923 } 2457 }
2924 2458
2925 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2926 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2927 { 2461 {
2928 done = 1; 2462 done = 1;
2929 break; 2463 break;
… …
2931 } 2465 }
2932 } 2466 }
2933 2467
2934 pclose_printer (fd); 2468 pclose_printer (fd);
2935} 2469}
2936#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2937/*}}} */ 2471/*}}} */
2938 2472
2939/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2940enum { 2474enum {
2941 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
2991 process_dcs_seq (); 2525 process_dcs_seq ();
2992 break; 2526 break;
2993 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
2994 process_csi_seq (); 2528 process_csi_seq ();
2995 break; 2529 break;
2996 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
2997 process_osc_seq (); 2531 process_osc_seq ();
2998 break; 2532 break;
2999#endif 2533#endif
3000 } 2534 }
3001} 2535}
… …
3227rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3228{ 2762{
3229 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3230 unsigned int nargs, p; 2764 unsigned int nargs, p;
3231 int n, ndef; 2765 int n, ndef;
3232 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3233 2767
3234 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3235 arg[--nargs] = 0;
3236 2769
3237 priv = 0; 2770 priv = 0;
3238 ch = cmd_getc (); 2771 ch = cmd_getc ();
3239 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3240 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3241 priv = ch; 2775 priv = ch;
3242 ch = cmd_getc (); 2776 ch = cmd_getc ();
3243 } 2777 }
3244 2778
3245 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3284 switch (priv) 2818 switch (priv)
3285 { 2819 {
3286 case '>': 2820 case '>':
3287 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3288 { 2822 {
3289 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3290 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3291 // 2825 //
3292 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3293 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3294 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
3295 // 2829 //
3296 tt_printf ("\033[>%d;94;0c", 'U'); 2830 tt_printf ("\033[>%d;95;0c", 'U');
3297 } 2831 }
3298 break; 2832 break;
2833
3299 case '?': 2834 case '?':
3300 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3301 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
3302 break; 2837 break;
3303 } 2838 }
… …
3428 break; 2963 break;
3429 case 6: /* CPR requested */ 2964 case 6: /* CPR requested */
3430 scr_report_position (); 2965 scr_report_position ();
3431 break; 2966 break;
3432 case 7: /* unofficial extension */ 2967 case 7: /* unofficial extension */
3433 if (OPTION (Opt_insecure)) 2968 if (option (Opt_insecure))
3434 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2969 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3435 break; 2970 break;
3436 case 8: /* unofficial extension */ 2971 case 8: /* unofficial extension */
3437 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2972 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3438 break; 2973 break;
… …
3531{ 3066{
3532 int x, y; 3067 int x, y;
3533 XWindowAttributes wattr; 3068 XWindowAttributes wattr;
3534 Window wdummy; 3069 Window wdummy;
3535 3070
3536 dLocal (Display *, xdisp); 3071 dLocal (Display *, dpy);
3537 3072
3538 if (nargs == 0) 3073 if (nargs == 0)
3539 return; 3074 return;
3540 3075
3541 switch (args[0]) 3076 switch (args[0])
3542 { 3077 {
3543 /* 3078 /*
3544 * commands 3079 * commands
3545 */ 3080 */
3546 case 1: /* deiconify window */ 3081 case 1: /* deiconify window */
3547 XMapWindow (xdisp, parent[0]); 3082 XMapWindow (dpy, parent[0]);
3548 break; 3083 break;
3549 case 2: /* iconify window */ 3084 case 2: /* iconify window */
3550 XIconifyWindow (xdisp, parent[0], display->screen); 3085 XIconifyWindow (dpy, parent[0], display->screen);
3551 break; 3086 break;
3552 case 3: /* set position (pixels) */ 3087 case 3: /* set position (pixels) */
3553 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3088 XMoveWindow (dpy, parent[0], args[1], args[2]);
3554 break; 3089 break;
3555 case 4: /* set size (pixels) */ 3090 case 4: /* set size (pixels) */
3556 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3557 break; 3092 break;
3558 case 5: /* raise window */ 3093 case 5: /* raise window */
3559 XRaiseWindow (xdisp, parent[0]); 3094 XRaiseWindow (dpy, parent[0]);
3560 break; 3095 break;
3561 case 6: /* lower window */ 3096 case 6: /* lower window */
3562 XLowerWindow (xdisp, parent[0]); 3097 XLowerWindow (dpy, parent[0]);
3563 break; 3098 break;
3564 case 7: /* refresh window */ 3099 case 7: /* refresh window */
3565 scr_touch (true); 3100 scr_touch (true);
3566 break; 3101 break;
3567 case 8: /* set size (chars) */ 3102 case 8: /* set size (chars) */
… …
3574 if (args[0] >= 24) /* set height (chars) */ 3109 if (args[0] >= 24) /* set height (chars) */
3575 set_widthheight ((unsigned int)width, 3110 set_widthheight ((unsigned int)width,
3576 (unsigned int) (args[1] * fheight)); 3111 (unsigned int) (args[1] * fheight));
3577 break; 3112 break;
3578 3113
3579
3580 /* 3114 /*
3581 * reports - some output format copied from XTerm 3115 * reports - some output format copied from XTerm
3582 */ 3116 */
3583 case 11: /* report window state */ 3117 case 11: /* report window state */
3584 XGetWindowAttributes (xdisp, parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
3585 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3586 break; 3120 break;
3587 case 13: /* report window position */ 3121 case 13: /* report window position */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3122 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3123 XTranslateCoordinates (dpy, parent[0], wattr.root,
3590 -wattr.border_width, -wattr.border_width, 3124 -wattr.border_width, -wattr.border_width,
3591 &x, &y, &wdummy); 3125 &x, &y, &wdummy);
3592 tt_printf ("\033[3;%d;%dt", x, y); 3126 tt_printf ("\033[3;%d;%dt", x, y);
3593 break; 3127 break;
3594 case 14: /* report window size (pixels) */ 3128 case 14: /* report window size (pixels) */
3595 XGetWindowAttributes (xdisp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3597 break; 3131 break;
3598 case 18: /* report text area size (chars) */ 3132 case 18: /* report text area size (chars) */
3599 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3600 break; 3134 break;
… …
3602 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3136 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3603 break; 3137 break;
3604 case 20: /* report icon label */ 3138 case 20: /* report icon label */
3605 { 3139 {
3606 char *s; 3140 char *s;
3607 XGetIconName (xdisp, parent[0], &s); 3141 XGetIconName (dpy, parent[0], &s);
3608 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3142 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s); 3143 XFree (s);
3610 } 3144 }
3611 break; 3145 break;
3612 case 21: /* report window title */ 3146 case 21: /* report window title */
3613 { 3147 {
3614 char *s; 3148 char *s;
3615 XFetchName (xdisp, parent[0], &s); 3149 XFetchName (dpy, parent[0], &s);
3616 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3150 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3151 XFree (s);
3618 } 3152 }
3619 break; 3153 break;
3620 } 3154 }
3621} 3155}
… …
3648 seen_esc = true; 3182 seen_esc = true;
3649 continue; 3183 continue;
3650 } 3184 }
3651 else if (ch == C0_BEL || ch == CHAR_ST) 3185 else if (ch == C0_BEL || ch == CHAR_ST)
3652 break; 3186 break;
3187 else if (ch == C0_SYN)
3188 ch = cmd_get8 ();
3653 else if (ch < 0x20) 3189 else if (ch < 0x20)
3654 return NULL; /* other control character - exit */ 3190 return NULL; /* other control character - exit */
3655 3191
3656 seen_esc = false; 3192 seen_esc = false;
3657 3193
3658 if (n >= STRING_MAX - 1) 3194 if (n >= STRING_MAX - 1)
3659 // stop at some sane length 3195 // stop at some sane length
3660 return NULL; 3196 return NULL;
3661 3197
3662 if (ch == C0_SYN)
3663 string[n++] = cmd_get8 ();
3664 else
3665 string[n++] = ch; 3198 string[n++] = ch;
3666 } 3199 }
3667 3200
3668 string[n++] = '\0'; 3201 string[n++] = '\0';
3669 3202
3670 ends_how = (ch == 0x5c ? C0_ESC : ch); 3203 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3721void 3254void
3722rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3255rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3723{ 3256{
3724 if (str[0] == '?' && !str[1]) 3257 if (str[0] == '?' && !str[1])
3725 { 3258 {
3726 rxvt_rgba c; 3259 rgba c;
3727 pix_colors_focused[color].get (this, c); 3260 pix_colors_focused[color].get (c);
3728 3261
3729#if XFT 3262#if XFT
3730 if (c.a != rxvt_rgba::MAX_CC) 3263 if (c.a != rgba::MAX_CC)
3731 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp); 3264 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3732 else 3265 else
3733#endif 3266#endif
3734 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp); 3267 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3735 } 3268 }
… …
3746 int color; 3279 int color;
3747 char *buf, *name; 3280 char *buf, *name;
3748 bool query = str[0] == '?' && !str[1]; 3281 bool query = str[0] == '?' && !str[1];
3749 int saveop = op; 3282 int saveop = op;
3750 3283
3751 dLocal (Display *, xdisp); 3284 dLocal (Display *, dpy);
3752 3285
3753 assert (str != NULL); 3286 assert (str != NULL);
3287
3288 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3289 return;
3290
3754 switch (op) 3291 switch (op)
3755 { 3292 {
3756 case XTerm_name: 3293 case XTerm_name:
3757 set_title (str); 3294 set_title (str);
3758 /* FALLTHROUGH */ 3295 /* FALLTHROUGH */
… …
3772 unsigned long bytes_after; 3309 unsigned long bytes_after;
3773 unsigned char *value = 0; 3310 unsigned char *value = 0;
3774 const char *str = ""; 3311 const char *str = "";
3775 3312
3776 if (prop 3313 if (prop
3777 && XGetWindowProperty (xdisp, parent[0], 3314 && XGetWindowProperty (dpy, parent[0],
3778 prop, 0, 1<<16, 0, AnyPropertyType, 3315 prop, 0, 1<<16, 0, AnyPropertyType,
3779 &actual_type, &actual_format, 3316 &actual_type, &actual_format,
3780 &nitems, &bytes_after, &value) == Success 3317 &nitems, &bytes_after, &value) == Success
3781 && actual_type != None 3318 && actual_type != None
3782 && actual_format == 8) 3319 && actual_format == 8)
… …
3794 { 3331 {
3795 *eq = 0; 3332 *eq = 0;
3796 set_utf8_property (display->atom (str), eq + 1); 3333 set_utf8_property (display->atom (str), eq + 1);
3797 } 3334 }
3798 else 3335 else
3799 XDeleteProperty (xdisp, parent[0], 3336 XDeleteProperty (dpy, parent[0],
3800 display->atom (str)); 3337 display->atom (str));
3801 } 3338 }
3802 break; 3339 break;
3803 3340
3804 case XTerm_Color: 3341 case XTerm_Color:
… …
3817 *buf++ = '\0'; 3354 *buf++ = '\0';
3818 3355
3819 process_color_seq (op, color, name, resp); 3356 process_color_seq (op, color, name, resp);
3820 } 3357 }
3821 break; 3358 break;
3359 case Rxvt_restoreFG:
3822 case XTerm_Color00: 3360 case XTerm_Color00:
3823 process_color_seq (op, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3824 break; 3362 break;
3363 case Rxvt_restoreBG:
3825 case XTerm_Color01: 3364 case XTerm_Color01:
3826 process_color_seq (op, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3827 break; 3366 break;
3828#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3829 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
… …
3850 break; 3389 break;
3851 case URxvt_Color_IT: 3390 case URxvt_Color_IT:
3852 process_color_seq (op, Color_IT, str, resp); 3391 process_color_seq (op, Color_IT, str, resp);
3853 break; 3392 break;
3854#endif 3393#endif
3855#if TRANSPARENT && TINTING 3394#if ENABLE_TRANSPARENCY
3856 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3857 process_color_seq (op, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3858 check_our_parents (); 3397 {
3859 if (am_transparent) 3398 bool changed = false;
3860 want_full_refresh = want_refresh = 1;
3861 break;
3862#endif
3863 3399
3400 if (ISSET_PIXCOLOR (Color_tint))
3401 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3402 else
3403 changed = bgPixmap.unset_tint ();
3404
3405 if (changed)
3406 update_background ();
3407 }
3408
3409 break;
3410#endif
3411
3412#if BG_IMAGE_FROM_FILE
3864 case Rxvt_Pixmap: 3413 case Rxvt_Pixmap:
3865 { 3414 if (!strcmp (str, "?"))
3866 if (*str != ';')
3867 { 3415 {
3868#if XPM_BACKGROUND 3416 char str[256];
3869 scale_pixmap (""); /* reset to default scaling */ 3417
3870 set_bgPixmap (str); /* change pixmap */ 3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3871 scr_touch (true); 3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3872#endif 3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST);
3873 } 3422 }
3874 3423 else
3424 {
3875 int changed = 0; 3425 int changed = 0;
3876 3426
3877 while ((str = strchr (str, ';')) != NULL) 3427 if (*str != ';')
3878 { 3428 {
3429 /* reset to default scaling :*/
3430 bgPixmap.unset_geometry ();
3431 if (bgPixmap.set_file (str)) /* change pixmap */
3432 changed++;
3433 str = strchr (str, ';');
3434 if (str == NULL)
3435 bgPixmap.set_defaultGeometry ();
3436 }
3437
3438 while (str)
3439 {
3879 str++; 3440 str++;
3880#if XPM_BACKGROUND 3441 if (bgPixmap.set_geometry (str))
3881 changed += scale_pixmap (str); 3442 changed++;
3882#endif 3443 str = strchr (str, ';');
3883 } 3444 }
3884 3445
3885 if (changed) 3446 if (changed)
3886 { 3447 update_background ();
3887#ifdef XPM_BACKGROUND
3888 resize_pixmap ();
3889 scr_touch (true);
3890#endif
3891 } 3448 }
3892 }
3893 break; 3449 break;
3894 3450#endif
3895 case Rxvt_restoreFG:
3896 set_window_color (Color_fg, str);
3897 break;
3898 case Rxvt_restoreBG:
3899 set_window_color (Color_bg, str);
3900 break;
3901 3451
3902 case XTerm_logfile: 3452 case XTerm_logfile:
3903 // TODO, when secure mode? 3453 // TODO, when secure mode?
3904 break; 3454 break;
3905 3455
… …
3923 case URxvt_italicFont: 3473 case URxvt_italicFont:
3924 case URxvt_boldItalicFont: 3474 case URxvt_boldItalicFont:
3925#endif 3475#endif
3926 if (query) 3476 if (query)
3927 tt_printf ("\33]%d;%-.250s%c", saveop, 3477 tt_printf ("\33]%d;%-.250s%c", saveop,
3928 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3478 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3929 ? fontset[op - URxvt_font]->fontdesc : "", 3479 ? fontset[op - URxvt_font]->fontdesc : "",
3930 resp); 3480 resp);
3931 else 3481 else
3932 { 3482 {
3933 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3483 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 break; 3497 break;
3948 3498
3949#if !ENABLE_MINIMAL 3499#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3500 case URxvt_locale:
3951 if (query) 3501 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3502 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3953 else 3503 else
3954 { 3504 {
3955 set_locale (str); 3505 set_locale (str);
3956 pty->set_utf8_mode (enc_utf8); 3506 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3507 init_xlocale ();
… …
3972 break; 3522 break;
3973#endif 3523#endif
3974 3524
3975#if ENABLE_PERL 3525#if ENABLE_PERL
3976 case URxvt_perl: 3526 case URxvt_perl:
3977 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3978 ; // no responses yet 3528 ; // no responses yet
3979 break; 3529 break;
3980#endif 3530#endif
3981 } 3531 }
3982} 3532}
… …
4020{ 3570{
4021 unsigned int i, j; 3571 unsigned int i, j;
4022 int state; 3572 int state;
4023 3573
4024 static const struct 3574 static const struct
4025 { 3575 {
4026 const int argval; 3576 const int argval;
4027 const unsigned long bit; 3577 const unsigned long bit;
4028 }
4029
4030 argtopriv[] = { 3578 } argtopriv[] = {
4031 { 1, PrivMode_aplCUR }, 3579 { 1, PrivMode_aplCUR },
4032 { 2, PrivMode_vt52 }, 3580 { 2, PrivMode_vt52 },
4033 { 3, PrivMode_132 }, 3581 { 3, PrivMode_132 },
4034 { 4, PrivMode_smoothScroll }, 3582 { 4, PrivMode_smoothScroll },
4035 { 5, PrivMode_rVideo }, 3583 { 5, PrivMode_rVideo },
… …
4051 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
4052#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
4053 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
4054#endif 3602#endif
4055 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
4056 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3604 { 1002, PrivMode_MouseBtnEvent },
4057 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3605 { 1003, PrivMode_MouseAnyEvent },
4058 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4059 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4060 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
4061 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
4062 // 1036 send ESC for meta keys NYI 3609 // 1036 send ESC for meta keys NYI
4063 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
4064 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
4065 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
4066 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3613 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4067 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
4068 }; 3616 };
4069 3617
4070 if (nargs == 0) 3618 if (nargs == 0)
4071 return; 3619 return;
4072 3620
… …
4098 scr_touch (true); 3646 scr_touch (true);
4099 break; 3647 break;
4100#endif 3648#endif
4101 case 1048: /* alternative cursor save */ 3649 case 1048: /* alternative cursor save */
4102 case 1049: 3650 case 1049:
4103 if (OPTION (Opt_secondaryScreen)) 3651 if (option (Opt_secondaryScreen))
4104 if (mode == 0) 3652 if (mode == 0)
4105 scr_cursor (RESTORE); 3653 scr_cursor (RESTORE);
4106 else if (mode == 1) 3654 else if (mode == 1)
4107 scr_cursor (SAVE); 3655 scr_cursor (SAVE);
4108 break; 3656 break;
… …
4120 */ 3668 */
4121 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
4122 break; 3670 break;
4123 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
4126 break; 3677 break;
4127 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
4128 set_option (Opt_jumpScroll, !state); 3679 set_option (Opt_jumpScroll, !state);
4129 break; 3680 break;
4130 case 5: /* reverse video */ 3681 case 5: /* reverse video */
… …
4137 scr_autowrap (state); 3688 scr_autowrap (state);
4138 break; 3689 break;
4139 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
4140 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4141 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3694 break;
4144#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4145 case scrollBar_esc: 3696 case scrollBar_esc:
4146 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4147 { 3698 {
… …
4160 break; 3711 break;
4161 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4162 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4163 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4164 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4165 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4166 break; 3717 break;
4167#if 0
4168 case 1001: 3718 case 1002:
4169 break; /* X11 mouse highlighting */ 3719 case 1003:
4170#endif 3720 if (state)
3721 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask;
3725 }
3726 else
3727 vt_emask_mouse = NoEventMask;
3728 vt_select_input ();
3729 break;
4171 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4172 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4173 break; 3732 break;
4174 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4175 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
4176 break; 3735 break;
4177 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4178 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4179 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4180 scr_erase_screen (2); 3739 scr_erase_screen (2);
4181 scr_change_screen (state); 3740 scr_change_screen (state);
4182 break; 3741 break;
4183 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4184 scr_change_screen (state); 3743 scr_change_screen (state);
4185 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 3746 scr_erase_screen (2);
4188 break; 3747 break;
4189 default: 3748 default:
4190 break; 3749 break;
… …
4352rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4353{ 3912{
4354 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4355 3914
4356 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4357 { /* query graphics */ 3917 /* query graphics */
4358 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4359 return; 3919 return;
4360 } 3920 }
4361 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4362 do 3922 do
… …
4412 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4413 3973
4414 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4415 v_buflen += len; 3975 v_buflen += len;
4416 3976
4417 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4418} 3978}
4419 3979
4420void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4421{ 3981{
4422 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3982 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4427 3987
4428 if (v_buflen == 0) 3988 if (v_buflen == 0)
4429 { 3989 {
4430 free (v_buffer); 3990 free (v_buffer);
4431 v_buffer = 0; 3991 v_buffer = 0;
4432 v_buflen = 0;
4433 3992
4434 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4435 return; 3994 return;
4436 } 3995 }
4437 3996
4438 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4439 } 3998 }
4440 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4441 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4442} 4001}
4443 4002
4444/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4445 4004

Diff Legend

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