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.269 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.378 by root, Fri Dec 14 02:27:54 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>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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)
… …
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.is_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 }
1084 else
1085 w.stop ();
1063} 1086}
1064#endif 1087#endif
1065 1088
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1090void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1092{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 {
1073 want_refresh = 1; 1095 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1075 } 1097 w.stop ();
1076} 1098}
1077#endif 1099#endif
1078 1100
1079#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1080void 1102void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1104{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 { 1106 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1108 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1088 } 1109 }
1110 else
1111 w.stop ();
1089} 1112}
1090#endif 1113#endif
1091 1114
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1116void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1118{
1096 if (mouse_slip_wheel_speed == 0
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1119 if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed)) 1120 : scr_page (UP, mouse_slip_wheel_speed))
1121 want_refresh = 1;
1122
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1099 { 1124 {
1100 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0; 1125 mouse_slip_wheel_speed = 0;
1102 1126 w.stop ();
1103 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1127 }
1106} 1128}
1107#endif 1129#endif
1108 1130
1109#if HAVE_SCHED_YIELD 1131#if LINUX_YIELD_HACK
1110static struct event_handler 1132static struct event_handler
1111{ 1133{
1112 check_watcher cw_yield; 1134 ev::prepare yield_ev;
1113 1135
1114 void yield (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1115 { 1137 {
1116 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
1117 w.stop (); 1146 w.stop ();
1118 } 1147 }
1119 1148
1120 event_handler () 1149 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1150 : yield_ev (this, &event_handler::yield_cb)
1122 { 1151 {
1123 } 1152 }
1124} event_handler; 1153} event_handler;
1125#endif 1154#endif
1126 1155
… …
1146 cmdbuf_endp += r; 1175 cmdbuf_endp += r;
1147 return true; 1176 return true;
1148 } 1177 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1178 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1179 {
1151#if HAVE_SCHED_YIELD 1180#if LINUX_YIELD_HACK
1152 if (display->is_local) 1181 if (display->is_local)
1153 event_handler.cw_yield.start (); 1182 event_handler.yield_ev.start ();
1154#endif 1183#endif
1155 } 1184 }
1156 else 1185 else
1157 { 1186 {
1158 pty_ev.stop (); 1187 pty_ev.stop ();
1159 1188
1160 if (!OPTION (Opt_hold)) 1189 if (!option (Opt_hold))
1161 destroy (); 1190 destroy ();
1162 } 1191 }
1163 1192
1164 return false; 1193 return false;
1165} 1194}
1166 1195
1167void 1196void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1198{
1170 make_current (); 1199 make_current ();
1171 1200
1172 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1203 while (pty_fill ())
1175 if (cmd_parse ()) 1204 if (cmd_parse ())
1176 break; 1205 break;
1177 1206
1178 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1179 pty_write (); 1208 pty_write ();
1180} 1209}
1181 1210
1182void 1211void
1183rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
1184{ 1213{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1214 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1215 recolour_cursor ();
1187 1216
1188#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1218 hidden_pointer = 0;
1190 1219
1191 if (OPTION (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1193#endif 1222#endif
1194} 1223}
1195 1224
1196#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1197void 1226void
1198rxvt_term::pointer_blank () 1227rxvt_term::pointer_blank ()
1199{ 1228{
1200 if (!OPTION (Opt_pointerBlank)) 1229 if (!option (Opt_pointerBlank))
1201 return; 1230 return;
1202 1231
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1232 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1233 XFlush (dpy);
1205 1234
1206 hidden_pointer = 1; 1235 hidden_pointer = 1;
1207} 1236}
1208 1237
1209void 1238void
1210rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1240{
1212 make_current (); 1241 make_current ();
1213 1242
1214 pointer_blank (); 1243 pointer_blank ();
1215} 1244}
… …
1218void 1247void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1249{
1221 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1222 int x, y; 1251 int x, y;
1252 int code = 32;
1223 1253
1224 x = ev.x; 1254 x = Pixel2Col (ev.x);
1225 y = ev.y; 1255 y = Pixel2Row (ev.y);
1226 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 }
1227 1264
1228 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1229 button_number = 3; 1266 button_number = 3;
1230 else 1267 else
1231 { 1268 {
… …
1277 x + 1, 1314 x + 1,
1278 y + 1); 1315 y + 1);
1279#endif 1316#endif
1280 1317
1281 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1283 (32 + x + 1), 1320 (32 + x + 1),
1284 (32 + y + 1)); 1321 (32 + y + 1));
1285} 1322}
1286
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296 1323
1297/*{{{ process an X event */ 1324/*{{{ process an X event */
1298void 1325void
1299rxvt_term::x_cb (XEvent &ev) 1326rxvt_term::x_cb (XEvent &ev)
1300{ 1327{
1301 make_current (); 1328 make_current ();
1302 1329
1303 dDisp; 1330 dLocal (Display *, dpy);
1304 1331
1305 if (ev.xany.window == vt 1332 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1333 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1334 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1335 return;
… …
1313 unsigned int unused_mask; 1340 unsigned int unused_mask;
1314 1341
1315 switch (ev.type) 1342 switch (ev.type)
1316 { 1343 {
1317 case KeyPress: 1344 case KeyPress:
1318#if ISO_14755 1345 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1346 break;
1324 1347
1325 case KeyRelease: 1348 case KeyRelease:
1326 { 1349 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1350 break;
1398 }
1399 1351
1400 case ButtonPress: 1352 case ButtonPress:
1401 button_press (ev.xbutton); 1353 button_press (ev.xbutton);
1402 break; 1354 break;
1403 1355
… …
1405 button_release (ev.xbutton); 1357 button_release (ev.xbutton);
1406 break; 1358 break;
1407 1359
1408 case ClientMessage: 1360 case ClientMessage:
1409 if (ev.xclient.format == 32 1361 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1362 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 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 {
1412 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)))
1413 destroy (); 1371 destroy ();
1372 }
1414#if ENABLE_EWMH 1373#if ENABLE_EWMH
1415 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])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1375 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1376 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &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 }
1419#endif 1389#endif
1420 } 1390 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1391 break;
1461 1392
1462 /* 1393 /*
1463 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1483 break; 1414 break;
1484 } 1415 }
1485 break; 1416 break;
1486 1417
1487 case FocusIn: 1418 case FocusIn:
1419 if (ev.xfocus.detail != NotifyInferior
1420 && ev.xfocus.detail != NotifyPointer
1421 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1422 focus_in ();
1489 break; 1423 break;
1490 1424
1491 case FocusOut: 1425 case FocusOut:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1429 focus_out ();
1493 break; 1430 break;
1494 1431
1495 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); */
1496 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1497 { 1437 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1439 ;
1500 1440
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1442 {
1503 seen_resize = 1; 1443 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1445 }
1506 1446 else
1507#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1447 {
1508 if (OPTION (Opt_transparent)) 1448#ifdef HAVE_BG_PIXMAP
1509 check_our_parents (); 1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1510#endif 1451#endif
1452 }
1453 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1511 } 1454 }
1512 break; 1455 break;
1513 1456
1514 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1515 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1516 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1517 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1518 1462
1519 break; 1463 break;
1520 1464
1521 case SelectionClear: 1465 case SelectionClear:
1522 selection_clear (); 1466 selection_clear ();
… …
1532 break; 1476 break;
1533 1477
1534 case MapNotify: 1478 case MapNotify:
1535 mapped = 1; 1479 mapped = 1;
1536#ifdef TEXT_BLINK 1480#ifdef TEXT_BLINK
1537 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1481 text_blink_ev.start ();
1538#endif 1482#endif
1539 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1540 break; 1484 break;
1541 1485
1542 case UnmapNotify: 1486 case UnmapNotify:
… …
1544#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1545 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1546#endif 1490#endif
1547 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1548 break; 1492 break;
1549
1550#ifdef TRANSPARENT
1551 case ReparentNotify:
1552 rootwin_cb (ev);
1553 break;
1554#endif /* TRANSPARENT */
1555 1493
1556 case GraphicsExpose: 1494 case GraphicsExpose:
1557 case Expose: 1495 case Expose:
1558 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1559 { 1497 {
1560 do 1498 do
1499 {
1561 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1562 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1563 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1564 1504
1565 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1566 1506
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1568 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1569 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1570 1511 }
1571 want_refresh = 1; 1512 want_refresh = 1;
1572 } 1513 }
1573 else 1514 else
1574 { 1515 {
1575 XEvent unused_event; 1516 XEvent unused_event;
1576 1517
1577 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1518 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1578 ; 1519 ;
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1520 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1580 ; 1521 ;
1581 1522
1582 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1583 { 1524 {
1584 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1585 scrollbar_show (0); 1526 scrollbar_show (0);
1586 } 1527 }
1587
1588#ifdef TRANSPARENT
1589 if (am_transparent && ev.xany.window == parent[0])
1590 XClearWindow (disp, ev.xany.window);
1591#endif
1592 } 1528 }
1593 break; 1529 break;
1594 1530
1595 case MotionNotify: 1531 case MotionNotify:
1596#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1597 if (hidden_pointer) 1533 if (hidden_pointer)
1598 pointer_unblank (); 1534 pointer_unblank ();
1599#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);
1600 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1601 break; 1540 break;
1602 1541
1603 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1604 { 1543 {
1605 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1544 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1606 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1545 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1607 ; // nop 1546 ; // nop
1608 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1547 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1609 { 1548 {
1610 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1549 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1611 ; 1550 ;
1612 1551
1613 XQueryPointer (disp, vt, 1552 XQueryPointer (dpy, vt,
1614 &unused_root, &unused_child, 1553 &unused_root, &unused_child,
1615 &unused_root_x, &unused_root_y, 1554 &unused_root_x, &unused_root_y,
1616 &ev.xbutton.x, &ev.xbutton.y, 1555 &ev.xbutton.x, &ev.xbutton.y,
1617 &ev.xbutton.state); 1556 &ev.xbutton.state);
1618#ifdef MOUSE_THRESHOLD 1557#ifdef MOUSE_THRESHOLD
… …
1638 int dist; 1577 int dist;
1639 1578
1640 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1641 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1642 */ 1581 */
1643 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.is_active ())
1644 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1645 1584
1646 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1647 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1648 */ 1587 */
1649 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1671 else 1610 else
1672 { 1611 {
1673 /* we are within the text window, so we 1612 /* we are within the text window, so we
1674 * shouldn't be scrolling 1613 * shouldn't be scrolling
1675 */ 1614 */
1676 if (sel_scroll_ev.active)
1677 sel_scroll_ev.stop(); 1615 sel_scroll_ev.stop();
1678 } 1616 }
1679#endif 1617#endif
1680#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1681 } 1619 }
1682#endif 1620#endif
1683 } 1621 }
1684 } 1622 }
1685 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1623 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1686 { 1624 {
1687 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1625 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1688 MotionNotify, &ev)) 1626 MotionNotify, &ev))
1689 ; 1627 ;
1690 1628
1691 XQueryPointer (disp, scrollBar.win, 1629 XQueryPointer (dpy, scrollBar.win,
1692 &unused_root, &unused_child, 1630 &unused_root, &unused_child,
1693 &unused_root_x, &unused_root_y, 1631 &unused_root_x, &unused_root_y,
1694 &ev.xbutton.x, &ev.xbutton.y, 1632 &ev.xbutton.x, &ev.xbutton.y,
1695 &unused_mask); 1633 &unused_mask);
1696 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1634 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1697 scrollbar_size ()); 1635 scrollbar_size ());
1698 want_refresh = 1; 1636 want_refresh = 1;
1699 refresh_limit = 0;
1700 scrollbar_show (1); 1637 scrollbar_show (1);
1701 } 1638 }
1702 break; 1639 break;
1703 } 1640 }
1704 1641
1705skip_switch: ;
1706
1707#if defined(CURSOR_BLINK) 1642#if defined(CURSOR_BLINK)
1708 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1643 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1709 { 1644 {
1710 if (hidden_cursor) 1645 if (hidden_cursor)
1711 { 1646 {
1712 hidden_cursor = 0; 1647 hidden_cursor = 0;
1713 want_refresh = 1; 1648 want_refresh = 1;
1714 } 1649 }
1715 1650
1716 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1651 cursor_blink_ev.again ();
1717 } 1652 }
1718#endif 1653#endif
1719 1654
1720#if defined(POINTER_BLANK) 1655#if defined(POINTER_BLANK)
1721 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1656 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1722 { 1657 {
1723 if (ev.type == MotionNotify 1658 if (ev.type == MotionNotify
1724 || ev.type == ButtonPress 1659 || ev.type == ButtonPress
1725 || ev.type == ButtonRelease) 1660 || ev.type == ButtonRelease)
1726 if (hidden_pointer) 1661 if (hidden_pointer)
… …
1738 if (!focus) 1673 if (!focus)
1739 { 1674 {
1740 focus = 1; 1675 focus = 1;
1741 want_refresh = 1; 1676 want_refresh = 1;
1742 1677
1743 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1678 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1744 1679
1745#if USE_XIM 1680#if USE_XIM
1746 if (Input_Context != NULL) 1681 if (Input_Context != NULL)
1747 { 1682 {
1748 IMSetStatusPosition (); 1683 IMSetPosition ();
1749 XSetICFocus (Input_Context); 1684 XSetICFocus (Input_Context);
1750 } 1685 }
1751#endif 1686#endif
1752#if CURSOR_BLINK 1687#if CURSOR_BLINK
1753 if (OPTION (Opt_cursorBlink)) 1688 if (option (Opt_cursorBlink))
1754 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1689 cursor_blink_ev.again ();
1755#endif 1690#endif
1756#if OFF_FOCUS_FADING 1691#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1692 if (rs[Rs_fade])
1758 { 1693 {
1759 pix_colors = pix_colors_focused; 1694 pix_colors = pix_colors_focused;
1760 scr_recolour (); 1695 scr_recolour ();
1761 } 1696 }
1762#endif 1697#endif
1698#if ENABLE_FRILLS
1699 if (option (Opt_urgentOnBell))
1700 {
1701 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1702 {
1703 h->flags &= ~XUrgencyHint;
1704 XSetWMHints (dpy, parent[0], h);
1705 }
1706 }
1707#endif
1763 } 1708 }
1764} 1709}
1765 1710
1766void 1711void
1767rxvt_term::focus_out () 1712rxvt_term::focus_out ()
… …
1775 1720
1776#if ENABLE_FRILLS || ISO_14755 1721#if ENABLE_FRILLS || ISO_14755
1777 if (iso14755buf) 1722 if (iso14755buf)
1778 { 1723 {
1779 iso14755buf = 0; 1724 iso14755buf = 0;
1780# if ENABLE_OVERLAY 1725# if ISO_14755
1781 scr_overlay_off (); 1726 scr_overlay_off ();
1782# endif 1727# endif
1783 } 1728 }
1784#endif 1729#endif
1785#if USE_XIM 1730#if USE_XIM
1786 if (Input_Context != NULL) 1731 if (Input_Context != NULL)
1787 XUnsetICFocus (Input_Context); 1732 XUnsetICFocus (Input_Context);
1788#endif 1733#endif
1789#if CURSOR_BLINK 1734#if CURSOR_BLINK
1790 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1791 cursor_blink_ev.stop (); 1736 cursor_blink_ev.stop ();
1737
1792 hidden_cursor = 0; 1738 hidden_cursor = 0;
1793#endif 1739#endif
1794#if OFF_FOCUS_FADING 1740#if OFF_FOCUS_FADING
1795 if (rs[Rs_fade]) 1741 if (rs[Rs_fade])
1796 { 1742 {
… …
1799 } 1745 }
1800#endif 1746#endif
1801 } 1747 }
1802} 1748}
1803 1749
1804#if TRANSPARENT 1750void
1751rxvt_term::update_fade_color (unsigned int idx)
1752{
1753#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade])
1755 {
1756 rgba c;
1757 pix_colors [Color_fade].get (c);
1758 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1759 }
1760#endif
1761}
1762
1763#if ENABLE_TRANSPARENCY || ENABLE_PERL
1805void 1764void
1806rxvt_term::rootwin_cb (XEvent &ev) 1765rxvt_term::rootwin_cb (XEvent &ev)
1807{ 1766{
1808 make_current (); 1767 make_current ();
1809 1768
1769 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1770 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1771 return;
1772
1773# if ENABLE_TRANSPARENCY
1810 switch (ev.type) 1774 switch (ev.type)
1811 { 1775 {
1812 case PropertyNotify: 1776 case PropertyNotify:
1813 /* 1777 /*
1814 * if user used some Esetroot compatible prog to set the root bg, 1778 * if user used some Esetroot compatible prog to set the root bg,
1815 * use the property to determine the pixmap. We use it later on. 1779 * use the property to determine the pixmap. We use it later on.
1816 */ 1780 */
1817 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1781 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1782 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1819 return; 1783 {
1820 1784 bgPixmap.set_root_pixmap ();
1821 /* FALLTHROUGH */ 1785 update_background ();
1822 case ReparentNotify: 1786 }
1823 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1824 want_refresh = want_full_refresh = 1;
1825 break; 1787 break;
1826 } 1788 }
1789# endif
1827} 1790}
1828#endif 1791#endif
1829 1792
1830void 1793void
1831rxvt_term::button_press (XButtonEvent &ev) 1794rxvt_term::button_press (XButtonEvent &ev)
… …
1840 /* 1803 /*
1841 * VT window processing of button press 1804 * VT window processing of button press
1842 */ 1805 */
1843 if (ev.window == vt) 1806 if (ev.window == vt)
1844 { 1807 {
1808 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1809 return;
1810
1845#if ISO_14755 1811#if ISO_14755
1846 // 5.4 1812 // 5.4
1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1813 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1848 { 1814 {
1849 iso14755_54 (ev.x, ev.y); 1815 iso14755_54 (ev.x, ev.y);
… …
1883 mouse_report (ev); 1849 mouse_report (ev);
1884 } 1850 }
1885#else 1851#else
1886 MEvent.button = ev.button; 1852 MEvent.button = ev.button;
1887 mouse_report (ev); 1853 mouse_report (ev);
1888#endif /* MOUSE_REPORT_DOUBLECLICK */ 1854#endif /* MOUSE_REPORT_DOUBLECLICK */
1889 1855
1890 } 1856 }
1891 else 1857 else
1892 { 1858 {
1893 if (ev.button != MEvent.button) 1859 if (ev.button != MEvent.button)
1894 MEvent.clicks = 0; 1860 MEvent.clicks = 0;
1895 1861
1896 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1897 switch (ev.button) 1862 switch (ev.button)
1898 { 1863 {
1899 case Button1: 1864 case Button1:
1900 /* allow meta + click to select rectangular areas */ 1865 /* allow meta + click to select rectangular areas */
1901 /* should be done in screen.C */ 1866 /* should be done in screen.C */
1902#if ENABLE_FRILLS 1867#if ENABLE_FRILLS
1903 selection.rect = !!(ev.state & ModMetaMask); 1868 selection.rect = !!(ev.state & ModMetaMask);
1904#else 1869#else
1905 selection.rect = false; 1870 selection.rect = false;
1906#endif 1871#endif
1907 1872
1908 /* allow shift+left click to extend selection */ 1873 /* allow shift+left click to extend selection */
1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1874 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1910 { 1875 {
1911 if (MEvent.button == Button1 && clickintime) 1876 if (MEvent.button == Button1 && clickintime)
1912 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1913 else 1878 else
1914 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1915 } 1880 }
1916 else 1881 else
1917 { 1882 {
1918 if (MEvent.button == Button1 && clickintime) 1883 if (MEvent.button == Button1 && clickintime)
1919 MEvent.clicks++; 1884 MEvent.clicks++;
1920 else 1885 else
1921 MEvent.clicks = 1; 1886 MEvent.clicks = 1;
1922 1887
1923 selection_click (MEvent.clicks, ev.x, ev.y); 1888 selection_click (MEvent.clicks, ev.x, ev.y);
1924 } 1889 }
1925 1890
1926 MEvent.button = Button1; 1891 MEvent.button = Button1;
1927 break; 1892 break;
1928 1893
1929 case Button3: 1894 case Button3:
1930 if (MEvent.button == Button3 && clickintime) 1895 if (MEvent.button == Button3 && clickintime)
1931 selection_rotate (ev.x, ev.y); 1896 selection_rotate (ev.x, ev.y);
1932 else 1897 else
1933 selection_extend (ev.x, ev.y, 1); 1898 selection_extend (ev.x, ev.y, 1);
1934 1899
1935 MEvent.button = Button3; 1900 MEvent.button = Button3;
1936 break; 1901 break;
1937 } 1902 }
1938 } 1903 }
1939 1904
1940 MEvent.time = ev.time; 1905 MEvent.time = ev.time;
1941 return; 1906 return;
1942 } 1907 }
1943 1908
… …
1988 tt_printf ("\033[5~"); 1953 tt_printf ("\033[5~");
1989 break; 1954 break;
1990 } 1955 }
1991 } 1956 }
1992 else 1957 else
1993#endif /* NO_SCROLLBAR_REPORT */ 1958#endif /* NO_SCROLLBAR_REPORT */
1994 1959
1995 { 1960 {
1996 char upordown = 0; 1961 char upordown = 0;
1997 1962
1998 if (scrollBar.style == R_SB_NEXT) 1963 if (scrollBar.style == R_SB_NEXT)
1999 { 1964 {
2000 if (scrollbarnext_upButton (ev.y)) 1965 if (scrollbarnext_upButton (ev.y))
2001 upordown = -1; /* up */ 1966 upordown = -1; /* up */
… …
2007 if (scrollbarrxvt_upButton (ev.y)) 1972 if (scrollbarrxvt_upButton (ev.y))
2008 upordown = -1; /* up */ 1973 upordown = -1; /* up */
2009 else if (scrollbarrxvt_dnButton (ev.y)) 1974 else if (scrollbarrxvt_dnButton (ev.y))
2010 upordown = 1; /* down */ 1975 upordown = 1; /* down */
2011 } 1976 }
1977
2012 if (upordown) 1978 if (upordown)
2013 { 1979 {
2014#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1981 if (!cont_scroll_ev.is_active ())
2015 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1982 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2016#endif 1983#endif
2017 if (scr_page (upordown < 0 ? UP : DN, 1)) 1984 if (scr_page (upordown < 0 ? UP : DN, 1))
2018 { 1985 {
2019 if (upordown < 0) 1986 if (upordown < 0)
2020 scrollBar.setUp (); 1987 scrollBar.setUp ();
… …
2100 scrollBar.setIdle (); 2067 scrollBar.setIdle ();
2101 scrollbar_show (0); 2068 scrollbar_show (0);
2102 } 2069 }
2103 2070
2104#ifdef SELECTION_SCROLLING 2071#ifdef SELECTION_SCROLLING
2105 if (sel_scroll_ev.active)
2106 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2107#endif 2073#endif
2108 2074
2109 if (ev.window == vt) 2075 if (ev.window == vt)
2110 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2078 return;
2079
2111#if ISO_14755 2080#if ISO_14755
2112 // 5.4 2081 // 5.4
2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2082 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2114 return; 2083 return;
2115#endif 2084#endif
2085
2116 if (reportmode) 2086 if (reportmode)
2117 { 2087 {
2118 /* mouse report from vt window */ 2088 /* mouse report from vt window */
2119 /* don't report release of wheel "buttons" */ 2089 /* don't report release of wheel "buttons" */
2120 if (ev.button >= 4) 2090 if (ev.button >= 4)
… …
2131 mouse_report (ev); 2101 mouse_report (ev);
2132 } 2102 }
2133#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2134 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2135 mouse_report (ev); 2105 mouse_report (ev);
2136#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2137 return; 2107 return;
2138 } 2108 }
2139 2109
2140 /* 2110 /*
2141 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2144 if (priv_modes & PrivMode_mouse_report 2114 if (priv_modes & PrivMode_mouse_report
2145 && bypass_keystate 2115 && bypass_keystate
2146 && ev.button == Button1 && MEvent.clicks <= 1) 2116 && ev.button == Button1 && MEvent.clicks <= 1)
2147 selection_extend (ev.x, ev.y, 0); 2117 selection_extend (ev.x, ev.y, 0);
2148 2118
2149 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2150 return;
2151
2152 switch (ev.button) 2119 switch (ev.button)
2153 { 2120 {
2154 case Button1: 2121 case Button1:
2155 case Button3: 2122 case Button3:
2156 selection_make (ev.time); 2123 selection_make (ev.time);
2157 break; 2124 break;
2125
2158 case Button2: 2126 case Button2:
2159 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);
2160 break; 2129 break;
2130
2161#ifdef MOUSE_WHEEL 2131#ifdef MOUSE_WHEEL
2162 case Button4: 2132 case Button4:
2163 case Button5: 2133 case Button5:
2164 { 2134 {
2165 int i; 2135 int i;
… …
2167 2137
2168 v = ev.button == Button4 ? UP : DN; 2138 v = ev.button == Button4 ? UP : DN;
2169 2139
2170 if (ev.state & ShiftMask) 2140 if (ev.state & ShiftMask)
2171 i = 1; 2141 i = 1;
2172 else if (OPTION (Opt_mouseWheelScrollPage)) 2142 else if (option (Opt_mouseWheelScrollPage))
2173 i = nrow - 1; 2143 i = nrow - 1;
2174 else 2144 else
2175 i = 5; 2145 i = 5;
2176 2146
2177# ifdef MOUSE_SLIP_WHEELING 2147# ifdef MOUSE_SLIP_WHEELING
… …
2179 { 2149 {
2180 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2181 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2182 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2183 2153
2184 if (slip_wheel_ev.at < NOW) 2154 if (!slip_wheel_ev.is_active ())
2185 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2155 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2186
2187 slip_wheel_ev.start ();
2188 } 2156 }
2189 else 2157 else
2190 { 2158 {
2191# endif 2159# endif
2192 scr_page (v, i); 2160 scr_page (v, i);
… …
2198 break; 2166 break;
2199#endif 2167#endif
2200 } 2168 }
2201 } 2169 }
2202} 2170}
2203
2204#ifdef TRANSPARENT
2205#if TINTING
2206/* taken from aterm-0.4.2 */
2207
2208typedef uint32_t RUINT32T;
2209
2210void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2211{
2212 int sh_r, sh_g, sh_b;
2213 RUINT32T mask_r, mask_g, mask_b;
2214 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2215 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2216 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2217 int i;
2218
2219 Visual *visual = display->visual;
2220
2221 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2222
2223 /* for convenience */
2224 mask_r = visual->red_mask;
2225 mask_g = visual->green_mask;
2226 mask_b = visual->blue_mask;
2227
2228 /* boring lookup table pre-initialization */
2229 switch (srcImage->bits_per_pixel) {
2230 case 15:
2231 if ((mask_r != 0x7c00) ||
2232 (mask_g != 0x03e0) ||
2233 (mask_b != 0x001f))
2234 return;
2235 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2236 lookup_r = lookup;
2237 lookup_g = lookup+32;
2238 lookup_b = lookup+32+32;
2239 sh_r = 10;
2240 sh_g = 5;
2241 sh_b = 0;
2242 break;
2243 case 16:
2244 if ((mask_r != 0xf800) ||
2245 (mask_g != 0x07e0) ||
2246 (mask_b != 0x001f))
2247 return;
2248 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2249 lookup_r = lookup;
2250 lookup_g = lookup+32;
2251 lookup_b = lookup+32+64;
2252 sh_r = 11;
2253 sh_g = 5;
2254 sh_b = 0;
2255 break;
2256 case 24:
2257 if ((mask_r != 0xff0000) ||
2258 (mask_g != 0x00ff00) ||
2259 (mask_b != 0x0000ff))
2260 return;
2261 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2262 lookup_r = lookup;
2263 lookup_g = lookup+256;
2264 lookup_b = lookup+256+256;
2265 sh_r = 16;
2266 sh_g = 8;
2267 sh_b = 0;
2268 break;
2269 case 32:
2270 if ((mask_r != 0xff0000) ||
2271 (mask_g != 0x00ff00) ||
2272 (mask_b != 0x0000ff))
2273 return;
2274 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2275 lookup_r = lookup;
2276 lookup_g = lookup+256;
2277 lookup_b = lookup+256+256;
2278 sh_r = 16;
2279 sh_g = 8;
2280 sh_b = 0;
2281 break;
2282 default:
2283 return; /* we do not support this color depth */
2284 }
2285
2286 /* prepare limits for color transformation (each channel is handled separately) */
2287 if (shade < 0) {
2288 shade = -shade;
2289 if (shade < 0) shade = 0;
2290 if (shade > 100) shade = 100;
2291
2292 lower_lim_r = 65535-rm;
2293 lower_lim_g = 65535-gm;
2294 lower_lim_b = 65535-bm;
2295
2296 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2297 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2298 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2299
2300 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2301 } else {
2302 if (shade < 0) shade = 0;
2303 if (shade > 100) shade = 100;
2304
2305 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2306
2307 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2308 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2309 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2310 }
2311
2312 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2313 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2314 {
2315 unsigned int tmp;
2316
2317 tmp = lower_lim_r;
2318 lower_lim_r = lower_lim_b;
2319 lower_lim_b = tmp;
2320
2321 tmp = upper_lim_r;
2322 upper_lim_r = upper_lim_b;
2323 upper_lim_b = tmp;
2324 }
2325
2326 /* fill our lookup tables */
2327 for (i = 0; i <= mask_r>>sh_r; i++)
2328 {
2329 RUINT32T tmp;
2330 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2331 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2332 lookup_r[i] = (tmp/65535)<<sh_r;
2333 }
2334 for (i = 0; i <= mask_g>>sh_g; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2338 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2339 lookup_g[i] = (tmp/65535)<<sh_g;
2340 }
2341 for (i = 0; i <= mask_b>>sh_b; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2345 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2346 lookup_b[i] = (tmp/65535)<<sh_b;
2347 }
2348
2349 /* apply table to input image (replacing colors by newly calculated ones) */
2350 switch (srcImage->bits_per_pixel)
2351 {
2352 case 15:
2353 {
2354 unsigned short *p1, *pf, *p, *pl;
2355 p1 = (unsigned short *) srcImage->data;
2356 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2357 while (p1 < pf)
2358 {
2359 p = p1;
2360 pl = p1 + srcImage->width;
2361 for (; p < pl; p++)
2362 {
2363 *p = lookup_r[(*p & 0x7c00)>>10] |
2364 lookup_g[(*p & 0x03e0)>> 5] |
2365 lookup_b[(*p & 0x001f)];
2366 }
2367 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2368 }
2369 break;
2370 }
2371 case 16:
2372 {
2373 unsigned short *p1, *pf, *p, *pl;
2374 p1 = (unsigned short *) srcImage->data;
2375 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2376 while (p1 < pf)
2377 {
2378 p = p1;
2379 pl = p1 + srcImage->width;
2380 for (; p < pl; p++)
2381 {
2382 *p = lookup_r[(*p & 0xf800)>>11] |
2383 lookup_g[(*p & 0x07e0)>> 5] |
2384 lookup_b[(*p & 0x001f)];
2385 }
2386 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2387 }
2388 break;
2389 }
2390 case 24:
2391 {
2392 unsigned char *p1, *pf, *p, *pl;
2393 p1 = (unsigned char *) srcImage->data;
2394 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2395 while (p1 < pf)
2396 {
2397 p = p1;
2398 pl = p1 + srcImage->width * 3;
2399 for (; p < pl; p += 3)
2400 {
2401 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2402 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2403 p[2] = lookup_r[(p[2] & 0x0000ff)];
2404 }
2405 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 case 32:
2410 {
2411 RUINT32T *p1, *pf, *p, *pl;
2412 p1 = (RUINT32T *) srcImage->data;
2413 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2414
2415 while (p1 < pf)
2416 {
2417 p = p1;
2418 pl = p1 + srcImage->width;
2419 for (; p < pl; p++)
2420 {
2421 *p = lookup_r[(*p & 0xff0000)>>16] |
2422 lookup_g[(*p & 0x00ff00)>> 8] |
2423 lookup_b[(*p & 0x0000ff)] |
2424 (*p & ~0xffffff);
2425 }
2426 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2427 }
2428 break;
2429 }
2430 }
2431
2432 free (lookup);
2433}
2434#endif
2435
2436/*
2437 * Check our parents are still who we think they are.
2438 * Do transparency updates if required
2439 */
2440int
2441rxvt_term::check_our_parents ()
2442{
2443 int i, pchanged, aformat, have_pixmap, rootdepth;
2444 unsigned long nitems, bytes_after;
2445 Atom atype;
2446 unsigned char *prop = NULL;
2447 Window root, oldp, *list;
2448 Pixmap rootpixmap = None;
2449 XWindowAttributes wattr, wrootattr;
2450 dDisp;
2451
2452 pchanged = 0;
2453
2454 if (!OPTION (Opt_transparent))
2455 return pchanged; /* Don't try any more */
2456
2457 XGetWindowAttributes (disp, display->root, &wrootattr);
2458 rootdepth = wrootattr.depth;
2459
2460 XGetWindowAttributes (disp, parent[0], &wattr);
2461
2462 if (rootdepth != wattr.depth)
2463 {
2464 if (am_transparent)
2465 {
2466 pchanged = 1;
2467 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2468 am_transparent = am_pixmap_trans = 0;
2469 }
2470
2471 return pchanged; /* Don't try any more */
2472 }
2473
2474 /* Get all X ops out of the queue so that our information is up-to-date. */
2475 XSync (disp, False);
2476
2477 /*
2478 * Make the frame window set by the window manager have
2479 * the root background. Some window managers put multiple nested frame
2480 * windows for each client, so we have to take care about that.
2481 */
2482 i = (xa[XA_XROOTPMAP_ID]
2483 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2484 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2485 &nitems, &bytes_after, &prop) == Success);
2486
2487 if (!i || prop == NULL)
2488 i = (xa[XA_ESETROOT_PMAP_ID]
2489 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2491 &nitems, &bytes_after, &prop) == Success);
2492
2493 if (!i || prop == NULL
2494#if TINTING
2495 || !rs[Rs_color + Color_tint]
2496#endif
2497 )
2498 have_pixmap = 0;
2499 else
2500 {
2501 have_pixmap = 1;
2502 rootpixmap = *(Pixmap *)prop;
2503 XFree (prop);
2504 }
2505
2506 if (have_pixmap)
2507 {
2508 /*
2509 * Copy display->root pixmap transparency
2510 */
2511 int sx, sy, nx, ny;
2512 unsigned int nw, nh;
2513 Window cr;
2514 XImage *image;
2515 GC gc;
2516 XGCValues gcvalue;
2517
2518 XTranslateCoordinates (disp, parent[0], display->root,
2519 0, 0, &sx, &sy, &cr);
2520 nw = (unsigned int)szHint.width;
2521 nh = (unsigned int)szHint.height;
2522 nx = ny = 0;
2523
2524 if (sx < 0)
2525 {
2526 nw += sx;
2527 nx = -sx;
2528 sx = 0;
2529 }
2530
2531 if (sy < 0)
2532 {
2533 nh += sy;
2534 ny = -sy;
2535 sy = 0;
2536 }
2537
2538 min_it (nw, (unsigned int) (wrootattr.width - sx));
2539 min_it (nh, (unsigned int) (wrootattr.height - sy));
2540
2541 XSync (disp, False);
2542 allowedxerror = -1;
2543 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2544
2545 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2546 /* XXX: may need a delay here? */
2547 allowedxerror = 0;
2548
2549 if (image == NULL)
2550 {
2551 if (am_transparent && am_pixmap_trans)
2552 {
2553 pchanged = 1;
2554 if (pixmap != None)
2555 {
2556 XFreePixmap (disp, pixmap);
2557 pixmap = None;
2558 }
2559 }
2560
2561 am_pixmap_trans = 0;
2562 }
2563 else
2564 {
2565 if (pixmap != None)
2566 XFreePixmap (disp, pixmap);
2567
2568#if TINTING
2569 if (ISSET_PIXCOLOR (Color_tint))
2570 {
2571 unsigned short rm, gm, bm;
2572 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2573
2574 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2575
2576 ShadeXImage (display, image, shade, rm, gm, bm);
2577 }
2578#endif
2579
2580 pixmap = XCreatePixmap (disp, vt,
2581 szHint.width, szHint.height, image->depth);
2582 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2583 XPutImage (disp, pixmap, gc, image, 0, 0,
2584 nx, ny, image->width, image->height);
2585 XFreeGC (disp, gc);
2586 XDestroyImage (image);
2587 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2588 XClearWindow (disp, parent[0]);
2589
2590 if (!am_transparent || !am_pixmap_trans)
2591 pchanged = 1;
2592
2593 am_transparent = am_pixmap_trans = 1;
2594 }
2595 }
2596
2597 if (am_pixmap_trans)
2598 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2599 else
2600 {
2601 unsigned int n;
2602 /*
2603 * InheritPixmap transparency
2604 */
2605 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2606 {
2607 oldp = parent[i];
2608 XQueryTree (disp, parent[i - 1], &root,
2609 &parent[i], &list, &n);
2610 XFree (list);
2611
2612 if (parent[i] == display->root)
2613 {
2614 if (oldp != None)
2615 pchanged = 1;
2616
2617 break;
2618 }
2619
2620 if (oldp != parent[i])
2621 pchanged = 1;
2622 }
2623
2624 n = 0;
2625
2626 if (pchanged)
2627 {
2628 for (; n < (unsigned int)i; n++)
2629 {
2630 XGetWindowAttributes (disp, parent[n], &wattr);
2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2632 {
2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2634 break;
2635 }
2636 }
2637 }
2638
2639 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2640 {
2641 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2642 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2643 am_transparent = 0;
2644 /* XXX: also turn off Opt_transparent? */
2645 }
2646 else
2647 {
2648#if WAIT_FOR_WM
2649 /* wait (an arbitrary period) for the WM to do its thing
2650 * needed for fvwm2.2.2 (and before?) */
2651 sleep (1);
2652#endif
2653 for (n = 0; n < (unsigned int)i; n++)
2654 {
2655 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2656 XClearWindow (disp, parent[n]);
2657 }
2658
2659 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2660 am_transparent = 1;
2661 }
2662
2663 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2664 parent[i] = None;
2665 }
2666
2667 if (scrollBar.win)
2668 {
2669 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2670 scrollBar.setIdle ();
2671 scrollbar_show (0);
2672 }
2673
2674 if (am_transparent)
2675 {
2676 want_refresh = want_full_refresh = 1;
2677 if (am_pixmap_trans)
2678 flush ();
2679 }
2680
2681 return pchanged;
2682}
2683#endif
2684 2171
2685/*}}} */ 2172/*}}} */
2686 2173
2687bool 2174bool
2688rxvt_term::cmd_parse () 2175rxvt_term::cmd_parse ()
… …
2737 if (ch == C0_LF) 2224 if (ch == C0_LF)
2738 nlines++; 2225 nlines++;
2739 2226
2740 refresh_count++; 2227 refresh_count++;
2741 2228
2742 if (!OPTION (Opt_jumpScroll) 2229 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2743 || (refresh_count >= refresh_limit * (nrow - 1)))
2744 { 2230 {
2745 refreshnow = true;
2746 refresh_count = 0; 2231 refresh_count = 0;
2232
2233 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2234 {
2235 refreshnow = true;
2747 ch = NOCHAR; 2236 ch = NOCHAR;
2748 break; 2237 break;
2238 }
2749 } 2239 }
2750 2240
2751 // scr_add_lines only works for nlines <= nrow - 1. 2241 // scr_add_lines only works for nlines <= nrow - 1.
2752 if (nlines >= nrow - 1) 2242 if (nlines >= nrow - 1)
2753 { 2243 {
… …
2781 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2271 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2782 scr_add_lines (buf, str - buf, nlines); 2272 scr_add_lines (buf, str - buf, nlines);
2783 2273
2784 /* 2274 /*
2785 * If there have been a lot of new lines, then update the screen 2275 * If there have been a lot of new lines, then update the screen
2786 * What the heck I'll cheat and only refresh less than every page-full. 2276 * What the heck we'll cheat and only refresh less than every page-full.
2787 * the number of pages between refreshes is refresh_limit, which 2277 * if skipScroll is enabled.
2788 * is incremented here because we must be doing flat-out scrolling.
2789 */ 2278 */
2790 if (refreshnow) 2279 if (refreshnow)
2791 { 2280 {
2792 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2793 refresh_limit++;
2794 else
2795 {
2796 flag = true; 2281 flag = true;
2797 scr_refresh (); 2282 scr_refresh ();
2798 want_refresh = 1; 2283 want_refresh = 1;
2799 }
2800 } 2284 }
2801 2285
2802 } 2286 }
2803 else 2287 else
2804 { 2288 {
… …
2820 return flag; 2304 return flag;
2821} 2305}
2822 2306
2823// read the next character 2307// read the next character
2824wchar_t 2308wchar_t
2825rxvt_term::next_char () 2309rxvt_term::next_char () NOTHROW
2826{ 2310{
2827 while (cmdbuf_ptr < cmdbuf_endp) 2311 while (cmdbuf_ptr < cmdbuf_endp)
2828 { 2312 {
2829 // assume 7-bit to be ascii ALWAYS 2313 // assume 7-bit to be ascii ALWAYS
2830 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2314 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2851 return NOCHAR; 2335 return NOCHAR;
2852} 2336}
2853 2337
2854// read the next octet 2338// read the next octet
2855uint32_t 2339uint32_t
2856rxvt_term::next_octet () 2340rxvt_term::next_octet () NOTHROW
2857{ 2341{
2858 return cmdbuf_ptr < cmdbuf_endp 2342 return cmdbuf_ptr < cmdbuf_endp
2859 ? (unsigned char)*cmdbuf_ptr++ 2343 ? (unsigned char)*cmdbuf_ptr++
2860 : NOCHAR; 2344 : NOCHAR;
2861} 2345}
2346
2347static class out_of_input out_of_input;
2862 2348
2863/* rxvt_cmd_getc () - Return next input character */ 2349/* rxvt_cmd_getc () - Return next input character */
2864/* 2350/*
2865 * Return the next input character after first passing any keyboard input 2351 * Return the next input character after first passing any keyboard input
2866 * to the command. 2352 * to the command.
2867 */ 2353 */
2868wchar_t 2354wchar_t
2869rxvt_term::cmd_getc () 2355rxvt_term::cmd_getc () THROW ((class out_of_input))
2870{ 2356{
2871 wchar_t c = next_char (); 2357 wchar_t c = next_char ();
2872 2358
2873 if (c == NOCHAR) 2359 if (c == NOCHAR)
2874 throw out_of_input; 2360 throw out_of_input;
2875 2361
2876 return c; 2362 return c;
2877} 2363}
2878 2364
2879uint32_t 2365uint32_t
2880rxvt_term::cmd_get8 () 2366rxvt_term::cmd_get8 () THROW ((class out_of_input))
2881{ 2367{
2882 uint32_t c = next_octet (); 2368 uint32_t c = next_octet ();
2883 2369
2884 if (c == NOCHAR) 2370 if (c == NOCHAR)
2885 throw out_of_input; 2371 throw out_of_input;
… …
2951 { 2437 {
2952 if ((buf[len++] = cmd_getc ()) == 'i') 2438 if ((buf[len++] = cmd_getc ()) == 'i')
2953 break; /* done = 1 */ 2439 break; /* done = 1 */
2954 } 2440 }
2955 } 2441 }
2956 2442
2957 for (i = 0; i < len; i++) 2443 for (i = 0; i < len; i++)
2958 if (putc (buf[i], fd) == EOF) 2444 if (putc (buf[i], fd) == EOF)
2959 { 2445 {
2960 done = 1; 2446 done = 1;
2961 break; 2447 break;
… …
2963 } 2449 }
2964 } 2450 }
2965 2451
2966 pclose_printer (fd); 2452 pclose_printer (fd);
2967} 2453}
2968#endif /* PRINTPIPE */ 2454#endif /* PRINTPIPE */
2969/*}}} */ 2455/*}}} */
2970 2456
2971/* *INDENT-OFF* */ 2457/* *INDENT-OFF* */
2972enum { 2458enum {
2973 C1_40 = 0x40, 2459 C1_40 = 0x40,
… …
3023 process_dcs_seq (); 2509 process_dcs_seq ();
3024 break; 2510 break;
3025 case 0x9b: /* CSI */ 2511 case 0x9b: /* CSI */
3026 process_csi_seq (); 2512 process_csi_seq ();
3027 break; 2513 break;
3028 case 0x9d: /* CSI */ 2514 case 0x9d: /* OSC */
3029 process_osc_seq (); 2515 process_osc_seq ();
3030 break; 2516 break;
3031#endif 2517#endif
3032 } 2518 }
3033} 2519}
… …
3123 scr_charset_set (2, (unsigned int)cmd_getc ()); 2609 scr_charset_set (2, (unsigned int)cmd_getc ());
3124 break; 2610 break;
3125 case '+': 2611 case '+':
3126 scr_charset_set (3, (unsigned int)cmd_getc ()); 2612 scr_charset_set (3, (unsigned int)cmd_getc ());
3127 break; 2613 break;
3128#if ENABLE_FRILLS 2614#if !ENABLE_MINIMAL
3129 case '6': 2615 case '6':
3130 scr_backindex (); 2616 scr_backindex ();
3131 break; 2617 break;
3132#endif 2618#endif
3133 case '7': 2619 case '7':
3134 scr_cursor (SAVE); 2620 scr_cursor (SAVE);
3135 break; 2621 break;
3136 case '8': 2622 case '8':
3137 scr_cursor (RESTORE); 2623 scr_cursor (RESTORE);
3138 break; 2624 break;
3139#if ENABLE_FRILLS 2625#if !ENABLE_MINIMAL
3140 case '9': 2626 case '9':
3141 scr_forwardindex (); 2627 scr_forwardindex ();
3142 break; 2628 break;
3143#endif 2629#endif
3144 case '=': 2630 case '=':
… …
3259rxvt_term::process_csi_seq () 2745rxvt_term::process_csi_seq ()
3260{ 2746{
3261 unicode_t ch, priv, i; 2747 unicode_t ch, priv, i;
3262 unsigned int nargs, p; 2748 unsigned int nargs, p;
3263 int n, ndef; 2749 int n, ndef;
3264 int arg[ESC_ARGS]; 2750 int arg[ESC_ARGS] = { };
3265 2751
3266 for (nargs = ESC_ARGS; nargs > 0;) 2752 nargs = 0;
3267 arg[--nargs] = 0;
3268 2753
3269 priv = 0; 2754 priv = 0;
3270 ch = cmd_getc (); 2755 ch = cmd_getc ();
3271 if (ch >= '<' && ch <= '?') 2756 if (ch >= '<' && ch <= '?')
2757 {
3272 { /* '<' '=' '>' '?' */ 2758 /* '<' '=' '>' '?' */
3273 priv = ch; 2759 priv = ch;
3274 ch = cmd_getc (); 2760 ch = cmd_getc ();
3275 } 2761 }
3276 2762
3277 /* read any numerical arguments */ 2763 /* read any numerical arguments */
… …
3306 ndef = get_byte_array_bit (csi_defaults, i); 2792 ndef = get_byte_array_bit (csi_defaults, i);
3307 for (p = 0; p < nargs; p++) 2793 for (p = 0; p < nargs; p++)
3308 if (arg[p] == -1) 2794 if (arg[p] == -1)
3309 arg[p] = ndef; 2795 arg[p] = ndef;
3310 2796
3311#ifdef DEBUG_CMD
3312 fprintf (stderr, "CSI ");
3313 for (p = 0; p < nargs; p++)
3314 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3315 fprintf (stderr, "%c\n", ch);
3316#endif
3317
3318 /* 2797 /*
3319 * private mode handling 2798 * private mode handling
3320 */ 2799 */
3321 if (priv) 2800 if (priv)
3322 { 2801 {
3323 switch (priv) 2802 switch (priv)
3324 { 2803 {
3325 case '>': 2804 case '>':
3326 if (ch == CSI_DA) /* secondary device attributes */ 2805 if (ch == CSI_DA) /* secondary device attributes */
3327 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2806 {
2807 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2808 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2809 //
2810 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2811 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2812 // versions.
2813 //
2814 tt_printf ("\033[>%d;95;0c", 'U');
2815 }
3328 break; 2816 break;
3329 case '?': 2817 case '?':
3330 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2818 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3331 process_terminal_mode (ch, priv, nargs, arg); 2819 process_terminal_mode (ch, priv, nargs, arg);
3332 break; 2820 break;
… …
3458 break; 2946 break;
3459 case 6: /* CPR requested */ 2947 case 6: /* CPR requested */
3460 scr_report_position (); 2948 scr_report_position ();
3461 break; 2949 break;
3462 case 7: /* unofficial extension */ 2950 case 7: /* unofficial extension */
3463 if (OPTION (Opt_insecure)) 2951 if (option (Opt_insecure))
3464 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2952 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3465 break; 2953 break;
3466 case 8: /* unofficial extension */ 2954 case 8: /* unofficial extension */
3467 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2955 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3468 break; 2956 break;
… …
3535 break; 3023 break;
3536 case CSI_75: 3024 case CSI_75:
3537 scr_cursor (RESTORE); 3025 scr_cursor (RESTORE);
3538 break; 3026 break;
3539 3027
3540#if ENABLE_FRILLS 3028#if !ENABLE_MINIMAL
3541 case CSI_74: 3029 case CSI_74:
3542 process_window_ops (arg, nargs); 3030 process_window_ops (arg, nargs);
3543 break; 3031 break;
3544#endif 3032#endif
3545 3033
… …
3552 break; 3040 break;
3553 } 3041 }
3554} 3042}
3555/*}}} */ 3043/*}}} */
3556 3044
3557#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
3558/* ARGSUSED */ 3046/* ARGSUSED */
3559void 3047void
3560rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3048rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3561{ 3049{
3562 int x, y; 3050 int x, y;
3563 XWindowAttributes wattr; 3051 XWindowAttributes wattr;
3564 Window wdummy; 3052 Window wdummy;
3565 dDisp; 3053
3054 dLocal (Display *, dpy);
3566 3055
3567 if (nargs == 0) 3056 if (nargs == 0)
3568 return; 3057 return;
3569 3058
3570 switch (args[0]) 3059 switch (args[0])
3571 { 3060 {
3572 /* 3061 /*
3573 * commands 3062 * commands
3574 */ 3063 */
3575 case 1: /* deiconify window */ 3064 case 1: /* deiconify window */
3576 XMapWindow (disp, parent[0]); 3065 XMapWindow (dpy, parent[0]);
3577 break; 3066 break;
3578 case 2: /* iconify window */ 3067 case 2: /* iconify window */
3579 XIconifyWindow (disp, parent[0], display->screen); 3068 XIconifyWindow (dpy, parent[0], display->screen);
3580 break; 3069 break;
3581 case 3: /* set position (pixels) */ 3070 case 3: /* set position (pixels) */
3582 XMoveWindow (disp, parent[0], args[1], args[2]); 3071 XMoveWindow (dpy, parent[0], args[1], args[2]);
3583 break; 3072 break;
3584 case 4: /* set size (pixels) */ 3073 case 4: /* set size (pixels) */
3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3074 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3586 break; 3075 break;
3587 case 5: /* raise window */ 3076 case 5: /* raise window */
3588 XRaiseWindow (disp, parent[0]); 3077 XRaiseWindow (dpy, parent[0]);
3589 break; 3078 break;
3590 case 6: /* lower window */ 3079 case 6: /* lower window */
3591 XLowerWindow (disp, parent[0]); 3080 XLowerWindow (dpy, parent[0]);
3592 break; 3081 break;
3593 case 7: /* refresh window */ 3082 case 7: /* refresh window */
3594 scr_touch (true); 3083 scr_touch (true);
3595 break; 3084 break;
3596 case 8: /* set size (chars) */ 3085 case 8: /* set size (chars) */
… …
3603 if (args[0] >= 24) /* set height (chars) */ 3092 if (args[0] >= 24) /* set height (chars) */
3604 set_widthheight ((unsigned int)width, 3093 set_widthheight ((unsigned int)width,
3605 (unsigned int) (args[1] * fheight)); 3094 (unsigned int) (args[1] * fheight));
3606 break; 3095 break;
3607 3096
3608
3609 /* 3097 /*
3610 * reports - some output format copied from XTerm 3098 * reports - some output format copied from XTerm
3611 */ 3099 */
3612 case 11: /* report window state */ 3100 case 11: /* report window state */
3613 XGetWindowAttributes (disp, parent[0], &wattr); 3101 XGetWindowAttributes (dpy, parent[0], &wattr);
3614 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3102 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3615 break; 3103 break;
3616 case 13: /* report window position */ 3104 case 13: /* report window position */
3617 XGetWindowAttributes (disp, parent[0], &wattr); 3105 XGetWindowAttributes (dpy, parent[0], &wattr);
3618 XTranslateCoordinates (disp, parent[0], wattr.root, 3106 XTranslateCoordinates (dpy, parent[0], wattr.root,
3619 -wattr.border_width, -wattr.border_width, 3107 -wattr.border_width, -wattr.border_width,
3620 &x, &y, &wdummy); 3108 &x, &y, &wdummy);
3621 tt_printf ("\033[3;%d;%dt", x, y); 3109 tt_printf ("\033[3;%d;%dt", x, y);
3622 break; 3110 break;
3623 case 14: /* report window size (pixels) */ 3111 case 14: /* report window size (pixels) */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3112 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3113 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3626 break; 3114 break;
3627 case 18: /* report text area size (chars) */ 3115 case 18: /* report text area size (chars) */
3628 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3116 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3629 break; 3117 break;
… …
3631 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3119 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3632 break; 3120 break;
3633 case 20: /* report icon label */ 3121 case 20: /* report icon label */
3634 { 3122 {
3635 char *s; 3123 char *s;
3636 XGetIconName (disp, parent[0], &s); 3124 XGetIconName (dpy, parent[0], &s);
3637 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3125 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3638 XFree (s); 3126 XFree (s);
3639 } 3127 }
3640 break; 3128 break;
3641 case 21: /* report window title */ 3129 case 21: /* report window title */
3642 { 3130 {
3643 char *s; 3131 char *s;
3644 XFetchName (disp, parent[0], &s); 3132 XFetchName (dpy, parent[0], &s);
3645 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3133 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3646 XFree (s); 3134 XFree (s);
3647 } 3135 }
3648 break; 3136 break;
3649 } 3137 }
3650} 3138}
… …
3677 seen_esc = true; 3165 seen_esc = true;
3678 continue; 3166 continue;
3679 } 3167 }
3680 else if (ch == C0_BEL || ch == CHAR_ST) 3168 else if (ch == C0_BEL || ch == CHAR_ST)
3681 break; 3169 break;
3170 else if (ch == C0_SYN)
3171 ch = cmd_get8 ();
3682 else if (ch < 0x20) 3172 else if (ch < 0x20)
3683 return NULL; /* other control character - exit */ 3173 return NULL; /* other control character - exit */
3684 3174
3685 seen_esc = false; 3175 seen_esc = false;
3686 3176
3687 if (n >= STRING_MAX - 1) 3177 if (n >= STRING_MAX - 1)
3688 // stop at some sane length 3178 // stop at some sane length
3689 return NULL; 3179 return NULL;
3690 3180
3691 if (ch == C0_SYN)
3692 string[n++] = cmd_get8 ();
3693 else
3694 string[n++] = ch; 3181 string[n++] = ch;
3695 } 3182 }
3696 3183
3697 string[n++] = '\0'; 3184 string[n++] = '\0';
3698 3185
3699 ends_how = (ch == 0x5c ? C0_ESC : ch); 3186 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3750void 3237void
3751rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3238rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3752{ 3239{
3753 if (str[0] == '?' && !str[1]) 3240 if (str[0] == '?' && !str[1])
3754 { 3241 {
3755 unsigned short r, g, b; 3242 rgba c;
3756 pix_colors_focused[color].get (display, r, g, b); 3243 pix_colors_focused[color].get (c);
3244
3245#if XFT
3246 if (c.a != rgba::MAX_CC)
3247 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3248 else
3249#endif
3757 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3250 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3758 } 3251 }
3759 else 3252 else
3760 set_window_color (color, str); 3253 set_window_color (color, str);
3761} 3254}
3762 3255
… …
3764 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3257 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3765 */ 3258 */
3766void 3259void
3767rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3260rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3768{ 3261{
3769 int changed = 0;
3770 int color; 3262 int color;
3771 char *buf, *name; 3263 char *buf, *name;
3772 bool query = str[0] == '?' && !str[1]; 3264 bool query = str[0] == '?' && !str[1];
3773 int saveop = op; 3265 int saveop = op;
3774 dDisp; 3266
3267 dLocal (Display *, dpy);
3775 3268
3776 assert (str != NULL); 3269 assert (str != NULL);
3270
3271 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3272 return;
3273
3777 switch (op) 3274 switch (op)
3778 { 3275 {
3779 case XTerm_name: 3276 case XTerm_name:
3780 set_title (str); 3277 set_title (str);
3781 /* FALLTHROUGH */ 3278 /* FALLTHROUGH */
… …
3795 unsigned long bytes_after; 3292 unsigned long bytes_after;
3796 unsigned char *value = 0; 3293 unsigned char *value = 0;
3797 const char *str = ""; 3294 const char *str = "";
3798 3295
3799 if (prop 3296 if (prop
3800 && XGetWindowProperty (disp, parent[0], 3297 && XGetWindowProperty (dpy, parent[0],
3801 prop, 0, 1<<16, 0, AnyPropertyType, 3298 prop, 0, 1<<16, 0, AnyPropertyType,
3802 &actual_type, &actual_format, 3299 &actual_type, &actual_format,
3803 &nitems, &bytes_after, &value) == Success 3300 &nitems, &bytes_after, &value) == Success
3804 && actual_type != None 3301 && actual_type != None
3805 && actual_format == 8) 3302 && actual_format == 8)
3806 str = (const char *)(value); 3303 str = (const char *)(value);
3807 3304
3808 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3305 tt_printf ("\033]%d;%s%c", op, str, resp);
3809 3306
3810 XFree (value); 3307 XFree (value);
3811 } 3308 }
3812 else 3309 else
3813 { 3310 {
… …
3817 { 3314 {
3818 *eq = 0; 3315 *eq = 0;
3819 set_utf8_property (display->atom (str), eq + 1); 3316 set_utf8_property (display->atom (str), eq + 1);
3820 } 3317 }
3821 else 3318 else
3822 XDeleteProperty (disp, parent[0], 3319 XDeleteProperty (dpy, parent[0],
3823 display->atom (str)); 3320 display->atom (str));
3824 } 3321 }
3825 break; 3322 break;
3826 3323
3827 case XTerm_Color: 3324 case XTerm_Color:
… …
3837 break; 3334 break;
3838 3335
3839 if ((buf = strchr (name, ';')) != NULL) 3336 if ((buf = strchr (name, ';')) != NULL)
3840 *buf++ = '\0'; 3337 *buf++ = '\0';
3841 3338
3842 if (name[0] == '?' && !name[1]) 3339 process_color_seq (op, color, name, resp);
3843 {
3844 unsigned short r, g, b;
3845 pix_colors_focused[color].get (display, r, g, b);
3846 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3847 }
3848 else
3849 set_window_color (color, name);
3850 } 3340 }
3851 break; 3341 break;
3852 case XTerm_Color00: 3342 case XTerm_Color00:
3853 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3343 process_color_seq (op, Color_fg, str, resp);
3854 break; 3344 break;
3855 case XTerm_Color01: 3345 case XTerm_Color01:
3856 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3346 process_color_seq (op, Color_bg, str, resp);
3857 break; 3347 break;
3858#ifndef NO_CURSORCOLOR 3348#ifndef NO_CURSORCOLOR
3859 case XTerm_Color_cursor: 3349 case XTerm_Color_cursor:
3860 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3350 process_color_seq (op, Color_cursor, str, resp);
3861 break; 3351 break;
3862#endif 3352#endif
3863 case XTerm_Color_pointer_fg: 3353 case XTerm_Color_pointer_fg:
3864 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3354 process_color_seq (op, Color_pointer_fg, str, resp);
3865 break; 3355 break;
3866 case XTerm_Color_pointer_bg: 3356 case XTerm_Color_pointer_bg:
3867 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3357 process_color_seq (op, Color_pointer_bg, str, resp);
3868 break; 3358 break;
3869#ifndef NO_BOLD_UNDERLINE_REVERSE 3359#ifndef NO_BOLD_UNDERLINE_REVERSE
3870 case XTerm_Color_RV: 3360 case XTerm_Color_RV:
3871 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3361 process_color_seq (op, Color_RV, str, resp);
3872 break; 3362 break;
3873 case Rxvt_Color_BD: 3363 case Rxvt_Color_BD:
3874 case URxvt_Color_BD: 3364 case URxvt_Color_BD:
3875 process_color_seq (op, Color_BD, str, resp); 3365 process_color_seq (op, Color_BD, str, resp);
3876 break; 3366 break;
3877 case Rxvt_Color_UL: 3367 case Rxvt_Color_UL:
3878 case URxvt_Color_UL: 3368 case URxvt_Color_UL:
3879 process_color_seq (op, Color_UL, str, resp); 3369 process_color_seq (op, Color_UL, str, resp);
3880 break; 3370 break;
3881 case URxvt_Color_IT: 3371 case URxvt_Color_IT:
3882 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3372 process_color_seq (op, Color_IT, str, resp);
3883 break; 3373 break;
3884#endif 3374#endif
3885#if TRANSPARENT && TINTING 3375#if ENABLE_TRANSPARENCY
3886 case URxvt_Color_tint: 3376 case URxvt_Color_tint:
3887 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3377 process_color_seq (op, Color_tint, str, resp);
3888 check_our_parents (); 3378 {
3889 if (am_transparent) 3379 bool changed = false;
3890 want_full_refresh = want_refresh = 1; 3380 if (ISSET_PIXCOLOR (Color_tint))
3891 break; 3381 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3892#endif 3382 else
3383 changed = bgPixmap.unset_tint ();
3384 if (changed)
3385 update_background ();
3386 }
3893 3387
3388 break;
3389#endif
3390
3391#if BG_IMAGE_FROM_FILE
3894 case Rxvt_Pixmap: 3392 case Rxvt_Pixmap:
3895 if (*str != ';') 3393 if (!strcmp (str, "?"))
3896 { 3394 {
3897#if XPM_BACKGROUND 3395 char str[256];
3898 scale_pixmap (""); /* reset to default scaling */ 3396
3899 set_bgPixmap (str); /* change pixmap */ 3397 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3900 scr_touch (true); 3398 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3901#endif 3399 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3400 process_xterm_seq (XTerm_title, str, CHAR_ST);
3902 } 3401 }
3903 3402 else
3904 while ((str = strchr (str, ';')) != NULL)
3905 { 3403 {
3404 int changed = 0;
3405
3406 if (*str != ';')
3407 {
3408 /* reset to default scaling :*/
3409 bgPixmap.unset_geometry ();
3410 if (bgPixmap.set_file (str)) /* change pixmap */
3411 changed++;
3412 str = strchr (str, ';');
3413 if (str == NULL)
3414 bgPixmap.set_defaultGeometry ();
3415 }
3416 while (str)
3417 {
3906 str++; 3418 str++;
3907#if XPM_BACKGROUND 3419 if (bgPixmap.set_geometry (str))
3908 changed += scale_pixmap (str); 3420 changed++;
3909#endif 3421 str = strchr (str, ';');
3422 }
3423 if (changed)
3424 update_background ();
3910 } 3425 }
3911
3912 if (changed)
3913 {
3914#ifdef XPM_BACKGROUND
3915 resize_pixmap ();
3916 scr_touch (true);
3917#endif
3918 }
3919 break; 3426 break;
3427#endif
3920 3428
3921 case Rxvt_restoreFG: 3429 case Rxvt_restoreFG:
3922 set_window_color (Color_fg, str); 3430 set_window_color (Color_fg, str);
3923 break; 3431 break;
3924 case Rxvt_restoreBG: 3432 case Rxvt_restoreBG:
… …
3949 case URxvt_italicFont: 3457 case URxvt_italicFont:
3950 case URxvt_boldItalicFont: 3458 case URxvt_boldItalicFont:
3951#endif 3459#endif
3952 if (query) 3460 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", saveop, 3461 tt_printf ("\33]%d;%-.250s%c", saveop,
3954 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3462 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3955 ? fontset[op - URxvt_font]->fontdesc : "", 3463 ? fontset[op - URxvt_font]->fontdesc : "",
3956 resp); 3464 resp);
3957 else 3465 else
3958 { 3466 {
3959 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3467 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3962 allocated.push_back ((void *)res); 3470 allocated.push_back ((void *)res);
3963 set_fonts (); 3471 set_fonts ();
3964 } 3472 }
3965 break; 3473 break;
3966 3474
3967#if ENABLE_FRILLS 3475 case URxvt_version:
3476 if (query)
3477 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3478 op,
3479 rs[Rs_name], VERSION[0], VERSION[2],
3480 resp);
3481 break;
3482
3483#if !ENABLE_MINIMAL
3968 case URxvt_locale: 3484 case URxvt_locale:
3969 if (query) 3485 if (query)
3970 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3486 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3971 else 3487 else
3972 { 3488 {
3973 set_locale (str); 3489 set_locale (str);
3974 pty->set_utf8_mode (enc_utf8); 3490 pty->set_utf8_mode (enc_utf8);
3975 init_xlocale (); 3491 init_xlocale ();
… …
3990 break; 3506 break;
3991#endif 3507#endif
3992 3508
3993#if ENABLE_PERL 3509#if ENABLE_PERL
3994 case URxvt_perl: 3510 case URxvt_perl:
3995 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3511 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3996 ; // no responses yet 3512 ; // no responses yet
3997 break; 3513 break;
3998#endif 3514#endif
3999 } 3515 }
4000} 3516}
… …
4032 return state; 3548 return state;
4033} 3549}
4034 3550
4035/* we're not using priv _yet_ */ 3551/* we're not using priv _yet_ */
4036void 3552void
4037rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3553rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4038{ 3554{
4039 unsigned int i, j; 3555 unsigned int i, j;
4040 int state; 3556 int state;
4041 3557
4042 static const struct 3558 static const struct
4043 { 3559 {
4044 const int argval; 3560 const int argval;
4045 const unsigned long bit; 3561 const unsigned long bit;
4046 }
4047
4048 argtopriv[] = { 3562 } argtopriv[] = {
4049 { 1, PrivMode_aplCUR }, 3563 { 1, PrivMode_aplCUR },
4050 { 2, PrivMode_vt52 }, 3564 { 2, PrivMode_vt52 },
4051 { 3, PrivMode_132 }, 3565 { 3, PrivMode_132 },
4052 { 4, PrivMode_smoothScroll }, 3566 { 4, PrivMode_smoothScroll },
4053 { 5, PrivMode_rVideo }, 3567 { 5, PrivMode_rVideo },
… …
4069 { 66, PrivMode_aplKP }, 3583 { 66, PrivMode_aplKP },
4070#ifndef NO_BACKSPACE_KEY 3584#ifndef NO_BACKSPACE_KEY
4071 { 67, PrivMode_BackSpace }, 3585 { 67, PrivMode_BackSpace },
4072#endif 3586#endif
4073 { 1000, PrivMode_MouseX11 }, 3587 { 1000, PrivMode_MouseX11 },
4074 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3588 { 1002, PrivMode_MouseBtnEvent },
4075 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3589 { 1003, PrivMode_MouseAnyEvent },
4076 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4077 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3590 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4078 { 1011, PrivMode_Keypress }, // rxvt extension 3591 { 1011, PrivMode_Keypress }, // rxvt extension
4079 // 1035 enable modifiers for alt, numlock NYI 3592 // 1035 enable modifiers for alt, numlock NYI
4080 // 1036 send ESC for meta keys NYI 3593 // 1036 send ESC for meta keys NYI
4081 // 1037 send DEL for keypad delete NYI 3594 // 1037 send DEL for keypad delete NYI
… …
4116 scr_touch (true); 3629 scr_touch (true);
4117 break; 3630 break;
4118#endif 3631#endif
4119 case 1048: /* alternative cursor save */ 3632 case 1048: /* alternative cursor save */
4120 case 1049: 3633 case 1049:
4121 if (OPTION (Opt_secondaryScreen)) 3634 if (option (Opt_secondaryScreen))
4122 if (mode == 0) 3635 if (mode == 0)
4123 scr_cursor (RESTORE); 3636 scr_cursor (RESTORE);
4124 else if (mode == 1) 3637 else if (mode == 1)
4125 scr_cursor (SAVE); 3638 scr_cursor (SAVE);
4126 break; 3639 break;
… …
4155 scr_autowrap (state); 3668 scr_autowrap (state);
4156 break; 3669 break;
4157 /* case 8: - auto repeat, can't do on a per window basis */ 3670 /* case 8: - auto repeat, can't do on a per window basis */
4158 case 9: /* X10 mouse reporting */ 3671 case 9: /* X10 mouse reporting */
4159 if (state) /* orthogonal */ 3672 if (state) /* orthogonal */
4160 priv_modes &= ~PrivMode_MouseX11; 3673 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4161 break; 3674 break;
4162#ifdef scrollBar_esc 3675#ifdef scrollBar_esc
4163 case scrollBar_esc: 3676 case scrollBar_esc:
4164 if (scrollbar_mapping (state)) 3677 if (scrollbar_mapping (state))
4165 { 3678 {
… …
4178 break; 3691 break;
4179 /* case 66: - application key pad */ 3692 /* case 66: - application key pad */
4180 /* case 67: - backspace key */ 3693 /* case 67: - backspace key */
4181 case 1000: /* X11 mouse reporting */ 3694 case 1000: /* X11 mouse reporting */
4182 if (state) /* orthogonal */ 3695 if (state) /* orthogonal */
4183 priv_modes &= ~PrivMode_MouseX10; 3696 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4184 break; 3697 break;
4185#if 0
4186 case 1001: 3698 case 1002:
4187 break; /* X11 mouse highlighting */ 3699 case 1003:
4188#endif 3700 if (state)
3701 {
3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3703 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3704 vt_emask_mouse = PointerMotionMask;
3705 }
3706 else
3707 vt_emask_mouse = NoEventMask;
3708 vt_select_input ();
3709 break;
4189 case 1010: /* scroll to bottom on TTY output inhibit */ 3710 case 1010: /* scroll to bottom on TTY output inhibit */
4190 set_option (Opt_scrollTtyOutput, !state); 3711 set_option (Opt_scrollTtyOutput, !state);
4191 break; 3712 break;
4192 case 1011: /* scroll to bottom on key press */ 3713 case 1011: /* scroll to bottom on key press */
4193 set_option (Opt_scrollTtyKeypress, state); 3714 set_option (Opt_scrollTtyKeypress, state);
4194 break; 3715 break;
4195 case 1047: /* secondary screen w/ clearing last */ 3716 case 1047: /* secondary screen w/ clearing last */
4196 if (OPTION (Opt_secondaryScreen)) 3717 if (option (Opt_secondaryScreen))
4197 if (current_screen != PRIMARY) 3718 if (current_screen != PRIMARY)
4198 scr_erase_screen (2); 3719 scr_erase_screen (2);
4199 scr_change_screen (state); 3720 scr_change_screen (state);
4200 break; 3721 break;
4201 case 1049: /* secondary screen w/ clearing first */ 3722 case 1049: /* secondary screen w/ clearing first */
4202 scr_change_screen (state); 3723 scr_change_screen (state);
4203 if (OPTION (Opt_secondaryScreen)) 3724 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 3725 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 3726 scr_erase_screen (2);
4206 break; 3727 break;
4207 default: 3728 default:
4208 break; 3729 break;
… …
4336 scr_color (Color_bg, Color_bg); 3857 scr_color (Color_bg, Color_bg);
4337 break; 3858 break;
4338 3859
4339 //case 50: // not variable spacing 3860 //case 50: // not variable spacing
4340 3861
4341#if ENABLE_FRILLS 3862#if !ENABLE_MINIMAL
4342 case 90: 3863 case 90:
4343 case 91: /* set bright fg color */ 3864 case 91: /* set bright fg color */
4344 case 92: 3865 case 92:
4345 case 93: 3866 case 93:
4346 case 94: 3867 case 94:
… …
4370rxvt_term::process_graphics () 3891rxvt_term::process_graphics ()
4371{ 3892{
4372 unicode_t ch, cmd = cmd_getc (); 3893 unicode_t ch, cmd = cmd_getc ();
4373 3894
4374 if (cmd == 'Q') 3895 if (cmd == 'Q')
3896 {
4375 { /* query graphics */ 3897 /* query graphics */
4376 tt_printf ("\033G0\012"); /* no graphics */ 3898 tt_printf ("\033G0\012"); /* no graphics */
4377 return; 3899 return;
4378 } 3900 }
4379 /* swallow other graphics sequences until terminating ':' */ 3901 /* swallow other graphics sequences until terminating ':' */
4380 do 3902 do
… …
4430 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3952 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4431 3953
4432 memcpy (v_buffer + v_buflen, data, len); 3954 memcpy (v_buffer + v_buflen, data, len);
4433 v_buflen += len; 3955 v_buflen += len;
4434 3956
4435 pty_ev.set (EVENT_READ | EVENT_WRITE); 3957 pty_ev.set (ev::READ | ev::WRITE);
4436} 3958}
4437 3959
4438void rxvt_term::pty_write () 3960void rxvt_term::pty_write ()
4439{ 3961{
4440 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3962 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4445 3967
4446 if (v_buflen == 0) 3968 if (v_buflen == 0)
4447 { 3969 {
4448 free (v_buffer); 3970 free (v_buffer);
4449 v_buffer = 0; 3971 v_buffer = 0;
4450 v_buflen = 0;
4451 3972
4452 pty_ev.set (EVENT_READ); 3973 pty_ev.set (ev::READ);
4453 return; 3974 return;
4454 } 3975 }
4455 3976
4456 memmove (v_buffer, v_buffer + written, v_buflen); 3977 memmove (v_buffer, v_buffer + written, v_buflen);
4457 } 3978 }
4458 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3979 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4459 pty_ev.set (EVENT_READ); 3980 pty_ev.set (ev::READ);
4460} 3981}
4461 3982
4462/*----------------------- end-of-file (C source) -----------------------*/ 3983/*----------------------- end-of-file (C source) -----------------------*/
4463 3984

Diff Legend

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