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.286 by root, Wed Jan 25 21:09:21 2006 UTC vs.
Revision 1.384 by ayin, Tue Dec 18 13:07:55 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
64 63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 67
… …
96 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
98 97
99 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 198 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 199 r & RS_Careful ? " careful" : "");
202 200
203 int width = wcswidth (fname, wcslen (fname)); 201 int width = wcswidth (fname, wcslen (fname));
204 202
205 max_it (width, 8+5); // for char + hey 203 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 204 max_it (width, strlen (attr));
207 205
208 if (y >= 0) 206 if (y >= 0)
209 { 207 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 208 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
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 int valid_keysym; 308 int valid_keysym;
305 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * 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
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
… …
490# if ISO_14755 499# if ISO_14755
491 iso14755_51 (0); 500 iso14755_51 (0);
492# endif 501# endif
493 return; 502 return;
494 } 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 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
499# if ISO_14755 516# if ISO_14755
… …
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
… …
530#endif 547#endif
531 548
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 550 {
534 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
535 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
536 switch (keysym) 584 switch (keysym)
537 { 585 {
538#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 587 case XK_BackSpace:
540 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
545 } 593 }
546 else 594 else
547 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 596 break;
549#endif 597#endif
550#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
561 case XK_Delete: 599 case XK_Delete:
562 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 601 break;
564#endif 602#endif
565 case XK_Tab: 603 case XK_Tab:
566 if (shft) 604 if (shft)
567 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
577#endif 615#endif
578 newlen = 0; 616 newlen = 0;
579 } 617 }
580 break; 618 break;
581 619
582#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 {
589 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break;
592 }
593 else
594 /* translate to std. cursor key */
595 keysym = XK_Left + (keysym - XK_KP_Left);
596 /* FALLTHROUGH */
597#endif
598 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
612 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
614 break; 636 break;
615 637
616#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior
618 case XK_KP_Prior:
619 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
621 {
622 strcpy (kbuf, "\033Oy");
623 break;
624 }
625 /* FALLTHROUGH */
626# endif
627 case XK_Prior: 639 case XK_Prior:
628 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
629 break; 641 break;
630# ifdef XK_KP_Next
631 case XK_KP_Next:
632 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
634 {
635 strcpy (kbuf, "\033Os");
636 break;
637 }
638 /* FALLTHROUGH */
639# endif
640 case XK_Next: 642 case XK_Next:
641 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
642 break; 644 break;
643#endif 645#endif
644 case XK_KP_Enter: 646 case XK_KP_Enter:
645 /* allow shift to override */ 647 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
647 { 649 {
648 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
649 break; 651 break;
650 } 652 }
651 653
… …
663 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
664 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
665 } 667 }
666 break; 668 break;
667 669
668#ifdef XK_KP_Begin
669 case XK_KP_Begin:
670 strcpy (kbuf, "\033Ou");
671 break;
672
673#endif
674 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 694 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
700 { 696 {
701 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 699 }
704 else 700 else
… …
710 706
711 case XK_Find: 707 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
713 break; 709 break;
714 710
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
725 case XK_Insert: 711 case XK_Insert:
726 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
727 break; 713 break;
728#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove: 715 case DXK_Remove:
… …
733 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
734 break; 720 break;
735 case XK_Select: 721 case XK_Select:
736 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
737 break; 723 break;
738#ifdef XK_KP_End
739 case XK_KP_End:
740 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
742 {
743 strcpy (kbuf, "\033Oq");
744 break;
745 }
746 /* FALLTHROUGH */
747#endif
748 case XK_End: 724 case XK_End:
749 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
750 break; 726 break;
751#ifdef XK_KP_Home
752 case XK_KP_Home:
753 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
755 {
756 strcpy (kbuf, "\033Ow");
757 break;
758 }
759 /* FALLTHROUGH */
760#endif
761 case XK_Home: 727 case XK_Home:
762 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
763 break; 729 break;
764 730
765#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
867 return; 833 return;
868 834
869 if (len <= 0) 835 if (len <= 0)
870 return; /* not mapped */ 836 return; /* not mapped */
871 837
872 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 839 if (view_start)
874 { 840 {
875 view_start = 0; 841 view_start = 0;
876 want_refresh = 1; 842 want_refresh = 1;
877 } 843 }
… …
901 tt_write (&ch, 1); 867 tt_write (&ch, 1);
902 } 868 }
903 869
904 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
905} 871}
906/*}}} */ 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}
907 949
908#if defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
909unsigned int 951unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 953{
… …
941void 983void
942rxvt_term::flush () 984rxvt_term::flush ()
943{ 985{
944 flush_ev.stop (); 986 flush_ev.stop ();
945 987
946#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
948 { 990 {
949 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 992 scr_touch (false);
952 } 993 }
953#endif 994#endif
954 995
955 if (want_refresh) 996 if (want_refresh)
… …
1000 } 1041 }
1001 1042
1002 display->flush (); 1043 display->flush ();
1003} 1044}
1004 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1005void 1047void
1006rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1049{
1050 if (want_refresh && !flush_ev.is_active ())
1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1052
1053 display->flush ();
1054}
1055
1056void
1057rxvt_term::flush_cb (ev::timer &w, int revents)
1007{ 1058{
1008 make_current (); 1059 make_current ();
1009 1060
1010 display->flush ();
1011
1012 if (want_refresh && !flush_ev.active)
1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1014}
1015
1016void
1017rxvt_term::flush_cb (time_watcher &w)
1018{
1019 make_current ();
1020
1021 refresh_limit = 1;
1022 refresh_count = 0; 1061 refresh_count = 0;
1023 flush (); 1062 flush ();
1024} 1063}
1025 1064
1026#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1027void 1066void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1068{
1030 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1070 want_refresh = 1;
1032 1071 refresh_check ();
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1072}
1035#endif 1073#endif
1036 1074
1037#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1038void 1076void
1039rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1078{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1080 {
1043 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1044 want_refresh = 1; 1082 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1046 } 1084 }
1085 else
1086 w.stop ();
1047} 1087}
1048#endif 1088#endif
1049 1089
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1091void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1093{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1056 { 1096 {
1057 want_refresh = 1; 1097 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1059 } 1099 }
1100 else
1101 w.stop ();
1060} 1102}
1061#endif 1103#endif
1062 1104
1063#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1064void 1106void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1108{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1110 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1112 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1072 } 1114 }
1115 else
1116 w.stop ();
1073} 1117}
1074#endif 1118#endif
1075 1119
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1121void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1123{
1080 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1082 : scr_page (UP, mouse_slip_wheel_speed))
1083 { 1125 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
1087 want_refresh = 1; 1126 want_refresh = 1;
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1089 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
1090} 1135}
1091#endif 1136#endif
1092 1137
1093#if HAVE_SCHED_YIELD 1138#if LINUX_YIELD_HACK
1094static struct event_handler 1139static struct event_handler
1095{ 1140{
1096 check_watcher cw_yield; 1141 ev::prepare yield_ev;
1097 1142
1098 void yield (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1099 { 1144 {
1100 sched_yield (); 1145 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS.
1149
1150 struct timespec ts = { 0, 0 };
1151 nanosleep (&ts, 0);
1152
1101 w.stop (); 1153 w.stop ();
1102 } 1154 }
1103 1155
1104 event_handler () 1156 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1157 : yield_ev (this, &event_handler::yield_cb)
1106 { 1158 {
1107 } 1159 }
1108} event_handler; 1160} event_handler;
1109#endif 1161#endif
1110 1162
… …
1130 cmdbuf_endp += r; 1182 cmdbuf_endp += r;
1131 return true; 1183 return true;
1132 } 1184 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1186 {
1135#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1136 if (display->is_local) 1188 if (display->is_local)
1137 event_handler.cw_yield.start (); 1189 event_handler.yield_ev.start ();
1138#endif 1190#endif
1139 } 1191 }
1140 else 1192 else
1141 { 1193 {
1142 pty_ev.stop (); 1194 pty_ev.stop ();
1143 1195
1144 if (!OPTION (Opt_hold)) 1196 if (!option (Opt_hold))
1145 destroy (); 1197 destroy ();
1146 } 1198 }
1147 1199
1148 return false; 1200 return false;
1149} 1201}
1150 1202
1151void 1203void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1205{
1154 make_current (); 1206 make_current ();
1155 1207
1156 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1210 while (pty_fill ())
1159 if (cmd_parse ()) 1211 if (cmd_parse ())
1160 break; 1212 break;
1161 1213
1162 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1163 pty_write (); 1215 pty_write ();
1216
1217 refresh_check ();
1164} 1218}
1165 1219
1166void 1220void
1167rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1168{ 1222{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1223 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1224 recolour_cursor ();
1171 1225
1172#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1227 hidden_pointer = 0;
1174 1228
1175 if (OPTION (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1177#endif 1231#endif
1178} 1232}
1179 1233
1180#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1181void 1235void
1182rxvt_term::pointer_blank () 1236rxvt_term::pointer_blank ()
1183{ 1237{
1184 if (!OPTION (Opt_pointerBlank)) 1238 if (!option (Opt_pointerBlank))
1185 return; 1239 return;
1186 1240
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1241 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1242 XFlush (dpy);
1189 1243
1190 hidden_pointer = 1; 1244 hidden_pointer = 1;
1191} 1245}
1192 1246
1193void 1247void
1194rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1249{
1196 make_current (); 1250 make_current ();
1197 1251
1198 pointer_blank (); 1252 pointer_blank ();
1199} 1253}
… …
1202void 1256void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1258{
1205 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1206 int x, y; 1260 int x, y;
1261 int code = 32;
1207 1262
1208 x = ev.x; 1263 x = Pixel2Col (ev.x);
1209 y = ev.y; 1264 y = Pixel2Row (ev.y);
1210 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1211 1273
1212 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1213 button_number = 3; 1275 button_number = 3;
1214 else 1276 else
1215 { 1277 {
… …
1261 x + 1, 1323 x + 1,
1262 y + 1); 1324 y + 1);
1263#endif 1325#endif
1264 1326
1265 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1267 (32 + x + 1), 1329 (32 + x + 1),
1268 (32 + y + 1)); 1330 (32 + y + 1));
1269} 1331}
1270 1332
1271/*{{{ process an X event */ 1333/*{{{ process an X event */
1272void 1334void
1273rxvt_term::x_cb (XEvent &ev) 1335rxvt_term::x_cb (XEvent &ev)
1274{ 1336{
1275 make_current (); 1337 make_current ();
1276 1338
1277 dLocal (Display *, xdisp); 1339 dLocal (Display *, dpy);
1278 1340
1279 if (ev.xany.window == vt 1341 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1342 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1343 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1344 return;
… …
1287 unsigned int unused_mask; 1349 unsigned int unused_mask;
1288 1350
1289 switch (ev.type) 1351 switch (ev.type)
1290 { 1352 {
1291 case KeyPress: 1353 case KeyPress:
1292#if ISO_14755 1354 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1355 break;
1298 1356
1299 case KeyRelease: 1357 case KeyRelease:
1300 { 1358 key_release (ev.xkey);
1301#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1302 KeySym keysym;
1303
1304 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1305#endif
1306
1307#if ENABLE_FRILLS || ISO_14755
1308 // ISO 14755 support
1309 if (iso14755buf)
1310 if (iso14755buf & ISO_14755_52)
1311 {
1312# if ENABLE_OVERLAY
1313 scr_overlay_off ();
1314# endif
1315# if ISO_14755
1316 // iso14755 part 5.2 handling: release time
1317 // first: controls
1318 if ((ev.xkey.state & ControlMask)
1319 && ((keysym >= 0x40 && keysym <= 0x5f)
1320 || (keysym >= 0x61 && keysym <= 0x7f)))
1321 {
1322 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1323 commit_iso14755 ();
1324 goto skip_switch;
1325 }
1326
1327 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1328 if (i[0] == keysym)
1329 {
1330 iso14755buf = ISO_14755_51 | i[1];
1331 commit_iso14755 ();
1332 goto skip_switch;
1333 }
1334
1335 scr_bell ();
1336# endif
1337 iso14755buf = 0;
1338 break;
1339 }
1340 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345 if (iso14755buf & ISO_14755_51)
1346 commit_iso14755 ();
1347#if ISO_14755
1348 else if (iso14755buf & ISO_14755_STARTED)
1349 {
1350 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1351
1352 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1353 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1354 }
1355# endif
1356 else
1357 iso14755buf = 0;
1358 }
1359#endif
1360
1361 if (ev.xany.window == vt
1362 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1363 break;
1364
1365#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1366 if (!(ev.xkey.state & ControlMask))
1367 slip_wheel_ev.stop ();
1368 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1369 mouse_slip_wheel_speed = 0;
1370#endif
1371 break; 1359 break;
1372 }
1373 1360
1374 case ButtonPress: 1361 case ButtonPress:
1375 button_press (ev.xbutton); 1362 button_press (ev.xbutton);
1376 break; 1363 break;
1377 1364
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1379 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1380 destroy ();
1394 } 1381 }
1395#if ENABLE_EWMH 1382#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1383 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1384 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1385 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1386 &ev);
1400#endif 1387#endif
1401 } 1388 }
1402 } 1389 }
… …
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1396 focus_out ();
1410 } 1397 }
1411#endif 1398#endif
1412 } 1399 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1400 break;
1418 1401
1419 /* 1402 /*
1420 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1440 break; 1423 break;
1441 } 1424 }
1442 break; 1425 break;
1443 1426
1444 case FocusIn: 1427 case FocusIn:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1431 focus_in ();
1446 break; 1432 break;
1447 1433
1448 case FocusOut: 1434 case FocusOut:
1435 if (ev.xfocus.detail != NotifyInferior
1436 && ev.xfocus.detail != NotifyPointer
1437 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1438 focus_out ();
1450 break; 1439 break;
1451 1440
1452 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1453 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1454 { 1446 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1448 ;
1457 1449
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1451 {
1460 seen_resize = 1; 1452 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 1454 }
1463 1455 else
1456 {
1457#ifdef HAVE_BG_PIXMAP
1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1460#endif
1461 }
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1465
1466#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1467 if (OPTION (Opt_transparent))
1468 check_our_parents ();
1469#endif
1470 } 1463 }
1471 break; 1464 break;
1472 1465
1473 case PropertyNotify: 1466 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1492 break; 1485 break;
1493 1486
1494 case MapNotify: 1487 case MapNotify:
1495 mapped = 1; 1488 mapped = 1;
1496#ifdef TEXT_BLINK 1489#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1490 text_blink_ev.start ();
1498#endif 1491#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break; 1493 break;
1501 1494
1502 case UnmapNotify: 1495 case UnmapNotify:
… …
1504#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1505 text_blink_ev.stop (); 1498 text_blink_ev.stop ();
1506#endif 1499#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1501 break;
1509
1510#ifdef TRANSPARENT
1511 case ReparentNotify:
1512 rootwin_cb (ev);
1513 break;
1514#endif /* TRANSPARENT */
1515 1502
1516 case GraphicsExpose: 1503 case GraphicsExpose:
1517 case Expose: 1504 case Expose:
1518 if (ev.xany.window == vt) 1505 if (ev.xany.window == vt)
1519 { 1506 {
1520 do 1507 do
1508 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1511 }
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1513
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1514 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1515
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1516 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1517 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1520 }
1530 1521
1531 want_refresh = 1; 1522 want_refresh = 1;
1532 } 1523 }
1533 else 1524 else
1534 { 1525 {
1535 XEvent unused_event; 1526 XEvent unused_event;
1536 1527
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1529 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1531 ;
1541 1532
1542 if (isScrollbarWindow (ev.xany.window)) 1533 if (isScrollbarWindow (ev.xany.window))
1543 { 1534 {
1544 scrollBar.setIdle (); 1535 scrollBar.setIdle ();
1545 scrollbar_show (0); 1536 scrollbar_show (0);
1546 } 1537 }
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window);
1551#endif
1552 } 1538 }
1553 break; 1539 break;
1554 1540
1555 case MotionNotify: 1541 case MotionNotify:
1556#ifdef POINTER_BLANK 1542#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1543 if (hidden_pointer)
1558 pointer_unblank (); 1544 pointer_unblank ();
1559#endif 1545#endif
1546 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1547 || priv_modes & PrivMode_MouseAnyEvent)
1548 mouse_report (ev.xbutton);
1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1549 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1561 break; 1550 break;
1562 1551
1563 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1564 { 1553 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1554 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1555 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1556 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1557 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1558 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1560 ;
1572 1561
1573 XQueryPointer (xdisp, vt, 1562 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1565 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1566 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
… …
1598 int dist; 1587 int dist;
1599 1588
1600 /* don't clobber the current delay if we are 1589 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1590 * already in the middle of scrolling.
1602 */ 1591 */
1603 if (!sel_scroll_ev.active) 1592 if (!sel_scroll_ev.is_active ())
1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1593 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1605 1594
1606 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1607 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1608 */ 1597 */
1609 selection_save_x = ev.xbutton.x; 1598 selection_save_x = ev.xbutton.x;
… …
1631 else 1620 else
1632 { 1621 {
1633 /* we are within the text window, so we 1622 /* we are within the text window, so we
1634 * shouldn't be scrolling 1623 * shouldn't be scrolling
1635 */ 1624 */
1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1638 } 1626 }
1639#endif 1627#endif
1640#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1641 } 1629 }
1642#endif 1630#endif
1643 } 1631 }
1644 } 1632 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1646 { 1634 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1635 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1636 MotionNotify, &ev))
1649 ; 1637 ;
1650 1638
1651 XQueryPointer (xdisp, scrollBar.win, 1639 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1642 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1643 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1645 scrollbar_size ());
1658 want_refresh = 1; 1646 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1647 scrollbar_show (1);
1661 } 1648 }
1662 break; 1649 break;
1663 } 1650 }
1664 1651
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1652#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1653 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1654 {
1670 if (hidden_cursor) 1655 if (hidden_cursor)
1671 { 1656 {
1672 hidden_cursor = 0; 1657 hidden_cursor = 0;
1673 want_refresh = 1; 1658 want_refresh = 1;
1674 } 1659 }
1675 1660
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1661 cursor_blink_ev.again ();
1677 } 1662 }
1678#endif 1663#endif
1679 1664
1680#if defined(POINTER_BLANK) 1665#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1666 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1667 {
1683 if (ev.type == MotionNotify 1668 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1669 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1670 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1671 if (hidden_pointer)
… …
1688 1673
1689 if (ev.type == KeyPress && hidden_pointer == 0) 1674 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank (); 1675 pointer_blank ();
1691 } 1676 }
1692#endif 1677#endif
1678
1679 refresh_check ();
1693} 1680}
1694 1681
1695void 1682void
1696rxvt_term::focus_in () 1683rxvt_term::focus_in ()
1697{ 1684{
1698 if (!focus) 1685 if (!focus)
1699 { 1686 {
1700 focus = 1; 1687 focus = 1;
1701 want_refresh = 1; 1688 want_refresh = 1;
1702 1689
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1690 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1691
1705#if USE_XIM 1692#if USE_XIM
1706 if (Input_Context != NULL) 1693 if (Input_Context != NULL)
1707 { 1694 {
1708 IMSetStatusPosition (); 1695 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1696 XSetICFocus (Input_Context);
1710 } 1697 }
1711#endif 1698#endif
1712#if CURSOR_BLINK 1699#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1700 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1701 cursor_blink_ev.again ();
1715#endif 1702#endif
1716#if OFF_FOCUS_FADING 1703#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1704 if (rs[Rs_fade])
1718 { 1705 {
1719 pix_colors = pix_colors_focused; 1706 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1707 scr_recolour ();
1721 } 1708 }
1722#endif 1709#endif
1710#if ENABLE_FRILLS
1711 if (option (Opt_urgentOnBell))
1712 {
1713 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1714 {
1715 h->flags &= ~XUrgencyHint;
1716 XSetWMHints (dpy, parent[0], h);
1717 }
1718 }
1719#endif
1723 } 1720 }
1724} 1721}
1725 1722
1726void 1723void
1727rxvt_term::focus_out () 1724rxvt_term::focus_out ()
… …
1735 1732
1736#if ENABLE_FRILLS || ISO_14755 1733#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1734 if (iso14755buf)
1738 { 1735 {
1739 iso14755buf = 0; 1736 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1737# if ISO_14755
1741 scr_overlay_off (); 1738 scr_overlay_off ();
1742# endif 1739# endif
1743 } 1740 }
1744#endif 1741#endif
1745#if USE_XIM 1742#if USE_XIM
1746 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1744 XUnsetICFocus (Input_Context);
1748#endif 1745#endif
1749#if CURSOR_BLINK 1746#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1747 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1748 cursor_blink_ev.stop ();
1749
1752 hidden_cursor = 0; 1750 hidden_cursor = 0;
1753#endif 1751#endif
1754#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1756 { 1754 {
… …
1759 } 1757 }
1760#endif 1758#endif
1761 } 1759 }
1762} 1760}
1763 1761
1764#if TRANSPARENT 1762void
1763rxvt_term::update_fade_color (unsigned int idx)
1764{
1765#if OFF_FOCUS_FADING
1766 if (rs[Rs_fade])
1767 {
1768 rgba c;
1769 pix_colors [Color_fade].get (c);
1770 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1771 }
1772#endif
1773}
1774
1775#if ENABLE_TRANSPARENCY || ENABLE_PERL
1765void 1776void
1766rxvt_term::rootwin_cb (XEvent &ev) 1777rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1778{
1768 make_current (); 1779 make_current ();
1769 1780
1781 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1782 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1783 return;
1784
1785# if ENABLE_TRANSPARENCY
1770 switch (ev.type) 1786 switch (ev.type)
1771 { 1787 {
1772 case PropertyNotify: 1788 case PropertyNotify:
1773 /* 1789 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1790 * if user used some Esetroot compatible prog to set the root bg,
1775 * use the property to determine the pixmap. We use it later on. 1791 * use the property to determine the pixmap. We use it later on.
1776 */ 1792 */
1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1793 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779 return; 1795 {
1780 1796 bgPixmap.set_root_pixmap ();
1781 /* FALLTHROUGH */ 1797 update_background ();
1782 case ReparentNotify: 1798 }
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1;
1785 break; 1799 break;
1786 } 1800 }
1801# endif
1802
1803 refresh_check ();
1787} 1804}
1788#endif 1805#endif
1789 1806
1790void 1807void
1791rxvt_term::button_press (XButtonEvent &ev) 1808rxvt_term::button_press (XButtonEvent &ev)
… …
1846 mouse_report (ev); 1863 mouse_report (ev);
1847 } 1864 }
1848#else 1865#else
1849 MEvent.button = ev.button; 1866 MEvent.button = ev.button;
1850 mouse_report (ev); 1867 mouse_report (ev);
1851#endif /* MOUSE_REPORT_DOUBLECLICK */ 1868#endif /* MOUSE_REPORT_DOUBLECLICK */
1852 1869
1853 } 1870 }
1854 else 1871 else
1855 { 1872 {
1856 if (ev.button != MEvent.button) 1873 if (ev.button != MEvent.button)
… …
1950 tt_printf ("\033[5~"); 1967 tt_printf ("\033[5~");
1951 break; 1968 break;
1952 } 1969 }
1953 } 1970 }
1954 else 1971 else
1955#endif /* NO_SCROLLBAR_REPORT */ 1972#endif /* NO_SCROLLBAR_REPORT */
1956 1973
1957 { 1974 {
1958 char upordown = 0; 1975 char upordown = 0;
1959 1976
1960 if (scrollBar.style == R_SB_NEXT) 1977 if (scrollBar.style == R_SB_NEXT)
1961 { 1978 {
1962 if (scrollbarnext_upButton (ev.y)) 1979 if (scrollbarnext_upButton (ev.y))
1963 upordown = -1; /* up */ 1980 upordown = -1; /* up */
… …
1969 if (scrollbarrxvt_upButton (ev.y)) 1986 if (scrollbarrxvt_upButton (ev.y))
1970 upordown = -1; /* up */ 1987 upordown = -1; /* up */
1971 else if (scrollbarrxvt_dnButton (ev.y)) 1988 else if (scrollbarrxvt_dnButton (ev.y))
1972 upordown = 1; /* down */ 1989 upordown = 1; /* down */
1973 } 1990 }
1991
1974 if (upordown) 1992 if (upordown)
1975 { 1993 {
1976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ())
1977 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1978#endif 1997#endif
1979 if (scr_page (upordown < 0 ? UP : DN, 1)) 1998 if (scr_page (upordown < 0 ? UP : DN, 1))
1980 { 1999 {
1981 if (upordown < 0) 2000 if (upordown < 0)
1982 scrollBar.setUp (); 2001 scrollBar.setUp ();
… …
2062 scrollBar.setIdle (); 2081 scrollBar.setIdle ();
2063 scrollbar_show (0); 2082 scrollbar_show (0);
2064 } 2083 }
2065 2084
2066#ifdef SELECTION_SCROLLING 2085#ifdef SELECTION_SCROLLING
2067 if (sel_scroll_ev.active)
2068 sel_scroll_ev.stop(); 2086 sel_scroll_ev.stop();
2069#endif 2087#endif
2070 2088
2071 if (ev.window == vt) 2089 if (ev.window == vt)
2072 { 2090 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2091 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2097 mouse_report (ev); 2115 mouse_report (ev);
2098 } 2116 }
2099#else /* MOUSE_REPORT_DOUBLECLICK */ 2117#else /* MOUSE_REPORT_DOUBLECLICK */
2100 MEvent.button = AnyButton; 2118 MEvent.button = AnyButton;
2101 mouse_report (ev); 2119 mouse_report (ev);
2102#endif /* MOUSE_REPORT_DOUBLECLICK */ 2120#endif /* MOUSE_REPORT_DOUBLECLICK */
2103 return; 2121 return;
2104 } 2122 }
2105 2123
2106 /* 2124 /*
2107 * dumb hack to compensate for the failure of click-and-drag 2125 * dumb hack to compensate for the failure of click-and-drag
… …
2119 selection_make (ev.time); 2137 selection_make (ev.time);
2120 break; 2138 break;
2121 2139
2122 case Button2: 2140 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2141 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2124 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2142 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2143 break;
2126 2144
2127#ifdef MOUSE_WHEEL 2145#ifdef MOUSE_WHEEL
2128 case Button4: 2146 case Button4:
2129 case Button5: 2147 case Button5:
… …
2133 2151
2134 v = ev.button == Button4 ? UP : DN; 2152 v = ev.button == Button4 ? UP : DN;
2135 2153
2136 if (ev.state & ShiftMask) 2154 if (ev.state & ShiftMask)
2137 i = 1; 2155 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2156 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2157 i = nrow - 1;
2140 else 2158 else
2141 i = 5; 2159 i = 5;
2142 2160
2143# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
… …
2145 { 2163 {
2146 mouse_slip_wheel_speed += v ? -1 : 1; 2164 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2165 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2166 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149 2167
2150 if (slip_wheel_ev.at < NOW) 2168 if (!slip_wheel_ev.is_active ())
2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2152
2153 slip_wheel_ev.start ();
2154 } 2170 }
2155 else 2171 else
2156 { 2172 {
2157# endif 2173# endif
2158 scr_page (v, i); 2174 scr_page (v, i);
… …
2164 break; 2180 break;
2165#endif 2181#endif
2166 } 2182 }
2167 } 2183 }
2168} 2184}
2169
2170#ifdef TRANSPARENT
2171#if TINTING
2172/* taken from aterm-0.4.2 */
2173
2174typedef uint32_t RUINT32T;
2175
2176void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2177{
2178 int sh_r, sh_g, sh_b;
2179 RUINT32T mask_r, mask_g, mask_b;
2180 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2181 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2182 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2183 int i;
2184
2185 Visual *visual = term->visual;
2186
2187 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2188
2189 /* for convenience */
2190 mask_r = visual->red_mask;
2191 mask_g = visual->green_mask;
2192 mask_b = visual->blue_mask;
2193
2194 /* boring lookup table pre-initialization */
2195 switch (srcImage->bits_per_pixel) {
2196 case 15:
2197 if ((mask_r != 0x7c00) ||
2198 (mask_g != 0x03e0) ||
2199 (mask_b != 0x001f))
2200 return;
2201 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2202 lookup_r = lookup;
2203 lookup_g = lookup+32;
2204 lookup_b = lookup+32+32;
2205 sh_r = 10;
2206 sh_g = 5;
2207 sh_b = 0;
2208 break;
2209 case 16:
2210 if ((mask_r != 0xf800) ||
2211 (mask_g != 0x07e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+64;
2218 sh_r = 11;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 24:
2223 if ((mask_r != 0xff0000) ||
2224 (mask_g != 0x00ff00) ||
2225 (mask_b != 0x0000ff))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2228 lookup_r = lookup;
2229 lookup_g = lookup+256;
2230 lookup_b = lookup+256+256;
2231 sh_r = 16;
2232 sh_g = 8;
2233 sh_b = 0;
2234 break;
2235 case 32:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 default:
2249 return; /* we do not support this color depth */
2250 }
2251
2252 /* prepare limits for color transformation (each channel is handled separately) */
2253 if (shade < 0) {
2254 shade = -shade;
2255 if (shade < 0) shade = 0;
2256 if (shade > 100) shade = 100;
2257
2258 lower_lim_r = 65535-rm;
2259 lower_lim_g = 65535-gm;
2260 lower_lim_b = 65535-bm;
2261
2262 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2263 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2264 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2265
2266 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2267 } else {
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2272
2273 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2274 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2275 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2276 }
2277
2278 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2279 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2280 {
2281 unsigned int tmp;
2282
2283 tmp = lower_lim_r;
2284 lower_lim_r = lower_lim_b;
2285 lower_lim_b = tmp;
2286
2287 tmp = upper_lim_r;
2288 upper_lim_r = upper_lim_b;
2289 upper_lim_b = tmp;
2290 }
2291
2292 /* fill our lookup tables */
2293 for (i = 0; i <= mask_r>>sh_r; i++)
2294 {
2295 RUINT32T tmp;
2296 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2297 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2298 lookup_r[i] = (tmp/65535)<<sh_r;
2299 }
2300 for (i = 0; i <= mask_g>>sh_g; i++)
2301 {
2302 RUINT32T tmp;
2303 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2304 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2305 lookup_g[i] = (tmp/65535)<<sh_g;
2306 }
2307 for (i = 0; i <= mask_b>>sh_b; i++)
2308 {
2309 RUINT32T tmp;
2310 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2311 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2312 lookup_b[i] = (tmp/65535)<<sh_b;
2313 }
2314
2315 /* apply table to input image (replacing colors by newly calculated ones) */
2316 switch (srcImage->bits_per_pixel)
2317 {
2318 case 15:
2319 {
2320 unsigned short *p1, *pf, *p, *pl;
2321 p1 = (unsigned short *) srcImage->data;
2322 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2323 while (p1 < pf)
2324 {
2325 p = p1;
2326 pl = p1 + srcImage->width;
2327 for (; p < pl; p++)
2328 {
2329 *p = lookup_r[(*p & 0x7c00)>>10] |
2330 lookup_g[(*p & 0x03e0)>> 5] |
2331 lookup_b[(*p & 0x001f)];
2332 }
2333 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2334 }
2335 break;
2336 }
2337 case 16:
2338 {
2339 unsigned short *p1, *pf, *p, *pl;
2340 p1 = (unsigned short *) srcImage->data;
2341 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2342 while (p1 < pf)
2343 {
2344 p = p1;
2345 pl = p1 + srcImage->width;
2346 for (; p < pl; p++)
2347 {
2348 *p = lookup_r[(*p & 0xf800)>>11] |
2349 lookup_g[(*p & 0x07e0)>> 5] |
2350 lookup_b[(*p & 0x001f)];
2351 }
2352 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2353 }
2354 break;
2355 }
2356 case 24:
2357 {
2358 unsigned char *p1, *pf, *p, *pl;
2359 p1 = (unsigned char *) srcImage->data;
2360 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2361 while (p1 < pf)
2362 {
2363 p = p1;
2364 pl = p1 + srcImage->width * 3;
2365 for (; p < pl; p += 3)
2366 {
2367 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2368 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2369 p[2] = lookup_r[(p[2] & 0x0000ff)];
2370 }
2371 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2372 }
2373 break;
2374 }
2375 case 32:
2376 {
2377 RUINT32T *p1, *pf, *p, *pl;
2378 p1 = (RUINT32T *) srcImage->data;
2379 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380
2381 while (p1 < pf)
2382 {
2383 p = p1;
2384 pl = p1 + srcImage->width;
2385 for (; p < pl; p++)
2386 {
2387 *p = lookup_r[(*p & 0xff0000)>>16] |
2388 lookup_g[(*p & 0x00ff00)>> 8] |
2389 lookup_b[(*p & 0x0000ff)] |
2390 (*p & ~0xffffff);
2391 }
2392 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2393 }
2394 break;
2395 }
2396 }
2397
2398 free (lookup);
2399}
2400#endif
2401
2402/*
2403 * Check our parents are still who we think they are.
2404 * Do transparency updates if required
2405 */
2406int
2407rxvt_term::check_our_parents ()
2408{
2409 int i, pchanged, aformat, have_pixmap, rootdepth;
2410 unsigned long nitems, bytes_after;
2411 Atom atype;
2412 unsigned char *prop = NULL;
2413 Window root, oldp, *list;
2414 Pixmap rootpixmap = None;
2415 XWindowAttributes wattr, wrootattr;
2416
2417 pchanged = 0;
2418
2419 if (!OPTION (Opt_transparent))
2420 return pchanged; /* Don't try any more */
2421
2422 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2423 rootdepth = wrootattr.depth;
2424
2425 XGetWindowAttributes (xdisp, parent[0], &wattr);
2426
2427 if (rootdepth != wattr.depth)
2428 {
2429 if (am_transparent)
2430 {
2431 pchanged = 1;
2432 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2433 am_transparent = am_pixmap_trans = 0;
2434 }
2435
2436 return pchanged; /* Don't try any more */
2437 }
2438
2439 /* Get all X ops out of the queue so that our information is up-to-date. */
2440 XSync (xdisp, False);
2441
2442 /*
2443 * Make the frame window set by the window manager have
2444 * the root background. Some window managers put multiple nested frame
2445 * windows for each client, so we have to take care about that.
2446 */
2447 i = (xa[XA_XROOTPMAP_ID]
2448 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2449 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2450 &nitems, &bytes_after, &prop) == Success);
2451
2452 if (!i || prop == NULL)
2453 i = (xa[XA_ESETROOT_PMAP_ID]
2454 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2455 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2456 &nitems, &bytes_after, &prop) == Success);
2457
2458 if (!i || prop == NULL
2459#if TINTING
2460 || !rs[Rs_color + Color_tint]
2461#endif
2462 )
2463 have_pixmap = 0;
2464 else
2465 {
2466 have_pixmap = 1;
2467 rootpixmap = *(Pixmap *)prop;
2468 XFree (prop);
2469 }
2470
2471 if (have_pixmap)
2472 {
2473 /*
2474 * Copy display->root pixmap transparency
2475 */
2476 int sx, sy, nx, ny;
2477 unsigned int nw, nh;
2478 Window cr;
2479 XImage *image;
2480 GC gc;
2481 XGCValues gcvalue;
2482
2483 XTranslateCoordinates (xdisp, parent[0], display->root,
2484 0, 0, &sx, &sy, &cr);
2485 nw = (unsigned int)szHint.width;
2486 nh = (unsigned int)szHint.height;
2487 nx = ny = 0;
2488
2489 if (sx < 0)
2490 {
2491 nw += sx;
2492 nx = -sx;
2493 sx = 0;
2494 }
2495
2496 if (sy < 0)
2497 {
2498 nh += sy;
2499 ny = -sy;
2500 sy = 0;
2501 }
2502
2503 min_it (nw, (unsigned int) (wrootattr.width - sx));
2504 min_it (nh, (unsigned int) (wrootattr.height - sy));
2505
2506 XSync (xdisp, False);
2507 allowedxerror = -1;
2508 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2509
2510 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2511 /* XXX: may need a delay here? */
2512 allowedxerror = 0;
2513
2514 if (image == NULL)
2515 {
2516 if (am_transparent && am_pixmap_trans)
2517 {
2518 pchanged = 1;
2519 if (pixmap != None)
2520 {
2521 XFreePixmap (xdisp, pixmap);
2522 pixmap = None;
2523 }
2524 }
2525
2526 am_pixmap_trans = 0;
2527 }
2528 else
2529 {
2530 if (pixmap != None)
2531 XFreePixmap (xdisp, pixmap);
2532
2533#if TINTING
2534 if (ISSET_PIXCOLOR (Color_tint))
2535 {
2536 unsigned short rm, gm, bm;
2537 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2538
2539 pix_colors_focused[Color_tint].get (this, rm, gm, bm);
2540
2541 ShadeXImage (this, image, shade, rm, gm, bm);
2542 }
2543#endif
2544
2545 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2546 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2547 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2548 nx, ny, image->width, image->height);
2549 XFreeGC (xdisp, gc);
2550 XDestroyImage (image);
2551 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2552 XClearWindow (xdisp, parent[0]);
2553
2554 if (!am_transparent || !am_pixmap_trans)
2555 pchanged = 1;
2556
2557 am_transparent = am_pixmap_trans = 1;
2558 }
2559 }
2560
2561 if (am_pixmap_trans)
2562 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2563 else
2564 {
2565 unsigned int n;
2566 /*
2567 * InheritPixmap transparency
2568 */
2569 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2570 {
2571 oldp = parent[i];
2572 XQueryTree (xdisp, parent[i - 1], &root,
2573 &parent[i], &list, &n);
2574 XFree (list);
2575
2576 if (parent[i] == display->root)
2577 {
2578 if (oldp != None)
2579 pchanged = 1;
2580
2581 break;
2582 }
2583
2584 if (oldp != parent[i])
2585 pchanged = 1;
2586 }
2587
2588 n = 0;
2589
2590 if (pchanged)
2591 {
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2596 {
2597 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2598 break;
2599 }
2600 }
2601 }
2602
2603 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643 2185
2644/*}}} */ 2186/*}}} */
2645 2187
2646bool 2188bool
2647rxvt_term::cmd_parse () 2189rxvt_term::cmd_parse ()
… …
2696 if (ch == C0_LF) 2238 if (ch == C0_LF)
2697 nlines++; 2239 nlines++;
2698 2240
2699 refresh_count++; 2241 refresh_count++;
2700 2242
2701 if (!OPTION (Opt_jumpScroll) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2244 {
2704 refreshnow = true;
2705 refresh_count = 0; 2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2706 ch = NOCHAR; 2250 ch = NOCHAR;
2707 break; 2251 break;
2252 }
2708 } 2253 }
2709 2254
2710 // scr_add_lines only works for nlines <= nrow - 1. 2255 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2256 if (nlines >= nrow - 1)
2712 { 2257 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2286 scr_add_lines (buf, str - buf, nlines);
2742 2287
2743 /* 2288 /*
2744 * If there have been a lot of new lines, then update the screen 2289 * If there have been a lot of new lines, then update the screen
2745 * What the heck I'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2746 * the number of pages between refreshes is refresh_limit, which 2291 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2292 */
2749 if (refreshnow) 2293 if (refreshnow)
2750 { 2294 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true; 2295 flag = true;
2756 scr_refresh (); 2296 scr_refresh ();
2757 want_refresh = 1; 2297 want_refresh = 1;
2758 }
2759 } 2298 }
2760 2299
2761 } 2300 }
2762 else 2301 else
2763 { 2302 {
… …
2912 { 2451 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2453 break; /* done = 1 */
2915 } 2454 }
2916 } 2455 }
2917 2456
2918 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2920 { 2459 {
2921 done = 1; 2460 done = 1;
2922 break; 2461 break;
… …
2924 } 2463 }
2925 } 2464 }
2926 2465
2927 pclose_printer (fd); 2466 pclose_printer (fd);
2928} 2467}
2929#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2930/*}}} */ 2469/*}}} */
2931 2470
2932/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
2933enum { 2472enum {
2934 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
2984 process_dcs_seq (); 2523 process_dcs_seq ();
2985 break; 2524 break;
2986 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
2987 process_csi_seq (); 2526 process_csi_seq ();
2988 break; 2527 break;
2989 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
2990 process_osc_seq (); 2529 process_osc_seq ();
2991 break; 2530 break;
2992#endif 2531#endif
2993 } 2532 }
2994} 2533}
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2623 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2624 break;
3086 case '+': 2625 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2626 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2627 break;
3089#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3090 case '6': 2629 case '6':
3091 scr_backindex (); 2630 scr_backindex ();
3092 break; 2631 break;
3093#endif 2632#endif
3094 case '7': 2633 case '7':
3095 scr_cursor (SAVE); 2634 scr_cursor (SAVE);
3096 break; 2635 break;
3097 case '8': 2636 case '8':
3098 scr_cursor (RESTORE); 2637 scr_cursor (RESTORE);
3099 break; 2638 break;
3100#if ENABLE_FRILLS 2639#if !ENABLE_MINIMAL
3101 case '9': 2640 case '9':
3102 scr_forwardindex (); 2641 scr_forwardindex ();
3103 break; 2642 break;
3104#endif 2643#endif
3105 case '=': 2644 case '=':
… …
3220rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
3221{ 2760{
3222 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2762 unsigned int nargs, p;
3224 int n, ndef; 2763 int n, ndef;
3225 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
3226 2765
3227 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
3228 arg[--nargs] = 0;
3229 2767
3230 priv = 0; 2768 priv = 0;
3231 ch = cmd_getc (); 2769 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
3233 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
3234 priv = ch; 2773 priv = ch;
3235 ch = cmd_getc (); 2774 ch = cmd_getc ();
3236 } 2775 }
3237 2776
3238 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
3277 switch (priv) 2816 switch (priv)
3278 { 2817 {
3279 case '>': 2818 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2820 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2823 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2826 // versions.
3288 // 2827 //
3289 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2828 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2829 }
3291 break; 2830 break;
3292 case '?': 2831 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
… …
3421 break; 2960 break;
3422 case 6: /* CPR requested */ 2961 case 6: /* CPR requested */
3423 scr_report_position (); 2962 scr_report_position ();
3424 break; 2963 break;
3425 case 7: /* unofficial extension */ 2964 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 2965 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2966 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 2967 break;
3429 case 8: /* unofficial extension */ 2968 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2969 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 2970 break;
… …
3498 break; 3037 break;
3499 case CSI_75: 3038 case CSI_75:
3500 scr_cursor (RESTORE); 3039 scr_cursor (RESTORE);
3501 break; 3040 break;
3502 3041
3503#if ENABLE_FRILLS 3042#if !ENABLE_MINIMAL
3504 case CSI_74: 3043 case CSI_74:
3505 process_window_ops (arg, nargs); 3044 process_window_ops (arg, nargs);
3506 break; 3045 break;
3507#endif 3046#endif
3508 3047
… …
3515 break; 3054 break;
3516 } 3055 }
3517} 3056}
3518/*}}} */ 3057/*}}} */
3519 3058
3520#if ENABLE_FRILLS 3059#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3060/* ARGSUSED */
3522void 3061void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3062rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3063{
3525 int x, y; 3064 int x, y;
3526 XWindowAttributes wattr; 3065 XWindowAttributes wattr;
3527 Window wdummy; 3066 Window wdummy;
3528 3067
3529 dLocal (Display *, xdisp); 3068 dLocal (Display *, dpy);
3530 3069
3531 if (nargs == 0) 3070 if (nargs == 0)
3532 return; 3071 return;
3533 3072
3534 switch (args[0]) 3073 switch (args[0])
3535 { 3074 {
3536 /* 3075 /*
3537 * commands 3076 * commands
3538 */ 3077 */
3539 case 1: /* deiconify window */ 3078 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3079 XMapWindow (dpy, parent[0]);
3541 break; 3080 break;
3542 case 2: /* iconify window */ 3081 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3082 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3083 break;
3545 case 3: /* set position (pixels) */ 3084 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3085 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3086 break;
3548 case 4: /* set size (pixels) */ 3087 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3089 break;
3551 case 5: /* raise window */ 3090 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3091 XRaiseWindow (dpy, parent[0]);
3553 break; 3092 break;
3554 case 6: /* lower window */ 3093 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3094 XLowerWindow (dpy, parent[0]);
3556 break; 3095 break;
3557 case 7: /* refresh window */ 3096 case 7: /* refresh window */
3558 scr_touch (true); 3097 scr_touch (true);
3559 break; 3098 break;
3560 case 8: /* set size (chars) */ 3099 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3106 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3107 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3108 (unsigned int) (args[1] * fheight));
3570 break; 3109 break;
3571 3110
3572
3573 /* 3111 /*
3574 * reports - some output format copied from XTerm 3112 * reports - some output format copied from XTerm
3575 */ 3113 */
3576 case 11: /* report window state */ 3114 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3117 break;
3580 case 13: /* report window position */ 3118 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3119 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3120 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3121 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3122 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3123 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3124 break;
3587 case 14: /* report window size (pixels) */ 3125 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3126 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3128 break;
3591 case 18: /* report text area size (chars) */ 3129 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3130 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3131 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3134 break;
3597 case 20: /* report icon label */ 3135 case 20: /* report icon label */
3598 { 3136 {
3599 char *s; 3137 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3138 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3140 XFree (s);
3603 } 3141 }
3604 break; 3142 break;
3605 case 21: /* report window title */ 3143 case 21: /* report window title */
3606 { 3144 {
3607 char *s; 3145 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3146 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3148 XFree (s);
3611 } 3149 }
3612 break; 3150 break;
3613 } 3151 }
3614} 3152}
… …
3641 seen_esc = true; 3179 seen_esc = true;
3642 continue; 3180 continue;
3643 } 3181 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3182 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3183 break;
3184 else if (ch == C0_SYN)
3185 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3186 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3187 return NULL; /* other control character - exit */
3648 3188
3649 seen_esc = false; 3189 seen_esc = false;
3650 3190
3651 if (n >= STRING_MAX - 1) 3191 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3192 // stop at some sane length
3653 return NULL; 3193 return NULL;
3654 3194
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3195 string[n++] = ch;
3659 } 3196 }
3660 3197
3661 string[n++] = '\0'; 3198 string[n++] = '\0';
3662 3199
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3200 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3251void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3252rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3253{
3717 if (str[0] == '?' && !str[1]) 3254 if (str[0] == '?' && !str[1])
3718 { 3255 {
3719 unsigned short r, g, b; 3256 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3257 pix_colors_focused[color].get (c);
3258
3259#if XFT
3260 if (c.a != rgba::MAX_CC)
3261 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3262 else
3263#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3264 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3265 }
3723 else 3266 else
3724 set_window_color (color, str); 3267 set_window_color (color, str);
3725} 3268}
3726 3269
… …
3733 int color; 3276 int color;
3734 char *buf, *name; 3277 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3278 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3279 int saveop = op;
3737 3280
3738 dLocal (Display *, xdisp); 3281 dLocal (Display *, dpy);
3739 3282
3740 assert (str != NULL); 3283 assert (str != NULL);
3284
3285 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3286 return;
3287
3741 switch (op) 3288 switch (op)
3742 { 3289 {
3743 case XTerm_name: 3290 case XTerm_name:
3744 set_title (str); 3291 set_title (str);
3745 /* FALLTHROUGH */ 3292 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3306 unsigned long bytes_after;
3760 unsigned char *value = 0; 3307 unsigned char *value = 0;
3761 const char *str = ""; 3308 const char *str = "";
3762 3309
3763 if (prop 3310 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3311 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3312 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3313 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3314 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3315 && actual_type != None
3769 && actual_format == 8) 3316 && actual_format == 8)
3770 str = (const char *)(value); 3317 str = (const char *)(value);
3771 3318
3772 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3319 tt_printf ("\033]%d;%s%c", op, str, resp);
3773 3320
3774 XFree (value); 3321 XFree (value);
3775 } 3322 }
3776 else 3323 else
3777 { 3324 {
… …
3781 { 3328 {
3782 *eq = 0; 3329 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3330 set_utf8_property (display->atom (str), eq + 1);
3784 } 3331 }
3785 else 3332 else
3786 XDeleteProperty (xdisp, parent[0], 3333 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3334 display->atom (str));
3788 } 3335 }
3789 break; 3336 break;
3790 3337
3791 case XTerm_Color: 3338 case XTerm_Color:
… …
3801 break; 3348 break;
3802 3349
3803 if ((buf = strchr (name, ';')) != NULL) 3350 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3351 *buf++ = '\0';
3805 3352
3806 if (name[0] == '?' && !name[1]) 3353 process_color_seq (op, color, name, resp);
3807 {
3808 unsigned short r, g, b;
3809 pix_colors_focused[color].get (this, r, g, b);
3810 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3354 }
3815 break; 3355 break;
3816 case XTerm_Color00: 3356 case XTerm_Color00:
3817 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3357 process_color_seq (op, Color_fg, str, resp);
3818 break; 3358 break;
3819 case XTerm_Color01: 3359 case XTerm_Color01:
3820 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3360 process_color_seq (op, Color_bg, str, resp);
3821 break; 3361 break;
3822#ifndef NO_CURSORCOLOR 3362#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3363 case XTerm_Color_cursor:
3824 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3364 process_color_seq (op, Color_cursor, str, resp);
3825 break; 3365 break;
3826#endif 3366#endif
3827 case XTerm_Color_pointer_fg: 3367 case XTerm_Color_pointer_fg:
3828 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3368 process_color_seq (op, Color_pointer_fg, str, resp);
3829 break; 3369 break;
3830 case XTerm_Color_pointer_bg: 3370 case XTerm_Color_pointer_bg:
3831 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3371 process_color_seq (op, Color_pointer_bg, str, resp);
3832 break; 3372 break;
3833#ifndef NO_BOLD_UNDERLINE_REVERSE 3373#ifndef NO_BOLD_UNDERLINE_REVERSE
3834 case XTerm_Color_RV: 3374 case XTerm_Color_RV:
3835 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3375 process_color_seq (op, Color_RV, str, resp);
3836 break; 3376 break;
3837 case Rxvt_Color_BD: 3377 case Rxvt_Color_BD:
3838 case URxvt_Color_BD: 3378 case URxvt_Color_BD:
3839 process_color_seq (op, Color_BD, str, resp); 3379 process_color_seq (op, Color_BD, str, resp);
3840 break; 3380 break;
3841 case Rxvt_Color_UL: 3381 case Rxvt_Color_UL:
3842 case URxvt_Color_UL: 3382 case URxvt_Color_UL:
3843 process_color_seq (op, Color_UL, str, resp); 3383 process_color_seq (op, Color_UL, str, resp);
3844 break; 3384 break;
3845 case URxvt_Color_IT: 3385 case URxvt_Color_IT:
3846 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3386 process_color_seq (op, Color_IT, str, resp);
3847 break; 3387 break;
3848#endif 3388#endif
3849#if TRANSPARENT && TINTING 3389#if ENABLE_TRANSPARENCY
3850 case URxvt_Color_tint: 3390 case URxvt_Color_tint:
3851 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3391 process_color_seq (op, Color_tint, str, resp);
3852 check_our_parents (); 3392 {
3853 if (am_transparent) 3393 bool changed = false;
3854 want_full_refresh = want_refresh = 1; 3394 if (ISSET_PIXCOLOR (Color_tint))
3855 break; 3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3856#endif 3396 else
3397 changed = bgPixmap.unset_tint ();
3398 if (changed)
3399 update_background ();
3400 }
3857 3401
3402 break;
3403#endif
3404
3405#if BG_IMAGE_FROM_FILE
3858 case Rxvt_Pixmap: 3406 case Rxvt_Pixmap:
3859 { 3407 if (!strcmp (str, "?"))
3860 if (*str != ';')
3861 { 3408 {
3862#if XPM_BACKGROUND 3409 char str[256];
3863 scale_pixmap (""); /* reset to default scaling */ 3410
3864 set_bgPixmap (str); /* change pixmap */ 3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3865 scr_touch (true); 3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3866#endif 3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST);
3867 } 3415 }
3868 3416 else
3417 {
3869 int changed = 0; 3418 int changed = 0;
3870 3419
3871 while ((str = strchr (str, ';')) != NULL) 3420 if (*str != ';')
3872 { 3421 {
3422 /* reset to default scaling :*/
3423 bgPixmap.unset_geometry ();
3424 if (bgPixmap.set_file (str)) /* change pixmap */
3425 changed++;
3426 str = strchr (str, ';');
3427 if (str == NULL)
3428 bgPixmap.set_defaultGeometry ();
3429 }
3430 while (str)
3431 {
3873 str++; 3432 str++;
3874#if XPM_BACKGROUND 3433 if (bgPixmap.set_geometry (str))
3875 changed += scale_pixmap (str); 3434 changed++;
3876#endif 3435 str = strchr (str, ';');
3877 } 3436 }
3878
3879 if (changed) 3437 if (changed)
3880 { 3438 update_background ();
3881#ifdef XPM_BACKGROUND
3882 resize_pixmap ();
3883 scr_touch (true);
3884#endif
3885 } 3439 }
3886 }
3887 break; 3440 break;
3441#endif
3888 3442
3889 case Rxvt_restoreFG: 3443 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str); 3444 set_window_color (Color_fg, str);
3891 break; 3445 break;
3892 case Rxvt_restoreBG: 3446 case Rxvt_restoreBG:
… …
3917 case URxvt_italicFont: 3471 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3472 case URxvt_boldItalicFont:
3919#endif 3473#endif
3920 if (query) 3474 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3475 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3476 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3477 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3478 resp);
3925 else 3479 else
3926 { 3480 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3481 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3930 allocated.push_back ((void *)res); 3484 allocated.push_back ((void *)res);
3931 set_fonts (); 3485 set_fonts ();
3932 } 3486 }
3933 break; 3487 break;
3934 3488
3935#if ENABLE_FRILLS 3489 case URxvt_version:
3490 if (query)
3491 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3492 op,
3493 rs[Rs_name], VERSION[0], VERSION[2],
3494 resp);
3495 break;
3496
3497#if !ENABLE_MINIMAL
3936 case URxvt_locale: 3498 case URxvt_locale:
3937 if (query) 3499 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3500 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3939 else 3501 else
3940 { 3502 {
3941 set_locale (str); 3503 set_locale (str);
3942 pty->set_utf8_mode (enc_utf8); 3504 pty->set_utf8_mode (enc_utf8);
3943 init_xlocale (); 3505 init_xlocale ();
… …
3958 break; 3520 break;
3959#endif 3521#endif
3960 3522
3961#if ENABLE_PERL 3523#if ENABLE_PERL
3962 case URxvt_perl: 3524 case URxvt_perl:
3963 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3964 ; // no responses yet 3526 ; // no responses yet
3965 break; 3527 break;
3966#endif 3528#endif
3967 } 3529 }
3968} 3530}
… …
4006{ 3568{
4007 unsigned int i, j; 3569 unsigned int i, j;
4008 int state; 3570 int state;
4009 3571
4010 static const struct 3572 static const struct
4011 { 3573 {
4012 const int argval; 3574 const int argval;
4013 const unsigned long bit; 3575 const unsigned long bit;
4014 }
4015
4016 argtopriv[] = { 3576 } argtopriv[] = {
4017 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
4018 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
4019 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
4020 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
4021 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
… …
4037 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
4038#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
4039 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
4040#endif 3600#endif
4041 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
4042 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
4043 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
4044 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4045 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4046 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
4047 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
4048 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
4049 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
4084 scr_touch (true); 3643 scr_touch (true);
4085 break; 3644 break;
4086#endif 3645#endif
4087 case 1048: /* alternative cursor save */ 3646 case 1048: /* alternative cursor save */
4088 case 1049: 3647 case 1049:
4089 if (OPTION (Opt_secondaryScreen)) 3648 if (option (Opt_secondaryScreen))
4090 if (mode == 0) 3649 if (mode == 0)
4091 scr_cursor (RESTORE); 3650 scr_cursor (RESTORE);
4092 else if (mode == 1) 3651 else if (mode == 1)
4093 scr_cursor (SAVE); 3652 scr_cursor (SAVE);
4094 break; 3653 break;
… …
4123 scr_autowrap (state); 3682 scr_autowrap (state);
4124 break; 3683 break;
4125 /* case 8: - auto repeat, can't do on a per window basis */ 3684 /* case 8: - auto repeat, can't do on a per window basis */
4126 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
4127 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
4128 priv_modes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4129 break; 3688 break;
4130#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
4131 case scrollBar_esc: 3690 case scrollBar_esc:
4132 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
4133 { 3692 {
… …
4146 break; 3705 break;
4147 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
4148 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
4149 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
4150 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3711 break;
4153#if 0
4154 case 1001: 3712 case 1002:
4155 break; /* X11 mouse highlighting */ 3713 case 1003:
4156#endif 3714 if (state)
3715 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask;
3719 }
3720 else
3721 vt_emask_mouse = NoEventMask;
3722 vt_select_input ();
3723 break;
4157 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
4158 set_option (Opt_scrollTtyOutput, !state); 3725 set_option (Opt_scrollTtyOutput, !state);
4159 break; 3726 break;
4160 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
4161 set_option (Opt_scrollTtyKeypress, state); 3728 set_option (Opt_scrollTtyKeypress, state);
4162 break; 3729 break;
4163 case 1047: /* secondary screen w/ clearing last */ 3730 case 1047: /* secondary screen w/ clearing last */
4164 if (OPTION (Opt_secondaryScreen)) 3731 if (option (Opt_secondaryScreen))
4165 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4166 scr_erase_screen (2); 3733 scr_erase_screen (2);
4167 scr_change_screen (state); 3734 scr_change_screen (state);
4168 break; 3735 break;
4169 case 1049: /* secondary screen w/ clearing first */ 3736 case 1049: /* secondary screen w/ clearing first */
4170 scr_change_screen (state); 3737 scr_change_screen (state);
4171 if (OPTION (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
4172 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
4173 scr_erase_screen (2); 3740 scr_erase_screen (2);
4174 break; 3741 break;
4175 default: 3742 default:
4176 break; 3743 break;
… …
4304 scr_color (Color_bg, Color_bg); 3871 scr_color (Color_bg, Color_bg);
4305 break; 3872 break;
4306 3873
4307 //case 50: // not variable spacing 3874 //case 50: // not variable spacing
4308 3875
4309#if ENABLE_FRILLS 3876#if !ENABLE_MINIMAL
4310 case 90: 3877 case 90:
4311 case 91: /* set bright fg color */ 3878 case 91: /* set bright fg color */
4312 case 92: 3879 case 92:
4313 case 93: 3880 case 93:
4314 case 94: 3881 case 94:
… …
4338rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
4339{ 3906{
4340 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
4341 3908
4342 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
4343 { /* query graphics */ 3911 /* query graphics */
4344 tt_printf ("\033G0\012"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
4345 return; 3913 return;
4346 } 3914 }
4347 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
4348 do 3916 do
… …
4398 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4399 3967
4400 memcpy (v_buffer + v_buflen, data, len); 3968 memcpy (v_buffer + v_buflen, data, len);
4401 v_buflen += len; 3969 v_buflen += len;
4402 3970
4403 pty_ev.set (EVENT_READ | EVENT_WRITE); 3971 pty_ev.set (ev::READ | ev::WRITE);
4404} 3972}
4405 3973
4406void rxvt_term::pty_write () 3974void rxvt_term::pty_write ()
4407{ 3975{
4408 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3976 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4413 3981
4414 if (v_buflen == 0) 3982 if (v_buflen == 0)
4415 { 3983 {
4416 free (v_buffer); 3984 free (v_buffer);
4417 v_buffer = 0; 3985 v_buffer = 0;
4418 v_buflen = 0;
4419 3986
4420 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4421 return; 3988 return;
4422 } 3989 }
4423 3990
4424 memmove (v_buffer, v_buffer + written, v_buflen); 3991 memmove (v_buffer, v_buffer + written, v_buflen);
4425 } 3992 }
4426 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4427 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4428} 3995}
4429 3996
4430/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
4431 3998

Diff Legend

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