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.280 by root, Mon Jan 23 23:33:58 2006 UTC vs.
Revision 1.381 by root, Fri Dec 14 05:25:23 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,
… …
227# if !UNICODE3 225# if !UNICODE3
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
1054void
1055rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1056{
1021 make_current (); 1057 make_current ();
1022 1058
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; 1059 refresh_count = 0;
1036 flush (); 1060 flush ();
1037} 1061}
1038 1062
1039#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1040void 1064void
1041rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1042{ 1066{
1043 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1044 want_refresh = 1; 1068 want_refresh = 1;
1045 1069 refresh_check ();
1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1047} 1070}
1048#endif 1071#endif
1049 1072
1050#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1051void 1074void
1052rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1053{ 1076{
1054 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1055 { 1078 {
1056 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1057 want_refresh = 1; 1080 want_refresh = 1;
1058 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1059 } 1082 }
1083 else
1084 w.stop ();
1060} 1085}
1061#endif 1086#endif
1062 1087
1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1064void 1089void
1065rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1066{ 1091{
1067 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollbar_isUp () || scrollbar_isDn ())
1068 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1069 { 1094 {
1070 want_refresh = 1; 1095 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1072 } 1097 }
1098 else
1099 w.stop ();
1073} 1100}
1074#endif 1101#endif
1075 1102
1076#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1077void 1104void
1078rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1079{ 1106{
1080 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1081 { 1108 {
1082 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1083 want_refresh = 1; 1110 want_refresh = 1;
1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1085 } 1112 }
1113 else
1114 w.stop ();
1086} 1115}
1087#endif 1116#endif
1088 1117
1089#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1090void 1119void
1091rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1092{ 1121{
1093 if (mouse_slip_wheel_speed == 0 1122 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 { 1123 {
1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1100 want_refresh = 1; 1124 want_refresh = 1;
1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1102 } 1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1132 }
1103} 1133}
1104#endif 1134#endif
1105 1135
1106#if HAVE_SCHED_YIELD 1136#if LINUX_YIELD_HACK
1107static struct event_handler 1137static struct event_handler
1108{ 1138{
1109 check_watcher cw_yield; 1139 ev::prepare yield_ev;
1110 1140
1111 void yield (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1112 { 1142 {
1113 sched_yield (); 1143 // this should really be sched_yield(), but the linux guys thought
1144 // that giving a process calling sched_yield () less cpu time than
1145 // ones with high nice levels is a useful thing to do. It surely is is
1146 // allowed by the sus... as is returning ENOSYS.
1147
1148 struct timespec ts = { 0, 0 };
1149 nanosleep (&ts, 0);
1150
1114 w.stop (); 1151 w.stop ();
1115 } 1152 }
1116 1153
1117 event_handler () 1154 event_handler ()
1118 : cw_yield (this, &event_handler::yield) 1155 : yield_ev (this, &event_handler::yield_cb)
1119 { 1156 {
1120 } 1157 }
1121} event_handler; 1158} event_handler;
1122#endif 1159#endif
1123 1160
… …
1143 cmdbuf_endp += r; 1180 cmdbuf_endp += r;
1144 return true; 1181 return true;
1145 } 1182 }
1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1183 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 { 1184 {
1148#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1149 if (display->is_local) 1186 if (display->is_local)
1150 event_handler.cw_yield.start (); 1187 event_handler.yield_ev.start ();
1151#endif 1188#endif
1152 } 1189 }
1153 else 1190 else
1154 { 1191 {
1155 pty_ev.stop (); 1192 pty_ev.stop ();
1156 1193
1157 if (!OPTION (Opt_hold)) 1194 if (!option (Opt_hold))
1158 destroy (); 1195 destroy ();
1159 } 1196 }
1160 1197
1161 return false; 1198 return false;
1162} 1199}
1163 1200
1164void 1201void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1166{ 1203{
1167 make_current (); 1204 make_current ();
1168 1205
1169 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1170 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1171 while (pty_fill ()) 1208 while (pty_fill ())
1172 if (cmd_parse ()) 1209 if (cmd_parse ())
1173 break; 1210 break;
1174 1211
1175 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1176 pty_write (); 1213 pty_write ();
1177} 1214}
1178 1215
1179void 1216void
1180rxvt_term::pointer_unblank () 1217rxvt_term::pointer_unblank ()
1181{ 1218{
1182 XDefineCursor (display->display, vt, TermWin_cursor); 1219 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1220 recolour_cursor ();
1184 1221
1185#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1223 hidden_pointer = 0;
1187 1224
1188 if (OPTION (Opt_pointerBlank)) 1225 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1226 pointer_ev.start (pointerBlankDelay);
1190#endif 1227#endif
1191} 1228}
1192 1229
1193#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1194void 1231void
1195rxvt_term::pointer_blank () 1232rxvt_term::pointer_blank ()
1196{ 1233{
1197 if (!OPTION (Opt_pointerBlank)) 1234 if (!option (Opt_pointerBlank))
1198 return; 1235 return;
1199 1236
1200 XDefineCursor (display->display, vt, display->blank_cursor); 1237 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (display->display); 1238 XFlush (dpy);
1202 1239
1203 hidden_pointer = 1; 1240 hidden_pointer = 1;
1204} 1241}
1205 1242
1206void 1243void
1207rxvt_term::pointer_cb (time_watcher &w) 1244rxvt_term::pointer_cb (ev::timer &w, int revents)
1208{ 1245{
1209 make_current (); 1246 make_current ();
1210 1247
1211 pointer_blank (); 1248 pointer_blank ();
1212} 1249}
… …
1215void 1252void
1216rxvt_term::mouse_report (XButtonEvent &ev) 1253rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1254{
1218 int button_number, key_state = 0; 1255 int button_number, key_state = 0;
1219 int x, y; 1256 int x, y;
1257 int code = 32;
1220 1258
1221 x = ev.x; 1259 x = Pixel2Col (ev.x);
1222 y = ev.y; 1260 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y); 1261 if (ev.type == MotionNotify)
1262 {
1263 if (x == mouse_row && y == mouse_col)
1264 return;
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1224 1269
1225 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1226 button_number = 3; 1271 button_number = 3;
1227 else 1272 else
1228 { 1273 {
… …
1274 x + 1, 1319 x + 1,
1275 y + 1); 1320 y + 1);
1276#endif 1321#endif
1277 1322
1278 tt_printf ("\033[M%c%c%c", 1323 tt_printf ("\033[M%c%c%c",
1279 (32 + button_number + key_state), 1324 (code + button_number + key_state),
1280 (32 + x + 1), 1325 (32 + x + 1),
1281 (32 + y + 1)); 1326 (32 + y + 1));
1282} 1327}
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 1328
1294/*{{{ process an X event */ 1329/*{{{ process an X event */
1295void 1330void
1296rxvt_term::x_cb (XEvent &ev) 1331rxvt_term::x_cb (XEvent &ev)
1297{ 1332{
1298 make_current (); 1333 make_current ();
1299 1334
1300 dDisp; 1335 dLocal (Display *, dpy);
1301 1336
1302 if (ev.xany.window == vt 1337 if (ev.xany.window == vt
1303 && SHOULD_INVOKE (HOOK_X_EVENT) 1338 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1339 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return; 1340 return;
… …
1310 unsigned int unused_mask; 1345 unsigned int unused_mask;
1311 1346
1312 switch (ev.type) 1347 switch (ev.type)
1313 { 1348 {
1314 case KeyPress: 1349 case KeyPress:
1315#if ISO_14755 1350 key_press (ev.xkey);
1316 if (!(iso14755buf & ISO_14755_52))
1317#endif
1318 lookup_key (ev.xkey);
1319
1320 break; 1351 break;
1321 1352
1322 case KeyRelease: 1353 case KeyRelease:
1323 { 1354 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; 1355 break;
1395 }
1396 1356
1397 case ButtonPress: 1357 case ButtonPress:
1398 button_press (ev.xbutton); 1358 button_press (ev.xbutton);
1399 break; 1359 break;
1400 1360
… …
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1375 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1416 destroy (); 1376 destroy ();
1417 } 1377 }
1418#if ENABLE_EWMH 1378#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1379 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1380 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1381 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1382 &ev);
1423#endif 1383#endif
1424 } 1384 }
1425 } 1385 }
… …
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1391 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out (); 1392 focus_out ();
1433 } 1393 }
1434#endif 1394#endif
1435 } 1395 }
1436 break;
1437
1438 case MappingNotify:
1439 XRefreshKeyboardMapping (&ev.xmapping);
1440 break; 1396 break;
1441 1397
1442 /* 1398 /*
1443 * XXX: this is not the _current_ arrangement 1399 * XXX: this is not the _current_ arrangement
1444 * Here's my conclusion: 1400 * Here's my conclusion:
… …
1463 break; 1419 break;
1464 } 1420 }
1465 break; 1421 break;
1466 1422
1467 case FocusIn: 1423 case FocusIn:
1424 if (ev.xfocus.detail != NotifyInferior
1425 && ev.xfocus.detail != NotifyPointer
1426 && ev.xfocus.mode != NotifyGrab)
1468 focus_in (); 1427 focus_in ();
1469 break; 1428 break;
1470 1429
1471 case FocusOut: 1430 case FocusOut:
1431 if (ev.xfocus.detail != NotifyInferior
1432 && ev.xfocus.detail != NotifyPointer
1433 && ev.xfocus.mode != NotifyGrab)
1472 focus_out (); 1434 focus_out ();
1473 break; 1435 break;
1474 1436
1475 case ConfigureNotify: 1437 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */
1476 if (ev.xconfigure.window == parent[0]) 1441 if (ev.xconfigure.window == parent[0])
1477 { 1442 {
1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ; 1444 ;
1480 1445
1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1446 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1482 { 1447 {
1483 seen_resize = 1; 1448 seen_resize = 1;
1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1449 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1485 } 1450 }
1486 1451 else
1452 {
1453#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ())
1455 update_background ();
1456#endif
1457 }
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1458 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 } 1459 }
1494 break; 1460 break;
1495 1461
1496 case PropertyNotify: 1462 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1515 break; 1481 break;
1516 1482
1517 case MapNotify: 1483 case MapNotify:
1518 mapped = 1; 1484 mapped = 1;
1519#ifdef TEXT_BLINK 1485#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1486 text_blink_ev.start ();
1521#endif 1487#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break; 1489 break;
1524 1490
1525 case UnmapNotify: 1491 case UnmapNotify:
… …
1527#ifdef TEXT_BLINK 1493#ifdef TEXT_BLINK
1528 text_blink_ev.stop (); 1494 text_blink_ev.stop ();
1529#endif 1495#endif
1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1531 break; 1497 break;
1532
1533#ifdef TRANSPARENT
1534 case ReparentNotify:
1535 rootwin_cb (ev);
1536 break;
1537#endif /* TRANSPARENT */
1538 1498
1539 case GraphicsExpose: 1499 case GraphicsExpose:
1540 case Expose: 1500 case Expose:
1541 if (ev.xany.window == vt) 1501 if (ev.xany.window == vt)
1542 { 1502 {
1543 do 1503 do
1504 {
1544 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1545 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1507 }
1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1508 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1547 1509
1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1549 1511
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 {
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1553 1517
1554 want_refresh = 1; 1518 want_refresh = 1;
1555 } 1519 }
1556 else 1520 else
1557 { 1521 {
1558 XEvent unused_event; 1522 XEvent unused_event;
1559 1523
1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1524 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1561 ; 1525 ;
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1527 ;
1564 1528
1565 if (isScrollbarWindow (ev.xany.window)) 1529 if (isScrollbarWindow (ev.xany.window))
1566 { 1530 {
1567 scrollBar.setIdle (); 1531 scrollBar.setIdle ();
1568 scrollbar_show (0); 1532 scrollbar_show (0);
1569 } 1533 }
1570
1571#ifdef TRANSPARENT
1572 if (am_transparent && ev.xany.window == parent[0])
1573 XClearWindow (disp, ev.xany.window);
1574#endif
1575 } 1534 }
1576 break; 1535 break;
1577 1536
1578 case MotionNotify: 1537 case MotionNotify:
1579#ifdef POINTER_BLANK 1538#ifdef POINTER_BLANK
1580 if (hidden_pointer) 1539 if (hidden_pointer)
1581 pointer_unblank (); 1540 pointer_unblank ();
1582#endif 1541#endif
1542 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1543 || priv_modes & PrivMode_MouseAnyEvent)
1544 mouse_report (ev.xbutton);
1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1584 break; 1546 break;
1585 1547
1586 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1587 { 1549 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1550 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1551 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop 1552 ; // nop
1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1553 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1592 { 1554 {
1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1555 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1594 ; 1556 ;
1595 1557
1596 XQueryPointer (disp, vt, 1558 XQueryPointer (dpy, vt,
1597 &unused_root, &unused_child, 1559 &unused_root, &unused_child,
1598 &unused_root_x, &unused_root_y, 1560 &unused_root_x, &unused_root_y,
1599 &ev.xbutton.x, &ev.xbutton.y, 1561 &ev.xbutton.x, &ev.xbutton.y,
1600 &ev.xbutton.state); 1562 &ev.xbutton.state);
1601#ifdef MOUSE_THRESHOLD 1563#ifdef MOUSE_THRESHOLD
… …
1621 int dist; 1583 int dist;
1622 1584
1623 /* don't clobber the current delay if we are 1585 /* don't clobber the current delay if we are
1624 * already in the middle of scrolling. 1586 * already in the middle of scrolling.
1625 */ 1587 */
1626 if (!sel_scroll_ev.active) 1588 if (!sel_scroll_ev.is_active ())
1627 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1589 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1628 1590
1629 /* save the event params so we can highlight 1591 /* save the event params so we can highlight
1630 * the selection in the pending-scroll loop 1592 * the selection in the pending-scroll loop
1631 */ 1593 */
1632 selection_save_x = ev.xbutton.x; 1594 selection_save_x = ev.xbutton.x;
… …
1654 else 1616 else
1655 { 1617 {
1656 /* we are within the text window, so we 1618 /* we are within the text window, so we
1657 * shouldn't be scrolling 1619 * shouldn't be scrolling
1658 */ 1620 */
1659 if (sel_scroll_ev.active)
1660 sel_scroll_ev.stop(); 1621 sel_scroll_ev.stop();
1661 } 1622 }
1662#endif 1623#endif
1663#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1664 } 1625 }
1665#endif 1626#endif
1666 } 1627 }
1667 } 1628 }
1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1669 { 1630 {
1670 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1672 ; 1633 ;
1673 1634
1674 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1639 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1680 scrollbar_size ()); 1641 scrollbar_size ());
1681 want_refresh = 1; 1642 want_refresh = 1;
1682 refresh_limit = 0;
1683 scrollbar_show (1); 1643 scrollbar_show (1);
1684 } 1644 }
1685 break; 1645 break;
1686 } 1646 }
1687 1647
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK) 1648#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1649 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1692 { 1650 {
1693 if (hidden_cursor) 1651 if (hidden_cursor)
1694 { 1652 {
1695 hidden_cursor = 0; 1653 hidden_cursor = 0;
1696 want_refresh = 1; 1654 want_refresh = 1;
1697 } 1655 }
1698 1656
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1657 cursor_blink_ev.again ();
1700 } 1658 }
1701#endif 1659#endif
1702 1660
1703#if defined(POINTER_BLANK) 1661#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1662 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 { 1663 {
1706 if (ev.type == MotionNotify 1664 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress 1665 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease) 1666 || ev.type == ButtonRelease)
1709 if (hidden_pointer) 1667 if (hidden_pointer)
… …
1711 1669
1712 if (ev.type == KeyPress && hidden_pointer == 0) 1670 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank (); 1671 pointer_blank ();
1714 } 1672 }
1715#endif 1673#endif
1674
1675 refresh_check ();
1716} 1676}
1717 1677
1718void 1678void
1719rxvt_term::focus_in () 1679rxvt_term::focus_in ()
1720{ 1680{
1721 if (!focus) 1681 if (!focus)
1722 { 1682 {
1723 focus = 1; 1683 focus = 1;
1724 want_refresh = 1; 1684 want_refresh = 1;
1725 1685
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1686 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1727 1687
1728#if USE_XIM 1688#if USE_XIM
1729 if (Input_Context != NULL) 1689 if (Input_Context != NULL)
1730 { 1690 {
1731 IMSetStatusPosition (); 1691 IMSetPosition ();
1732 XSetICFocus (Input_Context); 1692 XSetICFocus (Input_Context);
1733 } 1693 }
1734#endif 1694#endif
1735#if CURSOR_BLINK 1695#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink)) 1696 if (option (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1697 cursor_blink_ev.again ();
1738#endif 1698#endif
1739#if OFF_FOCUS_FADING 1699#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade]) 1700 if (rs[Rs_fade])
1741 { 1701 {
1742 pix_colors = pix_colors_focused; 1702 pix_colors = pix_colors_focused;
1743 scr_recolour (); 1703 scr_recolour ();
1744 } 1704 }
1745#endif 1705#endif
1706#if ENABLE_FRILLS
1707 if (option (Opt_urgentOnBell))
1708 {
1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1710 {
1711 h->flags &= ~XUrgencyHint;
1712 XSetWMHints (dpy, parent[0], h);
1713 }
1714 }
1715#endif
1746 } 1716 }
1747} 1717}
1748 1718
1749void 1719void
1750rxvt_term::focus_out () 1720rxvt_term::focus_out ()
… …
1758 1728
1759#if ENABLE_FRILLS || ISO_14755 1729#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf) 1730 if (iso14755buf)
1761 { 1731 {
1762 iso14755buf = 0; 1732 iso14755buf = 0;
1763# if ENABLE_OVERLAY 1733# if ISO_14755
1764 scr_overlay_off (); 1734 scr_overlay_off ();
1765# endif 1735# endif
1766 } 1736 }
1767#endif 1737#endif
1768#if USE_XIM 1738#if USE_XIM
1769 if (Input_Context != NULL) 1739 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context); 1740 XUnsetICFocus (Input_Context);
1771#endif 1741#endif
1772#if CURSOR_BLINK 1742#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1774 cursor_blink_ev.stop (); 1744 cursor_blink_ev.stop ();
1745
1775 hidden_cursor = 0; 1746 hidden_cursor = 0;
1776#endif 1747#endif
1777#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1779 { 1750 {
… …
1782 } 1753 }
1783#endif 1754#endif
1784 } 1755 }
1785} 1756}
1786 1757
1787#if TRANSPARENT 1758void
1759rxvt_term::update_fade_color (unsigned int idx)
1760{
1761#if OFF_FOCUS_FADING
1762 if (rs[Rs_fade])
1763 {
1764 rgba c;
1765 pix_colors [Color_fade].get (c);
1766 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1767 }
1768#endif
1769}
1770
1771#if ENABLE_TRANSPARENCY || ENABLE_PERL
1788void 1772void
1789rxvt_term::rootwin_cb (XEvent &ev) 1773rxvt_term::rootwin_cb (XEvent &ev)
1790{ 1774{
1791 make_current (); 1775 make_current ();
1792 1776
1777 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1778 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1779 return;
1780
1781# if ENABLE_TRANSPARENCY
1793 switch (ev.type) 1782 switch (ev.type)
1794 { 1783 {
1795 case PropertyNotify: 1784 case PropertyNotify:
1796 /* 1785 /*
1797 * if user used some Esetroot compatible prog to set the root bg, 1786 * if user used some Esetroot compatible prog to set the root bg,
1798 * use the property to determine the pixmap. We use it later on. 1787 * use the property to determine the pixmap. We use it later on.
1799 */ 1788 */
1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1789 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1802 return; 1791 {
1803 1792 bgPixmap.set_root_pixmap ();
1804 /* FALLTHROUGH */ 1793 update_background ();
1805 case ReparentNotify: 1794 }
1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1807 want_refresh = want_full_refresh = 1;
1808 break; 1795 break;
1809 } 1796 }
1797# endif
1798
1799 refresh_check ();
1810} 1800}
1811#endif 1801#endif
1812 1802
1813void 1803void
1814rxvt_term::button_press (XButtonEvent &ev) 1804rxvt_term::button_press (XButtonEvent &ev)
… …
1869 mouse_report (ev); 1859 mouse_report (ev);
1870 } 1860 }
1871#else 1861#else
1872 MEvent.button = ev.button; 1862 MEvent.button = ev.button;
1873 mouse_report (ev); 1863 mouse_report (ev);
1874#endif /* MOUSE_REPORT_DOUBLECLICK */ 1864#endif /* MOUSE_REPORT_DOUBLECLICK */
1875 1865
1876 } 1866 }
1877 else 1867 else
1878 { 1868 {
1879 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
… …
1973 tt_printf ("\033[5~"); 1963 tt_printf ("\033[5~");
1974 break; 1964 break;
1975 } 1965 }
1976 } 1966 }
1977 else 1967 else
1978#endif /* NO_SCROLLBAR_REPORT */ 1968#endif /* NO_SCROLLBAR_REPORT */
1979 1969
1980 { 1970 {
1981 char upordown = 0; 1971 char upordown = 0;
1982 1972
1983 if (scrollBar.style == R_SB_NEXT) 1973 if (scrollBar.style == R_SB_NEXT)
1984 { 1974 {
1985 if (scrollbarnext_upButton (ev.y)) 1975 if (scrollbarnext_upButton (ev.y))
1986 upordown = -1; /* up */ 1976 upordown = -1; /* up */
… …
1992 if (scrollbarrxvt_upButton (ev.y)) 1982 if (scrollbarrxvt_upButton (ev.y))
1993 upordown = -1; /* up */ 1983 upordown = -1; /* up */
1994 else if (scrollbarrxvt_dnButton (ev.y)) 1984 else if (scrollbarrxvt_dnButton (ev.y))
1995 upordown = 1; /* down */ 1985 upordown = 1; /* down */
1996 } 1986 }
1987
1997 if (upordown) 1988 if (upordown)
1998 { 1989 {
1999#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ())
2000 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2001#endif 1993#endif
2002 if (scr_page (upordown < 0 ? UP : DN, 1)) 1994 if (scr_page (upordown < 0 ? UP : DN, 1))
2003 { 1995 {
2004 if (upordown < 0) 1996 if (upordown < 0)
2005 scrollBar.setUp (); 1997 scrollBar.setUp ();
… …
2085 scrollBar.setIdle (); 2077 scrollBar.setIdle ();
2086 scrollbar_show (0); 2078 scrollbar_show (0);
2087 } 2079 }
2088 2080
2089#ifdef SELECTION_SCROLLING 2081#ifdef SELECTION_SCROLLING
2090 if (sel_scroll_ev.active)
2091 sel_scroll_ev.stop(); 2082 sel_scroll_ev.stop();
2092#endif 2083#endif
2093 2084
2094 if (ev.window == vt) 2085 if (ev.window == vt)
2095 { 2086 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2087 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2120 mouse_report (ev); 2111 mouse_report (ev);
2121 } 2112 }
2122#else /* MOUSE_REPORT_DOUBLECLICK */ 2113#else /* MOUSE_REPORT_DOUBLECLICK */
2123 MEvent.button = AnyButton; 2114 MEvent.button = AnyButton;
2124 mouse_report (ev); 2115 mouse_report (ev);
2125#endif /* MOUSE_REPORT_DOUBLECLICK */ 2116#endif /* MOUSE_REPORT_DOUBLECLICK */
2126 return; 2117 return;
2127 } 2118 }
2128 2119
2129 /* 2120 /*
2130 * dumb hack to compensate for the failure of click-and-drag 2121 * dumb hack to compensate for the failure of click-and-drag
… …
2142 selection_make (ev.time); 2133 selection_make (ev.time);
2143 break; 2134 break;
2144 2135
2145 case Button2: 2136 case Button2:
2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2137 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary); 2138 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2148 break; 2139 break;
2149 2140
2150#ifdef MOUSE_WHEEL 2141#ifdef MOUSE_WHEEL
2151 case Button4: 2142 case Button4:
2152 case Button5: 2143 case Button5:
… …
2156 2147
2157 v = ev.button == Button4 ? UP : DN; 2148 v = ev.button == Button4 ? UP : DN;
2158 2149
2159 if (ev.state & ShiftMask) 2150 if (ev.state & ShiftMask)
2160 i = 1; 2151 i = 1;
2161 else if (OPTION (Opt_mouseWheelScrollPage)) 2152 else if (option (Opt_mouseWheelScrollPage))
2162 i = nrow - 1; 2153 i = nrow - 1;
2163 else 2154 else
2164 i = 5; 2155 i = 5;
2165 2156
2166# ifdef MOUSE_SLIP_WHEELING 2157# ifdef MOUSE_SLIP_WHEELING
… …
2168 { 2159 {
2169 mouse_slip_wheel_speed += v ? -1 : 1; 2160 mouse_slip_wheel_speed += v ? -1 : 1;
2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2161 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2162 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2172 2163
2173 if (slip_wheel_ev.at < NOW) 2164 if (!slip_wheel_ev.is_active ())
2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2175
2176 slip_wheel_ev.start ();
2177 } 2166 }
2178 else 2167 else
2179 { 2168 {
2180# endif 2169# endif
2181 scr_page (v, i); 2170 scr_page (v, i);
… …
2187 break; 2176 break;
2188#endif 2177#endif
2189 } 2178 }
2190 } 2179 }
2191} 2180}
2192
2193#ifdef TRANSPARENT
2194#if TINTING
2195/* taken from aterm-0.4.2 */
2196
2197typedef uint32_t RUINT32T;
2198
2199void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2200{
2201 int sh_r, sh_g, sh_b;
2202 RUINT32T mask_r, mask_g, mask_b;
2203 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2204 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2205 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2206 int i;
2207
2208 Visual *visual = display->visual;
2209
2210 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2211
2212 /* for convenience */
2213 mask_r = visual->red_mask;
2214 mask_g = visual->green_mask;
2215 mask_b = visual->blue_mask;
2216
2217 /* boring lookup table pre-initialization */
2218 switch (srcImage->bits_per_pixel) {
2219 case 15:
2220 if ((mask_r != 0x7c00) ||
2221 (mask_g != 0x03e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+32;
2228 sh_r = 10;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 16:
2233 if ((mask_r != 0xf800) ||
2234 (mask_g != 0x07e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+64;
2241 sh_r = 11;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 24:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 case 32:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 default:
2272 return; /* we do not support this color depth */
2273 }
2274
2275 /* prepare limits for color transformation (each channel is handled separately) */
2276 if (shade < 0) {
2277 shade = -shade;
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = 65535-rm;
2282 lower_lim_g = 65535-gm;
2283 lower_lim_b = 65535-bm;
2284
2285 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2286 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2287 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2288
2289 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2290 } else {
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2295
2296 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2297 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2298 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2299 }
2300
2301 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2302 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2303 {
2304 unsigned int tmp;
2305
2306 tmp = lower_lim_r;
2307 lower_lim_r = lower_lim_b;
2308 lower_lim_b = tmp;
2309
2310 tmp = upper_lim_r;
2311 upper_lim_r = upper_lim_b;
2312 upper_lim_b = tmp;
2313 }
2314
2315 /* fill our lookup tables */
2316 for (i = 0; i <= mask_r>>sh_r; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2320 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2321 lookup_r[i] = (tmp/65535)<<sh_r;
2322 }
2323 for (i = 0; i <= mask_g>>sh_g; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2327 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2328 lookup_g[i] = (tmp/65535)<<sh_g;
2329 }
2330 for (i = 0; i <= mask_b>>sh_b; i++)
2331 {
2332 RUINT32T tmp;
2333 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2334 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2335 lookup_b[i] = (tmp/65535)<<sh_b;
2336 }
2337
2338 /* apply table to input image (replacing colors by newly calculated ones) */
2339 switch (srcImage->bits_per_pixel)
2340 {
2341 case 15:
2342 {
2343 unsigned short *p1, *pf, *p, *pl;
2344 p1 = (unsigned short *) srcImage->data;
2345 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2346 while (p1 < pf)
2347 {
2348 p = p1;
2349 pl = p1 + srcImage->width;
2350 for (; p < pl; p++)
2351 {
2352 *p = lookup_r[(*p & 0x7c00)>>10] |
2353 lookup_g[(*p & 0x03e0)>> 5] |
2354 lookup_b[(*p & 0x001f)];
2355 }
2356 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2357 }
2358 break;
2359 }
2360 case 16:
2361 {
2362 unsigned short *p1, *pf, *p, *pl;
2363 p1 = (unsigned short *) srcImage->data;
2364 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xf800)>>11] |
2372 lookup_g[(*p & 0x07e0)>> 5] |
2373 lookup_b[(*p & 0x001f)];
2374 }
2375 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2376 }
2377 break;
2378 }
2379 case 24:
2380 {
2381 unsigned char *p1, *pf, *p, *pl;
2382 p1 = (unsigned char *) srcImage->data;
2383 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2384 while (p1 < pf)
2385 {
2386 p = p1;
2387 pl = p1 + srcImage->width * 3;
2388 for (; p < pl; p += 3)
2389 {
2390 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2391 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2392 p[2] = lookup_r[(p[2] & 0x0000ff)];
2393 }
2394 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 case 32:
2399 {
2400 RUINT32T *p1, *pf, *p, *pl;
2401 p1 = (RUINT32T *) srcImage->data;
2402 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2403
2404 while (p1 < pf)
2405 {
2406 p = p1;
2407 pl = p1 + srcImage->width;
2408 for (; p < pl; p++)
2409 {
2410 *p = lookup_r[(*p & 0xff0000)>>16] |
2411 lookup_g[(*p & 0x00ff00)>> 8] |
2412 lookup_b[(*p & 0x0000ff)] |
2413 (*p & ~0xffffff);
2414 }
2415 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 }
2420
2421 free (lookup);
2422}
2423#endif
2424
2425/*
2426 * Check our parents are still who we think they are.
2427 * Do transparency updates if required
2428 */
2429int
2430rxvt_term::check_our_parents ()
2431{
2432 int i, pchanged, aformat, have_pixmap, rootdepth;
2433 unsigned long nitems, bytes_after;
2434 Atom atype;
2435 unsigned char *prop = NULL;
2436 Window root, oldp, *list;
2437 Pixmap rootpixmap = None;
2438 XWindowAttributes wattr, wrootattr;
2439 dDisp;
2440
2441 pchanged = 0;
2442
2443 if (!OPTION (Opt_transparent))
2444 return pchanged; /* Don't try any more */
2445
2446 XGetWindowAttributes (disp, display->root, &wrootattr);
2447 rootdepth = wrootattr.depth;
2448
2449 XGetWindowAttributes (disp, parent[0], &wattr);
2450
2451 if (rootdepth != wattr.depth)
2452 {
2453 if (am_transparent)
2454 {
2455 pchanged = 1;
2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2457 am_transparent = am_pixmap_trans = 0;
2458 }
2459
2460 return pchanged; /* Don't try any more */
2461 }
2462
2463 /* Get all X ops out of the queue so that our information is up-to-date. */
2464 XSync (disp, False);
2465
2466 /*
2467 * Make the frame window set by the window manager have
2468 * the root background. Some window managers put multiple nested frame
2469 * windows for each client, so we have to take care about that.
2470 */
2471 i = (xa[XA_XROOTPMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success);
2475
2476 if (!i || prop == NULL)
2477 i = (xa[XA_ESETROOT_PMAP_ID]
2478 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2479 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2480 &nitems, &bytes_after, &prop) == Success);
2481
2482 if (!i || prop == NULL
2483#if TINTING
2484 || !rs[Rs_color + Color_tint]
2485#endif
2486 )
2487 have_pixmap = 0;
2488 else
2489 {
2490 have_pixmap = 1;
2491 rootpixmap = *(Pixmap *)prop;
2492 XFree (prop);
2493 }
2494
2495 if (have_pixmap)
2496 {
2497 /*
2498 * Copy display->root pixmap transparency
2499 */
2500 int sx, sy, nx, ny;
2501 unsigned int nw, nh;
2502 Window cr;
2503 XImage *image;
2504 GC gc;
2505 XGCValues gcvalue;
2506
2507 XTranslateCoordinates (disp, parent[0], display->root,
2508 0, 0, &sx, &sy, &cr);
2509 nw = (unsigned int)szHint.width;
2510 nh = (unsigned int)szHint.height;
2511 nx = ny = 0;
2512
2513 if (sx < 0)
2514 {
2515 nw += sx;
2516 nx = -sx;
2517 sx = 0;
2518 }
2519
2520 if (sy < 0)
2521 {
2522 nh += sy;
2523 ny = -sy;
2524 sy = 0;
2525 }
2526
2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2529
2530 XSync (disp, False);
2531 allowedxerror = -1;
2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2533
2534 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2535 /* XXX: may need a delay here? */
2536 allowedxerror = 0;
2537
2538 if (image == NULL)
2539 {
2540 if (am_transparent && am_pixmap_trans)
2541 {
2542 pchanged = 1;
2543 if (pixmap != None)
2544 {
2545 XFreePixmap (disp, pixmap);
2546 pixmap = None;
2547 }
2548 }
2549
2550 am_pixmap_trans = 0;
2551 }
2552 else
2553 {
2554 if (pixmap != None)
2555 XFreePixmap (disp, pixmap);
2556
2557#if TINTING
2558 if (ISSET_PIXCOLOR (Color_tint))
2559 {
2560 unsigned short rm, gm, bm;
2561 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2562
2563 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2564
2565 ShadeXImage (display, image, shade, rm, gm, bm);
2566 }
2567#endif
2568
2569 pixmap = XCreatePixmap (disp, vt,
2570 szHint.width, szHint.height, image->depth);
2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2573 nx, ny, image->width, image->height);
2574 XFreeGC (disp, gc);
2575 XDestroyImage (image);
2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2577 XClearWindow (disp, parent[0]);
2578
2579 if (!am_transparent || !am_pixmap_trans)
2580 pchanged = 1;
2581
2582 am_transparent = am_pixmap_trans = 1;
2583 }
2584 }
2585
2586 if (am_pixmap_trans)
2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2588 else
2589 {
2590 unsigned int n;
2591 /*
2592 * InheritPixmap transparency
2593 */
2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2595 {
2596 oldp = parent[i];
2597 XQueryTree (disp, parent[i - 1], &root,
2598 &parent[i], &list, &n);
2599 XFree (list);
2600
2601 if (parent[i] == display->root)
2602 {
2603 if (oldp != None)
2604 pchanged = 1;
2605
2606 break;
2607 }
2608
2609 if (oldp != parent[i])
2610 pchanged = 1;
2611 }
2612
2613 n = 0;
2614
2615 if (pchanged)
2616 {
2617 for (; n < (unsigned int)i; n++)
2618 {
2619 XGetWindowAttributes (disp, parent[n], &wattr);
2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2621 {
2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2623 break;
2624 }
2625 }
2626 }
2627
2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2629 {
2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2632 am_transparent = 0;
2633 /* XXX: also turn off Opt_transparent? */
2634 }
2635 else
2636 {
2637 for (n = 0; n < (unsigned int)i; n++)
2638 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]);
2641 }
2642
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2644 am_transparent = 1;
2645 }
2646
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None;
2649 }
2650
2651 if (scrollBar.win)
2652 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle ();
2655 scrollbar_show (0);
2656 }
2657
2658 if (am_transparent)
2659 {
2660 want_refresh = want_full_refresh = 1;
2661 if (am_pixmap_trans)
2662 flush ();
2663 }
2664
2665 return pchanged;
2666}
2667#endif
2668 2181
2669/*}}} */ 2182/*}}} */
2670 2183
2671bool 2184bool
2672rxvt_term::cmd_parse () 2185rxvt_term::cmd_parse ()
… …
2721 if (ch == C0_LF) 2234 if (ch == C0_LF)
2722 nlines++; 2235 nlines++;
2723 2236
2724 refresh_count++; 2237 refresh_count++;
2725 2238
2726 if (!OPTION (Opt_jumpScroll) 2239 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2240 {
2729 refreshnow = true;
2730 refresh_count = 0; 2241 refresh_count = 0;
2242
2243 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2244 {
2245 refreshnow = true;
2731 ch = NOCHAR; 2246 ch = NOCHAR;
2732 break; 2247 break;
2248 }
2733 } 2249 }
2734 2250
2735 // scr_add_lines only works for nlines <= nrow - 1. 2251 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2252 if (nlines >= nrow - 1)
2737 { 2253 {
… …
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2766 scr_add_lines (buf, str - buf, nlines); 2282 scr_add_lines (buf, str - buf, nlines);
2767 2283
2768 /* 2284 /*
2769 * If there have been a lot of new lines, then update the screen 2285 * If there have been a lot of new lines, then update the screen
2770 * What the heck I'll cheat and only refresh less than every page-full. 2286 * What the heck we'll cheat and only refresh less than every page-full.
2771 * the number of pages between refreshes is refresh_limit, which 2287 * if skipScroll is enabled.
2772 * is incremented here because we must be doing flat-out scrolling.
2773 */ 2288 */
2774 if (refreshnow) 2289 if (refreshnow)
2775 { 2290 {
2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2777 refresh_limit++;
2778 else
2779 {
2780 flag = true; 2291 flag = true;
2781 scr_refresh (); 2292 scr_refresh ();
2782 want_refresh = 1; 2293 want_refresh = 1;
2783 }
2784 } 2294 }
2785 2295
2786 } 2296 }
2787 else 2297 else
2788 { 2298 {
… …
2798 } 2308 }
2799 2309
2800 ch = NOCHAR; 2310 ch = NOCHAR;
2801 } 2311 }
2802 } 2312 }
2313
2314 refresh_check ();
2803 2315
2804 return flag; 2316 return flag;
2805} 2317}
2806 2318
2807// read the next character 2319// read the next character
… …
2937 { 2449 {
2938 if ((buf[len++] = cmd_getc ()) == 'i') 2450 if ((buf[len++] = cmd_getc ()) == 'i')
2939 break; /* done = 1 */ 2451 break; /* done = 1 */
2940 } 2452 }
2941 } 2453 }
2942 2454
2943 for (i = 0; i < len; i++) 2455 for (i = 0; i < len; i++)
2944 if (putc (buf[i], fd) == EOF) 2456 if (putc (buf[i], fd) == EOF)
2945 { 2457 {
2946 done = 1; 2458 done = 1;
2947 break; 2459 break;
… …
2949 } 2461 }
2950 } 2462 }
2951 2463
2952 pclose_printer (fd); 2464 pclose_printer (fd);
2953} 2465}
2954#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2955/*}}} */ 2467/*}}} */
2956 2468
2957/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2958enum { 2470enum {
2959 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
3009 process_dcs_seq (); 2521 process_dcs_seq ();
3010 break; 2522 break;
3011 case 0x9b: /* CSI */ 2523 case 0x9b: /* CSI */
3012 process_csi_seq (); 2524 process_csi_seq ();
3013 break; 2525 break;
3014 case 0x9d: /* CSI */ 2526 case 0x9d: /* OSC */
3015 process_osc_seq (); 2527 process_osc_seq ();
3016 break; 2528 break;
3017#endif 2529#endif
3018 } 2530 }
3019} 2531}
… …
3109 scr_charset_set (2, (unsigned int)cmd_getc ()); 2621 scr_charset_set (2, (unsigned int)cmd_getc ());
3110 break; 2622 break;
3111 case '+': 2623 case '+':
3112 scr_charset_set (3, (unsigned int)cmd_getc ()); 2624 scr_charset_set (3, (unsigned int)cmd_getc ());
3113 break; 2625 break;
3114#if ENABLE_FRILLS 2626#if !ENABLE_MINIMAL
3115 case '6': 2627 case '6':
3116 scr_backindex (); 2628 scr_backindex ();
3117 break; 2629 break;
3118#endif 2630#endif
3119 case '7': 2631 case '7':
3120 scr_cursor (SAVE); 2632 scr_cursor (SAVE);
3121 break; 2633 break;
3122 case '8': 2634 case '8':
3123 scr_cursor (RESTORE); 2635 scr_cursor (RESTORE);
3124 break; 2636 break;
3125#if ENABLE_FRILLS 2637#if !ENABLE_MINIMAL
3126 case '9': 2638 case '9':
3127 scr_forwardindex (); 2639 scr_forwardindex ();
3128 break; 2640 break;
3129#endif 2641#endif
3130 case '=': 2642 case '=':
… …
3245rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
3246{ 2758{
3247 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
3248 unsigned int nargs, p; 2760 unsigned int nargs, p;
3249 int n, ndef; 2761 int n, ndef;
3250 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
3251 2763
3252 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
3253 arg[--nargs] = 0;
3254 2765
3255 priv = 0; 2766 priv = 0;
3256 ch = cmd_getc (); 2767 ch = cmd_getc ();
3257 if (ch >= '<' && ch <= '?') 2768 if (ch >= '<' && ch <= '?')
2769 {
3258 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' */
3259 priv = ch; 2771 priv = ch;
3260 ch = cmd_getc (); 2772 ch = cmd_getc ();
3261 } 2773 }
3262 2774
3263 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
3292 ndef = get_byte_array_bit (csi_defaults, i); 2804 ndef = get_byte_array_bit (csi_defaults, i);
3293 for (p = 0; p < nargs; p++) 2805 for (p = 0; p < nargs; p++)
3294 if (arg[p] == -1) 2806 if (arg[p] == -1)
3295 arg[p] = ndef; 2807 arg[p] = ndef;
3296 2808
3297#ifdef DEBUG_CMD
3298 fprintf (stderr, "CSI ");
3299 for (p = 0; p < nargs; p++)
3300 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3301 fprintf (stderr, "%c\n", ch);
3302#endif
3303
3304 /* 2809 /*
3305 * private mode handling 2810 * private mode handling
3306 */ 2811 */
3307 if (priv) 2812 if (priv)
3308 { 2813 {
3309 switch (priv) 2814 switch (priv)
3310 { 2815 {
3311 case '>': 2816 case '>':
3312 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
3313 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2818 {
2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2821 //
2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2824 // versions.
2825 //
2826 tt_printf ("\033[>%d;95;0c", 'U');
2827 }
3314 break; 2828 break;
3315 case '?': 2829 case '?':
3316 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3317 process_terminal_mode (ch, priv, nargs, arg); 2831 process_terminal_mode (ch, priv, nargs, arg);
3318 break; 2832 break;
… …
3444 break; 2958 break;
3445 case 6: /* CPR requested */ 2959 case 6: /* CPR requested */
3446 scr_report_position (); 2960 scr_report_position ();
3447 break; 2961 break;
3448 case 7: /* unofficial extension */ 2962 case 7: /* unofficial extension */
3449 if (OPTION (Opt_insecure)) 2963 if (option (Opt_insecure))
3450 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2964 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3451 break; 2965 break;
3452 case 8: /* unofficial extension */ 2966 case 8: /* unofficial extension */
3453 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2967 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3454 break; 2968 break;
… …
3521 break; 3035 break;
3522 case CSI_75: 3036 case CSI_75:
3523 scr_cursor (RESTORE); 3037 scr_cursor (RESTORE);
3524 break; 3038 break;
3525 3039
3526#if ENABLE_FRILLS 3040#if !ENABLE_MINIMAL
3527 case CSI_74: 3041 case CSI_74:
3528 process_window_ops (arg, nargs); 3042 process_window_ops (arg, nargs);
3529 break; 3043 break;
3530#endif 3044#endif
3531 3045
… …
3538 break; 3052 break;
3539 } 3053 }
3540} 3054}
3541/*}}} */ 3055/*}}} */
3542 3056
3543#if ENABLE_FRILLS 3057#if !ENABLE_MINIMAL
3544/* ARGSUSED */ 3058/* ARGSUSED */
3545void 3059void
3546rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3060rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3547{ 3061{
3548 int x, y; 3062 int x, y;
3549 XWindowAttributes wattr; 3063 XWindowAttributes wattr;
3550 Window wdummy; 3064 Window wdummy;
3551 dDisp; 3065
3066 dLocal (Display *, dpy);
3552 3067
3553 if (nargs == 0) 3068 if (nargs == 0)
3554 return; 3069 return;
3555 3070
3556 switch (args[0]) 3071 switch (args[0])
3557 { 3072 {
3558 /* 3073 /*
3559 * commands 3074 * commands
3560 */ 3075 */
3561 case 1: /* deiconify window */ 3076 case 1: /* deiconify window */
3562 XMapWindow (disp, parent[0]); 3077 XMapWindow (dpy, parent[0]);
3563 break; 3078 break;
3564 case 2: /* iconify window */ 3079 case 2: /* iconify window */
3565 XIconifyWindow (disp, parent[0], display->screen); 3080 XIconifyWindow (dpy, parent[0], display->screen);
3566 break; 3081 break;
3567 case 3: /* set position (pixels) */ 3082 case 3: /* set position (pixels) */
3568 XMoveWindow (disp, parent[0], args[1], args[2]); 3083 XMoveWindow (dpy, parent[0], args[1], args[2]);
3569 break; 3084 break;
3570 case 4: /* set size (pixels) */ 3085 case 4: /* set size (pixels) */
3571 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3086 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3572 break; 3087 break;
3573 case 5: /* raise window */ 3088 case 5: /* raise window */
3574 XRaiseWindow (disp, parent[0]); 3089 XRaiseWindow (dpy, parent[0]);
3575 break; 3090 break;
3576 case 6: /* lower window */ 3091 case 6: /* lower window */
3577 XLowerWindow (disp, parent[0]); 3092 XLowerWindow (dpy, parent[0]);
3578 break; 3093 break;
3579 case 7: /* refresh window */ 3094 case 7: /* refresh window */
3580 scr_touch (true); 3095 scr_touch (true);
3581 break; 3096 break;
3582 case 8: /* set size (chars) */ 3097 case 8: /* set size (chars) */
… …
3589 if (args[0] >= 24) /* set height (chars) */ 3104 if (args[0] >= 24) /* set height (chars) */
3590 set_widthheight ((unsigned int)width, 3105 set_widthheight ((unsigned int)width,
3591 (unsigned int) (args[1] * fheight)); 3106 (unsigned int) (args[1] * fheight));
3592 break; 3107 break;
3593 3108
3594
3595 /* 3109 /*
3596 * reports - some output format copied from XTerm 3110 * reports - some output format copied from XTerm
3597 */ 3111 */
3598 case 11: /* report window state */ 3112 case 11: /* report window state */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3113 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3114 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3601 break; 3115 break;
3602 case 13: /* report window position */ 3116 case 13: /* report window position */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3117 XGetWindowAttributes (dpy, parent[0], &wattr);
3604 XTranslateCoordinates (disp, parent[0], wattr.root, 3118 XTranslateCoordinates (dpy, parent[0], wattr.root,
3605 -wattr.border_width, -wattr.border_width, 3119 -wattr.border_width, -wattr.border_width,
3606 &x, &y, &wdummy); 3120 &x, &y, &wdummy);
3607 tt_printf ("\033[3;%d;%dt", x, y); 3121 tt_printf ("\033[3;%d;%dt", x, y);
3608 break; 3122 break;
3609 case 14: /* report window size (pixels) */ 3123 case 14: /* report window size (pixels) */
3610 XGetWindowAttributes (disp, parent[0], &wattr); 3124 XGetWindowAttributes (dpy, parent[0], &wattr);
3611 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3125 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3612 break; 3126 break;
3613 case 18: /* report text area size (chars) */ 3127 case 18: /* report text area size (chars) */
3614 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3128 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3615 break; 3129 break;
… …
3617 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3131 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3618 break; 3132 break;
3619 case 20: /* report icon label */ 3133 case 20: /* report icon label */
3620 { 3134 {
3621 char *s; 3135 char *s;
3622 XGetIconName (disp, parent[0], &s); 3136 XGetIconName (dpy, parent[0], &s);
3623 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3137 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3624 XFree (s); 3138 XFree (s);
3625 } 3139 }
3626 break; 3140 break;
3627 case 21: /* report window title */ 3141 case 21: /* report window title */
3628 { 3142 {
3629 char *s; 3143 char *s;
3630 XFetchName (disp, parent[0], &s); 3144 XFetchName (dpy, parent[0], &s);
3631 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3145 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3632 XFree (s); 3146 XFree (s);
3633 } 3147 }
3634 break; 3148 break;
3635 } 3149 }
3636} 3150}
… …
3663 seen_esc = true; 3177 seen_esc = true;
3664 continue; 3178 continue;
3665 } 3179 }
3666 else if (ch == C0_BEL || ch == CHAR_ST) 3180 else if (ch == C0_BEL || ch == CHAR_ST)
3667 break; 3181 break;
3182 else if (ch == C0_SYN)
3183 ch = cmd_get8 ();
3668 else if (ch < 0x20) 3184 else if (ch < 0x20)
3669 return NULL; /* other control character - exit */ 3185 return NULL; /* other control character - exit */
3670 3186
3671 seen_esc = false; 3187 seen_esc = false;
3672 3188
3673 if (n >= STRING_MAX - 1) 3189 if (n >= STRING_MAX - 1)
3674 // stop at some sane length 3190 // stop at some sane length
3675 return NULL; 3191 return NULL;
3676 3192
3677 if (ch == C0_SYN)
3678 string[n++] = cmd_get8 ();
3679 else
3680 string[n++] = ch; 3193 string[n++] = ch;
3681 } 3194 }
3682 3195
3683 string[n++] = '\0'; 3196 string[n++] = '\0';
3684 3197
3685 ends_how = (ch == 0x5c ? C0_ESC : ch); 3198 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3736void 3249void
3737rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3250rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3738{ 3251{
3739 if (str[0] == '?' && !str[1]) 3252 if (str[0] == '?' && !str[1])
3740 { 3253 {
3741 unsigned short r, g, b; 3254 rgba c;
3742 pix_colors_focused[color].get (display, r, g, b); 3255 pix_colors_focused[color].get (c);
3256
3257#if XFT
3258 if (c.a != rgba::MAX_CC)
3259 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3260 else
3261#endif
3743 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3262 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3744 } 3263 }
3745 else 3264 else
3746 set_window_color (color, str); 3265 set_window_color (color, str);
3747} 3266}
3748 3267
… …
3754{ 3273{
3755 int color; 3274 int color;
3756 char *buf, *name; 3275 char *buf, *name;
3757 bool query = str[0] == '?' && !str[1]; 3276 bool query = str[0] == '?' && !str[1];
3758 int saveop = op; 3277 int saveop = op;
3759 dDisp; 3278
3279 dLocal (Display *, dpy);
3760 3280
3761 assert (str != NULL); 3281 assert (str != NULL);
3282
3283 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3284 return;
3285
3762 switch (op) 3286 switch (op)
3763 { 3287 {
3764 case XTerm_name: 3288 case XTerm_name:
3765 set_title (str); 3289 set_title (str);
3766 /* FALLTHROUGH */ 3290 /* FALLTHROUGH */
… …
3780 unsigned long bytes_after; 3304 unsigned long bytes_after;
3781 unsigned char *value = 0; 3305 unsigned char *value = 0;
3782 const char *str = ""; 3306 const char *str = "";
3783 3307
3784 if (prop 3308 if (prop
3785 && XGetWindowProperty (disp, parent[0], 3309 && XGetWindowProperty (dpy, parent[0],
3786 prop, 0, 1<<16, 0, AnyPropertyType, 3310 prop, 0, 1<<16, 0, AnyPropertyType,
3787 &actual_type, &actual_format, 3311 &actual_type, &actual_format,
3788 &nitems, &bytes_after, &value) == Success 3312 &nitems, &bytes_after, &value) == Success
3789 && actual_type != None 3313 && actual_type != None
3790 && actual_format == 8) 3314 && actual_format == 8)
3791 str = (const char *)(value); 3315 str = (const char *)(value);
3792 3316
3793 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3317 tt_printf ("\033]%d;%s%c", op, str, resp);
3794 3318
3795 XFree (value); 3319 XFree (value);
3796 } 3320 }
3797 else 3321 else
3798 { 3322 {
… …
3802 { 3326 {
3803 *eq = 0; 3327 *eq = 0;
3804 set_utf8_property (display->atom (str), eq + 1); 3328 set_utf8_property (display->atom (str), eq + 1);
3805 } 3329 }
3806 else 3330 else
3807 XDeleteProperty (disp, parent[0], 3331 XDeleteProperty (dpy, parent[0],
3808 display->atom (str)); 3332 display->atom (str));
3809 } 3333 }
3810 break; 3334 break;
3811 3335
3812 case XTerm_Color: 3336 case XTerm_Color:
… …
3822 break; 3346 break;
3823 3347
3824 if ((buf = strchr (name, ';')) != NULL) 3348 if ((buf = strchr (name, ';')) != NULL)
3825 *buf++ = '\0'; 3349 *buf++ = '\0';
3826 3350
3827 if (name[0] == '?' && !name[1]) 3351 process_color_seq (op, color, name, resp);
3828 {
3829 unsigned short r, g, b;
3830 pix_colors_focused[color].get (display, r, g, b);
3831 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3832 }
3833 else
3834 set_window_color (color, name);
3835 } 3352 }
3836 break; 3353 break;
3837 case XTerm_Color00: 3354 case XTerm_Color00:
3838 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3355 process_color_seq (op, Color_fg, str, resp);
3839 break; 3356 break;
3840 case XTerm_Color01: 3357 case XTerm_Color01:
3841 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3358 process_color_seq (op, Color_bg, str, resp);
3842 break; 3359 break;
3843#ifndef NO_CURSORCOLOR 3360#ifndef NO_CURSORCOLOR
3844 case XTerm_Color_cursor: 3361 case XTerm_Color_cursor:
3845 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3362 process_color_seq (op, Color_cursor, str, resp);
3846 break; 3363 break;
3847#endif 3364#endif
3848 case XTerm_Color_pointer_fg: 3365 case XTerm_Color_pointer_fg:
3849 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3366 process_color_seq (op, Color_pointer_fg, str, resp);
3850 break; 3367 break;
3851 case XTerm_Color_pointer_bg: 3368 case XTerm_Color_pointer_bg:
3852 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3369 process_color_seq (op, Color_pointer_bg, str, resp);
3853 break; 3370 break;
3854#ifndef NO_BOLD_UNDERLINE_REVERSE 3371#ifndef NO_BOLD_UNDERLINE_REVERSE
3855 case XTerm_Color_RV: 3372 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3373 process_color_seq (op, Color_RV, str, resp);
3857 break; 3374 break;
3858 case Rxvt_Color_BD: 3375 case Rxvt_Color_BD:
3859 case URxvt_Color_BD: 3376 case URxvt_Color_BD:
3860 process_color_seq (op, Color_BD, str, resp); 3377 process_color_seq (op, Color_BD, str, resp);
3861 break; 3378 break;
3862 case Rxvt_Color_UL: 3379 case Rxvt_Color_UL:
3863 case URxvt_Color_UL: 3380 case URxvt_Color_UL:
3864 process_color_seq (op, Color_UL, str, resp); 3381 process_color_seq (op, Color_UL, str, resp);
3865 break; 3382 break;
3866 case URxvt_Color_IT: 3383 case URxvt_Color_IT:
3867 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3384 process_color_seq (op, Color_IT, str, resp);
3868 break; 3385 break;
3869#endif 3386#endif
3870#if TRANSPARENT && TINTING 3387#if ENABLE_TRANSPARENCY
3871 case URxvt_Color_tint: 3388 case URxvt_Color_tint:
3872 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3389 process_color_seq (op, Color_tint, str, resp);
3873 check_our_parents (); 3390 {
3874 if (am_transparent) 3391 bool changed = false;
3875 want_full_refresh = want_refresh = 1; 3392 if (ISSET_PIXCOLOR (Color_tint))
3876 break; 3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3877#endif 3394 else
3395 changed = bgPixmap.unset_tint ();
3396 if (changed)
3397 update_background ();
3398 }
3878 3399
3400 break;
3401#endif
3402
3403#if BG_IMAGE_FROM_FILE
3879 case Rxvt_Pixmap: 3404 case Rxvt_Pixmap:
3880 { 3405 if (!strcmp (str, "?"))
3881 if (*str != ';')
3882 { 3406 {
3883#if XPM_BACKGROUND 3407 char str[256];
3884 scale_pixmap (""); /* reset to default scaling */ 3408
3885 set_bgPixmap (str); /* change pixmap */ 3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3886 scr_touch (true); 3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3887#endif 3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3412 process_xterm_seq (XTerm_title, str, CHAR_ST);
3888 } 3413 }
3889 3414 else
3415 {
3890 int changed = 0; 3416 int changed = 0;
3891 3417
3892 while ((str = strchr (str, ';')) != NULL) 3418 if (*str != ';')
3893 { 3419 {
3420 /* reset to default scaling :*/
3421 bgPixmap.unset_geometry ();
3422 if (bgPixmap.set_file (str)) /* change pixmap */
3423 changed++;
3424 str = strchr (str, ';');
3425 if (str == NULL)
3426 bgPixmap.set_defaultGeometry ();
3427 }
3428 while (str)
3429 {
3894 str++; 3430 str++;
3895#if XPM_BACKGROUND 3431 if (bgPixmap.set_geometry (str))
3896 changed += scale_pixmap (str); 3432 changed++;
3897#endif 3433 str = strchr (str, ';');
3898 } 3434 }
3899
3900 if (changed) 3435 if (changed)
3901 { 3436 update_background ();
3902#ifdef XPM_BACKGROUND
3903 resize_pixmap ();
3904 scr_touch (true);
3905#endif
3906 } 3437 }
3907 }
3908 break; 3438 break;
3439#endif
3909 3440
3910 case Rxvt_restoreFG: 3441 case Rxvt_restoreFG:
3911 set_window_color (Color_fg, str); 3442 set_window_color (Color_fg, str);
3912 break; 3443 break;
3913 case Rxvt_restoreBG: 3444 case Rxvt_restoreBG:
… …
3938 case URxvt_italicFont: 3469 case URxvt_italicFont:
3939 case URxvt_boldItalicFont: 3470 case URxvt_boldItalicFont:
3940#endif 3471#endif
3941 if (query) 3472 if (query)
3942 tt_printf ("\33]%d;%-.250s%c", saveop, 3473 tt_printf ("\33]%d;%-.250s%c", saveop,
3943 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3474 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3944 ? fontset[op - URxvt_font]->fontdesc : "", 3475 ? fontset[op - URxvt_font]->fontdesc : "",
3945 resp); 3476 resp);
3946 else 3477 else
3947 { 3478 {
3948 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3479 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3951 allocated.push_back ((void *)res); 3482 allocated.push_back ((void *)res);
3952 set_fonts (); 3483 set_fonts ();
3953 } 3484 }
3954 break; 3485 break;
3955 3486
3956#if ENABLE_FRILLS 3487 case URxvt_version:
3488 if (query)
3489 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3490 op,
3491 rs[Rs_name], VERSION[0], VERSION[2],
3492 resp);
3493 break;
3494
3495#if !ENABLE_MINIMAL
3957 case URxvt_locale: 3496 case URxvt_locale:
3958 if (query) 3497 if (query)
3959 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3498 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3960 else 3499 else
3961 { 3500 {
3962 set_locale (str); 3501 set_locale (str);
3963 pty->set_utf8_mode (enc_utf8); 3502 pty->set_utf8_mode (enc_utf8);
3964 init_xlocale (); 3503 init_xlocale ();
… …
3979 break; 3518 break;
3980#endif 3519#endif
3981 3520
3982#if ENABLE_PERL 3521#if ENABLE_PERL
3983 case URxvt_perl: 3522 case URxvt_perl:
3984 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3523 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3985 ; // no responses yet 3524 ; // no responses yet
3986 break; 3525 break;
3987#endif 3526#endif
3988 } 3527 }
3989} 3528}
… …
4027{ 3566{
4028 unsigned int i, j; 3567 unsigned int i, j;
4029 int state; 3568 int state;
4030 3569
4031 static const struct 3570 static const struct
4032 { 3571 {
4033 const int argval; 3572 const int argval;
4034 const unsigned long bit; 3573 const unsigned long bit;
4035 }
4036
4037 argtopriv[] = { 3574 } argtopriv[] = {
4038 { 1, PrivMode_aplCUR }, 3575 { 1, PrivMode_aplCUR },
4039 { 2, PrivMode_vt52 }, 3576 { 2, PrivMode_vt52 },
4040 { 3, PrivMode_132 }, 3577 { 3, PrivMode_132 },
4041 { 4, PrivMode_smoothScroll }, 3578 { 4, PrivMode_smoothScroll },
4042 { 5, PrivMode_rVideo }, 3579 { 5, PrivMode_rVideo },
… …
4058 { 66, PrivMode_aplKP }, 3595 { 66, PrivMode_aplKP },
4059#ifndef NO_BACKSPACE_KEY 3596#ifndef NO_BACKSPACE_KEY
4060 { 67, PrivMode_BackSpace }, 3597 { 67, PrivMode_BackSpace },
4061#endif 3598#endif
4062 { 1000, PrivMode_MouseX11 }, 3599 { 1000, PrivMode_MouseX11 },
4063 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3600 { 1002, PrivMode_MouseBtnEvent },
4064 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3601 { 1003, PrivMode_MouseAnyEvent },
4065 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4066 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4067 { 1011, PrivMode_Keypress }, // rxvt extension 3603 { 1011, PrivMode_Keypress }, // rxvt extension
4068 // 1035 enable modifiers for alt, numlock NYI 3604 // 1035 enable modifiers for alt, numlock NYI
4069 // 1036 send ESC for meta keys NYI 3605 // 1036 send ESC for meta keys NYI
4070 // 1037 send DEL for keypad delete NYI 3606 // 1037 send DEL for keypad delete NYI
… …
4105 scr_touch (true); 3641 scr_touch (true);
4106 break; 3642 break;
4107#endif 3643#endif
4108 case 1048: /* alternative cursor save */ 3644 case 1048: /* alternative cursor save */
4109 case 1049: 3645 case 1049:
4110 if (OPTION (Opt_secondaryScreen)) 3646 if (option (Opt_secondaryScreen))
4111 if (mode == 0) 3647 if (mode == 0)
4112 scr_cursor (RESTORE); 3648 scr_cursor (RESTORE);
4113 else if (mode == 1) 3649 else if (mode == 1)
4114 scr_cursor (SAVE); 3650 scr_cursor (SAVE);
4115 break; 3651 break;
… …
4144 scr_autowrap (state); 3680 scr_autowrap (state);
4145 break; 3681 break;
4146 /* case 8: - auto repeat, can't do on a per window basis */ 3682 /* case 8: - auto repeat, can't do on a per window basis */
4147 case 9: /* X10 mouse reporting */ 3683 case 9: /* X10 mouse reporting */
4148 if (state) /* orthogonal */ 3684 if (state) /* orthogonal */
4149 priv_modes &= ~PrivMode_MouseX11; 3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4150 break; 3686 break;
4151#ifdef scrollBar_esc 3687#ifdef scrollBar_esc
4152 case scrollBar_esc: 3688 case scrollBar_esc:
4153 if (scrollbar_mapping (state)) 3689 if (scrollbar_mapping (state))
4154 { 3690 {
… …
4167 break; 3703 break;
4168 /* case 66: - application key pad */ 3704 /* case 66: - application key pad */
4169 /* case 67: - backspace key */ 3705 /* case 67: - backspace key */
4170 case 1000: /* X11 mouse reporting */ 3706 case 1000: /* X11 mouse reporting */
4171 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
4172 priv_modes &= ~PrivMode_MouseX10; 3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4173 break; 3709 break;
4174#if 0
4175 case 1001: 3710 case 1002:
4176 break; /* X11 mouse highlighting */ 3711 case 1003:
4177#endif 3712 if (state)
3713 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3716 vt_emask_mouse = PointerMotionMask;
3717 }
3718 else
3719 vt_emask_mouse = NoEventMask;
3720 vt_select_input ();
3721 break;
4178 case 1010: /* scroll to bottom on TTY output inhibit */ 3722 case 1010: /* scroll to bottom on TTY output inhibit */
4179 set_option (Opt_scrollTtyOutput, !state); 3723 set_option (Opt_scrollTtyOutput, !state);
4180 break; 3724 break;
4181 case 1011: /* scroll to bottom on key press */ 3725 case 1011: /* scroll to bottom on key press */
4182 set_option (Opt_scrollTtyKeypress, state); 3726 set_option (Opt_scrollTtyKeypress, state);
4183 break; 3727 break;
4184 case 1047: /* secondary screen w/ clearing last */ 3728 case 1047: /* secondary screen w/ clearing last */
4185 if (OPTION (Opt_secondaryScreen)) 3729 if (option (Opt_secondaryScreen))
4186 if (current_screen != PRIMARY) 3730 if (current_screen != PRIMARY)
4187 scr_erase_screen (2); 3731 scr_erase_screen (2);
4188 scr_change_screen (state); 3732 scr_change_screen (state);
4189 break; 3733 break;
4190 case 1049: /* secondary screen w/ clearing first */ 3734 case 1049: /* secondary screen w/ clearing first */
4191 scr_change_screen (state); 3735 scr_change_screen (state);
4192 if (OPTION (Opt_secondaryScreen)) 3736 if (option (Opt_secondaryScreen))
4193 if (current_screen != PRIMARY) 3737 if (current_screen != PRIMARY)
4194 scr_erase_screen (2); 3738 scr_erase_screen (2);
4195 break; 3739 break;
4196 default: 3740 default:
4197 break; 3741 break;
… …
4325 scr_color (Color_bg, Color_bg); 3869 scr_color (Color_bg, Color_bg);
4326 break; 3870 break;
4327 3871
4328 //case 50: // not variable spacing 3872 //case 50: // not variable spacing
4329 3873
4330#if ENABLE_FRILLS 3874#if !ENABLE_MINIMAL
4331 case 90: 3875 case 90:
4332 case 91: /* set bright fg color */ 3876 case 91: /* set bright fg color */
4333 case 92: 3877 case 92:
4334 case 93: 3878 case 93:
4335 case 94: 3879 case 94:
… …
4359rxvt_term::process_graphics () 3903rxvt_term::process_graphics ()
4360{ 3904{
4361 unicode_t ch, cmd = cmd_getc (); 3905 unicode_t ch, cmd = cmd_getc ();
4362 3906
4363 if (cmd == 'Q') 3907 if (cmd == 'Q')
3908 {
4364 { /* query graphics */ 3909 /* query graphics */
4365 tt_printf ("\033G0\012"); /* no graphics */ 3910 tt_printf ("\033G0\012"); /* no graphics */
4366 return; 3911 return;
4367 } 3912 }
4368 /* swallow other graphics sequences until terminating ':' */ 3913 /* swallow other graphics sequences until terminating ':' */
4369 do 3914 do
… …
4419 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4420 3965
4421 memcpy (v_buffer + v_buflen, data, len); 3966 memcpy (v_buffer + v_buflen, data, len);
4422 v_buflen += len; 3967 v_buflen += len;
4423 3968
4424 pty_ev.set (EVENT_READ | EVENT_WRITE); 3969 pty_ev.set (ev::READ | ev::WRITE);
4425} 3970}
4426 3971
4427void rxvt_term::pty_write () 3972void rxvt_term::pty_write ()
4428{ 3973{
4429 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3974 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4434 3979
4435 if (v_buflen == 0) 3980 if (v_buflen == 0)
4436 { 3981 {
4437 free (v_buffer); 3982 free (v_buffer);
4438 v_buffer = 0; 3983 v_buffer = 0;
4439 v_buflen = 0;
4440 3984
4441 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4442 return; 3986 return;
4443 } 3987 }
4444 3988
4445 memmove (v_buffer, v_buffer + written, v_buflen); 3989 memmove (v_buffer, v_buffer + written, v_buflen);
4446 } 3990 }
4447 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3991 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4448 pty_ev.set (EVENT_READ); 3992 pty_ev.set (ev::READ);
4449} 3993}
4450 3994
4451/*----------------------- end-of-file (C source) -----------------------*/ 3995/*----------------------- end-of-file (C source) -----------------------*/
4452 3996

Diff Legend

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