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.309 by root, Mon Feb 20 22:42:00 2006 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08:00 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,
… …
500# if ISO_14755 499# if ISO_14755
501 iso14755_51 (0); 500 iso14755_51 (0);
502# endif 501# endif
503 return; 502 return;
504 } 503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
509# endif
510 return;
511 }
505 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
506 { 513 {
507 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
508 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
509# if ISO_14755 516# if ISO_14755
… …
511# endif 518# endif
512 return; 519 return;
513 } 520 }
514 else 521 else
515 { 522 {
516# if ENABLE_OVERLAY 523# if ISO_14755
517 scr_overlay_off (); 524 scr_overlay_off ();
518# endif 525# endif
519 iso14755buf = 0; 526 iso14755buf = 0;
520 } 527 }
521 } 528 }
522 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
523 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
524 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
525 { 532 {
526 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
527# if ENABLE_OVERLAY 534# if ISO_14755
528 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
529 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
530# endif 537# endif
531 } 538 }
532#endif 539#endif
533 540
534#ifdef PRINTPIPE 541#ifdef PRINTPIPE
535 if (keysym == XK_Print) 542 if (keysym == XK_Print)
536 { 543 {
537 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
538 return; 545 return;
… …
540#endif 547#endif
541 548
542 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
543 { 550 {
544 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
545 newlen = 1; 553 newlen = 1;
546 switch (keysym) 554 switch (keysym)
547 { 555 {
548#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
549 case XK_BackSpace: 557 case XK_BackSpace:
… …
552 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
553 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
554 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
555 } 563 }
556 else 564 else
557 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
558 break; 566 break;
559#endif 567#endif
560#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
561# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
562 case XK_KP_Delete: 570 case XK_KP_Delete:
563 /* allow shift to override */ 571 /* allow shift to override */
564 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
565 { 573 {
566 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
567 break; 575 break;
568 } 576 }
569 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
570# endif 578# endif
571 case XK_Delete: 579 case XK_Delete:
572 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
573 break; 581 break;
574#endif 582#endif
575 case XK_Tab: 583 case XK_Tab:
576 if (shft) 584 if (shft)
577 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
588 newlen = 0; 596 newlen = 0;
589 } 597 }
590 break; 598 break;
591 599
592#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
593 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
594 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
595 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
596 case XK_KP_Left: /* \033Ot or standard */
597 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
598 { 606 {
599 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
600 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
601 break; 609 break;
602 } 610 }
… …
625 633
626#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
627# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
628 case XK_KP_Prior: 636 case XK_KP_Prior:
629 /* allow shift to override */ 637 /* allow shift to override */
630 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
631 { 639 {
632 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
633 break; 641 break;
634 } 642 }
635 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
638 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
639 break; 647 break;
640# ifdef XK_KP_Next 648# ifdef XK_KP_Next
641 case XK_KP_Next: 649 case XK_KP_Next:
642 /* allow shift to override */ 650 /* allow shift to override */
643 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
644 { 652 {
645 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
646 break; 654 break;
647 } 655 }
648 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
651 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
652 break; 660 break;
653#endif 661#endif
654 case XK_KP_Enter: 662 case XK_KP_Enter:
655 /* allow shift to override */ 663 /* allow shift to override */
656 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
657 { 665 {
658 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
659 break; 667 break;
660 } 668 }
661 669
… …
704 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
705 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
706 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
707 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
708 /* allow shift to override */ 716 /* allow shift to override */
709 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
710 { 718 {
711 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
712 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
713 } 721 }
714 else 722 else
… …
720 728
721 case XK_Find: 729 case XK_Find:
722 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
723 break; 731 break;
724 732
725#ifdef XK_KP_End 733#ifdef XK_KP_Insert
726 case XK_KP_Insert: 734 case XK_KP_Insert:
727 /* allow shift to override */ 735 /* allow shift to override */
728 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
729 { 737 {
730 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
731 break; 739 break;
732 } 740 }
733 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
746 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
747 break; 755 break;
748#ifdef XK_KP_End 756#ifdef XK_KP_End
749 case XK_KP_End: 757 case XK_KP_End:
750 /* allow shift to override */ 758 /* allow shift to override */
751 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
752 { 760 {
753 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
754 break; 762 break;
755 } 763 }
756 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
759 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
760 break; 768 break;
761#ifdef XK_KP_Home 769#ifdef XK_KP_Home
762 case XK_KP_Home: 770 case XK_KP_Home:
763 /* allow shift to override */ 771 /* allow shift to override */
764 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
765 { 773 {
766 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
767 break; 775 break;
768 } 776 }
769 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
877 return; 885 return;
878 886
879 if (len <= 0) 887 if (len <= 0)
880 return; /* not mapped */ 888 return; /* not mapped */
881 889
882 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
883 if (view_start) 891 if (view_start)
884 { 892 {
885 view_start = 0; 893 view_start = 0;
886 want_refresh = 1; 894 want_refresh = 1;
887 } 895 }
… …
926#if ENABLE_FRILLS || ISO_14755 934#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support 935 // ISO 14755 support
928 if (iso14755buf) 936 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52) 937 if (iso14755buf & ISO_14755_52)
930 { 938 {
931# if ENABLE_OVERLAY 939# if ISO_14755
932 scr_overlay_off (); 940 scr_overlay_off ();
933# endif 941# endif
934# if ISO_14755 942# if ISO_14755
935 // iso14755 part 5.2 handling: release time 943 // iso14755 part 5.2 handling: release time
936 // first: controls 944 // first: controls
… …
959 967
960 return; 968 return;
961 } 969 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask)) 970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 { 971 {
964# if ENABLE_OVERLAY 972# if ISO_14755
965 scr_overlay_off (); 973 scr_overlay_off ();
966# endif 974# endif
967 if (iso14755buf & ISO_14755_51) 975 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 (); 976 commit_iso14755 ();
969#if ISO_14755 977#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED) 978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
971 { 979 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair 980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973 981
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1); 982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE"); 983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
… …
1027void 1035void
1028rxvt_term::flush () 1036rxvt_term::flush ()
1029{ 1037{
1030 flush_ev.stop (); 1038 flush_ev.stop ();
1031 1039
1032#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
1033 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
1034 { 1042 {
1035 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
1036 scr_clear ();
1037 scr_touch (false); 1044 scr_touch (false);
1038 } 1045 }
1039#endif 1046#endif
1040 1047
1041 if (want_refresh) 1048 if (want_refresh)
… …
1087 1094
1088 display->flush (); 1095 display->flush ();
1089} 1096}
1090 1097
1091void 1098void
1092rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1093{ 1100{
1094 make_current (); 1101 make_current ();
1095 1102
1096 display->flush (); 1103 display->flush ();
1097 1104
1098 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1100} 1107}
1101 1108
1102void 1109void
1103rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1104{ 1111{
1105 make_current (); 1112 make_current ();
1106 1113
1107 refresh_limit = 1;
1108 refresh_count = 0; 1114 refresh_count = 0;
1109 flush (); 1115 flush ();
1110} 1116}
1111 1117
1112#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1113void 1119void
1114rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1115{ 1121{
1116 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1117 want_refresh = 1; 1123 want_refresh = 1;
1118
1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1120} 1124}
1121#endif 1125#endif
1122 1126
1123#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1124void 1128void
1125rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1126{ 1130{
1127 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1128 { 1132 {
1129 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1130 want_refresh = 1; 1134 want_refresh = 1;
1131 w.start (w.at + TEXT_BLINK_INTERVAL);
1132 } 1135 }
1133} 1136}
1134#endif 1137#endif
1135 1138
1136#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1137void 1140void
1138rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1139{ 1142{
1140 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1141 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1142 {
1143 want_refresh = 1; 1145 want_refresh = 1;
1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1145 } 1147 w.stop ();
1146} 1148}
1147#endif 1149#endif
1148 1150
1149#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1150void 1152void
1151rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1152{ 1154{
1153 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1154 { 1156 {
1155 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1156 want_refresh = 1; 1158 want_refresh = 1;
1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1158 } 1159 }
1160 else
1161 w.stop ();
1159} 1162}
1160#endif 1163#endif
1161 1164
1162#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1163void 1166void
1164rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1165{ 1168{
1166 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1168 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1169 { 1172 {
1170 if (view_start == top_row || view_start == 0) 1173 if (view_start == top_row || view_start == 0)
1171 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1172 1175
1173 want_refresh = 1; 1176 want_refresh = 1;
1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1175 } 1177 }
1178 else
1179 w.stop ();
1176} 1180}
1177#endif 1181#endif
1178 1182
1179#if LINUX_YIELD_HACK 1183#if LINUX_YIELD_HACK
1180static struct event_handler 1184static struct event_handler
1181{ 1185{
1182 check_watcher yield_ev; 1186 ev::prepare yield_ev;
1183 1187
1184 void yield_cb (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1185 { 1189 {
1186 // this should really be sched_yield(), but the linux guys thought 1190 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than 1191 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is 1192 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS. 1193 // allowed by the sus... as is returning ENOSYS.
… …
1232 } 1236 }
1233 else 1237 else
1234 { 1238 {
1235 pty_ev.stop (); 1239 pty_ev.stop ();
1236 1240
1237 if (!OPTION (Opt_hold)) 1241 if (!option (Opt_hold))
1238 destroy (); 1242 destroy ();
1239 } 1243 }
1240 1244
1241 return false; 1245 return false;
1242} 1246}
1243 1247
1244void 1248void
1245rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1246{ 1250{
1247 make_current (); 1251 make_current ();
1248 1252
1249 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1250 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1251 while (pty_fill ()) 1255 while (pty_fill ())
1252 if (cmd_parse ()) 1256 if (cmd_parse ())
1253 break; 1257 break;
1254 1258
1255 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1256 pty_write (); 1260 pty_write ();
1257} 1261}
1258 1262
1259void 1263void
1260rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
… …
1263 recolour_cursor (); 1267 recolour_cursor ();
1264 1268
1265#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1266 hidden_pointer = 0; 1270 hidden_pointer = 0;
1267 1271
1268 if (OPTION (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1269 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1270#endif 1274#endif
1271} 1275}
1272 1276
1273#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1274void 1278void
1275rxvt_term::pointer_blank () 1279rxvt_term::pointer_blank ()
1276{ 1280{
1277 if (!OPTION (Opt_pointerBlank)) 1281 if (!option (Opt_pointerBlank))
1278 return; 1282 return;
1279 1283
1280 XDefineCursor (dpy, vt, display->blank_cursor); 1284 XDefineCursor (dpy, vt, display->blank_cursor);
1281 XFlush (dpy); 1285 XFlush (dpy);
1282 1286
1283 hidden_pointer = 1; 1287 hidden_pointer = 1;
1284} 1288}
1285 1289
1286void 1290void
1287rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1288{ 1292{
1289 make_current (); 1293 make_current ();
1290 1294
1291 pointer_blank (); 1295 pointer_blank ();
1292} 1296}
… …
1295void 1299void
1296rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1297{ 1301{
1298 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1299 int x, y; 1303 int x, y;
1304 int code = 32;
1300 1305
1301 x = ev.x; 1306 x = Pixel2Col (ev.x);
1302 y = ev.y; 1307 y = Pixel2Row (ev.y);
1303 pixel_position (&x, &y); 1308 if (ev.type == MotionNotify) {
1309 if (x == mouse_row && y == mouse_col)
1310 return;
1311 mouse_row = x;
1312 mouse_col = y;
1313 code += 32;
1314 }
1304 1315
1305 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1306 button_number = 3; 1317 button_number = 3;
1307 else 1318 else
1308 { 1319 {
… …
1354 x + 1, 1365 x + 1,
1355 y + 1); 1366 y + 1);
1356#endif 1367#endif
1357 1368
1358 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1359 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1360 (32 + x + 1), 1371 (32 + x + 1),
1361 (32 + y + 1)); 1372 (32 + y + 1));
1362} 1373}
1363 1374
1364/*{{{ process an X event */ 1375/*{{{ process an X event */
… …
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1437 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out (); 1438 focus_out ();
1428 } 1439 }
1429#endif 1440#endif
1430 } 1441 }
1431 break;
1432
1433 case MappingNotify:
1434 XRefreshKeyboardMapping (&ev.xmapping);
1435 break; 1442 break;
1436 1443
1437 /* 1444 /*
1438 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1439 * Here's my conclusion: 1446 * Here's my conclusion:
… …
1458 break; 1465 break;
1459 } 1466 }
1460 break; 1467 break;
1461 1468
1462 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1463 focus_in (); 1473 focus_in ();
1464 break; 1474 break;
1465 1475
1466 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1467 focus_out (); 1480 focus_out ();
1468 break; 1481 break;
1469 1482
1470 case ConfigureNotify: 1483 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */
1471 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1472 { 1488 {
1473 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1474 ; 1490 ;
1475 1491
1476 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1477 { 1493 {
1478 seen_resize = 1; 1494 seen_resize = 1;
1479 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1480 } 1496 }
1481 1497 else
1498 {
1499#ifdef HAVE_BG_PIXMAP
1500 if (bgPixmap.window_position_sensitive ())
1501 update_background ();
1502#endif
1503 }
1482 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1485 if (OPTION (Opt_transparent))
1486 check_our_parents ();
1487#endif
1488 } 1505 }
1489 break; 1506 break;
1490 1507
1491 case PropertyNotify: 1508 case PropertyNotify:
1492 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1510 break; 1527 break;
1511 1528
1512 case MapNotify: 1529 case MapNotify:
1513 mapped = 1; 1530 mapped = 1;
1514#ifdef TEXT_BLINK 1531#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1516#endif 1533#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1535 break;
1519 1536
1520 case UnmapNotify: 1537 case UnmapNotify:
… …
1522#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1524#endif 1541#endif
1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526 break; 1543 break;
1527
1528#ifdef TRANSPARENT
1529 case ReparentNotify:
1530 rootwin_cb (ev);
1531 break;
1532#endif /* TRANSPARENT */
1533 1544
1534 case GraphicsExpose: 1545 case GraphicsExpose:
1535 case Expose: 1546 case Expose:
1536 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1537 { 1548 {
1538 do 1549 do
1550 {
1539 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1540 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1541 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1542 1555
1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1544 1557
1545 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1548 1562 }
1549 want_refresh = 1; 1563 want_refresh = 1;
1550 } 1564 }
1551 else 1565 else
1552 { 1566 {
1553 XEvent unused_event; 1567 XEvent unused_event;
… …
1560 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1561 { 1575 {
1562 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1563 scrollbar_show (0); 1577 scrollbar_show (0);
1564 } 1578 }
1565
1566#ifdef TRANSPARENT
1567 if (am_transparent && ev.xany.window == parent[0])
1568 XClearWindow (dpy, ev.xany.window);
1569#endif
1570 } 1579 }
1571 break; 1580 break;
1572 1581
1573 case MotionNotify: 1582 case MotionNotify:
1574#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1575 if (hidden_pointer) 1584 if (hidden_pointer)
1576 pointer_unblank (); 1585 pointer_unblank ();
1577#endif 1586#endif
1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1588 || priv_modes & PrivMode_MouseAnyEvent)
1589 mouse_report (ev.xbutton);
1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1579 break; 1591 break;
1580 1592
1581 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1582 { 1594 {
… …
1617 1629
1618 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1619 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1620 */ 1632 */
1621 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1622 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1623 1635
1624 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1625 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1626 */ 1638 */
1627 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1672 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1673 &unused_mask); 1685 &unused_mask);
1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1675 scrollbar_size ()); 1687 scrollbar_size ());
1676 want_refresh = 1; 1688 want_refresh = 1;
1677 refresh_limit = 0;
1678 scrollbar_show (1); 1689 scrollbar_show (1);
1679 } 1690 }
1680 break; 1691 break;
1681 } 1692 }
1682 1693
1683#if defined(CURSOR_BLINK) 1694#if defined(CURSOR_BLINK)
1684 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1685 { 1696 {
1686 if (hidden_cursor) 1697 if (hidden_cursor)
1687 { 1698 {
1688 hidden_cursor = 0; 1699 hidden_cursor = 0;
1689 want_refresh = 1; 1700 want_refresh = 1;
1690 } 1701 }
1691 1702
1692 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1703 cursor_blink_ev.again ();
1693 } 1704 }
1694#endif 1705#endif
1695 1706
1696#if defined(POINTER_BLANK) 1707#if defined(POINTER_BLANK)
1697 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1698 { 1709 {
1699 if (ev.type == MotionNotify 1710 if (ev.type == MotionNotify
1700 || ev.type == ButtonPress 1711 || ev.type == ButtonPress
1701 || ev.type == ButtonRelease) 1712 || ev.type == ButtonRelease)
1702 if (hidden_pointer) 1713 if (hidden_pointer)
… …
1724 IMSetPosition (); 1735 IMSetPosition ();
1725 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1726 } 1737 }
1727#endif 1738#endif
1728#if CURSOR_BLINK 1739#if CURSOR_BLINK
1729 if (OPTION (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1730 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1731#endif 1742#endif
1732#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1733 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1734 { 1745 {
1735 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
1736 scr_recolour (); 1747 scr_recolour ();
1737 } 1748 }
1738#endif 1749#endif
1750#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell))
1752 {
1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1754 {
1755 h->flags &= ~XUrgencyHint;
1756 XSetWMHints (dpy, parent[0], h);
1757 }
1758 }
1759#endif
1739 } 1760 }
1740} 1761}
1741 1762
1742void 1763void
1743rxvt_term::focus_out () 1764rxvt_term::focus_out ()
… …
1751 1772
1752#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1753 if (iso14755buf) 1774 if (iso14755buf)
1754 { 1775 {
1755 iso14755buf = 0; 1776 iso14755buf = 0;
1756# if ENABLE_OVERLAY 1777# if ISO_14755
1757 scr_overlay_off (); 1778 scr_overlay_off ();
1758# endif 1779# endif
1759 } 1780 }
1760#endif 1781#endif
1761#if USE_XIM 1782#if USE_XIM
1762 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1763 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1764#endif 1785#endif
1765#if CURSOR_BLINK 1786#if CURSOR_BLINK
1766 if (OPTION (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1767 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1768 hidden_cursor = 0; 1790 hidden_cursor = 0;
1769#endif 1791#endif
1770#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1772 { 1794 {
… …
1775 } 1797 }
1776#endif 1798#endif
1777 } 1799 }
1778} 1800}
1779 1801
1780#if TRANSPARENT 1802void
1803rxvt_term::update_fade_color (unsigned int idx)
1804{
1805#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade])
1807 {
1808 rgba c;
1809 pix_colors [Color_fade].get (c);
1810 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1811 }
1812#endif
1813}
1814
1815#if ENABLE_TRANSPARENCY || ENABLE_PERL
1781void 1816void
1782rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1783{ 1818{
1784 make_current (); 1819 make_current ();
1785 1820
1821 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1822 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1823 return;
1824
1825# if ENABLE_TRANSPARENCY
1786 switch (ev.type) 1826 switch (ev.type)
1787 { 1827 {
1788 case PropertyNotify: 1828 case PropertyNotify:
1789 /* 1829 /*
1790 * if user used some Esetroot compatible prog to set the root bg, 1830 * if user used some Esetroot compatible prog to set the root bg,
1791 * use the property to determine the pixmap. We use it later on. 1831 * use the property to determine the pixmap. We use it later on.
1792 */ 1832 */
1793 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1794 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1795 return; 1835 {
1796 1836 bgPixmap.set_root_pixmap ();
1797 /* FALLTHROUGH */ 1837 update_background ();
1798 case ReparentNotify: 1838 }
1799 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1800 want_refresh = want_full_refresh = 1;
1801 break; 1839 break;
1802 } 1840 }
1841# endif
1803} 1842}
1804#endif 1843#endif
1805 1844
1806void 1845void
1807rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
… …
1988 upordown = 1; /* down */ 2027 upordown = 1; /* down */
1989 } 2028 }
1990 if (upordown) 2029 if (upordown)
1991 { 2030 {
1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1993 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1994#endif 2033#endif
1995 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
1996 { 2035 {
1997 if (upordown < 0) 2036 if (upordown < 0)
1998 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2135 selection_make (ev.time); 2174 selection_make (ev.time);
2136 break; 2175 break;
2137 2176
2138 case Button2: 2177 case Button2:
2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2178 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2141 break; 2180 break;
2142 2181
2143#ifdef MOUSE_WHEEL 2182#ifdef MOUSE_WHEEL
2144 case Button4: 2183 case Button4:
2145 case Button5: 2184 case Button5:
… …
2149 2188
2150 v = ev.button == Button4 ? UP : DN; 2189 v = ev.button == Button4 ? UP : DN;
2151 2190
2152 if (ev.state & ShiftMask) 2191 if (ev.state & ShiftMask)
2153 i = 1; 2192 i = 1;
2154 else if (OPTION (Opt_mouseWheelScrollPage)) 2193 else if (option (Opt_mouseWheelScrollPage))
2155 i = nrow - 1; 2194 i = nrow - 1;
2156 else 2195 else
2157 i = 5; 2196 i = 5;
2158 2197
2159# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
… …
2161 { 2200 {
2162 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2165 2204
2166 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2167 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2168
2169 slip_wheel_ev.start ();
2170 } 2206 }
2171 else 2207 else
2172 { 2208 {
2173# endif 2209# endif
2174 scr_page (v, i); 2210 scr_page (v, i);
… …
2180 break; 2216 break;
2181#endif 2217#endif
2182 } 2218 }
2183 } 2219 }
2184} 2220}
2185
2186#ifdef TRANSPARENT
2187#if TINTING
2188/* taken from aterm-0.4.2 */
2189
2190typedef uint32_t RUINT32T;
2191
2192void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2193{
2194 int sh_r, sh_g, sh_b;
2195 RUINT32T mask_r, mask_g, mask_b;
2196 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2197 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2198 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2199 int i;
2200
2201 Visual *visual = term->visual;
2202
2203 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2204
2205 /* for convenience */
2206 mask_r = visual->red_mask;
2207 mask_g = visual->green_mask;
2208 mask_b = visual->blue_mask;
2209
2210 /* boring lookup table pre-initialization */
2211 switch (srcImage->bits_per_pixel) {
2212 case 15:
2213 if ((mask_r != 0x7c00) ||
2214 (mask_g != 0x03e0) ||
2215 (mask_b != 0x001f))
2216 return;
2217 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2218 lookup_r = lookup;
2219 lookup_g = lookup+32;
2220 lookup_b = lookup+32+32;
2221 sh_r = 10;
2222 sh_g = 5;
2223 sh_b = 0;
2224 break;
2225 case 16:
2226 if ((mask_r != 0xf800) ||
2227 (mask_g != 0x07e0) ||
2228 (mask_b != 0x001f))
2229 return;
2230 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2231 lookup_r = lookup;
2232 lookup_g = lookup+32;
2233 lookup_b = lookup+32+64;
2234 sh_r = 11;
2235 sh_g = 5;
2236 sh_b = 0;
2237 break;
2238 case 24:
2239 if ((mask_r != 0xff0000) ||
2240 (mask_g != 0x00ff00) ||
2241 (mask_b != 0x0000ff))
2242 return;
2243 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2244 lookup_r = lookup;
2245 lookup_g = lookup+256;
2246 lookup_b = lookup+256+256;
2247 sh_r = 16;
2248 sh_g = 8;
2249 sh_b = 0;
2250 break;
2251 case 32:
2252 if ((mask_r != 0xff0000) ||
2253 (mask_g != 0x00ff00) ||
2254 (mask_b != 0x0000ff))
2255 return;
2256 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2257 lookup_r = lookup;
2258 lookup_g = lookup+256;
2259 lookup_b = lookup+256+256;
2260 sh_r = 16;
2261 sh_g = 8;
2262 sh_b = 0;
2263 break;
2264 default:
2265 return; /* we do not support this color depth */
2266 }
2267
2268 /* prepare limits for color transformation (each channel is handled separately) */
2269 if (shade < 0) {
2270 shade = -shade;
2271 if (shade < 0) shade = 0;
2272 if (shade > 100) shade = 100;
2273
2274 lower_lim_r = 65535-rm;
2275 lower_lim_g = 65535-gm;
2276 lower_lim_b = 65535-bm;
2277
2278 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2279 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2280 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2281
2282 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2283 } else {
2284 if (shade < 0) shade = 0;
2285 if (shade > 100) shade = 100;
2286
2287 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2288
2289 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2290 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2291 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2292 }
2293
2294 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2295 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2296 {
2297 unsigned int tmp;
2298
2299 tmp = lower_lim_r;
2300 lower_lim_r = lower_lim_b;
2301 lower_lim_b = tmp;
2302
2303 tmp = upper_lim_r;
2304 upper_lim_r = upper_lim_b;
2305 upper_lim_b = tmp;
2306 }
2307
2308 /* fill our lookup tables */
2309 for (i = 0; i <= mask_r>>sh_r; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2313 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2314 lookup_r[i] = (tmp/65535)<<sh_r;
2315 }
2316 for (i = 0; i <= mask_g>>sh_g; i++)
2317 {
2318 RUINT32T tmp;
2319 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2320 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2321 lookup_g[i] = (tmp/65535)<<sh_g;
2322 }
2323 for (i = 0; i <= mask_b>>sh_b; i++)
2324 {
2325 RUINT32T tmp;
2326 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2327 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2328 lookup_b[i] = (tmp/65535)<<sh_b;
2329 }
2330
2331 /* apply table to input image (replacing colors by newly calculated ones) */
2332 switch (srcImage->bits_per_pixel)
2333 {
2334 case 15:
2335 {
2336 unsigned short *p1, *pf, *p, *pl;
2337 p1 = (unsigned short *) srcImage->data;
2338 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2339 while (p1 < pf)
2340 {
2341 p = p1;
2342 pl = p1 + srcImage->width;
2343 for (; p < pl; p++)
2344 {
2345 *p = lookup_r[(*p & 0x7c00)>>10] |
2346 lookup_g[(*p & 0x03e0)>> 5] |
2347 lookup_b[(*p & 0x001f)];
2348 }
2349 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2350 }
2351 break;
2352 }
2353 case 16:
2354 {
2355 unsigned short *p1, *pf, *p, *pl;
2356 p1 = (unsigned short *) srcImage->data;
2357 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2358 while (p1 < pf)
2359 {
2360 p = p1;
2361 pl = p1 + srcImage->width;
2362 for (; p < pl; p++)
2363 {
2364 *p = lookup_r[(*p & 0xf800)>>11] |
2365 lookup_g[(*p & 0x07e0)>> 5] |
2366 lookup_b[(*p & 0x001f)];
2367 }
2368 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2369 }
2370 break;
2371 }
2372 case 24:
2373 {
2374 unsigned char *p1, *pf, *p, *pl;
2375 p1 = (unsigned char *) srcImage->data;
2376 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2377 while (p1 < pf)
2378 {
2379 p = p1;
2380 pl = p1 + srcImage->width * 3;
2381 for (; p < pl; p += 3)
2382 {
2383 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2384 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2385 p[2] = lookup_r[(p[2] & 0x0000ff)];
2386 }
2387 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2388 }
2389 break;
2390 }
2391 case 32:
2392 {
2393 RUINT32T *p1, *pf, *p, *pl;
2394 p1 = (RUINT32T *) srcImage->data;
2395 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2396
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0xff0000)>>16] |
2404 lookup_g[(*p & 0x00ff00)>> 8] |
2405 lookup_b[(*p & 0x0000ff)] |
2406 (*p & ~0xffffff);
2407 }
2408 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2409 }
2410 break;
2411 }
2412 }
2413
2414 free (lookup);
2415}
2416#endif
2417
2418/*
2419 * Check our parents are still who we think they are.
2420 * Do transparency updates if required
2421 */
2422int
2423rxvt_term::check_our_parents ()
2424{
2425 int i, pchanged, aformat, have_pixmap, rootdepth;
2426 unsigned long nitems, bytes_after;
2427 Atom atype;
2428 unsigned char *prop = NULL;
2429 Window root, oldp, *list;
2430 Pixmap rootpixmap = None;
2431 XWindowAttributes wattr, wrootattr;
2432
2433 pchanged = 0;
2434
2435 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */
2437
2438 XGetWindowAttributes (dpy, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth;
2440
2441 XGetWindowAttributes (dpy, parent[0], &wattr);
2442
2443 if (rootdepth != wattr.depth)
2444 {
2445 if (am_transparent)
2446 {
2447 pchanged = 1;
2448 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0;
2450 }
2451
2452 return pchanged; /* Don't try any more */
2453 }
2454
2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2456 XSync (dpy, False);
2457
2458 /*
2459 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame
2461 * windows for each client, so we have to take care about that.
2462 */
2463 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success);
2467
2468 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success);
2473
2474 if (!i || prop == NULL
2475#if TINTING
2476 || !ISSET_PIXCOLOR (Color_tint)
2477#endif
2478 )
2479 have_pixmap = 0;
2480 else
2481 {
2482 have_pixmap = 1;
2483 rootpixmap = *(Pixmap *)prop;
2484 XFree (prop);
2485 }
2486
2487 if (have_pixmap)
2488 {
2489 /*
2490 * Copy display->root pixmap transparency
2491 */
2492 int sx, sy, nx, ny;
2493 unsigned int nw, nh;
2494 Window cr;
2495 XImage *image;
2496 GC gc;
2497 XGCValues gcvalue;
2498
2499 XTranslateCoordinates (dpy, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height;
2503 nx = ny = 0;
2504
2505 if (sx < 0)
2506 {
2507 nw += sx;
2508 nx = -sx;
2509 sx = 0;
2510 }
2511
2512 if (sy < 0)
2513 {
2514 nh += sy;
2515 ny = -sy;
2516 sy = 0;
2517 }
2518
2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521
2522 XSync (dpy, False);
2523 allowedxerror = -1;
2524 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */
2528 allowedxerror = 0;
2529
2530 if (image == NULL)
2531 {
2532 if (am_transparent && am_pixmap_trans)
2533 {
2534 pchanged = 1;
2535 if (pixmap != None)
2536 {
2537 XFreePixmap (dpy, pixmap);
2538 pixmap = None;
2539 }
2540 }
2541
2542 am_pixmap_trans = 0;
2543 }
2544 else
2545 {
2546 if (pixmap != None)
2547 XFreePixmap (dpy, pixmap);
2548
2549#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint))
2551 {
2552 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2553
2554 rgba c;
2555 pix_colors_focused [Color_tint].get (c);
2556
2557 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 }
2559#endif
2560
2561 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2562 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2563 XPutImage (dpy, pixmap, gc, image, 0, 0,
2564 nx, ny, image->width, image->height);
2565 XFreeGC (dpy, gc);
2566 XDestroyImage (image);
2567 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2568 XClearWindow (dpy, parent[0]);
2569
2570 if (!am_transparent || !am_pixmap_trans)
2571 pchanged = 1;
2572
2573 am_transparent = am_pixmap_trans = 1;
2574 }
2575 }
2576
2577 if (am_pixmap_trans)
2578 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2579 else
2580 {
2581 unsigned int n;
2582 /*
2583 * InheritPixmap transparency
2584 */
2585 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2586 {
2587 oldp = parent[i];
2588 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2589 XFree (list);
2590
2591 if (parent[i] == display->root)
2592 {
2593 if (oldp != None)
2594 pchanged = 1;
2595
2596 break;
2597 }
2598
2599 if (oldp != parent[i])
2600 pchanged = 1;
2601 }
2602
2603 n = 0;
2604
2605 if (pchanged)
2606 for (; n < (unsigned int)i; n++)
2607 {
2608 XGetWindowAttributes (dpy, parent[n], &wattr);
2609
2610 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2611 {
2612 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2613 break;
2614 }
2615 }
2616
2617 if (n > (sizeof (parent) / sizeof (parent[0])))
2618 {
2619 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2620 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2621 am_transparent = 0;
2622 /* XXX: also turn off Opt_transparent? */
2623 }
2624 else
2625 {
2626 for (n = 0; n < (unsigned int)i; n++)
2627 {
2628 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2629 XClearWindow (dpy, parent[n]);
2630 }
2631
2632 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2633 am_transparent = 1;
2634 }
2635
2636 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 parent[i] = None;
2638 }
2639
2640 if (scrollBar.win)
2641 {
2642 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2643 scrollBar.setIdle ();
2644 scrollbar_show (0);
2645 }
2646
2647 if (am_transparent)
2648 {
2649 want_refresh = want_full_refresh = 1;
2650 if (am_pixmap_trans)
2651 flush ();
2652 }
2653
2654 return pchanged;
2655}
2656#endif
2657 2221
2658/*}}} */ 2222/*}}} */
2659 2223
2660bool 2224bool
2661rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
… …
2710 if (ch == C0_LF) 2274 if (ch == C0_LF)
2711 nlines++; 2275 nlines++;
2712 2276
2713 refresh_count++; 2277 refresh_count++;
2714 2278
2715 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2716 || (refresh_count >= refresh_limit * (nrow - 1)))
2717 { 2280 {
2718 refreshnow = true;
2719 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2720 ch = NOCHAR; 2286 ch = NOCHAR;
2721 break; 2287 break;
2288 }
2722 } 2289 }
2723 2290
2724 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2725 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2726 { 2293 {
… …
2754 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2755 scr_add_lines (buf, str - buf, nlines); 2322 scr_add_lines (buf, str - buf, nlines);
2756 2323
2757 /* 2324 /*
2758 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2759 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2760 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2761 * is incremented here because we must be doing flat-out scrolling.
2762 */ 2328 */
2763 if (refreshnow) 2329 if (refreshnow)
2764 { 2330 {
2765 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2766 refresh_limit++;
2767 else
2768 {
2769 flag = true; 2331 flag = true;
2770 scr_refresh (); 2332 scr_refresh ();
2771 want_refresh = 1; 2333 want_refresh = 1;
2772 }
2773 } 2334 }
2774 2335
2775 } 2336 }
2776 else 2337 else
2777 { 2338 {
… …
2926 { 2487 {
2927 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2928 break; /* done = 1 */ 2489 break; /* done = 1 */
2929 } 2490 }
2930 } 2491 }
2931 2492
2932 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2933 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2934 { 2495 {
2935 done = 1; 2496 done = 1;
2936 break; 2497 break;
… …
2998 process_dcs_seq (); 2559 process_dcs_seq ();
2999 break; 2560 break;
3000 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
3001 process_csi_seq (); 2562 process_csi_seq ();
3002 break; 2563 break;
3003 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
3004 process_osc_seq (); 2565 process_osc_seq ();
3005 break; 2566 break;
3006#endif 2567#endif
3007 } 2568 }
3008} 2569}
… …
3234rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
3235{ 2796{
3236 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3237 unsigned int nargs, p; 2798 unsigned int nargs, p;
3238 int n, ndef; 2799 int n, ndef;
3239 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
3240 2801
3241 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
3242 arg[--nargs] = 0;
3243 2803
3244 priv = 0; 2804 priv = 0;
3245 ch = cmd_getc (); 2805 ch = cmd_getc ();
3246 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3247 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
… …
3291 switch (priv) 2851 switch (priv)
3292 { 2852 {
3293 case '>': 2853 case '>':
3294 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3295 { 2855 {
3296 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3297 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3298 // 2858 //
3299 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3300 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3301 // that we do not support xterm mouse reporting (should be 95 when we do). 2861 // versions.
3302 // 2862 //
3303 tt_printf ("\033[>%d;94;0c", 'U'); 2863 tt_printf ("\033[>%d;95;0c", 'U');
3304 } 2864 }
3305 break; 2865 break;
3306 case '?': 2866 case '?':
3307 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3308 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
… …
3435 break; 2995 break;
3436 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
3437 scr_report_position (); 2997 scr_report_position ();
3438 break; 2998 break;
3439 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
3440 if (OPTION (Opt_insecure)) 3000 if (option (Opt_insecure))
3441 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3442 break; 3002 break;
3443 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
3444 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3445 break; 3005 break;
… …
3609 break; 3169 break;
3610 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3611 { 3171 {
3612 char *s; 3172 char *s;
3613 XGetIconName (dpy, parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3614 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3174 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3615 XFree (s); 3175 XFree (s);
3616 } 3176 }
3617 break; 3177 break;
3618 case 21: /* report window title */ 3178 case 21: /* report window title */
3619 { 3179 {
3620 char *s; 3180 char *s;
3621 XFetchName (dpy, parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3622 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3623 XFree (s); 3183 XFree (s);
3624 } 3184 }
3625 break; 3185 break;
3626 } 3186 }
3627} 3187}
… …
3654 seen_esc = true; 3214 seen_esc = true;
3655 continue; 3215 continue;
3656 } 3216 }
3657 else if (ch == C0_BEL || ch == CHAR_ST) 3217 else if (ch == C0_BEL || ch == CHAR_ST)
3658 break; 3218 break;
3219 else if (ch == C0_SYN)
3220 ch = cmd_get8 ();
3659 else if (ch < 0x20) 3221 else if (ch < 0x20)
3660 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3661 3223
3662 seen_esc = false; 3224 seen_esc = false;
3663 3225
3664 if (n >= STRING_MAX - 1) 3226 if (n >= STRING_MAX - 1)
3665 // stop at some sane length 3227 // stop at some sane length
3666 return NULL; 3228 return NULL;
3667 3229
3668 if (ch == C0_SYN)
3669 string[n++] = cmd_get8 ();
3670 else
3671 string[n++] = ch; 3230 string[n++] = ch;
3672 } 3231 }
3673 3232
3674 string[n++] = '\0'; 3233 string[n++] = '\0';
3675 3234
3676 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3755 int saveop = op; 3314 int saveop = op;
3756 3315
3757 dLocal (Display *, dpy); 3316 dLocal (Display *, dpy);
3758 3317
3759 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3760 switch (op) 3323 switch (op)
3761 { 3324 {
3762 case XTerm_name: 3325 case XTerm_name:
3763 set_title (str); 3326 set_title (str);
3764 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3856 break; 3419 break;
3857 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3858 process_color_seq (op, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3859 break; 3422 break;
3860#endif 3423#endif
3861#if TRANSPARENT && TINTING 3424#if ENABLE_TRANSPARENCY
3862 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3863 process_color_seq (op, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3427 {
3428 bool changed = false;
3429 if (ISSET_PIXCOLOR (Color_tint))
3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3864 3436
3865 check_our_parents ();
3866
3867 if (am_transparent)
3868 want_full_refresh = want_refresh = 1;
3869
3870 break; 3437 break;
3871#endif 3438#endif
3872 3439
3440#if BG_IMAGE_FROM_FILE
3873 case Rxvt_Pixmap: 3441 case Rxvt_Pixmap:
3874 { 3442 if (!strcmp (str, "?"))
3875 if (*str != ';')
3876 { 3443 {
3877#if XPM_BACKGROUND 3444 char str[256];
3878 scale_pixmap (""); /* reset to default scaling */ 3445
3879 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3880 scr_touch (true); 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3881#endif 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3882 } 3450 }
3883 3451 else
3452 {
3884 int changed = 0; 3453 int changed = 0;
3885 3454
3886 while ((str = strchr (str, ';')) != NULL) 3455 if (*str != ';')
3887 { 3456 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */
3460 changed++;
3461 str = strchr (str, ';');
3462 if (str == NULL)
3463 bgPixmap.set_defaultGeometry ();
3464 }
3465 while (str)
3466 {
3888 str++; 3467 str++;
3889#if XPM_BACKGROUND 3468 if (bgPixmap.set_geometry (str))
3890 changed += scale_pixmap (str); 3469 changed++;
3891#endif 3470 str = strchr (str, ';');
3892 } 3471 }
3893
3894 if (changed) 3472 if (changed)
3895 { 3473 update_background ();
3896#ifdef XPM_BACKGROUND
3897 resize_pixmap ();
3898 scr_touch (true);
3899#endif
3900 } 3474 }
3901 }
3902 break; 3475 break;
3476#endif
3903 3477
3904 case Rxvt_restoreFG: 3478 case Rxvt_restoreFG:
3905 set_window_color (Color_fg, str); 3479 set_window_color (Color_fg, str);
3906 break; 3480 break;
3907 case Rxvt_restoreBG: 3481 case Rxvt_restoreBG:
… …
3932 case URxvt_italicFont: 3506 case URxvt_italicFont:
3933 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3934#endif 3508#endif
3935 if (query) 3509 if (query)
3936 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3937 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3938 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3939 resp); 3513 resp);
3940 else 3514 else
3941 { 3515 {
3942 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3956 break; 3530 break;
3957 3531
3958#if !ENABLE_MINIMAL 3532#if !ENABLE_MINIMAL
3959 case URxvt_locale: 3533 case URxvt_locale:
3960 if (query) 3534 if (query)
3961 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3962 else 3536 else
3963 { 3537 {
3964 set_locale (str); 3538 set_locale (str);
3965 pty->set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
3966 init_xlocale (); 3540 init_xlocale ();
… …
3981 break; 3555 break;
3982#endif 3556#endif
3983 3557
3984#if ENABLE_PERL 3558#if ENABLE_PERL
3985 case URxvt_perl: 3559 case URxvt_perl:
3986 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3987 ; // no responses yet 3561 ; // no responses yet
3988 break; 3562 break;
3989#endif 3563#endif
3990 } 3564 }
3991} 3565}
… …
4029{ 3603{
4030 unsigned int i, j; 3604 unsigned int i, j;
4031 int state; 3605 int state;
4032 3606
4033 static const struct 3607 static const struct
4034 { 3608 {
4035 const int argval; 3609 const int argval;
4036 const unsigned long bit; 3610 const unsigned long bit;
4037 }
4038
4039 argtopriv[] = { 3611 } argtopriv[] = {
4040 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
4041 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
4042 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
4043 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
4044 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
… …
4061#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
4062 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
4063#endif 3635#endif
4064 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
4065 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4066 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
4067 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
4068 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4069 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
4070 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
4071 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
4072 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
4107 scr_touch (true); 3679 scr_touch (true);
4108 break; 3680 break;
4109#endif 3681#endif
4110 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
4111 case 1049: 3683 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 3684 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 3685 if (mode == 0)
4114 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
4115 else if (mode == 1) 3687 else if (mode == 1)
4116 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
4117 break; 3689 break;
… …
4146 scr_autowrap (state); 3718 scr_autowrap (state);
4147 break; 3719 break;
4148 /* case 8: - auto repeat, can't do on a per window basis */ 3720 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4152 break; 3724 break;
4153#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
4154 case scrollBar_esc: 3726 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
4156 { 3728 {
… …
4169 break; 3741 break;
4170 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
4171 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
4172 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
4173 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4174 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4175 break; 3747 break;
4176#if 0 3748#if 0
4177 case 1001: 3749 case 1001:
4178 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
4179#endif 3751#endif
3752 case 1002:
3753 case 1003:
3754 if (state) {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask;
3758 } else
3759 vt_emask_mouse = NoEventMask;
3760 vt_select_input ();
3761 break;
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
4181 set_option (Opt_scrollTtyOutput, !state); 3763 set_option (Opt_scrollTtyOutput, !state);
4182 break; 3764 break;
4183 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
4184 set_option (Opt_scrollTtyKeypress, state); 3766 set_option (Opt_scrollTtyKeypress, state);
4185 break; 3767 break;
4186 case 1047: /* secondary screen w/ clearing last */ 3768 case 1047: /* secondary screen w/ clearing last */
4187 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4188 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4189 scr_erase_screen (2); 3771 scr_erase_screen (2);
4190 scr_change_screen (state); 3772 scr_change_screen (state);
4191 break; 3773 break;
4192 case 1049: /* secondary screen w/ clearing first */ 3774 case 1049: /* secondary screen w/ clearing first */
4193 scr_change_screen (state); 3775 scr_change_screen (state);
4194 if (OPTION (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 3778 scr_erase_screen (2);
4197 break; 3779 break;
4198 default: 3780 default:
4199 break; 3781 break;
… …
4421 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 4004
4423 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4006 v_buflen += len;
4425 4007
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4427} 4009}
4428 4010
4429void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4430{ 4012{
4431 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
… …
4436 4018
4437 if (v_buflen == 0) 4019 if (v_buflen == 0)
4438 { 4020 {
4439 free (v_buffer); 4021 free (v_buffer);
4440 v_buffer = 0; 4022 v_buffer = 0;
4441 v_buflen = 0;
4442 4023
4443 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4444 return; 4025 return;
4445 } 4026 }
4446 4027
4447 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4448 } 4029 }
4449 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4450 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4451} 4032}
4452 4033
4453/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4454 4035

Diff Legend

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