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.327 by ayin, Mon Jun 11 13:33:34 2007 UTC vs.
Revision 1.365 by ayin, Thu Nov 15 10:13:37 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
… …
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.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 }
1141} 1084}
1142#endif 1085#endif
1143 1086
1144#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1145void 1088void
1146rxvt_term::cont_scroll_cb (time_watcher &w) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1147{ 1090{
1148 if ((scrollbar_isUp() || scrollbar_isDn()) && 1091 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1149 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1092 scr_page (scrollbar_isUp() ? UP : DN, 1))
1150 {
1151 want_refresh = 1; 1093 want_refresh = 1;
1152 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 else
1153 } 1095 w.stop ();
1154} 1096}
1155#endif 1097#endif
1156 1098
1157#ifdef SELECTION_SCROLLING 1099#ifdef SELECTION_SCROLLING
1158void 1100void
1159rxvt_term::sel_scroll_cb (time_watcher &w) 1101rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1160{ 1102{
1161 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1103 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1162 { 1104 {
1163 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1105 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1164 want_refresh = 1; 1106 want_refresh = 1;
1165 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1166 } 1107 }
1108 else
1109 w.stop ();
1167} 1110}
1168#endif 1111#endif
1169 1112
1170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1171void 1114void
1172rxvt_term::slip_wheel_cb (time_watcher &w) 1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1173{ 1116{
1174 if (mouse_slip_wheel_speed == 0 1117 if (mouse_slip_wheel_speed == 0
1175 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1176 : scr_page (UP, mouse_slip_wheel_speed)) 1119 : scr_page (UP, mouse_slip_wheel_speed))
1177 { 1120 {
1178 if (view_start == top_row || view_start == 0) 1121 if (view_start == top_row || view_start == 0)
1179 mouse_slip_wheel_speed = 0; 1122 mouse_slip_wheel_speed = 0;
1180 1123
1181 want_refresh = 1; 1124 want_refresh = 1;
1182 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1183 } 1125 }
1126 else
1127 w.stop ();
1184} 1128}
1185#endif 1129#endif
1186 1130
1187#if LINUX_YIELD_HACK 1131#if LINUX_YIELD_HACK
1188static struct event_handler 1132static struct event_handler
1189{ 1133{
1190 check_watcher yield_ev; 1134 ev::prepare yield_ev;
1191 1135
1192 void yield_cb (check_watcher &w) 1136 void yield_cb (ev::prepare &w, int revents)
1193 { 1137 {
1194 // this should really be sched_yield(), but the linux guys thought 1138 // this should really be sched_yield(), but the linux guys thought
1195 // that giving a process calling sched_yield () less cpu time than 1139 // 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 1140 // ones with high nice levels is a useful thing to do. It surely is is
1197 // allowed by the sus... as is returning ENOSYS. 1141 // allowed by the sus... as is returning ENOSYS.
… …
1243 pty_ev.stop (); 1187 pty_ev.stop ();
1244 1188
1245 if (!option (Opt_hold)) 1189 if (!option (Opt_hold))
1246 destroy (); 1190 destroy ();
1247 } 1191 }
1248 1192
1249 return false; 1193 return false;
1250} 1194}
1251 1195
1252void 1196void
1253rxvt_term::pty_cb (io_watcher &w, short revents) 1197rxvt_term::pty_cb (ev::io &w, int revents)
1254{ 1198{
1255 make_current (); 1199 make_current ();
1256 1200
1257 if (revents & EVENT_READ) 1201 if (revents & ev::READ)
1258 // loop, but don't allow a single term to monopolize us 1202 // loop, but don't allow a single term to monopolize us
1259 while (pty_fill ()) 1203 while (pty_fill ())
1260 if (cmd_parse ()) 1204 if (cmd_parse ())
1261 break; 1205 break;
1262 1206
1263 if (revents & EVENT_WRITE) 1207 if (revents & ev::WRITE)
1264 pty_write (); 1208 pty_write ();
1265} 1209}
1266 1210
1267void 1211void
1268rxvt_term::pointer_unblank () 1212rxvt_term::pointer_unblank ()
… …
1272 1216
1273#ifdef POINTER_BLANK 1217#ifdef POINTER_BLANK
1274 hidden_pointer = 0; 1218 hidden_pointer = 0;
1275 1219
1276 if (option (Opt_pointerBlank)) 1220 if (option (Opt_pointerBlank))
1277 pointer_ev.start (NOW + pointerBlankDelay); 1221 pointer_ev.start (pointerBlankDelay);
1278#endif 1222#endif
1279} 1223}
1280 1224
1281#ifdef POINTER_BLANK 1225#ifdef POINTER_BLANK
1282void 1226void
… …
1290 1234
1291 hidden_pointer = 1; 1235 hidden_pointer = 1;
1292} 1236}
1293 1237
1294void 1238void
1295rxvt_term::pointer_cb (time_watcher &w) 1239rxvt_term::pointer_cb (ev::timer &w, int revents)
1296{ 1240{
1297 make_current (); 1241 make_current ();
1298 1242
1299 pointer_blank (); 1243 pointer_blank ();
1300} 1244}
… …
1303void 1247void
1304rxvt_term::mouse_report (XButtonEvent &ev) 1248rxvt_term::mouse_report (XButtonEvent &ev)
1305{ 1249{
1306 int button_number, key_state = 0; 1250 int button_number, key_state = 0;
1307 int x, y; 1251 int x, y;
1252 int code = 32;
1308 1253
1309 x = ev.x; 1254 x = Pixel2Col (ev.x);
1310 y = ev.y; 1255 y = Pixel2Row (ev.y);
1311 pixel_position (&x, &y); 1256 if (ev.type == MotionNotify)
1257 {
1258 if (x == mouse_row && y == mouse_col)
1259 return;
1260 mouse_row = x;
1261 mouse_col = y;
1262 code += 32;
1263 }
1312 1264
1313 if (MEvent.button == AnyButton) 1265 if (MEvent.button == AnyButton)
1314 button_number = 3; 1266 button_number = 3;
1315 else 1267 else
1316 { 1268 {
… …
1362 x + 1, 1314 x + 1,
1363 y + 1); 1315 y + 1);
1364#endif 1316#endif
1365 1317
1366 tt_printf ("\033[M%c%c%c", 1318 tt_printf ("\033[M%c%c%c",
1367 (32 + button_number + key_state), 1319 (code + button_number + key_state),
1368 (32 + x + 1), 1320 (32 + x + 1),
1369 (32 + y + 1)); 1321 (32 + y + 1));
1370} 1322}
1371 1323
1372/*{{{ process an X event */ 1324/*{{{ process an X event */
… …
1434 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1386 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1435 focus_out (); 1387 focus_out ();
1436 } 1388 }
1437#endif 1389#endif
1438 } 1390 }
1439 break;
1440
1441 case MappingNotify:
1442 XRefreshKeyboardMapping (&ev.xmapping);
1443 break; 1391 break;
1444 1392
1445 /* 1393 /*
1446 * XXX: this is not the _current_ arrangement 1394 * XXX: this is not the _current_ arrangement
1447 * Here's my conclusion: 1395 * Here's my conclusion:
… …
1480 && ev.xfocus.mode != NotifyGrab) 1428 && ev.xfocus.mode != NotifyGrab)
1481 focus_out (); 1429 focus_out ();
1482 break; 1430 break;
1483 1431
1484 case ConfigureNotify: 1432 case ConfigureNotify:
1433 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1434 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1435 szHint.width, szHint.height); */
1485 if (ev.xconfigure.window == parent[0]) 1436 if (ev.xconfigure.window == parent[0])
1486 { 1437 {
1487 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1488 ; 1439 ;
1489 1440
1490 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1491 { 1442 {
1492 seen_resize = 1; 1443 seen_resize = 1;
1493 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1444 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 } 1445 }
1502 1446 else
1447 {
1448#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 update_background ();
1451#endif
1452 }
1503 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1453 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 } 1454 }
1510 break; 1455 break;
1511 1456
1512 case PropertyNotify: 1457 case PropertyNotify:
1513 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1531 break; 1476 break;
1532 1477
1533 case MapNotify: 1478 case MapNotify:
1534 mapped = 1; 1479 mapped = 1;
1535#ifdef TEXT_BLINK 1480#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1481 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1537#endif 1482#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break; 1484 break;
1540 1485
1541 case UnmapNotify: 1486 case UnmapNotify:
… …
1543#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1544 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1545#endif 1490#endif
1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break; 1492 break;
1548
1549#ifdef TRANSPARENT
1550 case ReparentNotify:
1551 rootwin_cb (ev);
1552 break;
1553#endif /* TRANSPARENT */
1554 1493
1555 case GraphicsExpose: 1494 case GraphicsExpose:
1556 case Expose: 1495 case Expose:
1557 if (ev.xany.window == vt) 1496 if (ev.xany.window == vt)
1558 { 1497 {
1559 do 1498 do
1499 {
1560 scr_expose (ev.xexpose.x, ev.xexpose.y, 1500 scr_expose (ev.xexpose.x, ev.xexpose.y,
1561 ev.xexpose.width, ev.xexpose.height, False); 1501 ev.xexpose.width, ev.xexpose.height, False);
1502 }
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1503 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1563 1504
1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1505 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1565 1506
1566 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1507 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1508 {
1567 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1568 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1569 1511 }
1570 want_refresh = 1; 1512 want_refresh = 1;
1571 } 1513 }
1572 else 1514 else
1573 { 1515 {
1574 XEvent unused_event; 1516 XEvent unused_event;
… …
1581 if (isScrollbarWindow (ev.xany.window)) 1523 if (isScrollbarWindow (ev.xany.window))
1582 { 1524 {
1583 scrollBar.setIdle (); 1525 scrollBar.setIdle ();
1584 scrollbar_show (0); 1526 scrollbar_show (0);
1585 } 1527 }
1586
1587#ifdef TRANSPARENT
1588 if (am_transparent && ev.xany.window == parent[0])
1589 XClearWindow (dpy, ev.xany.window);
1590#endif
1591 } 1528 }
1592 break; 1529 break;
1593 1530
1594 case MotionNotify: 1531 case MotionNotify:
1595#ifdef POINTER_BLANK 1532#ifdef POINTER_BLANK
1596 if (hidden_pointer) 1533 if (hidden_pointer)
1597 pointer_unblank (); 1534 pointer_unblank ();
1598#endif 1535#endif
1536 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1537 || priv_modes & PrivMode_MouseAnyEvent)
1538 mouse_report (ev.xbutton);
1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1539 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1600 break; 1540 break;
1601 1541
1602 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1603 { 1543 {
… …
1638 1578
1639 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1640 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1641 */ 1581 */
1642 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.active)
1643 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1644 1584
1645 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1646 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1647 */ 1587 */
1648 selection_save_x = ev.xbutton.x; 1588 selection_save_x = ev.xbutton.x;
… …
1693 &ev.xbutton.x, &ev.xbutton.y, 1633 &ev.xbutton.x, &ev.xbutton.y,
1694 &unused_mask); 1634 &unused_mask);
1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1635 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1696 scrollbar_size ()); 1636 scrollbar_size ());
1697 want_refresh = 1; 1637 want_refresh = 1;
1698 refresh_limit = 0;
1699 scrollbar_show (1); 1638 scrollbar_show (1);
1700 } 1639 }
1701 break; 1640 break;
1702 } 1641 }
1703 1642
… …
1708 { 1647 {
1709 hidden_cursor = 0; 1648 hidden_cursor = 0;
1710 want_refresh = 1; 1649 want_refresh = 1;
1711 } 1650 }
1712 1651
1713 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1652 cursor_blink_ev.again ();
1714 } 1653 }
1715#endif 1654#endif
1716 1655
1717#if defined(POINTER_BLANK) 1656#if defined(POINTER_BLANK)
1718 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1657 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
… …
1746 XSetICFocus (Input_Context); 1685 XSetICFocus (Input_Context);
1747 } 1686 }
1748#endif 1687#endif
1749#if CURSOR_BLINK 1688#if CURSOR_BLINK
1750 if (option (Opt_cursorBlink)) 1689 if (option (Opt_cursorBlink))
1751 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1752#endif 1691#endif
1753#if OFF_FOCUS_FADING 1692#if OFF_FOCUS_FADING
1754 if (rs[Rs_fade]) 1693 if (rs[Rs_fade])
1755 { 1694 {
1756 pix_colors = pix_colors_focused; 1695 pix_colors = pix_colors_focused;
… …
1758 } 1697 }
1759#endif 1698#endif
1760#if ENABLE_FRILLS 1699#if ENABLE_FRILLS
1761 if (option (Opt_urgentOnBell)) 1700 if (option (Opt_urgentOnBell))
1762 { 1701 {
1763 XWMHints *h;
1764
1765 h = XGetWMHints(dpy, parent[0]); 1702 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1766 if (h != NULL)
1767 { 1703 {
1768 h->flags &= ~XUrgencyHint; 1704 h->flags &= ~XUrgencyHint;
1769 XSetWMHints(dpy, parent[0], h); 1705 XSetWMHints (dpy, parent[0], h);
1770 } 1706 }
1771 } 1707 }
1772#endif 1708#endif
1773 } 1709 }
1774} 1710}
… …
1785 1721
1786#if ENABLE_FRILLS || ISO_14755 1722#if ENABLE_FRILLS || ISO_14755
1787 if (iso14755buf) 1723 if (iso14755buf)
1788 { 1724 {
1789 iso14755buf = 0; 1725 iso14755buf = 0;
1790# if ENABLE_OVERLAY 1726# if ISO_14755
1791 scr_overlay_off (); 1727 scr_overlay_off ();
1792# endif 1728# endif
1793 } 1729 }
1794#endif 1730#endif
1795#if USE_XIM 1731#if USE_XIM
… …
1797 XUnsetICFocus (Input_Context); 1733 XUnsetICFocus (Input_Context);
1798#endif 1734#endif
1799#if CURSOR_BLINK 1735#if CURSOR_BLINK
1800 if (option (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1801 cursor_blink_ev.stop (); 1737 cursor_blink_ev.stop ();
1738
1802 hidden_cursor = 0; 1739 hidden_cursor = 0;
1803#endif 1740#endif
1804#if OFF_FOCUS_FADING 1741#if OFF_FOCUS_FADING
1805 if (rs[Rs_fade]) 1742 if (rs[Rs_fade])
1806 { 1743 {
… …
1822 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1759 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1823 } 1760 }
1824#endif 1761#endif
1825} 1762}
1826 1763
1827#if TRANSPARENT || ENABLE_PERL 1764#if ENABLE_TRANSPARENCY || ENABLE_PERL
1828void 1765void
1829rxvt_term::rootwin_cb (XEvent &ev) 1766rxvt_term::rootwin_cb (XEvent &ev)
1830{ 1767{
1831 make_current (); 1768 make_current ();
1832 1769
1833 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1770 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1834 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1771 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1835 return; 1772 return;
1836 1773
1837# if TRANSPARENT 1774# if ENABLE_TRANSPARENCY
1838 switch (ev.type) 1775 switch (ev.type)
1839 { 1776 {
1840 case PropertyNotify: 1777 case PropertyNotify:
1841 /* 1778 /*
1842 * if user used some Esetroot compatible prog to set the root bg, 1779 * 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. 1780 * use the property to determine the pixmap. We use it later on.
1844 */ 1781 */
1845 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1782 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1846 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1783 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1847 return; 1784 {
1848 1785 bgPixmap.set_root_pixmap ();
1849 /* FALLTHROUGH */ 1786 update_background ();
1850 case ReparentNotify: 1787 }
1851 if (option (Opt_transparent))
1852 check_our_parents ();
1853 break; 1788 break;
1854 } 1789 }
1855# endif 1790# endif
1856} 1791}
1857#endif 1792#endif
… …
2041 upordown = 1; /* down */ 1976 upordown = 1; /* down */
2042 } 1977 }
2043 if (upordown) 1978 if (upordown)
2044 { 1979 {
2045#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2046 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2047#endif 1982#endif
2048 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2049 { 1984 {
2050 if (upordown < 0) 1985 if (upordown < 0)
2051 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2214 { 2149 {
2215 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2216 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2217 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2218 2153
2219 if (slip_wheel_ev.at < NOW) 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2220 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2221
2222 slip_wheel_ev.start ();
2223 } 2155 }
2224 else 2156 else
2225 { 2157 {
2226# endif 2158# endif
2227 scr_page (v, i); 2159 scr_page (v, i);
… …
2233 break; 2165 break;
2234#endif 2166#endif
2235 } 2167 }
2236 } 2168 }
2237} 2169}
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 check_our_parents_ev.stop ();
2479 check_our_parents_ev.start (NOW + .1);
2480 return 0;
2481}
2482
2483void
2484rxvt_term::check_our_parents_cb (time_watcher &w)
2485{
2486 int i, pchanged, aformat, have_pixmap, rootdepth;
2487 unsigned long nitems, bytes_after;
2488 Atom atype;
2489 unsigned char *prop = NULL;
2490 Window root, oldp, *list;
2491 Pixmap rootpixmap = None;
2492 XWindowAttributes wattr, wrootattr;
2493 int sx, sy;
2494 Window cr;
2495
2496 pchanged = 0;
2497
2498 if (!option (Opt_transparent))
2499 return /*pchanged*/; /* Don't try any more */
2500
2501 XGetWindowAttributes (dpy, display->root, &wrootattr);
2502 rootdepth = wrootattr.depth;
2503
2504 XGetWindowAttributes (dpy, parent[0], &wattr);
2505
2506 if (rootdepth != wattr.depth)
2507 {
2508 if (am_transparent)
2509 {
2510 pchanged = 1;
2511 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2512 am_transparent = am_pixmap_trans = 0;
2513 }
2514
2515 return /*pchanged*/; /* Don't try any more */
2516 }
2517
2518 /* Get all X ops out of the queue so that our information is up-to-date. */
2519 XSync (dpy, False);
2520
2521 XTranslateCoordinates (dpy, parent[0], display->root,
2522 0, 0, &sx, &sy, &cr);
2523
2524 /* check if we are outside of the visible part of the virtual screen : */
2525 if( sx + (int)szHint.width <= 0 || sy + (int)szHint.height <= 0
2526 || sx >= wrootattr.width || sy >= wrootattr.height )
2527 return /* 0 */ ;
2528 /*
2529 * Make the frame window set by the window manager have
2530 * the root background. Some window managers put multiple nested frame
2531 * windows for each client, so we have to take care about that.
2532 */
2533 i = (xa[XA_XROOTPMAP_ID]
2534 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2535 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2536 &nitems, &bytes_after, &prop) == Success);
2537
2538 if (!i || prop == NULL)
2539 i = (xa[XA_ESETROOT_PMAP_ID]
2540 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2541 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2542 &nitems, &bytes_after, &prop) == Success);
2543
2544 if (!i || prop == NULL
2545#if TINTING
2546 || (!ISSET_PIXCOLOR (Color_tint) && rs[Rs_shade] == NULL
2547#ifdef HAVE_AFTERIMAGE
2548 && original_asim == NULL && rs[Rs_blurradius] == NULL
2549#endif
2550 )
2551#endif
2552 )
2553 have_pixmap = 0;
2554 else
2555 {
2556 have_pixmap = 1;
2557 rootpixmap = *(Pixmap *)prop;
2558 XFree (prop);
2559 }
2560
2561 if (have_pixmap)
2562 {
2563 Bool success = False ;
2564 GC gc;
2565 XGCValues gcvalue;
2566#ifdef HAVE_AFTERIMAGE
2567 {
2568 Pixmap tmp_pmap = None ;
2569 ShadingInfo shade;
2570 ARGB32 tint ;
2571 unsigned int pmap_w = 0, pmap_h = 0;
2572
2573 if (get_drawable_size( rootpixmap, &pmap_w, &pmap_h ))
2574 {
2575 int root_x = 0, root_y = 0;
2576
2577 shade.shading = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2578 if (ISSET_PIXCOLOR (Color_tint))
2579 {
2580 rgba c;
2581 pix_colors_focused [Color_tint].get (c);
2582 shade.tintColor.red = c.r;
2583 shade.tintColor.green = c.g;
2584 shade.tintColor.blue = c.b;
2585 }
2586 else
2587 shade.tintColor.red = shade.tintColor.green = shade.tintColor.blue = 0xFFFF;
2588 tint = shading2tint32( &shade );
2589 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2590 if (GetWinPosition (parent[0], &root_x, &root_y) )
2591 {
2592 ASImageLayer *layers = create_image_layers( 2 );
2593 ASImage *merged_im = NULL;
2594 int back_x, back_y, back_w, back_h;
2595 /* merge_layers does good job at tiling background appropriately,
2596 so all we need is to cut out smallest possible piece : */
2597#define MAKE_ROOTPMAP_GEOM(xy,wh,widthheight) \
2598 do{ while( root_##xy < 0 ) root_##xy += (int)wrootattr.widthheight; \
2599 back_##xy = root_##xy % pmap_##wh; /* that gives us left side of the closest tile : */ \
2600 if( pmap_##wh >= back_##xy + szHint.widthheight ) \
2601 back_##wh = szHint.widthheight;/* background is large - limit it by our size */ \
2602 else \
2603 { /* small background - need the whole of it for successfull tiling :*/ \
2604 back_##xy = 0; \
2605 back_##wh = pmap_##wh; \
2606 }}while(0)
2607
2608 MAKE_ROOTPMAP_GEOM(x,w,width);
2609 MAKE_ROOTPMAP_GEOM(y,h,height);
2610
2611 layers[0].im = pixmap2asimage (display->asv, rootpixmap, back_x, back_y, back_w, back_h, AllPlanes, ASA_ASImage, 100);
2612 layers[0].clip_x = (back_w == pmap_w)?root_x:0;
2613 layers[0].clip_y = (back_h == pmap_h)?root_y:0;
2614 layers[0].clip_width = szHint.width;
2615 layers[0].clip_height = szHint.height;
2616 layers[0].tint = tint;
2617 if (rs[Rs_blurradius] && layers[0].im)
2618 {
2619 double r = atof(rs[Rs_blurradius]);
2620 ASImage* tmp = blur_asimage_gauss(display->asv, layers[0].im, r, r, 0xFFFFFFFF, ASA_ASImage, 100, ASIMAGE_QUALITY_DEFAULT );
2621 if( tmp )
2622 {
2623 destroy_asimage( &layers[0].im );
2624 layers[0].im = tmp;
2625 }
2626 }
2627 if (original_asim != NULL)
2628 {
2629 int fore_w, fore_h;
2630 layers[1].im = original_asim;
2631 if( bgPixmap.auto_resize )
2632 {
2633 fore_w = szHint.width;
2634 fore_h = szHint.height;
2635 }
2636 else
2637 {
2638 fore_w = bgPixmap.w;
2639 fore_h = bgPixmap.h;
2640 }
2641 if (fore_w != original_asim->width
2642 || fore_h != original_asim->height)
2643 {
2644 layers[1].im = scale_asimage( display->asv,
2645 original_asim,
2646 fore_w, fore_h,
2647 ASA_ASImage, 100,
2648 ASIMAGE_QUALITY_DEFAULT );
2649 }
2650
2651 layers[1].clip_width = szHint.width;
2652 layers[1].clip_height = szHint.height;
2653
2654 if (rs[Rs_blendtype])
2655 {
2656 layers[1].merge_scanlines = blend_scanlines_name2func(rs[Rs_blendtype]);
2657 if( layers[1].merge_scanlines == NULL )
2658 layers[1].merge_scanlines = alphablend_scanlines;
2659 }
2660 }
2661 merged_im = merge_layers( display->asv, layers, layers[1].im?2:1,
2662 szHint.width, szHint.height,
2663 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT );
2664 if (layers[1].im != original_asim)
2665 destroy_asimage( &(layers[1].im) );
2666 destroy_asimage( &(layers[0].im) );
2667 if (merged_im != NULL)
2668 {
2669 tmp_pmap = asimage2pixmap( display->asv, DefaultRootWindow(dpy), merged_im, gc, True );
2670 destroy_asimage( &merged_im );
2671 }
2672 free( layers );
2673 }
2674 }
2675 if (tmp_pmap != None)
2676 {
2677 success = True;
2678 if (pixmap != None)
2679 XFreePixmap (dpy, pixmap);
2680 pixmap = tmp_pmap;
2681 }
2682 }
2683#else /* HAVE_AFTERIMAGE */
2684 {
2685 /*
2686 * Copy display->root pixmap transparency
2687 */
2688 int nx, ny;
2689 unsigned int nw, nh;
2690 XImage *image;
2691
2692 nw = (unsigned int)szHint.width;
2693 nh = (unsigned int)szHint.height;
2694 nx = ny = 0;
2695
2696 if (sx < 0)
2697 {
2698 nw += sx;
2699 nx = -sx;
2700 sx = 0;
2701 }
2702
2703 if (sy < 0)
2704 {
2705 nh += sy;
2706 ny = -sy;
2707 sy = 0;
2708 }
2709
2710 min_it (nw, (unsigned int) (wrootattr.width - sx));
2711 min_it (nh, (unsigned int) (wrootattr.height - sy));
2712
2713 XSync (dpy, False);
2714 allowedxerror = -1;
2715 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2716
2717 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2718 /* XXX: may need a delay here? */
2719 allowedxerror = 0;
2720 if (image != NULL)
2721 {
2722 if (pixmap != None)
2723 XFreePixmap (dpy, pixmap);
2724
2725#if TINTING
2726 if (ISSET_PIXCOLOR (Color_tint))
2727 {
2728 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2729
2730 rgba c;
2731 pix_colors_focused [Color_tint].get (c);
2732 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2733 }
2734#endif
2735
2736 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2737 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2738 XPutImage (dpy, pixmap, gc, image, 0, 0,
2739 nx, ny, image->width, image->height);
2740 XDestroyImage (image);
2741 success = True ;
2742 }
2743 }
2744#endif /* HAVE_AFTERIMAGE */
2745 if (gc != NULL)
2746 XFreeGC (dpy, gc);
2747
2748 if (!success)
2749 {
2750 if (am_transparent && am_pixmap_trans)
2751 {
2752 pchanged = 1;
2753 if (pixmap != None)
2754 {
2755 XFreePixmap (dpy, pixmap);
2756 pixmap = None;
2757 }
2758 }
2759
2760 am_pixmap_trans = 0;
2761 }
2762 else
2763 {
2764 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2765 XClearWindow (dpy, parent[0]);
2766
2767 if (!am_transparent || !am_pixmap_trans)
2768 pchanged = 1;
2769
2770 am_transparent = am_pixmap_trans = 1;
2771 }
2772 }
2773
2774 if (am_pixmap_trans)
2775 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2776 else
2777 {
2778 unsigned int n;
2779 /*
2780 * InheritPixmap transparency
2781 */
2782 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2783 {
2784 oldp = parent[i];
2785 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2786 XFree (list);
2787
2788 if (parent[i] == display->root)
2789 {
2790 if (oldp != None)
2791 pchanged = 1;
2792
2793 break;
2794 }
2795
2796 if (oldp != parent[i])
2797 pchanged = 1;
2798 }
2799
2800 n = 0;
2801
2802 if (pchanged)
2803 for (; n < (unsigned int)i; n++)
2804 {
2805 XGetWindowAttributes (dpy, parent[n], &wattr);
2806
2807 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2808 {
2809 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2810 break;
2811 }
2812 }
2813
2814 if (n > (sizeof (parent) / sizeof (parent[0])))
2815 {
2816 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2817 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2818 am_transparent = 0;
2819 /* XXX: also turn off Opt_transparent? */
2820 }
2821 else
2822 {
2823 for (n = 0; n < (unsigned int)i; n++)
2824 {
2825 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2826 XClearWindow (dpy, parent[n]);
2827 }
2828
2829 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2830 am_transparent = 1;
2831 }
2832
2833 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2834 parent[i] = None;
2835 }
2836
2837 if (scrollBar.win)
2838 {
2839 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2840 scrollBar.setIdle ();
2841 scrollbar_show (0);
2842 }
2843
2844 if (am_transparent)
2845 {
2846 want_refresh = want_full_refresh = 1;
2847 if (am_pixmap_trans)
2848 flush ();
2849 }
2850
2851// return pchanged;
2852}
2853#endif
2854 2170
2855/*}}} */ 2171/*}}} */
2856 2172
2857bool 2173bool
2858rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
… …
2907 if (ch == C0_LF) 2223 if (ch == C0_LF)
2908 nlines++; 2224 nlines++;
2909 2225
2910 refresh_count++; 2226 refresh_count++;
2911 2227
2912 if (!option (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2913 || (refresh_count >= refresh_limit * (nrow - 1)))
2914 { 2229 {
2915 refreshnow = true;
2916 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2917 ch = NOCHAR; 2235 ch = NOCHAR;
2918 break; 2236 break;
2237 }
2919 } 2238 }
2920 2239
2921 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2922 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2923 { 2242 {
… …
2951 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2952 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2953 2272
2954 /* 2273 /*
2955 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2956 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2957 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2958 * is incremented here because we must be doing flat-out scrolling.
2959 */ 2277 */
2960 if (refreshnow) 2278 if (refreshnow)
2961 { 2279 {
2962 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2963 refresh_limit++;
2964 else
2965 {
2966 flag = true; 2280 flag = true;
2967 //TODO: due to popular request, implement "skipscroll" option here
2968 scr_refresh (); 2281 scr_refresh ();
2969 want_refresh = 1; 2282 want_refresh = 1;
2970 }
2971 } 2283 }
2972 2284
2973 } 2285 }
2974 else 2286 else
2975 { 2287 {
… …
3124 { 2436 {
3125 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
3126 break; /* done = 1 */ 2438 break; /* done = 1 */
3127 } 2439 }
3128 } 2440 }
3129 2441
3130 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
3131 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
3132 { 2444 {
3133 done = 1; 2445 done = 1;
3134 break; 2446 break;
… …
3196 process_dcs_seq (); 2508 process_dcs_seq ();
3197 break; 2509 break;
3198 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
3199 process_csi_seq (); 2511 process_csi_seq ();
3200 break; 2512 break;
3201 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3202 process_osc_seq (); 2514 process_osc_seq ();
3203 break; 2515 break;
3204#endif 2516#endif
3205 } 2517 }
3206} 2518}
… …
3432rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3433{ 2745{
3434 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3435 unsigned int nargs, p; 2747 unsigned int nargs, p;
3436 int n, ndef; 2748 int n, ndef;
3437 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3438 2750
3439 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3440 arg[--nargs] = 0;
3441 2752
3442 priv = 0; 2753 priv = 0;
3443 ch = cmd_getc (); 2754 ch = cmd_getc ();
3444 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
3445 { /* '<' '=' '>' '?' */ 2756 { /* '<' '=' '>' '?' */
… …
3489 switch (priv) 2800 switch (priv)
3490 { 2801 {
3491 case '>': 2802 case '>':
3492 if (ch == CSI_DA) /* secondary device attributes */ 2803 if (ch == CSI_DA) /* secondary device attributes */
3493 { 2804 {
3494 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2805 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3495 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2806 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3496 // 2807 //
3497 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2808 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3498 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2809 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3499 // that we do not support xterm mouse reporting (should be 95 when we do). 2810 // versions.
3500 // 2811 //
3501 tt_printf ("\033[>%d;94;0c", 'U'); 2812 tt_printf ("\033[>%d;95;0c", 'U');
3502 } 2813 }
3503 break; 2814 break;
3504 case '?': 2815 case '?':
3505 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2816 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3506 process_terminal_mode (ch, priv, nargs, arg); 2817 process_terminal_mode (ch, priv, nargs, arg);
… …
3952 int saveop = op; 3263 int saveop = op;
3953 3264
3954 dLocal (Display *, dpy); 3265 dLocal (Display *, dpy);
3955 3266
3956 assert (str != NULL); 3267 assert (str != NULL);
3957 3268
3958 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END))) 3269 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3959 return; 3270 return;
3960 3271
3961 switch (op) 3272 switch (op)
3962 { 3273 {
… …
4057 break; 3368 break;
4058 case URxvt_Color_IT: 3369 case URxvt_Color_IT:
4059 process_color_seq (op, Color_IT, str, resp); 3370 process_color_seq (op, Color_IT, str, resp);
4060 break; 3371 break;
4061#endif 3372#endif
4062#if TRANSPARENT && TINTING 3373#if ENABLE_TRANSPARENCY
4063 case URxvt_Color_tint: 3374 case URxvt_Color_tint:
4064 process_color_seq (op, Color_tint, str, resp); 3375 process_color_seq (op, Color_tint, str, resp);
3376 {
3377 bool changed = false;
3378 if (ISSET_PIXCOLOR (Color_tint))
3379 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3380 else
3381 changed = bgPixmap.unset_tint ();
3382 if (changed)
3383 update_background ();
3384 }
4065 3385
4066 check_our_parents ();
4067
4068 if (am_transparent)
4069 want_full_refresh = want_refresh = 1;
4070
4071 break; 3386 break;
4072#endif 3387#endif
4073 3388
3389#if BG_IMAGE_FROM_FILE
4074 case Rxvt_Pixmap: 3390 case Rxvt_Pixmap:
4075 { 3391 if (!strcmp (str, "?"))
4076 if (*str != ';')
4077 { 3392 {
4078#if XPM_BACKGROUND 3393 char str[256];
4079 scale_pixmap (""); /* reset to default scaling */ 3394
4080 set_bgPixmap (str); /* change pixmap */ 3395 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
4081 scr_touch (true); 3396 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
4082#endif 3397 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3398 process_xterm_seq (XTerm_title, str, CHAR_ST);
4083 } 3399 }
4084 3400 else
3401 {
4085 int changed = 0; 3402 int changed = 0;
4086 3403
4087 while ((str = strchr (str, ';')) != NULL) 3404 if (*str != ';')
4088 { 3405 {
3406 /* reset to default scaling :*/
3407 bgPixmap.unset_geometry ();
3408 if (bgPixmap.set_file (str)) /* change pixmap */
3409 changed++;
3410 str = strchr (str, ';');
3411 if (str == NULL)
3412 bgPixmap.set_defaultGeometry ();
3413 }
3414 while (str)
3415 {
4089 str++; 3416 str++;
4090#if XPM_BACKGROUND 3417 if (bgPixmap.set_geometry (str))
4091 changed += scale_pixmap (str); 3418 changed++;
4092#endif 3419 str = strchr (str, ';');
4093 } 3420 }
4094
4095 if (changed) 3421 if (changed)
4096 { 3422 update_background ();
4097#ifdef XPM_BACKGROUND
4098 resize_pixmap ();
4099 scr_touch (true);
4100#endif
4101 } 3423 }
4102#if TRANSPARENT && defined(HAVE_AFTERIMAGE) 3424 break;
4103 if (option(Opt_transparent))
4104 check_our_parents ();
4105#endif 3425#endif
4106
4107 }
4108 break;
4109 3426
4110 case Rxvt_restoreFG: 3427 case Rxvt_restoreFG:
4111 set_window_color (Color_fg, str); 3428 set_window_color (Color_fg, str);
4112 break; 3429 break;
4113 case Rxvt_restoreBG: 3430 case Rxvt_restoreBG:
… …
4235{ 3552{
4236 unsigned int i, j; 3553 unsigned int i, j;
4237 int state; 3554 int state;
4238 3555
4239 static const struct 3556 static const struct
4240 { 3557 {
4241 const int argval; 3558 const int argval;
4242 const unsigned long bit; 3559 const unsigned long bit;
4243 }
4244
4245 argtopriv[] = { 3560 } argtopriv[] = {
4246 { 1, PrivMode_aplCUR }, 3561 { 1, PrivMode_aplCUR },
4247 { 2, PrivMode_vt52 }, 3562 { 2, PrivMode_vt52 },
4248 { 3, PrivMode_132 }, 3563 { 3, PrivMode_132 },
4249 { 4, PrivMode_smoothScroll }, 3564 { 4, PrivMode_smoothScroll },
4250 { 5, PrivMode_rVideo }, 3565 { 5, PrivMode_rVideo },
… …
4267#ifndef NO_BACKSPACE_KEY 3582#ifndef NO_BACKSPACE_KEY
4268 { 67, PrivMode_BackSpace }, 3583 { 67, PrivMode_BackSpace },
4269#endif 3584#endif
4270 { 1000, PrivMode_MouseX11 }, 3585 { 1000, PrivMode_MouseX11 },
4271 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4272 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4273 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4274 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4275 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4276 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4277 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4278 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
4352 scr_autowrap (state); 3667 scr_autowrap (state);
4353 break; 3668 break;
4354 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
4355 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4356 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4357 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4358 break; 3673 break;
4359#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4360 case scrollBar_esc: 3675 case scrollBar_esc:
4361 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4362 { 3677 {
… …
4375 break; 3690 break;
4376 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4377 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4378 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4379 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4380 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4381 break; 3696 break;
4382#if 0 3697#if 0
4383 case 1001: 3698 case 1001:
4384 break; /* X11 mouse highlighting */ 3699 break; /* X11 mouse highlighting */
4385#endif 3700#endif
3701 case 1002:
3702 case 1003:
3703 if (state)
3704 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3706 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3707 vt_emask_mouse = PointerMotionMask;
3708 }
3709 else
3710 vt_emask_mouse = NoEventMask;
3711 vt_select_input ();
3712 break;
4386 case 1010: /* scroll to bottom on TTY output inhibit */ 3713 case 1010: /* scroll to bottom on TTY output inhibit */
4387 set_option (Opt_scrollTtyOutput, !state); 3714 set_option (Opt_scrollTtyOutput, !state);
4388 break; 3715 break;
4389 case 1011: /* scroll to bottom on key press */ 3716 case 1011: /* scroll to bottom on key press */
4390 set_option (Opt_scrollTtyKeypress, state); 3717 set_option (Opt_scrollTtyKeypress, state);
… …
4627 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3954 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4628 3955
4629 memcpy (v_buffer + v_buflen, data, len); 3956 memcpy (v_buffer + v_buflen, data, len);
4630 v_buflen += len; 3957 v_buflen += len;
4631 3958
4632 pty_ev.set (EVENT_READ | EVENT_WRITE); 3959 pty_ev.set (ev::READ | ev::WRITE);
4633} 3960}
4634 3961
4635void rxvt_term::pty_write () 3962void rxvt_term::pty_write ()
4636{ 3963{
4637 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));
… …
4642 3969
4643 if (v_buflen == 0) 3970 if (v_buflen == 0)
4644 { 3971 {
4645 free (v_buffer); 3972 free (v_buffer);
4646 v_buffer = 0; 3973 v_buffer = 0;
4647 v_buflen = 0;
4648 3974
4649 pty_ev.set (EVENT_READ); 3975 pty_ev.set (ev::READ);
4650 return; 3976 return;
4651 } 3977 }
4652 3978
4653 memmove (v_buffer, v_buffer + written, v_buflen); 3979 memmove (v_buffer, v_buffer + written, v_buflen);
4654 } 3980 }
4655 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3981 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4656 pty_ev.set (EVENT_READ); 3982 pty_ev.set (ev::READ);
4657} 3983}
4658 3984
4659/*----------------------- end-of-file (C source) -----------------------*/ 3985/*----------------------- end-of-file (C source) -----------------------*/
4660 3986

Diff Legend

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