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.302 by root, Tue Jan 31 21:35:39 2006 UTC vs.
Revision 1.353 by sasha, Wed Sep 12 19:51:41 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>
… …
55# include "keyboard.h" 55# include "keyboard.h"
56#endif 56#endif
57 57
58#include <csignal> 58#include <csignal>
59 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
60/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
61 65
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63 67
64#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
… …
91 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
92 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
93 97
94 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
95 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
96 XK_ISO_Lock, 0x21eb,
97 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
98 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
99 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
100 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
101 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
294 297
295 return -1; 298 return -1;
296} 299}
297#endif 300#endif
298 301
299/*{{{ Convert the keypress event into a string */
300void 302void
301rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
302{ 304{
303 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
304 unsigned int newlen; 306 unsigned int newlen;
305 KeySym keysym; 307 KeySym keysym;
306 int valid_keysym; 308 int valid_keysym;
307 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
308 315
309 /* 316 /*
310 * 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
311 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
312 * 319 *
… …
492# if ISO_14755 499# if ISO_14755
493 iso14755_51 (0); 500 iso14755_51 (0);
494# endif 501# endif
495 return; 502 return;
496 } 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 }
497 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
498 { 513 {
499 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
500 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
501# if ISO_14755 516# if ISO_14755
… …
503# endif 518# endif
504 return; 519 return;
505 } 520 }
506 else 521 else
507 { 522 {
508# if ENABLE_OVERLAY 523# if ISO_14755
509 scr_overlay_off (); 524 scr_overlay_off ();
510# endif 525# endif
511 iso14755buf = 0; 526 iso14755buf = 0;
512 } 527 }
513 } 528 }
514 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
515 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
516 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
517 { 532 {
518 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
519# if ENABLE_OVERLAY 534# if ISO_14755
520 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
521 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
522# endif 537# endif
523 } 538 }
524#endif 539#endif
525 540
526#ifdef PRINTPIPE 541#ifdef PRINTPIPE
527 if (keysym == XK_Print) 542 if (keysym == XK_Print)
528 { 543 {
529 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
530 return; 545 return;
… …
532#endif 547#endif
533 548
534 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
535 { 550 {
536 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
537 newlen = 1; 553 newlen = 1;
538 switch (keysym) 554 switch (keysym)
539 { 555 {
540#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
541 case XK_BackSpace: 557 case XK_BackSpace:
… …
544 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
545 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
546 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
547 } 563 }
548 else 564 else
549 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
550 break; 566 break;
551#endif 567#endif
552#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
553# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
554 case XK_KP_Delete: 570 case XK_KP_Delete:
555 /* allow shift to override */ 571 /* allow shift to override */
556 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
557 { 573 {
558 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
559 break; 575 break;
560 } 576 }
561 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
562# endif 578# endif
563 case XK_Delete: 579 case XK_Delete:
564 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
565 break; 581 break;
566#endif 582#endif
567 case XK_Tab: 583 case XK_Tab:
568 if (shft) 584 if (shft)
569 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
584#ifdef XK_KP_Left 600#ifdef XK_KP_Left
585 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
586 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
587 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
588 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
589 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
590 { 606 {
591 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
592 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
593 break; 609 break;
594 } 610 }
… …
617 633
618#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
619# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
620 case XK_KP_Prior: 636 case XK_KP_Prior:
621 /* allow shift to override */ 637 /* allow shift to override */
622 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
623 { 639 {
624 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
625 break; 641 break;
626 } 642 }
627 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
630 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
631 break; 647 break;
632# ifdef XK_KP_Next 648# ifdef XK_KP_Next
633 case XK_KP_Next: 649 case XK_KP_Next:
634 /* allow shift to override */ 650 /* allow shift to override */
635 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
636 { 652 {
637 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
638 break; 654 break;
639 } 655 }
640 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
643 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
644 break; 660 break;
645#endif 661#endif
646 case XK_KP_Enter: 662 case XK_KP_Enter:
647 /* allow shift to override */ 663 /* allow shift to override */
648 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
649 { 665 {
650 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
651 break; 667 break;
652 } 668 }
653 669
… …
696 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
697 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
698 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
699 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
700 /* allow shift to override */ 716 /* allow shift to override */
701 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
702 { 718 {
703 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
704 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
705 } 721 }
706 else 722 else
… …
712 728
713 case XK_Find: 729 case XK_Find:
714 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
715 break; 731 break;
716 732
717#ifdef XK_KP_End 733#ifdef XK_KP_Insert
718 case XK_KP_Insert: 734 case XK_KP_Insert:
719 /* allow shift to override */ 735 /* allow shift to override */
720 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
721 { 737 {
722 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
723 break; 739 break;
724 } 740 }
725 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
738 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
739 break; 755 break;
740#ifdef XK_KP_End 756#ifdef XK_KP_End
741 case XK_KP_End: 757 case XK_KP_End:
742 /* allow shift to override */ 758 /* allow shift to override */
743 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
744 { 760 {
745 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
746 break; 762 break;
747 } 763 }
748 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
751 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
752 break; 768 break;
753#ifdef XK_KP_Home 769#ifdef XK_KP_Home
754 case XK_KP_Home: 770 case XK_KP_Home:
755 /* allow shift to override */ 771 /* allow shift to override */
756 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
757 { 773 {
758 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
759 break; 775 break;
760 } 776 }
761 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
869 return; 885 return;
870 886
871 if (len <= 0) 887 if (len <= 0)
872 return; /* not mapped */ 888 return; /* not mapped */
873 889
874 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
875 if (view_start) 891 if (view_start)
876 { 892 {
877 view_start = 0; 893 view_start = 0;
878 want_refresh = 1; 894 want_refresh = 1;
879 } 895 }
… …
903 tt_write (&ch, 1); 919 tt_write (&ch, 1);
904 } 920 }
905 921
906 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
907} 923}
908/*}}} */ 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}
909 1001
910#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
911unsigned int 1003unsigned int
912rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
913{ 1005{
… …
942 1034
943void 1035void
944rxvt_term::flush () 1036rxvt_term::flush ()
945{ 1037{
946 flush_ev.stop (); 1038 flush_ev.stop ();
947
948#ifdef TRANSPARENT
949 if (want_full_refresh)
950 {
951 want_full_refresh = 0;
952 scr_clear ();
953 scr_touch (false);
954 }
955#endif
956 1039
957 if (want_refresh) 1040 if (want_refresh)
958 { 1041 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 { 1043 {
… …
1018void 1101void
1019rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
1020{ 1103{
1021 make_current (); 1104 make_current ();
1022 1105
1023 refresh_limit = 1;
1024 refresh_count = 0; 1106 refresh_count = 0;
1025 flush (); 1107 flush ();
1026} 1108}
1027 1109
1028#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
1094 1176
1095#if LINUX_YIELD_HACK 1177#if LINUX_YIELD_HACK
1096static struct event_handler 1178static struct event_handler
1097{ 1179{
1098 check_watcher yield_ev; 1180 check_watcher yield_ev;
1099 1181
1100 void yield_cb (check_watcher &w) 1182 void yield_cb (check_watcher &w)
1101 { 1183 {
1102 usleep (0); 1184 // this should really be sched_yield(), but the linux guys thought
1185 // that giving a process calling sched_yield () less cpu time than
1186 // ones with high nice levels is a useful thing to do. It surely is is
1187 // allowed by the sus... as is returning ENOSYS.
1188
1189 struct timespec ts = { 0, 0 };
1190 nanosleep (&ts, 0);
1191
1103 w.stop (); 1192 w.stop ();
1104 } 1193 }
1105 1194
1106 event_handler () 1195 event_handler ()
1107 : yield_ev (this, &event_handler::yield_cb) 1196 : yield_ev (this, &event_handler::yield_cb)
… …
1141 } 1230 }
1142 else 1231 else
1143 { 1232 {
1144 pty_ev.stop (); 1233 pty_ev.stop ();
1145 1234
1146 if (!OPTION (Opt_hold)) 1235 if (!option (Opt_hold))
1147 destroy (); 1236 destroy ();
1148 } 1237 }
1149 1238
1150 return false; 1239 return false;
1151} 1240}
1152 1241
1153void 1242void
1154rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1166} 1255}
1167 1256
1168void 1257void
1169rxvt_term::pointer_unblank () 1258rxvt_term::pointer_unblank ()
1170{ 1259{
1171 XDefineCursor (xdisp, vt, TermWin_cursor); 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1172 recolour_cursor (); 1261 recolour_cursor ();
1173 1262
1174#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1175 hidden_pointer = 0; 1264 hidden_pointer = 0;
1176 1265
1177 if (OPTION (Opt_pointerBlank)) 1266 if (option (Opt_pointerBlank))
1178 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
1179#endif 1268#endif
1180} 1269}
1181 1270
1182#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1183void 1272void
1184rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
1185{ 1274{
1186 if (!OPTION (Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
1187 return; 1276 return;
1188 1277
1189 XDefineCursor (xdisp, vt, display->blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
1190 XFlush (xdisp); 1279 XFlush (dpy);
1191 1280
1192 hidden_pointer = 1; 1281 hidden_pointer = 1;
1193} 1282}
1194 1283
1195void 1284void
… …
1274void 1363void
1275rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
1276{ 1365{
1277 make_current (); 1366 make_current ();
1278 1367
1279 dLocal (Display *, xdisp); 1368 dLocal (Display *, dpy);
1280 1369
1281 if (ev.xany.window == vt 1370 if (ev.xany.window == vt
1282 && SHOULD_INVOKE (HOOK_X_EVENT) 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1284 return; 1373 return;
… …
1289 unsigned int unused_mask; 1378 unsigned int unused_mask;
1290 1379
1291 switch (ev.type) 1380 switch (ev.type)
1292 { 1381 {
1293 case KeyPress: 1382 case KeyPress:
1294#if ISO_14755 1383 key_press (ev.xkey);
1295 if (!(iso14755buf & ISO_14755_52))
1296#endif
1297 lookup_key (ev.xkey);
1298
1299 break; 1384 break;
1300 1385
1301 case KeyRelease: 1386 case KeyRelease:
1302 { 1387 key_release (ev.xkey);
1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1304 KeySym keysym;
1305
1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1307#endif
1308
1309#if ENABLE_FRILLS || ISO_14755
1310 // ISO 14755 support
1311 if (iso14755buf)
1312 if (iso14755buf & ISO_14755_52)
1313 {
1314# if ENABLE_OVERLAY
1315 scr_overlay_off ();
1316# endif
1317# if ISO_14755
1318 // iso14755 part 5.2 handling: release time
1319 // first: controls
1320 if ((ev.xkey.state & ControlMask)
1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1323 {
1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1325 commit_iso14755 ();
1326 goto skip_switch;
1327 }
1328
1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1330 if (i[0] == keysym)
1331 {
1332 iso14755buf = ISO_14755_51 | i[1];
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 scr_bell ();
1338# endif
1339 iso14755buf = 0;
1340 break;
1341 }
1342 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1343 {
1344# if ENABLE_OVERLAY
1345 scr_overlay_off ();
1346# endif
1347 if (iso14755buf & ISO_14755_51)
1348 commit_iso14755 ();
1349#if ISO_14755
1350 else if (iso14755buf & ISO_14755_STARTED)
1351 {
1352 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1353
1354 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1355 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1356 }
1357# endif
1358 else
1359 iso14755buf = 0;
1360 }
1361#endif
1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1365 break;
1366
1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1368 if (!(ev.xkey.state & ControlMask))
1369 slip_wheel_ev.stop ();
1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1371 mouse_slip_wheel_speed = 0;
1372#endif
1373 break; 1388 break;
1374 }
1375 1389
1376 case ButtonPress: 1390 case ButtonPress:
1377 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1378 break; 1392 break;
1379 1393
… …
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1395 destroy (); 1409 destroy ();
1396 } 1410 }
1397#if ENABLE_EWMH 1411#if ENABLE_EWMH
1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1399 XSendEvent (xdisp, ev.xclient.window = display->root, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1400 False, SubstructureRedirectMask | SubstructureNotifyMask, 1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1401 &ev); 1415 &ev);
1402#endif 1416#endif
1403 } 1417 }
1404 } 1418 }
… …
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out (); 1425 focus_out ();
1412 } 1426 }
1413#endif 1427#endif
1414 } 1428 }
1415 break;
1416
1417 case MappingNotify:
1418 XRefreshKeyboardMapping (&ev.xmapping);
1419 break; 1429 break;
1420 1430
1421 /* 1431 /*
1422 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1423 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1442 break; 1452 break;
1443 } 1453 }
1444 break; 1454 break;
1445 1455
1446 case FocusIn: 1456 case FocusIn:
1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1447 focus_in (); 1460 focus_in ();
1448 break; 1461 break;
1449 1462
1450 case FocusOut: 1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1451 focus_out (); 1467 focus_out ();
1452 break; 1468 break;
1453 1469
1454 case ConfigureNotify: 1470 case ConfigureNotify:
1471/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1472 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1473 szHint.width, szHint.height);*/
1455 if (ev.xconfigure.window == parent[0]) 1474 if (ev.xconfigure.window == parent[0])
1456 { 1475 {
1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev)) 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1458 ; 1477 ;
1459 1478
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1461 { 1480 {
1462 seen_resize = 1; 1481 seen_resize = 1;
1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1464 } 1483 }
1465 1484 else
1485 {
1486#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1489#endif
1490 }
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1469 if (OPTION (Opt_transparent))
1470 check_our_parents ();
1471#endif
1472 } 1492 }
1473 break; 1493 break;
1474 1494
1475 case PropertyNotify: 1495 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1506#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1507 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1508#endif 1528#endif
1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1530 break;
1511
1512#ifdef TRANSPARENT
1513 case ReparentNotify:
1514 rootwin_cb (ev);
1515 break;
1516#endif /* TRANSPARENT */
1517 1531
1518 case GraphicsExpose: 1532 case GraphicsExpose:
1519 case Expose: 1533 case Expose:
1520 if (ev.xany.window == vt) 1534 if (ev.xany.window == vt)
1521 { 1535 {
1522 do 1536 do
1523 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1524 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1540
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1542
1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1532 1546
1533 want_refresh = 1; 1547 want_refresh = 1;
1534 } 1548 }
1535 else 1549 else
1536 { 1550 {
1537 XEvent unused_event; 1551 XEvent unused_event;
1538 1552
1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1540 ; 1554 ;
1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1542 ; 1556 ;
1543 1557
1544 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1545 { 1559 {
1546 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1547 scrollbar_show (0); 1561 scrollbar_show (0);
1548 } 1562 }
1549
1550#ifdef TRANSPARENT
1551 if (am_transparent && ev.xany.window == parent[0])
1552 XClearWindow (xdisp, ev.xany.window);
1553#endif
1554 } 1563 }
1555 break; 1564 break;
1556 1565
1557 case MotionNotify: 1566 case MotionNotify:
1558#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
… …
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop 1578 ; // nop
1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1580 {
1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1573 ; 1582 ;
1574 1583
1575 XQueryPointer (xdisp, vt, 1584 XQueryPointer (dpy, vt,
1576 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1588 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1644#endif 1653#endif
1645 } 1654 }
1646 } 1655 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1648 { 1657 {
1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1650 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1651 ; 1660 ;
1652 1661
1653 XQueryPointer (xdisp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1654 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1666 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1668 scrollbar_size ());
1660 want_refresh = 1; 1669 want_refresh = 1;
1661 refresh_limit = 0;
1662 scrollbar_show (1); 1670 scrollbar_show (1);
1663 } 1671 }
1664 break; 1672 break;
1665 } 1673 }
1666 1674
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1671 { 1677 {
1672 if (hidden_cursor) 1678 if (hidden_cursor)
1673 { 1679 {
1674 hidden_cursor = 0; 1680 hidden_cursor = 0;
1675 want_refresh = 1; 1681 want_refresh = 1;
… …
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 } 1685 }
1680#endif 1686#endif
1681 1687
1682#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 { 1690 {
1685 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1688 if (hidden_pointer) 1694 if (hidden_pointer)
… …
1700 if (!focus) 1706 if (!focus)
1701 { 1707 {
1702 focus = 1; 1708 focus = 1;
1703 want_refresh = 1; 1709 want_refresh = 1;
1704 1710
1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1706 1712
1707#if USE_XIM 1713#if USE_XIM
1708 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1709 { 1715 {
1710 IMSetStatusPosition (); 1716 IMSetPosition ();
1711 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1712 } 1718 }
1713#endif 1719#endif
1714#if CURSOR_BLINK 1720#if CURSOR_BLINK
1715 if (OPTION (Opt_cursorBlink)) 1721 if (option (Opt_cursorBlink))
1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1717#endif 1723#endif
1718#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1719 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1720 { 1726 {
1721 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1722 scr_recolour (); 1728 scr_recolour ();
1723 } 1729 }
1724#endif 1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 XWMHints *h;
1735
1736 h = XGetWMHints(dpy, parent[0]);
1737 if (h != NULL)
1738 {
1739 h->flags &= ~XUrgencyHint;
1740 XSetWMHints(dpy, parent[0], h);
1741 }
1742 }
1743#endif
1725 } 1744 }
1726} 1745}
1727 1746
1728void 1747void
1729rxvt_term::focus_out () 1748rxvt_term::focus_out ()
… …
1737 1756
1738#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1758 if (iso14755buf)
1740 { 1759 {
1741 iso14755buf = 0; 1760 iso14755buf = 0;
1742# if ENABLE_OVERLAY 1761# if ISO_14755
1743 scr_overlay_off (); 1762 scr_overlay_off ();
1744# endif 1763# endif
1745 } 1764 }
1746#endif 1765#endif
1747#if USE_XIM 1766#if USE_XIM
1748 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1749 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1750#endif 1769#endif
1751#if CURSOR_BLINK 1770#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink)) 1771 if (option (Opt_cursorBlink))
1753 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1754 hidden_cursor = 0; 1773 hidden_cursor = 0;
1755#endif 1774#endif
1756#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1757 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
… …
1761 } 1780 }
1762#endif 1781#endif
1763 } 1782 }
1764} 1783}
1765 1784
1766#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1767void 1799void
1768rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1801{
1770 make_current (); 1802 make_current ();
1771 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1772 switch (ev.type) 1809 switch (ev.type)
1773 { 1810 {
1774 case PropertyNotify: 1811 case PropertyNotify:
1775 /* 1812 /*
1776 * if user used some Esetroot compatible prog to set the root bg, 1813 * if user used some Esetroot compatible prog to set the root bg,
1777 * use the property to determine the pixmap. We use it later on. 1814 * use the property to determine the pixmap. We use it later on.
1778 */ 1815 */
1779 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1780 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1781 return; 1818 {
1782 1819 bgPixmap.set_root_pixmap ();
1783 /* FALLTHROUGH */ 1820 update_background ();
1784 case ReparentNotify: 1821 }
1785 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1786 want_refresh = want_full_refresh = 1;
1787 break; 1822 break;
1788 } 1823 }
1824# endif
1789} 1825}
1790#endif 1826#endif
1791 1827
1792void 1828void
1793rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
2121 selection_make (ev.time); 2157 selection_make (ev.time);
2122 break; 2158 break;
2123 2159
2124 case Button2: 2160 case Button2:
2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2127 break; 2163 break;
2128 2164
2129#ifdef MOUSE_WHEEL 2165#ifdef MOUSE_WHEEL
2130 case Button4: 2166 case Button4:
2131 case Button5: 2167 case Button5:
… …
2135 2171
2136 v = ev.button == Button4 ? UP : DN; 2172 v = ev.button == Button4 ? UP : DN;
2137 2173
2138 if (ev.state & ShiftMask) 2174 if (ev.state & ShiftMask)
2139 i = 1; 2175 i = 1;
2140 else if (OPTION (Opt_mouseWheelScrollPage)) 2176 else if (option (Opt_mouseWheelScrollPage))
2141 i = nrow - 1; 2177 i = nrow - 1;
2142 else 2178 else
2143 i = 5; 2179 i = 5;
2144 2180
2145# ifdef MOUSE_SLIP_WHEELING 2181# ifdef MOUSE_SLIP_WHEELING
… …
2166 break; 2202 break;
2167#endif 2203#endif
2168 } 2204 }
2169 } 2205 }
2170} 2206}
2171
2172#ifdef TRANSPARENT
2173#if TINTING
2174/* taken from aterm-0.4.2 */
2175
2176typedef uint32_t RUINT32T;
2177
2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2179{
2180 int sh_r, sh_g, sh_b;
2181 RUINT32T mask_r, mask_g, mask_b;
2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2185 int i;
2186
2187 Visual *visual = term->visual;
2188
2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2190
2191 /* for convenience */
2192 mask_r = visual->red_mask;
2193 mask_g = visual->green_mask;
2194 mask_b = visual->blue_mask;
2195
2196 /* boring lookup table pre-initialization */
2197 switch (srcImage->bits_per_pixel) {
2198 case 15:
2199 if ((mask_r != 0x7c00) ||
2200 (mask_g != 0x03e0) ||
2201 (mask_b != 0x001f))
2202 return;
2203 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2204 lookup_r = lookup;
2205 lookup_g = lookup+32;
2206 lookup_b = lookup+32+32;
2207 sh_r = 10;
2208 sh_g = 5;
2209 sh_b = 0;
2210 break;
2211 case 16:
2212 if ((mask_r != 0xf800) ||
2213 (mask_g != 0x07e0) ||
2214 (mask_b != 0x001f))
2215 return;
2216 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2217 lookup_r = lookup;
2218 lookup_g = lookup+32;
2219 lookup_b = lookup+32+64;
2220 sh_r = 11;
2221 sh_g = 5;
2222 sh_b = 0;
2223 break;
2224 case 24:
2225 if ((mask_r != 0xff0000) ||
2226 (mask_g != 0x00ff00) ||
2227 (mask_b != 0x0000ff))
2228 return;
2229 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2230 lookup_r = lookup;
2231 lookup_g = lookup+256;
2232 lookup_b = lookup+256+256;
2233 sh_r = 16;
2234 sh_g = 8;
2235 sh_b = 0;
2236 break;
2237 case 32:
2238 if ((mask_r != 0xff0000) ||
2239 (mask_g != 0x00ff00) ||
2240 (mask_b != 0x0000ff))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2243 lookup_r = lookup;
2244 lookup_g = lookup+256;
2245 lookup_b = lookup+256+256;
2246 sh_r = 16;
2247 sh_g = 8;
2248 sh_b = 0;
2249 break;
2250 default:
2251 return; /* we do not support this color depth */
2252 }
2253
2254 /* prepare limits for color transformation (each channel is handled separately) */
2255 if (shade < 0) {
2256 shade = -shade;
2257 if (shade < 0) shade = 0;
2258 if (shade > 100) shade = 100;
2259
2260 lower_lim_r = 65535-rm;
2261 lower_lim_g = 65535-gm;
2262 lower_lim_b = 65535-bm;
2263
2264 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2265 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2266 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2267
2268 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2269 } else {
2270 if (shade < 0) shade = 0;
2271 if (shade > 100) shade = 100;
2272
2273 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2274
2275 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2276 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2277 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2278 }
2279
2280 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2281 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2282 {
2283 unsigned int tmp;
2284
2285 tmp = lower_lim_r;
2286 lower_lim_r = lower_lim_b;
2287 lower_lim_b = tmp;
2288
2289 tmp = upper_lim_r;
2290 upper_lim_r = upper_lim_b;
2291 upper_lim_b = tmp;
2292 }
2293
2294 /* fill our lookup tables */
2295 for (i = 0; i <= mask_r>>sh_r; i++)
2296 {
2297 RUINT32T tmp;
2298 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2299 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2300 lookup_r[i] = (tmp/65535)<<sh_r;
2301 }
2302 for (i = 0; i <= mask_g>>sh_g; i++)
2303 {
2304 RUINT32T tmp;
2305 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2306 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2307 lookup_g[i] = (tmp/65535)<<sh_g;
2308 }
2309 for (i = 0; i <= mask_b>>sh_b; i++)
2310 {
2311 RUINT32T tmp;
2312 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2313 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2314 lookup_b[i] = (tmp/65535)<<sh_b;
2315 }
2316
2317 /* apply table to input image (replacing colors by newly calculated ones) */
2318 switch (srcImage->bits_per_pixel)
2319 {
2320 case 15:
2321 {
2322 unsigned short *p1, *pf, *p, *pl;
2323 p1 = (unsigned short *) srcImage->data;
2324 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2325 while (p1 < pf)
2326 {
2327 p = p1;
2328 pl = p1 + srcImage->width;
2329 for (; p < pl; p++)
2330 {
2331 *p = lookup_r[(*p & 0x7c00)>>10] |
2332 lookup_g[(*p & 0x03e0)>> 5] |
2333 lookup_b[(*p & 0x001f)];
2334 }
2335 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2336 }
2337 break;
2338 }
2339 case 16:
2340 {
2341 unsigned short *p1, *pf, *p, *pl;
2342 p1 = (unsigned short *) srcImage->data;
2343 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2344 while (p1 < pf)
2345 {
2346 p = p1;
2347 pl = p1 + srcImage->width;
2348 for (; p < pl; p++)
2349 {
2350 *p = lookup_r[(*p & 0xf800)>>11] |
2351 lookup_g[(*p & 0x07e0)>> 5] |
2352 lookup_b[(*p & 0x001f)];
2353 }
2354 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2355 }
2356 break;
2357 }
2358 case 24:
2359 {
2360 unsigned char *p1, *pf, *p, *pl;
2361 p1 = (unsigned char *) srcImage->data;
2362 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2363 while (p1 < pf)
2364 {
2365 p = p1;
2366 pl = p1 + srcImage->width * 3;
2367 for (; p < pl; p += 3)
2368 {
2369 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2370 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2371 p[2] = lookup_r[(p[2] & 0x0000ff)];
2372 }
2373 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2374 }
2375 break;
2376 }
2377 case 32:
2378 {
2379 RUINT32T *p1, *pf, *p, *pl;
2380 p1 = (RUINT32T *) srcImage->data;
2381 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2382
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xff0000)>>16] |
2390 lookup_g[(*p & 0x00ff00)>> 8] |
2391 lookup_b[(*p & 0x0000ff)] |
2392 (*p & ~0xffffff);
2393 }
2394 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2395 }
2396 break;
2397 }
2398 }
2399
2400 free (lookup);
2401}
2402#endif
2403
2404/*
2405 * Check our parents are still who we think they are.
2406 * Do transparency updates if required
2407 */
2408int
2409rxvt_term::check_our_parents ()
2410{
2411 int i, pchanged, aformat, have_pixmap, rootdepth;
2412 unsigned long nitems, bytes_after;
2413 Atom atype;
2414 unsigned char *prop = NULL;
2415 Window root, oldp, *list;
2416 Pixmap rootpixmap = None;
2417 XWindowAttributes wattr, wrootattr;
2418
2419 pchanged = 0;
2420
2421 if (!OPTION (Opt_transparent))
2422 return pchanged; /* Don't try any more */
2423
2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2425 rootdepth = wrootattr.depth;
2426
2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2428
2429 if (rootdepth != wattr.depth)
2430 {
2431 if (am_transparent)
2432 {
2433 pchanged = 1;
2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2435 am_transparent = am_pixmap_trans = 0;
2436 }
2437
2438 return pchanged; /* Don't try any more */
2439 }
2440
2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2442 XSync (xdisp, False);
2443
2444 /*
2445 * Make the frame window set by the window manager have
2446 * the root background. Some window managers put multiple nested frame
2447 * windows for each client, so we have to take care about that.
2448 */
2449 i = (xa[XA_XROOTPMAP_ID]
2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2452 &nitems, &bytes_after, &prop) == Success);
2453
2454 if (!i || prop == NULL)
2455 i = (xa[XA_ESETROOT_PMAP_ID]
2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2458 &nitems, &bytes_after, &prop) == Success);
2459
2460 if (!i || prop == NULL
2461#if TINTING
2462 || !ISSET_PIXCOLOR (Color_tint)
2463#endif
2464 )
2465 have_pixmap = 0;
2466 else
2467 {
2468 have_pixmap = 1;
2469 rootpixmap = *(Pixmap *)prop;
2470 XFree (prop);
2471 }
2472
2473 if (have_pixmap)
2474 {
2475 /*
2476 * Copy display->root pixmap transparency
2477 */
2478 int sx, sy, nx, ny;
2479 unsigned int nw, nh;
2480 Window cr;
2481 XImage *image;
2482 GC gc;
2483 XGCValues gcvalue;
2484
2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2486 0, 0, &sx, &sy, &cr);
2487 nw = (unsigned int)szHint.width;
2488 nh = (unsigned int)szHint.height;
2489 nx = ny = 0;
2490
2491 if (sx < 0)
2492 {
2493 nw += sx;
2494 nx = -sx;
2495 sx = 0;
2496 }
2497
2498 if (sy < 0)
2499 {
2500 nh += sy;
2501 ny = -sy;
2502 sy = 0;
2503 }
2504
2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2507
2508 XSync (xdisp, False);
2509 allowedxerror = -1;
2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2511
2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2513 /* XXX: may need a delay here? */
2514 allowedxerror = 0;
2515
2516 if (image == NULL)
2517 {
2518 if (am_transparent && am_pixmap_trans)
2519 {
2520 pchanged = 1;
2521 if (pixmap != None)
2522 {
2523 XFreePixmap (xdisp, pixmap);
2524 pixmap = None;
2525 }
2526 }
2527
2528 am_pixmap_trans = 0;
2529 }
2530 else
2531 {
2532 if (pixmap != None)
2533 XFreePixmap (xdisp, pixmap);
2534
2535#if TINTING
2536 if (ISSET_PIXCOLOR (Color_tint))
2537 {
2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2539
2540 rgba c;
2541 pix_colors_focused [Color_tint].get (c);
2542
2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2544 }
2545#endif
2546
2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2550 nx, ny, image->width, image->height);
2551 XFreeGC (xdisp, gc);
2552 XDestroyImage (image);
2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2554 XClearWindow (xdisp, parent[0]);
2555
2556 if (!am_transparent || !am_pixmap_trans)
2557 pchanged = 1;
2558
2559 am_transparent = am_pixmap_trans = 1;
2560 }
2561 }
2562
2563 if (am_pixmap_trans)
2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2565 else
2566 {
2567 unsigned int n;
2568 /*
2569 * InheritPixmap transparency
2570 */
2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2572 {
2573 oldp = parent[i];
2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2575 XFree (list);
2576
2577 if (parent[i] == display->root)
2578 {
2579 if (oldp != None)
2580 pchanged = 1;
2581
2582 break;
2583 }
2584
2585 if (oldp != parent[i])
2586 pchanged = 1;
2587 }
2588
2589 n = 0;
2590
2591 if (pchanged)
2592 for (; n < (unsigned int)i; n++)
2593 {
2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2597 {
2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2599 break;
2600 }
2601 }
2602
2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2604 {
2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2607 am_transparent = 0;
2608 /* XXX: also turn off Opt_transparent? */
2609 }
2610 else
2611 {
2612 for (n = 0; n < (unsigned int)i; n++)
2613 {
2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2615 XClearWindow (xdisp, parent[n]);
2616 }
2617
2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2619 am_transparent = 1;
2620 }
2621
2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2623 parent[i] = None;
2624 }
2625
2626 if (scrollBar.win)
2627 {
2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2629 scrollBar.setIdle ();
2630 scrollbar_show (0);
2631 }
2632
2633 if (am_transparent)
2634 {
2635 want_refresh = want_full_refresh = 1;
2636 if (am_pixmap_trans)
2637 flush ();
2638 }
2639
2640 return pchanged;
2641}
2642#endif
2643 2207
2644/*}}} */ 2208/*}}} */
2645 2209
2646bool 2210bool
2647rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
… …
2696 if (ch == C0_LF) 2260 if (ch == C0_LF)
2697 nlines++; 2261 nlines++;
2698 2262
2699 refresh_count++; 2263 refresh_count++;
2700 2264
2701 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2702 || (refresh_count >= refresh_limit * (nrow - 1)))
2703 { 2266 {
2704 refreshnow = true;
2705 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2270 {
2271 refreshnow = true;
2706 ch = NOCHAR; 2272 ch = NOCHAR;
2707 break; 2273 break;
2274 }
2708 } 2275 }
2709 2276
2710 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2711 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2712 { 2279 {
… …
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2741 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2742 2309
2743 /* 2310 /*
2744 * If there have been a lot of new lines, then update the screen 2311 * If there have been a lot of new lines, then update the screen
2745 * What the heck I'll cheat and only refresh less than every page-full. 2312 * What the heck we'll cheat and only refresh less than every page-full.
2746 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2747 * is incremented here because we must be doing flat-out scrolling.
2748 */ 2314 */
2749 if (refreshnow) 2315 if (refreshnow)
2750 { 2316 {
2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2752 refresh_limit++;
2753 else
2754 {
2755 flag = true; 2317 flag = true;
2756 scr_refresh (); 2318 scr_refresh ();
2757 want_refresh = 1; 2319 want_refresh = 1;
2758 }
2759 } 2320 }
2760 2321
2761 } 2322 }
2762 else 2323 else
2763 { 2324 {
… …
2912 { 2473 {
2913 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2914 break; /* done = 1 */ 2475 break; /* done = 1 */
2915 } 2476 }
2916 } 2477 }
2917 2478
2918 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2919 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2920 { 2481 {
2921 done = 1; 2482 done = 1;
2922 break; 2483 break;
… …
2984 process_dcs_seq (); 2545 process_dcs_seq ();
2985 break; 2546 break;
2986 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
2987 process_csi_seq (); 2548 process_csi_seq ();
2988 break; 2549 break;
2989 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
2990 process_osc_seq (); 2551 process_osc_seq ();
2991 break; 2552 break;
2992#endif 2553#endif
2993 } 2554 }
2994} 2555}
… …
3220rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3221{ 2782{
3222 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3223 unsigned int nargs, p; 2784 unsigned int nargs, p;
3224 int n, ndef; 2785 int n, ndef;
3225 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3226 2787
3227 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3228 arg[--nargs] = 0;
3229 2789
3230 priv = 0; 2790 priv = 0;
3231 ch = cmd_getc (); 2791 ch = cmd_getc ();
3232 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
3233 { /* '<' '=' '>' '?' */ 2793 { /* '<' '=' '>' '?' */
… …
3277 switch (priv) 2837 switch (priv)
3278 { 2838 {
3279 case '>': 2839 case '>':
3280 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
3281 { 2841 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken). 2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 // 2844 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do). 2847 // that we do not support xterm mouse reporting (should be 95 when we do).
… …
3421 break; 2981 break;
3422 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3423 scr_report_position (); 2983 scr_report_position ();
3424 break; 2984 break;
3425 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3426 if (OPTION (Opt_insecure)) 2986 if (option (Opt_insecure))
3427 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3428 break; 2988 break;
3429 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3430 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3431 break; 2991 break;
… …
3524{ 3084{
3525 int x, y; 3085 int x, y;
3526 XWindowAttributes wattr; 3086 XWindowAttributes wattr;
3527 Window wdummy; 3087 Window wdummy;
3528 3088
3529 dLocal (Display *, xdisp); 3089 dLocal (Display *, dpy);
3530 3090
3531 if (nargs == 0) 3091 if (nargs == 0)
3532 return; 3092 return;
3533 3093
3534 switch (args[0]) 3094 switch (args[0])
3535 { 3095 {
3536 /* 3096 /*
3537 * commands 3097 * commands
3538 */ 3098 */
3539 case 1: /* deiconify window */ 3099 case 1: /* deiconify window */
3540 XMapWindow (xdisp, parent[0]); 3100 XMapWindow (dpy, parent[0]);
3541 break; 3101 break;
3542 case 2: /* iconify window */ 3102 case 2: /* iconify window */
3543 XIconifyWindow (xdisp, parent[0], display->screen); 3103 XIconifyWindow (dpy, parent[0], display->screen);
3544 break; 3104 break;
3545 case 3: /* set position (pixels) */ 3105 case 3: /* set position (pixels) */
3546 XMoveWindow (xdisp, parent[0], args[1], args[2]); 3106 XMoveWindow (dpy, parent[0], args[1], args[2]);
3547 break; 3107 break;
3548 case 4: /* set size (pixels) */ 3108 case 4: /* set size (pixels) */
3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3550 break; 3110 break;
3551 case 5: /* raise window */ 3111 case 5: /* raise window */
3552 XRaiseWindow (xdisp, parent[0]); 3112 XRaiseWindow (dpy, parent[0]);
3553 break; 3113 break;
3554 case 6: /* lower window */ 3114 case 6: /* lower window */
3555 XLowerWindow (xdisp, parent[0]); 3115 XLowerWindow (dpy, parent[0]);
3556 break; 3116 break;
3557 case 7: /* refresh window */ 3117 case 7: /* refresh window */
3558 scr_touch (true); 3118 scr_touch (true);
3559 break; 3119 break;
3560 case 8: /* set size (chars) */ 3120 case 8: /* set size (chars) */
… …
3571 3131
3572 /* 3132 /*
3573 * reports - some output format copied from XTerm 3133 * reports - some output format copied from XTerm
3574 */ 3134 */
3575 case 11: /* report window state */ 3135 case 11: /* report window state */
3576 XGetWindowAttributes (xdisp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3578 break; 3138 break;
3579 case 13: /* report window position */ 3139 case 13: /* report window position */
3580 XGetWindowAttributes (xdisp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3581 XTranslateCoordinates (xdisp, parent[0], wattr.root, 3141 XTranslateCoordinates (dpy, parent[0], wattr.root,
3582 -wattr.border_width, -wattr.border_width, 3142 -wattr.border_width, -wattr.border_width,
3583 &x, &y, &wdummy); 3143 &x, &y, &wdummy);
3584 tt_printf ("\033[3;%d;%dt", x, y); 3144 tt_printf ("\033[3;%d;%dt", x, y);
3585 break; 3145 break;
3586 case 14: /* report window size (pixels) */ 3146 case 14: /* report window size (pixels) */
3587 XGetWindowAttributes (xdisp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3589 break; 3149 break;
3590 case 18: /* report text area size (chars) */ 3150 case 18: /* report text area size (chars) */
3591 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3151 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3592 break; 3152 break;
… …
3594 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3154 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3595 break; 3155 break;
3596 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3597 { 3157 {
3598 char *s; 3158 char *s;
3599 XGetIconName (xdisp, parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3601 XFree (s); 3161 XFree (s);
3602 } 3162 }
3603 break; 3163 break;
3604 case 21: /* report window title */ 3164 case 21: /* report window title */
3605 { 3165 {
3606 char *s; 3166 char *s;
3607 XFetchName (xdisp, parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3609 XFree (s); 3169 XFree (s);
3610 } 3170 }
3611 break; 3171 break;
3612 } 3172 }
3613} 3173}
… …
3640 seen_esc = true; 3200 seen_esc = true;
3641 continue; 3201 continue;
3642 } 3202 }
3643 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3644 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3645 else if (ch < 0x20) 3207 else if (ch < 0x20)
3646 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3647 3209
3648 seen_esc = false; 3210 seen_esc = false;
3649 3211
3650 if (n >= STRING_MAX - 1) 3212 if (n >= STRING_MAX - 1)
3651 // stop at some sane length 3213 // stop at some sane length
3652 return NULL; 3214 return NULL;
3653 3215
3654 if (ch == C0_SYN)
3655 string[n++] = cmd_get8 ();
3656 else
3657 string[n++] = ch; 3216 string[n++] = ch;
3658 } 3217 }
3659 3218
3660 string[n++] = '\0'; 3219 string[n++] = '\0';
3661 3220
3662 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3738 int color; 3297 int color;
3739 char *buf, *name; 3298 char *buf, *name;
3740 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3741 int saveop = op; 3300 int saveop = op;
3742 3301
3743 dLocal (Display *, xdisp); 3302 dLocal (Display *, dpy);
3744 3303
3745 assert (str != NULL); 3304 assert (str != NULL);
3305
3306 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3307 return;
3308
3746 switch (op) 3309 switch (op)
3747 { 3310 {
3748 case XTerm_name: 3311 case XTerm_name:
3749 set_title (str); 3312 set_title (str);
3750 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
3764 unsigned long bytes_after; 3327 unsigned long bytes_after;
3765 unsigned char *value = 0; 3328 unsigned char *value = 0;
3766 const char *str = ""; 3329 const char *str = "";
3767 3330
3768 if (prop 3331 if (prop
3769 && XGetWindowProperty (xdisp, parent[0], 3332 && XGetWindowProperty (dpy, parent[0],
3770 prop, 0, 1<<16, 0, AnyPropertyType, 3333 prop, 0, 1<<16, 0, AnyPropertyType,
3771 &actual_type, &actual_format, 3334 &actual_type, &actual_format,
3772 &nitems, &bytes_after, &value) == Success 3335 &nitems, &bytes_after, &value) == Success
3773 && actual_type != None 3336 && actual_type != None
3774 && actual_format == 8) 3337 && actual_format == 8)
… …
3786 { 3349 {
3787 *eq = 0; 3350 *eq = 0;
3788 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3789 } 3352 }
3790 else 3353 else
3791 XDeleteProperty (xdisp, parent[0], 3354 XDeleteProperty (dpy, parent[0],
3792 display->atom (str)); 3355 display->atom (str));
3793 } 3356 }
3794 break; 3357 break;
3795 3358
3796 case XTerm_Color: 3359 case XTerm_Color:
… …
3842 break; 3405 break;
3843 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3844 process_color_seq (op, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3845 break; 3408 break;
3846#endif 3409#endif
3847#if TRANSPARENT && TINTING 3410#if ENABLE_TRANSPARENCY
3848 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3849 process_color_seq (op, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3413 {
3414 bool changed = false;
3415 if (ISSET_PIXCOLOR (Color_tint))
3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3417 else
3418 changed = bgPixmap.unset_tint ();
3419 if (changed)
3420 update_background ();
3421 }
3850 3422
3851 check_our_parents ();
3852
3853 if (am_transparent)
3854 want_full_refresh = want_refresh = 1;
3855
3856 break; 3423 break;
3857#endif 3424#endif
3858 3425
3426#if XPM_BACKGROUND
3859 case Rxvt_Pixmap: 3427 case Rxvt_Pixmap:
3860 { 3428 if (!strcmp (str, "?"))
3861 if (*str != ';')
3862 { 3429 {
3863#if XPM_BACKGROUND 3430 char str[256];
3864 scale_pixmap (""); /* reset to default scaling */ 3431
3865 set_bgPixmap (str); /* change pixmap */ 3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3866 scr_touch (true); 3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3867#endif 3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST);
3868 } 3436 }
3869 3437 else
3438 {
3870 int changed = 0; 3439 int changed = 0;
3871 3440
3872 while ((str = strchr (str, ';')) != NULL) 3441 if (*str != ';')
3873 { 3442 {
3443 /* reset to default scaling :*/
3444 bgPixmap.unset_geometry ();
3445 if (bgPixmap.set_file (str)) /* change pixmap */
3446 changed++;
3447 str = strchr (str, ';');
3448 if (str == NULL)
3449 bgPixmap.set_defaultGeometry ();
3450 }
3451 while (str)
3452 {
3874 str++; 3453 str++;
3875#if XPM_BACKGROUND 3454 if (bgPixmap.set_geometry (str))
3876 changed += scale_pixmap (str); 3455 changed++;
3877#endif 3456 str = strchr (str, ';');
3878 } 3457 }
3879
3880 if (changed) 3458 if (changed)
3881 { 3459 update_background ();
3882#ifdef XPM_BACKGROUND
3883 resize_pixmap ();
3884 scr_touch (true);
3885#endif
3886 } 3460 }
3887 }
3888 break; 3461 break;
3462#endif
3889 3463
3890 case Rxvt_restoreFG: 3464 case Rxvt_restoreFG:
3891 set_window_color (Color_fg, str); 3465 set_window_color (Color_fg, str);
3892 break; 3466 break;
3893 case Rxvt_restoreBG: 3467 case Rxvt_restoreBG:
… …
3918 case URxvt_italicFont: 3492 case URxvt_italicFont:
3919 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3920#endif 3494#endif
3921 if (query) 3495 if (query)
3922 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3923 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3924 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3925 resp); 3499 resp);
3926 else 3500 else
3927 { 3501 {
3928 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3942 break; 3516 break;
3943 3517
3944#if !ENABLE_MINIMAL 3518#if !ENABLE_MINIMAL
3945 case URxvt_locale: 3519 case URxvt_locale:
3946 if (query) 3520 if (query)
3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3948 else 3522 else
3949 { 3523 {
3950 set_locale (str); 3524 set_locale (str);
3951 pty->set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3952 init_xlocale (); 3526 init_xlocale ();
… …
3967 break; 3541 break;
3968#endif 3542#endif
3969 3543
3970#if ENABLE_PERL 3544#if ENABLE_PERL
3971 case URxvt_perl: 3545 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3973 ; // no responses yet 3547 ; // no responses yet
3974 break; 3548 break;
3975#endif 3549#endif
3976 } 3550 }
3977} 3551}
… …
4015{ 3589{
4016 unsigned int i, j; 3590 unsigned int i, j;
4017 int state; 3591 int state;
4018 3592
4019 static const struct 3593 static const struct
4020 { 3594 {
4021 const int argval; 3595 const int argval;
4022 const unsigned long bit; 3596 const unsigned long bit;
4023 }
4024
4025 argtopriv[] = { 3597 } argtopriv[] = {
4026 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
4027 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
4028 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
4029 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
4030 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
… …
4093 scr_touch (true); 3665 scr_touch (true);
4094 break; 3666 break;
4095#endif 3667#endif
4096 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
4097 case 1049: 3669 case 1049:
4098 if (OPTION (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
4099 if (mode == 0) 3671 if (mode == 0)
4100 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4101 else if (mode == 1) 3673 else if (mode == 1)
4102 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4103 break; 3675 break;
… …
4168 break; 3740 break;
4169 case 1011: /* scroll to bottom on key press */ 3741 case 1011: /* scroll to bottom on key press */
4170 set_option (Opt_scrollTtyKeypress, state); 3742 set_option (Opt_scrollTtyKeypress, state);
4171 break; 3743 break;
4172 case 1047: /* secondary screen w/ clearing last */ 3744 case 1047: /* secondary screen w/ clearing last */
4173 if (OPTION (Opt_secondaryScreen)) 3745 if (option (Opt_secondaryScreen))
4174 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
4175 scr_erase_screen (2); 3747 scr_erase_screen (2);
4176 scr_change_screen (state); 3748 scr_change_screen (state);
4177 break; 3749 break;
4178 case 1049: /* secondary screen w/ clearing first */ 3750 case 1049: /* secondary screen w/ clearing first */
4179 scr_change_screen (state); 3751 scr_change_screen (state);
4180 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4181 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4182 scr_erase_screen (2); 3754 scr_erase_screen (2);
4183 break; 3755 break;
4184 default: 3756 default:
4185 break; 3757 break;

Diff Legend

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