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.324 by sasha, Fri Jun 8 20:04:12 2007 UTC vs.
Revision 1.376 by root, Fri Dec 14 02:08:18 2007 UTC

… …
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, 99 XK_ISO_Lock, 0x21eb,
100 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,
105 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
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
541 540
542#ifdef PRINTPIPE 541#ifdef PRINTPIPE
543 if (keysym == XK_Print) 542 if (keysym == XK_Print)
544 { 543 {
545 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
546 return; 545 return;
… …
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
978 else if (iso14755buf & ISO_14755_STARTED) 926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 { 927 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981 929
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1035void 983void
1036rxvt_term::flush () 984rxvt_term::flush ()
1037{ 985{
1038 flush_ev.stop (); 986 flush_ev.stop ();
1039 987
1040#ifdef TRANSPARENT 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)
… …
1095 1042
1096 display->flush (); 1043 display->flush ();
1097} 1044}
1098 1045
1099void 1046void
1100rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1101{ 1048{
1102 make_current (); 1049 make_current ();
1103 1050
1104 display->flush (); 1051 display->flush ();
1105 1052
1106 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.is_active ())
1107 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1108} 1055}
1109 1056
1110void 1057void
1111rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1112{ 1059{
1113 make_current (); 1060 make_current ();
1114 1061
1115 refresh_limit = 1;
1116 refresh_count = 0; 1062 refresh_count = 0;
1117 flush (); 1063 flush ();
1118} 1064}
1119 1065
1120#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1121void 1067void
1122rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1123{ 1069{
1124 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1125 want_refresh = 1; 1071 want_refresh = 1;
1126
1127 w.start (w.at + CURSOR_BLINK_INTERVAL);
1128} 1072}
1129#endif 1073#endif
1130 1074
1131#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1132void 1076void
1133rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1134{ 1078{
1135 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1136 { 1080 {
1137 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1138 want_refresh = 1; 1082 want_refresh = 1;
1139 w.start (w.at + TEXT_BLINK_INTERVAL);
1140 } 1083 }
1084 else
1085 w.stop ();
1141} 1086}
1142#endif 1087#endif
1143 1088
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1090void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1092{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1150 {
1151 want_refresh = 1; 1095 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1153 } 1097 w.stop ();
1154} 1098}
1155#endif 1099#endif
1156 1100
1157#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1158void 1102void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1104{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1106 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1108 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1166 } 1109 }
1110 else
1111 w.stop ();
1167} 1112}
1168#endif 1113#endif
1169 1114
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1116void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1118{
1174 if (mouse_slip_wheel_speed == 0 1119 if (mouse_slip_wheel_speed == 0
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed)) 1121 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1122 {
1178 if (view_start == top_row || view_start == 0) 1123 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1180 1125
1181 want_refresh = 1; 1126 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1183 } 1127 }
1128 else
1129 w.stop ();
1184} 1130}
1185#endif 1131#endif
1186 1132
1187#if LINUX_YIELD_HACK 1133#if LINUX_YIELD_HACK
1188static struct event_handler 1134static struct event_handler
1189{ 1135{
1190 check_watcher yield_ev; 1136 ev::prepare yield_ev;
1191 1137
1192 void yield_cb (check_watcher &w) 1138 void yield_cb (ev::prepare &w, int revents)
1193 { 1139 {
1194 // this should really be sched_yield(), but the linux guys thought 1140 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1141 // that giving a process calling sched_yield () less cpu time than
1196 // ones with high nice levels is a useful thing to do. It surely is is 1142 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1143 // allowed by the sus... as is returning ENOSYS.
… …
1243 pty_ev.stop (); 1189 pty_ev.stop ();
1244 1190
1245 if (!option (Opt_hold)) 1191 if (!option (Opt_hold))
1246 destroy (); 1192 destroy ();
1247 } 1193 }
1248 1194
1249 return false; 1195 return false;
1250} 1196}
1251 1197
1252void 1198void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1199rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1200{
1255 make_current (); 1201 make_current ();
1256 1202
1257 if (revents & EVENT_READ) 1203 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1204 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1205 while (pty_fill ())
1260 if (cmd_parse ()) 1206 if (cmd_parse ())
1261 break; 1207 break;
1262 1208
1263 if (revents & EVENT_WRITE) 1209 if (revents & ev::WRITE)
1264 pty_write (); 1210 pty_write ();
1265} 1211}
1266 1212
1267void 1213void
1268rxvt_term::pointer_unblank () 1214rxvt_term::pointer_unblank ()
… …
1272 1218
1273#ifdef POINTER_BLANK 1219#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1220 hidden_pointer = 0;
1275 1221
1276 if (option (Opt_pointerBlank)) 1222 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1223 pointer_ev.start (pointerBlankDelay);
1278#endif 1224#endif
1279} 1225}
1280 1226
1281#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1282void 1228void
… …
1290 1236
1291 hidden_pointer = 1; 1237 hidden_pointer = 1;
1292} 1238}
1293 1239
1294void 1240void
1295rxvt_term::pointer_cb (time_watcher &w) 1241rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1242{
1297 make_current (); 1243 make_current ();
1298 1244
1299 pointer_blank (); 1245 pointer_blank ();
1300} 1246}
… …
1303void 1249void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1250rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1251{
1306 int button_number, key_state = 0; 1252 int button_number, key_state = 0;
1307 int x, y; 1253 int x, y;
1254 int code = 32;
1308 1255
1309 x = ev.x; 1256 x = Pixel2Col (ev.x);
1310 y = ev.y; 1257 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1258 if (ev.type == MotionNotify)
1259 {
1260 if (x == mouse_row && y == mouse_col)
1261 return;
1262 mouse_row = x;
1263 mouse_col = y;
1264 code += 32;
1265 }
1312 1266
1313 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1314 button_number = 3; 1268 button_number = 3;
1315 else 1269 else
1316 { 1270 {
… …
1362 x + 1, 1316 x + 1,
1363 y + 1); 1317 y + 1);
1364#endif 1318#endif
1365 1319
1366 tt_printf ("\033[M%c%c%c", 1320 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1321 (code + button_number + key_state),
1368 (32 + x + 1), 1322 (32 + x + 1),
1369 (32 + y + 1)); 1323 (32 + y + 1));
1370} 1324}
1371 1325
1372/*{{{ process an X event */ 1326/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1388 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1389 focus_out ();
1436 } 1390 }
1437#endif 1391#endif
1438 } 1392 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1393 break;
1444 1394
1445 /* 1395 /*
1446 * XXX: this is not the _current_ arrangement 1396 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1397 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1430 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1431 focus_out ();
1482 break; 1432 break;
1483 1433
1484 case ConfigureNotify: 1434 case ConfigureNotify:
1435 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1436 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1437 szHint.width, szHint.height); */
1485 if (ev.xconfigure.window == parent[0]) 1438 if (ev.xconfigure.window == parent[0])
1486 { 1439 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1440 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1441 ;
1489 1442
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1443 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1444 {
1492 seen_resize = 1; 1445 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1446 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1494#ifdef XPM_BACKGROUND
1495 if (!option(Opt_transparent) && bgPixmap.auto_resize)
1496 {
1497 resize_pixmap ();
1498 scr_touch (true);
1499 }
1500#endif
1501 } 1447 }
1502 1448 else
1449 {
1450#ifdef HAVE_BG_PIXMAP
1451 if (bgPixmap.window_position_sensitive ())
1452 update_background ();
1453#endif
1454 }
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1455 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1504
1505#ifdef TRANSPARENT
1506 if (option (Opt_transparent))
1507 check_our_parents ();
1508#endif
1509 } 1456 }
1510 break; 1457 break;
1511 1458
1512 case PropertyNotify: 1459 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1460 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1531 break; 1478 break;
1532 1479
1533 case MapNotify: 1480 case MapNotify:
1534 mapped = 1; 1481 mapped = 1;
1535#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1537#endif 1484#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1486 break;
1540 1487
1541 case UnmapNotify: 1488 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1490#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1491 text_blink_ev.stop ();
1545#endif 1492#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1493 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1494 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1495
1555 case GraphicsExpose: 1496 case GraphicsExpose:
1556 case Expose: 1497 case Expose:
1557 if (ev.xany.window == vt) 1498 if (ev.xany.window == vt)
1558 { 1499 {
1559 do 1500 do
1501 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1502 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1503 ev.xexpose.width, ev.xexpose.height, False);
1504 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1505 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1506
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1507 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1508
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1509 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1510 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1511 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1512 ev.xexpose.width, ev.xexpose.height, False);
1569 1513 }
1570 want_refresh = 1; 1514 want_refresh = 1;
1571 } 1515 }
1572 else 1516 else
1573 { 1517 {
1574 XEvent unused_event; 1518 XEvent unused_event;
… …
1581 if (isScrollbarWindow (ev.xany.window)) 1525 if (isScrollbarWindow (ev.xany.window))
1582 { 1526 {
1583 scrollBar.setIdle (); 1527 scrollBar.setIdle ();
1584 scrollbar_show (0); 1528 scrollbar_show (0);
1585 } 1529 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1530 }
1592 break; 1531 break;
1593 1532
1594 case MotionNotify: 1533 case MotionNotify:
1595#ifdef POINTER_BLANK 1534#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1535 if (hidden_pointer)
1597 pointer_unblank (); 1536 pointer_unblank ();
1598#endif 1537#endif
1538 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1539 || priv_modes & PrivMode_MouseAnyEvent)
1540 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1541 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1542 break;
1601 1543
1602 if (ev.xany.window == vt) 1544 if (ev.xany.window == vt)
1603 { 1545 {
… …
1637 int dist; 1579 int dist;
1638 1580
1639 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1641 */ 1583 */
1642 if (!sel_scroll_ev.active) 1584 if (!sel_scroll_ev.is_active ())
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1586
1645 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1647 */ 1589 */
1648 selection_save_x = ev.xbutton.x; 1590 selection_save_x = ev.xbutton.x;
… …
1670 else 1612 else
1671 { 1613 {
1672 /* we are within the text window, so we 1614 /* we are within the text window, so we
1673 * shouldn't be scrolling 1615 * shouldn't be scrolling
1674 */ 1616 */
1675 if (sel_scroll_ev.active)
1676 sel_scroll_ev.stop(); 1617 sel_scroll_ev.stop();
1677 } 1618 }
1678#endif 1619#endif
1679#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1680 } 1621 }
1681#endif 1622#endif
… …
1693 &ev.xbutton.x, &ev.xbutton.y, 1634 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1635 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1636 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1637 scrollbar_size ());
1697 want_refresh = 1; 1638 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1639 scrollbar_show (1);
1700 } 1640 }
1701 break; 1641 break;
1702 } 1642 }
1703 1643
… …
1708 { 1648 {
1709 hidden_cursor = 0; 1649 hidden_cursor = 0;
1710 want_refresh = 1; 1650 want_refresh = 1;
1711 } 1651 }
1712 1652
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1653 cursor_blink_ev.again ();
1714 } 1654 }
1715#endif 1655#endif
1716 1656
1717#if defined(POINTER_BLANK) 1657#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1658 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1746 XSetICFocus (Input_Context); 1686 XSetICFocus (Input_Context);
1747 } 1687 }
1748#endif 1688#endif
1749#if CURSOR_BLINK 1689#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1690 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1691 cursor_blink_ev.again ();
1752#endif 1692#endif
1753#if OFF_FOCUS_FADING 1693#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1694 if (rs[Rs_fade])
1755 { 1695 {
1756 pix_colors = pix_colors_focused; 1696 pix_colors = pix_colors_focused;
… …
1758 } 1698 }
1759#endif 1699#endif
1760#if ENABLE_FRILLS 1700#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1701 if (option (Opt_urgentOnBell))
1762 { 1702 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]); 1703 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766 if (h != NULL)
1767 { 1704 {
1768 h->flags &= ~XUrgencyHint; 1705 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h); 1706 XSetWMHints (dpy, parent[0], h);
1770 } 1707 }
1771 } 1708 }
1772#endif 1709#endif
1773 } 1710 }
1774} 1711}
… …
1785 1722
1786#if ENABLE_FRILLS || ISO_14755 1723#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1724 if (iso14755buf)
1788 { 1725 {
1789 iso14755buf = 0; 1726 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1727# if ISO_14755
1791 scr_overlay_off (); 1728 scr_overlay_off ();
1792# endif 1729# endif
1793 } 1730 }
1794#endif 1731#endif
1795#if USE_XIM 1732#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1734 XUnsetICFocus (Input_Context);
1798#endif 1735#endif
1799#if CURSOR_BLINK 1736#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1737 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1738 cursor_blink_ev.stop ();
1739
1802 hidden_cursor = 0; 1740 hidden_cursor = 0;
1803#endif 1741#endif
1804#if OFF_FOCUS_FADING 1742#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1743 if (rs[Rs_fade])
1806 { 1744 {
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1760 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1761 }
1824#endif 1762#endif
1825} 1763}
1826 1764
1827#if TRANSPARENT || ENABLE_PERL 1765#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1766void
1829rxvt_term::rootwin_cb (XEvent &ev) 1767rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1768{
1831 make_current (); 1769 make_current ();
1832 1770
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1771 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1772 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1773 return;
1836 1774
1837# if TRANSPARENT 1775# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1776 switch (ev.type)
1839 { 1777 {
1840 case PropertyNotify: 1778 case PropertyNotify:
1841 /* 1779 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1780 * if user used some Esetroot compatible prog to set the root bg,
1843 * use the property to determine the pixmap. We use it later on. 1781 * use the property to determine the pixmap. We use it later on.
1844 */ 1782 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1783 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1784 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1785 {
1848 1786 bgPixmap.set_root_pixmap ();
1849 /* FALLTHROUGH */ 1787 update_background ();
1850 case ReparentNotify: 1788 }
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1789 break;
1854 } 1790 }
1855# endif 1791# endif
1856} 1792}
1857#endif 1793#endif
… …
1915 mouse_report (ev); 1851 mouse_report (ev);
1916 } 1852 }
1917#else 1853#else
1918 MEvent.button = ev.button; 1854 MEvent.button = ev.button;
1919 mouse_report (ev); 1855 mouse_report (ev);
1920#endif /* MOUSE_REPORT_DOUBLECLICK */ 1856#endif /* MOUSE_REPORT_DOUBLECLICK */
1921 1857
1922 } 1858 }
1923 else 1859 else
1924 { 1860 {
1925 if (ev.button != MEvent.button) 1861 if (ev.button != MEvent.button)
… …
2019 tt_printf ("\033[5~"); 1955 tt_printf ("\033[5~");
2020 break; 1956 break;
2021 } 1957 }
2022 } 1958 }
2023 else 1959 else
2024#endif /* NO_SCROLLBAR_REPORT */ 1960#endif /* NO_SCROLLBAR_REPORT */
2025 1961
2026 { 1962 {
2027 char upordown = 0; 1963 char upordown = 0;
2028 1964
2029 if (scrollBar.style == R_SB_NEXT) 1965 if (scrollBar.style == R_SB_NEXT)
2030 { 1966 {
2031 if (scrollbarnext_upButton (ev.y)) 1967 if (scrollbarnext_upButton (ev.y))
2032 upordown = -1; /* up */ 1968 upordown = -1; /* up */
… …
2038 if (scrollbarrxvt_upButton (ev.y)) 1974 if (scrollbarrxvt_upButton (ev.y))
2039 upordown = -1; /* up */ 1975 upordown = -1; /* up */
2040 else if (scrollbarrxvt_dnButton (ev.y)) 1976 else if (scrollbarrxvt_dnButton (ev.y))
2041 upordown = 1; /* down */ 1977 upordown = 1; /* down */
2042 } 1978 }
1979
2043 if (upordown) 1980 if (upordown)
2044 { 1981 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ())
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 1985#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 1986 if (scr_page (upordown < 0 ? UP : DN, 1))
2049 { 1987 {
2050 if (upordown < 0) 1988 if (upordown < 0)
2051 scrollBar.setUp (); 1989 scrollBar.setUp ();
… …
2131 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2132 scrollbar_show (0); 2070 scrollbar_show (0);
2133 } 2071 }
2134 2072
2135#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2138#endif 2075#endif
2139 2076
2140 if (ev.window == vt) 2077 if (ev.window == vt)
2141 { 2078 {
2142 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2166 mouse_report (ev); 2103 mouse_report (ev);
2167 } 2104 }
2168#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2169 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2170 mouse_report (ev); 2107 mouse_report (ev);
2171#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2172 return; 2109 return;
2173 } 2110 }
2174 2111
2175 /* 2112 /*
2176 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2214 { 2151 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2155
2219 if (slip_wheel_ev.at < NOW) 2156 if (!slip_wheel_ev.is_active ())
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2221
2222 slip_wheel_ev.start ();
2223 } 2158 }
2224 else 2159 else
2225 { 2160 {
2226# endif 2161# endif
2227 scr_page (v, i); 2162 scr_page (v, i);
… …
2233 break; 2168 break;
2234#endif 2169#endif
2235 } 2170 }
2236 } 2171 }
2237} 2172}
2238
2239#ifdef TRANSPARENT
2240#if TINTING && !defined(HAVE_AFTERIMAGE)
2241/* taken from aterm-0.4.2 */
2242
2243typedef uint32_t RUINT32T;
2244
2245void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2246{
2247 int sh_r, sh_g, sh_b;
2248 RUINT32T mask_r, mask_g, mask_b;
2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
2253
2254 Visual *visual = term->visual;
2255
2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257
2258 /* for convenience */
2259 mask_r = visual->red_mask;
2260 mask_g = visual->green_mask;
2261 mask_b = visual->blue_mask;
2262
2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336 } else {
2337 if (shade < 0) shade = 0;
2338 if (shade > 100) shade = 100;
2339
2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345 }
2346
2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349 {
2350 unsigned int tmp;
2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 case 16:
2407 {
2408 unsigned short *p1, *pf, *p, *pl;
2409 p1 = (unsigned short *) srcImage->data;
2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2411 while (p1 < pf)
2412 {
2413 p = p1;
2414 pl = p1 + srcImage->width;
2415 for (; p < pl; p++)
2416 {
2417 *p = lookup_r[(*p & 0xf800)>>11] |
2418 lookup_g[(*p & 0x07e0)>> 5] |
2419 lookup_b[(*p & 0x001f)];
2420 }
2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2441 }
2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2449
2450 while (p1 < pf)
2451 {
2452 p = p1;
2453 pl = p1 + srcImage->width;
2454 for (; p < pl; p++)
2455 {
2456 *p = lookup_r[(*p & 0xff0000)>>16] |
2457 lookup_g[(*p & 0x00ff00)>> 8] |
2458 lookup_b[(*p & 0x0000ff)] |
2459 (*p & ~0xffffff);
2460 }
2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2462 }
2463 break;
2464 }
2465 }
2466
2467 free (lookup);
2468}
2469#endif
2470
2471/*
2472 * Check our parents are still who we think they are.
2473 * Do transparency updates if required
2474 */
2475int
2476rxvt_term::check_our_parents ()
2477{
2478#if TRANSPARENT || ENABLE_PERL
2479 check_our_aprents_ev.stop();
2480 check_our_aprents_ev.start(NOW + 1./3.);
2481#endif
2482 return 0;
2483}
2484
2485void
2486rxvt_term::check_our_parents_cb (time_watcher &w)
2487{
2488 int i, pchanged, aformat, have_pixmap, rootdepth;
2489 unsigned long nitems, bytes_after;
2490 Atom atype;
2491 unsigned char *prop = NULL;
2492 Window root, oldp, *list;
2493 Pixmap rootpixmap = None;
2494 XWindowAttributes wattr, wrootattr;
2495 int sx, sy;
2496 Window cr;
2497
2498 pchanged = 0;
2499
2500 if (!option (Opt_transparent))
2501 return /*pchanged*/; /* Don't try any more */
2502
2503 XGetWindowAttributes (dpy, display->root, &wrootattr);
2504 rootdepth = wrootattr.depth;
2505
2506 XGetWindowAttributes (dpy, parent[0], &wattr);
2507
2508 if (rootdepth != wattr.depth)
2509 {
2510 if (am_transparent)
2511 {
2512 pchanged = 1;
2513 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2514 am_transparent = am_pixmap_trans = 0;
2515 }
2516
2517 return /*pchanged*/; /* Don't try any more */
2518 }
2519
2520 /* Get all X ops out of the queue so that our information is up-to-date. */
2521 XSync (dpy, False);
2522
2523 XTranslateCoordinates (dpy, parent[0], display->root,
2524 0, 0, &sx, &sy, &cr);
2525
2526 /* check if we are outside of the visible part of the virtual screen : */
2527 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2528 || sx >= wrootattr.width || sy >= wrootattr.height )
2529 return /* 0 */ ;
2530 /*
2531 * Make the frame window set by the window manager have
2532 * the root background. Some window managers put multiple nested frame
2533 * windows for each client, so we have to take care about that.
2534 */
2535 i = (xa[XA_XROOTPMAP_ID]
2536 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2537 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2538 &nitems, &bytes_after, &prop) == Success);
2539
2540 if (!i || prop == NULL)
2541 i = (xa[XA_ESETROOT_PMAP_ID]
2542 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2543 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2544 &nitems, &bytes_after, &prop) == Success);
2545
2546 if (!i || prop == NULL
2547#if TINTING
2548 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2549#ifdef HAVE_AFTERIMAGE
2550 && original_asim == NULL && rs[Rs_blurradius] == NULL
2551#endif
2552 )
2553#endif
2554 )
2555 have_pixmap = 0;
2556 else
2557 {
2558 have_pixmap = 1;
2559 rootpixmap = *(Pixmap *)prop;
2560 XFree (prop);
2561 }
2562
2563 if (have_pixmap)
2564 {
2565 Bool success = False ;
2566 GC gc;
2567 XGCValues gcvalue;
2568#ifdef HAVE_AFTERIMAGE
2569 {
2570 Pixmap tmp_pmap = None ;
2571 ShadingInfo shade;
2572 ARGB32 tint ;
2573 unsigned int pmap_w = 0, pmap_h = 0;
2574
2575 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2576 {
2577 int root_x = 0, root_y = 0;
2578
2579 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580 if (ISSET_PIXCOLOR (Color_tint))
2581 {
2582 rgba c;
2583 pix_colors_focused [Color_tint].get (c);
2584 shade.tintColor.red = c.r;
2585 shade.tintColor.green = c.g;
2586 shade.tintColor.blue = c.b;
2587 }
2588 else
2589 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2590 tint = shading2tint32( &shade );
2591 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2592 if (GetWinPosition (parent[0], &root_x, &root_y) )
2593 {
2594 ASImageLayer *layers = create_image_layers( 2 );
2595 ASImage *merged_im = NULL;
2596 int back_x, back_y, back_w, back_h;
2597 /* merge_layers does good job at tiling background appropriately,
2598 so all we need is to cut out smallest possible piece : */
2599#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2600 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2601 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2602 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2603 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2604 else \
2605 { /* small background - need the whole of it for successfull tiling :*/ \
2606 back_##xy = 0; \
2607 back_##wh = pmap_##wh; \
2608 }}while(0)
2609
2610 MAKE_ROOTPMAP_GEOM(x,w,width);
2611 MAKE_ROOTPMAP_GEOM(y,h,height);
2612
2613 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2614 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2615 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2616 layers[0].clip_width = szHint.width;
2617 layers[0].clip_height = szHint.height;
2618 layers[0].tint = tint;
2619 if (rs[Rs_blurradius] && layers[0].im)
2620 {
2621 double r = atof(rs[Rs_blurradius]);
2622 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2623 if( tmp )
2624 {
2625 destroy_asimage( &layers[0].im );
2626 layers[0].im = tmp;
2627 }
2628 }
2629 if (original_asim != NULL)
2630 {
2631 int fore_w, fore_h;
2632 layers[1].im = original_asim;
2633 if( bgPixmap.auto_resize )
2634 {
2635 fore_w = szHint.width;
2636 fore_h = szHint.height;
2637 }
2638 else
2639 {
2640 fore_w = bgPixmap.w;
2641 fore_h = bgPixmap.h;
2642 }
2643 if (fore_w != original_asim->width
2644 || fore_h != original_asim->height)
2645 {
2646 layers[1].im = scale_asimage( display->asv,
2647 original_asim,
2648 fore_w, fore_h,
2649 ASA_ASImage, 100,
2650 ASIMAGE_QUALITY_DEFAULT );
2651 }
2652
2653 layers[1].clip_width = szHint.width;
2654 layers[1].clip_height = szHint.height;
2655
2656 if (rs[Rs_blendtype])
2657 {
2658 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2659 if( layers[1].merge_scanlines == NULL )
2660 layers[1].merge_scanlines = alphablend_scanlines;
2661 }
2662 }
2663 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2664 szHint.width, szHint.height,
2665 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2666 if (layers[1].im != original_asim)
2667 destroy_asimage( &(layers[1].im) );
2668 destroy_asimage( &(layers[0].im) );
2669 if (merged_im != NULL)
2670 {
2671 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2672 destroy_asimage( &merged_im );
2673 }
2674 free( layers );
2675 }
2676 }
2677 if (tmp_pmap != None)
2678 {
2679 success = True;
2680 if (pixmap != None)
2681 XFreePixmap (dpy, pixmap);
2682 pixmap = tmp_pmap;
2683 }
2684 }
2685#else /* HAVE_AFTERIMAGE */
2686 {
2687 /*
2688 * Copy display->root pixmap transparency
2689 */
2690 int nx, ny;
2691 unsigned int nw, nh;
2692 XImage *image;
2693
2694 nw = (unsigned int)szHint.width;
2695 nh = (unsigned int)szHint.height;
2696 nx = ny = 0;
2697
2698 if (sx < 0)
2699 {
2700 nw += sx;
2701 nx = -sx;
2702 sx = 0;
2703 }
2704
2705 if (sy < 0)
2706 {
2707 nh += sy;
2708 ny = -sy;
2709 sy = 0;
2710 }
2711
2712 min_it (nw, (unsigned int) (wrootattr.width - sx));
2713 min_it (nh, (unsigned int) (wrootattr.height - sy));
2714
2715 XSync (dpy, False);
2716 allowedxerror = -1;
2717 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2718
2719 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2720 /* XXX: may need a delay here? */
2721 allowedxerror = 0;
2722 if (image != NULL)
2723 {
2724 if (pixmap != None)
2725 XFreePixmap (dpy, pixmap);
2726
2727#if TINTING
2728 if (ISSET_PIXCOLOR (Color_tint))
2729 {
2730 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2731
2732 rgba c;
2733 pix_colors_focused [Color_tint].get (c);
2734 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2735 }
2736#endif
2737
2738 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2739 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2740 XPutImage (dpy, pixmap, gc, image, 0, 0,
2741 nx, ny, image->width, image->height);
2742 XDestroyImage (image);
2743 success = True ;
2744 }
2745 }
2746#endif /* HAVE_AFTERIMAGE */
2747 if (gc != NULL)
2748 XFreeGC (dpy, gc);
2749
2750 if (!success)
2751 {
2752 if (am_transparent && am_pixmap_trans)
2753 {
2754 pchanged = 1;
2755 if (pixmap != None)
2756 {
2757 XFreePixmap (dpy, pixmap);
2758 pixmap = None;
2759 }
2760 }
2761
2762 am_pixmap_trans = 0;
2763 }
2764 else
2765 {
2766 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2767 XClearWindow (dpy, parent[0]);
2768
2769 if (!am_transparent || !am_pixmap_trans)
2770 pchanged = 1;
2771
2772 am_transparent = am_pixmap_trans = 1;
2773 }
2774 }
2775
2776 if (am_pixmap_trans)
2777 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2778 else
2779 {
2780 unsigned int n;
2781 /*
2782 * InheritPixmap transparency
2783 */
2784 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2785 {
2786 oldp = parent[i];
2787 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2788 XFree (list);
2789
2790 if (parent[i] == display->root)
2791 {
2792 if (oldp != None)
2793 pchanged = 1;
2794
2795 break;
2796 }
2797
2798 if (oldp != parent[i])
2799 pchanged = 1;
2800 }
2801
2802 n = 0;
2803
2804 if (pchanged)
2805 for (; n < (unsigned int)i; n++)
2806 {
2807 XGetWindowAttributes (dpy, parent[n], &wattr);
2808
2809 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2810 {
2811 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2812 break;
2813 }
2814 }
2815
2816 if (n > (sizeof (parent) / sizeof (parent[0])))
2817 {
2818 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2819 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2820 am_transparent = 0;
2821 /* XXX: also turn off Opt_transparent? */
2822 }
2823 else
2824 {
2825 for (n = 0; n < (unsigned int)i; n++)
2826 {
2827 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2828 XClearWindow (dpy, parent[n]);
2829 }
2830
2831 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2832 am_transparent = 1;
2833 }
2834
2835 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2836 parent[i] = None;
2837 }
2838
2839 if (scrollBar.win)
2840 {
2841 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2842 scrollBar.setIdle ();
2843 scrollbar_show (0);
2844 }
2845
2846 if (am_transparent)
2847 {
2848 want_refresh = want_full_refresh = 1;
2849 if (am_pixmap_trans)
2850 flush ();
2851 }
2852
2853// return pchanged;
2854}
2855#endif
2856 2173
2857/*}}} */ 2174/*}}} */
2858 2175
2859bool 2176bool
2860rxvt_term::cmd_parse () 2177rxvt_term::cmd_parse ()
… …
2909 if (ch == C0_LF) 2226 if (ch == C0_LF)
2910 nlines++; 2227 nlines++;
2911 2228
2912 refresh_count++; 2229 refresh_count++;
2913 2230
2914 if (!option (Opt_jumpScroll) 2231 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2915 || (refresh_count >= refresh_limit * (nrow - 1)))
2916 { 2232 {
2917 refreshnow = true;
2918 refresh_count = 0; 2233 refresh_count = 0;
2234
2235 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2236 {
2237 refreshnow = true;
2919 ch = NOCHAR; 2238 ch = NOCHAR;
2920 break; 2239 break;
2240 }
2921 } 2241 }
2922 2242
2923 // scr_add_lines only works for nlines <= nrow - 1. 2243 // scr_add_lines only works for nlines <= nrow - 1.
2924 if (nlines >= nrow - 1) 2244 if (nlines >= nrow - 1)
2925 { 2245 {
… …
2953 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2273 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2954 scr_add_lines (buf, str - buf, nlines); 2274 scr_add_lines (buf, str - buf, nlines);
2955 2275
2956 /* 2276 /*
2957 * If there have been a lot of new lines, then update the screen 2277 * If there have been a lot of new lines, then update the screen
2958 * What the heck I'll cheat and only refresh less than every page-full. 2278 * What the heck we'll cheat and only refresh less than every page-full.
2959 * the number of pages between refreshes is refresh_limit, which 2279 * if skipScroll is enabled.
2960 * is incremented here because we must be doing flat-out scrolling.
2961 */ 2280 */
2962 if (refreshnow) 2281 if (refreshnow)
2963 { 2282 {
2964 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2965 refresh_limit++;
2966 else
2967 {
2968 flag = true; 2283 flag = true;
2969 //TODO: due to popular request, implement "skipscroll" option here
2970 scr_refresh (); 2284 scr_refresh ();
2971 want_refresh = 1; 2285 want_refresh = 1;
2972 }
2973 } 2286 }
2974 2287
2975 } 2288 }
2976 else 2289 else
2977 { 2290 {
… …
3126 { 2439 {
3127 if ((buf[len++] = cmd_getc ()) == 'i') 2440 if ((buf[len++] = cmd_getc ()) == 'i')
3128 break; /* done = 1 */ 2441 break; /* done = 1 */
3129 } 2442 }
3130 } 2443 }
3131 2444
3132 for (i = 0; i < len; i++) 2445 for (i = 0; i < len; i++)
3133 if (putc (buf[i], fd) == EOF) 2446 if (putc (buf[i], fd) == EOF)
3134 { 2447 {
3135 done = 1; 2448 done = 1;
3136 break; 2449 break;
… …
3138 } 2451 }
3139 } 2452 }
3140 2453
3141 pclose_printer (fd); 2454 pclose_printer (fd);
3142} 2455}
3143#endif /* PRINTPIPE */ 2456#endif /* PRINTPIPE */
3144/*}}} */ 2457/*}}} */
3145 2458
3146/* *INDENT-OFF* */ 2459/* *INDENT-OFF* */
3147enum { 2460enum {
3148 C1_40 = 0x40, 2461 C1_40 = 0x40,
… …
3198 process_dcs_seq (); 2511 process_dcs_seq ();
3199 break; 2512 break;
3200 case 0x9b: /* CSI */ 2513 case 0x9b: /* CSI */
3201 process_csi_seq (); 2514 process_csi_seq ();
3202 break; 2515 break;
3203 case 0x9d: /* CSI */ 2516 case 0x9d: /* OSC */
3204 process_osc_seq (); 2517 process_osc_seq ();
3205 break; 2518 break;
3206#endif 2519#endif
3207 } 2520 }
3208} 2521}
… …
3434rxvt_term::process_csi_seq () 2747rxvt_term::process_csi_seq ()
3435{ 2748{
3436 unicode_t ch, priv, i; 2749 unicode_t ch, priv, i;
3437 unsigned int nargs, p; 2750 unsigned int nargs, p;
3438 int n, ndef; 2751 int n, ndef;
3439 int arg[ESC_ARGS]; 2752 int arg[ESC_ARGS] = { };
3440 2753
3441 for (nargs = ESC_ARGS; nargs > 0;) 2754 nargs = 0;
3442 arg[--nargs] = 0;
3443 2755
3444 priv = 0; 2756 priv = 0;
3445 ch = cmd_getc (); 2757 ch = cmd_getc ();
3446 if (ch >= '<' && ch <= '?') 2758 if (ch >= '<' && ch <= '?')
2759 {
3447 { /* '<' '=' '>' '?' */ 2760 /* '<' '=' '>' '?' */
3448 priv = ch; 2761 priv = ch;
3449 ch = cmd_getc (); 2762 ch = cmd_getc ();
3450 } 2763 }
3451 2764
3452 /* read any numerical arguments */ 2765 /* read any numerical arguments */
… …
3491 switch (priv) 2804 switch (priv)
3492 { 2805 {
3493 case '>': 2806 case '>':
3494 if (ch == CSI_DA) /* secondary device attributes */ 2807 if (ch == CSI_DA) /* secondary device attributes */
3495 { 2808 {
3496 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2809 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3497 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2810 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3498 // 2811 //
3499 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2812 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3500 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2813 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3501 // that we do not support xterm mouse reporting (should be 95 when we do). 2814 // versions.
3502 // 2815 //
3503 tt_printf ("\033[>%d;94;0c", 'U'); 2816 tt_printf ("\033[>%d;95;0c", 'U');
3504 } 2817 }
3505 break; 2818 break;
3506 case '?': 2819 case '?':
3507 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2820 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3508 process_terminal_mode (ch, priv, nargs, arg); 2821 process_terminal_mode (ch, priv, nargs, arg);
… …
3954 int saveop = op; 3267 int saveop = op;
3955 3268
3956 dLocal (Display *, dpy); 3269 dLocal (Display *, dpy);
3957 3270
3958 assert (str != NULL); 3271 assert (str != NULL);
3959 3272
3960 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3273 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3961 return; 3274 return;
3962 3275
3963 switch (op) 3276 switch (op)
3964 { 3277 {
… …
4059 break; 3372 break;
4060 case URxvt_Color_IT: 3373 case URxvt_Color_IT:
4061 process_color_seq (op, Color_IT, str, resp); 3374 process_color_seq (op, Color_IT, str, resp);
4062 break; 3375 break;
4063#endif 3376#endif
4064#if TRANSPARENT && TINTING 3377#if ENABLE_TRANSPARENCY
4065 case URxvt_Color_tint: 3378 case URxvt_Color_tint:
4066 process_color_seq (op, Color_tint, str, resp); 3379 process_color_seq (op, Color_tint, str, resp);
3380 {
3381 bool changed = false;
3382 if (ISSET_PIXCOLOR (Color_tint))
3383 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3384 else
3385 changed = bgPixmap.unset_tint ();
3386 if (changed)
3387 update_background ();
3388 }
4067 3389
4068 check_our_parents ();
4069
4070 if (am_transparent)
4071 want_full_refresh = want_refresh = 1;
4072
4073 break; 3390 break;
4074#endif 3391#endif
4075 3392
3393#if BG_IMAGE_FROM_FILE
4076 case Rxvt_Pixmap: 3394 case Rxvt_Pixmap:
4077 { 3395 if (!strcmp (str, "?"))
4078 if (*str != ';')
4079 { 3396 {
4080#if XPM_BACKGROUND 3397 char str[256];
4081 scale_pixmap (""); /* reset to default scaling */ 3398
4082 set_bgPixmap (str); /* change pixmap */ 3399 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
4083 scr_touch (true); 3400 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
4084#endif 3401 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3402 process_xterm_seq (XTerm_title, str, CHAR_ST);
4085 } 3403 }
4086 3404 else
3405 {
4087 int changed = 0; 3406 int changed = 0;
4088 3407
4089 while ((str = strchr (str, ';')) != NULL) 3408 if (*str != ';')
4090 { 3409 {
3410 /* reset to default scaling :*/
3411 bgPixmap.unset_geometry ();
3412 if (bgPixmap.set_file (str)) /* change pixmap */
3413 changed++;
3414 str = strchr (str, ';');
3415 if (str == NULL)
3416 bgPixmap.set_defaultGeometry ();
3417 }
3418 while (str)
3419 {
4091 str++; 3420 str++;
4092#if XPM_BACKGROUND 3421 if (bgPixmap.set_geometry (str))
4093 changed += scale_pixmap (str); 3422 changed++;
4094#endif 3423 str = strchr (str, ';');
4095 } 3424 }
4096
4097 if (changed) 3425 if (changed)
4098 { 3426 update_background ();
4099#ifdef XPM_BACKGROUND
4100 resize_pixmap ();
4101 scr_touch (true);
4102#endif
4103 } 3427 }
4104#if TRANSPARENT && defined(HAVE_AFTERIMAGE) 3428 break;
4105 if (option(Opt_transparent))
4106 check_our_parents ();
4107#endif 3429#endif
4108
4109 }
4110 break;
4111 3430
4112 case Rxvt_restoreFG: 3431 case Rxvt_restoreFG:
4113 set_window_color (Color_fg, str); 3432 set_window_color (Color_fg, str);
4114 break; 3433 break;
4115 case Rxvt_restoreBG: 3434 case Rxvt_restoreBG:
… …
4237{ 3556{
4238 unsigned int i, j; 3557 unsigned int i, j;
4239 int state; 3558 int state;
4240 3559
4241 static const struct 3560 static const struct
4242 { 3561 {
4243 const int argval; 3562 const int argval;
4244 const unsigned long bit; 3563 const unsigned long bit;
4245 }
4246
4247 argtopriv[] = { 3564 } argtopriv[] = {
4248 { 1, PrivMode_aplCUR }, 3565 { 1, PrivMode_aplCUR },
4249 { 2, PrivMode_vt52 }, 3566 { 2, PrivMode_vt52 },
4250 { 3, PrivMode_132 }, 3567 { 3, PrivMode_132 },
4251 { 4, PrivMode_smoothScroll }, 3568 { 4, PrivMode_smoothScroll },
4252 { 5, PrivMode_rVideo }, 3569 { 5, PrivMode_rVideo },
… …
4268 { 66, PrivMode_aplKP }, 3585 { 66, PrivMode_aplKP },
4269#ifndef NO_BACKSPACE_KEY 3586#ifndef NO_BACKSPACE_KEY
4270 { 67, PrivMode_BackSpace }, 3587 { 67, PrivMode_BackSpace },
4271#endif 3588#endif
4272 { 1000, PrivMode_MouseX11 }, 3589 { 1000, PrivMode_MouseX11 },
4273 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3590 { 1002, PrivMode_MouseBtnEvent },
4274 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3591 { 1003, PrivMode_MouseAnyEvent },
4275 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4276 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3592 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4277 { 1011, PrivMode_Keypress }, // rxvt extension 3593 { 1011, PrivMode_Keypress }, // rxvt extension
4278 // 1035 enable modifiers for alt, numlock NYI 3594 // 1035 enable modifiers for alt, numlock NYI
4279 // 1036 send ESC for meta keys NYI 3595 // 1036 send ESC for meta keys NYI
4280 // 1037 send DEL for keypad delete NYI 3596 // 1037 send DEL for keypad delete NYI
… …
4354 scr_autowrap (state); 3670 scr_autowrap (state);
4355 break; 3671 break;
4356 /* case 8: - auto repeat, can't do on a per window basis */ 3672 /* case 8: - auto repeat, can't do on a per window basis */
4357 case 9: /* X10 mouse reporting */ 3673 case 9: /* X10 mouse reporting */
4358 if (state) /* orthogonal */ 3674 if (state) /* orthogonal */
4359 priv_modes &= ~PrivMode_MouseX11; 3675 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4360 break; 3676 break;
4361#ifdef scrollBar_esc 3677#ifdef scrollBar_esc
4362 case scrollBar_esc: 3678 case scrollBar_esc:
4363 if (scrollbar_mapping (state)) 3679 if (scrollbar_mapping (state))
4364 { 3680 {
… …
4377 break; 3693 break;
4378 /* case 66: - application key pad */ 3694 /* case 66: - application key pad */
4379 /* case 67: - backspace key */ 3695 /* case 67: - backspace key */
4380 case 1000: /* X11 mouse reporting */ 3696 case 1000: /* X11 mouse reporting */
4381 if (state) /* orthogonal */ 3697 if (state) /* orthogonal */
4382 priv_modes &= ~PrivMode_MouseX10; 3698 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4383 break; 3699 break;
4384#if 0
4385 case 1001: 3700 case 1002:
4386 break; /* X11 mouse highlighting */ 3701 case 1003:
4387#endif 3702 if (state)
3703 {
3704 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3705 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3706 vt_emask_mouse = PointerMotionMask;
3707 }
3708 else
3709 vt_emask_mouse = NoEventMask;
3710 vt_select_input ();
3711 break;
4388 case 1010: /* scroll to bottom on TTY output inhibit */ 3712 case 1010: /* scroll to bottom on TTY output inhibit */
4389 set_option (Opt_scrollTtyOutput, !state); 3713 set_option (Opt_scrollTtyOutput, !state);
4390 break; 3714 break;
4391 case 1011: /* scroll to bottom on key press */ 3715 case 1011: /* scroll to bottom on key press */
4392 set_option (Opt_scrollTtyKeypress, state); 3716 set_option (Opt_scrollTtyKeypress, state);
… …
4569rxvt_term::process_graphics () 3893rxvt_term::process_graphics ()
4570{ 3894{
4571 unicode_t ch, cmd = cmd_getc (); 3895 unicode_t ch, cmd = cmd_getc ();
4572 3896
4573 if (cmd == 'Q') 3897 if (cmd == 'Q')
3898 {
4574 { /* query graphics */ 3899 /* query graphics */
4575 tt_printf ("\033G0\012"); /* no graphics */ 3900 tt_printf ("\033G0\012"); /* no graphics */
4576 return; 3901 return;
4577 } 3902 }
4578 /* swallow other graphics sequences until terminating ':' */ 3903 /* swallow other graphics sequences until terminating ':' */
4579 do 3904 do
… …
4629 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4630 3955
4631 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
4632 v_buflen += len; 3957 v_buflen += len;
4633 3958
4634 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
4635} 3960}
4636 3961
4637void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
4638{ 3963{
4639 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3964 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4644 3969
4645 if (v_buflen == 0) 3970 if (v_buflen == 0)
4646 { 3971 {
4647 free (v_buffer); 3972 free (v_buffer);
4648 v_buffer = 0; 3973 v_buffer = 0;
4649 v_buflen = 0;
4650 3974
4651 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4652 return; 3976 return;
4653 } 3977 }
4654 3978
4655 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4656 } 3980 }
4657 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4658 pty_ev.set (EVENT_READ); 3982 pty_ev.set (ev::READ);
4659} 3983}
4660 3984
4661/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4662 3986

Diff Legend

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