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.304 by root, Tue Jan 31 22:01:25 2006 UTC vs.
Revision 1.359 by ayin, Mon Oct 15 14:56:06 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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,
… …
298 297
299 return -1; 298 return -1;
300} 299}
301#endif 300#endif
302 301
303/*{{{ Convert the keypress event into a string */
304void 302void
305rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
306{ 304{
307 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
308 unsigned int newlen; 306 unsigned int newlen;
309 KeySym keysym; 307 KeySym keysym;
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
498# endif 501# endif
499 return; 502 return;
500 } 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 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
503 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
504 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
505# if ISO_14755 516# if ISO_14755
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 newlen = 1;
542 switch (keysym) 554 switch (keysym)
543 { 555 {
544#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 557 case XK_BackSpace:
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
551 } 563 }
552 else 564 else
553 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 566 break;
555#endif 567#endif
556#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
558 case XK_KP_Delete: 570 case XK_KP_Delete:
559 /* allow shift to override */ 571 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
561 { 573 {
562 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
563 break; 575 break;
564 } 576 }
565 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
566# endif 578# endif
567 case XK_Delete: 579 case XK_Delete:
568 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 581 break;
570#endif 582#endif
571 case XK_Tab: 583 case XK_Tab:
572 if (shft) 584 if (shft)
573 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
588#ifdef XK_KP_Left 600#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
594 { 606 {
595 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break; 609 break;
598 } 610 }
… …
621 633
622#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
624 case XK_KP_Prior: 636 case XK_KP_Prior:
625 /* allow shift to override */ 637 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
627 { 639 {
628 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
629 break; 641 break;
630 } 642 }
631 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
634 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
635 break; 647 break;
636# ifdef XK_KP_Next 648# ifdef XK_KP_Next
637 case XK_KP_Next: 649 case XK_KP_Next:
638 /* allow shift to override */ 650 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
640 { 652 {
641 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
642 break; 654 break;
643 } 655 }
644 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
647 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
648 break; 660 break;
649#endif 661#endif
650 case XK_KP_Enter: 662 case XK_KP_Enter:
651 /* allow shift to override */ 663 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
653 { 665 {
654 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
655 break; 667 break;
656 } 668 }
657 669
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 716 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
706 { 718 {
707 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 721 }
710 else 722 else
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
727 break; 739 break;
728 } 740 }
729 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
742 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
743 break; 755 break;
744#ifdef XK_KP_End 756#ifdef XK_KP_End
745 case XK_KP_End: 757 case XK_KP_End:
746 /* allow shift to override */ 758 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
748 { 760 {
749 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
750 break; 762 break;
751 } 763 }
752 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
755 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
756 break; 768 break;
757#ifdef XK_KP_Home 769#ifdef XK_KP_Home
758 case XK_KP_Home: 770 case XK_KP_Home:
759 /* allow shift to override */ 771 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
761 { 773 {
762 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
763 break; 775 break;
764 } 776 }
765 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
911} 923}
912/*}}} */ 924
925void
926rxvt_term::key_release (XKeyEvent &ev)
927{
928#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
929 KeySym keysym;
930
931 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
932#endif
933
934#if ENABLE_FRILLS || ISO_14755
935 // ISO 14755 support
936 if (iso14755buf)
937 if (iso14755buf & ISO_14755_52)
938 {
939# if ISO_14755
940 scr_overlay_off ();
941# endif
942# if ISO_14755
943 // iso14755 part 5.2 handling: release time
944 // first: controls
945 if ((ev.state & ControlMask)
946 && ((keysym >= 0x40 && keysym <= 0x5f)
947 || (keysym >= 0x61 && keysym <= 0x7f)))
948 {
949 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
950 commit_iso14755 ();
951
952 return;
953 }
954
955 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
956 if (i[0] == keysym)
957 {
958 iso14755buf = ISO_14755_51 | i[1];
959 commit_iso14755 ();
960
961 return;
962 }
963
964 scr_bell ();
965# endif
966 iso14755buf = 0;
967
968 return;
969 }
970 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
971 {
972# if ISO_14755
973 scr_overlay_off ();
974# endif
975 if (iso14755buf & ISO_14755_51)
976 commit_iso14755 ();
977#if ISO_14755
978 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
979 {
980 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
981
982 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
983 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
984 }
985# endif
986 else
987 iso14755buf = 0;
988 }
989#endif
990
991 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
992 return;
993
994#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
995 if (!(ev.state & ControlMask))
996 slip_wheel_ev.stop ();
997 else if (keysym == XK_Control_L || keysym == XK_Control_R)
998 mouse_slip_wheel_speed = 0;
999#endif
1000}
913 1001
914#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
915unsigned int 1003unsigned int
916rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
917{ 1005{
… …
946 1034
947void 1035void
948rxvt_term::flush () 1036rxvt_term::flush ()
949{ 1037{
950 flush_ev.stop (); 1038 flush_ev.stop ();
951 1039
952#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
953 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
954 { 1042 {
955 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
956 scr_clear ();
957 scr_touch (false); 1044 scr_touch (false);
958 } 1045 }
959#endif 1046#endif
960 1047
961 if (want_refresh) 1048 if (want_refresh)
… …
1022void 1109void
1023rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1024{ 1111{
1025 make_current (); 1112 make_current ();
1026 1113
1027 refresh_limit = 1;
1028 refresh_count = 0; 1114 refresh_count = 0;
1029 flush (); 1115 flush ();
1030} 1116}
1031 1117
1032#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1098 1184
1099#if LINUX_YIELD_HACK 1185#if LINUX_YIELD_HACK
1100static struct event_handler 1186static struct event_handler
1101{ 1187{
1102 check_watcher yield_ev; 1188 check_watcher yield_ev;
1103 1189
1104 void yield_cb (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1105 { 1191 {
1106 // this should really be sched_yield(), but the linux guys thought 1192 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than 1193 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is 1194 // ones with high nice levels is a useful thing to do. It surely is is
… …
1152 } 1238 }
1153 else 1239 else
1154 { 1240 {
1155 pty_ev.stop (); 1241 pty_ev.stop ();
1156 1242
1157 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1158 destroy (); 1244 destroy ();
1159 } 1245 }
1160 1246
1161 return false; 1247 return false;
1162} 1248}
1163 1249
1164void 1250void
1165rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1177} 1263}
1178 1264
1179void 1265void
1180rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1181{ 1267{
1182 XDefineCursor (xdisp, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1183 recolour_cursor (); 1269 recolour_cursor ();
1184 1270
1185#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1186 hidden_pointer = 0; 1272 hidden_pointer = 0;
1187 1273
1188 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1189 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1190#endif 1276#endif
1191} 1277}
1192 1278
1193#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1194void 1280void
1195rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1196{ 1282{
1197 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1198 return; 1284 return;
1199 1285
1200 XDefineCursor (xdisp, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1201 XFlush (xdisp); 1287 XFlush (dpy);
1202 1288
1203 hidden_pointer = 1; 1289 hidden_pointer = 1;
1204} 1290}
1205 1291
1206void 1292void
… …
1216rxvt_term::mouse_report (XButtonEvent &ev) 1302rxvt_term::mouse_report (XButtonEvent &ev)
1217{ 1303{
1218 int button_number, key_state = 0; 1304 int button_number, key_state = 0;
1219 int x, y; 1305 int x, y;
1220 1306
1221 x = ev.x; 1307 x = Pixel2Col (ev.x);
1222 y = ev.y; 1308 y = Pixel2Row (ev.y);
1223 pixel_position (&x, &y);
1224 1309
1225 if (MEvent.button == AnyButton) 1310 if (MEvent.button == AnyButton)
1226 button_number = 3; 1311 button_number = 3;
1227 else 1312 else
1228 { 1313 {
… …
1285void 1370void
1286rxvt_term::x_cb (XEvent &ev) 1371rxvt_term::x_cb (XEvent &ev)
1287{ 1372{
1288 make_current (); 1373 make_current ();
1289 1374
1290 dLocal (Display *, xdisp); 1375 dLocal (Display *, dpy);
1291 1376
1292 if (ev.xany.window == vt 1377 if (ev.xany.window == vt
1293 && SHOULD_INVOKE (HOOK_X_EVENT) 1378 && SHOULD_INVOKE (HOOK_X_EVENT)
1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1379 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1295 return; 1380 return;
… …
1300 unsigned int unused_mask; 1385 unsigned int unused_mask;
1301 1386
1302 switch (ev.type) 1387 switch (ev.type)
1303 { 1388 {
1304 case KeyPress: 1389 case KeyPress:
1305#if ISO_14755 1390 key_press (ev.xkey);
1306 if (!(iso14755buf & ISO_14755_52))
1307#endif
1308 lookup_key (ev.xkey);
1309
1310 break; 1391 break;
1311 1392
1312 case KeyRelease: 1393 case KeyRelease:
1313 { 1394 key_release (ev.xkey);
1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1315 KeySym keysym;
1316
1317 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1318#endif
1319
1320#if ENABLE_FRILLS || ISO_14755
1321 // ISO 14755 support
1322 if (iso14755buf)
1323 if (iso14755buf & ISO_14755_52)
1324 {
1325# if ENABLE_OVERLAY
1326 scr_overlay_off ();
1327# endif
1328# if ISO_14755
1329 // iso14755 part 5.2 handling: release time
1330 // first: controls
1331 if ((ev.xkey.state & ControlMask)
1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1334 {
1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1336 commit_iso14755 ();
1337 goto skip_switch;
1338 }
1339
1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1341 if (i[0] == keysym)
1342 {
1343 iso14755buf = ISO_14755_51 | i[1];
1344 commit_iso14755 ();
1345 goto skip_switch;
1346 }
1347
1348 scr_bell ();
1349# endif
1350 iso14755buf = 0;
1351 break;
1352 }
1353 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1354 {
1355# if ENABLE_OVERLAY
1356 scr_overlay_off ();
1357# endif
1358 if (iso14755buf & ISO_14755_51)
1359 commit_iso14755 ();
1360#if ISO_14755
1361 else if (iso14755buf & ISO_14755_STARTED)
1362 {
1363 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1364
1365 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1366 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1367 }
1368# endif
1369 else
1370 iso14755buf = 0;
1371 }
1372#endif
1373
1374 if (ev.xany.window == vt
1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376 break;
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1395 break;
1385 }
1386 1396
1387 case ButtonPress: 1397 case ButtonPress:
1388 button_press (ev.xbutton); 1398 button_press (ev.xbutton);
1389 break; 1399 break;
1390 1400
… …
1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1406 destroy (); 1416 destroy ();
1407 } 1417 }
1408#if ENABLE_EWMH 1418#if ENABLE_EWMH
1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1410 XSendEvent (xdisp, ev.xclient.window = display->root, 1420 XSendEvent (dpy, ev.xclient.window = display->root,
1411 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1412 &ev); 1422 &ev);
1413#endif 1423#endif
1414 } 1424 }
1415 } 1425 }
… …
1421 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1422 focus_out (); 1432 focus_out ();
1423 } 1433 }
1424#endif 1434#endif
1425 } 1435 }
1426 break;
1427
1428 case MappingNotify:
1429 XRefreshKeyboardMapping (&ev.xmapping);
1430 break; 1436 break;
1431 1437
1432 /* 1438 /*
1433 * XXX: this is not the _current_ arrangement 1439 * XXX: this is not the _current_ arrangement
1434 * Here's my conclusion: 1440 * Here's my conclusion:
… …
1453 break; 1459 break;
1454 } 1460 }
1455 break; 1461 break;
1456 1462
1457 case FocusIn: 1463 case FocusIn:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1458 focus_in (); 1467 focus_in ();
1459 break; 1468 break;
1460 1469
1461 case FocusOut: 1470 case FocusOut:
1471 if (ev.xfocus.detail != NotifyInferior
1472 && ev.xfocus.detail != NotifyPointer
1473 && ev.xfocus.mode != NotifyGrab)
1462 focus_out (); 1474 focus_out ();
1463 break; 1475 break;
1464 1476
1465 case ConfigureNotify: 1477 case ConfigureNotify:
1478 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1479 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1480 szHint.width, szHint.height); */
1466 if (ev.xconfigure.window == parent[0]) 1481 if (ev.xconfigure.window == parent[0])
1467 { 1482 {
1468 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1483 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1469 ; 1484 ;
1470 1485
1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1486 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1472 { 1487 {
1473 seen_resize = 1; 1488 seen_resize = 1;
1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1475 } 1490 }
1476 1491 else
1492 {
1493#ifdef HAVE_BG_PIXMAP
1494 if (bgPixmap.window_position_sensitive ())
1495 update_background ();
1496#endif
1497 }
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1480 if (OPTION (Opt_transparent))
1481 check_our_parents ();
1482#endif
1483 } 1499 }
1484 break; 1500 break;
1485 1501
1486 case PropertyNotify: 1502 case PropertyNotify:
1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1518 text_blink_ev.stop (); 1534 text_blink_ev.stop ();
1519#endif 1535#endif
1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1536 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 break; 1537 break;
1522 1538
1523#ifdef TRANSPARENT
1524 case ReparentNotify:
1525 rootwin_cb (ev);
1526 break;
1527#endif /* TRANSPARENT */
1528
1529 case GraphicsExpose: 1539 case GraphicsExpose:
1530 case Expose: 1540 case Expose:
1531 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1532 { 1542 {
1533 do 1543 do
1544 {
1534 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1535 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1547 }
1536 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1537 1549
1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1539 1551
1540 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1552 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1554 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1555 ev.xexpose.width, ev.xexpose.height, False);
1543 1556 }
1544 want_refresh = 1; 1557 want_refresh = 1;
1545 } 1558 }
1546 else 1559 else
1547 { 1560 {
1548 XEvent unused_event; 1561 XEvent unused_event;
1549 1562
1550 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1551 ; 1564 ;
1552 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1553 ; 1566 ;
1554 1567
1555 if (isScrollbarWindow (ev.xany.window)) 1568 if (isScrollbarWindow (ev.xany.window))
1556 { 1569 {
1557 scrollBar.setIdle (); 1570 scrollBar.setIdle ();
1558 scrollbar_show (0); 1571 scrollbar_show (0);
1559 } 1572 }
1560
1561#ifdef TRANSPARENT
1562 if (am_transparent && ev.xany.window == parent[0])
1563 XClearWindow (xdisp, ev.xany.window);
1564#endif
1565 } 1573 }
1566 break; 1574 break;
1567 1575
1568 case MotionNotify: 1576 case MotionNotify:
1569#ifdef POINTER_BLANK 1577#ifdef POINTER_BLANK
… …
1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1586 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1587 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1580 ; // nop 1588 ; // nop
1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1589 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1590 {
1583 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1591 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1584 ; 1592 ;
1585 1593
1586 XQueryPointer (xdisp, vt, 1594 XQueryPointer (dpy, vt,
1587 &unused_root, &unused_child, 1595 &unused_root, &unused_child,
1588 &unused_root_x, &unused_root_y, 1596 &unused_root_x, &unused_root_y,
1589 &ev.xbutton.x, &ev.xbutton.y, 1597 &ev.xbutton.x, &ev.xbutton.y,
1590 &ev.xbutton.state); 1598 &ev.xbutton.state);
1591#ifdef MOUSE_THRESHOLD 1599#ifdef MOUSE_THRESHOLD
… …
1655#endif 1663#endif
1656 } 1664 }
1657 } 1665 }
1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1666 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1659 { 1667 {
1660 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1668 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1661 MotionNotify, &ev)) 1669 MotionNotify, &ev))
1662 ; 1670 ;
1663 1671
1664 XQueryPointer (xdisp, scrollBar.win, 1672 XQueryPointer (dpy, scrollBar.win,
1665 &unused_root, &unused_child, 1673 &unused_root, &unused_child,
1666 &unused_root_x, &unused_root_y, 1674 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1675 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1676 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1677 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1678 scrollbar_size ());
1671 want_refresh = 1; 1679 want_refresh = 1;
1672 refresh_limit = 0;
1673 scrollbar_show (1); 1680 scrollbar_show (1);
1674 } 1681 }
1675 break; 1682 break;
1676 } 1683 }
1677 1684
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK) 1685#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1686 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1682 { 1687 {
1683 if (hidden_cursor) 1688 if (hidden_cursor)
1684 { 1689 {
1685 hidden_cursor = 0; 1690 hidden_cursor = 0;
1686 want_refresh = 1; 1691 want_refresh = 1;
… …
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1690 } 1695 }
1691#endif 1696#endif
1692 1697
1693#if defined(POINTER_BLANK) 1698#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1699 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 { 1700 {
1696 if (ev.type == MotionNotify 1701 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress 1702 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease) 1703 || ev.type == ButtonRelease)
1699 if (hidden_pointer) 1704 if (hidden_pointer)
… …
1711 if (!focus) 1716 if (!focus)
1712 { 1717 {
1713 focus = 1; 1718 focus = 1;
1714 want_refresh = 1; 1719 want_refresh = 1;
1715 1720
1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1717 1722
1718#if USE_XIM 1723#if USE_XIM
1719 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1720 { 1725 {
1721 IMSetStatusPosition (); 1726 IMSetPosition ();
1722 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1723 } 1728 }
1724#endif 1729#endif
1725#if CURSOR_BLINK 1730#if CURSOR_BLINK
1726 if (OPTION (Opt_cursorBlink)) 1731 if (option (Opt_cursorBlink))
1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1728#endif 1733#endif
1729#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1730 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1731 { 1736 {
1732 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
1733 scr_recolour (); 1738 scr_recolour ();
1734 } 1739 }
1735#endif 1740#endif
1741#if ENABLE_FRILLS
1742 if (option (Opt_urgentOnBell))
1743 {
1744 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1745 {
1746 h->flags &= ~XUrgencyHint;
1747 XSetWMHints (dpy, parent[0], h);
1748 }
1749 }
1750#endif
1736 } 1751 }
1737} 1752}
1738 1753
1739void 1754void
1740rxvt_term::focus_out () 1755rxvt_term::focus_out ()
… …
1748 1763
1749#if ENABLE_FRILLS || ISO_14755 1764#if ENABLE_FRILLS || ISO_14755
1750 if (iso14755buf) 1765 if (iso14755buf)
1751 { 1766 {
1752 iso14755buf = 0; 1767 iso14755buf = 0;
1753# if ENABLE_OVERLAY 1768# if ISO_14755
1754 scr_overlay_off (); 1769 scr_overlay_off ();
1755# endif 1770# endif
1756 } 1771 }
1757#endif 1772#endif
1758#if USE_XIM 1773#if USE_XIM
1759 if (Input_Context != NULL) 1774 if (Input_Context != NULL)
1760 XUnsetICFocus (Input_Context); 1775 XUnsetICFocus (Input_Context);
1761#endif 1776#endif
1762#if CURSOR_BLINK 1777#if CURSOR_BLINK
1763 if (OPTION (Opt_cursorBlink)) 1778 if (option (Opt_cursorBlink))
1764 cursor_blink_ev.stop (); 1779 cursor_blink_ev.stop ();
1765 hidden_cursor = 0; 1780 hidden_cursor = 0;
1766#endif 1781#endif
1767#if OFF_FOCUS_FADING 1782#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1783 if (rs[Rs_fade])
… …
1772 } 1787 }
1773#endif 1788#endif
1774 } 1789 }
1775} 1790}
1776 1791
1777#if TRANSPARENT 1792void
1793rxvt_term::update_fade_color (unsigned int idx)
1794{
1795#if OFF_FOCUS_FADING
1796 if (rs[Rs_fade])
1797 {
1798 rgba c;
1799 pix_colors [Color_fade].get (c);
1800 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1801 }
1802#endif
1803}
1804
1805#if ENABLE_TRANSPARENCY || ENABLE_PERL
1778void 1806void
1779rxvt_term::rootwin_cb (XEvent &ev) 1807rxvt_term::rootwin_cb (XEvent &ev)
1780{ 1808{
1781 make_current (); 1809 make_current ();
1782 1810
1811 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1812 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1813 return;
1814
1815# if ENABLE_TRANSPARENCY
1783 switch (ev.type) 1816 switch (ev.type)
1784 { 1817 {
1785 case PropertyNotify: 1818 case PropertyNotify:
1786 /* 1819 /*
1787 * if user used some Esetroot compatible prog to set the root bg, 1820 * if user used some Esetroot compatible prog to set the root bg,
1788 * use the property to determine the pixmap. We use it later on. 1821 * use the property to determine the pixmap. We use it later on.
1789 */ 1822 */
1790 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1823 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1791 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1824 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1792 return; 1825 {
1793 1826 bgPixmap.set_root_pixmap ();
1794 /* FALLTHROUGH */ 1827 update_background ();
1795 case ReparentNotify: 1828 }
1796 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1797 want_refresh = want_full_refresh = 1;
1798 break; 1829 break;
1799 } 1830 }
1831# endif
1800} 1832}
1801#endif 1833#endif
1802 1834
1803void 1835void
1804rxvt_term::button_press (XButtonEvent &ev) 1836rxvt_term::button_press (XButtonEvent &ev)
… …
2132 selection_make (ev.time); 2164 selection_make (ev.time);
2133 break; 2165 break;
2134 2166
2135 case Button2: 2167 case Button2:
2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2168 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2169 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2138 break; 2170 break;
2139 2171
2140#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2141 case Button4: 2173 case Button4:
2142 case Button5: 2174 case Button5:
… …
2146 2178
2147 v = ev.button == Button4 ? UP : DN; 2179 v = ev.button == Button4 ? UP : DN;
2148 2180
2149 if (ev.state & ShiftMask) 2181 if (ev.state & ShiftMask)
2150 i = 1; 2182 i = 1;
2151 else if (OPTION (Opt_mouseWheelScrollPage)) 2183 else if (option (Opt_mouseWheelScrollPage))
2152 i = nrow - 1; 2184 i = nrow - 1;
2153 else 2185 else
2154 i = 5; 2186 i = 5;
2155 2187
2156# ifdef MOUSE_SLIP_WHEELING 2188# ifdef MOUSE_SLIP_WHEELING
… …
2177 break; 2209 break;
2178#endif 2210#endif
2179 } 2211 }
2180 } 2212 }
2181} 2213}
2182
2183#ifdef TRANSPARENT
2184#if TINTING
2185/* taken from aterm-0.4.2 */
2186
2187typedef uint32_t RUINT32T;
2188
2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2190{
2191 int sh_r, sh_g, sh_b;
2192 RUINT32T mask_r, mask_g, mask_b;
2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2196 int i;
2197
2198 Visual *visual = term->visual;
2199
2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2201
2202 /* for convenience */
2203 mask_r = visual->red_mask;
2204 mask_g = visual->green_mask;
2205 mask_b = visual->blue_mask;
2206
2207 /* boring lookup table pre-initialization */
2208 switch (srcImage->bits_per_pixel) {
2209 case 15:
2210 if ((mask_r != 0x7c00) ||
2211 (mask_g != 0x03e0) ||
2212 (mask_b != 0x001f))
2213 return;
2214 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2215 lookup_r = lookup;
2216 lookup_g = lookup+32;
2217 lookup_b = lookup+32+32;
2218 sh_r = 10;
2219 sh_g = 5;
2220 sh_b = 0;
2221 break;
2222 case 16:
2223 if ((mask_r != 0xf800) ||
2224 (mask_g != 0x07e0) ||
2225 (mask_b != 0x001f))
2226 return;
2227 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2228 lookup_r = lookup;
2229 lookup_g = lookup+32;
2230 lookup_b = lookup+32+64;
2231 sh_r = 11;
2232 sh_g = 5;
2233 sh_b = 0;
2234 break;
2235 case 24:
2236 if ((mask_r != 0xff0000) ||
2237 (mask_g != 0x00ff00) ||
2238 (mask_b != 0x0000ff))
2239 return;
2240 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2241 lookup_r = lookup;
2242 lookup_g = lookup+256;
2243 lookup_b = lookup+256+256;
2244 sh_r = 16;
2245 sh_g = 8;
2246 sh_b = 0;
2247 break;
2248 case 32:
2249 if ((mask_r != 0xff0000) ||
2250 (mask_g != 0x00ff00) ||
2251 (mask_b != 0x0000ff))
2252 return;
2253 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2254 lookup_r = lookup;
2255 lookup_g = lookup+256;
2256 lookup_b = lookup+256+256;
2257 sh_r = 16;
2258 sh_g = 8;
2259 sh_b = 0;
2260 break;
2261 default:
2262 return; /* we do not support this color depth */
2263 }
2264
2265 /* prepare limits for color transformation (each channel is handled separately) */
2266 if (shade < 0) {
2267 shade = -shade;
2268 if (shade < 0) shade = 0;
2269 if (shade > 100) shade = 100;
2270
2271 lower_lim_r = 65535-rm;
2272 lower_lim_g = 65535-gm;
2273 lower_lim_b = 65535-bm;
2274
2275 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2276 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2277 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2278
2279 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2280 } else {
2281 if (shade < 0) shade = 0;
2282 if (shade > 100) shade = 100;
2283
2284 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2285
2286 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2287 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2288 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2289 }
2290
2291 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2292 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2293 {
2294 unsigned int tmp;
2295
2296 tmp = lower_lim_r;
2297 lower_lim_r = lower_lim_b;
2298 lower_lim_b = tmp;
2299
2300 tmp = upper_lim_r;
2301 upper_lim_r = upper_lim_b;
2302 upper_lim_b = tmp;
2303 }
2304
2305 /* fill our lookup tables */
2306 for (i = 0; i <= mask_r>>sh_r; i++)
2307 {
2308 RUINT32T tmp;
2309 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2310 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2311 lookup_r[i] = (tmp/65535)<<sh_r;
2312 }
2313 for (i = 0; i <= mask_g>>sh_g; i++)
2314 {
2315 RUINT32T tmp;
2316 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2317 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2318 lookup_g[i] = (tmp/65535)<<sh_g;
2319 }
2320 for (i = 0; i <= mask_b>>sh_b; i++)
2321 {
2322 RUINT32T tmp;
2323 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2324 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2325 lookup_b[i] = (tmp/65535)<<sh_b;
2326 }
2327
2328 /* apply table to input image (replacing colors by newly calculated ones) */
2329 switch (srcImage->bits_per_pixel)
2330 {
2331 case 15:
2332 {
2333 unsigned short *p1, *pf, *p, *pl;
2334 p1 = (unsigned short *) srcImage->data;
2335 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2336 while (p1 < pf)
2337 {
2338 p = p1;
2339 pl = p1 + srcImage->width;
2340 for (; p < pl; p++)
2341 {
2342 *p = lookup_r[(*p & 0x7c00)>>10] |
2343 lookup_g[(*p & 0x03e0)>> 5] |
2344 lookup_b[(*p & 0x001f)];
2345 }
2346 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2347 }
2348 break;
2349 }
2350 case 16:
2351 {
2352 unsigned short *p1, *pf, *p, *pl;
2353 p1 = (unsigned short *) srcImage->data;
2354 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2355 while (p1 < pf)
2356 {
2357 p = p1;
2358 pl = p1 + srcImage->width;
2359 for (; p < pl; p++)
2360 {
2361 *p = lookup_r[(*p & 0xf800)>>11] |
2362 lookup_g[(*p & 0x07e0)>> 5] |
2363 lookup_b[(*p & 0x001f)];
2364 }
2365 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2366 }
2367 break;
2368 }
2369 case 24:
2370 {
2371 unsigned char *p1, *pf, *p, *pl;
2372 p1 = (unsigned char *) srcImage->data;
2373 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2374 while (p1 < pf)
2375 {
2376 p = p1;
2377 pl = p1 + srcImage->width * 3;
2378 for (; p < pl; p += 3)
2379 {
2380 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2381 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2382 p[2] = lookup_r[(p[2] & 0x0000ff)];
2383 }
2384 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2385 }
2386 break;
2387 }
2388 case 32:
2389 {
2390 RUINT32T *p1, *pf, *p, *pl;
2391 p1 = (RUINT32T *) srcImage->data;
2392 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2393
2394 while (p1 < pf)
2395 {
2396 p = p1;
2397 pl = p1 + srcImage->width;
2398 for (; p < pl; p++)
2399 {
2400 *p = lookup_r[(*p & 0xff0000)>>16] |
2401 lookup_g[(*p & 0x00ff00)>> 8] |
2402 lookup_b[(*p & 0x0000ff)] |
2403 (*p & ~0xffffff);
2404 }
2405 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2406 }
2407 break;
2408 }
2409 }
2410
2411 free (lookup);
2412}
2413#endif
2414
2415/*
2416 * Check our parents are still who we think they are.
2417 * Do transparency updates if required
2418 */
2419int
2420rxvt_term::check_our_parents ()
2421{
2422 int i, pchanged, aformat, have_pixmap, rootdepth;
2423 unsigned long nitems, bytes_after;
2424 Atom atype;
2425 unsigned char *prop = NULL;
2426 Window root, oldp, *list;
2427 Pixmap rootpixmap = None;
2428 XWindowAttributes wattr, wrootattr;
2429
2430 pchanged = 0;
2431
2432 if (!OPTION (Opt_transparent))
2433 return pchanged; /* Don't try any more */
2434
2435 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2436 rootdepth = wrootattr.depth;
2437
2438 XGetWindowAttributes (xdisp, parent[0], &wattr);
2439
2440 if (rootdepth != wattr.depth)
2441 {
2442 if (am_transparent)
2443 {
2444 pchanged = 1;
2445 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2446 am_transparent = am_pixmap_trans = 0;
2447 }
2448
2449 return pchanged; /* Don't try any more */
2450 }
2451
2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2453 XSync (xdisp, False);
2454
2455 /*
2456 * Make the frame window set by the window manager have
2457 * the root background. Some window managers put multiple nested frame
2458 * windows for each client, so we have to take care about that.
2459 */
2460 i = (xa[XA_XROOTPMAP_ID]
2461 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2463 &nitems, &bytes_after, &prop) == Success);
2464
2465 if (!i || prop == NULL)
2466 i = (xa[XA_ESETROOT_PMAP_ID]
2467 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success);
2470
2471 if (!i || prop == NULL
2472#if TINTING
2473 || !ISSET_PIXCOLOR (Color_tint)
2474#endif
2475 )
2476 have_pixmap = 0;
2477 else
2478 {
2479 have_pixmap = 1;
2480 rootpixmap = *(Pixmap *)prop;
2481 XFree (prop);
2482 }
2483
2484 if (have_pixmap)
2485 {
2486 /*
2487 * Copy display->root pixmap transparency
2488 */
2489 int sx, sy, nx, ny;
2490 unsigned int nw, nh;
2491 Window cr;
2492 XImage *image;
2493 GC gc;
2494 XGCValues gcvalue;
2495
2496 XTranslateCoordinates (xdisp, parent[0], display->root,
2497 0, 0, &sx, &sy, &cr);
2498 nw = (unsigned int)szHint.width;
2499 nh = (unsigned int)szHint.height;
2500 nx = ny = 0;
2501
2502 if (sx < 0)
2503 {
2504 nw += sx;
2505 nx = -sx;
2506 sx = 0;
2507 }
2508
2509 if (sy < 0)
2510 {
2511 nh += sy;
2512 ny = -sy;
2513 sy = 0;
2514 }
2515
2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2518
2519 XSync (xdisp, False);
2520 allowedxerror = -1;
2521 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2522
2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2524 /* XXX: may need a delay here? */
2525 allowedxerror = 0;
2526
2527 if (image == NULL)
2528 {
2529 if (am_transparent && am_pixmap_trans)
2530 {
2531 pchanged = 1;
2532 if (pixmap != None)
2533 {
2534 XFreePixmap (xdisp, pixmap);
2535 pixmap = None;
2536 }
2537 }
2538
2539 am_pixmap_trans = 0;
2540 }
2541 else
2542 {
2543 if (pixmap != None)
2544 XFreePixmap (xdisp, pixmap);
2545
2546#if TINTING
2547 if (ISSET_PIXCOLOR (Color_tint))
2548 {
2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2550
2551 rgba c;
2552 pix_colors_focused [Color_tint].get (c);
2553
2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2555 }
2556#endif
2557
2558 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2559 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2560 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2561 nx, ny, image->width, image->height);
2562 XFreeGC (xdisp, gc);
2563 XDestroyImage (image);
2564 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2565 XClearWindow (xdisp, parent[0]);
2566
2567 if (!am_transparent || !am_pixmap_trans)
2568 pchanged = 1;
2569
2570 am_transparent = am_pixmap_trans = 1;
2571 }
2572 }
2573
2574 if (am_pixmap_trans)
2575 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2576 else
2577 {
2578 unsigned int n;
2579 /*
2580 * InheritPixmap transparency
2581 */
2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2583 {
2584 oldp = parent[i];
2585 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 for (; n < (unsigned int)i; n++)
2604 {
2605 XGetWindowAttributes (xdisp, parent[n], &wattr);
2606
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613
2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2615 {
2616 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2617 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2618 am_transparent = 0;
2619 /* XXX: also turn off Opt_transparent? */
2620 }
2621 else
2622 {
2623 for (n = 0; n < (unsigned int)i; n++)
2624 {
2625 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2626 XClearWindow (xdisp, parent[n]);
2627 }
2628
2629 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2630 am_transparent = 1;
2631 }
2632
2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2634 parent[i] = None;
2635 }
2636
2637 if (scrollBar.win)
2638 {
2639 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2640 scrollBar.setIdle ();
2641 scrollbar_show (0);
2642 }
2643
2644 if (am_transparent)
2645 {
2646 want_refresh = want_full_refresh = 1;
2647 if (am_pixmap_trans)
2648 flush ();
2649 }
2650
2651 return pchanged;
2652}
2653#endif
2654 2214
2655/*}}} */ 2215/*}}} */
2656 2216
2657bool 2217bool
2658rxvt_term::cmd_parse () 2218rxvt_term::cmd_parse ()
… …
2707 if (ch == C0_LF) 2267 if (ch == C0_LF)
2708 nlines++; 2268 nlines++;
2709 2269
2710 refresh_count++; 2270 refresh_count++;
2711 2271
2712 if (!OPTION (Opt_jumpScroll) 2272 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2713 || (refresh_count >= refresh_limit * (nrow - 1)))
2714 { 2273 {
2715 refreshnow = true;
2716 refresh_count = 0; 2274 refresh_count = 0;
2275
2276 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2277 {
2278 refreshnow = true;
2717 ch = NOCHAR; 2279 ch = NOCHAR;
2718 break; 2280 break;
2281 }
2719 } 2282 }
2720 2283
2721 // scr_add_lines only works for nlines <= nrow - 1. 2284 // scr_add_lines only works for nlines <= nrow - 1.
2722 if (nlines >= nrow - 1) 2285 if (nlines >= nrow - 1)
2723 { 2286 {
… …
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2314 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2752 scr_add_lines (buf, str - buf, nlines); 2315 scr_add_lines (buf, str - buf, nlines);
2753 2316
2754 /* 2317 /*
2755 * If there have been a lot of new lines, then update the screen 2318 * If there have been a lot of new lines, then update the screen
2756 * What the heck I'll cheat and only refresh less than every page-full. 2319 * What the heck we'll cheat and only refresh less than every page-full.
2757 * the number of pages between refreshes is refresh_limit, which 2320 * if skipScroll is enabled.
2758 * is incremented here because we must be doing flat-out scrolling.
2759 */ 2321 */
2760 if (refreshnow) 2322 if (refreshnow)
2761 { 2323 {
2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2763 refresh_limit++;
2764 else
2765 {
2766 flag = true; 2324 flag = true;
2767 scr_refresh (); 2325 scr_refresh ();
2768 want_refresh = 1; 2326 want_refresh = 1;
2769 }
2770 } 2327 }
2771 2328
2772 } 2329 }
2773 else 2330 else
2774 { 2331 {
… …
2923 { 2480 {
2924 if ((buf[len++] = cmd_getc ()) == 'i') 2481 if ((buf[len++] = cmd_getc ()) == 'i')
2925 break; /* done = 1 */ 2482 break; /* done = 1 */
2926 } 2483 }
2927 } 2484 }
2928 2485
2929 for (i = 0; i < len; i++) 2486 for (i = 0; i < len; i++)
2930 if (putc (buf[i], fd) == EOF) 2487 if (putc (buf[i], fd) == EOF)
2931 { 2488 {
2932 done = 1; 2489 done = 1;
2933 break; 2490 break;
… …
2995 process_dcs_seq (); 2552 process_dcs_seq ();
2996 break; 2553 break;
2997 case 0x9b: /* CSI */ 2554 case 0x9b: /* CSI */
2998 process_csi_seq (); 2555 process_csi_seq ();
2999 break; 2556 break;
3000 case 0x9d: /* CSI */ 2557 case 0x9d: /* OSC */
3001 process_osc_seq (); 2558 process_osc_seq ();
3002 break; 2559 break;
3003#endif 2560#endif
3004 } 2561 }
3005} 2562}
… …
3231rxvt_term::process_csi_seq () 2788rxvt_term::process_csi_seq ()
3232{ 2789{
3233 unicode_t ch, priv, i; 2790 unicode_t ch, priv, i;
3234 unsigned int nargs, p; 2791 unsigned int nargs, p;
3235 int n, ndef; 2792 int n, ndef;
3236 int arg[ESC_ARGS]; 2793 int arg[ESC_ARGS] = { };
3237 2794
3238 for (nargs = ESC_ARGS; nargs > 0;) 2795 nargs = 0;
3239 arg[--nargs] = 0;
3240 2796
3241 priv = 0; 2797 priv = 0;
3242 ch = cmd_getc (); 2798 ch = cmd_getc ();
3243 if (ch >= '<' && ch <= '?') 2799 if (ch >= '<' && ch <= '?')
3244 { /* '<' '=' '>' '?' */ 2800 { /* '<' '=' '>' '?' */
… …
3288 switch (priv) 2844 switch (priv)
3289 { 2845 {
3290 case '>': 2846 case '>':
3291 if (ch == CSI_DA) /* secondary device attributes */ 2847 if (ch == CSI_DA) /* secondary device attributes */
3292 { 2848 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2849 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2850 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 // 2851 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2852 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2853 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3298 // that we do not support xterm mouse reporting (should be 95 when we do). 2854 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3432 break; 2988 break;
3433 case 6: /* CPR requested */ 2989 case 6: /* CPR requested */
3434 scr_report_position (); 2990 scr_report_position ();
3435 break; 2991 break;
3436 case 7: /* unofficial extension */ 2992 case 7: /* unofficial extension */
3437 if (OPTION (Opt_insecure)) 2993 if (option (Opt_insecure))
3438 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2994 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3439 break; 2995 break;
3440 case 8: /* unofficial extension */ 2996 case 8: /* unofficial extension */
3441 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2997 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3442 break; 2998 break;
… …
3535{ 3091{
3536 int x, y; 3092 int x, y;
3537 XWindowAttributes wattr; 3093 XWindowAttributes wattr;
3538 Window wdummy; 3094 Window wdummy;
3539 3095
3540 dLocal (Display *, xdisp); 3096 dLocal (Display *, dpy);
3541 3097
3542 if (nargs == 0) 3098 if (nargs == 0)
3543 return; 3099 return;
3544 3100
3545 switch (args[0]) 3101 switch (args[0])
3546 { 3102 {
3547 /* 3103 /*
3548 * commands 3104 * commands
3549 */ 3105 */
3550 case 1: /* deiconify window */ 3106 case 1: /* deiconify window */
3551 XMapWindow (xdisp, parent[0]); 3107 XMapWindow (dpy, parent[0]);
3552 break; 3108 break;
3553 case 2: /* iconify window */ 3109 case 2: /* iconify window */
3554 XIconifyWindow (xdisp, parent[0], display->screen); 3110 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3111 break;
3556 case 3: /* set position (pixels) */ 3112 case 3: /* set position (pixels) */
3557 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3113 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3114 break;
3559 case 4: /* set size (pixels) */ 3115 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3116 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3117 break;
3562 case 5: /* raise window */ 3118 case 5: /* raise window */
3563 XRaiseWindow (xdisp, parent[0]); 3119 XRaiseWindow (dpy, parent[0]);
3564 break; 3120 break;
3565 case 6: /* lower window */ 3121 case 6: /* lower window */
3566 XLowerWindow (xdisp, parent[0]); 3122 XLowerWindow (dpy, parent[0]);
3567 break; 3123 break;
3568 case 7: /* refresh window */ 3124 case 7: /* refresh window */
3569 scr_touch (true); 3125 scr_touch (true);
3570 break; 3126 break;
3571 case 8: /* set size (chars) */ 3127 case 8: /* set size (chars) */
… …
3582 3138
3583 /* 3139 /*
3584 * reports - some output format copied from XTerm 3140 * reports - some output format copied from XTerm
3585 */ 3141 */
3586 case 11: /* report window state */ 3142 case 11: /* report window state */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3143 XGetWindowAttributes (dpy, parent[0], &wattr);
3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3144 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3589 break; 3145 break;
3590 case 13: /* report window position */ 3146 case 13: /* report window position */
3591 XGetWindowAttributes (xdisp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3592 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3148 XTranslateCoordinates (dpy, parent[0], wattr.root,
3593 -wattr.border_width, -wattr.border_width, 3149 -wattr.border_width, -wattr.border_width,
3594 &x, &y, &wdummy); 3150 &x, &y, &wdummy);
3595 tt_printf ("\033[3;%d;%dt", x, y); 3151 tt_printf ("\033[3;%d;%dt", x, y);
3596 break; 3152 break;
3597 case 14: /* report window size (pixels) */ 3153 case 14: /* report window size (pixels) */
3598 XGetWindowAttributes (xdisp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3155 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3600 break; 3156 break;
3601 case 18: /* report text area size (chars) */ 3157 case 18: /* report text area size (chars) */
3602 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3158 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3603 break; 3159 break;
… …
3605 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3161 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3606 break; 3162 break;
3607 case 20: /* report icon label */ 3163 case 20: /* report icon label */
3608 { 3164 {
3609 char *s; 3165 char *s;
3610 XGetIconName (xdisp, parent[0], &s); 3166 XGetIconName (dpy, parent[0], &s);
3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3167 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3612 XFree (s); 3168 XFree (s);
3613 } 3169 }
3614 break; 3170 break;
3615 case 21: /* report window title */ 3171 case 21: /* report window title */
3616 { 3172 {
3617 char *s; 3173 char *s;
3618 XFetchName (xdisp, parent[0], &s); 3174 XFetchName (dpy, parent[0], &s);
3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3176 XFree (s);
3621 } 3177 }
3622 break; 3178 break;
3623 } 3179 }
3624} 3180}
… …
3651 seen_esc = true; 3207 seen_esc = true;
3652 continue; 3208 continue;
3653 } 3209 }
3654 else if (ch == C0_BEL || ch == CHAR_ST) 3210 else if (ch == C0_BEL || ch == CHAR_ST)
3655 break; 3211 break;
3212 else if (ch == C0_SYN)
3213 ch = cmd_get8 ();
3656 else if (ch < 0x20) 3214 else if (ch < 0x20)
3657 return NULL; /* other control character - exit */ 3215 return NULL; /* other control character - exit */
3658 3216
3659 seen_esc = false; 3217 seen_esc = false;
3660 3218
3661 if (n >= STRING_MAX - 1) 3219 if (n >= STRING_MAX - 1)
3662 // stop at some sane length 3220 // stop at some sane length
3663 return NULL; 3221 return NULL;
3664 3222
3665 if (ch == C0_SYN)
3666 string[n++] = cmd_get8 ();
3667 else
3668 string[n++] = ch; 3223 string[n++] = ch;
3669 } 3224 }
3670 3225
3671 string[n++] = '\0'; 3226 string[n++] = '\0';
3672 3227
3673 ends_how = (ch == 0x5c ? C0_ESC : ch); 3228 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3749 int color; 3304 int color;
3750 char *buf, *name; 3305 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3306 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3307 int saveop = op;
3753 3308
3754 dLocal (Display *, xdisp); 3309 dLocal (Display *, dpy);
3755 3310
3756 assert (str != NULL); 3311 assert (str != NULL);
3312
3313 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3314 return;
3315
3757 switch (op) 3316 switch (op)
3758 { 3317 {
3759 case XTerm_name: 3318 case XTerm_name:
3760 set_title (str); 3319 set_title (str);
3761 /* FALLTHROUGH */ 3320 /* FALLTHROUGH */
… …
3775 unsigned long bytes_after; 3334 unsigned long bytes_after;
3776 unsigned char *value = 0; 3335 unsigned char *value = 0;
3777 const char *str = ""; 3336 const char *str = "";
3778 3337
3779 if (prop 3338 if (prop
3780 && XGetWindowProperty (xdisp, parent[0], 3339 && XGetWindowProperty (dpy, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType, 3340 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format, 3341 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success 3342 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None 3343 && actual_type != None
3785 && actual_format == 8) 3344 && actual_format == 8)
… …
3797 { 3356 {
3798 *eq = 0; 3357 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1); 3358 set_utf8_property (display->atom (str), eq + 1);
3800 } 3359 }
3801 else 3360 else
3802 XDeleteProperty (xdisp, parent[0], 3361 XDeleteProperty (dpy, parent[0],
3803 display->atom (str)); 3362 display->atom (str));
3804 } 3363 }
3805 break; 3364 break;
3806 3365
3807 case XTerm_Color: 3366 case XTerm_Color:
… …
3853 break; 3412 break;
3854 case URxvt_Color_IT: 3413 case URxvt_Color_IT:
3855 process_color_seq (op, Color_IT, str, resp); 3414 process_color_seq (op, Color_IT, str, resp);
3856 break; 3415 break;
3857#endif 3416#endif
3858#if TRANSPARENT && TINTING 3417#if ENABLE_TRANSPARENCY
3859 case URxvt_Color_tint: 3418 case URxvt_Color_tint:
3860 process_color_seq (op, Color_tint, str, resp); 3419 process_color_seq (op, Color_tint, str, resp);
3420 {
3421 bool changed = false;
3422 if (ISSET_PIXCOLOR (Color_tint))
3423 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3424 else
3425 changed = bgPixmap.unset_tint ();
3426 if (changed)
3427 update_background ();
3428 }
3861 3429
3862 check_our_parents ();
3863
3864 if (am_transparent)
3865 want_full_refresh = want_refresh = 1;
3866
3867 break; 3430 break;
3868#endif 3431#endif
3869 3432
3433#if BG_IMAGE_FROM_FILE
3870 case Rxvt_Pixmap: 3434 case Rxvt_Pixmap:
3871 { 3435 if (!strcmp (str, "?"))
3872 if (*str != ';')
3873 { 3436 {
3874#if XPM_BACKGROUND 3437 char str[256];
3875 scale_pixmap (""); /* reset to default scaling */ 3438
3876 set_bgPixmap (str); /* change pixmap */ 3439 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3877 scr_touch (true); 3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3878#endif 3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3442 process_xterm_seq (XTerm_title, str, CHAR_ST);
3879 } 3443 }
3880 3444 else
3445 {
3881 int changed = 0; 3446 int changed = 0;
3882 3447
3883 while ((str = strchr (str, ';')) != NULL) 3448 if (*str != ';')
3884 { 3449 {
3450 /* reset to default scaling :*/
3451 bgPixmap.unset_geometry ();
3452 if (bgPixmap.set_file (str)) /* change pixmap */
3453 changed++;
3454 str = strchr (str, ';');
3455 if (str == NULL)
3456 bgPixmap.set_defaultGeometry ();
3457 }
3458 while (str)
3459 {
3885 str++; 3460 str++;
3886#if XPM_BACKGROUND 3461 if (bgPixmap.set_geometry (str))
3887 changed += scale_pixmap (str); 3462 changed++;
3888#endif 3463 str = strchr (str, ';');
3889 } 3464 }
3890
3891 if (changed) 3465 if (changed)
3892 { 3466 update_background ();
3893#ifdef XPM_BACKGROUND
3894 resize_pixmap ();
3895 scr_touch (true);
3896#endif
3897 } 3467 }
3898 }
3899 break; 3468 break;
3469#endif
3900 3470
3901 case Rxvt_restoreFG: 3471 case Rxvt_restoreFG:
3902 set_window_color (Color_fg, str); 3472 set_window_color (Color_fg, str);
3903 break; 3473 break;
3904 case Rxvt_restoreBG: 3474 case Rxvt_restoreBG:
… …
3929 case URxvt_italicFont: 3499 case URxvt_italicFont:
3930 case URxvt_boldItalicFont: 3500 case URxvt_boldItalicFont:
3931#endif 3501#endif
3932 if (query) 3502 if (query)
3933 tt_printf ("\33]%d;%-.250s%c", saveop, 3503 tt_printf ("\33]%d;%-.250s%c", saveop,
3934 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3504 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3935 ? fontset[op - URxvt_font]->fontdesc : "", 3505 ? fontset[op - URxvt_font]->fontdesc : "",
3936 resp); 3506 resp);
3937 else 3507 else
3938 { 3508 {
3939 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3509 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3953 break; 3523 break;
3954 3524
3955#if !ENABLE_MINIMAL 3525#if !ENABLE_MINIMAL
3956 case URxvt_locale: 3526 case URxvt_locale:
3957 if (query) 3527 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3528 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3959 else 3529 else
3960 { 3530 {
3961 set_locale (str); 3531 set_locale (str);
3962 pty->set_utf8_mode (enc_utf8); 3532 pty->set_utf8_mode (enc_utf8);
3963 init_xlocale (); 3533 init_xlocale ();
… …
3978 break; 3548 break;
3979#endif 3549#endif
3980 3550
3981#if ENABLE_PERL 3551#if ENABLE_PERL
3982 case URxvt_perl: 3552 case URxvt_perl:
3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3553 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3984 ; // no responses yet 3554 ; // no responses yet
3985 break; 3555 break;
3986#endif 3556#endif
3987 } 3557 }
3988} 3558}
… …
4026{ 3596{
4027 unsigned int i, j; 3597 unsigned int i, j;
4028 int state; 3598 int state;
4029 3599
4030 static const struct 3600 static const struct
4031 { 3601 {
4032 const int argval; 3602 const int argval;
4033 const unsigned long bit; 3603 const unsigned long bit;
4034 }
4035
4036 argtopriv[] = { 3604 } argtopriv[] = {
4037 { 1, PrivMode_aplCUR }, 3605 { 1, PrivMode_aplCUR },
4038 { 2, PrivMode_vt52 }, 3606 { 2, PrivMode_vt52 },
4039 { 3, PrivMode_132 }, 3607 { 3, PrivMode_132 },
4040 { 4, PrivMode_smoothScroll }, 3608 { 4, PrivMode_smoothScroll },
4041 { 5, PrivMode_rVideo }, 3609 { 5, PrivMode_rVideo },
… …
4104 scr_touch (true); 3672 scr_touch (true);
4105 break; 3673 break;
4106#endif 3674#endif
4107 case 1048: /* alternative cursor save */ 3675 case 1048: /* alternative cursor save */
4108 case 1049: 3676 case 1049:
4109 if (OPTION (Opt_secondaryScreen)) 3677 if (option (Opt_secondaryScreen))
4110 if (mode == 0) 3678 if (mode == 0)
4111 scr_cursor (RESTORE); 3679 scr_cursor (RESTORE);
4112 else if (mode == 1) 3680 else if (mode == 1)
4113 scr_cursor (SAVE); 3681 scr_cursor (SAVE);
4114 break; 3682 break;
… …
4179 break; 3747 break;
4180 case 1011: /* scroll to bottom on key press */ 3748 case 1011: /* scroll to bottom on key press */
4181 set_option (Opt_scrollTtyKeypress, state); 3749 set_option (Opt_scrollTtyKeypress, state);
4182 break; 3750 break;
4183 case 1047: /* secondary screen w/ clearing last */ 3751 case 1047: /* secondary screen w/ clearing last */
4184 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4185 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4186 scr_erase_screen (2); 3754 scr_erase_screen (2);
4187 scr_change_screen (state); 3755 scr_change_screen (state);
4188 break; 3756 break;
4189 case 1049: /* secondary screen w/ clearing first */ 3757 case 1049: /* secondary screen w/ clearing first */
4190 scr_change_screen (state); 3758 scr_change_screen (state);
4191 if (OPTION (Opt_secondaryScreen)) 3759 if (option (Opt_secondaryScreen))
4192 if (current_screen != PRIMARY) 3760 if (current_screen != PRIMARY)
4193 scr_erase_screen (2); 3761 scr_erase_screen (2);
4194 break; 3762 break;
4195 default: 3763 default:
4196 break; 3764 break;
… …
4433 4001
4434 if (v_buflen == 0) 4002 if (v_buflen == 0)
4435 { 4003 {
4436 free (v_buffer); 4004 free (v_buffer);
4437 v_buffer = 0; 4005 v_buffer = 0;
4438 v_buflen = 0;
4439 4006
4440 pty_ev.set (EVENT_READ); 4007 pty_ev.set (EVENT_READ);
4441 return; 4008 return;
4442 } 4009 }
4443 4010

Diff Legend

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