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

Diff Legend

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