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.301 by root, Tue Jan 31 21:23:13 2006 UTC vs.
Revision 1.408 by ayin, Sat Feb 16 13:36:10 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.
… …
55# include "keyboard.h" 56# include "keyboard.h"
56#endif 57#endif
57 58
58#include <csignal> 59#include <csignal>
59 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 68
64#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
… …
91 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
92 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
93 98
94 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
96 XK_ISO_Lock, 0x21eb,
97 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
98 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
99 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
100 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
101 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
195 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
196 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
197 201
198 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
199 203
200 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
201 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
202 206
203 if (y >= 0) 207 if (y >= 0)
204 { 208 {
205 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
217 ch = *chr++; 221 ch = *chr++;
218 222
219 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
220 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
221 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
222# if !UNICODE3 226# if !UNICODE_3
223 if (ch >= 0x10000) 227 if (ch >= 0x10000)
224 ch = 0xfffd; 228 ch = 0xfffd;
225# endif 229# endif
226 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
227 231
… …
275 } 279 }
276 280
277 iso14755buf = 0; 281 iso14755buf = 0;
278} 282}
279 283
280int 284static int
281rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
282{ 286{
283 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
284 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
285 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
286 { 290 {
… …
294 298
295 return -1; 299 return -1;
296} 300}
297#endif 301#endif
298 302
299/*{{{ Convert the keypress event into a string */ 303static inline KeySym
304translate_keypad (KeySym keysym, bool kp)
305{
306#ifdef XK_KP_Home
307 static const KeySym keypadtrans[] = {
308 XK_KP_7, // XK_KP_Home
309 XK_KP_4, // XK_KP_Left
310 XK_KP_8, // XK_KP_Up
311 XK_KP_6, // XK_KP_Right
312 XK_KP_2, // XK_KP_Down
313# ifndef UNSHIFTED_SCROLLKEYS
314 XK_KP_9, // XK_KP_Prior
315 XK_KP_3, // XK_KP_Next
316# else
317 XK_Prior,
318 XK_Next,
319# endif
320 XK_KP_1, // XK_KP_End
321 XK_KP_5, // XK_KP_Begin
322 };
323
324 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
325 {
326 unsigned int index = keysym - XK_KP_Home;
327 keysym = kp ? keypadtrans[index] : XK_Home + index;
328 }
329 else if (keysym == XK_KP_Insert)
330 keysym = kp ? XK_KP_0 : XK_Insert;
331# ifndef NO_DELETE_KEY
332 else if (keysym == XK_KP_Delete)
333 keysym = kp ? XK_KP_Decimal : XK_Delete;
334# endif
335#endif
336 return keysym;
337}
338
300void 339void
301rxvt_term::lookup_key (XKeyEvent &ev) 340rxvt_term::key_press (XKeyEvent &ev)
302{ 341{
303 int ctrl, meta, shft, len; 342 int ctrl, meta, shft, len;
304 unsigned int newlen;
305 KeySym keysym; 343 KeySym keysym;
306 int valid_keysym; 344 int valid_keysym;
307 char kbuf[KBUFSZ]; 345 char kbuf[KBUFSZ];
346
347#if ISO_14755
348 if (iso14755buf & ISO_14755_52)
349 return;
350#endif
308 351
309 /* 352 /*
310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 353 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
311 * escape sequence to toggle the Keypad. 354 * escape sequence to toggle the Keypad.
312 * 355 *
… …
492# if ISO_14755 535# if ISO_14755
493 iso14755_51 (0); 536 iso14755_51 (0);
494# endif 537# endif
495 return; 538 return;
496 } 539 }
540 else if (keysym == XK_BackSpace)
541 {
542 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
543# if ISO_14755
544 iso14755_51 (iso14755buf & ISO_14755_MASK);
545# endif
546 return;
547 }
497 else if ((hv = hex_keyval (ev)) >= 0) 548 else if ((hv = hex_keyval (ev)) >= 0)
498 { 549 {
499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 550 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
500 | hv | ISO_14755_51; 551 | hv | ISO_14755_51;
501# if ISO_14755 552# if ISO_14755
… …
503# endif 554# endif
504 return; 555 return;
505 } 556 }
506 else 557 else
507 { 558 {
508# if ENABLE_OVERLAY 559# if ISO_14755
509 scr_overlay_off (); 560 scr_overlay_off ();
510# endif 561# endif
511 iso14755buf = 0; 562 iso14755buf = 0;
512 } 563 }
513 } 564 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 565 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 566 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED)) 567 if (!(iso14755buf & ISO_14755_STARTED))
517 { 568 {
518 iso14755buf |= ISO_14755_STARTED; 569 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY 570# if ISO_14755
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 571 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode"); 572 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif 573# endif
523 } 574 }
524#endif 575#endif
525 576
526#ifdef PRINTPIPE 577#ifdef PRINTPIPE
527 if (keysym == XK_Print) 578 if (keysym == XK_Print)
528 { 579 {
529 scr_printscreen (ctrl | shft); 580 scr_printscreen (ctrl | shft);
530 return; 581 return;
531 } 582 }
532#endif 583#endif
533 584
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 585 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 { 586 {
536 { 587 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
537 newlen = 1; 588 unsigned int newlen = 1;
538 switch (keysym) 589
590 switch (translate_keypad (keysym, kp))
539 { 591 {
540#ifndef NO_BACKSPACE_KEY 592#ifndef NO_BACKSPACE_KEY
541 case XK_BackSpace: 593 case XK_BackSpace:
542 if (priv_modes & PrivMode_HaveBackSpace) 594 if (priv_modes & PrivMode_HaveBackSpace)
543 { 595 {
544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 596 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
545 ^ !!ctrl) ? '\b' : '\177'; 597 ^ !!ctrl) ? '\b' : '\177';
546 kbuf[1] = '\0'; 598 kbuf[1] = '\0';
547 } 599 }
548 else 600 else
549 strcpy (kbuf, key_backspace); 601 strcpy (kbuf, rs[Rs_backspace_key]);
550 break; 602 break;
551#endif 603#endif
552#ifndef NO_DELETE_KEY 604#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior
554 case XK_KP_Delete:
555 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
557 {
558 strcpy (kbuf, "\033On");
559 break;
560 }
561 /* FALLTHROUGH */
562# endif
563 case XK_Delete: 605 case XK_Delete:
564 strcpy (kbuf, key_delete); 606 strcpy (kbuf, rs[Rs_delete_key]);
565 break; 607 break;
566#endif 608#endif
567 case XK_Tab: 609 case XK_Tab:
568 if (shft) 610 if (shft)
569 strcpy (kbuf, "\033[Z"); 611 strcpy (kbuf, "\033[Z");
… …
579#endif 621#endif
580 newlen = 0; 622 newlen = 0;
581 } 623 }
582 break; 624 break;
583 625
584#ifdef XK_KP_Left
585 case XK_KP_Up: /* \033Ox or standard */
586 case XK_KP_Down: /* \033Or or standard */
587 case XK_KP_Right: /* \033Ov or standard */
588 case XK_KP_Left: /* \033Ot or standard */
589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
590 {
591 strcpy (kbuf, "\033OZ");
592 kbuf[2] = "txvr"[keysym - XK_KP_Left];
593 break;
594 }
595 else
596 /* translate to std. cursor key */
597 keysym = XK_Left + (keysym - XK_KP_Left);
598 /* FALLTHROUGH */
599#endif
600 case XK_Up: /* "\033[A" */ 626 case XK_Up: /* "\033[A" */
601 case XK_Down: /* "\033[B" */ 627 case XK_Down: /* "\033[B" */
602 case XK_Right: /* "\033[C" */ 628 case XK_Right: /* "\033[C" */
603 case XK_Left: /* "\033[D" */ 629 case XK_Left: /* "\033[D" */
604 strcpy (kbuf, "\033[Z"); 630 strcpy (kbuf, "\033[Z");
… …
614 else if (priv_modes & PrivMode_aplCUR) 640 else if (priv_modes & PrivMode_aplCUR)
615 kbuf[1] = 'O'; 641 kbuf[1] = 'O';
616 break; 642 break;
617 643
618#ifndef UNSHIFTED_SCROLLKEYS 644#ifndef UNSHIFTED_SCROLLKEYS
619# ifdef XK_KP_Prior
620 case XK_KP_Prior:
621 /* allow shift to override */
622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
623 {
624 strcpy (kbuf, "\033Oy");
625 break;
626 }
627 /* FALLTHROUGH */
628# endif
629 case XK_Prior: 645 case XK_Prior:
630 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
631 break; 647 break;
632# ifdef XK_KP_Next
633 case XK_KP_Next:
634 /* allow shift to override */
635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
636 {
637 strcpy (kbuf, "\033Os");
638 break;
639 }
640 /* FALLTHROUGH */
641# endif
642 case XK_Next: 648 case XK_Next:
643 strcpy (kbuf, "\033[6~"); 649 strcpy (kbuf, "\033[6~");
644 break; 650 break;
645#endif 651#endif
646 case XK_KP_Enter: 652 case XK_KP_Enter:
647 /* allow shift to override */ 653 /* allow shift to override */
648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 654 if (kp)
649 { 655 {
650 strcpy (kbuf, "\033OM"); 656 strcpy (kbuf, "\033OM");
651 break; 657 break;
652 } 658 }
653 659
… …
665 kbuf[0] = '\015'; 671 kbuf[0] = '\015';
666 kbuf[1] = '\0'; 672 kbuf[1] = '\0';
667 } 673 }
668 break; 674 break;
669 675
670#ifdef XK_KP_Begin
671 case XK_KP_Begin:
672 strcpy (kbuf, "\033Ou");
673 break;
674
675#endif
676 case XK_KP_F1: /* "\033OP" */ 676 case XK_KP_F1: /* "\033OP" */
677 case XK_KP_F2: /* "\033OQ" */ 677 case XK_KP_F2: /* "\033OQ" */
678 case XK_KP_F3: /* "\033OR" */ 678 case XK_KP_F3: /* "\033OR" */
679 case XK_KP_F4: /* "\033OS" */ 679 case XK_KP_F4: /* "\033OS" */
680 strcpy (kbuf, "\033OP"); 680 strcpy (kbuf, "\033OP");
… …
696 case XK_KP_6: /* "\033Ov" : "6" */ 696 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */ 697 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */ 698 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */ 699 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */ 700 /* allow shift to override */
701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 701 if (kp)
702 { 702 {
703 strcpy (kbuf, "\033Oj"); 703 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply); 704 kbuf[2] += (keysym - XK_KP_Multiply);
705 } 705 }
706 else 706 else
… …
712 712
713 case XK_Find: 713 case XK_Find:
714 strcpy (kbuf, "\033[1~"); 714 strcpy (kbuf, "\033[1~");
715 break; 715 break;
716 716
717#ifdef XK_KP_End
718 case XK_KP_Insert:
719 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
721 {
722 strcpy (kbuf, "\033Op");
723 break;
724 }
725 /* FALLTHROUGH */
726#endif
727 case XK_Insert: 717 case XK_Insert:
728 strcpy (kbuf, "\033[2~"); 718 strcpy (kbuf, "\033[2~");
729 break; 719 break;
730#ifdef DXK_Remove /* support for DEC remove like key */ 720#ifdef DXK_Remove /* support for DEC remove like key */
731 case DXK_Remove: 721 case DXK_Remove:
… …
735 strcpy (kbuf, "\033[3~"); 725 strcpy (kbuf, "\033[3~");
736 break; 726 break;
737 case XK_Select: 727 case XK_Select:
738 strcpy (kbuf, "\033[4~"); 728 strcpy (kbuf, "\033[4~");
739 break; 729 break;
740#ifdef XK_KP_End
741 case XK_KP_End:
742 /* allow shift to override */
743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
744 {
745 strcpy (kbuf, "\033Oq");
746 break;
747 }
748 /* FALLTHROUGH */
749#endif
750 case XK_End: 730 case XK_End:
751 strcpy (kbuf, KS_END); 731 strcpy (kbuf, KS_END);
752 break; 732 break;
753#ifdef XK_KP_Home
754 case XK_KP_Home:
755 /* allow shift to override */
756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
757 {
758 strcpy (kbuf, "\033Ow");
759 break;
760 }
761 /* FALLTHROUGH */
762#endif
763 case XK_Home: 733 case XK_Home:
764 strcpy (kbuf, KS_HOME); 734 strcpy (kbuf, KS_HOME);
765 break; 735 break;
766 736
767#define FKEY(n, fkey) \ 737#define FKEY(n, fkey) \
… …
824 break; 794 break;
825 } 795 }
826 796
827 if (newlen) 797 if (newlen)
828 len = strlen (kbuf); 798 len = strlen (kbuf);
829 }
830 799
831 /* 800 /*
832 * Pass meta for all function keys, if 'meta' option set 801 * Pass meta for all function keys, if 'meta' option set
833 */ 802 */
834#ifdef META8_OPTION 803#ifdef META8_OPTION
… …
869 return; 838 return;
870 839
871 if (len <= 0) 840 if (len <= 0)
872 return; /* not mapped */ 841 return; /* not mapped */
873 842
874 if (OPTION (Opt_scrollTtyKeypress)) 843 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 844 if (view_start)
876 { 845 {
877 view_start = 0; 846 view_start = 0;
878 want_refresh = 1; 847 want_refresh = 1;
879 } 848 }
… …
903 tt_write (&ch, 1); 872 tt_write (&ch, 1);
904 } 873 }
905 874
906 tt_write (kbuf, (unsigned int)len); 875 tt_write (kbuf, (unsigned int)len);
907} 876}
908/*}}} */ 877
878void
879rxvt_term::key_release (XKeyEvent &ev)
880{
881#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
882 KeySym keysym;
883
884 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
885#endif
886
887#if ENABLE_FRILLS || ISO_14755
888 // ISO 14755 support
889 if (iso14755buf)
890 if (iso14755buf & ISO_14755_52)
891 {
892# if ISO_14755
893 scr_overlay_off ();
894# endif
895# if ISO_14755
896 // iso14755 part 5.2 handling: release time
897 // first: controls
898 if ((ev.state & ControlMask)
899 && ((keysym >= 0x40 && keysym <= 0x5f)
900 || (keysym >= 0x61 && keysym <= 0x7f)))
901 {
902 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
903 commit_iso14755 ();
904
905 return;
906 }
907
908 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
909 if (i[0] == keysym)
910 {
911 iso14755buf = ISO_14755_51 | i[1];
912 commit_iso14755 ();
913
914 return;
915 }
916
917 scr_bell ();
918# endif
919 iso14755buf = 0;
920
921 return;
922 }
923 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
924 {
925# if ISO_14755
926 scr_overlay_off ();
927# endif
928 if (iso14755buf & ISO_14755_51)
929 commit_iso14755 ();
930#if ISO_14755
931 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
932 {
933 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
934
935 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
936 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
937 }
938# endif
939 else
940 iso14755buf = 0;
941 }
942#endif
943
944 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
945 return;
946
947#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
948 if (!(ev.state & ControlMask))
949 slip_wheel_ev.stop ();
950 else if (keysym == XK_Control_L || keysym == XK_Control_R)
951 mouse_slip_wheel_speed = 0;
952#endif
953}
909 954
910#if defined (KEYSYM_RESOURCE) 955#if defined (KEYSYM_RESOURCE)
911unsigned int 956unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 957rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 958{
… …
943void 988void
944rxvt_term::flush () 989rxvt_term::flush ()
945{ 990{
946 flush_ev.stop (); 991 flush_ev.stop ();
947 992
948#ifdef TRANSPARENT 993#ifdef HAVE_BG_PIXMAP
949 if (want_full_refresh) 994 if (bgPixmap.check_clearChanged ())
950 { 995 {
951 want_full_refresh = 0; 996// scr_clear (true); This needs to be researched further!
952 scr_clear ();
953 scr_touch (false); 997 scr_touch (false);
954 } 998 }
955#endif 999#endif
956 1000
957 if (want_refresh) 1001 if (want_refresh)
… …
1002 } 1046 }
1003 1047
1004 display->flush (); 1048 display->flush ();
1005} 1049}
1006 1050
1051/* checks wether a refresh is requested and starts the refresh timer */
1007void 1052void
1008rxvt_term::check_cb (check_watcher &w) 1053rxvt_term::refresh_check ()
1054{
1055 if (want_refresh && !flush_ev.is_active ())
1056 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1057
1058 display->flush ();
1059}
1060
1061void
1062rxvt_term::flush_cb (ev::timer &w, int revents)
1009{ 1063{
1010 make_current (); 1064 make_current ();
1011 1065
1012 display->flush ();
1013
1014 if (want_refresh && !flush_ev.active)
1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1016}
1017
1018void
1019rxvt_term::flush_cb (time_watcher &w)
1020{
1021 make_current ();
1022
1023 refresh_limit = 1;
1024 refresh_count = 0; 1066 refresh_count = 0;
1025 flush (); 1067 flush ();
1026} 1068}
1027 1069
1028#ifdef CURSOR_BLINK 1070#ifdef CURSOR_BLINK
1029void 1071void
1030rxvt_term::cursor_blink_cb (time_watcher &w) 1072rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1031{ 1073{
1032 hidden_cursor = !hidden_cursor; 1074 hidden_cursor = !hidden_cursor;
1033 want_refresh = 1; 1075 want_refresh = 1;
1034 1076 refresh_check ();
1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1036} 1077}
1037#endif 1078#endif
1038 1079
1039#ifdef TEXT_BLINK 1080#ifdef TEXT_BLINK
1040void 1081void
1041rxvt_term::text_blink_cb (time_watcher &w) 1082rxvt_term::text_blink_cb (ev::timer &w, int revents)
1042{ 1083{
1043 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1084 if (scr_refresh_rend (RS_Blink, RS_Blink))
1044 { 1085 {
1045 hidden_text = !hidden_text; 1086 hidden_text = !hidden_text;
1046 want_refresh = 1; 1087 want_refresh = 1;
1047 w.start (w.at + TEXT_BLINK_INTERVAL); 1088 refresh_check ();
1048 } 1089 }
1090 else
1091 w.stop ();
1049} 1092}
1050#endif 1093#endif
1051 1094
1052#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1095#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1053void 1096void
1054rxvt_term::cont_scroll_cb (time_watcher &w) 1097rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1055{ 1098{
1056 if ((scrollbar_isUp() || scrollbar_isDn()) && 1099 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1057 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1100 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1058 { 1101 {
1059 want_refresh = 1; 1102 want_refresh = 1;
1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1103 refresh_check ();
1061 } 1104 }
1105 else
1106 w.stop ();
1062} 1107}
1063#endif 1108#endif
1064 1109
1065#ifdef SELECTION_SCROLLING 1110#ifdef SELECTION_SCROLLING
1066void 1111void
1067rxvt_term::sel_scroll_cb (time_watcher &w) 1112rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1068{ 1113{
1069 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1114 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1070 { 1115 {
1071 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1116 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1072 want_refresh = 1; 1117 want_refresh = 1;
1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1118 refresh_check ();
1074 } 1119 }
1120 else
1121 w.stop ();
1075} 1122}
1076#endif 1123#endif
1077 1124
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1125#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1126void
1080rxvt_term::slip_wheel_cb (time_watcher &w) 1127rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1128{
1082 if (mouse_slip_wheel_speed == 0 1129 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1084 : scr_page (UP, mouse_slip_wheel_speed))
1085 { 1130 {
1086 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0;
1088
1089 want_refresh = 1; 1131 want_refresh = 1;
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1132 refresh_check ();
1133 }
1134
1135 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1091 } 1136 {
1137 mouse_slip_wheel_speed = 0;
1138 w.stop ();
1139 }
1092} 1140}
1141#endif
1142
1143#if LINUX_YIELD_HACK
1144static struct event_handler
1145{
1146 ev::prepare yield_ev;
1147
1148 void yield_cb (ev::prepare &w, int revents)
1149 {
1150 // this should really be sched_yield(), but the linux guys thought
1151 // that giving a process calling sched_yield () less cpu time than
1152 // ones with high nice levels is a useful thing to do. It surely is is
1153 // allowed by the sus... as is returning ENOSYS.
1154
1155 struct timespec ts = { 0, 0 };
1156 nanosleep (&ts, 0);
1157
1158 w.stop ();
1159 }
1160
1161 event_handler ()
1162 : yield_ev (this, &event_handler::yield_cb)
1163 {
1164 }
1165} event_handler;
1093#endif 1166#endif
1094 1167
1095bool 1168bool
1096rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1097{ 1170{
… …
1114 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1115 return true; 1188 return true;
1116 } 1189 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1190 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1191 {
1119#if HAVE_SCHED_YIELD 1192#if LINUX_YIELD_HACK
1120 if (display->is_local) 1193 if (display->is_local)
1121 event_handler.cw_yield.start (); 1194 event_handler.yield_ev.start ();
1122#endif 1195#endif
1123 } 1196 }
1124 else 1197 else
1125 { 1198 {
1126 pty_ev.stop (); 1199 pty_ev.stop ();
1127 1200
1128 if (!OPTION (Opt_hold)) 1201 if (!option (Opt_hold))
1129 destroy (); 1202 destroy ();
1130 } 1203 }
1131 1204
1132 return false; 1205 return false;
1133} 1206}
1134 1207
1135void 1208void
1136rxvt_term::pty_cb (io_watcher &w, short revents) 1209rxvt_term::pty_cb (ev::io &w, int revents)
1137{ 1210{
1138 make_current (); 1211 make_current ();
1139 1212
1140 if (revents & EVENT_READ) 1213 if (revents & ev::READ)
1141 // loop, but don't allow a single term to monopolize us 1214 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1215 while (pty_fill ())
1143 if (cmd_parse ()) 1216 if (cmd_parse ())
1144 break; 1217 break;
1145 1218
1146 if (revents & EVENT_WRITE) 1219 if (revents & ev::WRITE)
1147 pty_write (); 1220 pty_write ();
1221
1222 refresh_check ();
1148} 1223}
1149 1224
1150void 1225void
1151rxvt_term::pointer_unblank () 1226rxvt_term::pointer_unblank ()
1152{ 1227{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1228 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1229 recolour_cursor ();
1155 1230
1156#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1232 hidden_pointer = 0;
1158 1233
1159 if (OPTION (Opt_pointerBlank)) 1234 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1235 pointer_ev.start (pointerBlankDelay);
1161#endif 1236#endif
1162} 1237}
1163 1238
1164#ifdef POINTER_BLANK 1239#ifdef POINTER_BLANK
1165void 1240void
1166rxvt_term::pointer_blank () 1241rxvt_term::pointer_blank ()
1167{ 1242{
1168 if (!OPTION (Opt_pointerBlank)) 1243 if (!option (Opt_pointerBlank))
1169 return; 1244 return;
1170 1245
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1246 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1247 XFlush (dpy);
1173 1248
1174 hidden_pointer = 1; 1249 hidden_pointer = 1;
1175} 1250}
1176 1251
1177void 1252void
1178rxvt_term::pointer_cb (time_watcher &w) 1253rxvt_term::pointer_cb (ev::timer &w, int revents)
1179{ 1254{
1180 make_current (); 1255 make_current ();
1181 1256
1182 pointer_blank (); 1257 pointer_blank ();
1183} 1258}
… …
1186void 1261void
1187rxvt_term::mouse_report (XButtonEvent &ev) 1262rxvt_term::mouse_report (XButtonEvent &ev)
1188{ 1263{
1189 int button_number, key_state = 0; 1264 int button_number, key_state = 0;
1190 int x, y; 1265 int x, y;
1266 int code = 32;
1191 1267
1192 x = ev.x; 1268 x = Pixel2Col (ev.x);
1193 y = ev.y; 1269 y = Pixel2Row (ev.y);
1194 pixel_position (&x, &y); 1270 if (ev.type == MotionNotify)
1271 {
1272 if (x == mouse_row && y == mouse_col)
1273 return;
1274 mouse_row = x;
1275 mouse_col = y;
1276 code += 32;
1277 }
1195 1278
1196 if (MEvent.button == AnyButton) 1279 if (MEvent.button == AnyButton)
1197 button_number = 3; 1280 button_number = 3;
1198 else 1281 else
1199 { 1282 {
… …
1245 x + 1, 1328 x + 1,
1246 y + 1); 1329 y + 1);
1247#endif 1330#endif
1248 1331
1249 tt_printf ("\033[M%c%c%c", 1332 tt_printf ("\033[M%c%c%c",
1250 (32 + button_number + key_state), 1333 (code + button_number + key_state),
1251 (32 + x + 1), 1334 (32 + x + 1),
1252 (32 + y + 1)); 1335 (32 + y + 1));
1253} 1336}
1254 1337
1255/*{{{ process an X event */ 1338/*{{{ process an X event */
1256void 1339void
1257rxvt_term::x_cb (XEvent &ev) 1340rxvt_term::x_cb (XEvent &ev)
1258{ 1341{
1259 make_current (); 1342 make_current ();
1260 1343
1261 dLocal (Display *, xdisp); 1344 dLocal (Display *, dpy);
1262 1345
1263 if (ev.xany.window == vt 1346 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1347 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1348 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1349 return;
… …
1271 unsigned int unused_mask; 1354 unsigned int unused_mask;
1272 1355
1273 switch (ev.type) 1356 switch (ev.type)
1274 { 1357 {
1275 case KeyPress: 1358 case KeyPress:
1276#if ISO_14755 1359 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1360 break;
1282 1361
1283 case KeyRelease: 1362 case KeyRelease:
1284 { 1363 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1364 break;
1356 }
1357 1365
1358 case ButtonPress: 1366 case ButtonPress:
1359 button_press (ev.xbutton); 1367 button_press (ev.xbutton);
1360 break; 1368 break;
1361 1369
… …
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1384 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1377 destroy (); 1385 destroy ();
1378 } 1386 }
1379#if ENABLE_EWMH 1387#if ENABLE_EWMH
1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1388 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1389 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1390 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1391 &ev);
1384#endif 1392#endif
1385 } 1393 }
1386 } 1394 }
… …
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1400 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out (); 1401 focus_out ();
1394 } 1402 }
1395#endif 1403#endif
1396 } 1404 }
1397 break;
1398
1399 case MappingNotify:
1400 XRefreshKeyboardMapping (&ev.xmapping);
1401 break; 1405 break;
1402 1406
1403 /* 1407 /*
1404 * XXX: this is not the _current_ arrangement 1408 * XXX: this is not the _current_ arrangement
1405 * Here's my conclusion: 1409 * Here's my conclusion:
… …
1424 break; 1428 break;
1425 } 1429 }
1426 break; 1430 break;
1427 1431
1428 case FocusIn: 1432 case FocusIn:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1436 focus_in ();
1430 break; 1437 break;
1431 1438
1432 case FocusOut: 1439 case FocusOut:
1440 if (ev.xfocus.detail != NotifyInferior
1441 && ev.xfocus.detail != NotifyPointer
1442 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1443 focus_out ();
1434 break; 1444 break;
1435 1445
1436 case ConfigureNotify: 1446 case ConfigureNotify:
1447 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1448 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1449 szHint.width, szHint.height);*/
1437 if (ev.xconfigure.window == parent[0]) 1450 if (ev.xconfigure.window == parent[0])
1438 { 1451 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1453 ;
1441 1454
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1455 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1456 {
1444 seen_resize = 1; 1457 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1458 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1459 }
1460 else
1461 {
1462#ifdef HAVE_BG_PIXMAP
1463 if (bgPixmap.window_position_sensitive ())
1464 {
1465 if (mapped)
1466 update_background ();
1467 else
1468 bgPixmap.invalidate ();
1469 }
1470#endif
1471 }
1447 1472
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1473 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1454 } 1474 }
1455 break; 1475 break;
1456 1476
1457 case PropertyNotify: 1477 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1478 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1474 case SelectionRequest: 1494 case SelectionRequest:
1475 selection_send (ev.xselectionrequest); 1495 selection_send (ev.xselectionrequest);
1476 break; 1496 break;
1477 1497
1478 case MapNotify: 1498 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP
1500 /* This is needed spcifically to fix the case of no window manager or a
1501 * non-reparenting window manager. In those cases we never get first
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1503 * care of multiplicity of ConfigureNotify events arriwing while WM does
1504 * reparenting.
1505 * We should not render background immidiately, as there could be several
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1507 * by scheduling background redraw as soon as we can, but giving a short
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1513 update_background_ev.start (0.025);
1514#endif
1479 mapped = 1; 1515 mapped = 1;
1480#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1517 text_blink_ev.start ();
1482#endif 1518#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1520 break;
1485 1521
1486 case UnmapNotify: 1522 case UnmapNotify:
… …
1488#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1490#endif 1526#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1528 break;
1493
1494#ifdef TRANSPARENT
1495 case ReparentNotify:
1496 rootwin_cb (ev);
1497 break;
1498#endif /* TRANSPARENT */
1499 1529
1500 case GraphicsExpose: 1530 case GraphicsExpose:
1501 case Expose: 1531 case Expose:
1502 if (ev.xany.window == vt) 1532 if (ev.xany.window == vt)
1503 { 1533 {
1504 do 1534 do
1535 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1536 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1537 ev.xexpose.width, ev.xexpose.height, False);
1538 }
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1540
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1542
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1544 {
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1514 1548
1515 want_refresh = 1; 1549 want_refresh = 1;
1516 } 1550 }
1517 else 1551 else
1518 { 1552 {
1519 XEvent unused_event; 1553 XEvent unused_event;
1520 1554
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1556 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1558 ;
1525 1559
1526 if (isScrollbarWindow (ev.xany.window)) 1560 if (scrollBar.state && ev.xany.window == scrollBar.win)
1527 { 1561 {
1528 scrollBar.setIdle (); 1562 scrollBar.state = STATE_IDLE;
1529 scrollbar_show (0); 1563 scrollbar_show (0);
1530 } 1564 }
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window);
1535#endif
1536 } 1565 }
1537 break; 1566 break;
1538 1567
1539 case MotionNotify: 1568 case MotionNotify:
1540#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1541 if (hidden_pointer) 1570 if (hidden_pointer)
1542 pointer_unblank (); 1571 pointer_unblank ();
1543#endif 1572#endif
1573 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1574 || priv_modes & PrivMode_MouseAnyEvent)
1575 mouse_report (ev.xbutton);
1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1545 break; 1577 break;
1546 1578
1547 if (ev.xany.window == vt) 1579 if (ev.xany.window == vt)
1548 { 1580 {
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1581 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1582 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1583 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1584 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1585 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1586 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1587 ;
1556 1588
1557 XQueryPointer (xdisp, vt, 1589 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1590 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1591 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1592 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1593 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1594#ifdef MOUSE_THRESHOLD
… …
1582 int dist; 1614 int dist;
1583 1615
1584 /* don't clobber the current delay if we are 1616 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1617 * already in the middle of scrolling.
1586 */ 1618 */
1587 if (!sel_scroll_ev.active) 1619 if (!sel_scroll_ev.is_active ())
1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1620 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1589 1621
1590 /* save the event params so we can highlight 1622 /* save the event params so we can highlight
1591 * the selection in the pending-scroll loop 1623 * the selection in the pending-scroll loop
1592 */ 1624 */
1593 selection_save_x = ev.xbutton.x; 1625 selection_save_x = ev.xbutton.x;
… …
1615 else 1647 else
1616 { 1648 {
1617 /* we are within the text window, so we 1649 /* we are within the text window, so we
1618 * shouldn't be scrolling 1650 * shouldn't be scrolling
1619 */ 1651 */
1620 if (sel_scroll_ev.active)
1621 sel_scroll_ev.stop(); 1652 sel_scroll_ev.stop();
1622 } 1653 }
1623#endif 1654#endif
1624#ifdef MOUSE_THRESHOLD 1655#ifdef MOUSE_THRESHOLD
1625 } 1656 }
1626#endif 1657#endif
1627 } 1658 }
1628 } 1659 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1630 { 1661 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1663 MotionNotify, &ev))
1633 ; 1664 ;
1634 1665
1635 XQueryPointer (xdisp, scrollBar.win, 1666 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1667 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1668 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1669 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1670 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1671 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1672 scrollbar_size ());
1642 want_refresh = 1; 1673 want_refresh = 1;
1643 refresh_limit = 0;
1644 scrollbar_show (1); 1674 scrollbar_show (1);
1645 } 1675 }
1646 break; 1676 break;
1647 } 1677 }
1648 1678
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1679#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1680 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1681 {
1654 if (hidden_cursor) 1682 if (hidden_cursor)
1655 { 1683 {
1656 hidden_cursor = 0; 1684 hidden_cursor = 0;
1657 want_refresh = 1; 1685 want_refresh = 1;
1658 } 1686 }
1659 1687
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1661 } 1689 }
1662#endif 1690#endif
1663 1691
1664#if defined(POINTER_BLANK) 1692#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1694 {
1667 if (ev.type == MotionNotify 1695 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1696 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1697 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1698 if (hidden_pointer)
… …
1672 1700
1673 if (ev.type == KeyPress && hidden_pointer == 0) 1701 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank (); 1702 pointer_blank ();
1675 } 1703 }
1676#endif 1704#endif
1705
1706 refresh_check ();
1677} 1707}
1678 1708
1679void 1709void
1680rxvt_term::focus_in () 1710rxvt_term::focus_in ()
1681{ 1711{
1682 if (!focus) 1712 if (!focus)
1683 { 1713 {
1684 focus = 1; 1714 focus = 1;
1685 want_refresh = 1; 1715 want_refresh = 1;
1686 1716
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1717 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1688 1718
1689#if USE_XIM 1719#if USE_XIM
1690 if (Input_Context != NULL) 1720 if (Input_Context != NULL)
1691 { 1721 {
1692 IMSetStatusPosition (); 1722 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1723 XSetICFocus (Input_Context);
1694 } 1724 }
1695#endif 1725#endif
1696#if CURSOR_BLINK 1726#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1727 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1728 cursor_blink_ev.again ();
1699#endif 1729#endif
1700#if OFF_FOCUS_FADING 1730#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1731 if (rs[Rs_fade])
1702 { 1732 {
1703 pix_colors = pix_colors_focused; 1733 pix_colors = pix_colors_focused;
1704 scr_recolour (); 1734 scr_recolour ();
1705 } 1735 }
1706#endif 1736#endif
1737#if ENABLE_FRILLS
1738 if (option (Opt_urgentOnBell))
1739 {
1740 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1741 {
1742 h->flags &= ~XUrgencyHint;
1743 XSetWMHints (dpy, parent[0], h);
1744 }
1745 }
1746#endif
1707 } 1747 }
1708} 1748}
1709 1749
1710void 1750void
1711rxvt_term::focus_out () 1751rxvt_term::focus_out ()
… …
1719 1759
1720#if ENABLE_FRILLS || ISO_14755 1760#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf) 1761 if (iso14755buf)
1722 { 1762 {
1723 iso14755buf = 0; 1763 iso14755buf = 0;
1724# if ENABLE_OVERLAY 1764# if ISO_14755
1725 scr_overlay_off (); 1765 scr_overlay_off ();
1726# endif 1766# endif
1727 } 1767 }
1728#endif 1768#endif
1729#if USE_XIM 1769#if USE_XIM
1730 if (Input_Context != NULL) 1770 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1771 XUnsetICFocus (Input_Context);
1732#endif 1772#endif
1733#if CURSOR_BLINK 1773#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1774 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1775 cursor_blink_ev.stop ();
1776
1736 hidden_cursor = 0; 1777 hidden_cursor = 0;
1737#endif 1778#endif
1738#if OFF_FOCUS_FADING 1779#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1780 if (rs[Rs_fade])
1740 { 1781 {
… …
1743 } 1784 }
1744#endif 1785#endif
1745 } 1786 }
1746} 1787}
1747 1788
1748#if TRANSPARENT 1789void
1790rxvt_term::update_fade_color (unsigned int idx)
1791{
1792#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade])
1794 {
1795 rgba c;
1796 pix_colors [Color_fade].get (c);
1797 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1798 }
1799#endif
1800}
1801
1802#if ENABLE_TRANSPARENCY || ENABLE_PERL
1749void 1803void
1750rxvt_term::rootwin_cb (XEvent &ev) 1804rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1805{
1752 make_current (); 1806 make_current ();
1753 1807
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1809 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1812# if ENABLE_TRANSPARENCY
1754 switch (ev.type) 1813 switch (ev.type)
1755 { 1814 {
1756 case PropertyNotify: 1815 case PropertyNotify:
1757 /* 1816 /*
1758 * if user used some Esetroot compatible prog to set the root bg, 1817 * if user used some Esetroot compatible prog to set the root bg,
1759 * use the property to determine the pixmap. We use it later on. 1818 * use the property to determine the pixmap. We use it later on.
1760 */ 1819 */
1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1763 return; 1822 {
1823 bgPixmap.set_root_pixmap ();
1824 update_background ();
1825 }
1764 1826
1765 /* FALLTHROUGH */
1766 case ReparentNotify:
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1768 want_refresh = want_full_refresh = 1;
1769 break; 1827 break;
1770 } 1828 }
1829# endif
1830
1831 refresh_check ();
1771} 1832}
1772#endif 1833#endif
1773 1834
1774void 1835void
1775rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
1830 mouse_report (ev); 1891 mouse_report (ev);
1831 } 1892 }
1832#else 1893#else
1833 MEvent.button = ev.button; 1894 MEvent.button = ev.button;
1834 mouse_report (ev); 1895 mouse_report (ev);
1835#endif /* MOUSE_REPORT_DOUBLECLICK */ 1896#endif /* MOUSE_REPORT_DOUBLECLICK */
1836 1897
1837 } 1898 }
1838 else 1899 else
1839 { 1900 {
1840 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
… …
1888 } 1949 }
1889 1950
1890 /* 1951 /*
1891 * Scrollbar window processing of button press 1952 * Scrollbar window processing of button press
1892 */ 1953 */
1893 if (isScrollbarWindow (ev.window)) 1954 if (scrollBar.state && ev.window == scrollBar.win)
1894 { 1955 {
1895 scrollBar.setIdle (); 1956 page_dirn direction = NO_DIR;
1957
1958 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */
1962
1963 scrollBar.state = STATE_IDLE;
1896 /* 1964 /*
1897 * Rxvt-style scrollbar: 1965 * Rxvt-style scrollbar:
1898 * move up if mouse is above slider 1966 * move up if mouse is above slider
1899 * move dn if mouse is below slider 1967 * move dn if mouse is below slider
1900 * 1968 *
… …
1909 /* 1977 /*
1910 * Mouse report disabled scrollbar: 1978 * Mouse report disabled scrollbar:
1911 * arrow buttons - send up/down 1979 * arrow buttons - send up/down
1912 * click on scrollbar - send pageup/down 1980 * click on scrollbar - send pageup/down
1913 */ 1981 */
1914 if ((scrollBar.style == R_SB_NEXT 1982 if (direction == UP)
1915 && scrollbarnext_upButton (ev.y))
1916 || (scrollBar.style == R_SB_RXVT
1917 && scrollbarrxvt_upButton (ev.y)))
1918 tt_printf ("\033[A"); 1983 tt_printf ("\033[A");
1919 else if ((scrollBar.style == R_SB_NEXT 1984 else if (direction == DN)
1920 && scrollbarnext_dnButton (ev.y))
1921 || (scrollBar.style == R_SB_RXVT
1922 && scrollbarrxvt_dnButton (ev.y)))
1923 tt_printf ("\033[B"); 1985 tt_printf ("\033[B");
1924 else 1986 else
1925 switch (ev.button) 1987 switch (ev.button)
1926 { 1988 {
1927 case Button2: 1989 case Button2:
… …
1934 tt_printf ("\033[5~"); 1996 tt_printf ("\033[5~");
1935 break; 1997 break;
1936 } 1998 }
1937 } 1999 }
1938 else 2000 else
1939#endif /* NO_SCROLLBAR_REPORT */ 2001#endif /* NO_SCROLLBAR_REPORT */
1940
1941 {
1942 char upordown = 0;
1943
1944 if (scrollBar.style == R_SB_NEXT)
1945 { 2002 {
1946 if (scrollbarnext_upButton (ev.y)) 2003 if (direction != NO_DIR)
1947 upordown = -1; /* up */
1948 else if (scrollbarnext_dnButton (ev.y))
1949 upordown = 1; /* down */
1950 }
1951 else if (scrollBar.style == R_SB_RXVT)
1952 {
1953 if (scrollbarrxvt_upButton (ev.y))
1954 upordown = -1; /* up */
1955 else if (scrollbarrxvt_dnButton (ev.y))
1956 upordown = 1; /* down */
1957 }
1958 if (upordown)
1959 { 2004 {
1960#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2005#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2006 if (!cont_scroll_ev.is_active ())
1961 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1962#endif 2008#endif
1963 if (scr_page (upordown < 0 ? UP : DN, 1)) 2009 if (scr_page (direction, 1))
1964 { 2010 {
1965 if (upordown < 0) 2011 if (direction == UP)
1966 scrollBar.setUp (); 2012 scrollBar.state = STATE_UP;
1967 else 2013 else
1968 scrollBar.setDn (); 2014 scrollBar.state = STATE_DOWN;
1969 } 2015 }
1970 } 2016 }
1971 else 2017 else
1972 switch (ev.button) 2018 switch (ev.button)
1973 { 2019 {
1974 case Button2: 2020 case Button2:
1975 switch (scrollbar_align) 2021 switch (scrollBar.align)
1976 { 2022 {
1977 case R_SB_ALIGN_TOP: 2023 case R_SB_ALIGN_TOP:
1978 csrO = 0; 2024 csrO = 0;
1979 break; 2025 break;
1980 case R_SB_ALIGN_CENTRE: 2026 case R_SB_ALIGN_CENTRE:
… …
1988 if (scrollBar.style == R_SB_XTERM 2034 if (scrollBar.style == R_SB_XTERM
1989 || scrollbar_above_slider (ev.y) 2035 || scrollbar_above_slider (ev.y)
1990 || scrollbar_below_slider (ev.y)) 2036 || scrollbar_below_slider (ev.y))
1991 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
1992 2038
1993 scrollBar.setMotion (); 2039 scrollBar.state = STATE_MOTION;
1994 break; 2040 break;
1995 2041
1996 case Button1: 2042 case Button1:
1997 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2043 if (scrollBar.align == R_SB_ALIGN_CENTRE)
1998 csrO = ev.y - scrollBar.top; 2044 csrO = ev.y - scrollBar.top;
1999 /* FALLTHROUGH */ 2045 /* FALLTHROUGH */
2000 2046
2001 case Button3: 2047 case Button3:
2002 if (scrollBar.style != R_SB_XTERM) 2048 if (scrollBar.style != R_SB_XTERM)
… …
2012 scr_page (DN, nrow - 1); 2058 scr_page (DN, nrow - 1);
2013# else 2059# else
2014 scr_page (DN, nrow / 4); 2060 scr_page (DN, nrow / 4);
2015# endif 2061# endif
2016 else 2062 else
2017 scrollBar.setMotion (); 2063 scrollBar.state = STATE_MOTION;
2018 } 2064 }
2019 else 2065 else
2020 { 2066 {
2021 scr_page ((ev.button == Button1 ? DN : UP), 2067 scr_page ((ev.button == Button1 ? DN : UP),
2022 (nrow 2068 (nrow
… …
2039 2085
2040 csrO = 0; /* reset csr Offset */ 2086 csrO = 0; /* reset csr Offset */
2041 if (!bypass_keystate) 2087 if (!bypass_keystate)
2042 reportmode = !! (priv_modes & PrivMode_mouse_report); 2088 reportmode = !! (priv_modes & PrivMode_mouse_report);
2043 2089
2044 if (scrollbar_isUpDn ()) 2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2045 { 2091 {
2046 scrollBar.setIdle (); 2092 scrollBar.state = STATE_IDLE;
2047 scrollbar_show (0); 2093 scrollbar_show (0);
2048 } 2094 }
2049 2095
2050#ifdef SELECTION_SCROLLING 2096#ifdef SELECTION_SCROLLING
2051 if (sel_scroll_ev.active)
2052 sel_scroll_ev.stop(); 2097 sel_scroll_ev.stop();
2053#endif 2098#endif
2054 2099
2055 if (ev.window == vt) 2100 if (ev.window == vt)
2056 { 2101 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2102 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2081 mouse_report (ev); 2126 mouse_report (ev);
2082 } 2127 }
2083#else /* MOUSE_REPORT_DOUBLECLICK */ 2128#else /* MOUSE_REPORT_DOUBLECLICK */
2084 MEvent.button = AnyButton; 2129 MEvent.button = AnyButton;
2085 mouse_report (ev); 2130 mouse_report (ev);
2086#endif /* MOUSE_REPORT_DOUBLECLICK */ 2131#endif /* MOUSE_REPORT_DOUBLECLICK */
2087 return; 2132 return;
2088 } 2133 }
2089 2134
2090 /* 2135 /*
2091 * dumb hack to compensate for the failure of click-and-drag 2136 * dumb hack to compensate for the failure of click-and-drag
… …
2103 selection_make (ev.time); 2148 selection_make (ev.time);
2104 break; 2149 break;
2105 2150
2106 case Button2: 2151 case Button2:
2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2154 break;
2110 2155
2111#ifdef MOUSE_WHEEL 2156#ifdef MOUSE_WHEEL
2112 case Button4: 2157 case Button4:
2113 case Button5: 2158 case Button5:
… …
2117 2162
2118 v = ev.button == Button4 ? UP : DN; 2163 v = ev.button == Button4 ? UP : DN;
2119 2164
2120 if (ev.state & ShiftMask) 2165 if (ev.state & ShiftMask)
2121 i = 1; 2166 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2167 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2168 i = nrow - 1;
2124 else 2169 else
2125 i = 5; 2170 i = 5;
2126 2171
2127# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
… …
2129 { 2174 {
2130 mouse_slip_wheel_speed += v ? -1 : 1; 2175 mouse_slip_wheel_speed += v ? -1 : 1;
2131 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2133 2178
2134 if (slip_wheel_ev.at < NOW) 2179 if (!slip_wheel_ev.is_active ())
2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2136
2137 slip_wheel_ev.start ();
2138 } 2181 }
2139 else 2182 else
2183# endif
2140 { 2184 {
2141# endif
2142 scr_page (v, i); 2185 scr_page (v, i);
2143 scrollbar_show (1); 2186 scrollbar_show (1);
2144# ifdef MOUSE_SLIP_WHEELING
2145 } 2187 }
2146# endif
2147 } 2188 }
2148 break; 2189 break;
2149#endif 2190#endif
2150 } 2191 }
2151 } 2192 }
2152} 2193}
2153
2154#ifdef TRANSPARENT
2155#if TINTING
2156/* taken from aterm-0.4.2 */
2157
2158typedef uint32_t RUINT32T;
2159
2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2161{
2162 int sh_r, sh_g, sh_b;
2163 RUINT32T mask_r, mask_g, mask_b;
2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2167 int i;
2168
2169 Visual *visual = term->visual;
2170
2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2172
2173 /* for convenience */
2174 mask_r = visual->red_mask;
2175 mask_g = visual->green_mask;
2176 mask_b = visual->blue_mask;
2177
2178 /* boring lookup table pre-initialization */
2179 switch (srcImage->bits_per_pixel) {
2180 case 15:
2181 if ((mask_r != 0x7c00) ||
2182 (mask_g != 0x03e0) ||
2183 (mask_b != 0x001f))
2184 return;
2185 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2186 lookup_r = lookup;
2187 lookup_g = lookup+32;
2188 lookup_b = lookup+32+32;
2189 sh_r = 10;
2190 sh_g = 5;
2191 sh_b = 0;
2192 break;
2193 case 16:
2194 if ((mask_r != 0xf800) ||
2195 (mask_g != 0x07e0) ||
2196 (mask_b != 0x001f))
2197 return;
2198 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2199 lookup_r = lookup;
2200 lookup_g = lookup+32;
2201 lookup_b = lookup+32+64;
2202 sh_r = 11;
2203 sh_g = 5;
2204 sh_b = 0;
2205 break;
2206 case 24:
2207 if ((mask_r != 0xff0000) ||
2208 (mask_g != 0x00ff00) ||
2209 (mask_b != 0x0000ff))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2212 lookup_r = lookup;
2213 lookup_g = lookup+256;
2214 lookup_b = lookup+256+256;
2215 sh_r = 16;
2216 sh_g = 8;
2217 sh_b = 0;
2218 break;
2219 case 32:
2220 if ((mask_r != 0xff0000) ||
2221 (mask_g != 0x00ff00) ||
2222 (mask_b != 0x0000ff))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2225 lookup_r = lookup;
2226 lookup_g = lookup+256;
2227 lookup_b = lookup+256+256;
2228 sh_r = 16;
2229 sh_g = 8;
2230 sh_b = 0;
2231 break;
2232 default:
2233 return; /* we do not support this color depth */
2234 }
2235
2236 /* prepare limits for color transformation (each channel is handled separately) */
2237 if (shade < 0) {
2238 shade = -shade;
2239 if (shade < 0) shade = 0;
2240 if (shade > 100) shade = 100;
2241
2242 lower_lim_r = 65535-rm;
2243 lower_lim_g = 65535-gm;
2244 lower_lim_b = 65535-bm;
2245
2246 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2247 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2248 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2249
2250 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2251 } else {
2252 if (shade < 0) shade = 0;
2253 if (shade > 100) shade = 100;
2254
2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2256
2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2260 }
2261
2262 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2264 {
2265 unsigned int tmp;
2266
2267 tmp = lower_lim_r;
2268 lower_lim_r = lower_lim_b;
2269 lower_lim_b = tmp;
2270
2271 tmp = upper_lim_r;
2272 upper_lim_r = upper_lim_b;
2273 upper_lim_b = tmp;
2274 }
2275
2276 /* fill our lookup tables */
2277 for (i = 0; i <= mask_r>>sh_r; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2281 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2282 lookup_r[i] = (tmp/65535)<<sh_r;
2283 }
2284 for (i = 0; i <= mask_g>>sh_g; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2288 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2289 lookup_g[i] = (tmp/65535)<<sh_g;
2290 }
2291 for (i = 0; i <= mask_b>>sh_b; i++)
2292 {
2293 RUINT32T tmp;
2294 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2295 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2296 lookup_b[i] = (tmp/65535)<<sh_b;
2297 }
2298
2299 /* apply table to input image (replacing colors by newly calculated ones) */
2300 switch (srcImage->bits_per_pixel)
2301 {
2302 case 15:
2303 {
2304 unsigned short *p1, *pf, *p, *pl;
2305 p1 = (unsigned short *) srcImage->data;
2306 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width;
2311 for (; p < pl; p++)
2312 {
2313 *p = lookup_r[(*p & 0x7c00)>>10] |
2314 lookup_g[(*p & 0x03e0)>> 5] |
2315 lookup_b[(*p & 0x001f)];
2316 }
2317 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 16:
2322 {
2323 unsigned short *p1, *pf, *p, *pl;
2324 p1 = (unsigned short *) srcImage->data;
2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326 while (p1 < pf)
2327 {
2328 p = p1;
2329 pl = p1 + srcImage->width;
2330 for (; p < pl; p++)
2331 {
2332 *p = lookup_r[(*p & 0xf800)>>11] |
2333 lookup_g[(*p & 0x07e0)>> 5] |
2334 lookup_b[(*p & 0x001f)];
2335 }
2336 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2337 }
2338 break;
2339 }
2340 case 24:
2341 {
2342 unsigned char *p1, *pf, *p, *pl;
2343 p1 = (unsigned char *) srcImage->data;
2344 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2345 while (p1 < pf)
2346 {
2347 p = p1;
2348 pl = p1 + srcImage->width * 3;
2349 for (; p < pl; p += 3)
2350 {
2351 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2352 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2353 p[2] = lookup_r[(p[2] & 0x0000ff)];
2354 }
2355 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2356 }
2357 break;
2358 }
2359 case 32:
2360 {
2361 RUINT32T *p1, *pf, *p, *pl;
2362 p1 = (RUINT32T *) srcImage->data;
2363 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xff0000)>>16] |
2372 lookup_g[(*p & 0x00ff00)>> 8] |
2373 lookup_b[(*p & 0x0000ff)] |
2374 (*p & ~0xffffff);
2375 }
2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2377 }
2378 break;
2379 }
2380 }
2381
2382 free (lookup);
2383}
2384#endif
2385
2386/*
2387 * Check our parents are still who we think they are.
2388 * Do transparency updates if required
2389 */
2390int
2391rxvt_term::check_our_parents ()
2392{
2393 int i, pchanged, aformat, have_pixmap, rootdepth;
2394 unsigned long nitems, bytes_after;
2395 Atom atype;
2396 unsigned char *prop = NULL;
2397 Window root, oldp, *list;
2398 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr;
2400
2401 pchanged = 0;
2402
2403 if (!OPTION (Opt_transparent))
2404 return pchanged; /* Don't try any more */
2405
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth;
2408
2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2410
2411 if (rootdepth != wattr.depth)
2412 {
2413 if (am_transparent)
2414 {
2415 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0;
2418 }
2419
2420 return pchanged; /* Don't try any more */
2421 }
2422
2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False);
2425
2426 /*
2427 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that.
2430 */
2431 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success);
2435
2436 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success);
2441
2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
2447 have_pixmap = 0;
2448 else
2449 {
2450 have_pixmap = 1;
2451 rootpixmap = *(Pixmap *)prop;
2452 XFree (prop);
2453 }
2454
2455 if (have_pixmap)
2456 {
2457 /*
2458 * Copy display->root pixmap transparency
2459 */
2460 int sx, sy, nx, ny;
2461 unsigned int nw, nh;
2462 Window cr;
2463 XImage *image;
2464 GC gc;
2465 XGCValues gcvalue;
2466
2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height;
2471 nx = ny = 0;
2472
2473 if (sx < 0)
2474 {
2475 nw += sx;
2476 nx = -sx;
2477 sx = 0;
2478 }
2479
2480 if (sy < 0)
2481 {
2482 nh += sy;
2483 ny = -sy;
2484 sy = 0;
2485 }
2486
2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2491 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */
2496 allowedxerror = 0;
2497
2498 if (image == NULL)
2499 {
2500 if (am_transparent && am_pixmap_trans)
2501 {
2502 pchanged = 1;
2503 if (pixmap != None)
2504 {
2505 XFreePixmap (xdisp, pixmap);
2506 pixmap = None;
2507 }
2508 }
2509
2510 am_pixmap_trans = 0;
2511 }
2512 else
2513 {
2514 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap);
2516
2517#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint))
2519 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2521
2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2524
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 }
2527#endif
2528
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc);
2534 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]);
2537
2538 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1;
2540
2541 am_transparent = am_pixmap_trans = 1;
2542 }
2543 }
2544
2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2548 {
2549 unsigned int n;
2550 /*
2551 * InheritPixmap transparency
2552 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 {
2555 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list);
2558
2559 if (parent[i] == display->root)
2560 {
2561 if (oldp != None)
2562 pchanged = 1;
2563
2564 break;
2565 }
2566
2567 if (oldp != parent[i])
2568 pchanged = 1;
2569 }
2570
2571 n = 0;
2572
2573 if (pchanged)
2574 for (; n < (unsigned int)i; n++)
2575 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break;
2582 }
2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */
2591 }
2592 else
2593 {
2594 for (n = 0; n < (unsigned int)i; n++)
2595 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]);
2598 }
2599
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601 am_transparent = 1;
2602 }
2603
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None;
2606 }
2607
2608 if (scrollBar.win)
2609 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle ();
2612 scrollbar_show (0);
2613 }
2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2622 return pchanged;
2623}
2624#endif
2625 2194
2626/*}}} */ 2195/*}}} */
2627 2196
2628bool 2197bool
2629rxvt_term::cmd_parse () 2198rxvt_term::cmd_parse ()
… …
2678 if (ch == C0_LF) 2247 if (ch == C0_LF)
2679 nlines++; 2248 nlines++;
2680 2249
2681 refresh_count++; 2250 refresh_count++;
2682 2251
2683 if (!OPTION (Opt_jumpScroll) 2252 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2253 {
2686 refreshnow = true;
2687 refresh_count = 0; 2254 refresh_count = 0;
2255
2256 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2257 {
2258 refreshnow = true;
2688 ch = NOCHAR; 2259 ch = NOCHAR;
2689 break; 2260 break;
2261 }
2690 } 2262 }
2691 2263
2692 // scr_add_lines only works for nlines <= nrow - 1. 2264 // scr_add_lines only works for nlines <= nrow - 1.
2693 if (nlines >= nrow - 1) 2265 if (nlines >= nrow - 1)
2694 { 2266 {
… …
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2294 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2723 scr_add_lines (buf, str - buf, nlines); 2295 scr_add_lines (buf, str - buf, nlines);
2724 2296
2725 /* 2297 /*
2726 * If there have been a lot of new lines, then update the screen 2298 * If there have been a lot of new lines, then update the screen
2727 * What the heck I'll cheat and only refresh less than every page-full. 2299 * What the heck we'll cheat and only refresh less than every page-full.
2728 * the number of pages between refreshes is refresh_limit, which 2300 * if skipScroll is enabled.
2729 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2301 */
2731 if (refreshnow) 2302 if (refreshnow)
2732 { 2303 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++;
2735 else
2736 {
2737 flag = true; 2304 flag = true;
2738 scr_refresh (); 2305 scr_refresh ();
2739 want_refresh = 1; 2306 want_refresh = 1;
2740 }
2741 } 2307 }
2742 2308
2743 } 2309 }
2744 else 2310 else
2745 { 2311 {
… …
2894 { 2460 {
2895 if ((buf[len++] = cmd_getc ()) == 'i') 2461 if ((buf[len++] = cmd_getc ()) == 'i')
2896 break; /* done = 1 */ 2462 break; /* done = 1 */
2897 } 2463 }
2898 } 2464 }
2899 2465
2900 for (i = 0; i < len; i++) 2466 for (i = 0; i < len; i++)
2901 if (putc (buf[i], fd) == EOF) 2467 if (putc (buf[i], fd) == EOF)
2902 { 2468 {
2903 done = 1; 2469 done = 1;
2904 break; 2470 break;
… …
2906 } 2472 }
2907 } 2473 }
2908 2474
2909 pclose_printer (fd); 2475 pclose_printer (fd);
2910} 2476}
2911#endif /* PRINTPIPE */ 2477#endif /* PRINTPIPE */
2912/*}}} */ 2478/*}}} */
2913 2479
2914/* *INDENT-OFF* */ 2480/* *INDENT-OFF* */
2915enum { 2481enum {
2916 C1_40 = 0x40, 2482 C1_40 = 0x40,
… …
2966 process_dcs_seq (); 2532 process_dcs_seq ();
2967 break; 2533 break;
2968 case 0x9b: /* CSI */ 2534 case 0x9b: /* CSI */
2969 process_csi_seq (); 2535 process_csi_seq ();
2970 break; 2536 break;
2971 case 0x9d: /* CSI */ 2537 case 0x9d: /* OSC */
2972 process_osc_seq (); 2538 process_osc_seq ();
2973 break; 2539 break;
2974#endif 2540#endif
2975 } 2541 }
2976} 2542}
… …
3202rxvt_term::process_csi_seq () 2768rxvt_term::process_csi_seq ()
3203{ 2769{
3204 unicode_t ch, priv, i; 2770 unicode_t ch, priv, i;
3205 unsigned int nargs, p; 2771 unsigned int nargs, p;
3206 int n, ndef; 2772 int n, ndef;
3207 int arg[ESC_ARGS]; 2773 int arg[ESC_ARGS] = { };
3208 2774
3209 for (nargs = ESC_ARGS; nargs > 0;) 2775 nargs = 0;
3210 arg[--nargs] = 0;
3211 2776
3212 priv = 0; 2777 priv = 0;
3213 ch = cmd_getc (); 2778 ch = cmd_getc ();
3214 if (ch >= '<' && ch <= '?') 2779 if (ch >= '<' && ch <= '?')
2780 {
3215 { /* '<' '=' '>' '?' */ 2781 /* '<' '=' '>' '?' */
3216 priv = ch; 2782 priv = ch;
3217 ch = cmd_getc (); 2783 ch = cmd_getc ();
3218 } 2784 }
3219 2785
3220 /* read any numerical arguments */ 2786 /* read any numerical arguments */
… …
3259 switch (priv) 2825 switch (priv)
3260 { 2826 {
3261 case '>': 2827 case '>':
3262 if (ch == CSI_DA) /* secondary device attributes */ 2828 if (ch == CSI_DA) /* secondary device attributes */
3263 { 2829 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2830 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2831 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 // 2832 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2833 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2834 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3269 // that we do not support xterm mouse reporting (should be 95 when we do). 2835 // versions.
3270 // 2836 //
3271 tt_printf ("\033[>%d;94;0c", 'U'); 2837 tt_printf ("\033[>%d;95;0c", 'U');
3272 } 2838 }
3273 break; 2839 break;
2840
3274 case '?': 2841 case '?':
3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2842 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3276 process_terminal_mode (ch, priv, nargs, arg); 2843 process_terminal_mode (ch, priv, nargs, arg);
3277 break; 2844 break;
3278 } 2845 }
… …
3403 break; 2970 break;
3404 case 6: /* CPR requested */ 2971 case 6: /* CPR requested */
3405 scr_report_position (); 2972 scr_report_position ();
3406 break; 2973 break;
3407 case 7: /* unofficial extension */ 2974 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 2975 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2976 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 2977 break;
3411 case 8: /* unofficial extension */ 2978 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2979 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 2980 break;
… …
3506{ 3073{
3507 int x, y; 3074 int x, y;
3508 XWindowAttributes wattr; 3075 XWindowAttributes wattr;
3509 Window wdummy; 3076 Window wdummy;
3510 3077
3511 dLocal (Display *, xdisp); 3078 dLocal (Display *, dpy);
3512 3079
3513 if (nargs == 0) 3080 if (nargs == 0)
3514 return; 3081 return;
3515 3082
3516 switch (args[0]) 3083 switch (args[0])
3517 { 3084 {
3518 /* 3085 /*
3519 * commands 3086 * commands
3520 */ 3087 */
3521 case 1: /* deiconify window */ 3088 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3089 XMapWindow (dpy, parent[0]);
3523 break; 3090 break;
3524 case 2: /* iconify window */ 3091 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3092 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3093 break;
3527 case 3: /* set position (pixels) */ 3094 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3095 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3096 break;
3530 case 4: /* set size (pixels) */ 3097 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3098 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3099 break;
3533 case 5: /* raise window */ 3100 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3101 XRaiseWindow (dpy, parent[0]);
3535 break; 3102 break;
3536 case 6: /* lower window */ 3103 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3104 XLowerWindow (dpy, parent[0]);
3538 break; 3105 break;
3539 case 7: /* refresh window */ 3106 case 7: /* refresh window */
3540 scr_touch (true); 3107 scr_touch (true);
3541 break; 3108 break;
3542 case 8: /* set size (chars) */ 3109 case 8: /* set size (chars) */
… …
3553 3120
3554 /* 3121 /*
3555 * reports - some output format copied from XTerm 3122 * reports - some output format copied from XTerm
3556 */ 3123 */
3557 case 11: /* report window state */ 3124 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3125 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3126 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3127 break;
3561 case 13: /* report window position */ 3128 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3130 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3131 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3132 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3133 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3134 break;
3568 case 14: /* report window size (pixels) */ 3135 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3137 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3138 break;
3572 case 18: /* report text area size (chars) */ 3139 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3140 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3141 break;
… …
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3143 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3144 break;
3578 case 20: /* report icon label */ 3145 case 20: /* report icon label */
3579 { 3146 {
3580 char *s; 3147 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3148 XGetIconName (dpy, parent[0], &s);
3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3149 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3583 XFree (s); 3150 XFree (s);
3584 } 3151 }
3585 break; 3152 break;
3586 case 21: /* report window title */ 3153 case 21: /* report window title */
3587 { 3154 {
3588 char *s; 3155 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3156 XFetchName (dpy, parent[0], &s);
3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3157 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3591 XFree (s); 3158 XFree (s);
3592 } 3159 }
3593 break; 3160 break;
3594 } 3161 }
3595} 3162}
… …
3622 seen_esc = true; 3189 seen_esc = true;
3623 continue; 3190 continue;
3624 } 3191 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3192 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3193 break;
3194 else if (ch == C0_SYN)
3195 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3196 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3197 return NULL; /* other control character - exit */
3629 3198
3630 seen_esc = false; 3199 seen_esc = false;
3631 3200
3632 if (n >= STRING_MAX - 1) 3201 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3202 // stop at some sane length
3634 return NULL; 3203 return NULL;
3635 3204
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3205 string[n++] = ch;
3640 } 3206 }
3641 3207
3642 string[n++] = '\0'; 3208 string[n++] = '\0';
3643 3209
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3210 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3720 int color; 3286 int color;
3721 char *buf, *name; 3287 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3288 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3289 int saveop = op;
3724 3290
3725 dLocal (Display *, xdisp); 3291 dLocal (Display *, dpy);
3726 3292
3727 assert (str != NULL); 3293 assert (str != NULL);
3294
3295 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3296 return;
3297
3728 switch (op) 3298 switch (op)
3729 { 3299 {
3730 case XTerm_name: 3300 case XTerm_name:
3731 set_title (str); 3301 set_title (str);
3732 /* FALLTHROUGH */ 3302 /* FALLTHROUGH */
… …
3746 unsigned long bytes_after; 3316 unsigned long bytes_after;
3747 unsigned char *value = 0; 3317 unsigned char *value = 0;
3748 const char *str = ""; 3318 const char *str = "";
3749 3319
3750 if (prop 3320 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3321 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3322 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3323 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3324 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3325 && actual_type != None
3756 && actual_format == 8) 3326 && actual_format == 8)
… …
3768 { 3338 {
3769 *eq = 0; 3339 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3340 set_utf8_property (display->atom (str), eq + 1);
3771 } 3341 }
3772 else 3342 else
3773 XDeleteProperty (xdisp, parent[0], 3343 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3344 display->atom (str));
3775 } 3345 }
3776 break; 3346 break;
3777 3347
3778 case XTerm_Color: 3348 case XTerm_Color:
… …
3791 *buf++ = '\0'; 3361 *buf++ = '\0';
3792 3362
3793 process_color_seq (op, color, name, resp); 3363 process_color_seq (op, color, name, resp);
3794 } 3364 }
3795 break; 3365 break;
3366 case Rxvt_restoreFG:
3796 case XTerm_Color00: 3367 case XTerm_Color00:
3797 process_color_seq (op, Color_fg, str, resp); 3368 process_color_seq (op, Color_fg, str, resp);
3798 break; 3369 break;
3370 case Rxvt_restoreBG:
3799 case XTerm_Color01: 3371 case XTerm_Color01:
3800 process_color_seq (op, Color_bg, str, resp); 3372 process_color_seq (op, Color_bg, str, resp);
3801 break; 3373 break;
3802#ifndef NO_CURSORCOLOR 3374#ifndef NO_CURSORCOLOR
3803 case XTerm_Color_cursor: 3375 case XTerm_Color_cursor:
… …
3824 break; 3396 break;
3825 case URxvt_Color_IT: 3397 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp); 3398 process_color_seq (op, Color_IT, str, resp);
3827 break; 3399 break;
3828#endif 3400#endif
3829#if TRANSPARENT && TINTING 3401#if ENABLE_TRANSPARENCY
3830 case URxvt_Color_tint: 3402 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp); 3403 process_color_seq (op, Color_tint, str, resp);
3404 {
3405 bool changed = false;
3832 3406
3833 check_our_parents (); 3407 if (ISSET_PIXCOLOR (Color_tint))
3408 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3409 else
3410 changed = bgPixmap.unset_tint ();
3834 3411
3835 if (am_transparent) 3412 if (changed)
3836 want_full_refresh = want_refresh = 1; 3413 update_background ();
3414 }
3837 3415
3838 break; 3416 break;
3839#endif 3417#endif
3840 3418
3419#if BG_IMAGE_FROM_FILE
3841 case Rxvt_Pixmap: 3420 case Rxvt_Pixmap:
3842 { 3421 if (!strcmp (str, "?"))
3843 if (*str != ';')
3844 { 3422 {
3845#if XPM_BACKGROUND 3423 char str[256];
3846 scale_pixmap (""); /* reset to default scaling */ 3424
3847 set_bgPixmap (str); /* change pixmap */ 3425 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3848 scr_touch (true); 3426 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3849#endif 3427 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3428 process_xterm_seq (XTerm_title, str, CHAR_ST);
3850 } 3429 }
3851 3430 else
3431 {
3852 int changed = 0; 3432 int changed = 0;
3853 3433
3854 while ((str = strchr (str, ';')) != NULL) 3434 if (*str != ';')
3855 { 3435 {
3436 /* reset to default scaling :*/
3437 bgPixmap.unset_geometry ();
3438 if (bgPixmap.set_file (str)) /* change pixmap */
3439 changed++;
3440 str = strchr (str, ';');
3441 if (str == NULL)
3442 bgPixmap.set_defaultGeometry ();
3443 }
3444
3445 while (str)
3446 {
3856 str++; 3447 str++;
3857#if XPM_BACKGROUND 3448 if (bgPixmap.set_geometry (str))
3858 changed += scale_pixmap (str); 3449 changed++;
3859#endif 3450 str = strchr (str, ';');
3860 } 3451 }
3861 3452
3862 if (changed) 3453 if (changed)
3863 { 3454 update_background ();
3864#ifdef XPM_BACKGROUND
3865 resize_pixmap ();
3866 scr_touch (true);
3867#endif
3868 } 3455 }
3869 }
3870 break; 3456 break;
3871 3457#endif
3872 case Rxvt_restoreFG:
3873 set_window_color (Color_fg, str);
3874 break;
3875 case Rxvt_restoreBG:
3876 set_window_color (Color_bg, str);
3877 break;
3878 3458
3879 case XTerm_logfile: 3459 case XTerm_logfile:
3880 // TODO, when secure mode? 3460 // TODO, when secure mode?
3881 break; 3461 break;
3882 3462
… …
3900 case URxvt_italicFont: 3480 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 3481 case URxvt_boldItalicFont:
3902#endif 3482#endif
3903 if (query) 3483 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 3484 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3485 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 3486 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 3487 resp);
3908 else 3488 else
3909 { 3489 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3490 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3924 break; 3504 break;
3925 3505
3926#if !ENABLE_MINIMAL 3506#if !ENABLE_MINIMAL
3927 case URxvt_locale: 3507 case URxvt_locale:
3928 if (query) 3508 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3509 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3930 else 3510 else
3931 { 3511 {
3932 set_locale (str); 3512 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 3513 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 3514 init_xlocale ();
… …
3949 break; 3529 break;
3950#endif 3530#endif
3951 3531
3952#if ENABLE_PERL 3532#if ENABLE_PERL
3953 case URxvt_perl: 3533 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3534 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3955 ; // no responses yet 3535 ; // no responses yet
3956 break; 3536 break;
3957#endif 3537#endif
3958 } 3538 }
3959} 3539}
… …
3997{ 3577{
3998 unsigned int i, j; 3578 unsigned int i, j;
3999 int state; 3579 int state;
4000 3580
4001 static const struct 3581 static const struct
4002 { 3582 {
4003 const int argval; 3583 const int argval;
4004 const unsigned long bit; 3584 const unsigned long bit;
4005 }
4006
4007 argtopriv[] = { 3585 } argtopriv[] = {
4008 { 1, PrivMode_aplCUR }, 3586 { 1, PrivMode_aplCUR },
4009 { 2, PrivMode_vt52 }, 3587 { 2, PrivMode_vt52 },
4010 { 3, PrivMode_132 }, 3588 { 3, PrivMode_132 },
4011 { 4, PrivMode_smoothScroll }, 3589 { 4, PrivMode_smoothScroll },
4012 { 5, PrivMode_rVideo }, 3590 { 5, PrivMode_rVideo },
… …
4028 { 66, PrivMode_aplKP }, 3606 { 66, PrivMode_aplKP },
4029#ifndef NO_BACKSPACE_KEY 3607#ifndef NO_BACKSPACE_KEY
4030 { 67, PrivMode_BackSpace }, 3608 { 67, PrivMode_BackSpace },
4031#endif 3609#endif
4032 { 1000, PrivMode_MouseX11 }, 3610 { 1000, PrivMode_MouseX11 },
4033 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3611 { 1002, PrivMode_MouseBtnEvent },
4034 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3612 { 1003, PrivMode_MouseAnyEvent },
4035 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4036 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3613 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4037 { 1011, PrivMode_Keypress }, // rxvt extension 3614 { 1011, PrivMode_Keypress }, // rxvt extension
4038 // 1035 enable modifiers for alt, numlock NYI 3615 // 1035 enable modifiers for alt, numlock NYI
4039 // 1036 send ESC for meta keys NYI 3616 // 1036 send ESC for meta keys NYI
4040 // 1037 send DEL for keypad delete NYI 3617 // 1037 send DEL for keypad delete NYI
4041 { 1047, PrivMode_Screen }, 3618 { 1047, PrivMode_Screen },
4042 // 1048 save and restore cursor 3619 // 1048 save and restore cursor
4043 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3620 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4044 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3621 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3622 { 2004, PrivMode_BracketPaste },
4045 }; 3623 };
4046 3624
4047 if (nargs == 0) 3625 if (nargs == 0)
4048 return; 3626 return;
4049 3627
… …
4075 scr_touch (true); 3653 scr_touch (true);
4076 break; 3654 break;
4077#endif 3655#endif
4078 case 1048: /* alternative cursor save */ 3656 case 1048: /* alternative cursor save */
4079 case 1049: 3657 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 3658 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 3659 if (mode == 0)
4082 scr_cursor (RESTORE); 3660 scr_cursor (RESTORE);
4083 else if (mode == 1) 3661 else if (mode == 1)
4084 scr_cursor (SAVE); 3662 scr_cursor (SAVE);
4085 break; 3663 break;
… …
4097 */ 3675 */
4098 PrivMode (1, PrivMode_vt52); 3676 PrivMode (1, PrivMode_vt52);
4099 break; 3677 break;
4100 case 3: /* 80/132 */ 3678 case 3: /* 80/132 */
4101 if (priv_modes & PrivMode_132OK) 3679 if (priv_modes & PrivMode_132OK)
3680 {
3681 scr_poweron ();
4102 set_widthheight (((state ? 132 : 80) * fwidth), height); 3682 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3683 }
4103 break; 3684 break;
4104 case 4: /* smooth scrolling */ 3685 case 4: /* smooth scrolling */
4105 set_option (Opt_jumpScroll, !state); 3686 set_option (Opt_jumpScroll, !state);
4106 break; 3687 break;
4107 case 5: /* reverse video */ 3688 case 5: /* reverse video */
… …
4114 scr_autowrap (state); 3695 scr_autowrap (state);
4115 break; 3696 break;
4116 /* case 8: - auto repeat, can't do on a per window basis */ 3697 /* case 8: - auto repeat, can't do on a per window basis */
4117 case 9: /* X10 mouse reporting */ 3698 case 9: /* X10 mouse reporting */
4118 if (state) /* orthogonal */ 3699 if (state) /* orthogonal */
4119 priv_modes &= ~PrivMode_MouseX11; 3700 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4120 break; 3701 break;
4121#ifdef scrollBar_esc 3702#ifdef scrollBar_esc
4122 case scrollBar_esc: 3703 case scrollBar_esc:
4123 if (scrollbar_mapping (state)) 3704 if (scrollbar_mapping (state))
4124 { 3705 {
… …
4137 break; 3718 break;
4138 /* case 66: - application key pad */ 3719 /* case 66: - application key pad */
4139 /* case 67: - backspace key */ 3720 /* case 67: - backspace key */
4140 case 1000: /* X11 mouse reporting */ 3721 case 1000: /* X11 mouse reporting */
4141 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX10; 3723 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3724 break;
4144#if 0
4145 case 1001: 3725 case 1002:
4146 break; /* X11 mouse highlighting */ 3726 case 1003:
4147#endif 3727 if (state)
3728 {
3729 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3730 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3731 vt_emask_mouse = PointerMotionMask;
3732 }
3733 else
3734 vt_emask_mouse = NoEventMask;
3735 vt_select_input ();
3736 break;
4148 case 1010: /* scroll to bottom on TTY output inhibit */ 3737 case 1010: /* scroll to bottom on TTY output inhibit */
4149 set_option (Opt_scrollTtyOutput, !state); 3738 set_option (Opt_scrollTtyOutput, !state);
4150 break; 3739 break;
4151 case 1011: /* scroll to bottom on key press */ 3740 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 3741 set_option (Opt_scrollTtyKeypress, state);
4153 break; 3742 break;
4154 case 1047: /* secondary screen w/ clearing last */ 3743 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 3746 scr_erase_screen (2);
4158 scr_change_screen (state); 3747 scr_change_screen (state);
4159 break; 3748 break;
4160 case 1049: /* secondary screen w/ clearing first */ 3749 case 1049: /* secondary screen w/ clearing first */
4161 scr_change_screen (state); 3750 scr_change_screen (state);
4162 if (OPTION (Opt_secondaryScreen)) 3751 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 3752 if (current_screen != PRIMARY)
4164 scr_erase_screen (2); 3753 scr_erase_screen (2);
4165 break; 3754 break;
4166 default: 3755 default:
4167 break; 3756 break;
… …
4329rxvt_term::process_graphics () 3918rxvt_term::process_graphics ()
4330{ 3919{
4331 unicode_t ch, cmd = cmd_getc (); 3920 unicode_t ch, cmd = cmd_getc ();
4332 3921
4333 if (cmd == 'Q') 3922 if (cmd == 'Q')
3923 {
4334 { /* query graphics */ 3924 /* query graphics */
4335 tt_printf ("\033G0\012"); /* no graphics */ 3925 tt_printf ("\033G0\012"); /* no graphics */
4336 return; 3926 return;
4337 } 3927 }
4338 /* swallow other graphics sequences until terminating ':' */ 3928 /* swallow other graphics sequences until terminating ':' */
4339 do 3929 do
… …
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3979 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4390 3980
4391 memcpy (v_buffer + v_buflen, data, len); 3981 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len; 3982 v_buflen += len;
4393 3983
4394 pty_ev.set (EVENT_READ | EVENT_WRITE); 3984 pty_ev.set (ev::READ | ev::WRITE);
4395} 3985}
4396 3986
4397void rxvt_term::pty_write () 3987void rxvt_term::pty_write ()
4398{ 3988{
4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3989 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4404 3994
4405 if (v_buflen == 0) 3995 if (v_buflen == 0)
4406 { 3996 {
4407 free (v_buffer); 3997 free (v_buffer);
4408 v_buffer = 0; 3998 v_buffer = 0;
4409 v_buflen = 0;
4410 3999
4411 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4412 return; 4001 return;
4413 } 4002 }
4414 4003
4415 memmove (v_buffer, v_buffer + written, v_buflen); 4004 memmove (v_buffer, v_buffer + written, v_buflen);
4416 } 4005 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4006 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ); 4007 pty_ev.set (ev::READ);
4419} 4008}
4420 4009
4421/*----------------------- end-of-file (C source) -----------------------*/ 4010/*----------------------- end-of-file (C source) -----------------------*/
4422 4011

Diff Legend

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