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.267 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.366 by ayin, Thu Nov 15 11:36:15 2007 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>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * 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
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
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);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 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
542 switch (keysym) 584 switch (keysym)
543 { 585 {
544#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 587 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
551 } 593 }
552 else 594 else
553 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 596 break;
555#endif 597#endif
556#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 599 case XK_Delete:
568 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 601 break;
570#endif 602#endif
571 case XK_Tab: 603 case XK_Tab:
572 if (shft) 604 if (shft)
573 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
583#endif 615#endif
584 newlen = 0; 616 newlen = 0;
585 } 617 }
586 break; 618 break;
587 619
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
620 break; 636 break;
621 637
622#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior: 639 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
635 break; 641 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next: 642 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
648 break; 644 break;
649#endif 645#endif
650 case XK_KP_Enter: 646 case XK_KP_Enter:
651 /* allow shift to override */ 647 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
653 { 649 {
654 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
655 break; 651 break;
656 } 652 }
657 653
… …
669 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
671 } 667 }
672 break; 668 break;
673 669
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 694 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
706 { 696 {
707 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 699 }
710 else 700 else
… …
716 706
717 case XK_Find: 707 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
719 break; 709 break;
720 710
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert: 711 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
733 break; 713 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 715 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
740 break; 720 break;
741 case XK_Select: 721 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
743 break; 723 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 724 case XK_End:
755 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
756 break; 726 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 727 case XK_Home:
768 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
769 break; 729 break;
770 730
771#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
873 return; 833 return;
874 834
875 if (len <= 0) 835 if (len <= 0)
876 return; /* not mapped */ 836 return; /* not mapped */
877 837
878 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 839 if (view_start)
880 { 840 {
881 view_start = 0; 841 view_start = 0;
882 want_refresh = 1; 842 want_refresh = 1;
883 } 843 }
… …
905 { 865 {
906 const char ch = C0_ESC; 866 const char ch = C0_ESC;
907 tt_write (&ch, 1); 867 tt_write (&ch, 1);
908 } 868 }
909 869
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
921} 871}
922/*}}} */ 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}
923 949
924#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
925unsigned int 951unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 953{
… …
957void 983void
958rxvt_term::flush () 984rxvt_term::flush ()
959{ 985{
960 flush_ev.stop (); 986 flush_ev.stop ();
961 987
962#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
963 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
964 { 990 {
965 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
966 scr_clear ();
967 scr_touch (false); 992 scr_touch (false);
968 } 993 }
969#endif 994#endif
970 995
971 if (want_refresh) 996 if (want_refresh)
… …
1006 while (l->is_longer () && row < end_row); 1031 while (l->is_longer () && row < end_row);
1007 } 1032 }
1008 while (row < end_row); 1033 while (row < end_row);
1009 } 1034 }
1010 1035
1011 scr_refresh (refresh_type); 1036 scr_refresh ();
1012 scrollbar_show (1); 1037 scrollbar_show (1);
1013#ifdef USE_XIM 1038#ifdef USE_XIM
1014 IMSendSpot (); 1039 IMSendSpot ();
1015#endif 1040#endif
1016 } 1041 }
1017 1042
1018 display->flush (); 1043 display->flush ();
1019} 1044}
1020 1045
1021void 1046void
1022rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1023{ 1048{
1024 make_current (); 1049 make_current ();
1025 1050
1026 display->flush (); 1051 display->flush ();
1027 1052
1028 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1030} 1055}
1031 1056
1032void 1057void
1033rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1034{ 1059{
1035 make_current (); 1060 make_current ();
1036 1061
1037 refresh_limit = 1;
1038 refresh_count = 0; 1062 refresh_count = 0;
1039 flush (); 1063 flush ();
1040} 1064}
1041 1065
1042#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1043void 1067void
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1045{ 1069{
1046 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1071 want_refresh = 1;
1048
1049 w.start (w.at + BLINK_INTERVAL);
1050} 1072}
1051#endif 1073#endif
1052 1074
1053#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1054void 1076void
1055rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1056{ 1078{
1057 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1058 { 1080 {
1059 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1060 want_refresh = 1; 1082 want_refresh = 1;
1061 w.start (w.at + TEXT_BLINK_INTERVAL);
1062 } 1083 }
1063} 1084}
1064#endif 1085#endif
1065 1086
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1088void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1090{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 {
1073 refresh_type |= SMOOTH_REFRESH;
1074 want_refresh = 1; 1093 want_refresh = 1;
1075 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1076 } 1095 w.stop ();
1077} 1096}
1078#endif 1097#endif
1079 1098
1080#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1081void 1100void
1082rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1083{ 1102{
1084 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1085 { 1104 {
1086 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1087 refresh_type |= SMOOTH_REFRESH;
1088 want_refresh = 1; 1106 want_refresh = 1;
1089 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1090 } 1107 }
1108 else
1109 w.stop ();
1091} 1110}
1092#endif 1111#endif
1093 1112
1094#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1095void 1114void
1096rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1097{ 1116{
1098 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1099 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1100 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1101 { 1120 {
1102 if (view_start == top_row || view_start == 0) 1121 if (view_start == top_row || view_start == 0)
1103 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1104 1123
1105 refresh_type |= SMOOTH_REFRESH;
1106 want_refresh = 1; 1124 want_refresh = 1;
1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1108 } 1125 }
1126 else
1127 w.stop ();
1109} 1128}
1110#endif 1129#endif
1111 1130
1112#if HAVE_SCHED_YIELD 1131#if LINUX_YIELD_HACK
1113static struct event_handler 1132static struct event_handler
1114{ 1133{
1115 check_watcher cw_yield; 1134 ev::prepare yield_ev;
1116 1135
1117 void yield (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1118 { 1137 {
1119 sched_yield (); 1138 // this should really be sched_yield(), but the linux guys thought
1139 // that giving a process calling sched_yield () less cpu time than
1140 // ones with high nice levels is a useful thing to do. It surely is is
1141 // allowed by the sus... as is returning ENOSYS.
1142
1143 struct timespec ts = { 0, 0 };
1144 nanosleep (&ts, 0);
1145
1120 w.stop (); 1146 w.stop ();
1121 } 1147 }
1122 1148
1123 event_handler () 1149 event_handler ()
1124 : cw_yield (this, &event_handler::yield) 1150 : yield_ev (this, &event_handler::yield_cb)
1125 { 1151 {
1126 } 1152 }
1127} event_handler; 1153} event_handler;
1128#endif 1154#endif
1129 1155
… …
1140 1166
1141 memmove (cmdbuf_base, cmdbuf_ptr, n); 1167 memmove (cmdbuf_base, cmdbuf_ptr, n);
1142 cmdbuf_ptr = cmdbuf_base; 1168 cmdbuf_ptr = cmdbuf_base;
1143 cmdbuf_endp = cmdbuf_ptr + n; 1169 cmdbuf_endp = cmdbuf_ptr + n;
1144 1170
1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1171 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1146 1172
1147 if (r > 0) 1173 if (r > 0)
1148 { 1174 {
1149 cmdbuf_endp += r; 1175 cmdbuf_endp += r;
1150 return true; 1176 return true;
1151 } 1177 }
1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 { 1179 {
1154#if HAVE_SCHED_YIELD 1180#if LINUX_YIELD_HACK
1155 if (display->is_local) 1181 if (display->is_local)
1156 event_handler.cw_yield.start (); 1182 event_handler.yield_ev.start ();
1157#endif 1183#endif
1158 } 1184 }
1159 else 1185 else
1160 { 1186 {
1161 pty_ev.stop (); 1187 pty_ev.stop ();
1162 1188
1163 if (!OPTION (Opt_hold)) 1189 if (!option (Opt_hold))
1164 destroy (); 1190 destroy ();
1165 } 1191 }
1166 1192
1167 return false; 1193 return false;
1168} 1194}
1169 1195
1170void 1196void
1171rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1172{ 1198{
1173 make_current (); 1199 make_current ();
1174 1200
1175 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1176 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1177 while (pty_fill ()) 1203 while (pty_fill ())
1178 if (cmd_parse ()) 1204 if (cmd_parse ())
1179 break; 1205 break;
1180 1206
1181 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1182 pty_write (); 1208 pty_write ();
1183} 1209}
1184 1210
1185void 1211void
1186rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1187{ 1213{
1188 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1189 recolour_cursor (); 1215 recolour_cursor ();
1190 1216
1191#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1192 hidden_pointer = 0; 1218 hidden_pointer = 0;
1193 1219
1194 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1195 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1196#endif 1222#endif
1197} 1223}
1198 1224
1199#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1200void 1226void
1201rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1202{ 1228{
1203 if (!OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1204 return; 1230 return;
1205 1231
1206 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1207 XFlush (display->display); 1233 XFlush (dpy);
1208 1234
1209 hidden_pointer = 1; 1235 hidden_pointer = 1;
1210} 1236}
1211 1237
1212void 1238void
1213rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1214{ 1240{
1215 make_current (); 1241 make_current ();
1216 1242
1217 pointer_blank (); 1243 pointer_blank ();
1218} 1244}
… …
1221void 1247void
1222rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1223{ 1249{
1224 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1225 int x, y; 1251 int x, y;
1252 int code = 32;
1226 1253
1227 x = ev.x; 1254 x = Pixel2Col (ev.x);
1228 y = ev.y; 1255 y = Pixel2Row (ev.y);
1229 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1230 1264
1231 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1232 button_number = 3; 1266 button_number = 3;
1233 else 1267 else
1234 { 1268 {
… …
1280 x + 1, 1314 x + 1,
1281 y + 1); 1315 y + 1);
1282#endif 1316#endif
1283 1317
1284 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1285 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1286 (32 + x + 1), 1320 (32 + x + 1),
1287 (32 + y + 1)); 1321 (32 + y + 1));
1288} 1322}
1289
1290#ifdef USING_W11LIB
1291void
1292rxvt_W11_process_x_event (XEvent *ev)
1293{
1294 rxvt_t *r = rxvt_get_r ();
1295
1296 x_cb (*ev);
1297}
1298#endif
1299 1323
1300/*{{{ process an X event */ 1324/*{{{ process an X event */
1301void 1325void
1302rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
1303{ 1327{
1304 make_current (); 1328 make_current ();
1305 1329
1306 dDisp; 1330 dLocal (Display *, dpy);
1307 1331
1308 if (ev.xany.window == vt 1332 if (ev.xany.window == vt
1309 && SHOULD_INVOKE (HOOK_X_EVENT) 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return; 1335 return;
… …
1316 unsigned int unused_mask; 1340 unsigned int unused_mask;
1317 1341
1318 switch (ev.type) 1342 switch (ev.type)
1319 { 1343 {
1320 case KeyPress: 1344 case KeyPress:
1321#if ISO_14755 1345 key_press (ev.xkey);
1322 if (!(iso14755buf & ISO_14755_52))
1323#endif
1324 lookup_key (ev.xkey);
1325
1326 break; 1346 break;
1327 1347
1328 case KeyRelease: 1348 case KeyRelease:
1329 { 1349 key_release (ev.xkey);
1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1331 KeySym keysym;
1332
1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1334#endif
1335
1336#if ENABLE_FRILLS || ISO_14755
1337 // ISO 14755 support
1338 if (iso14755buf)
1339 if (iso14755buf & ISO_14755_52)
1340 {
1341# if ENABLE_OVERLAY
1342 scr_overlay_off ();
1343# endif
1344# if ISO_14755
1345 // iso14755 part 5.2 handling: release time
1346 // first: controls
1347 if ((ev.xkey.state & ControlMask)
1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1350 {
1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1352 commit_iso14755 ();
1353 goto skip_switch;
1354 }
1355
1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1357 if (i[0] == keysym)
1358 {
1359 iso14755buf = ISO_14755_51 | i[1];
1360 commit_iso14755 ();
1361 goto skip_switch;
1362 }
1363
1364 scr_bell ();
1365# endif
1366 iso14755buf = 0;
1367 break;
1368 }
1369 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374 if (iso14755buf & ISO_14755_51)
1375 commit_iso14755 ();
1376#if ISO_14755
1377 else if (iso14755buf & ISO_14755_STARTED)
1378 {
1379 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1380
1381 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1382 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1383 }
1384# endif
1385 else
1386 iso14755buf = 0;
1387 }
1388#endif
1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1395 if (!(ev.xkey.state & ControlMask))
1396 slip_wheel_ev.stop ();
1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1398 mouse_slip_wheel_speed = 0;
1399#endif
1400 break; 1350 break;
1401 }
1402 1351
1403 case ButtonPress: 1352 case ButtonPress:
1404 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1405 break; 1354 break;
1406 1355
… …
1408 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1409 break; 1358 break;
1410 1359
1411 case ClientMessage: 1360 case ClientMessage:
1412 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1413 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1362 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1414 { 1363 {
1364 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1365 {
1366 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1367 {
1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1369 {
1370 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1371 destroy ();
1372 }
1417#if ENABLE_EWMH 1373#if ENABLE_EWMH
1418 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1374 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1419 XSendEvent (disp, ev.xclient.window = display->root, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1420 False, SubstructureRedirectMask | SubstructureNotifyMask, 1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1421 &ev); 1377 &ev);
1378#endif
1379 }
1380 }
1381#if ENABLE_XEMBED
1382 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1383 {
1384 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1385 focus_in ();
1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1387 focus_out ();
1388 }
1422#endif 1389#endif
1423 } 1390 }
1424#if ENABLE_XEMBED
1425 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1426 {
1427 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1428 focus_in ();
1429 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1430 focus_out ();
1431 }
1432#endif
1433#ifdef OFFIX_DND
1434 /* OffiX Dnd (drag 'n' drop) protocol */
1435 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1436 && (ev.xclient.data.l[0] == DndFile
1437 || ev.xclient.data.l[0] == DndDir
1438 || ev.xclient.data.l[0] == DndLink))
1439 {
1440 /* Get Dnd data */
1441 Atom ActualType;
1442 int ActualFormat;
1443 unsigned char *data;
1444 unsigned long Size, RemainingBytes;
1445
1446 XGetWindowProperty (disp, display->root,
1447 xa[XA_DNDSELECTION],
1448 0L, 1000000L,
1449 False, AnyPropertyType,
1450 &ActualType, &ActualFormat,
1451 &Size, &RemainingBytes,
1452 &data);
1453 set_string_property (XA_CUT_BUFFER0, data);
1454 XFree (data);
1455 selection_paste (display->root, XA_CUT_BUFFER0, true);
1456 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1457 }
1458#endif /* OFFIX_DND */
1459 break;
1460
1461 case MappingNotify:
1462 XRefreshKeyboardMapping (&ev.xmapping);
1463 break; 1391 break;
1464 1392
1465 /* 1393 /*
1466 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1467 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1486 break; 1414 break;
1487 } 1415 }
1488 break; 1416 break;
1489 1417
1490 case FocusIn: 1418 case FocusIn:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1491 focus_in (); 1422 focus_in ();
1492 break; 1423 break;
1493 1424
1494 case FocusOut: 1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1495 focus_out (); 1429 focus_out ();
1496 break; 1430 break;
1497 1431
1498 case ConfigureNotify: 1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1499 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1500 { 1437 {
1501 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1502 ; 1439 ;
1503 1440
1504 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1505 { 1442 {
1506 seen_resize = 1; 1443 seen_resize = 1;
1507 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1508 } 1445 }
1509 1446 else
1510#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1447 {
1511 if (OPTION (Opt_transparent)) 1448#ifdef HAVE_BG_PIXMAP
1512 check_our_parents (); 1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1513#endif 1451#endif
1452 }
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1514 } 1454 }
1515 break; 1455 break;
1516 1456
1517 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1518 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1519 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1520 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1521 1462
1522 break; 1463 break;
1523 1464
1524 case SelectionClear: 1465 case SelectionClear:
1525 selection_clear (); 1466 selection_clear ();
… …
1535 break; 1476 break;
1536 1477
1537 case MapNotify: 1478 case MapNotify:
1538 mapped = 1; 1479 mapped = 1;
1539#ifdef TEXT_BLINK 1480#ifdef TEXT_BLINK
1540 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1481 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1541#endif 1482#endif
1542 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break; 1484 break;
1544 1485
1545 case UnmapNotify: 1486 case UnmapNotify:
… …
1547#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1548 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1549#endif 1490#endif
1550 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1551 break; 1492 break;
1552
1553#ifdef TRANSPARENT
1554 case ReparentNotify:
1555 rootwin_cb (ev);
1556 break;
1557#endif /* TRANSPARENT */
1558 1493
1559 case GraphicsExpose: 1494 case GraphicsExpose:
1560 case Expose: 1495 case Expose:
1561 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1562 { 1497 {
1563 do 1498 do
1499 {
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1567 1504
1568 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1569 1506
1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1571 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1572 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1573 1511 }
1574 want_refresh = 1; 1512 want_refresh = 1;
1575 } 1513 }
1576 else 1514 else
1577 { 1515 {
1578 XEvent unused_event; 1516 XEvent unused_event;
1579 1517
1580 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1581 ; 1519 ;
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1583 ; 1521 ;
1584 1522
1585 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1586 { 1524 {
1587 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1588 scrollbar_show (0); 1526 scrollbar_show (0);
1589 } 1527 }
1590
1591#ifdef TRANSPARENT
1592 if (am_transparent && ev.xany.window == parent[0])
1593 XClearWindow (disp, ev.xany.window);
1594#endif
1595 } 1528 }
1596 break; 1529 break;
1597 1530
1598 case MotionNotify: 1531 case MotionNotify:
1599#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1600 if (hidden_pointer) 1533 if (hidden_pointer)
1601 pointer_unblank (); 1534 pointer_unblank ();
1602#endif 1535#endif
1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1537 || priv_modes & PrivMode_MouseAnyEvent)
1538 mouse_report (ev.xbutton);
1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1604 break; 1540 break;
1605 1541
1606 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1607 { 1543 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop 1546 ; // nop
1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1612 { 1548 {
1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1614 ; 1550 ;
1615 1551
1616 XQueryPointer (disp, vt, 1552 XQueryPointer (dpy, vt,
1617 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1618 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1619 &ev.xbutton.x, &ev.xbutton.y, 1555 &ev.xbutton.x, &ev.xbutton.y,
1620 &ev.xbutton.state); 1556 &ev.xbutton.state);
1621#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
… …
1642 1578
1643 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1644 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1645 */ 1581 */
1646 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.active)
1647 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1648 1584
1649 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1650 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1651 */ 1587 */
1652 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1685#endif 1621#endif
1686 } 1622 }
1687 } 1623 }
1688 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1624 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1689 { 1625 {
1690 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1626 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1691 MotionNotify, &ev)) 1627 MotionNotify, &ev))
1692 ; 1628 ;
1693 1629
1694 XQueryPointer (disp, scrollBar.win, 1630 XQueryPointer (dpy, scrollBar.win,
1695 &unused_root, &unused_child, 1631 &unused_root, &unused_child,
1696 &unused_root_x, &unused_root_y, 1632 &unused_root_x, &unused_root_y,
1697 &ev.xbutton.x, &ev.xbutton.y, 1633 &ev.xbutton.x, &ev.xbutton.y,
1698 &unused_mask); 1634 &unused_mask);
1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1700 scrollbar_size ()); 1636 scrollbar_size ());
1701 want_refresh = 1; 1637 want_refresh = 1;
1702 refresh_limit = 0;
1703 scrollbar_show (1); 1638 scrollbar_show (1);
1704 } 1639 }
1705 break; 1640 break;
1706 } 1641 }
1707 1642
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK) 1643#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1644 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1712 { 1645 {
1713 if (hidden_cursor) 1646 if (hidden_cursor)
1714 { 1647 {
1715 hidden_cursor = 0; 1648 hidden_cursor = 0;
1716 want_refresh = 1; 1649 want_refresh = 1;
1717 } 1650 }
1718 1651
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1652 cursor_blink_ev.again ();
1720 } 1653 }
1721#endif 1654#endif
1722 1655
1723#if defined(POINTER_BLANK) 1656#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 { 1658 {
1726 if (ev.type == MotionNotify 1659 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress 1660 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease) 1661 || ev.type == ButtonRelease)
1729 if (hidden_pointer) 1662 if (hidden_pointer)
… …
1741 if (!focus) 1674 if (!focus)
1742 { 1675 {
1743 focus = 1; 1676 focus = 1;
1744 want_refresh = 1; 1677 want_refresh = 1;
1745 1678
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1679 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1680
1748#if USE_XIM 1681#if USE_XIM
1749 if (Input_Context != NULL) 1682 if (Input_Context != NULL)
1750 { 1683 {
1751 IMSetStatusPosition (); 1684 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1753 } 1686 }
1754#endif 1687#endif
1755#if CURSOR_BLINK 1688#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1758#endif 1691#endif
1759#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1761 { 1694 {
1762 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
1763 scr_recolour (); 1696 scr_recolour ();
1764 } 1697 }
1765#endif 1698#endif
1699#if ENABLE_FRILLS
1700 if (option (Opt_urgentOnBell))
1701 {
1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1703 {
1704 h->flags &= ~XUrgencyHint;
1705 XSetWMHints (dpy, parent[0], h);
1706 }
1707 }
1708#endif
1766 } 1709 }
1767} 1710}
1768 1711
1769void 1712void
1770rxvt_term::focus_out () 1713rxvt_term::focus_out ()
… …
1778 1721
1779#if ENABLE_FRILLS || ISO_14755 1722#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf) 1723 if (iso14755buf)
1781 { 1724 {
1782 iso14755buf = 0; 1725 iso14755buf = 0;
1783# if ENABLE_OVERLAY 1726# if ISO_14755
1784 scr_overlay_off (); 1727 scr_overlay_off ();
1785# endif 1728# endif
1786 } 1729 }
1787#endif 1730#endif
1788#if USE_XIM 1731#if USE_XIM
1789 if (Input_Context != NULL) 1732 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1791#endif 1734#endif
1792#if CURSOR_BLINK 1735#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1795 hidden_cursor = 0; 1739 hidden_cursor = 0;
1796#endif 1740#endif
1797#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1799 { 1743 {
… …
1802 } 1746 }
1803#endif 1747#endif
1804 } 1748 }
1805} 1749}
1806 1750
1807#if TRANSPARENT 1751void
1752rxvt_term::update_fade_color (unsigned int idx)
1753{
1754#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade])
1756 {
1757 rgba c;
1758 pix_colors [Color_fade].get (c);
1759 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1760 }
1761#endif
1762}
1763
1764#if ENABLE_TRANSPARENCY || ENABLE_PERL
1808void 1765void
1809rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1767{
1811 make_current (); 1768 make_current ();
1812 1769
1770 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1771 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1772 return;
1773
1774# if ENABLE_TRANSPARENCY
1813 switch (ev.type) 1775 switch (ev.type)
1814 { 1776 {
1815 case PropertyNotify: 1777 case PropertyNotify:
1816 /* 1778 /*
1817 * if user used some Esetroot compatible prog to set the root bg, 1779 * if user used some Esetroot compatible prog to set the root bg,
1818 * use the property to determine the pixmap. We use it later on. 1780 * use the property to determine the pixmap. We use it later on.
1819 */ 1781 */
1820 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822 return; 1784 {
1823 1785 bgPixmap.set_root_pixmap ();
1824 /* FALLTHROUGH */ 1786 update_background ();
1825 case ReparentNotify: 1787 }
1826 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1827 want_refresh = want_full_refresh = 1;
1828 break; 1788 break;
1829 } 1789 }
1790# endif
1830} 1791}
1831#endif 1792#endif
1832 1793
1833void 1794void
1834rxvt_term::button_press (XButtonEvent &ev) 1795rxvt_term::button_press (XButtonEvent &ev)
… …
1843 /* 1804 /*
1844 * VT window processing of button press 1805 * VT window processing of button press
1845 */ 1806 */
1846 if (ev.window == vt) 1807 if (ev.window == vt)
1847 { 1808 {
1809 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1810 return;
1811
1848#if ISO_14755 1812#if ISO_14755
1849 // 5.4 1813 // 5.4
1850 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1814 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1851 { 1815 {
1852 iso14755_54 (ev.x, ev.y); 1816 iso14755_54 (ev.x, ev.y);
… …
1886 mouse_report (ev); 1850 mouse_report (ev);
1887 } 1851 }
1888#else 1852#else
1889 MEvent.button = ev.button; 1853 MEvent.button = ev.button;
1890 mouse_report (ev); 1854 mouse_report (ev);
1891#endif /* MOUSE_REPORT_DOUBLECLICK */ 1855#endif /* MOUSE_REPORT_DOUBLECLICK */
1892 1856
1893 } 1857 }
1894 else 1858 else
1895 { 1859 {
1896 if (ev.button != MEvent.button) 1860 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1861 MEvent.clicks = 0;
1898 1862
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1863 switch (ev.button)
1901 { 1864 {
1902 case Button1: 1865 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1866 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1867 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1868#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1869 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1870#else
1908 selection.rect = false; 1871 selection.rect = false;
1909#endif 1872#endif
1910 1873
1911 /* allow shift+left click to extend selection */ 1874 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1875 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1876 {
1914 if (MEvent.button == Button1 && clickintime) 1877 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1878 selection_rotate (ev.x, ev.y);
1916 else 1879 else
1917 selection_extend (ev.x, ev.y, 1); 1880 selection_extend (ev.x, ev.y, 1);
1918 } 1881 }
1919 else 1882 else
1920 { 1883 {
1921 if (MEvent.button == Button1 && clickintime) 1884 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1885 MEvent.clicks++;
1923 else 1886 else
1924 MEvent.clicks = 1; 1887 MEvent.clicks = 1;
1925 1888
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1889 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1890 }
1928 1891
1929 MEvent.button = Button1; 1892 MEvent.button = Button1;
1930 break; 1893 break;
1931 1894
1932 case Button3: 1895 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1896 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1935 else 1898 else
1936 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
1937 1900
1938 MEvent.button = Button3; 1901 MEvent.button = Button3;
1939 break; 1902 break;
1940 } 1903 }
1941 } 1904 }
1942 1905
1943 MEvent.time = ev.time; 1906 MEvent.time = ev.time;
1944 return; 1907 return;
1945 } 1908 }
1946 1909
… …
1991 tt_printf ("\033[5~"); 1954 tt_printf ("\033[5~");
1992 break; 1955 break;
1993 } 1956 }
1994 } 1957 }
1995 else 1958 else
1996#endif /* NO_SCROLLBAR_REPORT */ 1959#endif /* NO_SCROLLBAR_REPORT */
1997 1960
1998 { 1961 {
1999 char upordown = 0; 1962 char upordown = 0;
2000 1963
2001 if (scrollBar.style == R_SB_NEXT) 1964 if (scrollBar.style == R_SB_NEXT)
… …
2013 upordown = 1; /* down */ 1976 upordown = 1; /* down */
2014 } 1977 }
2015 if (upordown) 1978 if (upordown)
2016 { 1979 {
2017#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2018 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2019#endif 1982#endif
2020 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2021 { 1984 {
2022 if (upordown < 0) 1985 if (upordown < 0)
2023 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2100 2063
2101 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
2102 { 2065 {
2103 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2104 scrollbar_show (0); 2067 scrollbar_show (0);
2105#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2106 refresh_type &= ~SMOOTH_REFRESH;
2107#endif
2108 } 2068 }
2109 2069
2110#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2111 if (sel_scroll_ev.active) 2071 if (sel_scroll_ev.active)
2112 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2113#endif 2073#endif
2114 2074
2115 if (ev.window == vt) 2075 if (ev.window == vt)
2116 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
2117#if ISO_14755 2080#if ISO_14755
2118 // 5.4 2081 // 5.4
2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2120 return; 2083 return;
2121#endif 2084#endif
2085
2122 if (reportmode) 2086 if (reportmode)
2123 { 2087 {
2124 /* mouse report from vt window */ 2088 /* mouse report from vt window */
2125 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
2126 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
2137 mouse_report (ev); 2101 mouse_report (ev);
2138 } 2102 }
2139#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2140 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2141 mouse_report (ev); 2105 mouse_report (ev);
2142#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2143 return; 2107 return;
2144 } 2108 }
2145 2109
2146 /* 2110 /*
2147 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2150 if (priv_modes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
2151 && bypass_keystate 2115 && bypass_keystate
2152 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
2153 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
2154 2118
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2158 switch (ev.button) 2119 switch (ev.button)
2159 { 2120 {
2160 case Button1: 2121 case Button1:
2161 case Button3: 2122 case Button3:
2162 selection_make (ev.time); 2123 selection_make (ev.time);
2163 break; 2124 break;
2125
2164 case Button2: 2126 case Button2:
2165 selection_request (ev.time, ev.x, ev.y); 2127 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2128 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2166 break; 2129 break;
2130
2167#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
2168 case Button4: 2132 case Button4:
2169 case Button5: 2133 case Button5:
2170 { 2134 {
2171 int i; 2135 int i;
… …
2173 2137
2174 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2175 2139
2176 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2177 i = 1; 2141 i = 1;
2178 else if (OPTION (Opt_mouseWheelScrollPage)) 2142 else if (option (Opt_mouseWheelScrollPage))
2179 i = nrow - 1; 2143 i = nrow - 1;
2180 else 2144 else
2181 i = 5; 2145 i = 5;
2182 2146
2183# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
… …
2185 { 2149 {
2186 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2187 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2188 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2189 2153
2190 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2191 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2192
2193 slip_wheel_ev.start ();
2194 } 2155 }
2195 else 2156 else
2196 { 2157 {
2197# endif 2158# endif
2198 scr_page (v, i); 2159 scr_page (v, i);
… …
2204 break; 2165 break;
2205#endif 2166#endif
2206 } 2167 }
2207 } 2168 }
2208} 2169}
2209
2210#ifdef TRANSPARENT
2211#if TINTING
2212/* taken from aterm-0.4.2 */
2213
2214typedef uint32_t RUINT32T;
2215
2216void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2217{
2218 int sh_r, sh_g, sh_b;
2219 RUINT32T mask_r, mask_g, mask_b;
2220 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2221 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2222 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2223 int i;
2224
2225 Visual *visual = display->visual;
2226
2227 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2228
2229 /* for convenience */
2230 mask_r = visual->red_mask;
2231 mask_g = visual->green_mask;
2232 mask_b = visual->blue_mask;
2233
2234 /* boring lookup table pre-initialization */
2235 switch (srcImage->bits_per_pixel) {
2236 case 15:
2237 if ((mask_r != 0x7c00) ||
2238 (mask_g != 0x03e0) ||
2239 (mask_b != 0x001f))
2240 return;
2241 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2242 lookup_r = lookup;
2243 lookup_g = lookup+32;
2244 lookup_b = lookup+32+32;
2245 sh_r = 10;
2246 sh_g = 5;
2247 sh_b = 0;
2248 break;
2249 case 16:
2250 if ((mask_r != 0xf800) ||
2251 (mask_g != 0x07e0) ||
2252 (mask_b != 0x001f))
2253 return;
2254 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2255 lookup_r = lookup;
2256 lookup_g = lookup+32;
2257 lookup_b = lookup+32+64;
2258 sh_r = 11;
2259 sh_g = 5;
2260 sh_b = 0;
2261 break;
2262 case 24:
2263 if ((mask_r != 0xff0000) ||
2264 (mask_g != 0x00ff00) ||
2265 (mask_b != 0x0000ff))
2266 return;
2267 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2268 lookup_r = lookup;
2269 lookup_g = lookup+256;
2270 lookup_b = lookup+256+256;
2271 sh_r = 16;
2272 sh_g = 8;
2273 sh_b = 0;
2274 break;
2275 case 32:
2276 if ((mask_r != 0xff0000) ||
2277 (mask_g != 0x00ff00) ||
2278 (mask_b != 0x0000ff))
2279 return;
2280 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2281 lookup_r = lookup;
2282 lookup_g = lookup+256;
2283 lookup_b = lookup+256+256;
2284 sh_r = 16;
2285 sh_g = 8;
2286 sh_b = 0;
2287 break;
2288 default:
2289 return; /* we do not support this color depth */
2290 }
2291
2292 /* prepare limits for color transformation (each channel is handled separately) */
2293 if (shade < 0) {
2294 shade = -shade;
2295 if (shade < 0) shade = 0;
2296 if (shade > 100) shade = 100;
2297
2298 lower_lim_r = 65535-rm;
2299 lower_lim_g = 65535-gm;
2300 lower_lim_b = 65535-bm;
2301
2302 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2303 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2304 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2305
2306 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2307 } else {
2308 if (shade < 0) shade = 0;
2309 if (shade > 100) shade = 100;
2310
2311 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2312
2313 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2314 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2315 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2316 }
2317
2318 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2319 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2320 {
2321 unsigned int tmp;
2322
2323 tmp = lower_lim_r;
2324 lower_lim_r = lower_lim_b;
2325 lower_lim_b = tmp;
2326
2327 tmp = upper_lim_r;
2328 upper_lim_r = upper_lim_b;
2329 upper_lim_b = tmp;
2330 }
2331
2332 /* fill our lookup tables */
2333 for (i = 0; i <= mask_r>>sh_r; i++)
2334 {
2335 RUINT32T tmp;
2336 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2337 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2338 lookup_r[i] = (tmp/65535)<<sh_r;
2339 }
2340 for (i = 0; i <= mask_g>>sh_g; i++)
2341 {
2342 RUINT32T tmp;
2343 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2344 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2345 lookup_g[i] = (tmp/65535)<<sh_g;
2346 }
2347 for (i = 0; i <= mask_b>>sh_b; i++)
2348 {
2349 RUINT32T tmp;
2350 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2351 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2352 lookup_b[i] = (tmp/65535)<<sh_b;
2353 }
2354
2355 /* apply table to input image (replacing colors by newly calculated ones) */
2356 switch (srcImage->bits_per_pixel)
2357 {
2358 case 15:
2359 {
2360 unsigned short *p1, *pf, *p, *pl;
2361 p1 = (unsigned short *) srcImage->data;
2362 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2363 while (p1 < pf)
2364 {
2365 p = p1;
2366 pl = p1 + srcImage->width;
2367 for (; p < pl; p++)
2368 {
2369 *p = lookup_r[(*p & 0x7c00)>>10] |
2370 lookup_g[(*p & 0x03e0)>> 5] |
2371 lookup_b[(*p & 0x001f)];
2372 }
2373 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2374 }
2375 break;
2376 }
2377 case 16:
2378 {
2379 unsigned short *p1, *pf, *p, *pl;
2380 p1 = (unsigned short *) srcImage->data;
2381 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2382 while (p1 < pf)
2383 {
2384 p = p1;
2385 pl = p1 + srcImage->width;
2386 for (; p < pl; p++)
2387 {
2388 *p = lookup_r[(*p & 0xf800)>>11] |
2389 lookup_g[(*p & 0x07e0)>> 5] |
2390 lookup_b[(*p & 0x001f)];
2391 }
2392 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 case 24:
2397 {
2398 unsigned char *p1, *pf, *p, *pl;
2399 p1 = (unsigned char *) srcImage->data;
2400 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2401 while (p1 < pf)
2402 {
2403 p = p1;
2404 pl = p1 + srcImage->width * 3;
2405 for (; p < pl; p += 3)
2406 {
2407 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2408 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2409 p[2] = lookup_r[(p[2] & 0x0000ff)];
2410 }
2411 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2412 }
2413 break;
2414 }
2415 case 32:
2416 {
2417 RUINT32T *p1, *pf, *p, *pl;
2418 p1 = (RUINT32T *) srcImage->data;
2419 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2420
2421 while (p1 < pf)
2422 {
2423 p = p1;
2424 pl = p1 + srcImage->width;
2425 for (; p < pl; p++)
2426 {
2427 *p = lookup_r[(*p & 0xff0000)>>16] |
2428 lookup_g[(*p & 0x00ff00)>> 8] |
2429 lookup_b[(*p & 0x0000ff)] |
2430 (*p & ~0xffffff);
2431 }
2432 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2433 }
2434 break;
2435 }
2436 }
2437
2438 free (lookup);
2439}
2440#endif
2441
2442/*
2443 * Check our parents are still who we think they are.
2444 * Do transparency updates if required
2445 */
2446int
2447rxvt_term::check_our_parents ()
2448{
2449 int i, pchanged, aformat, have_pixmap, rootdepth;
2450 unsigned long nitems, bytes_after;
2451 Atom atype;
2452 unsigned char *prop = NULL;
2453 Window root, oldp, *list;
2454 Pixmap rootpixmap = None;
2455 XWindowAttributes wattr, wrootattr;
2456 dDisp;
2457
2458 pchanged = 0;
2459
2460 if (!OPTION (Opt_transparent))
2461 return pchanged; /* Don't try any more */
2462
2463 XGetWindowAttributes (disp, display->root, &wrootattr);
2464 rootdepth = wrootattr.depth;
2465
2466 XGetWindowAttributes (disp, parent[0], &wattr);
2467
2468 if (rootdepth != wattr.depth)
2469 {
2470 if (am_transparent)
2471 {
2472 pchanged = 1;
2473 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2474 am_transparent = am_pixmap_trans = 0;
2475 }
2476
2477 return pchanged; /* Don't try any more */
2478 }
2479
2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2481 XSync (disp, False);
2482
2483 /*
2484 * Make the frame window set by the window manager have
2485 * the root background. Some window managers put multiple nested frame
2486 * windows for each client, so we have to take care about that.
2487 */
2488 i = (xa[XA_XROOTPMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL)
2494 i = (xa[XA_ESETROOT_PMAP_ID]
2495 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2497 &nitems, &bytes_after, &prop) == Success);
2498
2499 if (!i || prop == NULL
2500#if TINTING
2501 || !rs[Rs_color + Color_tint]
2502#endif
2503 )
2504 have_pixmap = 0;
2505 else
2506 {
2507 have_pixmap = 1;
2508 rootpixmap = *(Pixmap *)prop;
2509 XFree (prop);
2510 }
2511
2512 if (have_pixmap)
2513 {
2514 /*
2515 * Copy display->root pixmap transparency
2516 */
2517 int sx, sy, nx, ny;
2518 unsigned int nw, nh;
2519 Window cr;
2520 XImage *image;
2521 GC gc;
2522 XGCValues gcvalue;
2523
2524 XTranslateCoordinates (disp, parent[0], display->root,
2525 0, 0, &sx, &sy, &cr);
2526 nw = (unsigned int)szHint.width;
2527 nh = (unsigned int)szHint.height;
2528 nx = ny = 0;
2529
2530 if (sx < 0)
2531 {
2532 nw += sx;
2533 nx = -sx;
2534 sx = 0;
2535 }
2536
2537 if (sy < 0)
2538 {
2539 nh += sy;
2540 ny = -sy;
2541 sy = 0;
2542 }
2543
2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2546
2547 XSync (disp, False);
2548 allowedxerror = -1;
2549 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2550
2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2552 /* XXX: may need a delay here? */
2553 allowedxerror = 0;
2554
2555 if (image == NULL)
2556 {
2557 if (am_transparent && am_pixmap_trans)
2558 {
2559 pchanged = 1;
2560 if (pixmap != None)
2561 {
2562 XFreePixmap (disp, pixmap);
2563 pixmap = None;
2564 }
2565 }
2566
2567 am_pixmap_trans = 0;
2568 }
2569 else
2570 {
2571 if (pixmap != None)
2572 XFreePixmap (disp, pixmap);
2573
2574#if TINTING
2575 if (ISSET_PIXCOLOR (Color_tint))
2576 {
2577 unsigned short rm, gm, bm;
2578 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2579
2580 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2581
2582 ShadeXImage (display, image, shade, rm, gm, bm);
2583 }
2584#endif
2585
2586 pixmap = XCreatePixmap (disp, vt,
2587 szHint.width, szHint.height, image->depth);
2588 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2589 XPutImage (disp, pixmap, gc, image, 0, 0,
2590 nx, ny, image->width, image->height);
2591 XFreeGC (disp, gc);
2592 XDestroyImage (image);
2593 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2594 XClearWindow (disp, parent[0]);
2595
2596 if (!am_transparent || !am_pixmap_trans)
2597 pchanged = 1;
2598
2599 am_transparent = am_pixmap_trans = 1;
2600 }
2601 }
2602
2603 if (am_pixmap_trans)
2604 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2605 else
2606 {
2607 unsigned int n;
2608 /*
2609 * InheritPixmap transparency
2610 */
2611 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2612 {
2613 oldp = parent[i];
2614 XQueryTree (disp, parent[i - 1], &root,
2615 &parent[i], &list, &n);
2616 XFree (list);
2617
2618 if (parent[i] == display->root)
2619 {
2620 if (oldp != None)
2621 pchanged = 1;
2622
2623 break;
2624 }
2625
2626 if (oldp != parent[i])
2627 pchanged = 1;
2628 }
2629
2630 n = 0;
2631
2632 if (pchanged)
2633 {
2634 for (; n < (unsigned int)i; n++)
2635 {
2636 XGetWindowAttributes (disp, parent[n], &wattr);
2637 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2638 {
2639 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2640 break;
2641 }
2642 }
2643 }
2644
2645 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2646 {
2647 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2648 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2649 am_transparent = 0;
2650 /* XXX: also turn off Opt_transparent? */
2651 }
2652 else
2653 {
2654#if WAIT_FOR_WM
2655 /* wait (an arbitrary period) for the WM to do its thing
2656 * needed for fvwm2.2.2 (and before?) */
2657 sleep (1);
2658#endif
2659 for (n = 0; n < (unsigned int)i; n++)
2660 {
2661 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2662 XClearWindow (disp, parent[n]);
2663 }
2664
2665 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2666 am_transparent = 1;
2667 }
2668
2669 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2670 parent[i] = None;
2671 }
2672
2673 if (scrollBar.win)
2674 {
2675 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2676 scrollBar.setIdle ();
2677 scrollbar_show (0);
2678 }
2679
2680 if (am_transparent)
2681 {
2682 want_refresh = want_full_refresh = 1;
2683 if (am_pixmap_trans)
2684 flush ();
2685 }
2686
2687 return pchanged;
2688}
2689#endif
2690 2170
2691/*}}} */ 2171/*}}} */
2692 2172
2693bool 2173bool
2694rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
… …
2743 if (ch == C0_LF) 2223 if (ch == C0_LF)
2744 nlines++; 2224 nlines++;
2745 2225
2746 refresh_count++; 2226 refresh_count++;
2747 2227
2748 if (!OPTION (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2749 || (refresh_count >= refresh_limit * (nrow - 1)))
2750 { 2229 {
2751 refreshnow = true;
2752 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2753 ch = NOCHAR; 2235 ch = NOCHAR;
2754 break; 2236 break;
2237 }
2755 } 2238 }
2756 2239
2757 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2758 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2759 { 2242 {
… …
2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2788 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2789 2272
2790 /* 2273 /*
2791 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2792 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2793 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2794 * is incremented here because we must be doing flat-out scrolling.
2795 */ 2277 */
2796 if (refreshnow) 2278 if (refreshnow)
2797 { 2279 {
2798 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2799 refresh_limit++;
2800 else
2801 {
2802 flag = true; 2280 flag = true;
2803 scr_refresh (refresh_type); 2281 scr_refresh ();
2804 want_refresh = 1; 2282 want_refresh = 1;
2805 }
2806 } 2283 }
2807 2284
2808 } 2285 }
2809 else 2286 else
2810 { 2287 {
… …
2826 return flag; 2303 return flag;
2827} 2304}
2828 2305
2829// read the next character 2306// read the next character
2830wchar_t 2307wchar_t
2831rxvt_term::next_char () 2308rxvt_term::next_char () NOTHROW
2832{ 2309{
2833 while (cmdbuf_ptr < cmdbuf_endp) 2310 while (cmdbuf_ptr < cmdbuf_endp)
2834 { 2311 {
2835 // assume 7-bit to be ascii ALWAYS 2312 // assume 7-bit to be ascii ALWAYS
2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2857 return NOCHAR; 2334 return NOCHAR;
2858} 2335}
2859 2336
2860// read the next octet 2337// read the next octet
2861uint32_t 2338uint32_t
2862rxvt_term::next_octet () 2339rxvt_term::next_octet () NOTHROW
2863{ 2340{
2864 return cmdbuf_ptr < cmdbuf_endp 2341 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++ 2342 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR; 2343 : NOCHAR;
2867} 2344}
2345
2346static class out_of_input out_of_input;
2868 2347
2869/* rxvt_cmd_getc () - Return next input character */ 2348/* rxvt_cmd_getc () - Return next input character */
2870/* 2349/*
2871 * Return the next input character after first passing any keyboard input 2350 * Return the next input character after first passing any keyboard input
2872 * to the command. 2351 * to the command.
2873 */ 2352 */
2874wchar_t 2353wchar_t
2875rxvt_term::cmd_getc () 2354rxvt_term::cmd_getc () THROW ((class out_of_input))
2876{ 2355{
2877 wchar_t c = next_char (); 2356 wchar_t c = next_char ();
2878 2357
2879 if (c == NOCHAR) 2358 if (c == NOCHAR)
2880 throw out_of_input; 2359 throw out_of_input;
2881 2360
2882 return c; 2361 return c;
2883} 2362}
2884 2363
2885uint32_t 2364uint32_t
2886rxvt_term::cmd_get8 () 2365rxvt_term::cmd_get8 () THROW ((class out_of_input))
2887{ 2366{
2888 uint32_t c = next_octet (); 2367 uint32_t c = next_octet ();
2889 2368
2890 if (c == NOCHAR) 2369 if (c == NOCHAR)
2891 throw out_of_input; 2370 throw out_of_input;
… …
2957 { 2436 {
2958 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2959 break; /* done = 1 */ 2438 break; /* done = 1 */
2960 } 2439 }
2961 } 2440 }
2962 2441
2963 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2964 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2965 { 2444 {
2966 done = 1; 2445 done = 1;
2967 break; 2446 break;
… …
2969 } 2448 }
2970 } 2449 }
2971 2450
2972 pclose_printer (fd); 2451 pclose_printer (fd);
2973} 2452}
2974#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
2975/*}}} */ 2454/*}}} */
2976 2455
2977/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
2978enum { 2457enum {
2979 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
3029 process_dcs_seq (); 2508 process_dcs_seq ();
3030 break; 2509 break;
3031 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
3032 process_csi_seq (); 2511 process_csi_seq ();
3033 break; 2512 break;
3034 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3035 process_osc_seq (); 2514 process_osc_seq ();
3036 break; 2515 break;
3037#endif 2516#endif
3038 } 2517 }
3039} 2518}
… …
3129 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
3130 break; 2609 break;
3131 case '+': 2610 case '+':
3132 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
3133 break; 2612 break;
3134#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
3135 case '6': 2614 case '6':
3136 scr_backindex (); 2615 scr_backindex ();
3137 break; 2616 break;
3138#endif 2617#endif
3139 case '7': 2618 case '7':
3140 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
3141 break; 2620 break;
3142 case '8': 2621 case '8':
3143 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
3144 break; 2623 break;
3145#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
3146 case '9': 2625 case '9':
3147 scr_forwardindex (); 2626 scr_forwardindex ();
3148 break; 2627 break;
3149#endif 2628#endif
3150 case '=': 2629 case '=':
… …
3265rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3266{ 2745{
3267 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3268 unsigned int nargs, p; 2747 unsigned int nargs, p;
3269 int n, ndef; 2748 int n, ndef;
3270 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3271 2750
3272 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3273 arg[--nargs] = 0;
3274 2752
3275 priv = 0; 2753 priv = 0;
3276 ch = cmd_getc (); 2754 ch = cmd_getc ();
3277 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
3278 { /* '<' '=' '>' '?' */ 2756 { /* '<' '=' '>' '?' */
… …
3312 ndef = get_byte_array_bit (csi_defaults, i); 2790 ndef = get_byte_array_bit (csi_defaults, i);
3313 for (p = 0; p < nargs; p++) 2791 for (p = 0; p < nargs; p++)
3314 if (arg[p] == -1) 2792 if (arg[p] == -1)
3315 arg[p] = ndef; 2793 arg[p] = ndef;
3316 2794
3317#ifdef DEBUG_CMD
3318 fprintf (stderr, "CSI ");
3319 for (p = 0; p < nargs; p++)
3320 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3321 fprintf (stderr, "%c\n", ch);
3322#endif
3323
3324 /* 2795 /*
3325 * private mode handling 2796 * private mode handling
3326 */ 2797 */
3327 if (priv) 2798 if (priv)
3328 { 2799 {
3329 switch (priv) 2800 switch (priv)
3330 { 2801 {
3331 case '>': 2802 case '>':
3332 if (ch == CSI_DA) /* secondary device attributes */ 2803 if (ch == CSI_DA) /* secondary device attributes */
3333 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2804 {
2805 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2806 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2807 //
2808 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2809 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2810 // versions.
2811 //
2812 tt_printf ("\033[>%d;95;0c", 'U');
2813 }
3334 break; 2814 break;
3335 case '?': 2815 case '?':
3336 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3337 process_terminal_mode (ch, priv, nargs, arg); 2817 process_terminal_mode (ch, priv, nargs, arg);
3338 break; 2818 break;
… …
3464 break; 2944 break;
3465 case 6: /* CPR requested */ 2945 case 6: /* CPR requested */
3466 scr_report_position (); 2946 scr_report_position ();
3467 break; 2947 break;
3468 case 7: /* unofficial extension */ 2948 case 7: /* unofficial extension */
3469 if (OPTION (Opt_insecure)) 2949 if (option (Opt_insecure))
3470 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2950 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3471 break; 2951 break;
3472 case 8: /* unofficial extension */ 2952 case 8: /* unofficial extension */
3473 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2953 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3474 break; 2954 break;
… …
3541 break; 3021 break;
3542 case CSI_75: 3022 case CSI_75:
3543 scr_cursor (RESTORE); 3023 scr_cursor (RESTORE);
3544 break; 3024 break;
3545 3025
3546#if ENABLE_FRILLS 3026#if !ENABLE_MINIMAL
3547 case CSI_74: 3027 case CSI_74:
3548 process_window_ops (arg, nargs); 3028 process_window_ops (arg, nargs);
3549 break; 3029 break;
3550#endif 3030#endif
3551 3031
… …
3558 break; 3038 break;
3559 } 3039 }
3560} 3040}
3561/*}}} */ 3041/*}}} */
3562 3042
3563#if ENABLE_FRILLS 3043#if !ENABLE_MINIMAL
3564/* ARGSUSED */ 3044/* ARGSUSED */
3565void 3045void
3566rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3046rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3567{ 3047{
3568 int x, y; 3048 int x, y;
3569 XWindowAttributes wattr; 3049 XWindowAttributes wattr;
3570 Window wdummy; 3050 Window wdummy;
3571 dDisp; 3051
3052 dLocal (Display *, dpy);
3572 3053
3573 if (nargs == 0) 3054 if (nargs == 0)
3574 return; 3055 return;
3575 3056
3576 switch (args[0]) 3057 switch (args[0])
3577 { 3058 {
3578 /* 3059 /*
3579 * commands 3060 * commands
3580 */ 3061 */
3581 case 1: /* deiconify window */ 3062 case 1: /* deiconify window */
3582 XMapWindow (disp, parent[0]); 3063 XMapWindow (dpy, parent[0]);
3583 break; 3064 break;
3584 case 2: /* iconify window */ 3065 case 2: /* iconify window */
3585 XIconifyWindow (disp, parent[0], display->screen); 3066 XIconifyWindow (dpy, parent[0], display->screen);
3586 break; 3067 break;
3587 case 3: /* set position (pixels) */ 3068 case 3: /* set position (pixels) */
3588 XMoveWindow (disp, parent[0], args[1], args[2]); 3069 XMoveWindow (dpy, parent[0], args[1], args[2]);
3589 break; 3070 break;
3590 case 4: /* set size (pixels) */ 3071 case 4: /* set size (pixels) */
3591 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3072 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3592 break; 3073 break;
3593 case 5: /* raise window */ 3074 case 5: /* raise window */
3594 XRaiseWindow (disp, parent[0]); 3075 XRaiseWindow (dpy, parent[0]);
3595 break; 3076 break;
3596 case 6: /* lower window */ 3077 case 6: /* lower window */
3597 XLowerWindow (disp, parent[0]); 3078 XLowerWindow (dpy, parent[0]);
3598 break; 3079 break;
3599 case 7: /* refresh window */ 3080 case 7: /* refresh window */
3600 scr_touch (true); 3081 scr_touch (true);
3601 break; 3082 break;
3602 case 8: /* set size (chars) */ 3083 case 8: /* set size (chars) */
… …
3609 if (args[0] >= 24) /* set height (chars) */ 3090 if (args[0] >= 24) /* set height (chars) */
3610 set_widthheight ((unsigned int)width, 3091 set_widthheight ((unsigned int)width,
3611 (unsigned int) (args[1] * fheight)); 3092 (unsigned int) (args[1] * fheight));
3612 break; 3093 break;
3613 3094
3614
3615 /* 3095 /*
3616 * reports - some output format copied from XTerm 3096 * reports - some output format copied from XTerm
3617 */ 3097 */
3618 case 11: /* report window state */ 3098 case 11: /* report window state */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3099 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3100 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3621 break; 3101 break;
3622 case 13: /* report window position */ 3102 case 13: /* report window position */
3623 XGetWindowAttributes (disp, parent[0], &wattr); 3103 XGetWindowAttributes (dpy, parent[0], &wattr);
3624 XTranslateCoordinates (disp, parent[0], wattr.root, 3104 XTranslateCoordinates (dpy, parent[0], wattr.root,
3625 -wattr.border_width, -wattr.border_width, 3105 -wattr.border_width, -wattr.border_width,
3626 &x, &y, &wdummy); 3106 &x, &y, &wdummy);
3627 tt_printf ("\033[3;%d;%dt", x, y); 3107 tt_printf ("\033[3;%d;%dt", x, y);
3628 break; 3108 break;
3629 case 14: /* report window size (pixels) */ 3109 case 14: /* report window size (pixels) */
3630 XGetWindowAttributes (disp, parent[0], &wattr); 3110 XGetWindowAttributes (dpy, parent[0], &wattr);
3631 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3111 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3632 break; 3112 break;
3633 case 18: /* report text area size (chars) */ 3113 case 18: /* report text area size (chars) */
3634 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3114 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3635 break; 3115 break;
… …
3637 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3117 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3638 break; 3118 break;
3639 case 20: /* report icon label */ 3119 case 20: /* report icon label */
3640 { 3120 {
3641 char *s; 3121 char *s;
3642 XGetIconName (disp, parent[0], &s); 3122 XGetIconName (dpy, parent[0], &s);
3643 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3123 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3644 XFree (s); 3124 XFree (s);
3645 } 3125 }
3646 break; 3126 break;
3647 case 21: /* report window title */ 3127 case 21: /* report window title */
3648 { 3128 {
3649 char *s; 3129 char *s;
3650 XFetchName (disp, parent[0], &s); 3130 XFetchName (dpy, parent[0], &s);
3651 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3131 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3652 XFree (s); 3132 XFree (s);
3653 } 3133 }
3654 break; 3134 break;
3655 } 3135 }
3656} 3136}
… …
3683 seen_esc = true; 3163 seen_esc = true;
3684 continue; 3164 continue;
3685 } 3165 }
3686 else if (ch == C0_BEL || ch == CHAR_ST) 3166 else if (ch == C0_BEL || ch == CHAR_ST)
3687 break; 3167 break;
3168 else if (ch == C0_SYN)
3169 ch = cmd_get8 ();
3688 else if (ch < 0x20) 3170 else if (ch < 0x20)
3689 return NULL; /* other control character - exit */ 3171 return NULL; /* other control character - exit */
3690 3172
3691 seen_esc = false; 3173 seen_esc = false;
3692 3174
3693 if (n >= STRING_MAX - 1) 3175 if (n >= STRING_MAX - 1)
3694 // stop at some sane length 3176 // stop at some sane length
3695 return NULL; 3177 return NULL;
3696 3178
3697 if (ch == C0_SYN)
3698 string[n++] = cmd_get8 ();
3699 else
3700 string[n++] = ch; 3179 string[n++] = ch;
3701 } 3180 }
3702 3181
3703 string[n++] = '\0'; 3182 string[n++] = '\0';
3704 3183
3705 ends_how = (ch == 0x5c ? C0_ESC : ch); 3184 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3756void 3235void
3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3236rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3758{ 3237{
3759 if (str[0] == '?' && !str[1]) 3238 if (str[0] == '?' && !str[1])
3760 { 3239 {
3761 unsigned short r, g, b; 3240 rgba c;
3762 pix_colors_focused[color].get (display, r, g, b); 3241 pix_colors_focused[color].get (c);
3242
3243#if XFT
3244 if (c.a != rgba::MAX_CC)
3245 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3246 else
3247#endif
3763 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3248 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3764 } 3249 }
3765 else 3250 else
3766 set_window_color (color, str); 3251 set_window_color (color, str);
3767} 3252}
3768 3253
… …
3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3255 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3771 */ 3256 */
3772void 3257void
3773rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3258rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3774{ 3259{
3775 int changed = 0;
3776 int color; 3260 int color;
3777 char *buf, *name; 3261 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3262 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3263 int saveop = op;
3780 dDisp; 3264
3265 dLocal (Display *, dpy);
3781 3266
3782 assert (str != NULL); 3267 assert (str != NULL);
3268
3269 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3270 return;
3271
3783 switch (op) 3272 switch (op)
3784 { 3273 {
3785 case XTerm_name: 3274 case XTerm_name:
3786 set_title (str); 3275 set_title (str);
3787 /* FALLTHROUGH */ 3276 /* FALLTHROUGH */
… …
3801 unsigned long bytes_after; 3290 unsigned long bytes_after;
3802 unsigned char *value = 0; 3291 unsigned char *value = 0;
3803 const char *str = ""; 3292 const char *str = "";
3804 3293
3805 if (prop 3294 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3295 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3296 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3297 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3298 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3299 && actual_type != None
3811 && actual_format == 8) 3300 && actual_format == 8)
3812 str = (const char *)(value); 3301 str = (const char *)(value);
3813 3302
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3303 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3304
3816 XFree (value); 3305 XFree (value);
3817 } 3306 }
3818 else 3307 else
3819 { 3308 {
… …
3823 { 3312 {
3824 *eq = 0; 3313 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3314 set_utf8_property (display->atom (str), eq + 1);
3826 } 3315 }
3827 else 3316 else
3828 XDeleteProperty (disp, parent[0], 3317 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3318 display->atom (str));
3830 } 3319 }
3831 break; 3320 break;
3832 3321
3833 case XTerm_Color: 3322 case XTerm_Color:
… …
3843 break; 3332 break;
3844 3333
3845 if ((buf = strchr (name, ';')) != NULL) 3334 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3335 *buf++ = '\0';
3847 3336
3848 if (name[0] == '?' && !name[1]) 3337 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3338 }
3857 break; 3339 break;
3858 case XTerm_Color00: 3340 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3341 process_color_seq (op, Color_fg, str, resp);
3860 break; 3342 break;
3861 case XTerm_Color01: 3343 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3344 process_color_seq (op, Color_bg, str, resp);
3863 break; 3345 break;
3864#ifndef NO_CURSORCOLOR 3346#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3347 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3348 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3349 break;
3868#endif 3350#endif
3869 case XTerm_Color_pointer_fg: 3351 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3352 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3353 break;
3872 case XTerm_Color_pointer_bg: 3354 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3355 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3356 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3357#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3358 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3359 process_color_seq (op, Color_RV, str, resp);
3878 break; 3360 break;
3879 case Rxvt_Color_BD: 3361 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3362 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3363 process_color_seq (op, Color_BD, str, resp);
3882 break; 3364 break;
3883 case Rxvt_Color_UL: 3365 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3366 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3367 process_color_seq (op, Color_UL, str, resp);
3886 break; 3368 break;
3887 case URxvt_Color_IT: 3369 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3370 process_color_seq (op, Color_IT, str, resp);
3889 break; 3371 break;
3890#endif 3372#endif
3891#if TRANSPARENT && TINTING 3373#if ENABLE_TRANSPARENCY
3892 case URxvt_Color_tint: 3374 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3375 process_color_seq (op, Color_tint, str, resp);
3894 check_our_parents (); 3376 {
3895 if (am_transparent) 3377 bool changed = false;
3896 want_full_refresh = want_refresh = 1; 3378 if (ISSET_PIXCOLOR (Color_tint))
3897 break; 3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3898#endif 3380 else
3381 changed = bgPixmap.unset_tint ();
3382 if (changed)
3383 update_background ();
3384 }
3899 3385
3386 break;
3387#endif
3388
3389#if BG_IMAGE_FROM_FILE
3900 case Rxvt_Pixmap: 3390 case Rxvt_Pixmap:
3901 if (*str != ';') 3391 if (!strcmp (str, "?"))
3902 { 3392 {
3903#if XPM_BACKGROUND 3393 char str[256];
3904 scale_pixmap (""); /* reset to default scaling */ 3394
3905 set_bgPixmap (str); /* change pixmap */ 3395 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3906 scr_touch (true); 3396 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3907#endif 3397 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3398 process_xterm_seq (XTerm_title, str, CHAR_ST);
3908 } 3399 }
3909 3400 else
3910 while ((str = strchr (str, ';')) != NULL)
3911 { 3401 {
3402 int changed = 0;
3403
3404 if (*str != ';')
3405 {
3406 /* reset to default scaling :*/
3407 bgPixmap.unset_geometry ();
3408 if (bgPixmap.set_file (str)) /* change pixmap */
3409 changed++;
3410 str = strchr (str, ';');
3411 if (str == NULL)
3412 bgPixmap.set_defaultGeometry ();
3413 }
3414 while (str)
3415 {
3912 str++; 3416 str++;
3913#if XPM_BACKGROUND 3417 if (bgPixmap.set_geometry (str))
3914 changed += scale_pixmap (str); 3418 changed++;
3915#endif 3419 str = strchr (str, ';');
3420 }
3421 if (changed)
3422 update_background ();
3916 } 3423 }
3917
3918 if (changed)
3919 {
3920#ifdef XPM_BACKGROUND
3921 resize_pixmap ();
3922 scr_touch (true);
3923#endif
3924 }
3925 break; 3424 break;
3425#endif
3926 3426
3927 case Rxvt_restoreFG: 3427 case Rxvt_restoreFG:
3928 set_window_color (Color_fg, str); 3428 set_window_color (Color_fg, str);
3929 break; 3429 break;
3930 case Rxvt_restoreBG: 3430 case Rxvt_restoreBG:
… …
3955 case URxvt_italicFont: 3455 case URxvt_italicFont:
3956 case URxvt_boldItalicFont: 3456 case URxvt_boldItalicFont:
3957#endif 3457#endif
3958 if (query) 3458 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", saveop, 3459 tt_printf ("\33]%d;%-.250s%c", saveop,
3960 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3460 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3961 ? fontset[op - URxvt_font]->fontdesc : "", 3461 ? fontset[op - URxvt_font]->fontdesc : "",
3962 resp); 3462 resp);
3963 else 3463 else
3964 { 3464 {
3965 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3465 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3968 allocated.push_back ((void *)res); 3468 allocated.push_back ((void *)res);
3969 set_fonts (); 3469 set_fonts ();
3970 } 3470 }
3971 break; 3471 break;
3972 3472
3973#if ENABLE_FRILLS 3473 case URxvt_version:
3474 if (query)
3475 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3476 op,
3477 rs[Rs_name], VERSION[0], VERSION[2],
3478 resp);
3479 break;
3480
3481#if !ENABLE_MINIMAL
3974 case URxvt_locale: 3482 case URxvt_locale:
3975 if (query) 3483 if (query)
3976 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3484 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3977 else 3485 else
3978 { 3486 {
3979 set_locale (str); 3487 set_locale (str);
3980 pty.set_utf8_mode (enc_utf8); 3488 pty->set_utf8_mode (enc_utf8);
3981 init_xlocale (); 3489 init_xlocale ();
3982 } 3490 }
3983 break; 3491 break;
3984 3492
3985 case URxvt_view_up: 3493 case URxvt_view_up:
… …
3996 break; 3504 break;
3997#endif 3505#endif
3998 3506
3999#if ENABLE_PERL 3507#if ENABLE_PERL
4000 case URxvt_perl: 3508 case URxvt_perl:
4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3509 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4002 ; // no responses yet 3510 ; // no responses yet
4003 break; 3511 break;
4004#endif 3512#endif
4005 } 3513 }
4006} 3514}
… …
4038 return state; 3546 return state;
4039} 3547}
4040 3548
4041/* we're not using priv _yet_ */ 3549/* we're not using priv _yet_ */
4042void 3550void
4043rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3551rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4044{ 3552{
4045 unsigned int i, j; 3553 unsigned int i, j;
4046 int state; 3554 int state;
4047 3555
4048 static const struct 3556 static const struct
4049 { 3557 {
4050 const int argval; 3558 const int argval;
4051 const unsigned long bit; 3559 const unsigned long bit;
4052 }
4053
4054 argtopriv[] = { 3560 } argtopriv[] = {
4055 { 1, PrivMode_aplCUR }, 3561 { 1, PrivMode_aplCUR },
4056 { 2, PrivMode_vt52 }, 3562 { 2, PrivMode_vt52 },
4057 { 3, PrivMode_132 }, 3563 { 3, PrivMode_132 },
4058 { 4, PrivMode_smoothScroll }, 3564 { 4, PrivMode_smoothScroll },
4059 { 5, PrivMode_rVideo }, 3565 { 5, PrivMode_rVideo },
… …
4076#ifndef NO_BACKSPACE_KEY 3582#ifndef NO_BACKSPACE_KEY
4077 { 67, PrivMode_BackSpace }, 3583 { 67, PrivMode_BackSpace },
4078#endif 3584#endif
4079 { 1000, PrivMode_MouseX11 }, 3585 { 1000, PrivMode_MouseX11 },
4080 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4081 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4082 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4083 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4084 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4085 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4086 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4087 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
4122 scr_touch (true); 3628 scr_touch (true);
4123 break; 3629 break;
4124#endif 3630#endif
4125 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
4126 case 1049: 3632 case 1049:
4127 if (OPTION (Opt_secondaryScreen)) 3633 if (option (Opt_secondaryScreen))
4128 if (mode == 0) 3634 if (mode == 0)
4129 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
4130 else if (mode == 1) 3636 else if (mode == 1)
4131 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
4132 break; 3638 break;
… …
4161 scr_autowrap (state); 3667 scr_autowrap (state);
4162 break; 3668 break;
4163 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
4164 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4165 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4166 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4167 break; 3673 break;
4168#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4169 case scrollBar_esc: 3675 case scrollBar_esc:
4170 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4171 { 3677 {
… …
4184 break; 3690 break;
4185 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4186 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4187 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4188 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4189 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4190 break; 3696 break;
4191#if 0 3697#if 0
4192 case 1001: 3698 case 1001:
4193 break; /* X11 mouse highlighting */ 3699 break; /* X11 mouse highlighting */
4194#endif 3700#endif
3701 case 1002:
3702 case 1003:
3703 if (state)
3704 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3706 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3707 vt_emask_mouse = PointerMotionMask;
3708 }
3709 else
3710 vt_emask_mouse = NoEventMask;
3711 vt_select_input ();
3712 break;
4195 case 1010: /* scroll to bottom on TTY output inhibit */ 3713 case 1010: /* scroll to bottom on TTY output inhibit */
4196 set_option (Opt_scrollTtyOutput, !state); 3714 set_option (Opt_scrollTtyOutput, !state);
4197 break; 3715 break;
4198 case 1011: /* scroll to bottom on key press */ 3716 case 1011: /* scroll to bottom on key press */
4199 set_option (Opt_scrollTtyKeypress, state); 3717 set_option (Opt_scrollTtyKeypress, state);
4200 break; 3718 break;
4201 case 1047: /* secondary screen w/ clearing last */ 3719 case 1047: /* secondary screen w/ clearing last */
4202 if (OPTION (Opt_secondaryScreen)) 3720 if (option (Opt_secondaryScreen))
4203 if (current_screen != PRIMARY) 3721 if (current_screen != PRIMARY)
4204 scr_erase_screen (2); 3722 scr_erase_screen (2);
4205 scr_change_screen (state); 3723 scr_change_screen (state);
4206 break; 3724 break;
4207 case 1049: /* secondary screen w/ clearing first */ 3725 case 1049: /* secondary screen w/ clearing first */
4208 scr_change_screen (state); 3726 scr_change_screen (state);
4209 if (OPTION (Opt_secondaryScreen)) 3727 if (option (Opt_secondaryScreen))
4210 if (current_screen != PRIMARY) 3728 if (current_screen != PRIMARY)
4211 scr_erase_screen (2); 3729 scr_erase_screen (2);
4212 break; 3730 break;
4213 default: 3731 default:
4214 break; 3732 break;
… …
4342 scr_color (Color_bg, Color_bg); 3860 scr_color (Color_bg, Color_bg);
4343 break; 3861 break;
4344 3862
4345 //case 50: // not variable spacing 3863 //case 50: // not variable spacing
4346 3864
4347#if ENABLE_FRILLS 3865#if !ENABLE_MINIMAL
4348 case 90: 3866 case 90:
4349 case 91: /* set bright fg color */ 3867 case 91: /* set bright fg color */
4350 case 92: 3868 case 92:
4351 case 93: 3869 case 93:
4352 case 94: 3870 case 94:
… …
4417rxvt_term::tt_write (const char *data, unsigned int len) 3935rxvt_term::tt_write (const char *data, unsigned int len)
4418{ 3936{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3937 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return; 3938 return;
4421 3939
4422 if (pty.pty < 0) 3940 if (pty->pty < 0)
4423 return; 3941 return;
4424 3942
4425 if (v_buflen == 0) 3943 if (v_buflen == 0)
4426 { 3944 {
4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3945 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4428 3946
4429 if ((unsigned int)written == len) 3947 if ((unsigned int)written == len)
4430 return; 3948 return;
4431 3949
4432 data += written; 3950 data += written;
… …
4436 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4437 3955
4438 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
4439 v_buflen += len; 3957 v_buflen += len;
4440 3958
4441 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
4442} 3960}
4443 3961
4444void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
4445{ 3963{
4446 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3964 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4447 3965
4448 if (written > 0) 3966 if (written > 0)
4449 { 3967 {
4450 v_buflen -= written; 3968 v_buflen -= written;
4451 3969
4452 if (v_buflen == 0) 3970 if (v_buflen == 0)
4453 { 3971 {
4454 free (v_buffer); 3972 free (v_buffer);
4455 v_buffer = 0; 3973 v_buffer = 0;
4456 v_buflen = 0;
4457 3974
4458 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4459 return; 3976 return;
4460 } 3977 }
4461 3978
4462 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4463 } 3980 }
4464 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4465 pty_ev.set (EVENT_READ); 3982 pty_ev.set (ev::READ);
4466} 3983}
4467 3984
4468/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4469 3986

Diff Legend

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