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.272 by root, Thu Jan 19 16:22:12 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>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
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 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */ 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}
923 1001
924#if defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925unsigned int 1003unsigned int
926rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
927{ 1005{
… …
956 1034
957void 1035void
958rxvt_term::flush () 1036rxvt_term::flush ()
959{ 1037{
960 flush_ev.stop (); 1038 flush_ev.stop ();
961
962#ifdef TRANSPARENT
963 if (want_full_refresh)
964 {
965 want_full_refresh = 0;
966 scr_clear ();
967 scr_touch (false);
968 }
969#endif
970 1039
971 if (want_refresh) 1040 if (want_refresh)
972 { 1041 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 { 1043 {
… …
1032void 1101void
1033rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
1034{ 1103{
1035 make_current (); 1104 make_current ();
1036 1105
1037 refresh_limit = 1;
1038 refresh_count = 0; 1106 refresh_count = 0;
1039 flush (); 1107 flush ();
1040} 1108}
1041 1109
1042#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1113{
1046 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1115 want_refresh = 1;
1048 1116
1049 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1118}
1051#endif 1119#endif
1052 1120
1053#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
1054void 1122void
… …
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1173 }
1106} 1174}
1107#endif 1175#endif
1108 1176
1109#if HAVE_SCHED_YIELD 1177#if LINUX_YIELD_HACK
1110static struct event_handler 1178static struct event_handler
1111{ 1179{
1112 check_watcher cw_yield; 1180 check_watcher yield_ev;
1113 1181
1114 void yield (check_watcher &w) 1182 void yield_cb (check_watcher &w)
1115 { 1183 {
1116 sched_yield (); 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
1117 w.stop (); 1192 w.stop ();
1118 } 1193 }
1119 1194
1120 event_handler () 1195 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1196 : yield_ev (this, &event_handler::yield_cb)
1122 { 1197 {
1123 } 1198 }
1124} event_handler; 1199} event_handler;
1125#endif 1200#endif
1126 1201
… …
1146 cmdbuf_endp += r; 1221 cmdbuf_endp += r;
1147 return true; 1222 return true;
1148 } 1223 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1225 {
1151#if HAVE_SCHED_YIELD 1226#if LINUX_YIELD_HACK
1152 if (display->is_local) 1227 if (display->is_local)
1153 event_handler.cw_yield.start (); 1228 event_handler.yield_ev.start ();
1154#endif 1229#endif
1155 } 1230 }
1156 else 1231 else
1157 { 1232 {
1158 pty_ev.stop (); 1233 pty_ev.stop ();
1159 1234
1160 if (!OPTION (Opt_hold)) 1235 if (!option (Opt_hold))
1161 destroy (); 1236 destroy ();
1162 } 1237 }
1163 1238
1164 return false; 1239 return false;
1165} 1240}
1166 1241
1167void 1242void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1180} 1255}
1181 1256
1182void 1257void
1183rxvt_term::pointer_unblank () 1258rxvt_term::pointer_unblank ()
1184{ 1259{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1261 recolour_cursor ();
1187 1262
1188#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1264 hidden_pointer = 0;
1190 1265
1191 if (OPTION (Opt_pointerBlank)) 1266 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
1193#endif 1268#endif
1194} 1269}
1195 1270
1196#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1197void 1272void
1198rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
1199{ 1274{
1200 if (!OPTION (Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
1201 return; 1276 return;
1202 1277
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1279 XFlush (dpy);
1205 1280
1206 hidden_pointer = 1; 1281 hidden_pointer = 1;
1207} 1282}
1208 1283
1209void 1284void
… …
1282 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
1283 (32 + x + 1), 1358 (32 + x + 1),
1284 (32 + y + 1)); 1359 (32 + y + 1));
1285} 1360}
1286 1361
1287#ifdef USING_W11LIB
1288void
1289rxvt_W11_process_x_event (XEvent *ev)
1290{
1291 rxvt_t *r = rxvt_get_r ();
1292
1293 x_cb (*ev);
1294}
1295#endif
1296
1297/*{{{ process an X event */ 1362/*{{{ process an X event */
1298void 1363void
1299rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
1300{ 1365{
1301 make_current (); 1366 make_current ();
1302 1367
1303 dDisp; 1368 dLocal (Display *, dpy);
1304 1369
1305 if (ev.xany.window == vt 1370 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1371 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1373 return;
… …
1313 unsigned int unused_mask; 1378 unsigned int unused_mask;
1314 1379
1315 switch (ev.type) 1380 switch (ev.type)
1316 { 1381 {
1317 case KeyPress: 1382 case KeyPress:
1318#if ISO_14755 1383 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1384 break;
1324 1385
1325 case KeyRelease: 1386 case KeyRelease:
1326 { 1387 key_release (ev.xkey);
1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1328 KeySym keysym;
1329
1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1331#endif
1332
1333#if ENABLE_FRILLS || ISO_14755
1334 // ISO 14755 support
1335 if (iso14755buf)
1336 if (iso14755buf & ISO_14755_52)
1337 {
1338# if ENABLE_OVERLAY
1339 scr_overlay_off ();
1340# endif
1341# if ISO_14755
1342 // iso14755 part 5.2 handling: release time
1343 // first: controls
1344 if ((ev.xkey.state & ControlMask)
1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1347 {
1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1349 commit_iso14755 ();
1350 goto skip_switch;
1351 }
1352
1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1354 if (i[0] == keysym)
1355 {
1356 iso14755buf = ISO_14755_51 | i[1];
1357 commit_iso14755 ();
1358 goto skip_switch;
1359 }
1360
1361 scr_bell ();
1362# endif
1363 iso14755buf = 0;
1364 break;
1365 }
1366 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371 if (iso14755buf & ISO_14755_51)
1372 commit_iso14755 ();
1373#if ISO_14755
1374 else if (iso14755buf & ISO_14755_STARTED)
1375 {
1376 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1377
1378 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1379 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1380 }
1381# endif
1382 else
1383 iso14755buf = 0;
1384 }
1385#endif
1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1392 if (!(ev.xkey.state & ControlMask))
1393 slip_wheel_ev.stop ();
1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1395 mouse_slip_wheel_speed = 0;
1396#endif
1397 break; 1388 break;
1398 }
1399 1389
1400 case ButtonPress: 1390 case ButtonPress:
1401 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1402 break; 1392 break;
1403 1393
… …
1405 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1406 break; 1396 break;
1407 1397
1408 case ClientMessage: 1398 case ClientMessage:
1409 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1401 {
1402 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1403 {
1404 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1405 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1406 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1407 {
1408 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1409 destroy ();
1410 }
1414#if ENABLE_EWMH 1411#if ENABLE_EWMH
1415 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])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1415 &ev);
1416#endif
1417 }
1418 }
1419#if ENABLE_XEMBED
1420 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1421 {
1422 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1423 focus_in ();
1424 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1425 focus_out ();
1426 }
1419#endif 1427#endif
1420 } 1428 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1429#endif
1430#ifdef OFFIX_DND
1431 /* OffiX Dnd (drag 'n' drop) protocol */
1432 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1433 && (ev.xclient.data.l[0] == DndFile
1434 || ev.xclient.data.l[0] == DndDir
1435 || ev.xclient.data.l[0] == DndLink))
1436 {
1437 /* Get Dnd data */
1438 Atom ActualType;
1439 int ActualFormat;
1440 unsigned char *data;
1441 unsigned long Size, RemainingBytes;
1442
1443 XGetWindowProperty (disp, display->root,
1444 xa[XA_DNDSELECTION],
1445 0L, 1000000L,
1446 False, AnyPropertyType,
1447 &ActualType, &ActualFormat,
1448 &Size, &RemainingBytes,
1449 &data);
1450 set_string_property (XA_CUT_BUFFER0, data);
1451 XFree (data);
1452 selection_paste (display->root, XA_CUT_BUFFER0, true);
1453 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1454 }
1455#endif /* OFFIX_DND */
1456 break;
1457
1458 case MappingNotify:
1459 XRefreshKeyboardMapping (&ev.xmapping);
1460 break; 1429 break;
1461 1430
1462 /* 1431 /*
1463 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1483 break; 1452 break;
1484 } 1453 }
1485 break; 1454 break;
1486 1455
1487 case FocusIn: 1456 case FocusIn:
1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1460 focus_in ();
1489 break; 1461 break;
1490 1462
1491 case FocusOut: 1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1467 focus_out ();
1493 break; 1468 break;
1494 1469
1495 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);*/
1496 if (ev.xconfigure.window == parent[0]) 1474 if (ev.xconfigure.window == parent[0])
1497 { 1475 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1477 ;
1500 1478
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1480 {
1503 seen_resize = 1; 1481 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1483 }
1506 1484 else
1485 {
1486#ifdef HAVE_BG_PIXMAP
1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1489#endif
1490 }
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1510 if (OPTION (Opt_transparent))
1511 check_our_parents ();
1512#endif
1513 } 1492 }
1514 break; 1493 break;
1515 1494
1516 case PropertyNotify: 1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1498 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1500
1521 break; 1501 break;
1522 1502
1523 case SelectionClear: 1503 case SelectionClear:
1524 selection_clear (); 1504 selection_clear ();
… …
1546#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1548#endif 1528#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1530 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1531
1558 case GraphicsExpose: 1532 case GraphicsExpose:
1559 case Expose: 1533 case Expose:
1560 if (ev.xany.window == vt) 1534 if (ev.xany.window == vt)
1561 { 1535 {
1562 do 1536 do
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1540
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1542
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1572 1546
1573 want_refresh = 1; 1547 want_refresh = 1;
1574 } 1548 }
1575 else 1549 else
1576 { 1550 {
1577 XEvent unused_event; 1551 XEvent unused_event;
1578 1552
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1554 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1556 ;
1583 1557
1584 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1585 { 1559 {
1586 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1587 scrollbar_show (0); 1561 scrollbar_show (0);
1588 } 1562 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1563 }
1595 break; 1564 break;
1596 1565
1597 case MotionNotify: 1566 case MotionNotify:
1598#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
… …
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1578 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1580 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1582 ;
1614 1583
1615 XQueryPointer (disp, vt, 1584 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1588 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1684#endif 1653#endif
1685 } 1654 }
1686 } 1655 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1657 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1691 ; 1660 ;
1692 1661
1693 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1666 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1668 scrollbar_size ());
1700 want_refresh = 1; 1669 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1670 scrollbar_show (1);
1703 } 1671 }
1704 break; 1672 break;
1705 } 1673 }
1706 1674
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1677 {
1712 if (hidden_cursor) 1678 if (hidden_cursor)
1713 { 1679 {
1714 hidden_cursor = 0; 1680 hidden_cursor = 0;
1715 want_refresh = 1; 1681 want_refresh = 1;
1716 } 1682 }
1717 1683
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1685 }
1720#endif 1686#endif
1721 1687
1722#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1690 {
1725 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1694 if (hidden_pointer)
… …
1740 if (!focus) 1706 if (!focus)
1741 { 1707 {
1742 focus = 1; 1708 focus = 1;
1743 want_refresh = 1; 1709 want_refresh = 1;
1744 1710
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1712
1747#if USE_XIM 1713#if USE_XIM
1748 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1749 { 1715 {
1750 IMSetStatusPosition (); 1716 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1752 } 1718 }
1753#endif 1719#endif
1754#if CURSOR_BLINK 1720#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1721 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1723#endif
1758#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1760 { 1726 {
1761 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1728 scr_recolour ();
1763 } 1729 }
1764#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
1765 } 1744 }
1766} 1745}
1767 1746
1768void 1747void
1769rxvt_term::focus_out () 1748rxvt_term::focus_out ()
… …
1777 1756
1778#if ENABLE_FRILLS || ISO_14755 1757#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1758 if (iso14755buf)
1780 { 1759 {
1781 iso14755buf = 0; 1760 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1761# if ISO_14755
1783 scr_overlay_off (); 1762 scr_overlay_off ();
1784# endif 1763# endif
1785 } 1764 }
1786#endif 1765#endif
1787#if USE_XIM 1766#if USE_XIM
1788 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1768 XUnsetICFocus (Input_Context);
1790#endif 1769#endif
1791#if CURSOR_BLINK 1770#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1771 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1772 cursor_blink_ev.stop ();
1794 hidden_cursor = 0; 1773 hidden_cursor = 0;
1795#endif 1774#endif
1796#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
… …
1801 } 1780 }
1802#endif 1781#endif
1803 } 1782 }
1804} 1783}
1805 1784
1806#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
1807void 1799void
1808rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1801{
1810 make_current (); 1802 make_current ();
1811 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
1812 switch (ev.type) 1809 switch (ev.type)
1813 { 1810 {
1814 case PropertyNotify: 1811 case PropertyNotify:
1815 /* 1812 /*
1816 * 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,
1817 * 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.
1818 */ 1815 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1818 {
1822 1819 bgPixmap.set_root_pixmap ();
1823 /* FALLTHROUGH */ 1820 update_background ();
1824 case ReparentNotify: 1821 }
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1822 break;
1828 } 1823 }
1824# endif
1829} 1825}
1830#endif 1826#endif
1831 1827
1832void 1828void
1833rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1838 /*
1843 * VT window processing of button press 1839 * VT window processing of button press
1844 */ 1840 */
1845 if (ev.window == vt) 1841 if (ev.window == vt)
1846 { 1842 {
1843 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1844 return;
1845
1847#if ISO_14755 1846#if ISO_14755
1848 // 5.4 1847 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1848 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1849 {
1851 iso14755_54 (ev.x, ev.y); 1850 iso14755_54 (ev.x, ev.y);
… …
1893 else 1892 else
1894 { 1893 {
1895 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1895 MEvent.clicks = 0;
1897 1896
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1897 switch (ev.button)
1900 { 1898 {
1901 case Button1: 1899 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1900 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1901 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1902#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1903 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1904#else
1907 selection.rect = false; 1905 selection.rect = false;
1908#endif 1906#endif
1909 1907
1910 /* allow shift+left click to extend selection */ 1908 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1909 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1910 {
1913 if (MEvent.button == Button1 && clickintime) 1911 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1912 selection_rotate (ev.x, ev.y);
1915 else 1913 else
1916 selection_extend (ev.x, ev.y, 1); 1914 selection_extend (ev.x, ev.y, 1);
1917 } 1915 }
1918 else 1916 else
1919 { 1917 {
1920 if (MEvent.button == Button1 && clickintime) 1918 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1919 MEvent.clicks++;
1922 else 1920 else
1923 MEvent.clicks = 1; 1921 MEvent.clicks = 1;
1924 1922
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1923 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1924 }
1927 1925
1928 MEvent.button = Button1; 1926 MEvent.button = Button1;
1929 break; 1927 break;
1930 1928
1931 case Button3: 1929 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1930 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1931 selection_rotate (ev.x, ev.y);
1934 else 1932 else
1935 selection_extend (ev.x, ev.y, 1); 1933 selection_extend (ev.x, ev.y, 1);
1936 1934
1937 MEvent.button = Button3; 1935 MEvent.button = Button3;
1938 break; 1936 break;
1939 } 1937 }
1940 } 1938 }
1941 1939
1942 MEvent.time = ev.time; 1940 MEvent.time = ev.time;
1943 return; 1941 return;
1944 } 1942 }
1945 1943
… …
2108 sel_scroll_ev.stop(); 2106 sel_scroll_ev.stop();
2109#endif 2107#endif
2110 2108
2111 if (ev.window == vt) 2109 if (ev.window == vt)
2112 { 2110 {
2111 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2112 return;
2113
2113#if ISO_14755 2114#if ISO_14755
2114 // 5.4 2115 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2116 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2117 return;
2117#endif 2118#endif
2119
2118 if (reportmode) 2120 if (reportmode)
2119 { 2121 {
2120 /* mouse report from vt window */ 2122 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2123 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2124 if (ev.button >= 4)
… …
2146 if (priv_modes & PrivMode_mouse_report 2148 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2149 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2150 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2151 selection_extend (ev.x, ev.y, 0);
2150 2152
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2153 switch (ev.button)
2155 { 2154 {
2156 case Button1: 2155 case Button1:
2157 case Button3: 2156 case Button3:
2158 selection_make (ev.time); 2157 selection_make (ev.time);
2159 break; 2158 break;
2160 2159
2161 case Button2: 2160 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width) 2161 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2162 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2164 selection_request (ev.time);
2165
2166 break; 2163 break;
2167 2164
2168#ifdef MOUSE_WHEEL 2165#ifdef MOUSE_WHEEL
2169 case Button4: 2166 case Button4:
2170 case Button5: 2167 case Button5:
… …
2174 2171
2175 v = ev.button == Button4 ? UP : DN; 2172 v = ev.button == Button4 ? UP : DN;
2176 2173
2177 if (ev.state & ShiftMask) 2174 if (ev.state & ShiftMask)
2178 i = 1; 2175 i = 1;
2179 else if (OPTION (Opt_mouseWheelScrollPage)) 2176 else if (option (Opt_mouseWheelScrollPage))
2180 i = nrow - 1; 2177 i = nrow - 1;
2181 else 2178 else
2182 i = 5; 2179 i = 5;
2183 2180
2184# ifdef MOUSE_SLIP_WHEELING 2181# ifdef MOUSE_SLIP_WHEELING
… …
2205 break; 2202 break;
2206#endif 2203#endif
2207 } 2204 }
2208 } 2205 }
2209} 2206}
2210
2211#ifdef TRANSPARENT
2212#if TINTING
2213/* taken from aterm-0.4.2 */
2214
2215typedef uint32_t RUINT32T;
2216
2217void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2218{
2219 int sh_r, sh_g, sh_b;
2220 RUINT32T mask_r, mask_g, mask_b;
2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2224 int i;
2225
2226 Visual *visual = display->visual;
2227
2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2229
2230 /* for convenience */
2231 mask_r = visual->red_mask;
2232 mask_g = visual->green_mask;
2233 mask_b = visual->blue_mask;
2234
2235 /* boring lookup table pre-initialization */
2236 switch (srcImage->bits_per_pixel) {
2237 case 15:
2238 if ((mask_r != 0x7c00) ||
2239 (mask_g != 0x03e0) ||
2240 (mask_b != 0x001f))
2241 return;
2242 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2243 lookup_r = lookup;
2244 lookup_g = lookup+32;
2245 lookup_b = lookup+32+32;
2246 sh_r = 10;
2247 sh_g = 5;
2248 sh_b = 0;
2249 break;
2250 case 16:
2251 if ((mask_r != 0xf800) ||
2252 (mask_g != 0x07e0) ||
2253 (mask_b != 0x001f))
2254 return;
2255 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2256 lookup_r = lookup;
2257 lookup_g = lookup+32;
2258 lookup_b = lookup+32+64;
2259 sh_r = 11;
2260 sh_g = 5;
2261 sh_b = 0;
2262 break;
2263 case 24:
2264 if ((mask_r != 0xff0000) ||
2265 (mask_g != 0x00ff00) ||
2266 (mask_b != 0x0000ff))
2267 return;
2268 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2269 lookup_r = lookup;
2270 lookup_g = lookup+256;
2271 lookup_b = lookup+256+256;
2272 sh_r = 16;
2273 sh_g = 8;
2274 sh_b = 0;
2275 break;
2276 case 32:
2277 if ((mask_r != 0xff0000) ||
2278 (mask_g != 0x00ff00) ||
2279 (mask_b != 0x0000ff))
2280 return;
2281 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2282 lookup_r = lookup;
2283 lookup_g = lookup+256;
2284 lookup_b = lookup+256+256;
2285 sh_r = 16;
2286 sh_g = 8;
2287 sh_b = 0;
2288 break;
2289 default:
2290 return; /* we do not support this color depth */
2291 }
2292
2293 /* prepare limits for color transformation (each channel is handled separately) */
2294 if (shade < 0) {
2295 shade = -shade;
2296 if (shade < 0) shade = 0;
2297 if (shade > 100) shade = 100;
2298
2299 lower_lim_r = 65535-rm;
2300 lower_lim_g = 65535-gm;
2301 lower_lim_b = 65535-bm;
2302
2303 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2304 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2305 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2306
2307 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2308 } else {
2309 if (shade < 0) shade = 0;
2310 if (shade > 100) shade = 100;
2311
2312 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2313
2314 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2315 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2316 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2317 }
2318
2319 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2320 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2321 {
2322 unsigned int tmp;
2323
2324 tmp = lower_lim_r;
2325 lower_lim_r = lower_lim_b;
2326 lower_lim_b = tmp;
2327
2328 tmp = upper_lim_r;
2329 upper_lim_r = upper_lim_b;
2330 upper_lim_b = tmp;
2331 }
2332
2333 /* fill our lookup tables */
2334 for (i = 0; i <= mask_r>>sh_r; i++)
2335 {
2336 RUINT32T tmp;
2337 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2338 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2339 lookup_r[i] = (tmp/65535)<<sh_r;
2340 }
2341 for (i = 0; i <= mask_g>>sh_g; i++)
2342 {
2343 RUINT32T tmp;
2344 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2345 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2346 lookup_g[i] = (tmp/65535)<<sh_g;
2347 }
2348 for (i = 0; i <= mask_b>>sh_b; i++)
2349 {
2350 RUINT32T tmp;
2351 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2352 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2353 lookup_b[i] = (tmp/65535)<<sh_b;
2354 }
2355
2356 /* apply table to input image (replacing colors by newly calculated ones) */
2357 switch (srcImage->bits_per_pixel)
2358 {
2359 case 15:
2360 {
2361 unsigned short *p1, *pf, *p, *pl;
2362 p1 = (unsigned short *) srcImage->data;
2363 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2364 while (p1 < pf)
2365 {
2366 p = p1;
2367 pl = p1 + srcImage->width;
2368 for (; p < pl; p++)
2369 {
2370 *p = lookup_r[(*p & 0x7c00)>>10] |
2371 lookup_g[(*p & 0x03e0)>> 5] |
2372 lookup_b[(*p & 0x001f)];
2373 }
2374 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2375 }
2376 break;
2377 }
2378 case 16:
2379 {
2380 unsigned short *p1, *pf, *p, *pl;
2381 p1 = (unsigned short *) srcImage->data;
2382 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2383 while (p1 < pf)
2384 {
2385 p = p1;
2386 pl = p1 + srcImage->width;
2387 for (; p < pl; p++)
2388 {
2389 *p = lookup_r[(*p & 0xf800)>>11] |
2390 lookup_g[(*p & 0x07e0)>> 5] |
2391 lookup_b[(*p & 0x001f)];
2392 }
2393 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2394 }
2395 break;
2396 }
2397 case 24:
2398 {
2399 unsigned char *p1, *pf, *p, *pl;
2400 p1 = (unsigned char *) srcImage->data;
2401 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2402 while (p1 < pf)
2403 {
2404 p = p1;
2405 pl = p1 + srcImage->width * 3;
2406 for (; p < pl; p += 3)
2407 {
2408 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2409 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2410 p[2] = lookup_r[(p[2] & 0x0000ff)];
2411 }
2412 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2413 }
2414 break;
2415 }
2416 case 32:
2417 {
2418 RUINT32T *p1, *pf, *p, *pl;
2419 p1 = (RUINT32T *) srcImage->data;
2420 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2421
2422 while (p1 < pf)
2423 {
2424 p = p1;
2425 pl = p1 + srcImage->width;
2426 for (; p < pl; p++)
2427 {
2428 *p = lookup_r[(*p & 0xff0000)>>16] |
2429 lookup_g[(*p & 0x00ff00)>> 8] |
2430 lookup_b[(*p & 0x0000ff)] |
2431 (*p & ~0xffffff);
2432 }
2433 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2434 }
2435 break;
2436 }
2437 }
2438
2439 free (lookup);
2440}
2441#endif
2442
2443/*
2444 * Check our parents are still who we think they are.
2445 * Do transparency updates if required
2446 */
2447int
2448rxvt_term::check_our_parents ()
2449{
2450 int i, pchanged, aformat, have_pixmap, rootdepth;
2451 unsigned long nitems, bytes_after;
2452 Atom atype;
2453 unsigned char *prop = NULL;
2454 Window root, oldp, *list;
2455 Pixmap rootpixmap = None;
2456 XWindowAttributes wattr, wrootattr;
2457 dDisp;
2458
2459 pchanged = 0;
2460
2461 if (!OPTION (Opt_transparent))
2462 return pchanged; /* Don't try any more */
2463
2464 XGetWindowAttributes (disp, display->root, &wrootattr);
2465 rootdepth = wrootattr.depth;
2466
2467 XGetWindowAttributes (disp, parent[0], &wattr);
2468
2469 if (rootdepth != wattr.depth)
2470 {
2471 if (am_transparent)
2472 {
2473 pchanged = 1;
2474 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2475 am_transparent = am_pixmap_trans = 0;
2476 }
2477
2478 return pchanged; /* Don't try any more */
2479 }
2480
2481 /* Get all X ops out of the queue so that our information is up-to-date. */
2482 XSync (disp, False);
2483
2484 /*
2485 * Make the frame window set by the window manager have
2486 * the root background. Some window managers put multiple nested frame
2487 * windows for each client, so we have to take care about that.
2488 */
2489 i = (xa[XA_XROOTPMAP_ID]
2490 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2491 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2492 &nitems, &bytes_after, &prop) == Success);
2493
2494 if (!i || prop == NULL)
2495 i = (xa[XA_ESETROOT_PMAP_ID]
2496 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2497 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2498 &nitems, &bytes_after, &prop) == Success);
2499
2500 if (!i || prop == NULL
2501#if TINTING
2502 || !rs[Rs_color + Color_tint]
2503#endif
2504 )
2505 have_pixmap = 0;
2506 else
2507 {
2508 have_pixmap = 1;
2509 rootpixmap = *(Pixmap *)prop;
2510 XFree (prop);
2511 }
2512
2513 if (have_pixmap)
2514 {
2515 /*
2516 * Copy display->root pixmap transparency
2517 */
2518 int sx, sy, nx, ny;
2519 unsigned int nw, nh;
2520 Window cr;
2521 XImage *image;
2522 GC gc;
2523 XGCValues gcvalue;
2524
2525 XTranslateCoordinates (disp, parent[0], display->root,
2526 0, 0, &sx, &sy, &cr);
2527 nw = (unsigned int)szHint.width;
2528 nh = (unsigned int)szHint.height;
2529 nx = ny = 0;
2530
2531 if (sx < 0)
2532 {
2533 nw += sx;
2534 nx = -sx;
2535 sx = 0;
2536 }
2537
2538 if (sy < 0)
2539 {
2540 nh += sy;
2541 ny = -sy;
2542 sy = 0;
2543 }
2544
2545 min_it (nw, (unsigned int) (wrootattr.width - sx));
2546 min_it (nh, (unsigned int) (wrootattr.height - sy));
2547
2548 XSync (disp, False);
2549 allowedxerror = -1;
2550 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2551
2552 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2553 /* XXX: may need a delay here? */
2554 allowedxerror = 0;
2555
2556 if (image == NULL)
2557 {
2558 if (am_transparent && am_pixmap_trans)
2559 {
2560 pchanged = 1;
2561 if (pixmap != None)
2562 {
2563 XFreePixmap (disp, pixmap);
2564 pixmap = None;
2565 }
2566 }
2567
2568 am_pixmap_trans = 0;
2569 }
2570 else
2571 {
2572 if (pixmap != None)
2573 XFreePixmap (disp, pixmap);
2574
2575#if TINTING
2576 if (ISSET_PIXCOLOR (Color_tint))
2577 {
2578 unsigned short rm, gm, bm;
2579 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2580
2581 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2582
2583 ShadeXImage (display, image, shade, rm, gm, bm);
2584 }
2585#endif
2586
2587 pixmap = XCreatePixmap (disp, vt,
2588 szHint.width, szHint.height, image->depth);
2589 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2590 XPutImage (disp, pixmap, gc, image, 0, 0,
2591 nx, ny, image->width, image->height);
2592 XFreeGC (disp, gc);
2593 XDestroyImage (image);
2594 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2595 XClearWindow (disp, parent[0]);
2596
2597 if (!am_transparent || !am_pixmap_trans)
2598 pchanged = 1;
2599
2600 am_transparent = am_pixmap_trans = 1;
2601 }
2602 }
2603
2604 if (am_pixmap_trans)
2605 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2606 else
2607 {
2608 unsigned int n;
2609 /*
2610 * InheritPixmap transparency
2611 */
2612 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2613 {
2614 oldp = parent[i];
2615 XQueryTree (disp, parent[i - 1], &root,
2616 &parent[i], &list, &n);
2617 XFree (list);
2618
2619 if (parent[i] == display->root)
2620 {
2621 if (oldp != None)
2622 pchanged = 1;
2623
2624 break;
2625 }
2626
2627 if (oldp != parent[i])
2628 pchanged = 1;
2629 }
2630
2631 n = 0;
2632
2633 if (pchanged)
2634 {
2635 for (; n < (unsigned int)i; n++)
2636 {
2637 XGetWindowAttributes (disp, parent[n], &wattr);
2638 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2639 {
2640 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2641 break;
2642 }
2643 }
2644 }
2645
2646 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2647 {
2648 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2649 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2650 am_transparent = 0;
2651 /* XXX: also turn off Opt_transparent? */
2652 }
2653 else
2654 {
2655#if WAIT_FOR_WM
2656 /* wait (an arbitrary period) for the WM to do its thing
2657 * needed for fvwm2.2.2 (and before?) */
2658 sleep (1);
2659#endif
2660 for (n = 0; n < (unsigned int)i; n++)
2661 {
2662 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2663 XClearWindow (disp, parent[n]);
2664 }
2665
2666 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2667 am_transparent = 1;
2668 }
2669
2670 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2671 parent[i] = None;
2672 }
2673
2674 if (scrollBar.win)
2675 {
2676 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2677 scrollBar.setIdle ();
2678 scrollbar_show (0);
2679 }
2680
2681 if (am_transparent)
2682 {
2683 want_refresh = want_full_refresh = 1;
2684 if (am_pixmap_trans)
2685 flush ();
2686 }
2687
2688 return pchanged;
2689}
2690#endif
2691 2207
2692/*}}} */ 2208/*}}} */
2693 2209
2694bool 2210bool
2695rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
… …
2744 if (ch == C0_LF) 2260 if (ch == C0_LF)
2745 nlines++; 2261 nlines++;
2746 2262
2747 refresh_count++; 2263 refresh_count++;
2748 2264
2749 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2750 || (refresh_count >= refresh_limit * (nrow - 1)))
2751 { 2266 {
2752 refreshnow = true;
2753 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2270 {
2271 refreshnow = true;
2754 ch = NOCHAR; 2272 ch = NOCHAR;
2755 break; 2273 break;
2274 }
2756 } 2275 }
2757 2276
2758 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2759 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2760 { 2279 {
… …
2788 && 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))))
2789 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2790 2309
2791 /* 2310 /*
2792 * 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
2793 * 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.
2794 * the number of pages between refreshes is refresh_limit, which 2313 * if skipScroll is enabled.
2795 * is incremented here because we must be doing flat-out scrolling.
2796 */ 2314 */
2797 if (refreshnow) 2315 if (refreshnow)
2798 { 2316 {
2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2800 refresh_limit++;
2801 else
2802 {
2803 flag = true; 2317 flag = true;
2804 scr_refresh (); 2318 scr_refresh ();
2805 want_refresh = 1; 2319 want_refresh = 1;
2806 }
2807 } 2320 }
2808 2321
2809 } 2322 }
2810 else 2323 else
2811 { 2324 {
… …
2827 return flag; 2340 return flag;
2828} 2341}
2829 2342
2830// read the next character 2343// read the next character
2831wchar_t 2344wchar_t
2832rxvt_term::next_char () 2345rxvt_term::next_char () NOTHROW
2833{ 2346{
2834 while (cmdbuf_ptr < cmdbuf_endp) 2347 while (cmdbuf_ptr < cmdbuf_endp)
2835 { 2348 {
2836 // assume 7-bit to be ascii ALWAYS 2349 // assume 7-bit to be ascii ALWAYS
2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2858 return NOCHAR; 2371 return NOCHAR;
2859} 2372}
2860 2373
2861// read the next octet 2374// read the next octet
2862uint32_t 2375uint32_t
2863rxvt_term::next_octet () 2376rxvt_term::next_octet () NOTHROW
2864{ 2377{
2865 return cmdbuf_ptr < cmdbuf_endp 2378 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++ 2379 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR; 2380 : NOCHAR;
2868} 2381}
2382
2383static class out_of_input out_of_input;
2869 2384
2870/* rxvt_cmd_getc () - Return next input character */ 2385/* rxvt_cmd_getc () - Return next input character */
2871/* 2386/*
2872 * Return the next input character after first passing any keyboard input 2387 * Return the next input character after first passing any keyboard input
2873 * to the command. 2388 * to the command.
2874 */ 2389 */
2875wchar_t 2390wchar_t
2876rxvt_term::cmd_getc () 2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2877{ 2392{
2878 wchar_t c = next_char (); 2393 wchar_t c = next_char ();
2879 2394
2880 if (c == NOCHAR) 2395 if (c == NOCHAR)
2881 throw out_of_input; 2396 throw out_of_input;
2882 2397
2883 return c; 2398 return c;
2884} 2399}
2885 2400
2886uint32_t 2401uint32_t
2887rxvt_term::cmd_get8 () 2402rxvt_term::cmd_get8 () THROW ((class out_of_input))
2888{ 2403{
2889 uint32_t c = next_octet (); 2404 uint32_t c = next_octet ();
2890 2405
2891 if (c == NOCHAR) 2406 if (c == NOCHAR)
2892 throw out_of_input; 2407 throw out_of_input;
… …
2958 { 2473 {
2959 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2960 break; /* done = 1 */ 2475 break; /* done = 1 */
2961 } 2476 }
2962 } 2477 }
2963 2478
2964 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2965 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2966 { 2481 {
2967 done = 1; 2482 done = 1;
2968 break; 2483 break;
… …
3030 process_dcs_seq (); 2545 process_dcs_seq ();
3031 break; 2546 break;
3032 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
3033 process_csi_seq (); 2548 process_csi_seq ();
3034 break; 2549 break;
3035 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3036 process_osc_seq (); 2551 process_osc_seq ();
3037 break; 2552 break;
3038#endif 2553#endif
3039 } 2554 }
3040} 2555}
… …
3130 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
3131 break; 2646 break;
3132 case '+': 2647 case '+':
3133 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
3134 break; 2649 break;
3135#if ENABLE_FRILLS 2650#if !ENABLE_MINIMAL
3136 case '6': 2651 case '6':
3137 scr_backindex (); 2652 scr_backindex ();
3138 break; 2653 break;
3139#endif 2654#endif
3140 case '7': 2655 case '7':
3141 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
3142 break; 2657 break;
3143 case '8': 2658 case '8':
3144 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
3145 break; 2660 break;
3146#if ENABLE_FRILLS 2661#if !ENABLE_MINIMAL
3147 case '9': 2662 case '9':
3148 scr_forwardindex (); 2663 scr_forwardindex ();
3149 break; 2664 break;
3150#endif 2665#endif
3151 case '=': 2666 case '=':
… …
3266rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3267{ 2782{
3268 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3269 unsigned int nargs, p; 2784 unsigned int nargs, p;
3270 int n, ndef; 2785 int n, ndef;
3271 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3272 2787
3273 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3274 arg[--nargs] = 0;
3275 2789
3276 priv = 0; 2790 priv = 0;
3277 ch = cmd_getc (); 2791 ch = cmd_getc ();
3278 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
3279 { /* '<' '=' '>' '?' */ 2793 { /* '<' '=' '>' '?' */
… …
3313 ndef = get_byte_array_bit (csi_defaults, i); 2827 ndef = get_byte_array_bit (csi_defaults, i);
3314 for (p = 0; p < nargs; p++) 2828 for (p = 0; p < nargs; p++)
3315 if (arg[p] == -1) 2829 if (arg[p] == -1)
3316 arg[p] = ndef; 2830 arg[p] = ndef;
3317 2831
3318#ifdef DEBUG_CMD
3319 fprintf (stderr, "CSI ");
3320 for (p = 0; p < nargs; p++)
3321 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3322 fprintf (stderr, "%c\n", ch);
3323#endif
3324
3325 /* 2832 /*
3326 * private mode handling 2833 * private mode handling
3327 */ 2834 */
3328 if (priv) 2835 if (priv)
3329 { 2836 {
3330 switch (priv) 2837 switch (priv)
3331 { 2838 {
3332 case '>': 2839 case '>':
3333 if (ch == CSI_DA) /* secondary device attributes */ 2840 if (ch == CSI_DA) /* secondary device attributes */
3334 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2841 {
2842 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2843 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2844 //
2845 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2846 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2847 // that we do not support xterm mouse reporting (should be 95 when we do).
2848 //
2849 tt_printf ("\033[>%d;94;0c", 'U');
2850 }
3335 break; 2851 break;
3336 case '?': 2852 case '?':
3337 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2853 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3338 process_terminal_mode (ch, priv, nargs, arg); 2854 process_terminal_mode (ch, priv, nargs, arg);
3339 break; 2855 break;
… …
3465 break; 2981 break;
3466 case 6: /* CPR requested */ 2982 case 6: /* CPR requested */
3467 scr_report_position (); 2983 scr_report_position ();
3468 break; 2984 break;
3469 case 7: /* unofficial extension */ 2985 case 7: /* unofficial extension */
3470 if (OPTION (Opt_insecure)) 2986 if (option (Opt_insecure))
3471 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2987 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3472 break; 2988 break;
3473 case 8: /* unofficial extension */ 2989 case 8: /* unofficial extension */
3474 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2990 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3475 break; 2991 break;
… …
3542 break; 3058 break;
3543 case CSI_75: 3059 case CSI_75:
3544 scr_cursor (RESTORE); 3060 scr_cursor (RESTORE);
3545 break; 3061 break;
3546 3062
3547#if ENABLE_FRILLS 3063#if !ENABLE_MINIMAL
3548 case CSI_74: 3064 case CSI_74:
3549 process_window_ops (arg, nargs); 3065 process_window_ops (arg, nargs);
3550 break; 3066 break;
3551#endif 3067#endif
3552 3068
… …
3559 break; 3075 break;
3560 } 3076 }
3561} 3077}
3562/*}}} */ 3078/*}}} */
3563 3079
3564#if ENABLE_FRILLS 3080#if !ENABLE_MINIMAL
3565/* ARGSUSED */ 3081/* ARGSUSED */
3566void 3082void
3567rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3083rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3568{ 3084{
3569 int x, y; 3085 int x, y;
3570 XWindowAttributes wattr; 3086 XWindowAttributes wattr;
3571 Window wdummy; 3087 Window wdummy;
3572 dDisp; 3088
3089 dLocal (Display *, dpy);
3573 3090
3574 if (nargs == 0) 3091 if (nargs == 0)
3575 return; 3092 return;
3576 3093
3577 switch (args[0]) 3094 switch (args[0])
3578 { 3095 {
3579 /* 3096 /*
3580 * commands 3097 * commands
3581 */ 3098 */
3582 case 1: /* deiconify window */ 3099 case 1: /* deiconify window */
3583 XMapWindow (disp, parent[0]); 3100 XMapWindow (dpy, parent[0]);
3584 break; 3101 break;
3585 case 2: /* iconify window */ 3102 case 2: /* iconify window */
3586 XIconifyWindow (disp, parent[0], display->screen); 3103 XIconifyWindow (dpy, parent[0], display->screen);
3587 break; 3104 break;
3588 case 3: /* set position (pixels) */ 3105 case 3: /* set position (pixels) */
3589 XMoveWindow (disp, parent[0], args[1], args[2]); 3106 XMoveWindow (dpy, parent[0], args[1], args[2]);
3590 break; 3107 break;
3591 case 4: /* set size (pixels) */ 3108 case 4: /* set size (pixels) */
3592 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3593 break; 3110 break;
3594 case 5: /* raise window */ 3111 case 5: /* raise window */
3595 XRaiseWindow (disp, parent[0]); 3112 XRaiseWindow (dpy, parent[0]);
3596 break; 3113 break;
3597 case 6: /* lower window */ 3114 case 6: /* lower window */
3598 XLowerWindow (disp, parent[0]); 3115 XLowerWindow (dpy, parent[0]);
3599 break; 3116 break;
3600 case 7: /* refresh window */ 3117 case 7: /* refresh window */
3601 scr_touch (true); 3118 scr_touch (true);
3602 break; 3119 break;
3603 case 8: /* set size (chars) */ 3120 case 8: /* set size (chars) */
… …
3610 if (args[0] >= 24) /* set height (chars) */ 3127 if (args[0] >= 24) /* set height (chars) */
3611 set_widthheight ((unsigned int)width, 3128 set_widthheight ((unsigned int)width,
3612 (unsigned int) (args[1] * fheight)); 3129 (unsigned int) (args[1] * fheight));
3613 break; 3130 break;
3614 3131
3615
3616 /* 3132 /*
3617 * reports - some output format copied from XTerm 3133 * reports - some output format copied from XTerm
3618 */ 3134 */
3619 case 11: /* report window state */ 3135 case 11: /* report window state */
3620 XGetWindowAttributes (disp, parent[0], &wattr); 3136 XGetWindowAttributes (dpy, parent[0], &wattr);
3621 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3622 break; 3138 break;
3623 case 13: /* report window position */ 3139 case 13: /* report window position */
3624 XGetWindowAttributes (disp, parent[0], &wattr); 3140 XGetWindowAttributes (dpy, parent[0], &wattr);
3625 XTranslateCoordinates (disp, parent[0], wattr.root, 3141 XTranslateCoordinates (dpy, parent[0], wattr.root,
3626 -wattr.border_width, -wattr.border_width, 3142 -wattr.border_width, -wattr.border_width,
3627 &x, &y, &wdummy); 3143 &x, &y, &wdummy);
3628 tt_printf ("\033[3;%d;%dt", x, y); 3144 tt_printf ("\033[3;%d;%dt", x, y);
3629 break; 3145 break;
3630 case 14: /* report window size (pixels) */ 3146 case 14: /* report window size (pixels) */
3631 XGetWindowAttributes (disp, parent[0], &wattr); 3147 XGetWindowAttributes (dpy, parent[0], &wattr);
3632 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3633 break; 3149 break;
3634 case 18: /* report text area size (chars) */ 3150 case 18: /* report text area size (chars) */
3635 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3151 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3636 break; 3152 break;
… …
3638 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3154 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3639 break; 3155 break;
3640 case 20: /* report icon label */ 3156 case 20: /* report icon label */
3641 { 3157 {
3642 char *s; 3158 char *s;
3643 XGetIconName (disp, parent[0], &s); 3159 XGetIconName (dpy, parent[0], &s);
3644 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 */
3645 XFree (s); 3161 XFree (s);
3646 } 3162 }
3647 break; 3163 break;
3648 case 21: /* report window title */ 3164 case 21: /* report window title */
3649 { 3165 {
3650 char *s; 3166 char *s;
3651 XFetchName (disp, parent[0], &s); 3167 XFetchName (dpy, parent[0], &s);
3652 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 */
3653 XFree (s); 3169 XFree (s);
3654 } 3170 }
3655 break; 3171 break;
3656 } 3172 }
3657} 3173}
… …
3684 seen_esc = true; 3200 seen_esc = true;
3685 continue; 3201 continue;
3686 } 3202 }
3687 else if (ch == C0_BEL || ch == CHAR_ST) 3203 else if (ch == C0_BEL || ch == CHAR_ST)
3688 break; 3204 break;
3205 else if (ch == C0_SYN)
3206 ch = cmd_get8 ();
3689 else if (ch < 0x20) 3207 else if (ch < 0x20)
3690 return NULL; /* other control character - exit */ 3208 return NULL; /* other control character - exit */
3691 3209
3692 seen_esc = false; 3210 seen_esc = false;
3693 3211
3694 if (n >= STRING_MAX - 1) 3212 if (n >= STRING_MAX - 1)
3695 // stop at some sane length 3213 // stop at some sane length
3696 return NULL; 3214 return NULL;
3697 3215
3698 if (ch == C0_SYN)
3699 string[n++] = cmd_get8 ();
3700 else
3701 string[n++] = ch; 3216 string[n++] = ch;
3702 } 3217 }
3703 3218
3704 string[n++] = '\0'; 3219 string[n++] = '\0';
3705 3220
3706 ends_how = (ch == 0x5c ? C0_ESC : ch); 3221 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3757void 3272void
3758rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3273rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3759{ 3274{
3760 if (str[0] == '?' && !str[1]) 3275 if (str[0] == '?' && !str[1])
3761 { 3276 {
3762 unsigned short r, g, b; 3277 rgba c;
3763 pix_colors_focused[color].get (display, r, g, b); 3278 pix_colors_focused[color].get (c);
3279
3280#if XFT
3281 if (c.a != rgba::MAX_CC)
3282 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3283 else
3284#endif
3764 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3285 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3765 } 3286 }
3766 else 3287 else
3767 set_window_color (color, str); 3288 set_window_color (color, str);
3768} 3289}
3769 3290
… …
3775{ 3296{
3776 int color; 3297 int color;
3777 char *buf, *name; 3298 char *buf, *name;
3778 bool query = str[0] == '?' && !str[1]; 3299 bool query = str[0] == '?' && !str[1];
3779 int saveop = op; 3300 int saveop = op;
3780 dDisp; 3301
3302 dLocal (Display *, dpy);
3781 3303
3782 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
3783 switch (op) 3309 switch (op)
3784 { 3310 {
3785 case XTerm_name: 3311 case XTerm_name:
3786 set_title (str); 3312 set_title (str);
3787 /* FALLTHROUGH */ 3313 /* FALLTHROUGH */
… …
3801 unsigned long bytes_after; 3327 unsigned long bytes_after;
3802 unsigned char *value = 0; 3328 unsigned char *value = 0;
3803 const char *str = ""; 3329 const char *str = "";
3804 3330
3805 if (prop 3331 if (prop
3806 && XGetWindowProperty (disp, parent[0], 3332 && XGetWindowProperty (dpy, parent[0],
3807 prop, 0, 1<<16, 0, AnyPropertyType, 3333 prop, 0, 1<<16, 0, AnyPropertyType,
3808 &actual_type, &actual_format, 3334 &actual_type, &actual_format,
3809 &nitems, &bytes_after, &value) == Success 3335 &nitems, &bytes_after, &value) == Success
3810 && actual_type != None 3336 && actual_type != None
3811 && actual_format == 8) 3337 && actual_format == 8)
3812 str = (const char *)(value); 3338 str = (const char *)(value);
3813 3339
3814 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3340 tt_printf ("\033]%d;%s%c", op, str, resp);
3815 3341
3816 XFree (value); 3342 XFree (value);
3817 } 3343 }
3818 else 3344 else
3819 { 3345 {
… …
3823 { 3349 {
3824 *eq = 0; 3350 *eq = 0;
3825 set_utf8_property (display->atom (str), eq + 1); 3351 set_utf8_property (display->atom (str), eq + 1);
3826 } 3352 }
3827 else 3353 else
3828 XDeleteProperty (disp, parent[0], 3354 XDeleteProperty (dpy, parent[0],
3829 display->atom (str)); 3355 display->atom (str));
3830 } 3356 }
3831 break; 3357 break;
3832 3358
3833 case XTerm_Color: 3359 case XTerm_Color:
… …
3843 break; 3369 break;
3844 3370
3845 if ((buf = strchr (name, ';')) != NULL) 3371 if ((buf = strchr (name, ';')) != NULL)
3846 *buf++ = '\0'; 3372 *buf++ = '\0';
3847 3373
3848 if (name[0] == '?' && !name[1]) 3374 process_color_seq (op, color, name, resp);
3849 {
3850 unsigned short r, g, b;
3851 pix_colors_focused[color].get (display, r, g, b);
3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3853 }
3854 else
3855 set_window_color (color, name);
3856 } 3375 }
3857 break; 3376 break;
3858 case XTerm_Color00: 3377 case XTerm_Color00:
3859 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3378 process_color_seq (op, Color_fg, str, resp);
3860 break; 3379 break;
3861 case XTerm_Color01: 3380 case XTerm_Color01:
3862 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3381 process_color_seq (op, Color_bg, str, resp);
3863 break; 3382 break;
3864#ifndef NO_CURSORCOLOR 3383#ifndef NO_CURSORCOLOR
3865 case XTerm_Color_cursor: 3384 case XTerm_Color_cursor:
3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3385 process_color_seq (op, Color_cursor, str, resp);
3867 break; 3386 break;
3868#endif 3387#endif
3869 case XTerm_Color_pointer_fg: 3388 case XTerm_Color_pointer_fg:
3870 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3389 process_color_seq (op, Color_pointer_fg, str, resp);
3871 break; 3390 break;
3872 case XTerm_Color_pointer_bg: 3391 case XTerm_Color_pointer_bg:
3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3392 process_color_seq (op, Color_pointer_bg, str, resp);
3874 break; 3393 break;
3875#ifndef NO_BOLD_UNDERLINE_REVERSE 3394#ifndef NO_BOLD_UNDERLINE_REVERSE
3876 case XTerm_Color_RV: 3395 case XTerm_Color_RV:
3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3396 process_color_seq (op, Color_RV, str, resp);
3878 break; 3397 break;
3879 case Rxvt_Color_BD: 3398 case Rxvt_Color_BD:
3880 case URxvt_Color_BD: 3399 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp); 3400 process_color_seq (op, Color_BD, str, resp);
3882 break; 3401 break;
3883 case Rxvt_Color_UL: 3402 case Rxvt_Color_UL:
3884 case URxvt_Color_UL: 3403 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp); 3404 process_color_seq (op, Color_UL, str, resp);
3886 break; 3405 break;
3887 case URxvt_Color_IT: 3406 case URxvt_Color_IT:
3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3407 process_color_seq (op, Color_IT, str, resp);
3889 break; 3408 break;
3890#endif 3409#endif
3891#if TRANSPARENT && TINTING 3410#if ENABLE_TRANSPARENCY
3892 case URxvt_Color_tint: 3411 case URxvt_Color_tint:
3893 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3412 process_color_seq (op, Color_tint, str, resp);
3894 check_our_parents (); 3413 {
3895 if (am_transparent) 3414 bool changed = false;
3896 want_full_refresh = want_refresh = 1; 3415 if (ISSET_PIXCOLOR (Color_tint))
3897 break; 3416 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3898#endif 3417 else
3418 changed = bgPixmap.unset_tint ();
3419 if (changed)
3420 update_background ();
3421 }
3899 3422
3423 break;
3424#endif
3425
3426#if XPM_BACKGROUND
3900 case Rxvt_Pixmap: 3427 case Rxvt_Pixmap:
3901 { 3428 if (!strcmp (str, "?"))
3902 if (*str != ';')
3903 { 3429 {
3904#if XPM_BACKGROUND 3430 char str[256];
3905 scale_pixmap (""); /* reset to default scaling */ 3431
3906 set_bgPixmap (str); /* change pixmap */ 3432 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3907 scr_touch (true); 3433 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3908#endif 3434 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3435 process_xterm_seq (XTerm_title, str, CHAR_ST);
3909 } 3436 }
3910 3437 else
3438 {
3911 int changed = 0; 3439 int changed = 0;
3912 3440
3913 while ((str = strchr (str, ';')) != NULL) 3441 if (*str != ';')
3914 { 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 {
3915 str++; 3453 str++;
3916#if XPM_BACKGROUND 3454 if (bgPixmap.set_geometry (str))
3917 changed += scale_pixmap (str); 3455 changed++;
3918#endif 3456 str = strchr (str, ';');
3919 } 3457 }
3920
3921 if (changed) 3458 if (changed)
3922 { 3459 update_background ();
3923#ifdef XPM_BACKGROUND
3924 resize_pixmap ();
3925 scr_touch (true);
3926#endif
3927 } 3460 }
3928 }
3929 break; 3461 break;
3462#endif
3930 3463
3931 case Rxvt_restoreFG: 3464 case Rxvt_restoreFG:
3932 set_window_color (Color_fg, str); 3465 set_window_color (Color_fg, str);
3933 break; 3466 break;
3934 case Rxvt_restoreBG: 3467 case Rxvt_restoreBG:
… …
3959 case URxvt_italicFont: 3492 case URxvt_italicFont:
3960 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3961#endif 3494#endif
3962 if (query) 3495 if (query)
3963 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3964 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3965 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3966 resp); 3499 resp);
3967 else 3500 else
3968 { 3501 {
3969 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3972 allocated.push_back ((void *)res); 3505 allocated.push_back ((void *)res);
3973 set_fonts (); 3506 set_fonts ();
3974 } 3507 }
3975 break; 3508 break;
3976 3509
3977#if ENABLE_FRILLS 3510 case URxvt_version:
3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
3978 case URxvt_locale: 3519 case URxvt_locale:
3979 if (query) 3520 if (query)
3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3981 else 3522 else
3982 { 3523 {
3983 set_locale (str); 3524 set_locale (str);
3984 pty->set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
3985 init_xlocale (); 3526 init_xlocale ();
… …
4000 break; 3541 break;
4001#endif 3542#endif
4002 3543
4003#if ENABLE_PERL 3544#if ENABLE_PERL
4004 case URxvt_perl: 3545 case URxvt_perl:
4005 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)))
4006 ; // no responses yet 3547 ; // no responses yet
4007 break; 3548 break;
4008#endif 3549#endif
4009 } 3550 }
4010} 3551}
… …
4042 return state; 3583 return state;
4043} 3584}
4044 3585
4045/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
4046void 3587void
4047rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4048{ 3589{
4049 unsigned int i, j; 3590 unsigned int i, j;
4050 int state; 3591 int state;
4051 3592
4052 static const struct 3593 static const struct
4053 { 3594 {
4054 const int argval; 3595 const int argval;
4055 const unsigned long bit; 3596 const unsigned long bit;
4056 }
4057
4058 argtopriv[] = { 3597 } argtopriv[] = {
4059 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
4060 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
4061 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
4062 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
4063 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
… …
4126 scr_touch (true); 3665 scr_touch (true);
4127 break; 3666 break;
4128#endif 3667#endif
4129 case 1048: /* alternative cursor save */ 3668 case 1048: /* alternative cursor save */
4130 case 1049: 3669 case 1049:
4131 if (OPTION (Opt_secondaryScreen)) 3670 if (option (Opt_secondaryScreen))
4132 if (mode == 0) 3671 if (mode == 0)
4133 scr_cursor (RESTORE); 3672 scr_cursor (RESTORE);
4134 else if (mode == 1) 3673 else if (mode == 1)
4135 scr_cursor (SAVE); 3674 scr_cursor (SAVE);
4136 break; 3675 break;
… …
4201 break; 3740 break;
4202 case 1011: /* scroll to bottom on key press */ 3741 case 1011: /* scroll to bottom on key press */
4203 set_option (Opt_scrollTtyKeypress, state); 3742 set_option (Opt_scrollTtyKeypress, state);
4204 break; 3743 break;
4205 case 1047: /* secondary screen w/ clearing last */ 3744 case 1047: /* secondary screen w/ clearing last */
4206 if (OPTION (Opt_secondaryScreen)) 3745 if (option (Opt_secondaryScreen))
4207 if (current_screen != PRIMARY) 3746 if (current_screen != PRIMARY)
4208 scr_erase_screen (2); 3747 scr_erase_screen (2);
4209 scr_change_screen (state); 3748 scr_change_screen (state);
4210 break; 3749 break;
4211 case 1049: /* secondary screen w/ clearing first */ 3750 case 1049: /* secondary screen w/ clearing first */
4212 scr_change_screen (state); 3751 scr_change_screen (state);
4213 if (OPTION (Opt_secondaryScreen)) 3752 if (option (Opt_secondaryScreen))
4214 if (current_screen != PRIMARY) 3753 if (current_screen != PRIMARY)
4215 scr_erase_screen (2); 3754 scr_erase_screen (2);
4216 break; 3755 break;
4217 default: 3756 default:
4218 break; 3757 break;
… …
4346 scr_color (Color_bg, Color_bg); 3885 scr_color (Color_bg, Color_bg);
4347 break; 3886 break;
4348 3887
4349 //case 50: // not variable spacing 3888 //case 50: // not variable spacing
4350 3889
4351#if ENABLE_FRILLS 3890#if !ENABLE_MINIMAL
4352 case 90: 3891 case 90:
4353 case 91: /* set bright fg color */ 3892 case 91: /* set bright fg color */
4354 case 92: 3893 case 92:
4355 case 93: 3894 case 93:
4356 case 94: 3895 case 94:

Diff Legend

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