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

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

Diff Legend

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