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.290 by root, Sat Jan 28 20:41:38 2006 UTC vs.
Revision 1.398 by root, Sat Jan 26 12:12:37 2008 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
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 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen; 307 unsigned int newlen;
303 KeySym keysym; 308 KeySym keysym;
304 int valid_keysym; 309 int valid_keysym;
305 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
306 316
307 /* 317 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
310 * 320 *
… …
490# if ISO_14755 500# if ISO_14755
491 iso14755_51 (0); 501 iso14755_51 (0);
492# endif 502# endif
493 return; 503 return;
494 } 504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
510# endif
511 return;
512 }
495 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
496 { 514 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 515 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 516 | hv | ISO_14755_51;
499# if ISO_14755 517# if ISO_14755
… …
501# endif 519# endif
502 return; 520 return;
503 } 521 }
504 else 522 else
505 { 523 {
506# if ENABLE_OVERLAY 524# if ISO_14755
507 scr_overlay_off (); 525 scr_overlay_off ();
508# endif 526# endif
509 iso14755buf = 0; 527 iso14755buf = 0;
510 } 528 }
511 } 529 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
515 { 533 {
516 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 535# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 538# endif
521 } 539 }
522#endif 540#endif
523 541
524#ifdef PRINTPIPE 542#ifdef PRINTPIPE
525 if (keysym == XK_Print) 543 if (keysym == XK_Print)
526 { 544 {
527 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
528 return; 546 return;
… …
530#endif 548#endif
531 549
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 551 {
534 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
535 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
536 switch (keysym) 585 switch (keysym)
537 { 586 {
538#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 588 case XK_BackSpace:
540 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
… …
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
545 } 594 }
546 else 595 else
547 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 597 break;
549#endif 598#endif
550#ifndef NO_DELETE_KEY 599#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: 600 case XK_Delete:
562 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 602 break;
564#endif 603#endif
565 case XK_Tab: 604 case XK_Tab:
566 if (shft) 605 if (shft)
567 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
… …
577#endif 616#endif
578 newlen = 0; 617 newlen = 0;
579 } 618 }
580 break; 619 break;
581 620
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" */ 621 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
… …
612 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
614 break; 637 break;
615 638
616#ifndef UNSHIFTED_SCROLLKEYS 639#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: 640 case XK_Prior:
628 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
629 break; 642 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: 643 case XK_Next:
641 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
642 break; 645 break;
643#endif 646#endif
644 case XK_KP_Enter: 647 case XK_KP_Enter:
645 /* allow shift to override */ 648 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
647 { 650 {
648 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
649 break; 652 break;
650 } 653 }
651 654
… …
663 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
664 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
665 } 668 }
666 break; 669 break;
667 670
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" */ 671 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 695 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
700 { 697 {
701 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 700 }
704 else 701 else
… …
710 707
711 case XK_Find: 708 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
713 break; 710 break;
714 711
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: 712 case XK_Insert:
726 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
727 break; 714 break;
728#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove: 716 case DXK_Remove:
… …
733 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
734 break; 721 break;
735 case XK_Select: 722 case XK_Select:
736 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
737 break; 724 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: 725 case XK_End:
749 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
750 break; 727 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: 728 case XK_Home:
762 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
763 break; 730 break;
764 731
765#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
… …
867 return; 834 return;
868 835
869 if (len <= 0) 836 if (len <= 0)
870 return; /* not mapped */ 837 return; /* not mapped */
871 838
872 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 840 if (view_start)
874 { 841 {
875 view_start = 0; 842 view_start = 0;
876 want_refresh = 1; 843 want_refresh = 1;
877 } 844 }
… …
901 tt_write (&ch, 1); 868 tt_write (&ch, 1);
902 } 869 }
903 870
904 tt_write (kbuf, (unsigned int)len); 871 tt_write (kbuf, (unsigned int)len);
905} 872}
906/*}}} */ 873
874void
875rxvt_term::key_release (XKeyEvent &ev)
876{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym;
879
880 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
881#endif
882
883#if ENABLE_FRILLS || ISO_14755
884 // ISO 14755 support
885 if (iso14755buf)
886 if (iso14755buf & ISO_14755_52)
887 {
888# if ISO_14755
889 scr_overlay_off ();
890# endif
891# if ISO_14755
892 // iso14755 part 5.2 handling: release time
893 // first: controls
894 if ((ev.state & ControlMask)
895 && ((keysym >= 0x40 && keysym <= 0x5f)
896 || (keysym >= 0x61 && keysym <= 0x7f)))
897 {
898 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
899 commit_iso14755 ();
900
901 return;
902 }
903
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
905 if (i[0] == keysym)
906 {
907 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 ();
909
910 return;
911 }
912
913 scr_bell ();
914# endif
915 iso14755buf = 0;
916
917 return;
918 }
919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
920 {
921# if ISO_14755
922 scr_overlay_off ();
923# endif
924 if (iso14755buf & ISO_14755_51)
925 commit_iso14755 ();
926#if ISO_14755
927 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
928 {
929 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
930
931 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
932 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
933 }
934# endif
935 else
936 iso14755buf = 0;
937 }
938#endif
939
940 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
941 return;
942
943#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
944 if (!(ev.state & ControlMask))
945 slip_wheel_ev.stop ();
946 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0;
948#endif
949}
907 950
908#if defined (KEYSYM_RESOURCE) 951#if defined (KEYSYM_RESOURCE)
909unsigned int 952unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 953rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 954{
… …
941void 984void
942rxvt_term::flush () 985rxvt_term::flush ()
943{ 986{
944 flush_ev.stop (); 987 flush_ev.stop ();
945 988
946#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
948 { 991 {
949 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 993 scr_touch (false);
952 } 994 }
953#endif 995#endif
954 996
955 if (want_refresh) 997 if (want_refresh)
… …
1000 } 1042 }
1001 1043
1002 display->flush (); 1044 display->flush ();
1003} 1045}
1004 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1005void 1048void
1006rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
1050{
1051 if (want_refresh && !flush_ev.is_active ())
1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1053
1054 display->flush ();
1055}
1056
1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents)
1007{ 1059{
1008 make_current (); 1060 make_current ();
1009 1061
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; 1062 refresh_count = 0;
1023 flush (); 1063 flush ();
1024} 1064}
1025 1065
1026#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1027void 1067void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1069{
1030 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1071 want_refresh = 1;
1032 1072 refresh_check ();
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1073}
1035#endif 1074#endif
1036 1075
1037#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1038void 1077void
1039rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1079{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1081 {
1043 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1044 want_refresh = 1; 1083 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1046 } 1085 }
1086 else
1087 w.stop ();
1047} 1088}
1048#endif 1089#endif
1049 1090
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1092void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1094{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1056 { 1097 {
1057 want_refresh = 1; 1098 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1059 } 1100 }
1101 else
1102 w.stop ();
1060} 1103}
1061#endif 1104#endif
1062 1105
1063#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1064void 1107void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1109{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1111 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1113 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1072 } 1115 }
1116 else
1117 w.stop ();
1073} 1118}
1074#endif 1119#endif
1075 1120
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1122void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1124{
1080 if (mouse_slip_wheel_speed == 0 1125 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 { 1126 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
1087 want_refresh = 1; 1127 want_refresh = 1;
1088 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1089 } 1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1135 }
1090} 1136}
1091#endif 1137#endif
1092 1138
1093#if HAVE_SCHED_YIELD 1139#if LINUX_YIELD_HACK
1094static struct event_handler 1140static struct event_handler
1095{ 1141{
1096 check_watcher cw_yield; 1142 ev::prepare yield_ev;
1097 1143
1098 void yield (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1099 { 1145 {
1100 sched_yield (); 1146 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS.
1150
1151 struct timespec ts = { 0, 0 };
1152 nanosleep (&ts, 0);
1153
1101 w.stop (); 1154 w.stop ();
1102 } 1155 }
1103 1156
1104 event_handler () 1157 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1158 : yield_ev (this, &event_handler::yield_cb)
1106 { 1159 {
1107 } 1160 }
1108} event_handler; 1161} event_handler;
1109#endif 1162#endif
1110 1163
… …
1130 cmdbuf_endp += r; 1183 cmdbuf_endp += r;
1131 return true; 1184 return true;
1132 } 1185 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1186 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1187 {
1135#if HAVE_SCHED_YIELD 1188#if LINUX_YIELD_HACK
1136 if (display->is_local) 1189 if (display->is_local)
1137 event_handler.cw_yield.start (); 1190 event_handler.yield_ev.start ();
1138#endif 1191#endif
1139 } 1192 }
1140 else 1193 else
1141 { 1194 {
1142 pty_ev.stop (); 1195 pty_ev.stop ();
1143 1196
1144 if (!OPTION (Opt_hold)) 1197 if (!option (Opt_hold))
1145 destroy (); 1198 destroy ();
1146 } 1199 }
1147 1200
1148 return false; 1201 return false;
1149} 1202}
1150 1203
1151void 1204void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1206{
1154 make_current (); 1207 make_current ();
1155 1208
1156 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1211 while (pty_fill ())
1159 if (cmd_parse ()) 1212 if (cmd_parse ())
1160 break; 1213 break;
1161 1214
1162 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1163 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1164} 1219}
1165 1220
1166void 1221void
1167rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1168{ 1223{
1169 XDefineCursor (xdisp, vt, TermWin_cursor); 1224 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1225 recolour_cursor ();
1171 1226
1172#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1228 hidden_pointer = 0;
1174 1229
1175 if (OPTION (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1177#endif 1232#endif
1178} 1233}
1179 1234
1180#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1181void 1236void
1182rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1183{ 1238{
1184 if (!OPTION (Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1185 return; 1240 return;
1186 1241
1187 XDefineCursor (xdisp, vt, display->blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (xdisp); 1243 XFlush (dpy);
1189 1244
1190 hidden_pointer = 1; 1245 hidden_pointer = 1;
1191} 1246}
1192 1247
1193void 1248void
1194rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1250{
1196 make_current (); 1251 make_current ();
1197 1252
1198 pointer_blank (); 1253 pointer_blank ();
1199} 1254}
… …
1202void 1257void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1259{
1205 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1206 int x, y; 1261 int x, y;
1262 int code = 32;
1207 1263
1208 x = ev.x; 1264 x = Pixel2Col (ev.x);
1209 y = ev.y; 1265 y = Pixel2Row (ev.y);
1210 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1211 1274
1212 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1213 button_number = 3; 1276 button_number = 3;
1214 else 1277 else
1215 { 1278 {
… …
1261 x + 1, 1324 x + 1,
1262 y + 1); 1325 y + 1);
1263#endif 1326#endif
1264 1327
1265 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1267 (32 + x + 1), 1330 (32 + x + 1),
1268 (32 + y + 1)); 1331 (32 + y + 1));
1269} 1332}
1270 1333
1271/*{{{ process an X event */ 1334/*{{{ process an X event */
1272void 1335void
1273rxvt_term::x_cb (XEvent &ev) 1336rxvt_term::x_cb (XEvent &ev)
1274{ 1337{
1275 make_current (); 1338 make_current ();
1276 1339
1277 dLocal (Display *, xdisp); 1340 dLocal (Display *, dpy);
1278 1341
1279 if (ev.xany.window == vt 1342 if (ev.xany.window == vt
1280 && SHOULD_INVOKE (HOOK_X_EVENT) 1343 && SHOULD_INVOKE (HOOK_X_EVENT)
1281 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1344 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1282 return; 1345 return;
… …
1287 unsigned int unused_mask; 1350 unsigned int unused_mask;
1288 1351
1289 switch (ev.type) 1352 switch (ev.type)
1290 { 1353 {
1291 case KeyPress: 1354 case KeyPress:
1292#if ISO_14755 1355 key_press (ev.xkey);
1293 if (!(iso14755buf & ISO_14755_52))
1294#endif
1295 lookup_key (ev.xkey);
1296
1297 break; 1356 break;
1298 1357
1299 case KeyRelease: 1358 case KeyRelease:
1300 { 1359 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; 1360 break;
1372 }
1373 1361
1374 case ButtonPress: 1362 case ButtonPress:
1375 button_press (ev.xbutton); 1363 button_press (ev.xbutton);
1376 break; 1364 break;
1377 1365
… …
1392 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1380 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1393 destroy (); 1381 destroy ();
1394 } 1382 }
1395#if ENABLE_EWMH 1383#if ENABLE_EWMH
1396 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1384 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1397 XSendEvent (xdisp, ev.xclient.window = display->root, 1385 XSendEvent (dpy, ev.xclient.window = display->root,
1398 False, SubstructureRedirectMask | SubstructureNotifyMask, 1386 False, SubstructureRedirectMask | SubstructureNotifyMask,
1399 &ev); 1387 &ev);
1400#endif 1388#endif
1401 } 1389 }
1402 } 1390 }
… …
1408 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1409 focus_out (); 1397 focus_out ();
1410 } 1398 }
1411#endif 1399#endif
1412 } 1400 }
1413 break;
1414
1415 case MappingNotify:
1416 XRefreshKeyboardMapping (&ev.xmapping);
1417 break; 1401 break;
1418 1402
1419 /* 1403 /*
1420 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1421 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1440 break; 1424 break;
1441 } 1425 }
1442 break; 1426 break;
1443 1427
1444 case FocusIn: 1428 case FocusIn:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1445 focus_in (); 1432 focus_in ();
1446 break; 1433 break;
1447 1434
1448 case FocusOut: 1435 case FocusOut:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1449 focus_out (); 1439 focus_out ();
1450 break; 1440 break;
1451 1441
1452 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height);*/
1453 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1454 { 1447 {
1455 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1456 ; 1449 ;
1457 1450
1458 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1459 { 1452 {
1460 seen_resize = 1; 1453 seen_resize = 1;
1461 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1462 } 1455 }
1456 else
1457 {
1458#ifdef HAVE_BG_PIXMAP
1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1466#endif
1467 }
1463 1468
1464 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1469 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 } 1470 }
1471 break; 1471 break;
1472 1472
1473 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1490 case SelectionRequest: 1490 case SelectionRequest:
1491 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1492 break; 1492 break;
1493 1493
1494 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1495 mapped = 1; 1511 mapped = 1;
1496#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1497 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1498#endif 1514#endif
1499 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1500 break; 1516 break;
1501 1517
1502 case UnmapNotify: 1518 case UnmapNotify:
… …
1504#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1505 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1506#endif 1522#endif
1507 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1508 break; 1524 break;
1509
1510#ifdef TRANSPARENT
1511 case ReparentNotify:
1512 rootwin_cb (ev);
1513 break;
1514#endif /* TRANSPARENT */
1515 1525
1516 case GraphicsExpose: 1526 case GraphicsExpose:
1517 case Expose: 1527 case Expose:
1518 if (ev.xany.window == vt) 1528 if (ev.xany.window == vt)
1519 { 1529 {
1520 do 1530 do
1531 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1523 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1524 1536
1525 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1526 1538
1527 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1528 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1529 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1530 1544
1531 want_refresh = 1; 1545 want_refresh = 1;
1532 } 1546 }
1533 else 1547 else
1534 { 1548 {
1535 XEvent unused_event; 1549 XEvent unused_event;
1536 1550
1537 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1538 ; 1552 ;
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1540 ; 1554 ;
1541 1555
1542 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1543 { 1557 {
1544 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1545 scrollbar_show (0); 1559 scrollbar_show (0);
1546 } 1560 }
1547
1548#ifdef TRANSPARENT
1549 if (am_transparent && ev.xany.window == parent[0])
1550 XClearWindow (xdisp, ev.xany.window);
1551#endif
1552 } 1561 }
1553 break; 1562 break;
1554 1563
1555 case MotionNotify: 1564 case MotionNotify:
1556#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1557 if (hidden_pointer) 1566 if (hidden_pointer)
1558 pointer_unblank (); 1567 pointer_unblank ();
1559#endif 1568#endif
1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1570 || priv_modes & PrivMode_MouseAnyEvent)
1571 mouse_report (ev.xbutton);
1560 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1561 break; 1573 break;
1562 1574
1563 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1564 { 1576 {
1565 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1566 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1567 ; // nop 1579 ; // nop
1568 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1569 { 1581 {
1570 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1571 ; 1583 ;
1572 1584
1573 XQueryPointer (xdisp, vt, 1585 XQueryPointer (dpy, vt,
1574 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1575 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1576 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1577 &ev.xbutton.state); 1589 &ev.xbutton.state);
1578#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1598 int dist; 1610 int dist;
1599 1611
1600 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1601 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1602 */ 1614 */
1603 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1604 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1605 1617
1606 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1607 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1608 */ 1620 */
1609 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
… …
1631 else 1643 else
1632 { 1644 {
1633 /* we are within the text window, so we 1645 /* we are within the text window, so we
1634 * shouldn't be scrolling 1646 * shouldn't be scrolling
1635 */ 1647 */
1636 if (sel_scroll_ev.active)
1637 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1638 } 1649 }
1639#endif 1650#endif
1640#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1641 } 1652 }
1642#endif 1653#endif
1643 } 1654 }
1644 } 1655 }
1645 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1646 { 1657 {
1647 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1649 ; 1660 ;
1650 1661
1651 XQueryPointer (xdisp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1666 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1657 scrollbar_size ()); 1668 scrollbar_size ());
1658 want_refresh = 1; 1669 want_refresh = 1;
1659 refresh_limit = 0;
1660 scrollbar_show (1); 1670 scrollbar_show (1);
1661 } 1671 }
1662 break; 1672 break;
1663 } 1673 }
1664 1674
1665skip_switch: ;
1666
1667#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1668 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1669 { 1677 {
1670 if (hidden_cursor) 1678 if (hidden_cursor)
1671 { 1679 {
1672 hidden_cursor = 0; 1680 hidden_cursor = 0;
1673 want_refresh = 1; 1681 want_refresh = 1;
1674 } 1682 }
1675 1683
1676 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1684 cursor_blink_ev.again ();
1677 } 1685 }
1678#endif 1686#endif
1679 1687
1680#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1681 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1682 { 1690 {
1683 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1684 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1685 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1686 if (hidden_pointer) 1694 if (hidden_pointer)
… …
1688 1696
1689 if (ev.type == KeyPress && hidden_pointer == 0) 1697 if (ev.type == KeyPress && hidden_pointer == 0)
1690 pointer_blank (); 1698 pointer_blank ();
1691 } 1699 }
1692#endif 1700#endif
1701
1702 refresh_check ();
1693} 1703}
1694 1704
1695void 1705void
1696rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1697{ 1707{
1698 if (!focus) 1708 if (!focus)
1699 { 1709 {
1700 focus = 1; 1710 focus = 1;
1701 want_refresh = 1; 1711 want_refresh = 1;
1702 1712
1703 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1704 1714
1705#if USE_XIM 1715#if USE_XIM
1706 if (Input_Context != NULL) 1716 if (Input_Context != NULL)
1707 { 1717 {
1708 IMSetStatusPosition (); 1718 IMSetPosition ();
1709 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1710 } 1720 }
1711#endif 1721#endif
1712#if CURSOR_BLINK 1722#if CURSOR_BLINK
1713 if (OPTION (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1714 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1715#endif 1725#endif
1716#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1717 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1718 { 1728 {
1719 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1720 scr_recolour (); 1730 scr_recolour ();
1721 } 1731 }
1722#endif 1732#endif
1733#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell))
1735 {
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1723 } 1743 }
1724} 1744}
1725 1745
1726void 1746void
1727rxvt_term::focus_out () 1747rxvt_term::focus_out ()
… …
1735 1755
1736#if ENABLE_FRILLS || ISO_14755 1756#if ENABLE_FRILLS || ISO_14755
1737 if (iso14755buf) 1757 if (iso14755buf)
1738 { 1758 {
1739 iso14755buf = 0; 1759 iso14755buf = 0;
1740# if ENABLE_OVERLAY 1760# if ISO_14755
1741 scr_overlay_off (); 1761 scr_overlay_off ();
1742# endif 1762# endif
1743 } 1763 }
1744#endif 1764#endif
1745#if USE_XIM 1765#if USE_XIM
1746 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1747 XUnsetICFocus (Input_Context); 1767 XUnsetICFocus (Input_Context);
1748#endif 1768#endif
1749#if CURSOR_BLINK 1769#if CURSOR_BLINK
1750 if (OPTION (Opt_cursorBlink)) 1770 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.stop (); 1771 cursor_blink_ev.stop ();
1772
1752 hidden_cursor = 0; 1773 hidden_cursor = 0;
1753#endif 1774#endif
1754#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1755 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1756 { 1777 {
… …
1759 } 1780 }
1760#endif 1781#endif
1761 } 1782 }
1762} 1783}
1763 1784
1764#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1765void 1799void
1766rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1767{ 1801{
1768 make_current (); 1802 make_current ();
1769 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1770 switch (ev.type) 1809 switch (ev.type)
1771 { 1810 {
1772 case PropertyNotify: 1811 case PropertyNotify:
1773 /* 1812 /*
1774 * if user used some Esetroot compatible prog to set the root bg, 1813 * 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. 1814 * use the property to determine the pixmap. We use it later on.
1776 */ 1815 */
1777 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1778 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1779 return; 1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1780 1822
1781 /* FALLTHROUGH */
1782 case ReparentNotify:
1783 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1784 want_refresh = want_full_refresh = 1;
1785 break; 1823 break;
1786 } 1824 }
1825# endif
1826
1827 refresh_check ();
1787} 1828}
1788#endif 1829#endif
1789 1830
1790void 1831void
1791rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1846 mouse_report (ev); 1887 mouse_report (ev);
1847 } 1888 }
1848#else 1889#else
1849 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1850 mouse_report (ev); 1891 mouse_report (ev);
1851#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1852 1893
1853 } 1894 }
1854 else 1895 else
1855 { 1896 {
1856 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
… …
1904 } 1945 }
1905 1946
1906 /* 1947 /*
1907 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1908 */ 1949 */
1909 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1910 { 1951 {
1911 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1912 /* 1953 /*
1913 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1914 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
1950 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
1951 break; 1992 break;
1952 } 1993 }
1953 } 1994 }
1954 else 1995 else
1955#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
1956 1997
1957 { 1998 {
1958 char upordown = 0; 1999 char upordown = 0;
1959 2000
1960 if (scrollBar.style == R_SB_NEXT) 2001 if (scrollBar.style == R_SB_NEXT)
1961 { 2002 {
1962 if (scrollbarnext_upButton (ev.y)) 2003 if (scrollbarnext_upButton (ev.y))
1963 upordown = -1; /* up */ 2004 upordown = -1; /* up */
… …
1969 if (scrollbarrxvt_upButton (ev.y)) 2010 if (scrollbarrxvt_upButton (ev.y))
1970 upordown = -1; /* up */ 2011 upordown = -1; /* up */
1971 else if (scrollbarrxvt_dnButton (ev.y)) 2012 else if (scrollbarrxvt_dnButton (ev.y))
1972 upordown = 1; /* down */ 2013 upordown = 1; /* down */
1973 } 2014 }
2015
1974 if (upordown) 2016 if (upordown)
1975 { 2017 {
1976#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ())
1977 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1978#endif 2021#endif
1979 if (scr_page (upordown < 0 ? UP : DN, 1)) 2022 if (scr_page (upordown < 0 ? UP : DN, 1))
1980 { 2023 {
1981 if (upordown < 0) 2024 if (upordown < 0)
1982 scrollBar.setUp (); 2025 scrollBar.setUp ();
… …
1986 } 2029 }
1987 else 2030 else
1988 switch (ev.button) 2031 switch (ev.button)
1989 { 2032 {
1990 case Button2: 2033 case Button2:
1991 switch (scrollbar_align) 2034 switch (scrollBar.align)
1992 { 2035 {
1993 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
1994 csrO = 0; 2037 csrO = 0;
1995 break; 2038 break;
1996 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
… …
2008 2051
2009 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
2010 break; 2053 break;
2011 2054
2012 case Button1: 2055 case Button1:
2013 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2014 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
2015 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
2016 2059
2017 case Button3: 2060 case Button3:
2018 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
… …
2062 scrollBar.setIdle (); 2105 scrollBar.setIdle ();
2063 scrollbar_show (0); 2106 scrollbar_show (0);
2064 } 2107 }
2065 2108
2066#ifdef SELECTION_SCROLLING 2109#ifdef SELECTION_SCROLLING
2067 if (sel_scroll_ev.active)
2068 sel_scroll_ev.stop(); 2110 sel_scroll_ev.stop();
2069#endif 2111#endif
2070 2112
2071 if (ev.window == vt) 2113 if (ev.window == vt)
2072 { 2114 {
2073 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2115 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2097 mouse_report (ev); 2139 mouse_report (ev);
2098 } 2140 }
2099#else /* MOUSE_REPORT_DOUBLECLICK */ 2141#else /* MOUSE_REPORT_DOUBLECLICK */
2100 MEvent.button = AnyButton; 2142 MEvent.button = AnyButton;
2101 mouse_report (ev); 2143 mouse_report (ev);
2102#endif /* MOUSE_REPORT_DOUBLECLICK */ 2144#endif /* MOUSE_REPORT_DOUBLECLICK */
2103 return; 2145 return;
2104 } 2146 }
2105 2147
2106 /* 2148 /*
2107 * dumb hack to compensate for the failure of click-and-drag 2149 * dumb hack to compensate for the failure of click-and-drag
… …
2119 selection_make (ev.time); 2161 selection_make (ev.time);
2120 break; 2162 break;
2121 2163
2122 case Button2: 2164 case Button2:
2123 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2165 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); 2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2125 break; 2167 break;
2126 2168
2127#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2128 case Button4: 2170 case Button4:
2129 case Button5: 2171 case Button5:
… …
2133 2175
2134 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2135 2177
2136 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2137 i = 1; 2179 i = 1;
2138 else if (OPTION (Opt_mouseWheelScrollPage)) 2180 else if (option (Opt_mouseWheelScrollPage))
2139 i = nrow - 1; 2181 i = nrow - 1;
2140 else 2182 else
2141 i = 5; 2183 i = 5;
2142 2184
2143# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
… …
2145 { 2187 {
2146 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2147 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2148 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2149 2191
2150 if (slip_wheel_ev.at < NOW) 2192 if (!slip_wheel_ev.is_active ())
2151 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2152
2153 slip_wheel_ev.start ();
2154 } 2194 }
2155 else 2195 else
2196# endif
2156 { 2197 {
2157# endif
2158 scr_page (v, i); 2198 scr_page (v, i);
2159 scrollbar_show (1); 2199 scrollbar_show (1);
2160# ifdef MOUSE_SLIP_WHEELING
2161 } 2200 }
2162# endif
2163 } 2201 }
2164 break; 2202 break;
2165#endif 2203#endif
2166 } 2204 }
2167 } 2205 }
2168} 2206}
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 2207
2644/*}}} */ 2208/*}}} */
2645 2209
2646bool 2210bool
2647rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
… …
2696 if (ch == C0_LF) 2260 if (ch == C0_LF)
2697 nlines++; 2261 nlines++;
2698 2262
2699 refresh_count++; 2263 refresh_count++;
2700 2264
2701 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2266 {
2704 refreshnow = true;
2705 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2706 ch = NOCHAR; 2272 ch = NOCHAR;
2707 break; 2273 break;
2274 }
2708 } 2275 }
2709 2276
2710 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2712 { 2279 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2742 2309
2743 /* 2310 /*
2744 * If there have been a lot of new lines, then update the screen 2311 * 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. 2312 * 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 2313 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2314 */
2749 if (refreshnow) 2315 if (refreshnow)
2750 { 2316 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true; 2317 flag = true;
2756 scr_refresh (); 2318 scr_refresh ();
2757 want_refresh = 1; 2319 want_refresh = 1;
2758 }
2759 } 2320 }
2760 2321
2761 } 2322 }
2762 else 2323 else
2763 { 2324 {
… …
2912 { 2473 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2475 break; /* done = 1 */
2915 } 2476 }
2916 } 2477 }
2917 2478
2918 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2920 { 2481 {
2921 done = 1; 2482 done = 1;
2922 break; 2483 break;
… …
2924 } 2485 }
2925 } 2486 }
2926 2487
2927 pclose_printer (fd); 2488 pclose_printer (fd);
2928} 2489}
2929#endif /* PRINTPIPE */ 2490#endif /* PRINTPIPE */
2930/*}}} */ 2491/*}}} */
2931 2492
2932/* *INDENT-OFF* */ 2493/* *INDENT-OFF* */
2933enum { 2494enum {
2934 C1_40 = 0x40, 2495 C1_40 = 0x40,
… …
2984 process_dcs_seq (); 2545 process_dcs_seq ();
2985 break; 2546 break;
2986 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2987 process_csi_seq (); 2548 process_csi_seq ();
2988 break; 2549 break;
2989 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
2990 process_osc_seq (); 2551 process_osc_seq ();
2991 break; 2552 break;
2992#endif 2553#endif
2993 } 2554 }
2994} 2555}
… …
3084 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
3085 break; 2646 break;
3086 case '+': 2647 case '+':
3087 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
3088 break; 2649 break;
3089#if ENABLE_FRILLS 2650#if !ENABLE_MINIMAL
3090 case '6': 2651 case '6':
3091 scr_backindex (); 2652 scr_backindex ();
3092 break; 2653 break;
3093#endif 2654#endif
3094 case '7': 2655 case '7':
3095 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
3096 break; 2657 break;
3097 case '8': 2658 case '8':
3098 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
3099 break; 2660 break;
3100#if ENABLE_FRILLS 2661#if !ENABLE_MINIMAL
3101 case '9': 2662 case '9':
3102 scr_forwardindex (); 2663 scr_forwardindex ();
3103 break; 2664 break;
3104#endif 2665#endif
3105 case '=': 2666 case '=':
… …
3220rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3221{ 2782{
3222 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2784 unsigned int nargs, p;
3224 int n, ndef; 2785 int n, ndef;
3225 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3226 2787
3227 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3228 arg[--nargs] = 0;
3229 2789
3230 priv = 0; 2790 priv = 0;
3231 ch = cmd_getc (); 2791 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2793 {
3233 { /* '<' '=' '>' '?' */ 2794 /* '<' '=' '>' '?' */
3234 priv = ch; 2795 priv = ch;
3235 ch = cmd_getc (); 2796 ch = cmd_getc ();
3236 } 2797 }
3237 2798
3238 /* read any numerical arguments */ 2799 /* read any numerical arguments */
… …
3277 switch (priv) 2838 switch (priv)
3278 { 2839 {
3279 case '>': 2840 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2841 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2842 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2843 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2844 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2845 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2846 // 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 2847 // 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). 2848 // versions.
3288 // 2849 //
3289 tt_printf ("\033[>%d;94;0c", 'U'); 2850 tt_printf ("\033[>%d;95;0c", 'U');
3290 } 2851 }
3291 break; 2852 break;
2853
3292 case '?': 2854 case '?':
3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2855 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3294 process_terminal_mode (ch, priv, nargs, arg); 2856 process_terminal_mode (ch, priv, nargs, arg);
3295 break; 2857 break;
3296 } 2858 }
… …
3421 break; 2983 break;
3422 case 6: /* CPR requested */ 2984 case 6: /* CPR requested */
3423 scr_report_position (); 2985 scr_report_position ();
3424 break; 2986 break;
3425 case 7: /* unofficial extension */ 2987 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 2988 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2989 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 2990 break;
3429 case 8: /* unofficial extension */ 2991 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2992 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 2993 break;
… …
3498 break; 3060 break;
3499 case CSI_75: 3061 case CSI_75:
3500 scr_cursor (RESTORE); 3062 scr_cursor (RESTORE);
3501 break; 3063 break;
3502 3064
3503#if ENABLE_FRILLS 3065#if !ENABLE_MINIMAL
3504 case CSI_74: 3066 case CSI_74:
3505 process_window_ops (arg, nargs); 3067 process_window_ops (arg, nargs);
3506 break; 3068 break;
3507#endif 3069#endif
3508 3070
… …
3515 break; 3077 break;
3516 } 3078 }
3517} 3079}
3518/*}}} */ 3080/*}}} */
3519 3081
3520#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3521/* ARGSUSED */ 3083/* ARGSUSED */
3522void 3084void
3523rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3085rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3524{ 3086{
3525 int x, y; 3087 int x, y;
3526 XWindowAttributes wattr; 3088 XWindowAttributes wattr;
3527 Window wdummy; 3089 Window wdummy;
3528 3090
3529 dLocal (Display *, xdisp); 3091 dLocal (Display *, dpy);
3530 3092
3531 if (nargs == 0) 3093 if (nargs == 0)
3532 return; 3094 return;
3533 3095
3534 switch (args[0]) 3096 switch (args[0])
3535 { 3097 {
3536 /* 3098 /*
3537 * commands 3099 * commands
3538 */ 3100 */
3539 case 1: /* deiconify window */ 3101 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3102 XMapWindow (dpy, parent[0]);
3541 break; 3103 break;
3542 case 2: /* iconify window */ 3104 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3105 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3106 break;
3545 case 3: /* set position (pixels) */ 3107 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3108 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3109 break;
3548 case 4: /* set size (pixels) */ 3110 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3111 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3112 break;
3551 case 5: /* raise window */ 3113 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3114 XRaiseWindow (dpy, parent[0]);
3553 break; 3115 break;
3554 case 6: /* lower window */ 3116 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3117 XLowerWindow (dpy, parent[0]);
3556 break; 3118 break;
3557 case 7: /* refresh window */ 3119 case 7: /* refresh window */
3558 scr_touch (true); 3120 scr_touch (true);
3559 break; 3121 break;
3560 case 8: /* set size (chars) */ 3122 case 8: /* set size (chars) */
… …
3567 if (args[0] >= 24) /* set height (chars) */ 3129 if (args[0] >= 24) /* set height (chars) */
3568 set_widthheight ((unsigned int)width, 3130 set_widthheight ((unsigned int)width,
3569 (unsigned int) (args[1] * fheight)); 3131 (unsigned int) (args[1] * fheight));
3570 break; 3132 break;
3571 3133
3572
3573 /* 3134 /*
3574 * reports - some output format copied from XTerm 3135 * reports - some output format copied from XTerm
3575 */ 3136 */
3576 case 11: /* report window state */ 3137 case 11: /* report window state */
3577 XGetWindowAttributes (xdisp, parent[0], &wattr); 3138 XGetWindowAttributes (dpy, parent[0], &wattr);
3578 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3139 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3579 break; 3140 break;
3580 case 13: /* report window position */ 3141 case 13: /* report window position */
3581 XGetWindowAttributes (xdisp, parent[0], &wattr); 3142 XGetWindowAttributes (dpy, parent[0], &wattr);
3582 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3143 XTranslateCoordinates (dpy, parent[0], wattr.root,
3583 -wattr.border_width, -wattr.border_width, 3144 -wattr.border_width, -wattr.border_width,
3584 &x, &y, &wdummy); 3145 &x, &y, &wdummy);
3585 tt_printf ("\033[3;%d;%dt", x, y); 3146 tt_printf ("\033[3;%d;%dt", x, y);
3586 break; 3147 break;
3587 case 14: /* report window size (pixels) */ 3148 case 14: /* report window size (pixels) */
3588 XGetWindowAttributes (xdisp, parent[0], &wattr); 3149 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3150 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3590 break; 3151 break;
3591 case 18: /* report text area size (chars) */ 3152 case 18: /* report text area size (chars) */
3592 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3153 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3593 break; 3154 break;
… …
3595 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3156 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3596 break; 3157 break;
3597 case 20: /* report icon label */ 3158 case 20: /* report icon label */
3598 { 3159 {
3599 char *s; 3160 char *s;
3600 XGetIconName (xdisp, parent[0], &s); 3161 XGetIconName (dpy, parent[0], &s);
3601 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3162 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3602 XFree (s); 3163 XFree (s);
3603 } 3164 }
3604 break; 3165 break;
3605 case 21: /* report window title */ 3166 case 21: /* report window title */
3606 { 3167 {
3607 char *s; 3168 char *s;
3608 XFetchName (xdisp, parent[0], &s); 3169 XFetchName (dpy, parent[0], &s);
3609 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3170 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3610 XFree (s); 3171 XFree (s);
3611 } 3172 }
3612 break; 3173 break;
3613 } 3174 }
3614} 3175}
… …
3641 seen_esc = true; 3202 seen_esc = true;
3642 continue; 3203 continue;
3643 } 3204 }
3644 else if (ch == C0_BEL || ch == CHAR_ST) 3205 else if (ch == C0_BEL || ch == CHAR_ST)
3645 break; 3206 break;
3207 else if (ch == C0_SYN)
3208 ch = cmd_get8 ();
3646 else if (ch < 0x20) 3209 else if (ch < 0x20)
3647 return NULL; /* other control character - exit */ 3210 return NULL; /* other control character - exit */
3648 3211
3649 seen_esc = false; 3212 seen_esc = false;
3650 3213
3651 if (n >= STRING_MAX - 1) 3214 if (n >= STRING_MAX - 1)
3652 // stop at some sane length 3215 // stop at some sane length
3653 return NULL; 3216 return NULL;
3654 3217
3655 if (ch == C0_SYN)
3656 string[n++] = cmd_get8 ();
3657 else
3658 string[n++] = ch; 3218 string[n++] = ch;
3659 } 3219 }
3660 3220
3661 string[n++] = '\0'; 3221 string[n++] = '\0';
3662 3222
3663 ends_how = (ch == 0x5c ? C0_ESC : ch); 3223 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3714void 3274void
3715rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3275rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3716{ 3276{
3717 if (str[0] == '?' && !str[1]) 3277 if (str[0] == '?' && !str[1])
3718 { 3278 {
3719 unsigned short r, g, b; 3279 rgba c;
3720 pix_colors_focused[color].get (this, r, g, b); 3280 pix_colors_focused[color].get (c);
3281
3282#if XFT
3283 if (c.a != rgba::MAX_CC)
3284 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3285 else
3286#endif
3721 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3287 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3722 } 3288 }
3723 else 3289 else
3724 set_window_color (color, str); 3290 set_window_color (color, str);
3725} 3291}
3726 3292
… …
3733 int color; 3299 int color;
3734 char *buf, *name; 3300 char *buf, *name;
3735 bool query = str[0] == '?' && !str[1]; 3301 bool query = str[0] == '?' && !str[1];
3736 int saveop = op; 3302 int saveop = op;
3737 3303
3738 dLocal (Display *, xdisp); 3304 dLocal (Display *, dpy);
3739 3305
3740 assert (str != NULL); 3306 assert (str != NULL);
3307
3308 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3309 return;
3310
3741 switch (op) 3311 switch (op)
3742 { 3312 {
3743 case XTerm_name: 3313 case XTerm_name:
3744 set_title (str); 3314 set_title (str);
3745 /* FALLTHROUGH */ 3315 /* FALLTHROUGH */
… …
3759 unsigned long bytes_after; 3329 unsigned long bytes_after;
3760 unsigned char *value = 0; 3330 unsigned char *value = 0;
3761 const char *str = ""; 3331 const char *str = "";
3762 3332
3763 if (prop 3333 if (prop
3764 && XGetWindowProperty (xdisp, parent[0], 3334 && XGetWindowProperty (dpy, parent[0],
3765 prop, 0, 1<<16, 0, AnyPropertyType, 3335 prop, 0, 1<<16, 0, AnyPropertyType,
3766 &actual_type, &actual_format, 3336 &actual_type, &actual_format,
3767 &nitems, &bytes_after, &value) == Success 3337 &nitems, &bytes_after, &value) == Success
3768 && actual_type != None 3338 && actual_type != None
3769 && actual_format == 8) 3339 && actual_format == 8)
… …
3781 { 3351 {
3782 *eq = 0; 3352 *eq = 0;
3783 set_utf8_property (display->atom (str), eq + 1); 3353 set_utf8_property (display->atom (str), eq + 1);
3784 } 3354 }
3785 else 3355 else
3786 XDeleteProperty (xdisp, parent[0], 3356 XDeleteProperty (dpy, parent[0],
3787 display->atom (str)); 3357 display->atom (str));
3788 } 3358 }
3789 break; 3359 break;
3790 3360
3791 case XTerm_Color: 3361 case XTerm_Color:
… …
3801 break; 3371 break;
3802 3372
3803 if ((buf = strchr (name, ';')) != NULL) 3373 if ((buf = strchr (name, ';')) != NULL)
3804 *buf++ = '\0'; 3374 *buf++ = '\0';
3805 3375
3806 if (name[0] == '?' && !name[1]) 3376 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", op, color, r, g, b, resp);
3811 }
3812 else
3813 set_window_color (color, name);
3814 } 3377 }
3815 break; 3378 break;
3379 case Rxvt_restoreFG:
3816 case XTerm_Color00: 3380 case XTerm_Color00:
3817 process_color_seq (op, Color_fg, str, resp); 3381 process_color_seq (op, Color_fg, str, resp);
3818 break; 3382 break;
3383 case Rxvt_restoreBG:
3819 case XTerm_Color01: 3384 case XTerm_Color01:
3820 process_color_seq (op, Color_bg, str, resp); 3385 process_color_seq (op, Color_bg, str, resp);
3821 break; 3386 break;
3822#ifndef NO_CURSORCOLOR 3387#ifndef NO_CURSORCOLOR
3823 case XTerm_Color_cursor: 3388 case XTerm_Color_cursor:
… …
3844 break; 3409 break;
3845 case URxvt_Color_IT: 3410 case URxvt_Color_IT:
3846 process_color_seq (op, Color_IT, str, resp); 3411 process_color_seq (op, Color_IT, str, resp);
3847 break; 3412 break;
3848#endif 3413#endif
3849#if TRANSPARENT && TINTING 3414#if ENABLE_TRANSPARENCY
3850 case URxvt_Color_tint: 3415 case URxvt_Color_tint:
3851 process_color_seq (op, Color_tint, str, resp); 3416 process_color_seq (op, Color_tint, str, resp);
3852 check_our_parents (); 3417 {
3853 if (am_transparent) 3418 bool changed = false;
3854 want_full_refresh = want_refresh = 1;
3855 break;
3856#endif
3857 3419
3420 if (ISSET_PIXCOLOR (Color_tint))
3421 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3422 else
3423 changed = bgPixmap.unset_tint ();
3424
3425 if (changed)
3426 update_background ();
3427 }
3428
3429 break;
3430#endif
3431
3432#if BG_IMAGE_FROM_FILE
3858 case Rxvt_Pixmap: 3433 case Rxvt_Pixmap:
3859 { 3434 if (!strcmp (str, "?"))
3860 if (*str != ';')
3861 { 3435 {
3862#if XPM_BACKGROUND 3436 char str[256];
3863 scale_pixmap (""); /* reset to default scaling */ 3437
3864 set_bgPixmap (str); /* change pixmap */ 3438 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3865 scr_touch (true); 3439 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3866#endif 3440 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3441 process_xterm_seq (XTerm_title, str, CHAR_ST);
3867 } 3442 }
3868 3443 else
3444 {
3869 int changed = 0; 3445 int changed = 0;
3870 3446
3871 while ((str = strchr (str, ';')) != NULL) 3447 if (*str != ';')
3872 { 3448 {
3449 /* reset to default scaling :*/
3450 bgPixmap.unset_geometry ();
3451 if (bgPixmap.set_file (str)) /* change pixmap */
3452 changed++;
3453 str = strchr (str, ';');
3454 if (str == NULL)
3455 bgPixmap.set_defaultGeometry ();
3456 }
3457
3458 while (str)
3459 {
3873 str++; 3460 str++;
3874#if XPM_BACKGROUND 3461 if (bgPixmap.set_geometry (str))
3875 changed += scale_pixmap (str); 3462 changed++;
3876#endif 3463 str = strchr (str, ';');
3877 } 3464 }
3878 3465
3879 if (changed) 3466 if (changed)
3880 { 3467 update_background ();
3881#ifdef XPM_BACKGROUND
3882 resize_pixmap ();
3883 scr_touch (true);
3884#endif
3885 } 3468 }
3886 }
3887 break; 3469 break;
3888 3470#endif
3889 case Rxvt_restoreFG:
3890 set_window_color (Color_fg, str);
3891 break;
3892 case Rxvt_restoreBG:
3893 set_window_color (Color_bg, str);
3894 break;
3895 3471
3896 case XTerm_logfile: 3472 case XTerm_logfile:
3897 // TODO, when secure mode? 3473 // TODO, when secure mode?
3898 break; 3474 break;
3899 3475
… …
3917 case URxvt_italicFont: 3493 case URxvt_italicFont:
3918 case URxvt_boldItalicFont: 3494 case URxvt_boldItalicFont:
3919#endif 3495#endif
3920 if (query) 3496 if (query)
3921 tt_printf ("\33]%d;%-.250s%c", saveop, 3497 tt_printf ("\33]%d;%-.250s%c", saveop,
3922 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3498 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3923 ? fontset[op - URxvt_font]->fontdesc : "", 3499 ? fontset[op - URxvt_font]->fontdesc : "",
3924 resp); 3500 resp);
3925 else 3501 else
3926 { 3502 {
3927 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3503 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3938 op, 3514 op,
3939 rs[Rs_name], VERSION[0], VERSION[2], 3515 rs[Rs_name], VERSION[0], VERSION[2],
3940 resp); 3516 resp);
3941 break; 3517 break;
3942 3518
3943#if ENABLE_FRILLS 3519#if !ENABLE_MINIMAL
3944 case URxvt_locale: 3520 case URxvt_locale:
3945 if (query) 3521 if (query)
3946 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3522 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3947 else 3523 else
3948 { 3524 {
3949 set_locale (str); 3525 set_locale (str);
3950 pty->set_utf8_mode (enc_utf8); 3526 pty->set_utf8_mode (enc_utf8);
3951 init_xlocale (); 3527 init_xlocale ();
… …
3966 break; 3542 break;
3967#endif 3543#endif
3968 3544
3969#if ENABLE_PERL 3545#if ENABLE_PERL
3970 case URxvt_perl: 3546 case URxvt_perl:
3971 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3547 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3972 ; // no responses yet 3548 ; // no responses yet
3973 break; 3549 break;
3974#endif 3550#endif
3975 } 3551 }
3976} 3552}
… …
4014{ 3590{
4015 unsigned int i, j; 3591 unsigned int i, j;
4016 int state; 3592 int state;
4017 3593
4018 static const struct 3594 static const struct
4019 { 3595 {
4020 const int argval; 3596 const int argval;
4021 const unsigned long bit; 3597 const unsigned long bit;
4022 }
4023
4024 argtopriv[] = { 3598 } argtopriv[] = {
4025 { 1, PrivMode_aplCUR }, 3599 { 1, PrivMode_aplCUR },
4026 { 2, PrivMode_vt52 }, 3600 { 2, PrivMode_vt52 },
4027 { 3, PrivMode_132 }, 3601 { 3, PrivMode_132 },
4028 { 4, PrivMode_smoothScroll }, 3602 { 4, PrivMode_smoothScroll },
4029 { 5, PrivMode_rVideo }, 3603 { 5, PrivMode_rVideo },
… …
4045 { 66, PrivMode_aplKP }, 3619 { 66, PrivMode_aplKP },
4046#ifndef NO_BACKSPACE_KEY 3620#ifndef NO_BACKSPACE_KEY
4047 { 67, PrivMode_BackSpace }, 3621 { 67, PrivMode_BackSpace },
4048#endif 3622#endif
4049 { 1000, PrivMode_MouseX11 }, 3623 { 1000, PrivMode_MouseX11 },
4050 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3624 { 1002, PrivMode_MouseBtnEvent },
4051 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3625 { 1003, PrivMode_MouseAnyEvent },
4052 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4053 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3626 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4054 { 1011, PrivMode_Keypress }, // rxvt extension 3627 { 1011, PrivMode_Keypress }, // rxvt extension
4055 // 1035 enable modifiers for alt, numlock NYI 3628 // 1035 enable modifiers for alt, numlock NYI
4056 // 1036 send ESC for meta keys NYI 3629 // 1036 send ESC for meta keys NYI
4057 // 1037 send DEL for keypad delete NYI 3630 // 1037 send DEL for keypad delete NYI
4058 { 1047, PrivMode_Screen }, 3631 { 1047, PrivMode_Screen },
4059 // 1048 save and restore cursor 3632 // 1048 save and restore cursor
4060 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3633 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
4061 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3634 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3635 { 2004, PrivMode_BracketPaste },
4062 }; 3636 };
4063 3637
4064 if (nargs == 0) 3638 if (nargs == 0)
4065 return; 3639 return;
4066 3640
… …
4092 scr_touch (true); 3666 scr_touch (true);
4093 break; 3667 break;
4094#endif 3668#endif
4095 case 1048: /* alternative cursor save */ 3669 case 1048: /* alternative cursor save */
4096 case 1049: 3670 case 1049:
4097 if (OPTION (Opt_secondaryScreen)) 3671 if (option (Opt_secondaryScreen))
4098 if (mode == 0) 3672 if (mode == 0)
4099 scr_cursor (RESTORE); 3673 scr_cursor (RESTORE);
4100 else if (mode == 1) 3674 else if (mode == 1)
4101 scr_cursor (SAVE); 3675 scr_cursor (SAVE);
4102 break; 3676 break;
… …
4114 */ 3688 */
4115 PrivMode (1, PrivMode_vt52); 3689 PrivMode (1, PrivMode_vt52);
4116 break; 3690 break;
4117 case 3: /* 80/132 */ 3691 case 3: /* 80/132 */
4118 if (priv_modes & PrivMode_132OK) 3692 if (priv_modes & PrivMode_132OK)
3693 {
3694 scr_poweron ();
4119 set_widthheight (((state ? 132 : 80) * fwidth), height); 3695 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3696 }
4120 break; 3697 break;
4121 case 4: /* smooth scrolling */ 3698 case 4: /* smooth scrolling */
4122 set_option (Opt_jumpScroll, !state); 3699 set_option (Opt_jumpScroll, !state);
4123 break; 3700 break;
4124 case 5: /* reverse video */ 3701 case 5: /* reverse video */
… …
4131 scr_autowrap (state); 3708 scr_autowrap (state);
4132 break; 3709 break;
4133 /* case 8: - auto repeat, can't do on a per window basis */ 3710 /* case 8: - auto repeat, can't do on a per window basis */
4134 case 9: /* X10 mouse reporting */ 3711 case 9: /* X10 mouse reporting */
4135 if (state) /* orthogonal */ 3712 if (state) /* orthogonal */
4136 priv_modes &= ~PrivMode_MouseX11; 3713 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4137 break; 3714 break;
4138#ifdef scrollBar_esc 3715#ifdef scrollBar_esc
4139 case scrollBar_esc: 3716 case scrollBar_esc:
4140 if (scrollbar_mapping (state)) 3717 if (scrollbar_mapping (state))
4141 { 3718 {
… …
4154 break; 3731 break;
4155 /* case 66: - application key pad */ 3732 /* case 66: - application key pad */
4156 /* case 67: - backspace key */ 3733 /* case 67: - backspace key */
4157 case 1000: /* X11 mouse reporting */ 3734 case 1000: /* X11 mouse reporting */
4158 if (state) /* orthogonal */ 3735 if (state) /* orthogonal */
4159 priv_modes &= ~PrivMode_MouseX10; 3736 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4160 break; 3737 break;
4161#if 0
4162 case 1001: 3738 case 1002:
4163 break; /* X11 mouse highlighting */ 3739 case 1003:
4164#endif 3740 if (state)
3741 {
3742 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3743 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3744 vt_emask_mouse = PointerMotionMask;
3745 }
3746 else
3747 vt_emask_mouse = NoEventMask;
3748 vt_select_input ();
3749 break;
4165 case 1010: /* scroll to bottom on TTY output inhibit */ 3750 case 1010: /* scroll to bottom on TTY output inhibit */
4166 set_option (Opt_scrollTtyOutput, !state); 3751 set_option (Opt_scrollTtyOutput, !state);
4167 break; 3752 break;
4168 case 1011: /* scroll to bottom on key press */ 3753 case 1011: /* scroll to bottom on key press */
4169 set_option (Opt_scrollTtyKeypress, state); 3754 set_option (Opt_scrollTtyKeypress, state);
4170 break; 3755 break;
4171 case 1047: /* secondary screen w/ clearing last */ 3756 case 1047: /* secondary screen w/ clearing last */
4172 if (OPTION (Opt_secondaryScreen)) 3757 if (option (Opt_secondaryScreen))
4173 if (current_screen != PRIMARY) 3758 if (current_screen != PRIMARY)
4174 scr_erase_screen (2); 3759 scr_erase_screen (2);
4175 scr_change_screen (state); 3760 scr_change_screen (state);
4176 break; 3761 break;
4177 case 1049: /* secondary screen w/ clearing first */ 3762 case 1049: /* secondary screen w/ clearing first */
4178 scr_change_screen (state); 3763 scr_change_screen (state);
4179 if (OPTION (Opt_secondaryScreen)) 3764 if (option (Opt_secondaryScreen))
4180 if (current_screen != PRIMARY) 3765 if (current_screen != PRIMARY)
4181 scr_erase_screen (2); 3766 scr_erase_screen (2);
4182 break; 3767 break;
4183 default: 3768 default:
4184 break; 3769 break;
… …
4312 scr_color (Color_bg, Color_bg); 3897 scr_color (Color_bg, Color_bg);
4313 break; 3898 break;
4314 3899
4315 //case 50: // not variable spacing 3900 //case 50: // not variable spacing
4316 3901
4317#if ENABLE_FRILLS 3902#if !ENABLE_MINIMAL
4318 case 90: 3903 case 90:
4319 case 91: /* set bright fg color */ 3904 case 91: /* set bright fg color */
4320 case 92: 3905 case 92:
4321 case 93: 3906 case 93:
4322 case 94: 3907 case 94:
… …
4346rxvt_term::process_graphics () 3931rxvt_term::process_graphics ()
4347{ 3932{
4348 unicode_t ch, cmd = cmd_getc (); 3933 unicode_t ch, cmd = cmd_getc ();
4349 3934
4350 if (cmd == 'Q') 3935 if (cmd == 'Q')
3936 {
4351 { /* query graphics */ 3937 /* query graphics */
4352 tt_printf ("\033G0\012"); /* no graphics */ 3938 tt_printf ("\033G0\012"); /* no graphics */
4353 return; 3939 return;
4354 } 3940 }
4355 /* swallow other graphics sequences until terminating ':' */ 3941 /* swallow other graphics sequences until terminating ':' */
4356 do 3942 do
… …
4406 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3992 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4407 3993
4408 memcpy (v_buffer + v_buflen, data, len); 3994 memcpy (v_buffer + v_buflen, data, len);
4409 v_buflen += len; 3995 v_buflen += len;
4410 3996
4411 pty_ev.set (EVENT_READ | EVENT_WRITE); 3997 pty_ev.set (ev::READ | ev::WRITE);
4412} 3998}
4413 3999
4414void rxvt_term::pty_write () 4000void rxvt_term::pty_write ()
4415{ 4001{
4416 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4002 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4421 4007
4422 if (v_buflen == 0) 4008 if (v_buflen == 0)
4423 { 4009 {
4424 free (v_buffer); 4010 free (v_buffer);
4425 v_buffer = 0; 4011 v_buffer = 0;
4426 v_buflen = 0;
4427 4012
4428 pty_ev.set (EVENT_READ); 4013 pty_ev.set (ev::READ);
4429 return; 4014 return;
4430 } 4015 }
4431 4016
4432 memmove (v_buffer, v_buffer + written, v_buflen); 4017 memmove (v_buffer, v_buffer + written, v_buflen);
4433 } 4018 }
4434 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4019 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4435 pty_ev.set (EVENT_READ); 4020 pty_ev.set (ev::READ);
4436} 4021}
4437 4022
4438/*----------------------- end-of-file (C source) -----------------------*/ 4023/*----------------------- end-of-file (C source) -----------------------*/
4439 4024

Diff Legend

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