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.301 by root, Tue Jan 31 21:23:13 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>
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
91 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
92 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
93 97
94 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
96 XK_ISO_Lock, 0x21eb,
97 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
98 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
99 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
100 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
101 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
294 297
295 return -1; 298 return -1;
296} 299}
297#endif 300#endif
298 301
299/*{{{ Convert the keypress event into a string */
300void 302void
301rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
302{ 304{
303 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
304 unsigned int newlen; 306 unsigned int newlen;
305 KeySym keysym; 307 KeySym keysym;
306 int valid_keysym; 308 int valid_keysym;
307 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
308 315
309 /* 316 /*
310 * 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
311 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
312 * 319 *
492# if ISO_14755 499# if ISO_14755
493 iso14755_51 (0); 500 iso14755_51 (0);
494# endif 501# endif
495 return; 502 return;
496 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
497 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
498 { 513 {
499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
500 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
501# if ISO_14755 516# if ISO_14755
503# endif 518# endif
504 return; 519 return;
505 } 520 }
506 else 521 else
507 { 522 {
508# if ENABLE_OVERLAY 523# if ISO_14755
509 scr_overlay_off (); 524 scr_overlay_off ();
510# endif 525# endif
511 iso14755buf = 0; 526 iso14755buf = 0;
512 } 527 }
513 } 528 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
517 { 532 {
518 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY 534# if ISO_14755
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif 537# endif
523 } 538 }
524#endif 539#endif
525 540
526#ifdef PRINTPIPE 541#ifdef PRINTPIPE
527 if (keysym == XK_Print) 542 if (keysym == XK_Print)
528 { 543 {
529 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
530 return; 545 return;
532#endif 547#endif
533 548
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 { 550 {
536 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
537 newlen = 1; 553 newlen = 1;
538 switch (keysym) 554 switch (keysym)
539 { 555 {
540#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
541 case XK_BackSpace: 557 case XK_BackSpace:
544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
545 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
546 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
547 } 563 }
548 else 564 else
549 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
550 break; 566 break;
551#endif 567#endif
552#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
554 case XK_KP_Delete: 570 case XK_KP_Delete:
555 /* allow shift to override */ 571 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
557 { 573 {
558 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
559 break; 575 break;
560 } 576 }
561 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
562# endif 578# endif
563 case XK_Delete: 579 case XK_Delete:
564 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
565 break; 581 break;
566#endif 582#endif
567 case XK_Tab: 583 case XK_Tab:
568 if (shft) 584 if (shft)
569 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
580 newlen = 0; 596 newlen = 0;
581 } 597 }
582 break; 598 break;
583 599
584#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
585 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
587 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
588 case XK_KP_Left: /* \033Ot or standard */
589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
590 { 606 {
591 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
592 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
593 break; 609 break;
594 } 610 }
617 633
618#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
619# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
620 case XK_KP_Prior: 636 case XK_KP_Prior:
621 /* allow shift to override */ 637 /* allow shift to override */
622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
623 { 639 {
624 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
625 break; 641 break;
626 } 642 }
627 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
630 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
631 break; 647 break;
632# ifdef XK_KP_Next 648# ifdef XK_KP_Next
633 case XK_KP_Next: 649 case XK_KP_Next:
634 /* allow shift to override */ 650 /* allow shift to override */
635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
636 { 652 {
637 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
638 break; 654 break;
639 } 655 }
640 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
643 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
644 break; 660 break;
645#endif 661#endif
646 case XK_KP_Enter: 662 case XK_KP_Enter:
647 /* allow shift to override */ 663 /* allow shift to override */
648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
649 { 665 {
650 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
651 break; 667 break;
652 } 668 }
653 669
696 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */ 716 /* allow shift to override */
701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
702 { 718 {
703 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
705 } 721 }
706 else 722 else
712 728
713 case XK_Find: 729 case XK_Find:
714 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
715 break; 731 break;
716 732
717#ifdef XK_KP_End 733#ifdef XK_KP_Insert
718 case XK_KP_Insert: 734 case XK_KP_Insert:
719 /* allow shift to override */ 735 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
721 { 737 {
722 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
723 break; 739 break;
724 } 740 }
725 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
738 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
739 break; 755 break;
740#ifdef XK_KP_End 756#ifdef XK_KP_End
741 case XK_KP_End: 757 case XK_KP_End:
742 /* allow shift to override */ 758 /* allow shift to override */
743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
744 { 760 {
745 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
746 break; 762 break;
747 } 763 }
748 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
751 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
752 break; 768 break;
753#ifdef XK_KP_Home 769#ifdef XK_KP_Home
754 case XK_KP_Home: 770 case XK_KP_Home:
755 /* allow shift to override */ 771 /* allow shift to override */
756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
757 { 773 {
758 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
759 break; 775 break;
760 } 776 }
761 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
869 return; 885 return;
870 886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
907} 923}
908/*}}} */ 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}
909 1001
910#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
911unsigned int 1003unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 1005{
943void 1035void
944rxvt_term::flush () 1036rxvt_term::flush ()
945{ 1037{
946 flush_ev.stop (); 1038 flush_ev.stop ();
947 1039
948#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
949 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
950 { 1042 {
951 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
952 scr_clear ();
953 scr_touch (false); 1044 scr_touch (false);
954 } 1045 }
955#endif 1046#endif
956 1047
957 if (want_refresh) 1048 if (want_refresh)
1003 1094
1004 display->flush (); 1095 display->flush ();
1005} 1096}
1006 1097
1007void 1098void
1008rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1009{ 1100{
1010 make_current (); 1101 make_current ();
1011 1102
1012 display->flush (); 1103 display->flush ();
1013 1104
1014 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1016} 1107}
1017 1108
1018void 1109void
1019rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1020{ 1111{
1021 make_current (); 1112 make_current ();
1022 1113
1023 refresh_limit = 1;
1024 refresh_count = 0; 1114 refresh_count = 0;
1025 flush (); 1115 flush ();
1026} 1116}
1027 1117
1028#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1029void 1119void
1030rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1031{ 1121{
1032 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1033 want_refresh = 1; 1123 want_refresh = 1;
1034
1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1036} 1124}
1037#endif 1125#endif
1038 1126
1039#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1040void 1128void
1041rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1042{ 1130{
1043 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1044 { 1132 {
1045 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1046 want_refresh = 1; 1134 want_refresh = 1;
1047 w.start (w.at + TEXT_BLINK_INTERVAL);
1048 } 1135 }
1049} 1136}
1050#endif 1137#endif
1051 1138
1052#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1053void 1140void
1054rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1055{ 1142{
1056 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1057 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1058 {
1059 want_refresh = 1; 1145 want_refresh = 1;
1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1061 } 1147 w.stop ();
1062} 1148}
1063#endif 1149#endif
1064 1150
1065#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1066void 1152void
1067rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1068{ 1154{
1069 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1070 { 1156 {
1071 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1072 want_refresh = 1; 1158 want_refresh = 1;
1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1074 } 1159 }
1160 else
1161 w.stop ();
1075} 1162}
1076#endif 1163#endif
1077 1164
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1166void
1080rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1168{
1082 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1083 || 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)
1084 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1085 { 1172 {
1086 if (view_start == top_row || view_start == 0) 1173 if (view_start == top_row || view_start == 0)
1087 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1088 1175
1089 want_refresh = 1; 1176 want_refresh = 1;
1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1177 }
1178 else
1179 w.stop ();
1180}
1181#endif
1182
1183#if LINUX_YIELD_HACK
1184static struct event_handler
1185{
1186 ev::prepare yield_ev;
1187
1188 void yield_cb (ev::prepare &w, int revents)
1189 {
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
1198 w.stop ();
1091 } 1199 }
1092} 1200
1201 event_handler ()
1202 : yield_ev (this, &event_handler::yield_cb)
1203 {
1204 }
1205} event_handler;
1093#endif 1206#endif
1094 1207
1095bool 1208bool
1096rxvt_term::pty_fill () 1209rxvt_term::pty_fill ()
1097{ 1210{
1114 cmdbuf_endp += r; 1227 cmdbuf_endp += r;
1115 return true; 1228 return true;
1116 } 1229 }
1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1230 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 { 1231 {
1119#if HAVE_SCHED_YIELD 1232#if LINUX_YIELD_HACK
1120 if (display->is_local) 1233 if (display->is_local)
1121 event_handler.cw_yield.start (); 1234 event_handler.yield_ev.start ();
1122#endif 1235#endif
1123 } 1236 }
1124 else 1237 else
1125 { 1238 {
1126 pty_ev.stop (); 1239 pty_ev.stop ();
1127 1240
1128 if (!OPTION (Opt_hold)) 1241 if (!option (Opt_hold))
1129 destroy (); 1242 destroy ();
1130 } 1243 }
1131 1244
1132 return false; 1245 return false;
1133} 1246}
1134 1247
1135void 1248void
1136rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1137{ 1250{
1138 make_current (); 1251 make_current ();
1139 1252
1140 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1141 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1255 while (pty_fill ())
1143 if (cmd_parse ()) 1256 if (cmd_parse ())
1144 break; 1257 break;
1145 1258
1146 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1147 pty_write (); 1260 pty_write ();
1148} 1261}
1149 1262
1150void 1263void
1151rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
1152{ 1265{
1153 XDefineCursor (xdisp, vt, TermWin_cursor); 1266 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1267 recolour_cursor ();
1155 1268
1156#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1270 hidden_pointer = 0;
1158 1271
1159 if (OPTION (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1161#endif 1274#endif
1162} 1275}
1163 1276
1164#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1165void 1278void
1166rxvt_term::pointer_blank () 1279rxvt_term::pointer_blank ()
1167{ 1280{
1168 if (!OPTION (Opt_pointerBlank)) 1281 if (!option (Opt_pointerBlank))
1169 return; 1282 return;
1170 1283
1171 XDefineCursor (xdisp, vt, display->blank_cursor); 1284 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (xdisp); 1285 XFlush (dpy);
1173 1286
1174 hidden_pointer = 1; 1287 hidden_pointer = 1;
1175} 1288}
1176 1289
1177void 1290void
1178rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1179{ 1292{
1180 make_current (); 1293 make_current ();
1181 1294
1182 pointer_blank (); 1295 pointer_blank ();
1183} 1296}
1186void 1299void
1187rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1188{ 1301{
1189 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1190 int x, y; 1303 int x, y;
1304 int code = 32;
1191 1305
1192 x = ev.x; 1306 x = Pixel2Col (ev.x);
1193 y = ev.y; 1307 y = Pixel2Row (ev.y);
1194 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 }
1195 1315
1196 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1197 button_number = 3; 1317 button_number = 3;
1198 else 1318 else
1199 { 1319 {
1245 x + 1, 1365 x + 1,
1246 y + 1); 1366 y + 1);
1247#endif 1367#endif
1248 1368
1249 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1250 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1251 (32 + x + 1), 1371 (32 + x + 1),
1252 (32 + y + 1)); 1372 (32 + y + 1));
1253} 1373}
1254 1374
1255/*{{{ process an X event */ 1375/*{{{ process an X event */
1256void 1376void
1257rxvt_term::x_cb (XEvent &ev) 1377rxvt_term::x_cb (XEvent &ev)
1258{ 1378{
1259 make_current (); 1379 make_current ();
1260 1380
1261 dLocal (Display *, xdisp); 1381 dLocal (Display *, dpy);
1262 1382
1263 if (ev.xany.window == vt 1383 if (ev.xany.window == vt
1264 && SHOULD_INVOKE (HOOK_X_EVENT) 1384 && SHOULD_INVOKE (HOOK_X_EVENT)
1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1385 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1266 return; 1386 return;
1271 unsigned int unused_mask; 1391 unsigned int unused_mask;
1272 1392
1273 switch (ev.type) 1393 switch (ev.type)
1274 { 1394 {
1275 case KeyPress: 1395 case KeyPress:
1276#if ISO_14755 1396 key_press (ev.xkey);
1277 if (!(iso14755buf & ISO_14755_52))
1278#endif
1279 lookup_key (ev.xkey);
1280
1281 break; 1397 break;
1282 1398
1283 case KeyRelease: 1399 case KeyRelease:
1284 { 1400 key_release (ev.xkey);
1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1286 KeySym keysym;
1287
1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1289#endif
1290
1291#if ENABLE_FRILLS || ISO_14755
1292 // ISO 14755 support
1293 if (iso14755buf)
1294 if (iso14755buf & ISO_14755_52)
1295 {
1296# if ENABLE_OVERLAY
1297 scr_overlay_off ();
1298# endif
1299# if ISO_14755
1300 // iso14755 part 5.2 handling: release time
1301 // first: controls
1302 if ((ev.xkey.state & ControlMask)
1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1305 {
1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1307 commit_iso14755 ();
1308 goto skip_switch;
1309 }
1310
1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1312 if (i[0] == keysym)
1313 {
1314 iso14755buf = ISO_14755_51 | i[1];
1315 commit_iso14755 ();
1316 goto skip_switch;
1317 }
1318
1319 scr_bell ();
1320# endif
1321 iso14755buf = 0;
1322 break;
1323 }
1324 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1325 {
1326# if ENABLE_OVERLAY
1327 scr_overlay_off ();
1328# endif
1329 if (iso14755buf & ISO_14755_51)
1330 commit_iso14755 ();
1331#if ISO_14755
1332 else if (iso14755buf & ISO_14755_STARTED)
1333 {
1334 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1335
1336 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1337 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1338 }
1339# endif
1340 else
1341 iso14755buf = 0;
1342 }
1343#endif
1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1350 if (!(ev.xkey.state & ControlMask))
1351 slip_wheel_ev.stop ();
1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1353 mouse_slip_wheel_speed = 0;
1354#endif
1355 break; 1401 break;
1356 }
1357 1402
1358 case ButtonPress: 1403 case ButtonPress:
1359 button_press (ev.xbutton); 1404 button_press (ev.xbutton);
1360 break; 1405 break;
1361 1406
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1421 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1377 destroy (); 1422 destroy ();
1378 } 1423 }
1379#if ENABLE_EWMH 1424#if ENABLE_EWMH
1380 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])
1381 XSendEvent (xdisp, ev.xclient.window = display->root, 1426 XSendEvent (dpy, ev.xclient.window = display->root,
1382 False, SubstructureRedirectMask | SubstructureNotifyMask, 1427 False, SubstructureRedirectMask | SubstructureNotifyMask,
1383 &ev); 1428 &ev);
1384#endif 1429#endif
1385 } 1430 }
1386 } 1431 }
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1437 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out (); 1438 focus_out ();
1394 } 1439 }
1395#endif 1440#endif
1396 } 1441 }
1397 break;
1398
1399 case MappingNotify:
1400 XRefreshKeyboardMapping (&ev.xmapping);
1401 break; 1442 break;
1402 1443
1403 /* 1444 /*
1404 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1405 * Here's my conclusion: 1446 * Here's my conclusion:
1424 break; 1465 break;
1425 } 1466 }
1426 break; 1467 break;
1427 1468
1428 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1429 focus_in (); 1473 focus_in ();
1430 break; 1474 break;
1431 1475
1432 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1480 focus_out ();
1434 break; 1481 break;
1435 1482
1436 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); */
1437 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1438 { 1488 {
1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1440 ; 1490 ;
1441 1491
1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1443 { 1493 {
1444 seen_resize = 1; 1494 seen_resize = 1;
1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1446 } 1496 }
1447 1497 else
1498 {
1499#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ())
1501 update_background ();
1502#endif
1503 }
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (OPTION (Opt_transparent))
1452 check_our_parents ();
1453#endif
1454 } 1505 }
1455 break; 1506 break;
1456 1507
1457 case PropertyNotify: 1508 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1476 break; 1527 break;
1477 1528
1478 case MapNotify: 1529 case MapNotify:
1479 mapped = 1; 1530 mapped = 1;
1480#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1482#endif 1533#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1535 break;
1485 1536
1486 case UnmapNotify: 1537 case UnmapNotify:
1488#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1489 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1490#endif 1541#endif
1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1492 break; 1543 break;
1493
1494#ifdef TRANSPARENT
1495 case ReparentNotify:
1496 rootwin_cb (ev);
1497 break;
1498#endif /* TRANSPARENT */
1499 1544
1500 case GraphicsExpose: 1545 case GraphicsExpose:
1501 case Expose: 1546 case Expose:
1502 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1503 { 1548 {
1504 do 1549 do
1550 {
1505 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1506 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1508 1555
1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1510 1557
1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1512 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1513 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1514 1562 }
1515 want_refresh = 1; 1563 want_refresh = 1;
1516 } 1564 }
1517 else 1565 else
1518 { 1566 {
1519 XEvent unused_event; 1567 XEvent unused_event;
1520 1568
1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1522 ; 1570 ;
1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1524 ; 1572 ;
1525 1573
1526 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1527 { 1575 {
1528 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1529 scrollbar_show (0); 1577 scrollbar_show (0);
1530 } 1578 }
1531
1532#ifdef TRANSPARENT
1533 if (am_transparent && ev.xany.window == parent[0])
1534 XClearWindow (xdisp, ev.xany.window);
1535#endif
1536 } 1579 }
1537 break; 1580 break;
1538 1581
1539 case MotionNotify: 1582 case MotionNotify:
1540#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1541 if (hidden_pointer) 1584 if (hidden_pointer)
1542 pointer_unblank (); 1585 pointer_unblank ();
1543#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);
1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1545 break; 1591 break;
1546 1592
1547 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1548 { 1594 {
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop 1597 ; // nop
1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1553 { 1599 {
1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1555 ; 1601 ;
1556 1602
1557 XQueryPointer (xdisp, vt, 1603 XQueryPointer (dpy, vt,
1558 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1559 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1560 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1561 &ev.xbutton.state); 1607 &ev.xbutton.state);
1562#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
1583 1629
1584 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1585 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1586 */ 1632 */
1587 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1588 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1589 1635
1590 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1591 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1592 */ 1638 */
1593 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
1626#endif 1672#endif
1627 } 1673 }
1628 } 1674 }
1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1630 { 1676 {
1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1632 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1633 ; 1679 ;
1634 1680
1635 XQueryPointer (xdisp, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1636 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1637 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1638 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1639 &unused_mask); 1685 &unused_mask);
1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1641 scrollbar_size ()); 1687 scrollbar_size ());
1642 want_refresh = 1; 1688 want_refresh = 1;
1643 refresh_limit = 0;
1644 scrollbar_show (1); 1689 scrollbar_show (1);
1645 } 1690 }
1646 break; 1691 break;
1647 } 1692 }
1648 1693
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK) 1694#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1653 { 1696 {
1654 if (hidden_cursor) 1697 if (hidden_cursor)
1655 { 1698 {
1656 hidden_cursor = 0; 1699 hidden_cursor = 0;
1657 want_refresh = 1; 1700 want_refresh = 1;
1658 } 1701 }
1659 1702
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1661 } 1704 }
1662#endif 1705#endif
1663 1706
1664#if defined(POINTER_BLANK) 1707#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 { 1709 {
1667 if (ev.type == MotionNotify 1710 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress 1711 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease) 1712 || ev.type == ButtonRelease)
1670 if (hidden_pointer) 1713 if (hidden_pointer)
1682 if (!focus) 1725 if (!focus)
1683 { 1726 {
1684 focus = 1; 1727 focus = 1;
1685 want_refresh = 1; 1728 want_refresh = 1;
1686 1729
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1688 1731
1689#if USE_XIM 1732#if USE_XIM
1690 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1691 { 1734 {
1692 IMSetStatusPosition (); 1735 IMSetPosition ();
1693 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1694 } 1737 }
1695#endif 1738#endif
1696#if CURSOR_BLINK 1739#if CURSOR_BLINK
1697 if (OPTION (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1699#endif 1742#endif
1700#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1701 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1702 { 1745 {
1703 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
1704 scr_recolour (); 1747 scr_recolour ();
1705 } 1748 }
1706#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
1707 } 1760 }
1708} 1761}
1709 1762
1710void 1763void
1711rxvt_term::focus_out () 1764rxvt_term::focus_out ()
1719 1772
1720#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf) 1774 if (iso14755buf)
1722 { 1775 {
1723 iso14755buf = 0; 1776 iso14755buf = 0;
1724# if ENABLE_OVERLAY 1777# if ISO_14755
1725 scr_overlay_off (); 1778 scr_overlay_off ();
1726# endif 1779# endif
1727 } 1780 }
1728#endif 1781#endif
1729#if USE_XIM 1782#if USE_XIM
1730 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1731 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1732#endif 1785#endif
1733#if CURSOR_BLINK 1786#if CURSOR_BLINK
1734 if (OPTION (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1735 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1736 hidden_cursor = 0; 1790 hidden_cursor = 0;
1737#endif 1791#endif
1738#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1739 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1740 { 1794 {
1743 } 1797 }
1744#endif 1798#endif
1745 } 1799 }
1746} 1800}
1747 1801
1748#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
1749void 1816void
1750rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1751{ 1818{
1752 make_current (); 1819 make_current ();
1753 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
1754 switch (ev.type) 1826 switch (ev.type)
1755 { 1827 {
1756 case PropertyNotify: 1828 case PropertyNotify:
1757 /* 1829 /*
1758 * 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,
1759 * 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.
1760 */ 1832 */
1761 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1762 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1763 return; 1835 {
1764 1836 bgPixmap.set_root_pixmap ();
1765 /* FALLTHROUGH */ 1837 update_background ();
1766 case ReparentNotify: 1838 }
1767 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1768 want_refresh = want_full_refresh = 1;
1769 break; 1839 break;
1770 } 1840 }
1841# endif
1771} 1842}
1772#endif 1843#endif
1773 1844
1774void 1845void
1775rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1956 upordown = 1; /* down */ 2027 upordown = 1; /* down */
1957 } 2028 }
1958 if (upordown) 2029 if (upordown)
1959 { 2030 {
1960#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1961 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1962#endif 2033#endif
1963 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
1964 { 2035 {
1965 if (upordown < 0) 2036 if (upordown < 0)
1966 scrollBar.setUp (); 2037 scrollBar.setUp ();
2103 selection_make (ev.time); 2174 selection_make (ev.time);
2104 break; 2175 break;
2105 2176
2106 case Button2: 2177 case Button2:
2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2178 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2109 break; 2180 break;
2110 2181
2111#ifdef MOUSE_WHEEL 2182#ifdef MOUSE_WHEEL
2112 case Button4: 2183 case Button4:
2113 case Button5: 2184 case Button5:
2117 2188
2118 v = ev.button == Button4 ? UP : DN; 2189 v = ev.button == Button4 ? UP : DN;
2119 2190
2120 if (ev.state & ShiftMask) 2191 if (ev.state & ShiftMask)
2121 i = 1; 2192 i = 1;
2122 else if (OPTION (Opt_mouseWheelScrollPage)) 2193 else if (option (Opt_mouseWheelScrollPage))
2123 i = nrow - 1; 2194 i = nrow - 1;
2124 else 2195 else
2125 i = 5; 2196 i = 5;
2126 2197
2127# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
2129 { 2200 {
2130 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2131 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2132 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2133 2204
2134 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2135 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2136
2137 slip_wheel_ev.start ();
2138 } 2206 }
2139 else 2207 else
2140 { 2208 {
2141# endif 2209# endif
2142 scr_page (v, i); 2210 scr_page (v, i);
2148 break; 2216 break;
2149#endif 2217#endif
2150 } 2218 }
2151 } 2219 }
2152} 2220}
2153
2154#ifdef TRANSPARENT
2155#if TINTING
2156/* taken from aterm-0.4.2 */
2157
2158typedef uint32_t RUINT32T;
2159
2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2161{
2162 int sh_r, sh_g, sh_b;
2163 RUINT32T mask_r, mask_g, mask_b;
2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2167 int i;
2168
2169 Visual *visual = term->visual;
2170
2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2172
2173 /* for convenience */
2174 mask_r = visual->red_mask;
2175 mask_g = visual->green_mask;
2176 mask_b = visual->blue_mask;
2177
2178 /* boring lookup table pre-initialization */
2179 switch (srcImage->bits_per_pixel) {
2180 case 15:
2181 if ((mask_r != 0x7c00) ||
2182 (mask_g != 0x03e0) ||
2183 (mask_b != 0x001f))
2184 return;
2185 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2186 lookup_r = lookup;
2187 lookup_g = lookup+32;
2188 lookup_b = lookup+32+32;
2189 sh_r = 10;
2190 sh_g = 5;
2191 sh_b = 0;
2192 break;
2193 case 16:
2194 if ((mask_r != 0xf800) ||
2195 (mask_g != 0x07e0) ||
2196 (mask_b != 0x001f))
2197 return;
2198 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2199 lookup_r = lookup;
2200 lookup_g = lookup+32;
2201 lookup_b = lookup+32+64;
2202 sh_r = 11;
2203 sh_g = 5;
2204 sh_b = 0;
2205 break;
2206 case 24:
2207 if ((mask_r != 0xff0000) ||
2208 (mask_g != 0x00ff00) ||
2209 (mask_b != 0x0000ff))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2212 lookup_r = lookup;
2213 lookup_g = lookup+256;
2214 lookup_b = lookup+256+256;
2215 sh_r = 16;
2216 sh_g = 8;
2217 sh_b = 0;
2218 break;
2219 case 32:
2220 if ((mask_r != 0xff0000) ||
2221 (mask_g != 0x00ff00) ||
2222 (mask_b != 0x0000ff))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2225 lookup_r = lookup;
2226 lookup_g = lookup+256;
2227 lookup_b = lookup+256+256;
2228 sh_r = 16;
2229 sh_g = 8;
2230 sh_b = 0;
2231 break;
2232 default:
2233 return; /* we do not support this color depth */
2234 }
2235
2236 /* prepare limits for color transformation (each channel is handled separately) */
2237 if (shade < 0) {
2238 shade = -shade;
2239 if (shade < 0) shade = 0;
2240 if (shade > 100) shade = 100;
2241
2242 lower_lim_r = 65535-rm;
2243 lower_lim_g = 65535-gm;
2244 lower_lim_b = 65535-bm;
2245
2246 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2247 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2248 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2249
2250 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2251 } else {
2252 if (shade < 0) shade = 0;
2253 if (shade > 100) shade = 100;
2254
2255 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2256
2257 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2258 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2259 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2260 }
2261
2262 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2263 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2264 {
2265 unsigned int tmp;
2266
2267 tmp = lower_lim_r;
2268 lower_lim_r = lower_lim_b;
2269 lower_lim_b = tmp;
2270
2271 tmp = upper_lim_r;
2272 upper_lim_r = upper_lim_b;
2273 upper_lim_b = tmp;
2274 }
2275
2276 /* fill our lookup tables */
2277 for (i = 0; i <= mask_r>>sh_r; i++)
2278 {
2279 RUINT32T tmp;
2280 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2281 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2282 lookup_r[i] = (tmp/65535)<<sh_r;
2283 }
2284 for (i = 0; i <= mask_g>>sh_g; i++)
2285 {
2286 RUINT32T tmp;
2287 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2288 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2289 lookup_g[i] = (tmp/65535)<<sh_g;
2290 }
2291 for (i = 0; i <= mask_b>>sh_b; i++)
2292 {
2293 RUINT32T tmp;
2294 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2295 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2296 lookup_b[i] = (tmp/65535)<<sh_b;
2297 }
2298
2299 /* apply table to input image (replacing colors by newly calculated ones) */
2300 switch (srcImage->bits_per_pixel)
2301 {
2302 case 15:
2303 {
2304 unsigned short *p1, *pf, *p, *pl;
2305 p1 = (unsigned short *) srcImage->data;
2306 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2307 while (p1 < pf)
2308 {
2309 p = p1;
2310 pl = p1 + srcImage->width;
2311 for (; p < pl; p++)
2312 {
2313 *p = lookup_r[(*p & 0x7c00)>>10] |
2314 lookup_g[(*p & 0x03e0)>> 5] |
2315 lookup_b[(*p & 0x001f)];
2316 }
2317 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2318 }
2319 break;
2320 }
2321 case 16:
2322 {
2323 unsigned short *p1, *pf, *p, *pl;
2324 p1 = (unsigned short *) srcImage->data;
2325 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2326 while (p1 < pf)
2327 {
2328 p = p1;
2329 pl = p1 + srcImage->width;
2330 for (; p < pl; p++)
2331 {
2332 *p = lookup_r[(*p & 0xf800)>>11] |
2333 lookup_g[(*p & 0x07e0)>> 5] |
2334 lookup_b[(*p & 0x001f)];
2335 }
2336 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2337 }
2338 break;
2339 }
2340 case 24:
2341 {
2342 unsigned char *p1, *pf, *p, *pl;
2343 p1 = (unsigned char *) srcImage->data;
2344 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2345 while (p1 < pf)
2346 {
2347 p = p1;
2348 pl = p1 + srcImage->width * 3;
2349 for (; p < pl; p += 3)
2350 {
2351 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2352 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2353 p[2] = lookup_r[(p[2] & 0x0000ff)];
2354 }
2355 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2356 }
2357 break;
2358 }
2359 case 32:
2360 {
2361 RUINT32T *p1, *pf, *p, *pl;
2362 p1 = (RUINT32T *) srcImage->data;
2363 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364
2365 while (p1 < pf)
2366 {
2367 p = p1;
2368 pl = p1 + srcImage->width;
2369 for (; p < pl; p++)
2370 {
2371 *p = lookup_r[(*p & 0xff0000)>>16] |
2372 lookup_g[(*p & 0x00ff00)>> 8] |
2373 lookup_b[(*p & 0x0000ff)] |
2374 (*p & ~0xffffff);
2375 }
2376 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2377 }
2378 break;
2379 }
2380 }
2381
2382 free (lookup);
2383}
2384#endif
2385
2386/*
2387 * Check our parents are still who we think they are.
2388 * Do transparency updates if required
2389 */
2390int
2391rxvt_term::check_our_parents ()
2392{
2393 int i, pchanged, aformat, have_pixmap, rootdepth;
2394 unsigned long nitems, bytes_after;
2395 Atom atype;
2396 unsigned char *prop = NULL;
2397 Window root, oldp, *list;
2398 Pixmap rootpixmap = None;
2399 XWindowAttributes wattr, wrootattr;
2400
2401 pchanged = 0;
2402
2403 if (!OPTION (Opt_transparent))
2404 return pchanged; /* Don't try any more */
2405
2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2407 rootdepth = wrootattr.depth;
2408
2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2410
2411 if (rootdepth != wattr.depth)
2412 {
2413 if (am_transparent)
2414 {
2415 pchanged = 1;
2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2417 am_transparent = am_pixmap_trans = 0;
2418 }
2419
2420 return pchanged; /* Don't try any more */
2421 }
2422
2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2424 XSync (xdisp, False);
2425
2426 /*
2427 * Make the frame window set by the window manager have
2428 * the root background. Some window managers put multiple nested frame
2429 * windows for each client, so we have to take care about that.
2430 */
2431 i = (xa[XA_XROOTPMAP_ID]
2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success);
2435
2436 if (!i || prop == NULL)
2437 i = (xa[XA_ESETROOT_PMAP_ID]
2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2440 &nitems, &bytes_after, &prop) == Success);
2441
2442 if (!i || prop == NULL
2443#if TINTING
2444 || !ISSET_PIXCOLOR (Color_tint)
2445#endif
2446 )
2447 have_pixmap = 0;
2448 else
2449 {
2450 have_pixmap = 1;
2451 rootpixmap = *(Pixmap *)prop;
2452 XFree (prop);
2453 }
2454
2455 if (have_pixmap)
2456 {
2457 /*
2458 * Copy display->root pixmap transparency
2459 */
2460 int sx, sy, nx, ny;
2461 unsigned int nw, nh;
2462 Window cr;
2463 XImage *image;
2464 GC gc;
2465 XGCValues gcvalue;
2466
2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2468 0, 0, &sx, &sy, &cr);
2469 nw = (unsigned int)szHint.width;
2470 nh = (unsigned int)szHint.height;
2471 nx = ny = 0;
2472
2473 if (sx < 0)
2474 {
2475 nw += sx;
2476 nx = -sx;
2477 sx = 0;
2478 }
2479
2480 if (sy < 0)
2481 {
2482 nh += sy;
2483 ny = -sy;
2484 sy = 0;
2485 }
2486
2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2489
2490 XSync (xdisp, False);
2491 allowedxerror = -1;
2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2493
2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2495 /* XXX: may need a delay here? */
2496 allowedxerror = 0;
2497
2498 if (image == NULL)
2499 {
2500 if (am_transparent && am_pixmap_trans)
2501 {
2502 pchanged = 1;
2503 if (pixmap != None)
2504 {
2505 XFreePixmap (xdisp, pixmap);
2506 pixmap = None;
2507 }
2508 }
2509
2510 am_pixmap_trans = 0;
2511 }
2512 else
2513 {
2514 if (pixmap != None)
2515 XFreePixmap (xdisp, pixmap);
2516
2517#if TINTING
2518 if (ISSET_PIXCOLOR (Color_tint))
2519 {
2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2521
2522 rgba c;
2523 pix_colors_focused [Color_tint].get (c);
2524
2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2526 }
2527#endif
2528
2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2532 nx, ny, image->width, image->height);
2533 XFreeGC (xdisp, gc);
2534 XDestroyImage (image);
2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2536 XClearWindow (xdisp, parent[0]);
2537
2538 if (!am_transparent || !am_pixmap_trans)
2539 pchanged = 1;
2540
2541 am_transparent = am_pixmap_trans = 1;
2542 }
2543 }
2544
2545 if (am_pixmap_trans)
2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2547 else
2548 {
2549 unsigned int n;
2550 /*
2551 * InheritPixmap transparency
2552 */
2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2554 {
2555 oldp = parent[i];
2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2557 XFree (list);
2558
2559 if (parent[i] == display->root)
2560 {
2561 if (oldp != None)
2562 pchanged = 1;
2563
2564 break;
2565 }
2566
2567 if (oldp != parent[i])
2568 pchanged = 1;
2569 }
2570
2571 n = 0;
2572
2573 if (pchanged)
2574 for (; n < (unsigned int)i; n++)
2575 {
2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2579 {
2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2581 break;
2582 }
2583 }
2584
2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2586 {
2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2589 am_transparent = 0;
2590 /* XXX: also turn off Opt_transparent? */
2591 }
2592 else
2593 {
2594 for (n = 0; n < (unsigned int)i; n++)
2595 {
2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2597 XClearWindow (xdisp, parent[n]);
2598 }
2599
2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2601 am_transparent = 1;
2602 }
2603
2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2605 parent[i] = None;
2606 }
2607
2608 if (scrollBar.win)
2609 {
2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2611 scrollBar.setIdle ();
2612 scrollbar_show (0);
2613 }
2614
2615 if (am_transparent)
2616 {
2617 want_refresh = want_full_refresh = 1;
2618 if (am_pixmap_trans)
2619 flush ();
2620 }
2621
2622 return pchanged;
2623}
2624#endif
2625 2221
2626/*}}} */ 2222/*}}} */
2627 2223
2628bool 2224bool
2629rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
2678 if (ch == C0_LF) 2274 if (ch == C0_LF)
2679 nlines++; 2275 nlines++;
2680 2276
2681 refresh_count++; 2277 refresh_count++;
2682 2278
2683 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2685 { 2280 {
2686 refreshnow = true;
2687 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2688 ch = NOCHAR; 2286 ch = NOCHAR;
2689 break; 2287 break;
2288 }
2690 } 2289 }
2691 2290
2692 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2693 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2694 { 2293 {
2722 && 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))))
2723 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2724 2323
2725 /* 2324 /*
2726 * 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
2727 * 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.
2728 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2729 * is incremented here because we must be doing flat-out scrolling.
2730 */ 2328 */
2731 if (refreshnow) 2329 if (refreshnow)
2732 { 2330 {
2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2734 refresh_limit++;
2735 else
2736 {
2737 flag = true; 2331 flag = true;
2738 scr_refresh (); 2332 scr_refresh ();
2739 want_refresh = 1; 2333 want_refresh = 1;
2740 }
2741 } 2334 }
2742 2335
2743 } 2336 }
2744 else 2337 else
2745 { 2338 {
2894 { 2487 {
2895 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2896 break; /* done = 1 */ 2489 break; /* done = 1 */
2897 } 2490 }
2898 } 2491 }
2899 2492
2900 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2901 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2902 { 2495 {
2903 done = 1; 2496 done = 1;
2904 break; 2497 break;
2966 process_dcs_seq (); 2559 process_dcs_seq ();
2967 break; 2560 break;
2968 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
2969 process_csi_seq (); 2562 process_csi_seq ();
2970 break; 2563 break;
2971 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
2972 process_osc_seq (); 2565 process_osc_seq ();
2973 break; 2566 break;
2974#endif 2567#endif
2975 } 2568 }
2976} 2569}
3202rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
3203{ 2796{
3204 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3205 unsigned int nargs, p; 2798 unsigned int nargs, p;
3206 int n, ndef; 2799 int n, ndef;
3207 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
3208 2801
3209 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
3210 arg[--nargs] = 0;
3211 2803
3212 priv = 0; 2804 priv = 0;
3213 ch = cmd_getc (); 2805 ch = cmd_getc ();
3214 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3215 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
3259 switch (priv) 2851 switch (priv)
3260 { 2852 {
3261 case '>': 2853 case '>':
3262 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3263 { 2855 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 // 2858 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3269 // that we do not support xterm mouse reporting (should be 95 when we do). 2861 // versions.
3270 // 2862 //
3271 tt_printf ("\033[>%d;94;0c", 'U'); 2863 tt_printf ("\033[>%d;95;0c", 'U');
3272 } 2864 }
3273 break; 2865 break;
3274 case '?': 2866 case '?':
3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3276 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
3403 break; 2995 break;
3404 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
3405 scr_report_position (); 2997 scr_report_position ();
3406 break; 2998 break;
3407 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
3408 if (OPTION (Opt_insecure)) 3000 if (option (Opt_insecure))
3409 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3410 break; 3002 break;
3411 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
3412 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3413 break; 3005 break;
3506{ 3098{
3507 int x, y; 3099 int x, y;
3508 XWindowAttributes wattr; 3100 XWindowAttributes wattr;
3509 Window wdummy; 3101 Window wdummy;
3510 3102
3511 dLocal (Display *, xdisp); 3103 dLocal (Display *, dpy);
3512 3104
3513 if (nargs == 0) 3105 if (nargs == 0)
3514 return; 3106 return;
3515 3107
3516 switch (args[0]) 3108 switch (args[0])
3517 { 3109 {
3518 /* 3110 /*
3519 * commands 3111 * commands
3520 */ 3112 */
3521 case 1: /* deiconify window */ 3113 case 1: /* deiconify window */
3522 XMapWindow (xdisp, parent[0]); 3114 XMapWindow (dpy, parent[0]);
3523 break; 3115 break;
3524 case 2: /* iconify window */ 3116 case 2: /* iconify window */
3525 XIconifyWindow (xdisp, parent[0], display->screen); 3117 XIconifyWindow (dpy, parent[0], display->screen);
3526 break; 3118 break;
3527 case 3: /* set position (pixels) */ 3119 case 3: /* set position (pixels) */
3528 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3120 XMoveWindow (dpy, parent[0], args[1], args[2]);
3529 break; 3121 break;
3530 case 4: /* set size (pixels) */ 3122 case 4: /* set size (pixels) */
3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3532 break; 3124 break;
3533 case 5: /* raise window */ 3125 case 5: /* raise window */
3534 XRaiseWindow (xdisp, parent[0]); 3126 XRaiseWindow (dpy, parent[0]);
3535 break; 3127 break;
3536 case 6: /* lower window */ 3128 case 6: /* lower window */
3537 XLowerWindow (xdisp, parent[0]); 3129 XLowerWindow (dpy, parent[0]);
3538 break; 3130 break;
3539 case 7: /* refresh window */ 3131 case 7: /* refresh window */
3540 scr_touch (true); 3132 scr_touch (true);
3541 break; 3133 break;
3542 case 8: /* set size (chars) */ 3134 case 8: /* set size (chars) */
3553 3145
3554 /* 3146 /*
3555 * reports - some output format copied from XTerm 3147 * reports - some output format copied from XTerm
3556 */ 3148 */
3557 case 11: /* report window state */ 3149 case 11: /* report window state */
3558 XGetWindowAttributes (xdisp, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3560 break; 3152 break;
3561 case 13: /* report window position */ 3153 case 13: /* report window position */
3562 XGetWindowAttributes (xdisp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3563 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3155 XTranslateCoordinates (dpy, parent[0], wattr.root,
3564 -wattr.border_width, -wattr.border_width, 3156 -wattr.border_width, -wattr.border_width,
3565 &x, &y, &wdummy); 3157 &x, &y, &wdummy);
3566 tt_printf ("\033[3;%d;%dt", x, y); 3158 tt_printf ("\033[3;%d;%dt", x, y);
3567 break; 3159 break;
3568 case 14: /* report window size (pixels) */ 3160 case 14: /* report window size (pixels) */
3569 XGetWindowAttributes (xdisp, parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3571 break; 3163 break;
3572 case 18: /* report text area size (chars) */ 3164 case 18: /* report text area size (chars) */
3573 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3574 break; 3166 break;
3576 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3168 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3577 break; 3169 break;
3578 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3579 { 3171 {
3580 char *s; 3172 char *s;
3581 XGetIconName (xdisp, parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3582 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 */
3583 XFree (s); 3175 XFree (s);
3584 } 3176 }
3585 break; 3177 break;
3586 case 21: /* report window title */ 3178 case 21: /* report window title */
3587 { 3179 {
3588 char *s; 3180 char *s;
3589 XFetchName (xdisp, parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3590 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 */
3591 XFree (s); 3183 XFree (s);
3592 } 3184 }
3593 break; 3185 break;
3594 } 3186 }
3595} 3187}
3622 seen_esc = true; 3214 seen_esc = true;
3623 continue; 3215 continue;
3624 } 3216 }
3625 else if (ch == C0_BEL || ch == CHAR_ST) 3217 else if (ch == C0_BEL || ch == CHAR_ST)
3626 break; 3218 break;
3219 else if (ch == C0_SYN)
3220 ch = cmd_get8 ();
3627 else if (ch < 0x20) 3221 else if (ch < 0x20)
3628 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3629 3223
3630 seen_esc = false; 3224 seen_esc = false;
3631 3225
3632 if (n >= STRING_MAX - 1) 3226 if (n >= STRING_MAX - 1)
3633 // stop at some sane length 3227 // stop at some sane length
3634 return NULL; 3228 return NULL;
3635 3229
3636 if (ch == C0_SYN)
3637 string[n++] = cmd_get8 ();
3638 else
3639 string[n++] = ch; 3230 string[n++] = ch;
3640 } 3231 }
3641 3232
3642 string[n++] = '\0'; 3233 string[n++] = '\0';
3643 3234
3644 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
3720 int color; 3311 int color;
3721 char *buf, *name; 3312 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3723 int saveop = op; 3314 int saveop = op;
3724 3315
3725 dLocal (Display *, xdisp); 3316 dLocal (Display *, dpy);
3726 3317
3727 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
3728 switch (op) 3323 switch (op)
3729 { 3324 {
3730 case XTerm_name: 3325 case XTerm_name:
3731 set_title (str); 3326 set_title (str);
3732 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
3746 unsigned long bytes_after; 3341 unsigned long bytes_after;
3747 unsigned char *value = 0; 3342 unsigned char *value = 0;
3748 const char *str = ""; 3343 const char *str = "";
3749 3344
3750 if (prop 3345 if (prop
3751 && XGetWindowProperty (xdisp, parent[0], 3346 && XGetWindowProperty (dpy, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3350 && actual_type != None
3756 && actual_format == 8) 3351 && actual_format == 8)
3768 { 3363 {
3769 *eq = 0; 3364 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3771 } 3366 }
3772 else 3367 else
3773 XDeleteProperty (xdisp, parent[0], 3368 XDeleteProperty (dpy, parent[0],
3774 display->atom (str)); 3369 display->atom (str));
3775 } 3370 }
3776 break; 3371 break;
3777 3372
3778 case XTerm_Color: 3373 case XTerm_Color:
3824 break; 3419 break;
3825 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3826 process_color_seq (op, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3827 break; 3422 break;
3828#endif 3423#endif
3829#if TRANSPARENT && TINTING 3424#if ENABLE_TRANSPARENCY
3830 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3831 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3427 {
3428 bool changed = false;
3429 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3832 3436
3833 check_our_parents ();
3834
3835 if (am_transparent)
3836 want_full_refresh = want_refresh = 1;
3837
3838 break; 3437 break;
3839#endif 3438#endif
3840 3439
3440#if BG_IMAGE_FROM_FILE
3841 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3842 { 3442 if (!strcmp (str, "?"))
3843 if (*str != ';')
3844 { 3443 {
3845#if XPM_BACKGROUND 3444 char str[256];
3846 scale_pixmap (""); /* reset to default scaling */ 3445
3847 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3848 scr_touch (true); 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3849#endif 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3850 } 3450 }
3851 3451 else
3452 {
3852 int changed = 0; 3453 int changed = 0;
3853 3454
3854 while ((str = strchr (str, ';')) != NULL) 3455 if (*str != ';')
3855 { 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 {
3856 str++; 3467 str++;
3857#if XPM_BACKGROUND 3468 if (bgPixmap.set_geometry (str))
3858 changed += scale_pixmap (str); 3469 changed++;
3859#endif 3470 str = strchr (str, ';');
3860 } 3471 }
3861
3862 if (changed) 3472 if (changed)
3863 { 3473 update_background ();
3864#ifdef XPM_BACKGROUND
3865 resize_pixmap ();
3866 scr_touch (true);
3867#endif
3868 } 3474 }
3869 }
3870 break; 3475 break;
3476#endif
3871 3477
3872 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:
3873 set_window_color (Color_fg, str); 3479 set_window_color (Color_fg, str);
3874 break; 3480 break;
3875 case Rxvt_restoreBG: 3481 case Rxvt_restoreBG:
3900 case URxvt_italicFont: 3506 case URxvt_italicFont:
3901 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3902#endif 3508#endif
3903 if (query) 3509 if (query)
3904 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3905 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3906 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3907 resp); 3513 resp);
3908 else 3514 else
3909 { 3515 {
3910 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
3924 break; 3530 break;
3925 3531
3926#if !ENABLE_MINIMAL 3532#if !ENABLE_MINIMAL
3927 case URxvt_locale: 3533 case URxvt_locale:
3928 if (query) 3534 if (query)
3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3930 else 3536 else
3931 { 3537 {
3932 set_locale (str); 3538 set_locale (str);
3933 pty->set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
3934 init_xlocale (); 3540 init_xlocale ();
3949 break; 3555 break;
3950#endif 3556#endif
3951 3557
3952#if ENABLE_PERL 3558#if ENABLE_PERL
3953 case URxvt_perl: 3559 case URxvt_perl:
3954 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)))
3955 ; // no responses yet 3561 ; // no responses yet
3956 break; 3562 break;
3957#endif 3563#endif
3958 } 3564 }
3959} 3565}
3997{ 3603{
3998 unsigned int i, j; 3604 unsigned int i, j;
3999 int state; 3605 int state;
4000 3606
4001 static const struct 3607 static const struct
4002 { 3608 {
4003 const int argval; 3609 const int argval;
4004 const unsigned long bit; 3610 const unsigned long bit;
4005 }
4006
4007 argtopriv[] = { 3611 } argtopriv[] = {
4008 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
4009 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
4010 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
4011 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
4012 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
4029#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
4030 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
4031#endif 3635#endif
4032 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
4033 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4034 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
4035 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
4036 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4037 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
4038 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
4039 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
4040 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
4075 scr_touch (true); 3679 scr_touch (true);
4076 break; 3680 break;
4077#endif 3681#endif
4078 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
4079 case 1049: 3683 case 1049:
4080 if (OPTION (Opt_secondaryScreen)) 3684 if (option (Opt_secondaryScreen))
4081 if (mode == 0) 3685 if (mode == 0)
4082 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
4083 else if (mode == 1) 3687 else if (mode == 1)
4084 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
4085 break; 3689 break;
4114 scr_autowrap (state); 3718 scr_autowrap (state);
4115 break; 3719 break;
4116 /* 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 */
4117 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
4118 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4119 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4120 break; 3724 break;
4121#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
4122 case scrollBar_esc: 3726 case scrollBar_esc:
4123 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
4124 { 3728 {
4137 break; 3741 break;
4138 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
4139 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
4140 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
4141 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4142 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4143 break; 3747 break;
4144#if 0 3748#if 0
4145 case 1001: 3749 case 1001:
4146 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
4147#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;
4148 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
4149 set_option (Opt_scrollTtyOutput, !state); 3763 set_option (Opt_scrollTtyOutput, !state);
4150 break; 3764 break;
4151 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
4152 set_option (Opt_scrollTtyKeypress, state); 3766 set_option (Opt_scrollTtyKeypress, state);
4153 break; 3767 break;
4154 case 1047: /* secondary screen w/ clearing last */ 3768 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 3771 scr_erase_screen (2);
4158 scr_change_screen (state); 3772 scr_change_screen (state);
4159 break; 3773 break;
4160 case 1049: /* secondary screen w/ clearing first */ 3774 case 1049: /* secondary screen w/ clearing first */
4161 scr_change_screen (state); 3775 scr_change_screen (state);
4162 if (OPTION (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
4163 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4164 scr_erase_screen (2); 3778 scr_erase_screen (2);
4165 break; 3779 break;
4166 default: 3780 default:
4167 break; 3781 break;
4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4390 4004
4391 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4392 v_buflen += len; 4006 v_buflen += len;
4393 4007
4394 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4395} 4009}
4396 4010
4397void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4398{ 4012{
4399 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));
4404 4018
4405 if (v_buflen == 0) 4019 if (v_buflen == 0)
4406 { 4020 {
4407 free (v_buffer); 4021 free (v_buffer);
4408 v_buffer = 0; 4022 v_buffer = 0;
4409 v_buflen = 0;
4410 4023
4411 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4412 return; 4025 return;
4413 } 4026 }
4414 4027
4415 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4416 } 4029 }
4417 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4418 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4419} 4032}
4420 4033
4421/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4422 4035

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines