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.277 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.387 by ayin, Sun Dec 30 23:45:42 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>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
96 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
98 97
99 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
202 200
203 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
204 202
205 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
207 205
208 if (y >= 0) 206 if (y >= 0)
209 { 207 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 220 ch = *chr++;
223 221
224 sprintf (buf, "%8x", ch); 222 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 223 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 224 scr_overlay_set (9, y, '=');
227# if !UNICODE3 225# if !UNICODE_3
228 if (ch >= 0x10000) 226 if (ch >= 0x10000)
229 ch = 0xfffd; 227 ch = 0xfffd;
230# endif 228# endif
231 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
233 } 233 }
234 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// }
235 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
237 242
238 free (fname); 243 free (fname);
239 244
… …
292 297
293 return -1; 298 return -1;
294} 299}
295#endif 300#endif
296 301
297/*{{{ Convert the keypress event into a string */
298void 302void
299rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
300{ 304{
301 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
302 unsigned int newlen; 306 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304#ifdef DEBUG_CMD
305 static int debug_key = 1; /* accessible by a debugger only */
306#endif
307 int valid_keysym; 308 int valid_keysym;
308 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
309 315
310 /* 316 /*
311 * 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
312 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
313 * 319 *
… …
493# if ISO_14755 499# if ISO_14755
494 iso14755_51 (0); 500 iso14755_51 (0);
495# endif 501# endif
496 return; 502 return;
497 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
498 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
499 { 513 {
500 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
501 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
502# if ISO_14755 516# if ISO_14755
… …
504# endif 518# endif
505 return; 519 return;
506 } 520 }
507 else 521 else
508 { 522 {
509# if ENABLE_OVERLAY 523# if ISO_14755
510 scr_overlay_off (); 524 scr_overlay_off ();
511# endif 525# endif
512 iso14755buf = 0; 526 iso14755buf = 0;
513 } 527 }
514 } 528 }
515 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
516 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
517 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
518 { 532 {
519 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
520# if ENABLE_OVERLAY 534# if ISO_14755
521 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
522 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
523# endif 537# endif
524 } 538 }
525#endif 539#endif
526 540
527#ifdef PRINTPIPE 541#ifdef PRINTPIPE
528 if (keysym == XK_Print) 542 if (keysym == XK_Print)
529 { 543 {
530 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
531 return; 545 return;
… …
533#endif 547#endif
534 548
535 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
536 { 550 {
537 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
538 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
539 switch (keysym) 584 switch (keysym)
540 { 585 {
541#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
542 case XK_BackSpace: 587 case XK_BackSpace:
543 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
545 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
546 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
547 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
548 } 593 }
549 else 594 else
550 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
551 break; 596 break;
552#endif 597#endif
553#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
564 case XK_Delete: 599 case XK_Delete:
565 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
566 break; 601 break;
567#endif 602#endif
568 case XK_Tab: 603 case XK_Tab:
569 if (shft) 604 if (shft)
570 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
580#endif 615#endif
581 newlen = 0; 616 newlen = 0;
582 } 617 }
583 break; 618 break;
584 619
585#ifdef XK_KP_Left
586 case XK_KP_Up: /* \033Ox or standard */
587 case XK_KP_Down: /* \033Or or standard */
588 case XK_KP_Right: /* \033Ov or standard */
589 case XK_KP_Left: /* \033Ot or standard */
590 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
591 {
592 strcpy (kbuf, "\033OZ");
593 kbuf[2] = "txvr"[keysym - XK_KP_Left];
594 break;
595 }
596 else
597 /* translate to std. cursor key */
598 keysym = XK_Left + (keysym - XK_KP_Left);
599 /* FALLTHROUGH */
600#endif
601 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
602 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
603 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
604 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
605 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
615 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
616 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
617 break; 636 break;
618 637
619#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
620# ifdef XK_KP_Prior
621 case XK_KP_Prior:
622 /* allow shift to override */
623 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
624 {
625 strcpy (kbuf, "\033Oy");
626 break;
627 }
628 /* FALLTHROUGH */
629# endif
630 case XK_Prior: 639 case XK_Prior:
631 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
632 break; 641 break;
633# ifdef XK_KP_Next
634 case XK_KP_Next:
635 /* allow shift to override */
636 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
637 {
638 strcpy (kbuf, "\033Os");
639 break;
640 }
641 /* FALLTHROUGH */
642# endif
643 case XK_Next: 642 case XK_Next:
644 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
645 break; 644 break;
646#endif 645#endif
647 case XK_KP_Enter: 646 case XK_KP_Enter:
648 /* allow shift to override */ 647 /* allow shift to override */
649 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
650 { 649 {
651 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
652 break; 651 break;
653 } 652 }
654 653
… …
666 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
667 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
668 } 667 }
669 break; 668 break;
670 669
671#ifdef XK_KP_Begin
672 case XK_KP_Begin:
673 strcpy (kbuf, "\033Ou");
674 break;
675
676#endif
677 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
678 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
679 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
680 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
681 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
697 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
698 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
699 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
700 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
701 /* allow shift to override */ 694 /* allow shift to override */
702 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
703 { 696 {
704 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
705 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
706 } 699 }
707 else 700 else
… …
713 706
714 case XK_Find: 707 case XK_Find:
715 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
716 break; 709 break;
717 710
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
728 case XK_Insert: 711 case XK_Insert:
729 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
730 break; 713 break;
731#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
732 case DXK_Remove: 715 case DXK_Remove:
… …
736 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
737 break; 720 break;
738 case XK_Select: 721 case XK_Select:
739 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
740 break; 723 break;
741#ifdef XK_KP_End
742 case XK_KP_End:
743 /* allow shift to override */
744 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
745 {
746 strcpy (kbuf, "\033Oq");
747 break;
748 }
749 /* FALLTHROUGH */
750#endif
751 case XK_End: 724 case XK_End:
752 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
753 break; 726 break;
754#ifdef XK_KP_Home
755 case XK_KP_Home:
756 /* allow shift to override */
757 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
758 {
759 strcpy (kbuf, "\033Ow");
760 break;
761 }
762 /* FALLTHROUGH */
763#endif
764 case XK_Home: 727 case XK_Home:
765 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
766 break; 729 break;
767 730
768#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
870 return; 833 return;
871 834
872 if (len <= 0) 835 if (len <= 0)
873 return; /* not mapped */ 836 return; /* not mapped */
874 837
875 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 839 if (view_start)
877 { 840 {
878 view_start = 0; 841 view_start = 0;
879 want_refresh = 1; 842 want_refresh = 1;
880 } 843 }
… …
902 { 865 {
903 const char ch = C0_ESC; 866 const char ch = C0_ESC;
904 tt_write (&ch, 1); 867 tt_write (&ch, 1);
905 } 868 }
906 869
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
918} 871}
919/*}}} */ 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}
920 949
921#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
922unsigned int 951unsigned int
923rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 953{
… …
954void 983void
955rxvt_term::flush () 984rxvt_term::flush ()
956{ 985{
957 flush_ev.stop (); 986 flush_ev.stop ();
958 987
959#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
960 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
961 { 990 {
962 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
963 scr_clear ();
964 scr_touch (false); 992 scr_touch (false);
965 } 993 }
966#endif 994#endif
967 995
968 if (want_refresh) 996 if (want_refresh)
… …
1013 } 1041 }
1014 1042
1015 display->flush (); 1043 display->flush ();
1016} 1044}
1017 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1018void 1047void
1019rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1049{
1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1054}
1055
1056void
1057rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1058{
1021 make_current (); 1059 make_current ();
1022 1060
1023 display->flush ();
1024
1025 if (want_refresh && !flush_ev.active)
1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1027}
1028
1029void
1030rxvt_term::flush_cb (time_watcher &w)
1031{
1032 make_current ();
1033
1034 refresh_limit = 1;
1035 refresh_count = 0; 1061 refresh_count = 0;
1036 flush (); 1062 flush ();
1037} 1063}
1038 1064
1039#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1040void 1066void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1068{
1043 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1070 want_refresh = 1;
1045 1071 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1072}
1048#endif 1073#endif
1049 1074
1050#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1051void 1076void
1052rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1078{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1080 {
1056 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1057 want_refresh = 1; 1082 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1059 } 1084 }
1085 else
1086 w.stop ();
1060} 1087}
1061#endif 1088#endif
1062 1089
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1091void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1093{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1069 { 1096 {
1070 want_refresh = 1; 1097 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1072 } 1099 }
1100 else
1101 w.stop ();
1073} 1102}
1074#endif 1103#endif
1075 1104
1076#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1077void 1106void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1108{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1110 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1112 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1085 } 1114 }
1115 else
1116 w.stop ();
1086} 1117}
1087#endif 1118#endif
1088 1119
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1121void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1123{
1093 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1095 : scr_page (UP, mouse_slip_wheel_speed))
1096 { 1125 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1126 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
1103} 1135}
1104#endif 1136#endif
1105 1137
1106#if HAVE_SCHED_YIELD 1138#if LINUX_YIELD_HACK
1107static struct event_handler 1139static struct event_handler
1108{ 1140{
1109 check_watcher cw_yield; 1141 ev::prepare yield_ev;
1110 1142
1111 void yield (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1112 { 1144 {
1113 sched_yield (); 1145 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS.
1149
1150 struct timespec ts = { 0, 0 };
1151 nanosleep (&ts, 0);
1152
1114 w.stop (); 1153 w.stop ();
1115 } 1154 }
1116 1155
1117 event_handler () 1156 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1157 : yield_ev (this, &event_handler::yield_cb)
1119 { 1158 {
1120 } 1159 }
1121} event_handler; 1160} event_handler;
1122#endif 1161#endif
1123 1162
… …
1143 cmdbuf_endp += r; 1182 cmdbuf_endp += r;
1144 return true; 1183 return true;
1145 } 1184 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1186 {
1148#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1149 if (display->is_local) 1188 if (display->is_local)
1150 event_handler.cw_yield.start (); 1189 event_handler.yield_ev.start ();
1151#endif 1190#endif
1152 } 1191 }
1153 else 1192 else
1154 { 1193 {
1155 pty_ev.stop (); 1194 pty_ev.stop ();
1156 1195
1157 if (!OPTION (Opt_hold)) 1196 if (!option (Opt_hold))
1158 destroy (); 1197 destroy ();
1159 } 1198 }
1160 1199
1161 return false; 1200 return false;
1162} 1201}
1163 1202
1164void 1203void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1205{
1167 make_current (); 1206 make_current ();
1168 1207
1169 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1210 while (pty_fill ())
1172 if (cmd_parse ()) 1211 if (cmd_parse ())
1173 break; 1212 break;
1174 1213
1175 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1176 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1177} 1218}
1178 1219
1179void 1220void
1180rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1181{ 1222{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1223 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1224 recolour_cursor ();
1184 1225
1185#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1227 hidden_pointer = 0;
1187 1228
1188 if (OPTION (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1190#endif 1231#endif
1191} 1232}
1192 1233
1193#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1194void 1235void
1195rxvt_term::pointer_blank () 1236rxvt_term::pointer_blank ()
1196{ 1237{
1197 if (!OPTION (Opt_pointerBlank)) 1238 if (!option (Opt_pointerBlank))
1198 return; 1239 return;
1199 1240
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1241 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1242 XFlush (dpy);
1202 1243
1203 hidden_pointer = 1; 1244 hidden_pointer = 1;
1204} 1245}
1205 1246
1206void 1247void
1207rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1249{
1209 make_current (); 1250 make_current ();
1210 1251
1211 pointer_blank (); 1252 pointer_blank ();
1212} 1253}
… …
1215void 1256void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1258{
1218 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1219 int x, y; 1260 int x, y;
1261 int code = 32;
1220 1262
1221 x = ev.x; 1263 x = Pixel2Col (ev.x);
1222 y = ev.y; 1264 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1224 1273
1225 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1226 button_number = 3; 1275 button_number = 3;
1227 else 1276 else
1228 { 1277 {
… …
1274 x + 1, 1323 x + 1,
1275 y + 1); 1324 y + 1);
1276#endif 1325#endif
1277 1326
1278 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1280 (32 + x + 1), 1329 (32 + x + 1),
1281 (32 + y + 1)); 1330 (32 + y + 1));
1282} 1331}
1283
1284#ifdef USING_W11LIB
1285void
1286rxvt_W11_process_x_event (XEvent *ev)
1287{
1288 rxvt_t *r = rxvt_get_r ();
1289
1290 x_cb (*ev);
1291}
1292#endif
1293 1332
1294/*{{{ process an X event */ 1333/*{{{ process an X event */
1295void 1334void
1296rxvt_term::x_cb (XEvent &ev) 1335rxvt_term::x_cb (XEvent &ev)
1297{ 1336{
1298 make_current (); 1337 make_current ();
1299 1338
1300 dDisp; 1339 dLocal (Display *, dpy);
1301 1340
1302 if (ev.xany.window == vt 1341 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1342 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1343 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1344 return;
… …
1310 unsigned int unused_mask; 1349 unsigned int unused_mask;
1311 1350
1312 switch (ev.type) 1351 switch (ev.type)
1313 { 1352 {
1314 case KeyPress: 1353 case KeyPress:
1315#if ISO_14755 1354 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1355 break;
1321 1356
1322 case KeyRelease: 1357 case KeyRelease:
1323 { 1358 key_release (ev.xkey);
1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1325 KeySym keysym;
1326
1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1328#endif
1329
1330#if ENABLE_FRILLS || ISO_14755
1331 // ISO 14755 support
1332 if (iso14755buf)
1333 if (iso14755buf & ISO_14755_52)
1334 {
1335# if ENABLE_OVERLAY
1336 scr_overlay_off ();
1337# endif
1338# if ISO_14755
1339 // iso14755 part 5.2 handling: release time
1340 // first: controls
1341 if ((ev.xkey.state & ControlMask)
1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1344 {
1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1346 commit_iso14755 ();
1347 goto skip_switch;
1348 }
1349
1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1351 if (i[0] == keysym)
1352 {
1353 iso14755buf = ISO_14755_51 | i[1];
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 scr_bell ();
1359# endif
1360 iso14755buf = 0;
1361 break;
1362 }
1363 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1364 {
1365# if ENABLE_OVERLAY
1366 scr_overlay_off ();
1367# endif
1368 if (iso14755buf & ISO_14755_51)
1369 commit_iso14755 ();
1370#if ISO_14755
1371 else if (iso14755buf & ISO_14755_STARTED)
1372 {
1373 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1374
1375 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1376 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1377 }
1378# endif
1379 else
1380 iso14755buf = 0;
1381 }
1382#endif
1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1389 if (!(ev.xkey.state & ControlMask))
1390 slip_wheel_ev.stop ();
1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1392 mouse_slip_wheel_speed = 0;
1393#endif
1394 break; 1359 break;
1395 }
1396 1360
1397 case ButtonPress: 1361 case ButtonPress:
1398 button_press (ev.xbutton); 1362 button_press (ev.xbutton);
1399 break; 1363 break;
1400 1364
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1379 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1380 destroy ();
1417 } 1381 }
1418#if ENABLE_EWMH 1382#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1383 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1384 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1385 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1386 &ev);
1423#endif 1387#endif
1424 } 1388 }
1425 } 1389 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1396 focus_out ();
1433 } 1397 }
1434#endif 1398#endif
1435 } 1399 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1400 break;
1441 1401
1442 /* 1402 /*
1443 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1463 break; 1423 break;
1464 } 1424 }
1465 break; 1425 break;
1466 1426
1467 case FocusIn: 1427 case FocusIn:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1431 focus_in ();
1469 break; 1432 break;
1470 1433
1471 case FocusOut: 1434 case FocusOut:
1435 if (ev.xfocus.detail != NotifyInferior
1436 && ev.xfocus.detail != NotifyPointer
1437 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1438 focus_out ();
1473 break; 1439 break;
1474 1440
1475 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1476 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1477 { 1446 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1448 ;
1480 1449
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1451 {
1483 seen_resize = 1; 1452 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1454 }
1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1486 1462
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1490 if (OPTION (Opt_transparent))
1491 check_our_parents ();
1492#endif
1493 } 1464 }
1494 break; 1465 break;
1495 1466
1496 case PropertyNotify: 1467 case PropertyNotify:
1468 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1469 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1498 && ev.xproperty.state == PropertyNewValue) 1470 && ev.xproperty.state == PropertyNewValue)
1499 selection_property (ev.xproperty.window, ev.xproperty.atom); 1471 selection_property (ev.xproperty.window, ev.xproperty.atom);
1500 1472
1501 break; 1473 break;
1502 1474
1503 case SelectionClear: 1475 case SelectionClear:
1504 selection_clear (); 1476 selection_clear ();
… …
1514 break; 1486 break;
1515 1487
1516 case MapNotify: 1488 case MapNotify:
1517 mapped = 1; 1489 mapped = 1;
1518#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1491 text_blink_ev.start ();
1520#endif 1492#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break; 1494 break;
1523 1495
1524 case UnmapNotify: 1496 case UnmapNotify:
… …
1526#ifdef TEXT_BLINK 1498#ifdef TEXT_BLINK
1527 text_blink_ev.stop (); 1499 text_blink_ev.stop ();
1528#endif 1500#endif
1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1501 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1530 break; 1502 break;
1531
1532#ifdef TRANSPARENT
1533 case ReparentNotify:
1534 rootwin_cb (ev);
1535 break;
1536#endif /* TRANSPARENT */
1537 1503
1538 case GraphicsExpose: 1504 case GraphicsExpose:
1539 case Expose: 1505 case Expose:
1540 if (ev.xany.window == vt) 1506 if (ev.xany.window == vt)
1541 { 1507 {
1542 do 1508 do
1509 {
1543 scr_expose (ev.xexpose.x, ev.xexpose.y, 1510 scr_expose (ev.xexpose.x, ev.xexpose.y,
1544 ev.xexpose.width, ev.xexpose.height, False); 1511 ev.xexpose.width, ev.xexpose.height, False);
1512 }
1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1513 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1546 1514
1547 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1515 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1548 1516
1549 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1517 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1518 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1519 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1520 ev.xexpose.width, ev.xexpose.height, False);
1521 }
1552 1522
1553 want_refresh = 1; 1523 want_refresh = 1;
1554 } 1524 }
1555 else 1525 else
1556 { 1526 {
1557 XEvent unused_event; 1527 XEvent unused_event;
1558 1528
1559 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1529 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1560 ; 1530 ;
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1531 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1562 ; 1532 ;
1563 1533
1564 if (isScrollbarWindow (ev.xany.window)) 1534 if (isScrollbarWindow (ev.xany.window))
1565 { 1535 {
1566 scrollBar.setIdle (); 1536 scrollBar.setIdle ();
1567 scrollbar_show (0); 1537 scrollbar_show (0);
1568 } 1538 }
1569
1570#ifdef TRANSPARENT
1571 if (am_transparent && ev.xany.window == parent[0])
1572 XClearWindow (disp, ev.xany.window);
1573#endif
1574 } 1539 }
1575 break; 1540 break;
1576 1541
1577 case MotionNotify: 1542 case MotionNotify:
1578#ifdef POINTER_BLANK 1543#ifdef POINTER_BLANK
1579 if (hidden_pointer) 1544 if (hidden_pointer)
1580 pointer_unblank (); 1545 pointer_unblank ();
1581#endif 1546#endif
1547 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1548 || priv_modes & PrivMode_MouseAnyEvent)
1549 mouse_report (ev.xbutton);
1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1550 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1583 break; 1551 break;
1584 1552
1585 if (ev.xany.window == vt) 1553 if (ev.xany.window == vt)
1586 { 1554 {
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1555 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1556 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589 ; // nop 1557 ; // nop
1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1558 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1591 { 1559 {
1592 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1560 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1593 ; 1561 ;
1594 1562
1595 XQueryPointer (disp, vt, 1563 XQueryPointer (dpy, vt,
1596 &unused_root, &unused_child, 1564 &unused_root, &unused_child,
1597 &unused_root_x, &unused_root_y, 1565 &unused_root_x, &unused_root_y,
1598 &ev.xbutton.x, &ev.xbutton.y, 1566 &ev.xbutton.x, &ev.xbutton.y,
1599 &ev.xbutton.state); 1567 &ev.xbutton.state);
1600#ifdef MOUSE_THRESHOLD 1568#ifdef MOUSE_THRESHOLD
… …
1620 int dist; 1588 int dist;
1621 1589
1622 /* don't clobber the current delay if we are 1590 /* don't clobber the current delay if we are
1623 * already in the middle of scrolling. 1591 * already in the middle of scrolling.
1624 */ 1592 */
1625 if (!sel_scroll_ev.active) 1593 if (!sel_scroll_ev.is_active ())
1626 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1594 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1627 1595
1628 /* save the event params so we can highlight 1596 /* save the event params so we can highlight
1629 * the selection in the pending-scroll loop 1597 * the selection in the pending-scroll loop
1630 */ 1598 */
1631 selection_save_x = ev.xbutton.x; 1599 selection_save_x = ev.xbutton.x;
… …
1653 else 1621 else
1654 { 1622 {
1655 /* we are within the text window, so we 1623 /* we are within the text window, so we
1656 * shouldn't be scrolling 1624 * shouldn't be scrolling
1657 */ 1625 */
1658 if (sel_scroll_ev.active)
1659 sel_scroll_ev.stop(); 1626 sel_scroll_ev.stop();
1660 } 1627 }
1661#endif 1628#endif
1662#ifdef MOUSE_THRESHOLD 1629#ifdef MOUSE_THRESHOLD
1663 } 1630 }
1664#endif 1631#endif
1665 } 1632 }
1666 } 1633 }
1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1634 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1668 { 1635 {
1669 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1636 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1670 MotionNotify, &ev)) 1637 MotionNotify, &ev))
1671 ; 1638 ;
1672 1639
1673 XQueryPointer (disp, scrollBar.win, 1640 XQueryPointer (dpy, scrollBar.win,
1674 &unused_root, &unused_child, 1641 &unused_root, &unused_child,
1675 &unused_root_x, &unused_root_y, 1642 &unused_root_x, &unused_root_y,
1676 &ev.xbutton.x, &ev.xbutton.y, 1643 &ev.xbutton.x, &ev.xbutton.y,
1677 &unused_mask); 1644 &unused_mask);
1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1679 scrollbar_size ()); 1646 scrollbar_size ());
1680 want_refresh = 1; 1647 want_refresh = 1;
1681 refresh_limit = 0;
1682 scrollbar_show (1); 1648 scrollbar_show (1);
1683 } 1649 }
1684 break; 1650 break;
1685 } 1651 }
1686 1652
1687skip_switch: ;
1688
1689#if defined(CURSOR_BLINK) 1653#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1654 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 { 1655 {
1692 if (hidden_cursor) 1656 if (hidden_cursor)
1693 { 1657 {
1694 hidden_cursor = 0; 1658 hidden_cursor = 0;
1695 want_refresh = 1; 1659 want_refresh = 1;
1696 } 1660 }
1697 1661
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1662 cursor_blink_ev.again ();
1699 } 1663 }
1700#endif 1664#endif
1701 1665
1702#if defined(POINTER_BLANK) 1666#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1667 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1668 {
1705 if (ev.type == MotionNotify 1669 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress 1670 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease) 1671 || ev.type == ButtonRelease)
1708 if (hidden_pointer) 1672 if (hidden_pointer)
… …
1710 1674
1711 if (ev.type == KeyPress && hidden_pointer == 0) 1675 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank (); 1676 pointer_blank ();
1713 } 1677 }
1714#endif 1678#endif
1679
1680 refresh_check ();
1715} 1681}
1716 1682
1717void 1683void
1718rxvt_term::focus_in () 1684rxvt_term::focus_in ()
1719{ 1685{
1720 if (!focus) 1686 if (!focus)
1721 { 1687 {
1722 focus = 1; 1688 focus = 1;
1723 want_refresh = 1; 1689 want_refresh = 1;
1724 1690
1725 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1691 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1726 1692
1727#if USE_XIM 1693#if USE_XIM
1728 if (Input_Context != NULL) 1694 if (Input_Context != NULL)
1729 { 1695 {
1730 IMSetStatusPosition (); 1696 IMSetPosition ();
1731 XSetICFocus (Input_Context); 1697 XSetICFocus (Input_Context);
1732 } 1698 }
1733#endif 1699#endif
1734#if CURSOR_BLINK 1700#if CURSOR_BLINK
1735 if (OPTION (Opt_cursorBlink)) 1701 if (option (Opt_cursorBlink))
1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1702 cursor_blink_ev.again ();
1737#endif 1703#endif
1738#if OFF_FOCUS_FADING 1704#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1705 if (rs[Rs_fade])
1740 { 1706 {
1741 pix_colors = pix_colors_focused; 1707 pix_colors = pix_colors_focused;
1742 scr_recolour (); 1708 scr_recolour ();
1743 } 1709 }
1744#endif 1710#endif
1711#if ENABLE_FRILLS
1712 if (option (Opt_urgentOnBell))
1713 {
1714 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1715 {
1716 h->flags &= ~XUrgencyHint;
1717 XSetWMHints (dpy, parent[0], h);
1718 }
1719 }
1720#endif
1745 } 1721 }
1746} 1722}
1747 1723
1748void 1724void
1749rxvt_term::focus_out () 1725rxvt_term::focus_out ()
… …
1757 1733
1758#if ENABLE_FRILLS || ISO_14755 1734#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf) 1735 if (iso14755buf)
1760 { 1736 {
1761 iso14755buf = 0; 1737 iso14755buf = 0;
1762# if ENABLE_OVERLAY 1738# if ISO_14755
1763 scr_overlay_off (); 1739 scr_overlay_off ();
1764# endif 1740# endif
1765 } 1741 }
1766#endif 1742#endif
1767#if USE_XIM 1743#if USE_XIM
1768 if (Input_Context != NULL) 1744 if (Input_Context != NULL)
1769 XUnsetICFocus (Input_Context); 1745 XUnsetICFocus (Input_Context);
1770#endif 1746#endif
1771#if CURSOR_BLINK 1747#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1748 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.stop (); 1749 cursor_blink_ev.stop ();
1750
1774 hidden_cursor = 0; 1751 hidden_cursor = 0;
1775#endif 1752#endif
1776#if OFF_FOCUS_FADING 1753#if OFF_FOCUS_FADING
1777 if (rs[Rs_fade]) 1754 if (rs[Rs_fade])
1778 { 1755 {
… …
1781 } 1758 }
1782#endif 1759#endif
1783 } 1760 }
1784} 1761}
1785 1762
1786#if TRANSPARENT 1763void
1764rxvt_term::update_fade_color (unsigned int idx)
1765{
1766#if OFF_FOCUS_FADING
1767 if (rs[Rs_fade])
1768 {
1769 rgba c;
1770 pix_colors [Color_fade].get (c);
1771 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1772 }
1773#endif
1774}
1775
1776#if ENABLE_TRANSPARENCY || ENABLE_PERL
1787void 1777void
1788rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1789{ 1779{
1790 make_current (); 1780 make_current ();
1791 1781
1782 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1783 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1784 return;
1785
1786# if ENABLE_TRANSPARENCY
1792 switch (ev.type) 1787 switch (ev.type)
1793 { 1788 {
1794 case PropertyNotify: 1789 case PropertyNotify:
1795 /* 1790 /*
1796 * if user used some Esetroot compatible prog to set the root bg, 1791 * if user used some Esetroot compatible prog to set the root bg,
1797 * use the property to determine the pixmap. We use it later on. 1792 * use the property to determine the pixmap. We use it later on.
1798 */ 1793 */
1799 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1794 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1800 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1795 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1801 return; 1796 {
1797 bgPixmap.set_root_pixmap ();
1798 update_background ();
1799 }
1802 1800
1803 /* FALLTHROUGH */
1804 case ReparentNotify:
1805 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1806 want_refresh = want_full_refresh = 1;
1807 break; 1801 break;
1808 } 1802 }
1803# endif
1804
1805 refresh_check ();
1809} 1806}
1810#endif 1807#endif
1811 1808
1812void 1809void
1813rxvt_term::button_press (XButtonEvent &ev) 1810rxvt_term::button_press (XButtonEvent &ev)
… …
1822 /* 1819 /*
1823 * VT window processing of button press 1820 * VT window processing of button press
1824 */ 1821 */
1825 if (ev.window == vt) 1822 if (ev.window == vt)
1826 { 1823 {
1824 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1825 return;
1826
1827#if ISO_14755 1827#if ISO_14755
1828 // 5.4 1828 // 5.4
1829 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1829 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1830 { 1830 {
1831 iso14755_54 (ev.x, ev.y); 1831 iso14755_54 (ev.x, ev.y);
… …
1865 mouse_report (ev); 1865 mouse_report (ev);
1866 } 1866 }
1867#else 1867#else
1868 MEvent.button = ev.button; 1868 MEvent.button = ev.button;
1869 mouse_report (ev); 1869 mouse_report (ev);
1870#endif /* MOUSE_REPORT_DOUBLECLICK */ 1870#endif /* MOUSE_REPORT_DOUBLECLICK */
1871 1871
1872 } 1872 }
1873 else 1873 else
1874 { 1874 {
1875 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
1876 MEvent.clicks = 0; 1876 MEvent.clicks = 0;
1877 1877
1878 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1879 switch (ev.button) 1878 switch (ev.button)
1880 { 1879 {
1881 case Button1: 1880 case Button1:
1882 /* allow meta + click to select rectangular areas */ 1881 /* allow meta + click to select rectangular areas */
1883 /* should be done in screen.C */ 1882 /* should be done in screen.C */
1884#if ENABLE_FRILLS 1883#if ENABLE_FRILLS
1885 selection.rect = !!(ev.state & ModMetaMask); 1884 selection.rect = !!(ev.state & ModMetaMask);
1886#else 1885#else
1887 selection.rect = false; 1886 selection.rect = false;
1888#endif 1887#endif
1889 1888
1890 /* allow shift+left click to extend selection */ 1889 /* allow shift+left click to extend selection */
1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1890 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1892 { 1891 {
1893 if (MEvent.button == Button1 && clickintime) 1892 if (MEvent.button == Button1 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1893 selection_rotate (ev.x, ev.y);
1895 else 1894 else
1896 selection_extend (ev.x, ev.y, 1); 1895 selection_extend (ev.x, ev.y, 1);
1897 } 1896 }
1898 else 1897 else
1899 { 1898 {
1900 if (MEvent.button == Button1 && clickintime) 1899 if (MEvent.button == Button1 && clickintime)
1901 MEvent.clicks++; 1900 MEvent.clicks++;
1902 else 1901 else
1903 MEvent.clicks = 1; 1902 MEvent.clicks = 1;
1904 1903
1905 selection_click (MEvent.clicks, ev.x, ev.y); 1904 selection_click (MEvent.clicks, ev.x, ev.y);
1906 } 1905 }
1907 1906
1908 MEvent.button = Button1; 1907 MEvent.button = Button1;
1909 break; 1908 break;
1910 1909
1911 case Button3: 1910 case Button3:
1912 if (MEvent.button == Button3 && clickintime) 1911 if (MEvent.button == Button3 && clickintime)
1913 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1914 else 1913 else
1915 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1916 1915
1917 MEvent.button = Button3; 1916 MEvent.button = Button3;
1918 break; 1917 break;
1919 } 1918 }
1920 } 1919 }
1921 1920
1922 MEvent.time = ev.time; 1921 MEvent.time = ev.time;
1923 return; 1922 return;
1924 } 1923 }
1925 1924
… …
1970 tt_printf ("\033[5~"); 1969 tt_printf ("\033[5~");
1971 break; 1970 break;
1972 } 1971 }
1973 } 1972 }
1974 else 1973 else
1975#endif /* NO_SCROLLBAR_REPORT */ 1974#endif /* NO_SCROLLBAR_REPORT */
1976 1975
1977 { 1976 {
1978 char upordown = 0; 1977 char upordown = 0;
1979 1978
1980 if (scrollBar.style == R_SB_NEXT) 1979 if (scrollBar.style == R_SB_NEXT)
1981 { 1980 {
1982 if (scrollbarnext_upButton (ev.y)) 1981 if (scrollbarnext_upButton (ev.y))
1983 upordown = -1; /* up */ 1982 upordown = -1; /* up */
… …
1989 if (scrollbarrxvt_upButton (ev.y)) 1988 if (scrollbarrxvt_upButton (ev.y))
1990 upordown = -1; /* up */ 1989 upordown = -1; /* up */
1991 else if (scrollbarrxvt_dnButton (ev.y)) 1990 else if (scrollbarrxvt_dnButton (ev.y))
1992 upordown = 1; /* down */ 1991 upordown = 1; /* down */
1993 } 1992 }
1993
1994 if (upordown) 1994 if (upordown)
1995 { 1995 {
1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1996#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1997 if (!cont_scroll_ev.is_active ())
1997 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1998 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1998#endif 1999#endif
1999 if (scr_page (upordown < 0 ? UP : DN, 1)) 2000 if (scr_page (upordown < 0 ? UP : DN, 1))
2000 { 2001 {
2001 if (upordown < 0) 2002 if (upordown < 0)
2002 scrollBar.setUp (); 2003 scrollBar.setUp ();
… …
2006 } 2007 }
2007 else 2008 else
2008 switch (ev.button) 2009 switch (ev.button)
2009 { 2010 {
2010 case Button2: 2011 case Button2:
2011 switch (scrollbar_align) 2012 switch (scrollBar.align)
2012 { 2013 {
2013 case R_SB_ALIGN_TOP: 2014 case R_SB_ALIGN_TOP:
2014 csrO = 0; 2015 csrO = 0;
2015 break; 2016 break;
2016 case R_SB_ALIGN_CENTRE: 2017 case R_SB_ALIGN_CENTRE:
… …
2028 2029
2029 scrollBar.setMotion (); 2030 scrollBar.setMotion ();
2030 break; 2031 break;
2031 2032
2032 case Button1: 2033 case Button1:
2033 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2034 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2034 csrO = ev.y - scrollBar.top; 2035 csrO = ev.y - scrollBar.top;
2035 /* FALLTHROUGH */ 2036 /* FALLTHROUGH */
2036 2037
2037 case Button3: 2038 case Button3:
2038 if (scrollBar.style != R_SB_XTERM) 2039 if (scrollBar.style != R_SB_XTERM)
… …
2082 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
2083 scrollbar_show (0); 2084 scrollbar_show (0);
2084 } 2085 }
2085 2086
2086#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
2087 if (sel_scroll_ev.active)
2088 sel_scroll_ev.stop(); 2088 sel_scroll_ev.stop();
2089#endif 2089#endif
2090 2090
2091 if (ev.window == vt) 2091 if (ev.window == vt)
2092 { 2092 {
2093 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2094 return;
2095
2093#if ISO_14755 2096#if ISO_14755
2094 // 5.4 2097 // 5.4
2095 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2098 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2096 return; 2099 return;
2097#endif 2100#endif
2101
2098 if (reportmode) 2102 if (reportmode)
2099 { 2103 {
2100 /* mouse report from vt window */ 2104 /* mouse report from vt window */
2101 /* don't report release of wheel "buttons" */ 2105 /* don't report release of wheel "buttons" */
2102 if (ev.button >= 4) 2106 if (ev.button >= 4)
… …
2113 mouse_report (ev); 2117 mouse_report (ev);
2114 } 2118 }
2115#else /* MOUSE_REPORT_DOUBLECLICK */ 2119#else /* MOUSE_REPORT_DOUBLECLICK */
2116 MEvent.button = AnyButton; 2120 MEvent.button = AnyButton;
2117 mouse_report (ev); 2121 mouse_report (ev);
2118#endif /* MOUSE_REPORT_DOUBLECLICK */ 2122#endif /* MOUSE_REPORT_DOUBLECLICK */
2119 return; 2123 return;
2120 } 2124 }
2121 2125
2122 /* 2126 /*
2123 * dumb hack to compensate for the failure of click-and-drag 2127 * dumb hack to compensate for the failure of click-and-drag
… …
2126 if (priv_modes & PrivMode_mouse_report 2130 if (priv_modes & PrivMode_mouse_report
2127 && bypass_keystate 2131 && bypass_keystate
2128 && ev.button == Button1 && MEvent.clicks <= 1) 2132 && ev.button == Button1 && MEvent.clicks <= 1)
2129 selection_extend (ev.x, ev.y, 0); 2133 selection_extend (ev.x, ev.y, 0);
2130 2134
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
2133
2134 switch (ev.button) 2135 switch (ev.button)
2135 { 2136 {
2136 case Button1: 2137 case Button1:
2137 case Button3: 2138 case Button3:
2138 selection_make (ev.time); 2139 selection_make (ev.time);
2139 break; 2140 break;
2140 2141
2141 case Button2: 2142 case Button2:
2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2144 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2144 break; 2145 break;
2145 2146
2146#ifdef MOUSE_WHEEL 2147#ifdef MOUSE_WHEEL
2147 case Button4: 2148 case Button4:
2148 case Button5: 2149 case Button5:
… …
2152 2153
2153 v = ev.button == Button4 ? UP : DN; 2154 v = ev.button == Button4 ? UP : DN;
2154 2155
2155 if (ev.state & ShiftMask) 2156 if (ev.state & ShiftMask)
2156 i = 1; 2157 i = 1;
2157 else if (OPTION (Opt_mouseWheelScrollPage)) 2158 else if (option (Opt_mouseWheelScrollPage))
2158 i = nrow - 1; 2159 i = nrow - 1;
2159 else 2160 else
2160 i = 5; 2161 i = 5;
2161 2162
2162# ifdef MOUSE_SLIP_WHEELING 2163# ifdef MOUSE_SLIP_WHEELING
… …
2164 { 2165 {
2165 mouse_slip_wheel_speed += v ? -1 : 1; 2166 mouse_slip_wheel_speed += v ? -1 : 1;
2166 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2167 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2168 2169
2169 if (slip_wheel_ev.at < NOW) 2170 if (!slip_wheel_ev.is_active ())
2170 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2171 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2171
2172 slip_wheel_ev.start ();
2173 } 2172 }
2174 else 2173 else
2175 { 2174 {
2176# endif 2175# endif
2177 scr_page (v, i); 2176 scr_page (v, i);
… …
2183 break; 2182 break;
2184#endif 2183#endif
2185 } 2184 }
2186 } 2185 }
2187} 2186}
2188
2189#ifdef TRANSPARENT
2190#if TINTING
2191/* taken from aterm-0.4.2 */
2192
2193typedef uint32_t RUINT32T;
2194
2195void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2196{
2197 int sh_r, sh_g, sh_b;
2198 RUINT32T mask_r, mask_g, mask_b;
2199 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2200 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2201 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2202 int i;
2203
2204 Visual *visual = display->visual;
2205
2206 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2207
2208 /* for convenience */
2209 mask_r = visual->red_mask;
2210 mask_g = visual->green_mask;
2211 mask_b = visual->blue_mask;
2212
2213 /* boring lookup table pre-initialization */
2214 switch (srcImage->bits_per_pixel) {
2215 case 15:
2216 if ((mask_r != 0x7c00) ||
2217 (mask_g != 0x03e0) ||
2218 (mask_b != 0x001f))
2219 return;
2220 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2221 lookup_r = lookup;
2222 lookup_g = lookup+32;
2223 lookup_b = lookup+32+32;
2224 sh_r = 10;
2225 sh_g = 5;
2226 sh_b = 0;
2227 break;
2228 case 16:
2229 if ((mask_r != 0xf800) ||
2230 (mask_g != 0x07e0) ||
2231 (mask_b != 0x001f))
2232 return;
2233 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2234 lookup_r = lookup;
2235 lookup_g = lookup+32;
2236 lookup_b = lookup+32+64;
2237 sh_r = 11;
2238 sh_g = 5;
2239 sh_b = 0;
2240 break;
2241 case 24:
2242 if ((mask_r != 0xff0000) ||
2243 (mask_g != 0x00ff00) ||
2244 (mask_b != 0x0000ff))
2245 return;
2246 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2247 lookup_r = lookup;
2248 lookup_g = lookup+256;
2249 lookup_b = lookup+256+256;
2250 sh_r = 16;
2251 sh_g = 8;
2252 sh_b = 0;
2253 break;
2254 case 32:
2255 if ((mask_r != 0xff0000) ||
2256 (mask_g != 0x00ff00) ||
2257 (mask_b != 0x0000ff))
2258 return;
2259 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2260 lookup_r = lookup;
2261 lookup_g = lookup+256;
2262 lookup_b = lookup+256+256;
2263 sh_r = 16;
2264 sh_g = 8;
2265 sh_b = 0;
2266 break;
2267 default:
2268 return; /* we do not support this color depth */
2269 }
2270
2271 /* prepare limits for color transformation (each channel is handled separately) */
2272 if (shade < 0) {
2273 shade = -shade;
2274 if (shade < 0) shade = 0;
2275 if (shade > 100) shade = 100;
2276
2277 lower_lim_r = 65535-rm;
2278 lower_lim_g = 65535-gm;
2279 lower_lim_b = 65535-bm;
2280
2281 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2282 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2283 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2284
2285 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2286 } else {
2287 if (shade < 0) shade = 0;
2288 if (shade > 100) shade = 100;
2289
2290 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2291
2292 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2293 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2294 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2295 }
2296
2297 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2298 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2299 {
2300 unsigned int tmp;
2301
2302 tmp = lower_lim_r;
2303 lower_lim_r = lower_lim_b;
2304 lower_lim_b = tmp;
2305
2306 tmp = upper_lim_r;
2307 upper_lim_r = upper_lim_b;
2308 upper_lim_b = tmp;
2309 }
2310
2311 /* fill our lookup tables */
2312 for (i = 0; i <= mask_r>>sh_r; i++)
2313 {
2314 RUINT32T tmp;
2315 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2316 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2317 lookup_r[i] = (tmp/65535)<<sh_r;
2318 }
2319 for (i = 0; i <= mask_g>>sh_g; i++)
2320 {
2321 RUINT32T tmp;
2322 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2323 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2324 lookup_g[i] = (tmp/65535)<<sh_g;
2325 }
2326 for (i = 0; i <= mask_b>>sh_b; i++)
2327 {
2328 RUINT32T tmp;
2329 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2330 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2331 lookup_b[i] = (tmp/65535)<<sh_b;
2332 }
2333
2334 /* apply table to input image (replacing colors by newly calculated ones) */
2335 switch (srcImage->bits_per_pixel)
2336 {
2337 case 15:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0x7c00)>>10] |
2349 lookup_g[(*p & 0x03e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 16:
2357 {
2358 unsigned short *p1, *pf, *p, *pl;
2359 p1 = (unsigned short *) srcImage->data;
2360 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width;
2365 for (; p < pl; p++)
2366 {
2367 *p = lookup_r[(*p & 0xf800)>>11] |
2368 lookup_g[(*p & 0x07e0)>> 5] |
2369 lookup_b[(*p & 0x001f)];
2370 }
2371 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 24:
2376 {
2377 unsigned char *p1, *pf, *p, *pl;
2378 p1 = (unsigned char *) srcImage->data;
2379 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380 while (p1 < pf)
2381 {
2382 p = p1;
2383 pl = p1 + srcImage->width * 3;
2384 for (; p < pl; p += 3)
2385 {
2386 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2387 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2388 p[2] = lookup_r[(p[2] & 0x0000ff)];
2389 }
2390 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2391 }
2392 break;
2393 }
2394 case 32:
2395 {
2396 RUINT32T *p1, *pf, *p, *pl;
2397 p1 = (RUINT32T *) srcImage->data;
2398 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399
2400 while (p1 < pf)
2401 {
2402 p = p1;
2403 pl = p1 + srcImage->width;
2404 for (; p < pl; p++)
2405 {
2406 *p = lookup_r[(*p & 0xff0000)>>16] |
2407 lookup_g[(*p & 0x00ff00)>> 8] |
2408 lookup_b[(*p & 0x0000ff)] |
2409 (*p & ~0xffffff);
2410 }
2411 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2412 }
2413 break;
2414 }
2415 }
2416
2417 free (lookup);
2418}
2419#endif
2420
2421/*
2422 * Check our parents are still who we think they are.
2423 * Do transparency updates if required
2424 */
2425int
2426rxvt_term::check_our_parents ()
2427{
2428 int i, pchanged, aformat, have_pixmap, rootdepth;
2429 unsigned long nitems, bytes_after;
2430 Atom atype;
2431 unsigned char *prop = NULL;
2432 Window root, oldp, *list;
2433 Pixmap rootpixmap = None;
2434 XWindowAttributes wattr, wrootattr;
2435 dDisp;
2436
2437 pchanged = 0;
2438
2439 if (!OPTION (Opt_transparent))
2440 return pchanged; /* Don't try any more */
2441
2442 XGetWindowAttributes (disp, display->root, &wrootattr);
2443 rootdepth = wrootattr.depth;
2444
2445 XGetWindowAttributes (disp, parent[0], &wattr);
2446
2447 if (rootdepth != wattr.depth)
2448 {
2449 if (am_transparent)
2450 {
2451 pchanged = 1;
2452 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2453 am_transparent = am_pixmap_trans = 0;
2454 }
2455
2456 return pchanged; /* Don't try any more */
2457 }
2458
2459 /* Get all X ops out of the queue so that our information is up-to-date. */
2460 XSync (disp, False);
2461
2462 /*
2463 * Make the frame window set by the window manager have
2464 * the root background. Some window managers put multiple nested frame
2465 * windows for each client, so we have to take care about that.
2466 */
2467 i = (xa[XA_XROOTPMAP_ID]
2468 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2469 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2470 &nitems, &bytes_after, &prop) == Success);
2471
2472 if (!i || prop == NULL)
2473 i = (xa[XA_ESETROOT_PMAP_ID]
2474 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2475 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2476 &nitems, &bytes_after, &prop) == Success);
2477
2478 if (!i || prop == NULL
2479#if TINTING
2480 || !rs[Rs_color + Color_tint]
2481#endif
2482 )
2483 have_pixmap = 0;
2484 else
2485 {
2486 have_pixmap = 1;
2487 rootpixmap = *(Pixmap *)prop;
2488 XFree (prop);
2489 }
2490
2491 if (have_pixmap)
2492 {
2493 /*
2494 * Copy display->root pixmap transparency
2495 */
2496 int sx, sy, nx, ny;
2497 unsigned int nw, nh;
2498 Window cr;
2499 XImage *image;
2500 GC gc;
2501 XGCValues gcvalue;
2502
2503 XTranslateCoordinates (disp, parent[0], display->root,
2504 0, 0, &sx, &sy, &cr);
2505 nw = (unsigned int)szHint.width;
2506 nh = (unsigned int)szHint.height;
2507 nx = ny = 0;
2508
2509 if (sx < 0)
2510 {
2511 nw += sx;
2512 nx = -sx;
2513 sx = 0;
2514 }
2515
2516 if (sy < 0)
2517 {
2518 nh += sy;
2519 ny = -sy;
2520 sy = 0;
2521 }
2522
2523 min_it (nw, (unsigned int) (wrootattr.width - sx));
2524 min_it (nh, (unsigned int) (wrootattr.height - sy));
2525
2526 XSync (disp, False);
2527 allowedxerror = -1;
2528 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2529
2530 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2531 /* XXX: may need a delay here? */
2532 allowedxerror = 0;
2533
2534 if (image == NULL)
2535 {
2536 if (am_transparent && am_pixmap_trans)
2537 {
2538 pchanged = 1;
2539 if (pixmap != None)
2540 {
2541 XFreePixmap (disp, pixmap);
2542 pixmap = None;
2543 }
2544 }
2545
2546 am_pixmap_trans = 0;
2547 }
2548 else
2549 {
2550 if (pixmap != None)
2551 XFreePixmap (disp, pixmap);
2552
2553#if TINTING
2554 if (ISSET_PIXCOLOR (Color_tint))
2555 {
2556 unsigned short rm, gm, bm;
2557 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2558
2559 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2560
2561 ShadeXImage (display, image, shade, rm, gm, bm);
2562 }
2563#endif
2564
2565 pixmap = XCreatePixmap (disp, vt,
2566 szHint.width, szHint.height, image->depth);
2567 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2568 XPutImage (disp, pixmap, gc, image, 0, 0,
2569 nx, ny, image->width, image->height);
2570 XFreeGC (disp, gc);
2571 XDestroyImage (image);
2572 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2573 XClearWindow (disp, parent[0]);
2574
2575 if (!am_transparent || !am_pixmap_trans)
2576 pchanged = 1;
2577
2578 am_transparent = am_pixmap_trans = 1;
2579 }
2580 }
2581
2582 if (am_pixmap_trans)
2583 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2584 else
2585 {
2586 unsigned int n;
2587 /*
2588 * InheritPixmap transparency
2589 */
2590 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2591 {
2592 oldp = parent[i];
2593 XQueryTree (disp, parent[i - 1], &root,
2594 &parent[i], &list, &n);
2595 XFree (list);
2596
2597 if (parent[i] == display->root)
2598 {
2599 if (oldp != None)
2600 pchanged = 1;
2601
2602 break;
2603 }
2604
2605 if (oldp != parent[i])
2606 pchanged = 1;
2607 }
2608
2609 n = 0;
2610
2611 if (pchanged)
2612 {
2613 for (; n < (unsigned int)i; n++)
2614 {
2615 XGetWindowAttributes (disp, parent[n], &wattr);
2616 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2617 {
2618 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2619 break;
2620 }
2621 }
2622 }
2623
2624 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2625 {
2626 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2627 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2628 am_transparent = 0;
2629 /* XXX: also turn off Opt_transparent? */
2630 }
2631 else
2632 {
2633#if WAIT_FOR_WM
2634 /* wait (an arbitrary period) for the WM to do its thing
2635 * needed for fvwm2.2.2 (and before?) */
2636 sleep (1);
2637#endif
2638 for (n = 0; n < (unsigned int)i; n++)
2639 {
2640 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2641 XClearWindow (disp, parent[n]);
2642 }
2643
2644 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2645 am_transparent = 1;
2646 }
2647
2648 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2649 parent[i] = None;
2650 }
2651
2652 if (scrollBar.win)
2653 {
2654 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2655 scrollBar.setIdle ();
2656 scrollbar_show (0);
2657 }
2658
2659 if (am_transparent)
2660 {
2661 want_refresh = want_full_refresh = 1;
2662 if (am_pixmap_trans)
2663 flush ();
2664 }
2665
2666 return pchanged;
2667}
2668#endif
2669 2187
2670/*}}} */ 2188/*}}} */
2671 2189
2672bool 2190bool
2673rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
… …
2722 if (ch == C0_LF) 2240 if (ch == C0_LF)
2723 nlines++; 2241 nlines++;
2724 2242
2725 refresh_count++; 2243 refresh_count++;
2726 2244
2727 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2728 || (refresh_count >= refresh_limit * (nrow - 1)))
2729 { 2246 {
2730 refreshnow = true;
2731 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2732 ch = NOCHAR; 2252 ch = NOCHAR;
2733 break; 2253 break;
2254 }
2734 } 2255 }
2735 2256
2736 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2737 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2738 { 2259 {
… …
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2767 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2768 2289
2769 /* 2290 /*
2770 * If there have been a lot of new lines, then update the screen 2291 * If there have been a lot of new lines, then update the screen
2771 * What the heck I'll cheat and only refresh less than every page-full. 2292 * What the heck we'll cheat and only refresh less than every page-full.
2772 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2773 * is incremented here because we must be doing flat-out scrolling.
2774 */ 2294 */
2775 if (refreshnow) 2295 if (refreshnow)
2776 { 2296 {
2777 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2778 refresh_limit++;
2779 else
2780 {
2781 flag = true; 2297 flag = true;
2782 scr_refresh (); 2298 scr_refresh ();
2783 want_refresh = 1; 2299 want_refresh = 1;
2784 }
2785 } 2300 }
2786 2301
2787 } 2302 }
2788 else 2303 else
2789 { 2304 {
… …
2938 { 2453 {
2939 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2940 break; /* done = 1 */ 2455 break; /* done = 1 */
2941 } 2456 }
2942 } 2457 }
2943 2458
2944 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2945 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2946 { 2461 {
2947 done = 1; 2462 done = 1;
2948 break; 2463 break;
… …
2950 } 2465 }
2951 } 2466 }
2952 2467
2953 pclose_printer (fd); 2468 pclose_printer (fd);
2954} 2469}
2955#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2956/*}}} */ 2471/*}}} */
2957 2472
2958/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2959enum { 2474enum {
2960 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
3010 process_dcs_seq (); 2525 process_dcs_seq ();
3011 break; 2526 break;
3012 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
3013 process_csi_seq (); 2528 process_csi_seq ();
3014 break; 2529 break;
3015 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
3016 process_osc_seq (); 2531 process_osc_seq ();
3017 break; 2532 break;
3018#endif 2533#endif
3019 } 2534 }
3020} 2535}
… …
3110 scr_charset_set (2, (unsigned int)cmd_getc ()); 2625 scr_charset_set (2, (unsigned int)cmd_getc ());
3111 break; 2626 break;
3112 case '+': 2627 case '+':
3113 scr_charset_set (3, (unsigned int)cmd_getc ()); 2628 scr_charset_set (3, (unsigned int)cmd_getc ());
3114 break; 2629 break;
3115#if ENABLE_FRILLS 2630#if !ENABLE_MINIMAL
3116 case '6': 2631 case '6':
3117 scr_backindex (); 2632 scr_backindex ();
3118 break; 2633 break;
3119#endif 2634#endif
3120 case '7': 2635 case '7':
3121 scr_cursor (SAVE); 2636 scr_cursor (SAVE);
3122 break; 2637 break;
3123 case '8': 2638 case '8':
3124 scr_cursor (RESTORE); 2639 scr_cursor (RESTORE);
3125 break; 2640 break;
3126#if ENABLE_FRILLS 2641#if !ENABLE_MINIMAL
3127 case '9': 2642 case '9':
3128 scr_forwardindex (); 2643 scr_forwardindex ();
3129 break; 2644 break;
3130#endif 2645#endif
3131 case '=': 2646 case '=':
… …
3246rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3247{ 2762{
3248 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3249 unsigned int nargs, p; 2764 unsigned int nargs, p;
3250 int n, ndef; 2765 int n, ndef;
3251 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3252 2767
3253 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3254 arg[--nargs] = 0;
3255 2769
3256 priv = 0; 2770 priv = 0;
3257 ch = cmd_getc (); 2771 ch = cmd_getc ();
3258 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3259 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3260 priv = ch; 2775 priv = ch;
3261 ch = cmd_getc (); 2776 ch = cmd_getc ();
3262 } 2777 }
3263 2778
3264 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3293 ndef = get_byte_array_bit (csi_defaults, i); 2808 ndef = get_byte_array_bit (csi_defaults, i);
3294 for (p = 0; p < nargs; p++) 2809 for (p = 0; p < nargs; p++)
3295 if (arg[p] == -1) 2810 if (arg[p] == -1)
3296 arg[p] = ndef; 2811 arg[p] = ndef;
3297 2812
3298#ifdef DEBUG_CMD
3299 fprintf (stderr, "CSI ");
3300 for (p = 0; p < nargs; p++)
3301 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3302 fprintf (stderr, "%c\n", ch);
3303#endif
3304
3305 /* 2813 /*
3306 * private mode handling 2814 * private mode handling
3307 */ 2815 */
3308 if (priv) 2816 if (priv)
3309 { 2817 {
3310 switch (priv) 2818 switch (priv)
3311 { 2819 {
3312 case '>': 2820 case '>':
3313 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3314 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2822 {
2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2825 //
2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2828 // versions.
2829 //
2830 tt_printf ("\033[>%d;95;0c", 'U');
2831 }
3315 break; 2832 break;
3316 case '?': 2833 case '?':
3317 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2834 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3318 process_terminal_mode (ch, priv, nargs, arg); 2835 process_terminal_mode (ch, priv, nargs, arg);
3319 break; 2836 break;
… …
3445 break; 2962 break;
3446 case 6: /* CPR requested */ 2963 case 6: /* CPR requested */
3447 scr_report_position (); 2964 scr_report_position ();
3448 break; 2965 break;
3449 case 7: /* unofficial extension */ 2966 case 7: /* unofficial extension */
3450 if (OPTION (Opt_insecure)) 2967 if (option (Opt_insecure))
3451 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2968 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3452 break; 2969 break;
3453 case 8: /* unofficial extension */ 2970 case 8: /* unofficial extension */
3454 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2971 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3455 break; 2972 break;
… …
3522 break; 3039 break;
3523 case CSI_75: 3040 case CSI_75:
3524 scr_cursor (RESTORE); 3041 scr_cursor (RESTORE);
3525 break; 3042 break;
3526 3043
3527#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3528 case CSI_74: 3045 case CSI_74:
3529 process_window_ops (arg, nargs); 3046 process_window_ops (arg, nargs);
3530 break; 3047 break;
3531#endif 3048#endif
3532 3049
… …
3539 break; 3056 break;
3540 } 3057 }
3541} 3058}
3542/*}}} */ 3059/*}}} */
3543 3060
3544#if ENABLE_FRILLS 3061#if !ENABLE_MINIMAL
3545/* ARGSUSED */ 3062/* ARGSUSED */
3546void 3063void
3547rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3064rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3548{ 3065{
3549 int x, y; 3066 int x, y;
3550 XWindowAttributes wattr; 3067 XWindowAttributes wattr;
3551 Window wdummy; 3068 Window wdummy;
3552 dDisp; 3069
3070 dLocal (Display *, dpy);
3553 3071
3554 if (nargs == 0) 3072 if (nargs == 0)
3555 return; 3073 return;
3556 3074
3557 switch (args[0]) 3075 switch (args[0])
3558 { 3076 {
3559 /* 3077 /*
3560 * commands 3078 * commands
3561 */ 3079 */
3562 case 1: /* deiconify window */ 3080 case 1: /* deiconify window */
3563 XMapWindow (disp, parent[0]); 3081 XMapWindow (dpy, parent[0]);
3564 break; 3082 break;
3565 case 2: /* iconify window */ 3083 case 2: /* iconify window */
3566 XIconifyWindow (disp, parent[0], display->screen); 3084 XIconifyWindow (dpy, parent[0], display->screen);
3567 break; 3085 break;
3568 case 3: /* set position (pixels) */ 3086 case 3: /* set position (pixels) */
3569 XMoveWindow (disp, parent[0], args[1], args[2]); 3087 XMoveWindow (dpy, parent[0], args[1], args[2]);
3570 break; 3088 break;
3571 case 4: /* set size (pixels) */ 3089 case 4: /* set size (pixels) */
3572 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3090 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3573 break; 3091 break;
3574 case 5: /* raise window */ 3092 case 5: /* raise window */
3575 XRaiseWindow (disp, parent[0]); 3093 XRaiseWindow (dpy, parent[0]);
3576 break; 3094 break;
3577 case 6: /* lower window */ 3095 case 6: /* lower window */
3578 XLowerWindow (disp, parent[0]); 3096 XLowerWindow (dpy, parent[0]);
3579 break; 3097 break;
3580 case 7: /* refresh window */ 3098 case 7: /* refresh window */
3581 scr_touch (true); 3099 scr_touch (true);
3582 break; 3100 break;
3583 case 8: /* set size (chars) */ 3101 case 8: /* set size (chars) */
… …
3590 if (args[0] >= 24) /* set height (chars) */ 3108 if (args[0] >= 24) /* set height (chars) */
3591 set_widthheight ((unsigned int)width, 3109 set_widthheight ((unsigned int)width,
3592 (unsigned int) (args[1] * fheight)); 3110 (unsigned int) (args[1] * fheight));
3593 break; 3111 break;
3594 3112
3595
3596 /* 3113 /*
3597 * reports - some output format copied from XTerm 3114 * reports - some output format copied from XTerm
3598 */ 3115 */
3599 case 11: /* report window state */ 3116 case 11: /* report window state */
3600 XGetWindowAttributes (disp, parent[0], &wattr); 3117 XGetWindowAttributes (dpy, parent[0], &wattr);
3601 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3118 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3602 break; 3119 break;
3603 case 13: /* report window position */ 3120 case 13: /* report window position */
3604 XGetWindowAttributes (disp, parent[0], &wattr); 3121 XGetWindowAttributes (dpy, parent[0], &wattr);
3605 XTranslateCoordinates (disp, parent[0], wattr.root, 3122 XTranslateCoordinates (dpy, parent[0], wattr.root,
3606 -wattr.border_width, -wattr.border_width, 3123 -wattr.border_width, -wattr.border_width,
3607 &x, &y, &wdummy); 3124 &x, &y, &wdummy);
3608 tt_printf ("\033[3;%d;%dt", x, y); 3125 tt_printf ("\033[3;%d;%dt", x, y);
3609 break; 3126 break;
3610 case 14: /* report window size (pixels) */ 3127 case 14: /* report window size (pixels) */
3611 XGetWindowAttributes (disp, parent[0], &wattr); 3128 XGetWindowAttributes (dpy, parent[0], &wattr);
3612 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3129 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3613 break; 3130 break;
3614 case 18: /* report text area size (chars) */ 3131 case 18: /* report text area size (chars) */
3615 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3132 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3616 break; 3133 break;
… …
3618 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3135 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3619 break; 3136 break;
3620 case 20: /* report icon label */ 3137 case 20: /* report icon label */
3621 { 3138 {
3622 char *s; 3139 char *s;
3623 XGetIconName (disp, parent[0], &s); 3140 XGetIconName (dpy, parent[0], &s);
3624 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3141 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3142 XFree (s);
3626 } 3143 }
3627 break; 3144 break;
3628 case 21: /* report window title */ 3145 case 21: /* report window title */
3629 { 3146 {
3630 char *s; 3147 char *s;
3631 XFetchName (disp, parent[0], &s); 3148 XFetchName (dpy, parent[0], &s);
3632 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3149 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3633 XFree (s); 3150 XFree (s);
3634 } 3151 }
3635 break; 3152 break;
3636 } 3153 }
3637} 3154}
… …
3664 seen_esc = true; 3181 seen_esc = true;
3665 continue; 3182 continue;
3666 } 3183 }
3667 else if (ch == C0_BEL || ch == CHAR_ST) 3184 else if (ch == C0_BEL || ch == CHAR_ST)
3668 break; 3185 break;
3186 else if (ch == C0_SYN)
3187 ch = cmd_get8 ();
3669 else if (ch < 0x20) 3188 else if (ch < 0x20)
3670 return NULL; /* other control character - exit */ 3189 return NULL; /* other control character - exit */
3671 3190
3672 seen_esc = false; 3191 seen_esc = false;
3673 3192
3674 if (n >= STRING_MAX - 1) 3193 if (n >= STRING_MAX - 1)
3675 // stop at some sane length 3194 // stop at some sane length
3676 return NULL; 3195 return NULL;
3677 3196
3678 if (ch == C0_SYN)
3679 string[n++] = cmd_get8 ();
3680 else
3681 string[n++] = ch; 3197 string[n++] = ch;
3682 } 3198 }
3683 3199
3684 string[n++] = '\0'; 3200 string[n++] = '\0';
3685 3201
3686 ends_how = (ch == 0x5c ? C0_ESC : ch); 3202 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3737void 3253void
3738rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3254rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3739{ 3255{
3740 if (str[0] == '?' && !str[1]) 3256 if (str[0] == '?' && !str[1])
3741 { 3257 {
3742 unsigned short r, g, b; 3258 rgba c;
3743 pix_colors_focused[color].get (display, r, g, b); 3259 pix_colors_focused[color].get (c);
3260
3261#if XFT
3262 if (c.a != rgba::MAX_CC)
3263 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3264 else
3265#endif
3744 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3266 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3745 } 3267 }
3746 else 3268 else
3747 set_window_color (color, str); 3269 set_window_color (color, str);
3748} 3270}
3749 3271
… …
3755{ 3277{
3756 int color; 3278 int color;
3757 char *buf, *name; 3279 char *buf, *name;
3758 bool query = str[0] == '?' && !str[1]; 3280 bool query = str[0] == '?' && !str[1];
3759 int saveop = op; 3281 int saveop = op;
3760 dDisp; 3282
3283 dLocal (Display *, dpy);
3761 3284
3762 assert (str != NULL); 3285 assert (str != NULL);
3286
3287 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3288 return;
3289
3763 switch (op) 3290 switch (op)
3764 { 3291 {
3765 case XTerm_name: 3292 case XTerm_name:
3766 set_title (str); 3293 set_title (str);
3767 /* FALLTHROUGH */ 3294 /* FALLTHROUGH */
… …
3781 unsigned long bytes_after; 3308 unsigned long bytes_after;
3782 unsigned char *value = 0; 3309 unsigned char *value = 0;
3783 const char *str = ""; 3310 const char *str = "";
3784 3311
3785 if (prop 3312 if (prop
3786 && XGetWindowProperty (disp, parent[0], 3313 && XGetWindowProperty (dpy, parent[0],
3787 prop, 0, 1<<16, 0, AnyPropertyType, 3314 prop, 0, 1<<16, 0, AnyPropertyType,
3788 &actual_type, &actual_format, 3315 &actual_type, &actual_format,
3789 &nitems, &bytes_after, &value) == Success 3316 &nitems, &bytes_after, &value) == Success
3790 && actual_type != None 3317 && actual_type != None
3791 && actual_format == 8) 3318 && actual_format == 8)
3792 str = (const char *)(value); 3319 str = (const char *)(value);
3793 3320
3794 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3321 tt_printf ("\033]%d;%s%c", op, str, resp);
3795 3322
3796 XFree (value); 3323 XFree (value);
3797 } 3324 }
3798 else 3325 else
3799 { 3326 {
… …
3803 { 3330 {
3804 *eq = 0; 3331 *eq = 0;
3805 set_utf8_property (display->atom (str), eq + 1); 3332 set_utf8_property (display->atom (str), eq + 1);
3806 } 3333 }
3807 else 3334 else
3808 XDeleteProperty (disp, parent[0], 3335 XDeleteProperty (dpy, parent[0],
3809 display->atom (str)); 3336 display->atom (str));
3810 } 3337 }
3811 break; 3338 break;
3812 3339
3813 case XTerm_Color: 3340 case XTerm_Color:
… …
3823 break; 3350 break;
3824 3351
3825 if ((buf = strchr (name, ';')) != NULL) 3352 if ((buf = strchr (name, ';')) != NULL)
3826 *buf++ = '\0'; 3353 *buf++ = '\0';
3827 3354
3828 if (name[0] == '?' && !name[1]) 3355 process_color_seq (op, color, name, resp);
3829 {
3830 unsigned short r, g, b;
3831 pix_colors_focused[color].get (display, r, g, b);
3832 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3833 }
3834 else
3835 set_window_color (color, name);
3836 } 3356 }
3837 break; 3357 break;
3838 case XTerm_Color00: 3358 case XTerm_Color00:
3839 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3359 process_color_seq (op, Color_fg, str, resp);
3840 break; 3360 break;
3841 case XTerm_Color01: 3361 case XTerm_Color01:
3842 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3362 process_color_seq (op, Color_bg, str, resp);
3843 break; 3363 break;
3844#ifndef NO_CURSORCOLOR 3364#ifndef NO_CURSORCOLOR
3845 case XTerm_Color_cursor: 3365 case XTerm_Color_cursor:
3846 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3366 process_color_seq (op, Color_cursor, str, resp);
3847 break; 3367 break;
3848#endif 3368#endif
3849 case XTerm_Color_pointer_fg: 3369 case XTerm_Color_pointer_fg:
3850 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3370 process_color_seq (op, Color_pointer_fg, str, resp);
3851 break; 3371 break;
3852 case XTerm_Color_pointer_bg: 3372 case XTerm_Color_pointer_bg:
3853 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3373 process_color_seq (op, Color_pointer_bg, str, resp);
3854 break; 3374 break;
3855#ifndef NO_BOLD_UNDERLINE_REVERSE 3375#ifndef NO_BOLD_UNDERLINE_REVERSE
3856 case XTerm_Color_RV: 3376 case XTerm_Color_RV:
3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3377 process_color_seq (op, Color_RV, str, resp);
3858 break; 3378 break;
3859 case Rxvt_Color_BD: 3379 case Rxvt_Color_BD:
3860 case URxvt_Color_BD: 3380 case URxvt_Color_BD:
3861 process_color_seq (op, Color_BD, str, resp); 3381 process_color_seq (op, Color_BD, str, resp);
3862 break; 3382 break;
3863 case Rxvt_Color_UL: 3383 case Rxvt_Color_UL:
3864 case URxvt_Color_UL: 3384 case URxvt_Color_UL:
3865 process_color_seq (op, Color_UL, str, resp); 3385 process_color_seq (op, Color_UL, str, resp);
3866 break; 3386 break;
3867 case URxvt_Color_IT: 3387 case URxvt_Color_IT:
3868 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3388 process_color_seq (op, Color_IT, str, resp);
3869 break; 3389 break;
3870#endif 3390#endif
3871#if TRANSPARENT && TINTING 3391#if ENABLE_TRANSPARENCY
3872 case URxvt_Color_tint: 3392 case URxvt_Color_tint:
3873 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3393 process_color_seq (op, Color_tint, str, resp);
3874 check_our_parents (); 3394 {
3875 if (am_transparent) 3395 bool changed = false;
3876 want_full_refresh = want_refresh = 1;
3877 break;
3878#endif
3879 3396
3397 if (ISSET_PIXCOLOR (Color_tint))
3398 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3399 else
3400 changed = bgPixmap.unset_tint ();
3401
3402 if (changed)
3403 update_background ();
3404 }
3405
3406 break;
3407#endif
3408
3409#if BG_IMAGE_FROM_FILE
3880 case Rxvt_Pixmap: 3410 case Rxvt_Pixmap:
3881 { 3411 if (!strcmp (str, "?"))
3882 if (*str != ';')
3883 { 3412 {
3884#if XPM_BACKGROUND 3413 char str[256];
3885 scale_pixmap (""); /* reset to default scaling */ 3414
3886 set_bgPixmap (str); /* change pixmap */ 3415 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3887 scr_touch (true); 3416 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3888#endif 3417 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3418 process_xterm_seq (XTerm_title, str, CHAR_ST);
3889 } 3419 }
3890 3420 else
3421 {
3891 int changed = 0; 3422 int changed = 0;
3892 3423
3893 while ((str = strchr (str, ';')) != NULL) 3424 if (*str != ';')
3894 { 3425 {
3426 /* reset to default scaling :*/
3427 bgPixmap.unset_geometry ();
3428 if (bgPixmap.set_file (str)) /* change pixmap */
3429 changed++;
3430 str = strchr (str, ';');
3431 if (str == NULL)
3432 bgPixmap.set_defaultGeometry ();
3433 }
3434
3435 while (str)
3436 {
3895 str++; 3437 str++;
3896#if XPM_BACKGROUND 3438 if (bgPixmap.set_geometry (str))
3897 changed += scale_pixmap (str); 3439 changed++;
3898#endif 3440 str = strchr (str, ';');
3899 } 3441 }
3900 3442
3901 if (changed) 3443 if (changed)
3902 { 3444 update_background ();
3903#ifdef XPM_BACKGROUND
3904 resize_pixmap ();
3905 scr_touch (true);
3906#endif
3907 } 3445 }
3908 }
3909 break; 3446 break;
3447#endif
3910 3448
3911 case Rxvt_restoreFG: 3449 case Rxvt_restoreFG:
3912 set_window_color (Color_fg, str); 3450 set_window_color (Color_fg, str);
3913 break; 3451 break;
3914 case Rxvt_restoreBG: 3452 case Rxvt_restoreBG:
… …
3939 case URxvt_italicFont: 3477 case URxvt_italicFont:
3940 case URxvt_boldItalicFont: 3478 case URxvt_boldItalicFont:
3941#endif 3479#endif
3942 if (query) 3480 if (query)
3943 tt_printf ("\33]%d;%-.250s%c", saveop, 3481 tt_printf ("\33]%d;%-.250s%c", saveop,
3944 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3482 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3945 ? fontset[op - URxvt_font]->fontdesc : "", 3483 ? fontset[op - URxvt_font]->fontdesc : "",
3946 resp); 3484 resp);
3947 else 3485 else
3948 { 3486 {
3949 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3487 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3952 allocated.push_back ((void *)res); 3490 allocated.push_back ((void *)res);
3953 set_fonts (); 3491 set_fonts ();
3954 } 3492 }
3955 break; 3493 break;
3956 3494
3957#if ENABLE_FRILLS 3495 case URxvt_version:
3496 if (query)
3497 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3498 op,
3499 rs[Rs_name], VERSION[0], VERSION[2],
3500 resp);
3501 break;
3502
3503#if !ENABLE_MINIMAL
3958 case URxvt_locale: 3504 case URxvt_locale:
3959 if (query) 3505 if (query)
3960 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3506 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3961 else 3507 else
3962 { 3508 {
3963 set_locale (str); 3509 set_locale (str);
3964 pty->set_utf8_mode (enc_utf8); 3510 pty->set_utf8_mode (enc_utf8);
3965 init_xlocale (); 3511 init_xlocale ();
… …
3980 break; 3526 break;
3981#endif 3527#endif
3982 3528
3983#if ENABLE_PERL 3529#if ENABLE_PERL
3984 case URxvt_perl: 3530 case URxvt_perl:
3985 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3531 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3986 ; // no responses yet 3532 ; // no responses yet
3987 break; 3533 break;
3988#endif 3534#endif
3989 } 3535 }
3990} 3536}
… …
4028{ 3574{
4029 unsigned int i, j; 3575 unsigned int i, j;
4030 int state; 3576 int state;
4031 3577
4032 static const struct 3578 static const struct
4033 { 3579 {
4034 const int argval; 3580 const int argval;
4035 const unsigned long bit; 3581 const unsigned long bit;
4036 }
4037
4038 argtopriv[] = { 3582 } argtopriv[] = {
4039 { 1, PrivMode_aplCUR }, 3583 { 1, PrivMode_aplCUR },
4040 { 2, PrivMode_vt52 }, 3584 { 2, PrivMode_vt52 },
4041 { 3, PrivMode_132 }, 3585 { 3, PrivMode_132 },
4042 { 4, PrivMode_smoothScroll }, 3586 { 4, PrivMode_smoothScroll },
4043 { 5, PrivMode_rVideo }, 3587 { 5, PrivMode_rVideo },
… …
4059 { 66, PrivMode_aplKP }, 3603 { 66, PrivMode_aplKP },
4060#ifndef NO_BACKSPACE_KEY 3604#ifndef NO_BACKSPACE_KEY
4061 { 67, PrivMode_BackSpace }, 3605 { 67, PrivMode_BackSpace },
4062#endif 3606#endif
4063 { 1000, PrivMode_MouseX11 }, 3607 { 1000, PrivMode_MouseX11 },
4064 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3608 { 1002, PrivMode_MouseBtnEvent },
4065 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3609 { 1003, PrivMode_MouseAnyEvent },
4066 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4067 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3610 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4068 { 1011, PrivMode_Keypress }, // rxvt extension 3611 { 1011, PrivMode_Keypress }, // rxvt extension
4069 // 1035 enable modifiers for alt, numlock NYI 3612 // 1035 enable modifiers for alt, numlock NYI
4070 // 1036 send ESC for meta keys NYI 3613 // 1036 send ESC for meta keys NYI
4071 // 1037 send DEL for keypad delete NYI 3614 // 1037 send DEL for keypad delete NYI
… …
4106 scr_touch (true); 3649 scr_touch (true);
4107 break; 3650 break;
4108#endif 3651#endif
4109 case 1048: /* alternative cursor save */ 3652 case 1048: /* alternative cursor save */
4110 case 1049: 3653 case 1049:
4111 if (OPTION (Opt_secondaryScreen)) 3654 if (option (Opt_secondaryScreen))
4112 if (mode == 0) 3655 if (mode == 0)
4113 scr_cursor (RESTORE); 3656 scr_cursor (RESTORE);
4114 else if (mode == 1) 3657 else if (mode == 1)
4115 scr_cursor (SAVE); 3658 scr_cursor (SAVE);
4116 break; 3659 break;
… …
4145 scr_autowrap (state); 3688 scr_autowrap (state);
4146 break; 3689 break;
4147 /* case 8: - auto repeat, can't do on a per window basis */ 3690 /* case 8: - auto repeat, can't do on a per window basis */
4148 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4149 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4150 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4151 break; 3694 break;
4152#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4153 case scrollBar_esc: 3696 case scrollBar_esc:
4154 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4155 { 3698 {
… …
4168 break; 3711 break;
4169 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4170 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4171 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4172 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4173 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4174 break; 3717 break;
4175#if 0
4176 case 1001: 3718 case 1002:
4177 break; /* X11 mouse highlighting */ 3719 case 1003:
4178#endif 3720 if (state)
3721 {
3722 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3723 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3724 vt_emask_mouse = PointerMotionMask;
3725 }
3726 else
3727 vt_emask_mouse = NoEventMask;
3728 vt_select_input ();
3729 break;
4179 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4180 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4181 break; 3732 break;
4182 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4183 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
4184 break; 3735 break;
4185 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4186 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4187 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4188 scr_erase_screen (2); 3739 scr_erase_screen (2);
4189 scr_change_screen (state); 3740 scr_change_screen (state);
4190 break; 3741 break;
4191 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4192 scr_change_screen (state); 3743 scr_change_screen (state);
4193 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4195 scr_erase_screen (2); 3746 scr_erase_screen (2);
4196 break; 3747 break;
4197 default: 3748 default:
4198 break; 3749 break;
… …
4326 scr_color (Color_bg, Color_bg); 3877 scr_color (Color_bg, Color_bg);
4327 break; 3878 break;
4328 3879
4329 //case 50: // not variable spacing 3880 //case 50: // not variable spacing
4330 3881
4331#if ENABLE_FRILLS 3882#if !ENABLE_MINIMAL
4332 case 90: 3883 case 90:
4333 case 91: /* set bright fg color */ 3884 case 91: /* set bright fg color */
4334 case 92: 3885 case 92:
4335 case 93: 3886 case 93:
4336 case 94: 3887 case 94:
… …
4360rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4361{ 3912{
4362 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4363 3914
4364 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4365 { /* query graphics */ 3917 /* query graphics */
4366 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4367 return; 3919 return;
4368 } 3920 }
4369 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4370 do 3922 do
… …
4420 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4421 3973
4422 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4423 v_buflen += len; 3975 v_buflen += len;
4424 3976
4425 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4426} 3978}
4427 3979
4428void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4429{ 3981{
4430 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3982 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4435 3987
4436 if (v_buflen == 0) 3988 if (v_buflen == 0)
4437 { 3989 {
4438 free (v_buffer); 3990 free (v_buffer);
4439 v_buffer = 0; 3991 v_buffer = 0;
4440 v_buflen = 0;
4441 3992
4442 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4443 return; 3994 return;
4444 } 3995 }
4445 3996
4446 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4447 } 3998 }
4448 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4449 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4450} 4001}
4451 4002
4452/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4453 4004

Diff Legend

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