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.333 by ayin, Tue Jun 26 09:55:22 2007 UTC vs.
Revision 1.381 by root, Fri Dec 14 05:25:23 2007 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
94 XK_ISO_Left_Tab, 0x21e6, 94 XK_ISO_Left_Tab, 0x21e6,
95 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
96 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
97 97
98 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
99 XK_ISO_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
101 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
102 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
103 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
104 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
… …
519# endif 518# endif
520 return; 519 return;
521 } 520 }
522 else 521 else
523 { 522 {
524# if ENABLE_OVERLAY 523# if ISO_14755
525 scr_overlay_off (); 524 scr_overlay_off ();
526# endif 525# endif
527 iso14755buf = 0; 526 iso14755buf = 0;
528 } 527 }
529 } 528 }
530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
532 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
533 { 532 {
534 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
535# if ENABLE_OVERLAY 534# if ISO_14755
536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
537 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
538# endif 537# endif
539 } 538 }
540#endif 539#endif
… …
548#endif 547#endif
549 548
550 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
551 { 550 {
552 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
553 newlen = 1; 553 newlen = 1;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
554 switch (keysym) 584 switch (keysym)
555 { 585 {
556#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
557 case XK_BackSpace: 587 case XK_BackSpace:
558 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
561 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
562 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
563 } 593 }
564 else 594 else
565 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
566 break; 596 break;
567#endif 597#endif
568#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
569# ifdef XK_KP_Prior
570 case XK_KP_Delete:
571 /* allow shift to override */
572 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
573 {
574 strcpy (kbuf, "\033On");
575 break;
576 }
577 /* FALLTHROUGH */
578# endif
579 case XK_Delete: 599 case XK_Delete:
580 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
581 break; 601 break;
582#endif 602#endif
583 case XK_Tab: 603 case XK_Tab:
584 if (shft) 604 if (shft)
585 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
595#endif 615#endif
596 newlen = 0; 616 newlen = 0;
597 } 617 }
598 break; 618 break;
599 619
600#ifdef XK_KP_Left
601 case XK_KP_Up: /* \033Ox or standard */
602 case XK_KP_Down: /* \033Or or standard */
603 case XK_KP_Right: /* \033Ov or standard */
604 case XK_KP_Left: /* \033Ot or standard */
605 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
606 {
607 strcpy (kbuf, "\033OZ");
608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
609 break;
610 }
611 else
612 /* translate to std. cursor key */
613 keysym = XK_Left + (keysym - XK_KP_Left);
614 /* FALLTHROUGH */
615#endif
616 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
617 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
618 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
619 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
620 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
630 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
631 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
632 break; 636 break;
633 637
634#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
635# ifdef XK_KP_Prior
636 case XK_KP_Prior:
637 /* allow shift to override */
638 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
639 {
640 strcpy (kbuf, "\033Oy");
641 break;
642 }
643 /* FALLTHROUGH */
644# endif
645 case XK_Prior: 639 case XK_Prior:
646 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
647 break; 641 break;
648# ifdef XK_KP_Next
649 case XK_KP_Next:
650 /* allow shift to override */
651 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
652 {
653 strcpy (kbuf, "\033Os");
654 break;
655 }
656 /* FALLTHROUGH */
657# endif
658 case XK_Next: 642 case XK_Next:
659 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
660 break; 644 break;
661#endif 645#endif
662 case XK_KP_Enter: 646 case XK_KP_Enter:
663 /* allow shift to override */ 647 /* allow shift to override */
664 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
665 { 649 {
666 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
667 break; 651 break;
668 } 652 }
669 653
… …
681 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
682 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
683 } 667 }
684 break; 668 break;
685 669
686#ifdef XK_KP_Begin
687 case XK_KP_Begin:
688 strcpy (kbuf, "\033Ou");
689 break;
690
691#endif
692 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
693 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
694 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
695 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
696 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
712 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
713 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
714 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
715 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
716 /* allow shift to override */ 694 /* allow shift to override */
717 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
718 { 696 {
719 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
720 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
721 } 699 }
722 else 700 else
… …
728 706
729 case XK_Find: 707 case XK_Find:
730 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
731 break; 709 break;
732 710
733#ifdef XK_KP_End
734 case XK_KP_Insert:
735 /* allow shift to override */
736 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
737 {
738 strcpy (kbuf, "\033Op");
739 break;
740 }
741 /* FALLTHROUGH */
742#endif
743 case XK_Insert: 711 case XK_Insert:
744 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
745 break; 713 break;
746#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
747 case DXK_Remove: 715 case DXK_Remove:
… …
751 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
752 break; 720 break;
753 case XK_Select: 721 case XK_Select:
754 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
755 break; 723 break;
756#ifdef XK_KP_End
757 case XK_KP_End:
758 /* allow shift to override */
759 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
760 {
761 strcpy (kbuf, "\033Oq");
762 break;
763 }
764 /* FALLTHROUGH */
765#endif
766 case XK_End: 724 case XK_End:
767 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
768 break; 726 break;
769#ifdef XK_KP_Home
770 case XK_KP_Home:
771 /* allow shift to override */
772 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
773 {
774 strcpy (kbuf, "\033Ow");
775 break;
776 }
777 /* FALLTHROUGH */
778#endif
779 case XK_Home: 727 case XK_Home:
780 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
781 break; 729 break;
782 730
783#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
934#if ENABLE_FRILLS || ISO_14755 882#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support 883 // ISO 14755 support
936 if (iso14755buf) 884 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52) 885 if (iso14755buf & ISO_14755_52)
938 { 886 {
939# if ENABLE_OVERLAY 887# if ISO_14755
940 scr_overlay_off (); 888 scr_overlay_off ();
941# endif 889# endif
942# if ISO_14755 890# if ISO_14755
943 // iso14755 part 5.2 handling: release time 891 // iso14755 part 5.2 handling: release time
944 // first: controls 892 // first: controls
… …
967 915
968 return; 916 return;
969 } 917 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 { 919 {
972# if ENABLE_OVERLAY 920# if ISO_14755
973 scr_overlay_off (); 921 scr_overlay_off ();
974# endif 922# endif
975 if (iso14755buf & ISO_14755_51) 923 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 (); 924 commit_iso14755 ();
977#if ISO_14755 925#if ISO_14755
… …
1035void 983void
1036rxvt_term::flush () 984rxvt_term::flush ()
1037{ 985{
1038 flush_ev.stop (); 986 flush_ev.stop ();
1039 987
1040#ifdef ENABLE_TRANSPARENCY 988#ifdef HAVE_BG_PIXMAP
1041 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
1042 { 990 {
1043 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
1044 scr_clear ();
1045 scr_touch (false); 992 scr_touch (false);
1046 } 993 }
1047#endif 994#endif
1048 995
1049 if (want_refresh) 996 if (want_refresh)
… …
1094 } 1041 }
1095 1042
1096 display->flush (); 1043 display->flush ();
1097} 1044}
1098 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1099void 1047void
1100rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1101{ 1049{
1102 make_current ();
1103
1104 display->flush ();
1105
1106 if (want_refresh && !flush_ev.active) 1050 if (want_refresh && !flush_ev.is_active ())
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1108} 1052}
1109 1053
1110void 1054void
1111rxvt_term::flush_cb (time_watcher &w) 1055rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1056{
1113 make_current (); 1057 make_current ();
1114 1058
1115 refresh_count = 0; 1059 refresh_count = 0;
1116 flush (); 1060 flush ();
1117} 1061}
1118 1062
1119#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1120void 1064void
1121rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1122{ 1066{
1123 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1124 want_refresh = 1; 1068 want_refresh = 1;
1125 1069 refresh_check ();
1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1127} 1070}
1128#endif 1071#endif
1129 1072
1130#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1131void 1074void
1132rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1133{ 1076{
1134 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1135 { 1078 {
1136 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1137 want_refresh = 1; 1080 want_refresh = 1;
1138 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1139 } 1082 }
1083 else
1084 w.stop ();
1140} 1085}
1141#endif 1086#endif
1142 1087
1143#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1144void 1089void
1145rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1146{ 1091{
1147 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollbar_isUp () || scrollbar_isDn ())
1148 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1149 { 1094 {
1150 want_refresh = 1; 1095 want_refresh = 1;
1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1152 } 1097 }
1098 else
1099 w.stop ();
1153} 1100}
1154#endif 1101#endif
1155 1102
1156#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1157void 1104void
1158rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1159{ 1106{
1160 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1161 { 1108 {
1162 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1163 want_refresh = 1; 1110 want_refresh = 1;
1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1165 } 1112 }
1113 else
1114 w.stop ();
1166} 1115}
1167#endif 1116#endif
1168 1117
1169#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1170void 1119void
1171rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1172{ 1121{
1173 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1174 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1175 : scr_page (UP, mouse_slip_wheel_speed))
1176 { 1123 {
1177 if (view_start == top_row || view_start == 0)
1178 mouse_slip_wheel_speed = 0;
1179
1180 want_refresh = 1; 1124 want_refresh = 1;
1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1125 refresh_check ();
1126 }
1127
1128 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1182 } 1132 }
1183} 1133}
1184#endif 1134#endif
1185 1135
1186#if LINUX_YIELD_HACK 1136#if LINUX_YIELD_HACK
1187static struct event_handler 1137static struct event_handler
1188{ 1138{
1189 check_watcher yield_ev; 1139 ev::prepare yield_ev;
1190 1140
1191 void yield_cb (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1192 { 1142 {
1193 // this should really be sched_yield(), but the linux guys thought 1143 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than 1144 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is 1145 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS. 1146 // allowed by the sus... as is returning ENOSYS.
… …
1247 1197
1248 return false; 1198 return false;
1249} 1199}
1250 1200
1251void 1201void
1252rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1253{ 1203{
1254 make_current (); 1204 make_current ();
1255 1205
1256 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1257 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1258 while (pty_fill ()) 1208 while (pty_fill ())
1259 if (cmd_parse ()) 1209 if (cmd_parse ())
1260 break; 1210 break;
1261 1211
1262 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1263 pty_write (); 1213 pty_write ();
1264} 1214}
1265 1215
1266void 1216void
1267rxvt_term::pointer_unblank () 1217rxvt_term::pointer_unblank ()
… …
1271 1221
1272#ifdef POINTER_BLANK 1222#ifdef POINTER_BLANK
1273 hidden_pointer = 0; 1223 hidden_pointer = 0;
1274 1224
1275 if (option (Opt_pointerBlank)) 1225 if (option (Opt_pointerBlank))
1276 pointer_ev.start (NOW + pointerBlankDelay); 1226 pointer_ev.start (pointerBlankDelay);
1277#endif 1227#endif
1278} 1228}
1279 1229
1280#ifdef POINTER_BLANK 1230#ifdef POINTER_BLANK
1281void 1231void
… …
1289 1239
1290 hidden_pointer = 1; 1240 hidden_pointer = 1;
1291} 1241}
1292 1242
1293void 1243void
1294rxvt_term::pointer_cb (time_watcher &w) 1244rxvt_term::pointer_cb (ev::timer &w, int revents)
1295{ 1245{
1296 make_current (); 1246 make_current ();
1297 1247
1298 pointer_blank (); 1248 pointer_blank ();
1299} 1249}
… …
1302void 1252void
1303rxvt_term::mouse_report (XButtonEvent &ev) 1253rxvt_term::mouse_report (XButtonEvent &ev)
1304{ 1254{
1305 int button_number, key_state = 0; 1255 int button_number, key_state = 0;
1306 int x, y; 1256 int x, y;
1257 int code = 32;
1307 1258
1308 x = ev.x; 1259 x = Pixel2Col (ev.x);
1309 y = ev.y; 1260 y = Pixel2Row (ev.y);
1310 pixel_position (&x, &y); 1261 if (ev.type == MotionNotify)
1262 {
1263 if (x == mouse_row && y == mouse_col)
1264 return;
1265 mouse_row = x;
1266 mouse_col = y;
1267 code += 32;
1268 }
1311 1269
1312 if (MEvent.button == AnyButton) 1270 if (MEvent.button == AnyButton)
1313 button_number = 3; 1271 button_number = 3;
1314 else 1272 else
1315 { 1273 {
… …
1361 x + 1, 1319 x + 1,
1362 y + 1); 1320 y + 1);
1363#endif 1321#endif
1364 1322
1365 tt_printf ("\033[M%c%c%c", 1323 tt_printf ("\033[M%c%c%c",
1366 (32 + button_number + key_state), 1324 (code + button_number + key_state),
1367 (32 + x + 1), 1325 (32 + x + 1),
1368 (32 + y + 1)); 1326 (32 + y + 1));
1369} 1327}
1370 1328
1371/*{{{ process an X event */ 1329/*{{{ process an X event */
… …
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1391 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out (); 1392 focus_out ();
1435 } 1393 }
1436#endif 1394#endif
1437 } 1395 }
1438 break;
1439
1440 case MappingNotify:
1441 XRefreshKeyboardMapping (&ev.xmapping);
1442 break; 1396 break;
1443 1397
1444 /* 1398 /*
1445 * XXX: this is not the _current_ arrangement 1399 * XXX: this is not the _current_ arrangement
1446 * Here's my conclusion: 1400 * Here's my conclusion:
… …
1479 && ev.xfocus.mode != NotifyGrab) 1433 && ev.xfocus.mode != NotifyGrab)
1480 focus_out (); 1434 focus_out ();
1481 break; 1435 break;
1482 1436
1483 case ConfigureNotify: 1437 case ConfigureNotify:
1438 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1439 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1440 szHint.width, szHint.height); */
1484 if (ev.xconfigure.window == parent[0]) 1441 if (ev.xconfigure.window == parent[0])
1485 { 1442 {
1486 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1443 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1487 ; 1444 ;
1488 1445
1489 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1446 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1490 { 1447 {
1491 seen_resize = 1; 1448 seen_resize = 1;
1492 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1449 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1493#ifdef XPM_BACKGROUND
1494 if (!option (Opt_transparent) && bgPixmap.auto_resize)
1495 {
1496 resize_pixmap ();
1497 scr_touch (true);
1498 }
1499#endif
1500 } 1450 }
1501 1451 else
1452 {
1453#ifdef HAVE_BG_PIXMAP
1454 if (bgPixmap.window_position_sensitive ())
1455 update_background ();
1456#endif
1457 }
1502 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1503
1504#ifdef ENABLE_TRANSPARENCY
1505 if (option (Opt_transparent))
1506 check_our_parents ();
1507#endif
1508 } 1459 }
1509 break; 1460 break;
1510 1461
1511 case PropertyNotify: 1462 case PropertyNotify:
1512 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1530 break; 1481 break;
1531 1482
1532 case MapNotify: 1483 case MapNotify:
1533 mapped = 1; 1484 mapped = 1;
1534#ifdef TEXT_BLINK 1485#ifdef TEXT_BLINK
1535 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1486 text_blink_ev.start ();
1536#endif 1487#endif
1537 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1488 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1538 break; 1489 break;
1539 1490
1540 case UnmapNotify: 1491 case UnmapNotify:
… …
1542#ifdef TEXT_BLINK 1493#ifdef TEXT_BLINK
1543 text_blink_ev.stop (); 1494 text_blink_ev.stop ();
1544#endif 1495#endif
1545 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1496 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break; 1497 break;
1547
1548#ifdef ENABLE_TRANSPARENCY
1549 case ReparentNotify:
1550 rootwin_cb (ev);
1551 break;
1552#endif /* ENABLE_TRANSPARENCY */
1553 1498
1554 case GraphicsExpose: 1499 case GraphicsExpose:
1555 case Expose: 1500 case Expose:
1556 if (ev.xany.window == vt) 1501 if (ev.xany.window == vt)
1557 { 1502 {
1558 do 1503 do
1504 {
1559 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1560 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1507 }
1561 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1508 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1562 1509
1563 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1564 1511
1565 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1513 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1514 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1515 ev.xexpose.width, ev.xexpose.height, False);
1516 }
1568 1517
1569 want_refresh = 1; 1518 want_refresh = 1;
1570 } 1519 }
1571 else 1520 else
1572 { 1521 {
… …
1580 if (isScrollbarWindow (ev.xany.window)) 1529 if (isScrollbarWindow (ev.xany.window))
1581 { 1530 {
1582 scrollBar.setIdle (); 1531 scrollBar.setIdle ();
1583 scrollbar_show (0); 1532 scrollbar_show (0);
1584 } 1533 }
1585
1586#ifdef ENABLE_TRANSPARENCY
1587 if (am_transparent && ev.xany.window == parent[0])
1588 XClearWindow (dpy, ev.xany.window);
1589#endif
1590 } 1534 }
1591 break; 1535 break;
1592 1536
1593 case MotionNotify: 1537 case MotionNotify:
1594#ifdef POINTER_BLANK 1538#ifdef POINTER_BLANK
1595 if (hidden_pointer) 1539 if (hidden_pointer)
1596 pointer_unblank (); 1540 pointer_unblank ();
1597#endif 1541#endif
1542 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1543 || priv_modes & PrivMode_MouseAnyEvent)
1544 mouse_report (ev.xbutton);
1598 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1545 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1599 break; 1546 break;
1600 1547
1601 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1602 { 1549 {
… …
1636 int dist; 1583 int dist;
1637 1584
1638 /* don't clobber the current delay if we are 1585 /* don't clobber the current delay if we are
1639 * already in the middle of scrolling. 1586 * already in the middle of scrolling.
1640 */ 1587 */
1641 if (!sel_scroll_ev.active) 1588 if (!sel_scroll_ev.is_active ())
1642 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1589 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1643 1590
1644 /* save the event params so we can highlight 1591 /* save the event params so we can highlight
1645 * the selection in the pending-scroll loop 1592 * the selection in the pending-scroll loop
1646 */ 1593 */
1647 selection_save_x = ev.xbutton.x; 1594 selection_save_x = ev.xbutton.x;
… …
1669 else 1616 else
1670 { 1617 {
1671 /* we are within the text window, so we 1618 /* we are within the text window, so we
1672 * shouldn't be scrolling 1619 * shouldn't be scrolling
1673 */ 1620 */
1674 if (sel_scroll_ev.active)
1675 sel_scroll_ev.stop(); 1621 sel_scroll_ev.stop();
1676 } 1622 }
1677#endif 1623#endif
1678#ifdef MOUSE_THRESHOLD 1624#ifdef MOUSE_THRESHOLD
1679 } 1625 }
1680#endif 1626#endif
… …
1706 { 1652 {
1707 hidden_cursor = 0; 1653 hidden_cursor = 0;
1708 want_refresh = 1; 1654 want_refresh = 1;
1709 } 1655 }
1710 1656
1711 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1657 cursor_blink_ev.again ();
1712 } 1658 }
1713#endif 1659#endif
1714 1660
1715#if defined(POINTER_BLANK) 1661#if defined(POINTER_BLANK)
1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1662 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1723 1669
1724 if (ev.type == KeyPress && hidden_pointer == 0) 1670 if (ev.type == KeyPress && hidden_pointer == 0)
1725 pointer_blank (); 1671 pointer_blank ();
1726 } 1672 }
1727#endif 1673#endif
1674
1675 refresh_check ();
1728} 1676}
1729 1677
1730void 1678void
1731rxvt_term::focus_in () 1679rxvt_term::focus_in ()
1732{ 1680{
… …
1744 XSetICFocus (Input_Context); 1692 XSetICFocus (Input_Context);
1745 } 1693 }
1746#endif 1694#endif
1747#if CURSOR_BLINK 1695#if CURSOR_BLINK
1748 if (option (Opt_cursorBlink)) 1696 if (option (Opt_cursorBlink))
1749 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1697 cursor_blink_ev.again ();
1750#endif 1698#endif
1751#if OFF_FOCUS_FADING 1699#if OFF_FOCUS_FADING
1752 if (rs[Rs_fade]) 1700 if (rs[Rs_fade])
1753 { 1701 {
1754 pix_colors = pix_colors_focused; 1702 pix_colors = pix_colors_focused;
… …
1756 } 1704 }
1757#endif 1705#endif
1758#if ENABLE_FRILLS 1706#if ENABLE_FRILLS
1759 if (option (Opt_urgentOnBell)) 1707 if (option (Opt_urgentOnBell))
1760 { 1708 {
1761 XWMHints *h;
1762
1763 h = XGetWMHints(dpy, parent[0]); 1709 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1764 if (h != NULL)
1765 { 1710 {
1766 h->flags &= ~XUrgencyHint; 1711 h->flags &= ~XUrgencyHint;
1767 XSetWMHints(dpy, parent[0], h); 1712 XSetWMHints (dpy, parent[0], h);
1768 } 1713 }
1769 } 1714 }
1770#endif 1715#endif
1771 } 1716 }
1772} 1717}
… …
1783 1728
1784#if ENABLE_FRILLS || ISO_14755 1729#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf) 1730 if (iso14755buf)
1786 { 1731 {
1787 iso14755buf = 0; 1732 iso14755buf = 0;
1788# if ENABLE_OVERLAY 1733# if ISO_14755
1789 scr_overlay_off (); 1734 scr_overlay_off ();
1790# endif 1735# endif
1791 } 1736 }
1792#endif 1737#endif
1793#if USE_XIM 1738#if USE_XIM
… …
1795 XUnsetICFocus (Input_Context); 1740 XUnsetICFocus (Input_Context);
1796#endif 1741#endif
1797#if CURSOR_BLINK 1742#if CURSOR_BLINK
1798 if (option (Opt_cursorBlink)) 1743 if (option (Opt_cursorBlink))
1799 cursor_blink_ev.stop (); 1744 cursor_blink_ev.stop ();
1745
1800 hidden_cursor = 0; 1746 hidden_cursor = 0;
1801#endif 1747#endif
1802#if OFF_FOCUS_FADING 1748#if OFF_FOCUS_FADING
1803 if (rs[Rs_fade]) 1749 if (rs[Rs_fade])
1804 { 1750 {
… …
1838 case PropertyNotify: 1784 case PropertyNotify:
1839 /* 1785 /*
1840 * if user used some Esetroot compatible prog to set the root bg, 1786 * if user used some Esetroot compatible prog to set the root bg,
1841 * use the property to determine the pixmap. We use it later on. 1787 * use the property to determine the pixmap. We use it later on.
1842 */ 1788 */
1843 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1789 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1844 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1790 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1845 return; 1791 {
1846 1792 bgPixmap.set_root_pixmap ();
1847 /* FALLTHROUGH */ 1793 update_background ();
1848 case ReparentNotify: 1794 }
1849 if (option (Opt_transparent))
1850 check_our_parents ();
1851 break; 1795 break;
1852 } 1796 }
1853# endif 1797# endif
1798
1799 refresh_check ();
1854} 1800}
1855#endif 1801#endif
1856 1802
1857void 1803void
1858rxvt_term::button_press (XButtonEvent &ev) 1804rxvt_term::button_press (XButtonEvent &ev)
… …
1913 mouse_report (ev); 1859 mouse_report (ev);
1914 } 1860 }
1915#else 1861#else
1916 MEvent.button = ev.button; 1862 MEvent.button = ev.button;
1917 mouse_report (ev); 1863 mouse_report (ev);
1918#endif /* MOUSE_REPORT_DOUBLECLICK */ 1864#endif /* MOUSE_REPORT_DOUBLECLICK */
1919 1865
1920 } 1866 }
1921 else 1867 else
1922 { 1868 {
1923 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
… …
2017 tt_printf ("\033[5~"); 1963 tt_printf ("\033[5~");
2018 break; 1964 break;
2019 } 1965 }
2020 } 1966 }
2021 else 1967 else
2022#endif /* NO_SCROLLBAR_REPORT */ 1968#endif /* NO_SCROLLBAR_REPORT */
2023 1969
2024 { 1970 {
2025 char upordown = 0; 1971 char upordown = 0;
2026 1972
2027 if (scrollBar.style == R_SB_NEXT) 1973 if (scrollBar.style == R_SB_NEXT)
2028 { 1974 {
2029 if (scrollbarnext_upButton (ev.y)) 1975 if (scrollbarnext_upButton (ev.y))
2030 upordown = -1; /* up */ 1976 upordown = -1; /* up */
… …
2036 if (scrollbarrxvt_upButton (ev.y)) 1982 if (scrollbarrxvt_upButton (ev.y))
2037 upordown = -1; /* up */ 1983 upordown = -1; /* up */
2038 else if (scrollbarrxvt_dnButton (ev.y)) 1984 else if (scrollbarrxvt_dnButton (ev.y))
2039 upordown = 1; /* down */ 1985 upordown = 1; /* down */
2040 } 1986 }
1987
2041 if (upordown) 1988 if (upordown)
2042 { 1989 {
2043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1990#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1991 if (!cont_scroll_ev.is_active ())
2044 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1992 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2045#endif 1993#endif
2046 if (scr_page (upordown < 0 ? UP : DN, 1)) 1994 if (scr_page (upordown < 0 ? UP : DN, 1))
2047 { 1995 {
2048 if (upordown < 0) 1996 if (upordown < 0)
2049 scrollBar.setUp (); 1997 scrollBar.setUp ();
… …
2129 scrollBar.setIdle (); 2077 scrollBar.setIdle ();
2130 scrollbar_show (0); 2078 scrollbar_show (0);
2131 } 2079 }
2132 2080
2133#ifdef SELECTION_SCROLLING 2081#ifdef SELECTION_SCROLLING
2134 if (sel_scroll_ev.active)
2135 sel_scroll_ev.stop(); 2082 sel_scroll_ev.stop();
2136#endif 2083#endif
2137 2084
2138 if (ev.window == vt) 2085 if (ev.window == vt)
2139 { 2086 {
2140 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2087 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2164 mouse_report (ev); 2111 mouse_report (ev);
2165 } 2112 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2113#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2114 MEvent.button = AnyButton;
2168 mouse_report (ev); 2115 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2116#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2117 return;
2171 } 2118 }
2172 2119
2173 /* 2120 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2121 * dumb hack to compensate for the failure of click-and-drag
… …
2212 { 2159 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2160 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2161 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2162 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2163
2217 if (slip_wheel_ev.at < NOW) 2164 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2165 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2166 }
2222 else 2167 else
2223 { 2168 {
2224# endif 2169# endif
2225 scr_page (v, i); 2170 scr_page (v, i);
… …
2293 2238
2294 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2239 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2295 { 2240 {
2296 refresh_count = 0; 2241 refresh_count = 0;
2297 2242
2298 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.) 2243 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2299 { 2244 {
2300 refreshnow = true; 2245 refreshnow = true;
2301 ch = NOCHAR; 2246 ch = NOCHAR;
2302 break; 2247 break;
2303 } 2248 }
… …
2363 } 2308 }
2364 2309
2365 ch = NOCHAR; 2310 ch = NOCHAR;
2366 } 2311 }
2367 } 2312 }
2313
2314 refresh_check ();
2368 2315
2369 return flag; 2316 return flag;
2370} 2317}
2371 2318
2372// read the next character 2319// read the next character
… …
2514 } 2461 }
2515 } 2462 }
2516 2463
2517 pclose_printer (fd); 2464 pclose_printer (fd);
2518} 2465}
2519#endif /* PRINTPIPE */ 2466#endif /* PRINTPIPE */
2520/*}}} */ 2467/*}}} */
2521 2468
2522/* *INDENT-OFF* */ 2469/* *INDENT-OFF* */
2523enum { 2470enum {
2524 C1_40 = 0x40, 2471 C1_40 = 0x40,
… …
2810rxvt_term::process_csi_seq () 2757rxvt_term::process_csi_seq ()
2811{ 2758{
2812 unicode_t ch, priv, i; 2759 unicode_t ch, priv, i;
2813 unsigned int nargs, p; 2760 unsigned int nargs, p;
2814 int n, ndef; 2761 int n, ndef;
2815 int arg[ESC_ARGS]; 2762 int arg[ESC_ARGS] = { };
2816 2763
2817 for (nargs = ESC_ARGS; nargs > 0;) 2764 nargs = 0;
2818 arg[--nargs] = 0;
2819 2765
2820 priv = 0; 2766 priv = 0;
2821 ch = cmd_getc (); 2767 ch = cmd_getc ();
2822 if (ch >= '<' && ch <= '?') 2768 if (ch >= '<' && ch <= '?')
2769 {
2823 { /* '<' '=' '>' '?' */ 2770 /* '<' '=' '>' '?' */
2824 priv = ch; 2771 priv = ch;
2825 ch = cmd_getc (); 2772 ch = cmd_getc ();
2826 } 2773 }
2827 2774
2828 /* read any numerical arguments */ 2775 /* read any numerical arguments */
… …
2867 switch (priv) 2814 switch (priv)
2868 { 2815 {
2869 case '>': 2816 case '>':
2870 if (ch == CSI_DA) /* secondary device attributes */ 2817 if (ch == CSI_DA) /* secondary device attributes */
2871 { 2818 {
2872 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2819 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2873 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2820 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2874 // 2821 //
2875 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2822 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2876 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2823 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2877 // that we do not support xterm mouse reporting (should be 95 when we do). 2824 // versions.
2878 // 2825 //
2879 tt_printf ("\033[>%d;94;0c", 'U'); 2826 tt_printf ("\033[>%d;95;0c", 'U');
2880 } 2827 }
2881 break; 2828 break;
2882 case '?': 2829 case '?':
2883 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2830 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
2884 process_terminal_mode (ch, priv, nargs, arg); 2831 process_terminal_mode (ch, priv, nargs, arg);
… …
3435 break; 3382 break;
3436 case URxvt_Color_IT: 3383 case URxvt_Color_IT:
3437 process_color_seq (op, Color_IT, str, resp); 3384 process_color_seq (op, Color_IT, str, resp);
3438 break; 3385 break;
3439#endif 3386#endif
3440#if ENABLE_TRANSPARENCY && TINTING 3387#if ENABLE_TRANSPARENCY
3441 case URxvt_Color_tint: 3388 case URxvt_Color_tint:
3442 process_color_seq (op, Color_tint, str, resp); 3389 process_color_seq (op, Color_tint, str, resp);
3390 {
3391 bool changed = false;
3392 if (ISSET_PIXCOLOR (Color_tint))
3393 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3394 else
3395 changed = bgPixmap.unset_tint ();
3396 if (changed)
3397 update_background ();
3398 }
3443 3399
3444 check_our_parents ();
3445
3446 if (am_transparent)
3447 want_full_refresh = want_refresh = 1;
3448
3449 break; 3400 break;
3450#endif 3401#endif
3451 3402
3403#if BG_IMAGE_FROM_FILE
3452 case Rxvt_Pixmap: 3404 case Rxvt_Pixmap:
3453 { 3405 if (!strcmp (str, "?"))
3454 if (*str != ';')
3455 { 3406 {
3456#if XPM_BACKGROUND 3407 char str[256];
3457 scale_pixmap (""); /* reset to default scaling */ 3408
3458 set_bgPixmap (str); /* change pixmap */ 3409 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3459 scr_touch (true); 3410 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3460#endif 3411 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3412 process_xterm_seq (XTerm_title, str, CHAR_ST);
3461 } 3413 }
3462 3414 else
3415 {
3463 int changed = 0; 3416 int changed = 0;
3464 3417
3465 while ((str = strchr (str, ';')) != NULL) 3418 if (*str != ';')
3466 { 3419 {
3420 /* reset to default scaling :*/
3421 bgPixmap.unset_geometry ();
3422 if (bgPixmap.set_file (str)) /* change pixmap */
3423 changed++;
3424 str = strchr (str, ';');
3425 if (str == NULL)
3426 bgPixmap.set_defaultGeometry ();
3427 }
3428 while (str)
3429 {
3467 str++; 3430 str++;
3468#if XPM_BACKGROUND 3431 if (bgPixmap.set_geometry (str))
3469 changed += scale_pixmap (str); 3432 changed++;
3470#endif 3433 str = strchr (str, ';');
3471 } 3434 }
3472
3473 if (changed) 3435 if (changed)
3474 { 3436 update_background ();
3475#ifdef XPM_BACKGROUND
3476 resize_pixmap ();
3477 scr_touch (true);
3478#endif
3479 } 3437 }
3480#if ENABLE_TRANSPARENCY && defined(HAVE_AFTERIMAGE)
3481 if (option (Opt_transparent))
3482 check_our_parents ();
3483#endif
3484 }
3485 break; 3438 break;
3439#endif
3486 3440
3487 case Rxvt_restoreFG: 3441 case Rxvt_restoreFG:
3488 set_window_color (Color_fg, str); 3442 set_window_color (Color_fg, str);
3489 break; 3443 break;
3490 case Rxvt_restoreBG: 3444 case Rxvt_restoreBG:
… …
3612{ 3566{
3613 unsigned int i, j; 3567 unsigned int i, j;
3614 int state; 3568 int state;
3615 3569
3616 static const struct 3570 static const struct
3617 { 3571 {
3618 const int argval; 3572 const int argval;
3619 const unsigned long bit; 3573 const unsigned long bit;
3620 }
3621
3622 argtopriv[] = { 3574 } argtopriv[] = {
3623 { 1, PrivMode_aplCUR }, 3575 { 1, PrivMode_aplCUR },
3624 { 2, PrivMode_vt52 }, 3576 { 2, PrivMode_vt52 },
3625 { 3, PrivMode_132 }, 3577 { 3, PrivMode_132 },
3626 { 4, PrivMode_smoothScroll }, 3578 { 4, PrivMode_smoothScroll },
3627 { 5, PrivMode_rVideo }, 3579 { 5, PrivMode_rVideo },
… …
3643 { 66, PrivMode_aplKP }, 3595 { 66, PrivMode_aplKP },
3644#ifndef NO_BACKSPACE_KEY 3596#ifndef NO_BACKSPACE_KEY
3645 { 67, PrivMode_BackSpace }, 3597 { 67, PrivMode_BackSpace },
3646#endif 3598#endif
3647 { 1000, PrivMode_MouseX11 }, 3599 { 1000, PrivMode_MouseX11 },
3648 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3600 { 1002, PrivMode_MouseBtnEvent },
3649 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3601 { 1003, PrivMode_MouseAnyEvent },
3650 // 1003 Use All Motion Mouse Tracking. NYI, TODO
3651 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3602 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3652 { 1011, PrivMode_Keypress }, // rxvt extension 3603 { 1011, PrivMode_Keypress }, // rxvt extension
3653 // 1035 enable modifiers for alt, numlock NYI 3604 // 1035 enable modifiers for alt, numlock NYI
3654 // 1036 send ESC for meta keys NYI 3605 // 1036 send ESC for meta keys NYI
3655 // 1037 send DEL for keypad delete NYI 3606 // 1037 send DEL for keypad delete NYI
… …
3729 scr_autowrap (state); 3680 scr_autowrap (state);
3730 break; 3681 break;
3731 /* case 8: - auto repeat, can't do on a per window basis */ 3682 /* case 8: - auto repeat, can't do on a per window basis */
3732 case 9: /* X10 mouse reporting */ 3683 case 9: /* X10 mouse reporting */
3733 if (state) /* orthogonal */ 3684 if (state) /* orthogonal */
3734 priv_modes &= ~PrivMode_MouseX11; 3685 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3735 break; 3686 break;
3736#ifdef scrollBar_esc 3687#ifdef scrollBar_esc
3737 case scrollBar_esc: 3688 case scrollBar_esc:
3738 if (scrollbar_mapping (state)) 3689 if (scrollbar_mapping (state))
3739 { 3690 {
… …
3752 break; 3703 break;
3753 /* case 66: - application key pad */ 3704 /* case 66: - application key pad */
3754 /* case 67: - backspace key */ 3705 /* case 67: - backspace key */
3755 case 1000: /* X11 mouse reporting */ 3706 case 1000: /* X11 mouse reporting */
3756 if (state) /* orthogonal */ 3707 if (state) /* orthogonal */
3757 priv_modes &= ~PrivMode_MouseX10; 3708 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3758 break; 3709 break;
3759#if 0
3760 case 1001: 3710 case 1002:
3761 break; /* X11 mouse highlighting */ 3711 case 1003:
3762#endif 3712 if (state)
3713 {
3714 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3715 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3716 vt_emask_mouse = PointerMotionMask;
3717 }
3718 else
3719 vt_emask_mouse = NoEventMask;
3720 vt_select_input ();
3721 break;
3763 case 1010: /* scroll to bottom on TTY output inhibit */ 3722 case 1010: /* scroll to bottom on TTY output inhibit */
3764 set_option (Opt_scrollTtyOutput, !state); 3723 set_option (Opt_scrollTtyOutput, !state);
3765 break; 3724 break;
3766 case 1011: /* scroll to bottom on key press */ 3725 case 1011: /* scroll to bottom on key press */
3767 set_option (Opt_scrollTtyKeypress, state); 3726 set_option (Opt_scrollTtyKeypress, state);
… …
3944rxvt_term::process_graphics () 3903rxvt_term::process_graphics ()
3945{ 3904{
3946 unicode_t ch, cmd = cmd_getc (); 3905 unicode_t ch, cmd = cmd_getc ();
3947 3906
3948 if (cmd == 'Q') 3907 if (cmd == 'Q')
3908 {
3949 { /* query graphics */ 3909 /* query graphics */
3950 tt_printf ("\033G0\012"); /* no graphics */ 3910 tt_printf ("\033G0\012"); /* no graphics */
3951 return; 3911 return;
3952 } 3912 }
3953 /* swallow other graphics sequences until terminating ':' */ 3913 /* swallow other graphics sequences until terminating ':' */
3954 do 3914 do
… …
4004 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3964 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4005 3965
4006 memcpy (v_buffer + v_buflen, data, len); 3966 memcpy (v_buffer + v_buflen, data, len);
4007 v_buflen += len; 3967 v_buflen += len;
4008 3968
4009 pty_ev.set (EVENT_READ | EVENT_WRITE); 3969 pty_ev.set (ev::READ | ev::WRITE);
4010} 3970}
4011 3971
4012void rxvt_term::pty_write () 3972void rxvt_term::pty_write ()
4013{ 3973{
4014 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3974 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4019 3979
4020 if (v_buflen == 0) 3980 if (v_buflen == 0)
4021 { 3981 {
4022 free (v_buffer); 3982 free (v_buffer);
4023 v_buffer = 0; 3983 v_buffer = 0;
4024 v_buflen = 0;
4025 3984
4026 pty_ev.set (EVENT_READ); 3985 pty_ev.set (ev::READ);
4027 return; 3986 return;
4028 } 3987 }
4029 3988
4030 memmove (v_buffer, v_buffer + written, v_buflen); 3989 memmove (v_buffer, v_buffer + written, v_buflen);
4031 } 3990 }
4032 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3991 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4033 pty_ev.set (EVENT_READ); 3992 pty_ev.set (ev::READ);
4034} 3993}
4035 3994
4036/*----------------------- end-of-file (C source) -----------------------*/ 3995/*----------------------- end-of-file (C source) -----------------------*/
4037 3996

Diff Legend

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