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.270 by root, Wed Jan 18 10:31:37 2006 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08:00 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 newlen = 1;
542 switch (keysym) 554 switch (keysym)
543 { 555 {
544#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 557 case XK_BackSpace:
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
551 } 563 }
552 else 564 else
553 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 566 break;
555#endif 567#endif
556#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
558 case XK_KP_Delete: 570 case XK_KP_Delete:
559 /* allow shift to override */ 571 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
561 { 573 {
562 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
563 break; 575 break;
564 } 576 }
565 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
566# endif 578# endif
567 case XK_Delete: 579 case XK_Delete:
568 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 581 break;
570#endif 582#endif
571 case XK_Tab: 583 case XK_Tab:
572 if (shft) 584 if (shft)
573 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
584 newlen = 0; 596 newlen = 0;
585 } 597 }
586 break; 598 break;
587 599
588#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
589 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
590 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 { 606 {
595 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break; 609 break;
598 } 610 }
… …
621 633
622#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
624 case XK_KP_Prior: 636 case XK_KP_Prior:
625 /* allow shift to override */ 637 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
627 { 639 {
628 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
629 break; 641 break;
630 } 642 }
631 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
634 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
635 break; 647 break;
636# ifdef XK_KP_Next 648# ifdef XK_KP_Next
637 case XK_KP_Next: 649 case XK_KP_Next:
638 /* allow shift to override */ 650 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
640 { 652 {
641 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
642 break; 654 break;
643 } 655 }
644 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
647 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
648 break; 660 break;
649#endif 661#endif
650 case XK_KP_Enter: 662 case XK_KP_Enter:
651 /* allow shift to override */ 663 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
653 { 665 {
654 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
655 break; 667 break;
656 } 668 }
657 669
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 716 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
706 { 718 {
707 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 721 }
710 else 722 else
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
727 break; 739 break;
728 } 740 }
729 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
742 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
743 break; 755 break;
744#ifdef XK_KP_End 756#ifdef XK_KP_End
745 case XK_KP_End: 757 case XK_KP_End:
746 /* allow shift to override */ 758 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
748 { 760 {
749 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
750 break; 762 break;
751 } 763 }
752 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
755 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
756 break; 768 break;
757#ifdef XK_KP_Home 769#ifdef XK_KP_Home
758 case XK_KP_Home: 770 case XK_KP_Home:
759 /* allow shift to override */ 771 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
761 { 773 {
762 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
763 break; 775 break;
764 } 776 }
765 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
923 1001
924#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925unsigned int 1003unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 1005{
… …
957void 1035void
958rxvt_term::flush () 1036rxvt_term::flush ()
959{ 1037{
960 flush_ev.stop (); 1038 flush_ev.stop ();
961 1039
962#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
963 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
964 { 1042 {
965 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
966 scr_clear ();
967 scr_touch (false); 1044 scr_touch (false);
968 } 1045 }
969#endif 1046#endif
970 1047
971 if (want_refresh) 1048 if (want_refresh)
… …
1017 1094
1018 display->flush (); 1095 display->flush ();
1019} 1096}
1020 1097
1021void 1098void
1022rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1023{ 1100{
1024 make_current (); 1101 make_current ();
1025 1102
1026 display->flush (); 1103 display->flush ();
1027 1104
1028 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1030} 1107}
1031 1108
1032void 1109void
1033rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1034{ 1111{
1035 make_current (); 1112 make_current ();
1036 1113
1037 refresh_limit = 1;
1038 refresh_count = 0; 1114 refresh_count = 0;
1039 flush (); 1115 flush ();
1040} 1116}
1041 1117
1042#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1043void 1119void
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1045{ 1121{
1046 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1123 want_refresh = 1;
1048
1049 w.start (w.at + BLINK_INTERVAL);
1050} 1124}
1051#endif 1125#endif
1052 1126
1053#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1054void 1128void
1055rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1056{ 1130{
1057 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1058 { 1132 {
1059 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1060 want_refresh = 1; 1134 want_refresh = 1;
1061 w.start (w.at + TEXT_BLINK_INTERVAL);
1062 } 1135 }
1063} 1136}
1064#endif 1137#endif
1065 1138
1066#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1067void 1140void
1068rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1069{ 1142{
1070 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1071 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1072 {
1073 want_refresh = 1; 1145 want_refresh = 1;
1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1075 } 1147 w.stop ();
1076} 1148}
1077#endif 1149#endif
1078 1150
1079#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1080void 1152void
1081rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1082{ 1154{
1083 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1084 { 1156 {
1085 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1086 want_refresh = 1; 1158 want_refresh = 1;
1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1088 } 1159 }
1160 else
1161 w.stop ();
1089} 1162}
1090#endif 1163#endif
1091 1164
1092#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1093void 1166void
1094rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1095{ 1168{
1096 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1098 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1099 { 1172 {
1100 if (view_start == top_row || view_start == 0) 1173 if (view_start == top_row || view_start == 0)
1101 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1102 1175
1103 want_refresh = 1; 1176 want_refresh = 1;
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1177 }
1178 else
1179 w.stop ();
1106} 1180}
1107#endif 1181#endif
1108 1182
1109#if HAVE_SCHED_YIELD 1183#if LINUX_YIELD_HACK
1110static struct event_handler 1184static struct event_handler
1111{ 1185{
1112 check_watcher cw_yield; 1186 ev::prepare yield_ev;
1113 1187
1114 void yield (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1115 { 1189 {
1116 sched_yield (); 1190 // this should really be sched_yield(), but the linux guys thought
1191 // that giving a process calling sched_yield () less cpu time than
1192 // ones with high nice levels is a useful thing to do. It surely is is
1193 // allowed by the sus... as is returning ENOSYS.
1194
1195 struct timespec ts = { 0, 0 };
1196 nanosleep (&ts, 0);
1197
1117 w.stop (); 1198 w.stop ();
1118 } 1199 }
1119 1200
1120 event_handler () 1201 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1202 : yield_ev (this, &event_handler::yield_cb)
1122 { 1203 {
1123 } 1204 }
1124} event_handler; 1205} event_handler;
1125#endif 1206#endif
1126 1207
… …
1146 cmdbuf_endp += r; 1227 cmdbuf_endp += r;
1147 return true; 1228 return true;
1148 } 1229 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1230 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1231 {
1151#if HAVE_SCHED_YIELD 1232#if LINUX_YIELD_HACK
1152 if (display->is_local) 1233 if (display->is_local)
1153 event_handler.cw_yield.start (); 1234 event_handler.yield_ev.start ();
1154#endif 1235#endif
1155 } 1236 }
1156 else 1237 else
1157 { 1238 {
1158 pty_ev.stop (); 1239 pty_ev.stop ();
1159 1240
1160 if (!OPTION (Opt_hold)) 1241 if (!option (Opt_hold))
1161 destroy (); 1242 destroy ();
1162 } 1243 }
1163 1244
1164 return false; 1245 return false;
1165} 1246}
1166 1247
1167void 1248void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1169{ 1250{
1170 make_current (); 1251 make_current ();
1171 1252
1172 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1173 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1174 while (pty_fill ()) 1255 while (pty_fill ())
1175 if (cmd_parse ()) 1256 if (cmd_parse ())
1176 break; 1257 break;
1177 1258
1178 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1179 pty_write (); 1260 pty_write ();
1180} 1261}
1181 1262
1182void 1263void
1183rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
1184{ 1265{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1266 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1267 recolour_cursor ();
1187 1268
1188#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1270 hidden_pointer = 0;
1190 1271
1191 if (OPTION (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1193#endif 1274#endif
1194} 1275}
1195 1276
1196#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1197void 1278void
1198rxvt_term::pointer_blank () 1279rxvt_term::pointer_blank ()
1199{ 1280{
1200 if (!OPTION (Opt_pointerBlank)) 1281 if (!option (Opt_pointerBlank))
1201 return; 1282 return;
1202 1283
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1284 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1285 XFlush (dpy);
1205 1286
1206 hidden_pointer = 1; 1287 hidden_pointer = 1;
1207} 1288}
1208 1289
1209void 1290void
1210rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1211{ 1292{
1212 make_current (); 1293 make_current ();
1213 1294
1214 pointer_blank (); 1295 pointer_blank ();
1215} 1296}
… …
1218void 1299void
1219rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1220{ 1301{
1221 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1222 int x, y; 1303 int x, y;
1304 int code = 32;
1223 1305
1224 x = ev.x; 1306 x = Pixel2Col (ev.x);
1225 y = ev.y; 1307 y = Pixel2Row (ev.y);
1226 pixel_position (&x, &y); 1308 if (ev.type == MotionNotify) {
1309 if (x == mouse_row && y == mouse_col)
1310 return;
1311 mouse_row = x;
1312 mouse_col = y;
1313 code += 32;
1314 }
1227 1315
1228 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1229 button_number = 3; 1317 button_number = 3;
1230 else 1318 else
1231 { 1319 {
… …
1277 x + 1, 1365 x + 1,
1278 y + 1); 1366 y + 1);
1279#endif 1367#endif
1280 1368
1281 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1282 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1283 (32 + x + 1), 1371 (32 + x + 1),
1284 (32 + y + 1)); 1372 (32 + y + 1));
1285} 1373}
1286
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296 1374
1297/*{{{ process an X event */ 1375/*{{{ process an X event */
1298void 1376void
1299rxvt_term::x_cb (XEvent &ev) 1377rxvt_term::x_cb (XEvent &ev)
1300{ 1378{
1301 make_current (); 1379 make_current ();
1302 1380
1303 dDisp; 1381 dLocal (Display *, dpy);
1304 1382
1305 if (ev.xany.window == vt 1383 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1384 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1385 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1386 return;
… …
1313 unsigned int unused_mask; 1391 unsigned int unused_mask;
1314 1392
1315 switch (ev.type) 1393 switch (ev.type)
1316 { 1394 {
1317 case KeyPress: 1395 case KeyPress:
1318#if ISO_14755 1396 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1397 break;
1324 1398
1325 case KeyRelease: 1399 case KeyRelease:
1326 { 1400 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1401 break;
1398 }
1399 1402
1400 case ButtonPress: 1403 case ButtonPress:
1401 button_press (ev.xbutton); 1404 button_press (ev.xbutton);
1402 break; 1405 break;
1403 1406
… …
1405 button_release (ev.xbutton); 1408 button_release (ev.xbutton);
1406 break; 1409 break;
1407 1410
1408 case ClientMessage: 1411 case ClientMessage:
1409 if (ev.xclient.format == 32 1412 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1413 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1414 {
1415 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1418 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1419 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1420 {
1421 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1422 destroy ();
1423 }
1414#if ENABLE_EWMH 1424#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1425 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1426 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1427 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1428 &ev);
1429#endif
1430 }
1431 }
1432#if ENABLE_XEMBED
1433 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1434 {
1435 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1436 focus_in ();
1437 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1438 focus_out ();
1439 }
1419#endif 1440#endif
1420 } 1441 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1442 break;
1461 1443
1462 /* 1444 /*
1463 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1446 * Here's my conclusion:
… …
1483 break; 1465 break;
1484 } 1466 }
1485 break; 1467 break;
1486 1468
1487 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1473 focus_in ();
1489 break; 1474 break;
1490 1475
1491 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1480 focus_out ();
1493 break; 1481 break;
1494 1482
1495 case ConfigureNotify: 1483 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */
1496 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1497 { 1488 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1490 ;
1500 1491
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1493 {
1503 seen_resize = 1; 1494 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1496 }
1506 1497 else
1498 {
1499#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ())
1501 update_background ();
1502#endif
1503 }
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1510 if (OPTION (Opt_transparent))
1511 check_our_parents ();
1512#endif
1513 } 1505 }
1514 break; 1506 break;
1515 1507
1516 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1513
1521 break; 1514 break;
1522 1515
1523 case SelectionClear: 1516 case SelectionClear:
1524 selection_clear (); 1517 selection_clear ();
… …
1534 break; 1527 break;
1535 1528
1536 case MapNotify: 1529 case MapNotify:
1537 mapped = 1; 1530 mapped = 1;
1538#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1540#endif 1533#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break; 1535 break;
1543 1536
1544 case UnmapNotify: 1537 case UnmapNotify:
… …
1546#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1548#endif 1541#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1543 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1544
1558 case GraphicsExpose: 1545 case GraphicsExpose:
1559 case Expose: 1546 case Expose:
1560 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1561 { 1548 {
1562 do 1549 do
1550 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1555
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1557
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1572 1562 }
1573 want_refresh = 1; 1563 want_refresh = 1;
1574 } 1564 }
1575 else 1565 else
1576 { 1566 {
1577 XEvent unused_event; 1567 XEvent unused_event;
1578 1568
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1570 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1572 ;
1583 1573
1584 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1585 { 1575 {
1586 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1587 scrollbar_show (0); 1577 scrollbar_show (0);
1588 } 1578 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1579 }
1595 break; 1580 break;
1596 1581
1597 case MotionNotify: 1582 case MotionNotify:
1598#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1599 if (hidden_pointer) 1584 if (hidden_pointer)
1600 pointer_unblank (); 1585 pointer_unblank ();
1601#endif 1586#endif
1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1588 || priv_modes & PrivMode_MouseAnyEvent)
1589 mouse_report (ev.xbutton);
1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1603 break; 1591 break;
1604 1592
1605 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1606 { 1594 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1597 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1599 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1601 ;
1614 1602
1615 XQueryPointer (disp, vt, 1603 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1607 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
… …
1641 1629
1642 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1643 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1644 */ 1632 */
1645 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1646 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1647 1635
1648 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1649 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1650 */ 1638 */
1651 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1684#endif 1672#endif
1685 } 1673 }
1686 } 1674 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1676 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1691 ; 1679 ;
1692 1680
1693 XQueryPointer (disp, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1685 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1687 scrollbar_size ());
1700 want_refresh = 1; 1688 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1689 scrollbar_show (1);
1703 } 1690 }
1704 break; 1691 break;
1705 } 1692 }
1706 1693
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1694#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1696 {
1712 if (hidden_cursor) 1697 if (hidden_cursor)
1713 { 1698 {
1714 hidden_cursor = 0; 1699 hidden_cursor = 0;
1715 want_refresh = 1; 1700 want_refresh = 1;
1716 } 1701 }
1717 1702
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1719 } 1704 }
1720#endif 1705#endif
1721 1706
1722#if defined(POINTER_BLANK) 1707#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1709 {
1725 if (ev.type == MotionNotify 1710 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1711 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1712 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1713 if (hidden_pointer)
… …
1740 if (!focus) 1725 if (!focus)
1741 { 1726 {
1742 focus = 1; 1727 focus = 1;
1743 want_refresh = 1; 1728 want_refresh = 1;
1744 1729
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1731
1747#if USE_XIM 1732#if USE_XIM
1748 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1749 { 1734 {
1750 IMSetStatusPosition (); 1735 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1752 } 1737 }
1753#endif 1738#endif
1754#if CURSOR_BLINK 1739#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1757#endif 1742#endif
1758#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1760 { 1745 {
1761 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1747 scr_recolour ();
1763 } 1748 }
1764#endif 1749#endif
1750#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell))
1752 {
1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1754 {
1755 h->flags &= ~XUrgencyHint;
1756 XSetWMHints (dpy, parent[0], h);
1757 }
1758 }
1759#endif
1765 } 1760 }
1766} 1761}
1767 1762
1768void 1763void
1769rxvt_term::focus_out () 1764rxvt_term::focus_out ()
… …
1777 1772
1778#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1774 if (iso14755buf)
1780 { 1775 {
1781 iso14755buf = 0; 1776 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1777# if ISO_14755
1783 scr_overlay_off (); 1778 scr_overlay_off ();
1784# endif 1779# endif
1785 } 1780 }
1786#endif 1781#endif
1787#if USE_XIM 1782#if USE_XIM
1788 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1790#endif 1785#endif
1791#if CURSOR_BLINK 1786#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1794 hidden_cursor = 0; 1790 hidden_cursor = 0;
1795#endif 1791#endif
1796#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1798 { 1794 {
… …
1801 } 1797 }
1802#endif 1798#endif
1803 } 1799 }
1804} 1800}
1805 1801
1806#if TRANSPARENT 1802void
1803rxvt_term::update_fade_color (unsigned int idx)
1804{
1805#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade])
1807 {
1808 rgba c;
1809 pix_colors [Color_fade].get (c);
1810 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1811 }
1812#endif
1813}
1814
1815#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1816void
1808rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1818{
1810 make_current (); 1819 make_current ();
1811 1820
1821 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1822 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1823 return;
1824
1825# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1826 switch (ev.type)
1813 { 1827 {
1814 case PropertyNotify: 1828 case PropertyNotify:
1815 /* 1829 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1830 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1831 * use the property to determine the pixmap. We use it later on.
1818 */ 1832 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1835 {
1822 1836 bgPixmap.set_root_pixmap ();
1823 /* FALLTHROUGH */ 1837 update_background ();
1824 case ReparentNotify: 1838 }
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1839 break;
1828 } 1840 }
1841# endif
1829} 1842}
1830#endif 1843#endif
1831 1844
1832void 1845void
1833rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1855 /*
1843 * VT window processing of button press 1856 * VT window processing of button press
1844 */ 1857 */
1845 if (ev.window == vt) 1858 if (ev.window == vt)
1846 { 1859 {
1860 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 return;
1862
1847#if ISO_14755 1863#if ISO_14755
1848 // 5.4 1864 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1866 {
1851 iso14755_54 (ev.x, ev.y); 1867 iso14755_54 (ev.x, ev.y);
… …
1893 else 1909 else
1894 { 1910 {
1895 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1897 1913
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1914 switch (ev.button)
1900 { 1915 {
1901 case Button1: 1916 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1918 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1919#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1920 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1921#else
1907 selection.rect = false; 1922 selection.rect = false;
1908#endif 1923#endif
1909 1924
1910 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1927 {
1913 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1915 else 1930 else
1916 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1917 } 1932 }
1918 else 1933 else
1919 { 1934 {
1920 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1936 MEvent.clicks++;
1922 else 1937 else
1923 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1924 1939
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1941 }
1927 1942
1928 MEvent.button = Button1; 1943 MEvent.button = Button1;
1929 break; 1944 break;
1930 1945
1931 case Button3: 1946 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1934 else 1949 else
1935 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1936 1951
1937 MEvent.button = Button3; 1952 MEvent.button = Button3;
1938 break; 1953 break;
1939 } 1954 }
1940 } 1955 }
1941 1956
1942 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1943 return; 1958 return;
1944 } 1959 }
1945 1960
… …
2012 upordown = 1; /* down */ 2027 upordown = 1; /* down */
2013 } 2028 }
2014 if (upordown) 2029 if (upordown)
2015 { 2030 {
2016#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2017 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2018#endif 2033#endif
2019 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
2020 { 2035 {
2021 if (upordown < 0) 2036 if (upordown < 0)
2022 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2108 sel_scroll_ev.stop(); 2123 sel_scroll_ev.stop();
2109#endif 2124#endif
2110 2125
2111 if (ev.window == vt) 2126 if (ev.window == vt)
2112 { 2127 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2129 return;
2130
2113#if ISO_14755 2131#if ISO_14755
2114 // 5.4 2132 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2134 return;
2117#endif 2135#endif
2136
2118 if (reportmode) 2137 if (reportmode)
2119 { 2138 {
2120 /* mouse report from vt window */ 2139 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2140 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2141 if (ev.button >= 4)
… …
2146 if (priv_modes & PrivMode_mouse_report 2165 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2166 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2167 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2168 selection_extend (ev.x, ev.y, 0);
2150 2169
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2170 switch (ev.button)
2155 { 2171 {
2156 case Button1: 2172 case Button1:
2157 case Button3: 2173 case Button3:
2158 selection_make (ev.time); 2174 selection_make (ev.time);
2159 break; 2175 break;
2176
2160 case Button2: 2177 case Button2:
2161 selection_request (ev.time, ev.x, ev.y); 2178 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2180 break;
2181
2163#ifdef MOUSE_WHEEL 2182#ifdef MOUSE_WHEEL
2164 case Button4: 2183 case Button4:
2165 case Button5: 2184 case Button5:
2166 { 2185 {
2167 int i; 2186 int i;
… …
2169 2188
2170 v = ev.button == Button4 ? UP : DN; 2189 v = ev.button == Button4 ? UP : DN;
2171 2190
2172 if (ev.state & ShiftMask) 2191 if (ev.state & ShiftMask)
2173 i = 1; 2192 i = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2193 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2194 i = nrow - 1;
2176 else 2195 else
2177 i = 5; 2196 i = 5;
2178 2197
2179# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
… …
2181 { 2200 {
2182 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2183 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2184 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2185 2204
2186 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2187 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2188
2189 slip_wheel_ev.start ();
2190 } 2206 }
2191 else 2207 else
2192 { 2208 {
2193# endif 2209# endif
2194 scr_page (v, i); 2210 scr_page (v, i);
… …
2200 break; 2216 break;
2201#endif 2217#endif
2202 } 2218 }
2203 } 2219 }
2204} 2220}
2205
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686 2221
2687/*}}} */ 2222/*}}} */
2688 2223
2689bool 2224bool
2690rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
… …
2739 if (ch == C0_LF) 2274 if (ch == C0_LF)
2740 nlines++; 2275 nlines++;
2741 2276
2742 refresh_count++; 2277 refresh_count++;
2743 2278
2744 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2280 {
2747 refreshnow = true;
2748 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2749 ch = NOCHAR; 2286 ch = NOCHAR;
2750 break; 2287 break;
2288 }
2751 } 2289 }
2752 2290
2753 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2755 { 2293 {
… …
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2785 2323
2786 /* 2324 /*
2787 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2788 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2789 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2328 */
2792 if (refreshnow) 2329 if (refreshnow)
2793 { 2330 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true; 2331 flag = true;
2799 scr_refresh (); 2332 scr_refresh ();
2800 want_refresh = 1; 2333 want_refresh = 1;
2801 }
2802 } 2334 }
2803 2335
2804 } 2336 }
2805 else 2337 else
2806 { 2338 {
… …
2822 return flag; 2354 return flag;
2823} 2355}
2824 2356
2825// read the next character 2357// read the next character
2826wchar_t 2358wchar_t
2827rxvt_term::next_char () 2359rxvt_term::next_char () NOTHROW
2828{ 2360{
2829 while (cmdbuf_ptr < cmdbuf_endp) 2361 while (cmdbuf_ptr < cmdbuf_endp)
2830 { 2362 {
2831 // assume 7-bit to be ascii ALWAYS 2363 // assume 7-bit to be ascii ALWAYS
2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2853 return NOCHAR; 2385 return NOCHAR;
2854} 2386}
2855 2387
2856// read the next octet 2388// read the next octet
2857uint32_t 2389uint32_t
2858rxvt_term::next_octet () 2390rxvt_term::next_octet () NOTHROW
2859{ 2391{
2860 return cmdbuf_ptr < cmdbuf_endp 2392 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++ 2393 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR; 2394 : NOCHAR;
2863} 2395}
2396
2397static class out_of_input out_of_input;
2864 2398
2865/* rxvt_cmd_getc () - Return next input character */ 2399/* rxvt_cmd_getc () - Return next input character */
2866/* 2400/*
2867 * Return the next input character after first passing any keyboard input 2401 * Return the next input character after first passing any keyboard input
2868 * to the command. 2402 * to the command.
2869 */ 2403 */
2870wchar_t 2404wchar_t
2871rxvt_term::cmd_getc () 2405rxvt_term::cmd_getc () THROW ((class out_of_input))
2872{ 2406{
2873 wchar_t c = next_char (); 2407 wchar_t c = next_char ();
2874 2408
2875 if (c == NOCHAR) 2409 if (c == NOCHAR)
2876 throw out_of_input; 2410 throw out_of_input;
2877 2411
2878 return c; 2412 return c;
2879} 2413}
2880 2414
2881uint32_t 2415uint32_t
2882rxvt_term::cmd_get8 () 2416rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883{ 2417{
2884 uint32_t c = next_octet (); 2418 uint32_t c = next_octet ();
2885 2419
2886 if (c == NOCHAR) 2420 if (c == NOCHAR)
2887 throw out_of_input; 2421 throw out_of_input;
… …
2953 { 2487 {
2954 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2955 break; /* done = 1 */ 2489 break; /* done = 1 */
2956 } 2490 }
2957 } 2491 }
2958 2492
2959 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2960 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2961 { 2495 {
2962 done = 1; 2496 done = 1;
2963 break; 2497 break;
… …
3025 process_dcs_seq (); 2559 process_dcs_seq ();
3026 break; 2560 break;
3027 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
3028 process_csi_seq (); 2562 process_csi_seq ();
3029 break; 2563 break;
3030 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
3031 process_osc_seq (); 2565 process_osc_seq ();
3032 break; 2566 break;
3033#endif 2567#endif
3034 } 2568 }
3035} 2569}
… …
3125 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
3126 break; 2660 break;
3127 case '+': 2661 case '+':
3128 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
3129 break; 2663 break;
3130#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3131 case '6': 2665 case '6':
3132 scr_backindex (); 2666 scr_backindex ();
3133 break; 2667 break;
3134#endif 2668#endif
3135 case '7': 2669 case '7':
3136 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
3137 break; 2671 break;
3138 case '8': 2672 case '8':
3139 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
3140 break; 2674 break;
3141#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3142 case '9': 2676 case '9':
3143 scr_forwardindex (); 2677 scr_forwardindex ();
3144 break; 2678 break;
3145#endif 2679#endif
3146 case '=': 2680 case '=':
… …
3261rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
3262{ 2796{
3263 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3264 unsigned int nargs, p; 2798 unsigned int nargs, p;
3265 int n, ndef; 2799 int n, ndef;
3266 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
3267 2801
3268 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
3269 arg[--nargs] = 0;
3270 2803
3271 priv = 0; 2804 priv = 0;
3272 ch = cmd_getc (); 2805 ch = cmd_getc ();
3273 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3274 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
… …
3308 ndef = get_byte_array_bit (csi_defaults, i); 2841 ndef = get_byte_array_bit (csi_defaults, i);
3309 for (p = 0; p < nargs; p++) 2842 for (p = 0; p < nargs; p++)
3310 if (arg[p] == -1) 2843 if (arg[p] == -1)
3311 arg[p] = ndef; 2844 arg[p] = ndef;
3312 2845
3313#ifdef DEBUG_CMD
3314 fprintf (stderr, "CSI ");
3315 for (p = 0; p < nargs; p++)
3316 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3317 fprintf (stderr, "%c\n", ch);
3318#endif
3319
3320 /* 2846 /*
3321 * private mode handling 2847 * private mode handling
3322 */ 2848 */
3323 if (priv) 2849 if (priv)
3324 { 2850 {
3325 switch (priv) 2851 switch (priv)
3326 { 2852 {
3327 case '>': 2853 case '>':
3328 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3329 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2855 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // versions.
2862 //
2863 tt_printf ("\033[>%d;95;0c", 'U');
2864 }
3330 break; 2865 break;
3331 case '?': 2866 case '?':
3332 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3333 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
3334 break; 2869 break;
… …
3460 break; 2995 break;
3461 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
3462 scr_report_position (); 2997 scr_report_position ();
3463 break; 2998 break;
3464 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
3465 if (OPTION (Opt_insecure)) 3000 if (option (Opt_insecure))
3466 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3467 break; 3002 break;
3468 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
3469 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3470 break; 3005 break;
… …
3537 break; 3072 break;
3538 case CSI_75: 3073 case CSI_75:
3539 scr_cursor (RESTORE); 3074 scr_cursor (RESTORE);
3540 break; 3075 break;
3541 3076
3542#if ENABLE_FRILLS 3077#if !ENABLE_MINIMAL
3543 case CSI_74: 3078 case CSI_74:
3544 process_window_ops (arg, nargs); 3079 process_window_ops (arg, nargs);
3545 break; 3080 break;
3546#endif 3081#endif
3547 3082
… …
3554 break; 3089 break;
3555 } 3090 }
3556} 3091}
3557/*}}} */ 3092/*}}} */
3558 3093
3559#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3560/* ARGSUSED */ 3095/* ARGSUSED */
3561void 3096void
3562rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3097rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563{ 3098{
3564 int x, y; 3099 int x, y;
3565 XWindowAttributes wattr; 3100 XWindowAttributes wattr;
3566 Window wdummy; 3101 Window wdummy;
3567 dDisp; 3102
3103 dLocal (Display *, dpy);
3568 3104
3569 if (nargs == 0) 3105 if (nargs == 0)
3570 return; 3106 return;
3571 3107
3572 switch (args[0]) 3108 switch (args[0])
3573 { 3109 {
3574 /* 3110 /*
3575 * commands 3111 * commands
3576 */ 3112 */
3577 case 1: /* deiconify window */ 3113 case 1: /* deiconify window */
3578 XMapWindow (disp, parent[0]); 3114 XMapWindow (dpy, parent[0]);
3579 break; 3115 break;
3580 case 2: /* iconify window */ 3116 case 2: /* iconify window */
3581 XIconifyWindow (disp, parent[0], display->screen); 3117 XIconifyWindow (dpy, parent[0], display->screen);
3582 break; 3118 break;
3583 case 3: /* set position (pixels) */ 3119 case 3: /* set position (pixels) */
3584 XMoveWindow (disp, parent[0], args[1], args[2]); 3120 XMoveWindow (dpy, parent[0], args[1], args[2]);
3585 break; 3121 break;
3586 case 4: /* set size (pixels) */ 3122 case 4: /* set size (pixels) */
3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588 break; 3124 break;
3589 case 5: /* raise window */ 3125 case 5: /* raise window */
3590 XRaiseWindow (disp, parent[0]); 3126 XRaiseWindow (dpy, parent[0]);
3591 break; 3127 break;
3592 case 6: /* lower window */ 3128 case 6: /* lower window */
3593 XLowerWindow (disp, parent[0]); 3129 XLowerWindow (dpy, parent[0]);
3594 break; 3130 break;
3595 case 7: /* refresh window */ 3131 case 7: /* refresh window */
3596 scr_touch (true); 3132 scr_touch (true);
3597 break; 3133 break;
3598 case 8: /* set size (chars) */ 3134 case 8: /* set size (chars) */
… …
3605 if (args[0] >= 24) /* set height (chars) */ 3141 if (args[0] >= 24) /* set height (chars) */
3606 set_widthheight ((unsigned int)width, 3142 set_widthheight ((unsigned int)width,
3607 (unsigned int) (args[1] * fheight)); 3143 (unsigned int) (args[1] * fheight));
3608 break; 3144 break;
3609 3145
3610
3611 /* 3146 /*
3612 * reports - some output format copied from XTerm 3147 * reports - some output format copied from XTerm
3613 */ 3148 */
3614 case 11: /* report window state */ 3149 case 11: /* report window state */
3615 XGetWindowAttributes (disp, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3616 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617 break; 3152 break;
3618 case 13: /* report window position */ 3153 case 13: /* report window position */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 XTranslateCoordinates (disp, parent[0], wattr.root, 3155 XTranslateCoordinates (dpy, parent[0], wattr.root,
3621 -wattr.border_width, -wattr.border_width, 3156 -wattr.border_width, -wattr.border_width,
3622 &x, &y, &wdummy); 3157 &x, &y, &wdummy);
3623 tt_printf ("\033[3;%d;%dt", x, y); 3158 tt_printf ("\033[3;%d;%dt", x, y);
3624 break; 3159 break;
3625 case 14: /* report window size (pixels) */ 3160 case 14: /* report window size (pixels) */
3626 XGetWindowAttributes (disp, parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3627 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628 break; 3163 break;
3629 case 18: /* report text area size (chars) */ 3164 case 18: /* report text area size (chars) */
3630 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631 break; 3166 break;
… …
3633 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3168 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634 break; 3169 break;
3635 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3636 { 3171 {
3637 char *s; 3172 char *s;
3638 XGetIconName (disp, parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3639 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3174 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3640 XFree (s); 3175 XFree (s);
3641 } 3176 }
3642 break; 3177 break;
3643 case 21: /* report window title */ 3178 case 21: /* report window title */
3644 { 3179 {
3645 char *s; 3180 char *s;
3646 XFetchName (disp, parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3647 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648 XFree (s); 3183 XFree (s);
3649 } 3184 }
3650 break; 3185 break;
3651 } 3186 }
3652} 3187}
… …
3679 seen_esc = true; 3214 seen_esc = true;
3680 continue; 3215 continue;
3681 } 3216 }
3682 else if (ch == C0_BEL || ch == CHAR_ST) 3217 else if (ch == C0_BEL || ch == CHAR_ST)
3683 break; 3218 break;
3219 else if (ch == C0_SYN)
3220 ch = cmd_get8 ();
3684 else if (ch < 0x20) 3221 else if (ch < 0x20)
3685 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3686 3223
3687 seen_esc = false; 3224 seen_esc = false;
3688 3225
3689 if (n >= STRING_MAX - 1) 3226 if (n >= STRING_MAX - 1)
3690 // stop at some sane length 3227 // stop at some sane length
3691 return NULL; 3228 return NULL;
3692 3229
3693 if (ch == C0_SYN)
3694 string[n++] = cmd_get8 ();
3695 else
3696 string[n++] = ch; 3230 string[n++] = ch;
3697 } 3231 }
3698 3232
3699 string[n++] = '\0'; 3233 string[n++] = '\0';
3700 3234
3701 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3752void 3286void
3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3287rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3754{ 3288{
3755 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3756 { 3290 {
3757 unsigned short r, g, b; 3291 rgba c;
3758 pix_colors_focused[color].get (display, r, g, b); 3292 pix_colors_focused[color].get (c);
3293
3294#if XFT
3295 if (c.a != rgba::MAX_CC)
3296 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3297 else
3298#endif
3759 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3299 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3760 } 3300 }
3761 else 3301 else
3762 set_window_color (color, str); 3302 set_window_color (color, str);
3763} 3303}
3764 3304
… …
3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3767 */ 3307 */
3768void 3308void
3769rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3309rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3770{ 3310{
3771 int changed = 0;
3772 int color; 3311 int color;
3773 char *buf, *name; 3312 char *buf, *name;
3774 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3775 int saveop = op; 3314 int saveop = op;
3776 dDisp; 3315
3316 dLocal (Display *, dpy);
3777 3317
3778 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3779 switch (op) 3323 switch (op)
3780 { 3324 {
3781 case XTerm_name: 3325 case XTerm_name:
3782 set_title (str); 3326 set_title (str);
3783 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3797 unsigned long bytes_after; 3341 unsigned long bytes_after;
3798 unsigned char *value = 0; 3342 unsigned char *value = 0;
3799 const char *str = ""; 3343 const char *str = "";
3800 3344
3801 if (prop 3345 if (prop
3802 && XGetWindowProperty (disp, parent[0], 3346 && XGetWindowProperty (dpy, parent[0],
3803 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3804 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3805 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3806 && actual_type != None 3350 && actual_type != None
3807 && actual_format == 8) 3351 && actual_format == 8)
3808 str = (const char *)(value); 3352 str = (const char *)(value);
3809 3353
3810 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3811 3355
3812 XFree (value); 3356 XFree (value);
3813 } 3357 }
3814 else 3358 else
3815 { 3359 {
… …
3819 { 3363 {
3820 *eq = 0; 3364 *eq = 0;
3821 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3822 } 3366 }
3823 else 3367 else
3824 XDeleteProperty (disp, parent[0], 3368 XDeleteProperty (dpy, parent[0],
3825 display->atom (str)); 3369 display->atom (str));
3826 } 3370 }
3827 break; 3371 break;
3828 3372
3829 case XTerm_Color: 3373 case XTerm_Color:
… …
3839 break; 3383 break;
3840 3384
3841 if ((buf = strchr (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3842 *buf++ = '\0'; 3386 *buf++ = '\0';
3843 3387
3844 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3845 {
3846 unsigned short r, g, b;
3847 pix_colors_focused[color].get (display, r, g, b);
3848 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3849 }
3850 else
3851 set_window_color (color, name);
3852 } 3389 }
3853 break; 3390 break;
3854 case XTerm_Color00: 3391 case XTerm_Color00:
3855 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3392 process_color_seq (op, Color_fg, str, resp);
3856 break; 3393 break;
3857 case XTerm_Color01: 3394 case XTerm_Color01:
3858 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3395 process_color_seq (op, Color_bg, str, resp);
3859 break; 3396 break;
3860#ifndef NO_CURSORCOLOR 3397#ifndef NO_CURSORCOLOR
3861 case XTerm_Color_cursor: 3398 case XTerm_Color_cursor:
3862 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3399 process_color_seq (op, Color_cursor, str, resp);
3863 break; 3400 break;
3864#endif 3401#endif
3865 case XTerm_Color_pointer_fg: 3402 case XTerm_Color_pointer_fg:
3866 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3403 process_color_seq (op, Color_pointer_fg, str, resp);
3867 break; 3404 break;
3868 case XTerm_Color_pointer_bg: 3405 case XTerm_Color_pointer_bg:
3869 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3406 process_color_seq (op, Color_pointer_bg, str, resp);
3870 break; 3407 break;
3871#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3872 case XTerm_Color_RV: 3409 case XTerm_Color_RV:
3873 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3410 process_color_seq (op, Color_RV, str, resp);
3874 break; 3411 break;
3875 case Rxvt_Color_BD: 3412 case Rxvt_Color_BD:
3876 case URxvt_Color_BD: 3413 case URxvt_Color_BD:
3877 process_color_seq (op, Color_BD, str, resp); 3414 process_color_seq (op, Color_BD, str, resp);
3878 break; 3415 break;
3879 case Rxvt_Color_UL: 3416 case Rxvt_Color_UL:
3880 case URxvt_Color_UL: 3417 case URxvt_Color_UL:
3881 process_color_seq (op, Color_UL, str, resp); 3418 process_color_seq (op, Color_UL, str, resp);
3882 break; 3419 break;
3883 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3884 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3885 break; 3422 break;
3886#endif 3423#endif
3887#if TRANSPARENT && TINTING 3424#if ENABLE_TRANSPARENCY
3888 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3889 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3890 check_our_parents (); 3427 {
3891 if (am_transparent) 3428 bool changed = false;
3892 want_full_refresh = want_refresh = 1; 3429 if (ISSET_PIXCOLOR (Color_tint))
3893 break; 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3894#endif 3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3895 3436
3437 break;
3438#endif
3439
3440#if BG_IMAGE_FROM_FILE
3896 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3897 if (*str != ';') 3442 if (!strcmp (str, "?"))
3898 { 3443 {
3899#if XPM_BACKGROUND 3444 char str[256];
3900 scale_pixmap (""); /* reset to default scaling */ 3445
3901 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3902 scr_touch (true); 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3903#endif 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3904 } 3450 }
3905 3451 else
3906 while ((str = strchr (str, ';')) != NULL)
3907 { 3452 {
3453 int changed = 0;
3454
3455 if (*str != ';')
3456 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */
3460 changed++;
3461 str = strchr (str, ';');
3462 if (str == NULL)
3463 bgPixmap.set_defaultGeometry ();
3464 }
3465 while (str)
3466 {
3908 str++; 3467 str++;
3909#if XPM_BACKGROUND 3468 if (bgPixmap.set_geometry (str))
3910 changed += scale_pixmap (str); 3469 changed++;
3911#endif 3470 str = strchr (str, ';');
3471 }
3472 if (changed)
3473 update_background ();
3912 } 3474 }
3913
3914 if (changed)
3915 {
3916#ifdef XPM_BACKGROUND
3917 resize_pixmap ();
3918 scr_touch (true);
3919#endif
3920 }
3921 break; 3475 break;
3476#endif
3922 3477
3923 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:
3924 set_window_color (Color_fg, str); 3479 set_window_color (Color_fg, str);
3925 break; 3480 break;
3926 case Rxvt_restoreBG: 3481 case Rxvt_restoreBG:
… …
3951 case URxvt_italicFont: 3506 case URxvt_italicFont:
3952 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3953#endif 3508#endif
3954 if (query) 3509 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3956 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3957 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3958 resp); 3513 resp);
3959 else 3514 else
3960 { 3515 {
3961 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3964 allocated.push_back ((void *)res); 3519 allocated.push_back ((void *)res);
3965 set_fonts (); 3520 set_fonts ();
3966 } 3521 }
3967 break; 3522 break;
3968 3523
3969#if ENABLE_FRILLS 3524 case URxvt_version:
3525 if (query)
3526 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3527 op,
3528 rs[Rs_name], VERSION[0], VERSION[2],
3529 resp);
3530 break;
3531
3532#if !ENABLE_MINIMAL
3970 case URxvt_locale: 3533 case URxvt_locale:
3971 if (query) 3534 if (query)
3972 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3973 else 3536 else
3974 { 3537 {
3975 set_locale (str); 3538 set_locale (str);
3976 pty->set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
3977 init_xlocale (); 3540 init_xlocale ();
… …
3992 break; 3555 break;
3993#endif 3556#endif
3994 3557
3995#if ENABLE_PERL 3558#if ENABLE_PERL
3996 case URxvt_perl: 3559 case URxvt_perl:
3997 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3998 ; // no responses yet 3561 ; // no responses yet
3999 break; 3562 break;
4000#endif 3563#endif
4001 } 3564 }
4002} 3565}
… …
4034 return state; 3597 return state;
4035} 3598}
4036 3599
4037/* we're not using priv _yet_ */ 3600/* we're not using priv _yet_ */
4038void 3601void
4039rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3602rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4040{ 3603{
4041 unsigned int i, j; 3604 unsigned int i, j;
4042 int state; 3605 int state;
4043 3606
4044 static const struct 3607 static const struct
4045 { 3608 {
4046 const int argval; 3609 const int argval;
4047 const unsigned long bit; 3610 const unsigned long bit;
4048 }
4049
4050 argtopriv[] = { 3611 } argtopriv[] = {
4051 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
4052 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
4053 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
4054 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
4055 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
… …
4072#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
4073 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
4074#endif 3635#endif
4075 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
4076 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4077 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
4078 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
4079 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4080 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
4081 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
4082 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
4083 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
4118 scr_touch (true); 3679 scr_touch (true);
4119 break; 3680 break;
4120#endif 3681#endif
4121 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
4122 case 1049: 3683 case 1049:
4123 if (OPTION (Opt_secondaryScreen)) 3684 if (option (Opt_secondaryScreen))
4124 if (mode == 0) 3685 if (mode == 0)
4125 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
4126 else if (mode == 1) 3687 else if (mode == 1)
4127 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
4128 break; 3689 break;
… …
4157 scr_autowrap (state); 3718 scr_autowrap (state);
4158 break; 3719 break;
4159 /* case 8: - auto repeat, can't do on a per window basis */ 3720 /* case 8: - auto repeat, can't do on a per window basis */
4160 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
4161 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4162 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4163 break; 3724 break;
4164#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
4165 case scrollBar_esc: 3726 case scrollBar_esc:
4166 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
4167 { 3728 {
… …
4180 break; 3741 break;
4181 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
4182 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
4183 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
4184 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4185 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4186 break; 3747 break;
4187#if 0 3748#if 0
4188 case 1001: 3749 case 1001:
4189 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
4190#endif 3751#endif
3752 case 1002:
3753 case 1003:
3754 if (state) {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask;
3758 } else
3759 vt_emask_mouse = NoEventMask;
3760 vt_select_input ();
3761 break;
4191 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
4192 set_option (Opt_scrollTtyOutput, !state); 3763 set_option (Opt_scrollTtyOutput, !state);
4193 break; 3764 break;
4194 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
4195 set_option (Opt_scrollTtyKeypress, state); 3766 set_option (Opt_scrollTtyKeypress, state);
4196 break; 3767 break;
4197 case 1047: /* secondary screen w/ clearing last */ 3768 case 1047: /* secondary screen w/ clearing last */
4198 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4199 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4200 scr_erase_screen (2); 3771 scr_erase_screen (2);
4201 scr_change_screen (state); 3772 scr_change_screen (state);
4202 break; 3773 break;
4203 case 1049: /* secondary screen w/ clearing first */ 3774 case 1049: /* secondary screen w/ clearing first */
4204 scr_change_screen (state); 3775 scr_change_screen (state);
4205 if (OPTION (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
4206 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4207 scr_erase_screen (2); 3778 scr_erase_screen (2);
4208 break; 3779 break;
4209 default: 3780 default:
4210 break; 3781 break;
… …
4338 scr_color (Color_bg, Color_bg); 3909 scr_color (Color_bg, Color_bg);
4339 break; 3910 break;
4340 3911
4341 //case 50: // not variable spacing 3912 //case 50: // not variable spacing
4342 3913
4343#if ENABLE_FRILLS 3914#if !ENABLE_MINIMAL
4344 case 90: 3915 case 90:
4345 case 91: /* set bright fg color */ 3916 case 91: /* set bright fg color */
4346 case 92: 3917 case 92:
4347 case 93: 3918 case 93:
4348 case 94: 3919 case 94:
… …
4432 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4433 4004
4434 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4435 v_buflen += len; 4006 v_buflen += len;
4436 4007
4437 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4438} 4009}
4439 4010
4440void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4441{ 4012{
4442 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4447 4018
4448 if (v_buflen == 0) 4019 if (v_buflen == 0)
4449 { 4020 {
4450 free (v_buffer); 4021 free (v_buffer);
4451 v_buffer = 0; 4022 v_buffer = 0;
4452 v_buflen = 0;
4453 4023
4454 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4455 return; 4025 return;
4456 } 4026 }
4457 4027
4458 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4459 } 4029 }
4460 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4461 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4462} 4032}
4463 4033
4464/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4465 4035

Diff Legend

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