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.271 by root, Wed Jan 18 17:49:46 2006 UTC vs.
Revision 1.358 by sasha, Tue Sep 18 22:27: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 *
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
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);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
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 1039
962#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
963 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
964 { 1042 {
965 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
966 scr_clear ();
967 scr_touch (false); 1044 scr_touch (false);
968 } 1045 }
969#endif 1046#endif
970 1047
971 if (want_refresh) 1048 if (want_refresh)
… …
1032void 1109void
1033rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (time_watcher &w)
1034{ 1111{
1035 make_current (); 1112 make_current ();
1036 1113
1037 refresh_limit = 1;
1038 refresh_count = 0; 1114 refresh_count = 0;
1039 flush (); 1115 flush ();
1040} 1116}
1041 1117
1042#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
… …
1044rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (time_watcher &w)
1045{ 1121{
1046 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1047 want_refresh = 1; 1123 want_refresh = 1;
1048 1124
1049 w.start (w.at + BLINK_INTERVAL); 1125 w.start (w.at + CURSOR_BLINK_INTERVAL);
1050} 1126}
1051#endif 1127#endif
1052 1128
1053#ifdef TEXT_BLINK 1129#ifdef TEXT_BLINK
1054void 1130void
… …
1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1180 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1105 } 1181 }
1106} 1182}
1107#endif 1183#endif
1108 1184
1109#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1110static struct event_handler 1186static struct event_handler
1111{ 1187{
1112 check_watcher cw_yield; 1188 check_watcher yield_ev;
1113 1189
1114 void yield (check_watcher &w) 1190 void yield_cb (check_watcher &w)
1115 { 1191 {
1116 sched_yield (); 1192 // this should really be sched_yield(), but the linux guys thought
1193 // that giving a process calling sched_yield () less cpu time than
1194 // ones with high nice levels is a useful thing to do. It surely is is
1195 // allowed by the sus... as is returning ENOSYS.
1196
1197 struct timespec ts = { 0, 0 };
1198 nanosleep (&ts, 0);
1199
1117 w.stop (); 1200 w.stop ();
1118 } 1201 }
1119 1202
1120 event_handler () 1203 event_handler ()
1121 : cw_yield (this, &event_handler::yield) 1204 : yield_ev (this, &event_handler::yield_cb)
1122 { 1205 {
1123 } 1206 }
1124} event_handler; 1207} event_handler;
1125#endif 1208#endif
1126 1209
… …
1146 cmdbuf_endp += r; 1229 cmdbuf_endp += r;
1147 return true; 1230 return true;
1148 } 1231 }
1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1232 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1150 { 1233 {
1151#if HAVE_SCHED_YIELD 1234#if LINUX_YIELD_HACK
1152 if (display->is_local) 1235 if (display->is_local)
1153 event_handler.cw_yield.start (); 1236 event_handler.yield_ev.start ();
1154#endif 1237#endif
1155 } 1238 }
1156 else 1239 else
1157 { 1240 {
1158 pty_ev.stop (); 1241 pty_ev.stop ();
1159 1242
1160 if (!OPTION (Opt_hold)) 1243 if (!option (Opt_hold))
1161 destroy (); 1244 destroy ();
1162 } 1245 }
1163 1246
1164 return false; 1247 return false;
1165} 1248}
1166 1249
1167void 1250void
1168rxvt_term::pty_cb (io_watcher &w, short revents) 1251rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1180} 1263}
1181 1264
1182void 1265void
1183rxvt_term::pointer_unblank () 1266rxvt_term::pointer_unblank ()
1184{ 1267{
1185 XDefineCursor (display->display, vt, TermWin_cursor); 1268 XDefineCursor (dpy, vt, TermWin_cursor);
1186 recolour_cursor (); 1269 recolour_cursor ();
1187 1270
1188#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1189 hidden_pointer = 0; 1272 hidden_pointer = 0;
1190 1273
1191 if (OPTION (Opt_pointerBlank)) 1274 if (option (Opt_pointerBlank))
1192 pointer_ev.start (NOW + pointerBlankDelay); 1275 pointer_ev.start (NOW + pointerBlankDelay);
1193#endif 1276#endif
1194} 1277}
1195 1278
1196#ifdef POINTER_BLANK 1279#ifdef POINTER_BLANK
1197void 1280void
1198rxvt_term::pointer_blank () 1281rxvt_term::pointer_blank ()
1199{ 1282{
1200 if (!OPTION (Opt_pointerBlank)) 1283 if (!option (Opt_pointerBlank))
1201 return; 1284 return;
1202 1285
1203 XDefineCursor (display->display, vt, display->blank_cursor); 1286 XDefineCursor (dpy, vt, display->blank_cursor);
1204 XFlush (display->display); 1287 XFlush (dpy);
1205 1288
1206 hidden_pointer = 1; 1289 hidden_pointer = 1;
1207} 1290}
1208 1291
1209void 1292void
… …
1282 (32 + button_number + key_state), 1365 (32 + button_number + key_state),
1283 (32 + x + 1), 1366 (32 + x + 1),
1284 (32 + y + 1)); 1367 (32 + y + 1));
1285} 1368}
1286 1369
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 */ 1370/*{{{ process an X event */
1298void 1371void
1299rxvt_term::x_cb (XEvent &ev) 1372rxvt_term::x_cb (XEvent &ev)
1300{ 1373{
1301 make_current (); 1374 make_current ();
1302 1375
1303 dDisp; 1376 dLocal (Display *, dpy);
1304 1377
1305 if (ev.xany.window == vt 1378 if (ev.xany.window == vt
1306 && SHOULD_INVOKE (HOOK_X_EVENT) 1379 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1380 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return; 1381 return;
… …
1313 unsigned int unused_mask; 1386 unsigned int unused_mask;
1314 1387
1315 switch (ev.type) 1388 switch (ev.type)
1316 { 1389 {
1317 case KeyPress: 1390 case KeyPress:
1318#if ISO_14755 1391 key_press (ev.xkey);
1319 if (!(iso14755buf & ISO_14755_52))
1320#endif
1321 lookup_key (ev.xkey);
1322
1323 break; 1392 break;
1324 1393
1325 case KeyRelease: 1394 case KeyRelease:
1326 { 1395 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; 1396 break;
1398 }
1399 1397
1400 case ButtonPress: 1398 case ButtonPress:
1401 button_press (ev.xbutton); 1399 button_press (ev.xbutton);
1402 break; 1400 break;
1403 1401
… …
1405 button_release (ev.xbutton); 1403 button_release (ev.xbutton);
1406 break; 1404 break;
1407 1405
1408 case ClientMessage: 1406 case ClientMessage:
1409 if (ev.xclient.format == 32 1407 if (ev.xclient.format == 32
1410 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1408 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1411 { 1409 {
1410 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1411 {
1412 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1413 {
1412 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1414 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1415 {
1416 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1413 destroy (); 1417 destroy ();
1418 }
1414#if ENABLE_EWMH 1419#if ENABLE_EWMH
1415 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1416 XSendEvent (disp, ev.xclient.window = display->root, 1421 XSendEvent (dpy, ev.xclient.window = display->root,
1417 False, SubstructureRedirectMask | SubstructureNotifyMask, 1422 False, SubstructureRedirectMask | SubstructureNotifyMask,
1418 &ev); 1423 &ev);
1424#endif
1425 }
1426 }
1427#if ENABLE_XEMBED
1428 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1429 {
1430 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1431 focus_in ();
1432 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1433 focus_out ();
1434 }
1419#endif 1435#endif
1420 } 1436 }
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; 1437 break;
1461 1438
1462 /* 1439 /*
1463 * XXX: this is not the _current_ arrangement 1440 * XXX: this is not the _current_ arrangement
1464 * Here's my conclusion: 1441 * Here's my conclusion:
… …
1483 break; 1460 break;
1484 } 1461 }
1485 break; 1462 break;
1486 1463
1487 case FocusIn: 1464 case FocusIn:
1465 if (ev.xfocus.detail != NotifyInferior
1466 && ev.xfocus.detail != NotifyPointer
1467 && ev.xfocus.mode != NotifyGrab)
1488 focus_in (); 1468 focus_in ();
1489 break; 1469 break;
1490 1470
1491 case FocusOut: 1471 case FocusOut:
1472 if (ev.xfocus.detail != NotifyInferior
1473 && ev.xfocus.detail != NotifyPointer
1474 && ev.xfocus.mode != NotifyGrab)
1492 focus_out (); 1475 focus_out ();
1493 break; 1476 break;
1494 1477
1495 case ConfigureNotify: 1478 case ConfigureNotify:
1479 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1480 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1481 szHint.width, szHint.height); */
1496 if (ev.xconfigure.window == parent[0]) 1482 if (ev.xconfigure.window == parent[0])
1497 { 1483 {
1498 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1484 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1499 ; 1485 ;
1500 1486
1501 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1502 { 1488 {
1503 seen_resize = 1; 1489 seen_resize = 1;
1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1505 } 1491 }
1506 1492 else
1493 {
1494#ifdef HAVE_BG_PIXMAP
1495 if (bgPixmap.window_position_sensitive ())
1496 update_background ();
1497#endif
1498 }
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1499 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 } 1500 }
1514 break; 1501 break;
1515 1502
1516 case PropertyNotify: 1503 case PropertyNotify:
1504 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1517 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1505 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1518 && ev.xproperty.state == PropertyNewValue) 1506 && ev.xproperty.state == PropertyNewValue)
1519 selection_property (ev.xproperty.window, ev.xproperty.atom); 1507 selection_property (ev.xproperty.window, ev.xproperty.atom);
1520 1508
1521 break; 1509 break;
1522 1510
1523 case SelectionClear: 1511 case SelectionClear:
1524 selection_clear (); 1512 selection_clear ();
… …
1546#ifdef TEXT_BLINK 1534#ifdef TEXT_BLINK
1547 text_blink_ev.stop (); 1535 text_blink_ev.stop ();
1548#endif 1536#endif
1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1537 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1538 break;
1551
1552#ifdef TRANSPARENT
1553 case ReparentNotify:
1554 rootwin_cb (ev);
1555 break;
1556#endif /* TRANSPARENT */
1557 1539
1558 case GraphicsExpose: 1540 case GraphicsExpose:
1559 case Expose: 1541 case Expose:
1560 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1561 { 1543 {
1562 do 1544 do
1545 {
1563 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1564 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1548 }
1565 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1549 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1566 1550
1567 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1551 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1568 1552
1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1553 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1554 {
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1555 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1556 ev.xexpose.width, ev.xexpose.height, False);
1572 1557 }
1573 want_refresh = 1; 1558 want_refresh = 1;
1574 } 1559 }
1575 else 1560 else
1576 { 1561 {
1577 XEvent unused_event; 1562 XEvent unused_event;
1578 1563
1579 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1564 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1580 ; 1565 ;
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1566 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1582 ; 1567 ;
1583 1568
1584 if (isScrollbarWindow (ev.xany.window)) 1569 if (isScrollbarWindow (ev.xany.window))
1585 { 1570 {
1586 scrollBar.setIdle (); 1571 scrollBar.setIdle ();
1587 scrollbar_show (0); 1572 scrollbar_show (0);
1588 } 1573 }
1589
1590#ifdef TRANSPARENT
1591 if (am_transparent && ev.xany.window == parent[0])
1592 XClearWindow (disp, ev.xany.window);
1593#endif
1594 } 1574 }
1595 break; 1575 break;
1596 1576
1597 case MotionNotify: 1577 case MotionNotify:
1598#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
… …
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop 1589 ; // nop
1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1611 { 1591 {
1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1613 ; 1593 ;
1614 1594
1615 XQueryPointer (disp, vt, 1595 XQueryPointer (dpy, vt,
1616 &unused_root, &unused_child, 1596 &unused_root, &unused_child,
1617 &unused_root_x, &unused_root_y, 1597 &unused_root_x, &unused_root_y,
1618 &ev.xbutton.x, &ev.xbutton.y, 1598 &ev.xbutton.x, &ev.xbutton.y,
1619 &ev.xbutton.state); 1599 &ev.xbutton.state);
1620#ifdef MOUSE_THRESHOLD 1600#ifdef MOUSE_THRESHOLD
… …
1684#endif 1664#endif
1685 } 1665 }
1686 } 1666 }
1687 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1667 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1688 { 1668 {
1689 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1669 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1690 MotionNotify, &ev)) 1670 MotionNotify, &ev))
1691 ; 1671 ;
1692 1672
1693 XQueryPointer (disp, scrollBar.win, 1673 XQueryPointer (dpy, scrollBar.win,
1694 &unused_root, &unused_child, 1674 &unused_root, &unused_child,
1695 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1696 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1697 &unused_mask); 1677 &unused_mask);
1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1699 scrollbar_size ()); 1679 scrollbar_size ());
1700 want_refresh = 1; 1680 want_refresh = 1;
1701 refresh_limit = 0;
1702 scrollbar_show (1); 1681 scrollbar_show (1);
1703 } 1682 }
1704 break; 1683 break;
1705 } 1684 }
1706 1685
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK) 1686#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1687 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1711 { 1688 {
1712 if (hidden_cursor) 1689 if (hidden_cursor)
1713 { 1690 {
1714 hidden_cursor = 0; 1691 hidden_cursor = 0;
1715 want_refresh = 1; 1692 want_refresh = 1;
1716 } 1693 }
1717 1694
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1695 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719 } 1696 }
1720#endif 1697#endif
1721 1698
1722#if defined(POINTER_BLANK) 1699#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1700 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 { 1701 {
1725 if (ev.type == MotionNotify 1702 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress 1703 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease) 1704 || ev.type == ButtonRelease)
1728 if (hidden_pointer) 1705 if (hidden_pointer)
… …
1740 if (!focus) 1717 if (!focus)
1741 { 1718 {
1742 focus = 1; 1719 focus = 1;
1743 want_refresh = 1; 1720 want_refresh = 1;
1744 1721
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1722 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1746 1723
1747#if USE_XIM 1724#if USE_XIM
1748 if (Input_Context != NULL) 1725 if (Input_Context != NULL)
1749 { 1726 {
1750 IMSetStatusPosition (); 1727 IMSetPosition ();
1751 XSetICFocus (Input_Context); 1728 XSetICFocus (Input_Context);
1752 } 1729 }
1753#endif 1730#endif
1754#if CURSOR_BLINK 1731#if CURSOR_BLINK
1755 if (OPTION (Opt_cursorBlink)) 1732 if (option (Opt_cursorBlink))
1756 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1733 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1757#endif 1734#endif
1758#if OFF_FOCUS_FADING 1735#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1736 if (rs[Rs_fade])
1760 { 1737 {
1761 pix_colors = pix_colors_focused; 1738 pix_colors = pix_colors_focused;
1762 scr_recolour (); 1739 scr_recolour ();
1763 } 1740 }
1764#endif 1741#endif
1742#if ENABLE_FRILLS
1743 if (option (Opt_urgentOnBell))
1744 {
1745 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1746 {
1747 h->flags &= ~XUrgencyHint;
1748 XSetWMHints (dpy, parent[0], h);
1749 }
1750 }
1751#endif
1765 } 1752 }
1766} 1753}
1767 1754
1768void 1755void
1769rxvt_term::focus_out () 1756rxvt_term::focus_out ()
… …
1777 1764
1778#if ENABLE_FRILLS || ISO_14755 1765#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf) 1766 if (iso14755buf)
1780 { 1767 {
1781 iso14755buf = 0; 1768 iso14755buf = 0;
1782# if ENABLE_OVERLAY 1769# if ISO_14755
1783 scr_overlay_off (); 1770 scr_overlay_off ();
1784# endif 1771# endif
1785 } 1772 }
1786#endif 1773#endif
1787#if USE_XIM 1774#if USE_XIM
1788 if (Input_Context != NULL) 1775 if (Input_Context != NULL)
1789 XUnsetICFocus (Input_Context); 1776 XUnsetICFocus (Input_Context);
1790#endif 1777#endif
1791#if CURSOR_BLINK 1778#if CURSOR_BLINK
1792 if (OPTION (Opt_cursorBlink)) 1779 if (option (Opt_cursorBlink))
1793 cursor_blink_ev.stop (); 1780 cursor_blink_ev.stop ();
1794 hidden_cursor = 0; 1781 hidden_cursor = 0;
1795#endif 1782#endif
1796#if OFF_FOCUS_FADING 1783#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1784 if (rs[Rs_fade])
… …
1801 } 1788 }
1802#endif 1789#endif
1803 } 1790 }
1804} 1791}
1805 1792
1806#if TRANSPARENT 1793void
1794rxvt_term::update_fade_color (unsigned int idx)
1795{
1796#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade])
1798 {
1799 rgba c;
1800 pix_colors [Color_fade].get (c);
1801 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1802 }
1803#endif
1804}
1805
1806#if ENABLE_TRANSPARENCY || ENABLE_PERL
1807void 1807void
1808rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1809{
1810 make_current (); 1810 make_current ();
1811 1811
1812 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1813 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1814 return;
1815
1816# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1817 switch (ev.type)
1813 { 1818 {
1814 case PropertyNotify: 1819 case PropertyNotify:
1815 /* 1820 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1821 * 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. 1822 * use the property to determine the pixmap. We use it later on.
1818 */ 1823 */
1819 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 return; 1826 {
1822 1827 bgPixmap.set_root_pixmap ();
1823 /* FALLTHROUGH */ 1828 update_background ();
1824 case ReparentNotify: 1829 }
1825 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1826 want_refresh = want_full_refresh = 1;
1827 break; 1830 break;
1828 } 1831 }
1832# endif
1829} 1833}
1830#endif 1834#endif
1831 1835
1832void 1836void
1833rxvt_term::button_press (XButtonEvent &ev) 1837rxvt_term::button_press (XButtonEvent &ev)
… …
1842 /* 1846 /*
1843 * VT window processing of button press 1847 * VT window processing of button press
1844 */ 1848 */
1845 if (ev.window == vt) 1849 if (ev.window == vt)
1846 { 1850 {
1851 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1852 return;
1853
1847#if ISO_14755 1854#if ISO_14755
1848 // 5.4 1855 // 5.4
1849 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1856 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1850 { 1857 {
1851 iso14755_54 (ev.x, ev.y); 1858 iso14755_54 (ev.x, ev.y);
… …
1893 else 1900 else
1894 { 1901 {
1895 if (ev.button != MEvent.button) 1902 if (ev.button != MEvent.button)
1896 MEvent.clicks = 0; 1903 MEvent.clicks = 0;
1897 1904
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1899 switch (ev.button) 1905 switch (ev.button)
1900 { 1906 {
1901 case Button1: 1907 case Button1:
1902 /* allow meta + click to select rectangular areas */ 1908 /* allow meta + click to select rectangular areas */
1903 /* should be done in screen.C */ 1909 /* should be done in screen.C */
1904#if ENABLE_FRILLS 1910#if ENABLE_FRILLS
1905 selection.rect = !!(ev.state & ModMetaMask); 1911 selection.rect = !!(ev.state & ModMetaMask);
1906#else 1912#else
1907 selection.rect = false; 1913 selection.rect = false;
1908#endif 1914#endif
1909 1915
1910 /* allow shift+left click to extend selection */ 1916 /* allow shift+left click to extend selection */
1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1917 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1912 { 1918 {
1913 if (MEvent.button == Button1 && clickintime) 1919 if (MEvent.button == Button1 && clickintime)
1914 selection_rotate (ev.x, ev.y); 1920 selection_rotate (ev.x, ev.y);
1915 else 1921 else
1916 selection_extend (ev.x, ev.y, 1); 1922 selection_extend (ev.x, ev.y, 1);
1917 } 1923 }
1918 else 1924 else
1919 { 1925 {
1920 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1921 MEvent.clicks++; 1927 MEvent.clicks++;
1922 else 1928 else
1923 MEvent.clicks = 1; 1929 MEvent.clicks = 1;
1924 1930
1925 selection_click (MEvent.clicks, ev.x, ev.y); 1931 selection_click (MEvent.clicks, ev.x, ev.y);
1926 } 1932 }
1927 1933
1928 MEvent.button = Button1; 1934 MEvent.button = Button1;
1929 break; 1935 break;
1930 1936
1931 case Button3: 1937 case Button3:
1932 if (MEvent.button == Button3 && clickintime) 1938 if (MEvent.button == Button3 && clickintime)
1933 selection_rotate (ev.x, ev.y); 1939 selection_rotate (ev.x, ev.y);
1934 else 1940 else
1935 selection_extend (ev.x, ev.y, 1); 1941 selection_extend (ev.x, ev.y, 1);
1936 1942
1937 MEvent.button = Button3; 1943 MEvent.button = Button3;
1938 break; 1944 break;
1939 } 1945 }
1940 } 1946 }
1941 1947
1942 MEvent.time = ev.time; 1948 MEvent.time = ev.time;
1943 return; 1949 return;
1944 } 1950 }
1945 1951
… …
2108 sel_scroll_ev.stop(); 2114 sel_scroll_ev.stop();
2109#endif 2115#endif
2110 2116
2111 if (ev.window == vt) 2117 if (ev.window == vt)
2112 { 2118 {
2119 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2120 return;
2121
2113#if ISO_14755 2122#if ISO_14755
2114 // 5.4 2123 // 5.4
2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2124 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2116 return; 2125 return;
2117#endif 2126#endif
2127
2118 if (reportmode) 2128 if (reportmode)
2119 { 2129 {
2120 /* mouse report from vt window */ 2130 /* mouse report from vt window */
2121 /* don't report release of wheel "buttons" */ 2131 /* don't report release of wheel "buttons" */
2122 if (ev.button >= 4) 2132 if (ev.button >= 4)
… …
2146 if (priv_modes & PrivMode_mouse_report 2156 if (priv_modes & PrivMode_mouse_report
2147 && bypass_keystate 2157 && bypass_keystate
2148 && ev.button == Button1 && MEvent.clicks <= 1) 2158 && ev.button == Button1 && MEvent.clicks <= 1)
2149 selection_extend (ev.x, ev.y, 0); 2159 selection_extend (ev.x, ev.y, 0);
2150 2160
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2154 switch (ev.button) 2161 switch (ev.button)
2155 { 2162 {
2156 case Button1: 2163 case Button1:
2157 case Button3: 2164 case Button3:
2158 selection_make (ev.time); 2165 selection_make (ev.time);
2159 break; 2166 break;
2167
2160 case Button2: 2168 case Button2:
2161 selection_request (ev.time, ev.x, ev.y); 2169 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2170 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2162 break; 2171 break;
2172
2163#ifdef MOUSE_WHEEL 2173#ifdef MOUSE_WHEEL
2164 case Button4: 2174 case Button4:
2165 case Button5: 2175 case Button5:
2166 { 2176 {
2167 int i; 2177 int i;
… …
2169 2179
2170 v = ev.button == Button4 ? UP : DN; 2180 v = ev.button == Button4 ? UP : DN;
2171 2181
2172 if (ev.state & ShiftMask) 2182 if (ev.state & ShiftMask)
2173 i = 1; 2183 i = 1;
2174 else if (OPTION (Opt_mouseWheelScrollPage)) 2184 else if (option (Opt_mouseWheelScrollPage))
2175 i = nrow - 1; 2185 i = nrow - 1;
2176 else 2186 else
2177 i = 5; 2187 i = 5;
2178 2188
2179# ifdef MOUSE_SLIP_WHEELING 2189# ifdef MOUSE_SLIP_WHEELING
… …
2200 break; 2210 break;
2201#endif 2211#endif
2202 } 2212 }
2203 } 2213 }
2204} 2214}
2205
2206#ifdef TRANSPARENT
2207#if TINTING
2208/* taken from aterm-0.4.2 */
2209
2210typedef uint32_t RUINT32T;
2211
2212void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2213{
2214 int sh_r, sh_g, sh_b;
2215 RUINT32T mask_r, mask_g, mask_b;
2216 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2217 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2218 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2219 int i;
2220
2221 Visual *visual = display->visual;
2222
2223 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2224
2225 /* for convenience */
2226 mask_r = visual->red_mask;
2227 mask_g = visual->green_mask;
2228 mask_b = visual->blue_mask;
2229
2230 /* boring lookup table pre-initialization */
2231 switch (srcImage->bits_per_pixel) {
2232 case 15:
2233 if ((mask_r != 0x7c00) ||
2234 (mask_g != 0x03e0) ||
2235 (mask_b != 0x001f))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2238 lookup_r = lookup;
2239 lookup_g = lookup+32;
2240 lookup_b = lookup+32+32;
2241 sh_r = 10;
2242 sh_g = 5;
2243 sh_b = 0;
2244 break;
2245 case 16:
2246 if ((mask_r != 0xf800) ||
2247 (mask_g != 0x07e0) ||
2248 (mask_b != 0x001f))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2251 lookup_r = lookup;
2252 lookup_g = lookup+32;
2253 lookup_b = lookup+32+64;
2254 sh_r = 11;
2255 sh_g = 5;
2256 sh_b = 0;
2257 break;
2258 case 24:
2259 if ((mask_r != 0xff0000) ||
2260 (mask_g != 0x00ff00) ||
2261 (mask_b != 0x0000ff))
2262 return;
2263 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2264 lookup_r = lookup;
2265 lookup_g = lookup+256;
2266 lookup_b = lookup+256+256;
2267 sh_r = 16;
2268 sh_g = 8;
2269 sh_b = 0;
2270 break;
2271 case 32:
2272 if ((mask_r != 0xff0000) ||
2273 (mask_g != 0x00ff00) ||
2274 (mask_b != 0x0000ff))
2275 return;
2276 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2277 lookup_r = lookup;
2278 lookup_g = lookup+256;
2279 lookup_b = lookup+256+256;
2280 sh_r = 16;
2281 sh_g = 8;
2282 sh_b = 0;
2283 break;
2284 default:
2285 return; /* we do not support this color depth */
2286 }
2287
2288 /* prepare limits for color transformation (each channel is handled separately) */
2289 if (shade < 0) {
2290 shade = -shade;
2291 if (shade < 0) shade = 0;
2292 if (shade > 100) shade = 100;
2293
2294 lower_lim_r = 65535-rm;
2295 lower_lim_g = 65535-gm;
2296 lower_lim_b = 65535-bm;
2297
2298 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2299 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2300 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2301
2302 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2303 } else {
2304 if (shade < 0) shade = 0;
2305 if (shade > 100) shade = 100;
2306
2307 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2308
2309 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2310 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2311 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2312 }
2313
2314 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2315 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2316 {
2317 unsigned int tmp;
2318
2319 tmp = lower_lim_r;
2320 lower_lim_r = lower_lim_b;
2321 lower_lim_b = tmp;
2322
2323 tmp = upper_lim_r;
2324 upper_lim_r = upper_lim_b;
2325 upper_lim_b = tmp;
2326 }
2327
2328 /* fill our lookup tables */
2329 for (i = 0; i <= mask_r>>sh_r; i++)
2330 {
2331 RUINT32T tmp;
2332 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2333 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2334 lookup_r[i] = (tmp/65535)<<sh_r;
2335 }
2336 for (i = 0; i <= mask_g>>sh_g; i++)
2337 {
2338 RUINT32T tmp;
2339 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2340 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2341 lookup_g[i] = (tmp/65535)<<sh_g;
2342 }
2343 for (i = 0; i <= mask_b>>sh_b; i++)
2344 {
2345 RUINT32T tmp;
2346 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2347 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2348 lookup_b[i] = (tmp/65535)<<sh_b;
2349 }
2350
2351 /* apply table to input image (replacing colors by newly calculated ones) */
2352 switch (srcImage->bits_per_pixel)
2353 {
2354 case 15:
2355 {
2356 unsigned short *p1, *pf, *p, *pl;
2357 p1 = (unsigned short *) srcImage->data;
2358 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2359 while (p1 < pf)
2360 {
2361 p = p1;
2362 pl = p1 + srcImage->width;
2363 for (; p < pl; p++)
2364 {
2365 *p = lookup_r[(*p & 0x7c00)>>10] |
2366 lookup_g[(*p & 0x03e0)>> 5] |
2367 lookup_b[(*p & 0x001f)];
2368 }
2369 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2370 }
2371 break;
2372 }
2373 case 16:
2374 {
2375 unsigned short *p1, *pf, *p, *pl;
2376 p1 = (unsigned short *) srcImage->data;
2377 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2378 while (p1 < pf)
2379 {
2380 p = p1;
2381 pl = p1 + srcImage->width;
2382 for (; p < pl; p++)
2383 {
2384 *p = lookup_r[(*p & 0xf800)>>11] |
2385 lookup_g[(*p & 0x07e0)>> 5] |
2386 lookup_b[(*p & 0x001f)];
2387 }
2388 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2389 }
2390 break;
2391 }
2392 case 24:
2393 {
2394 unsigned char *p1, *pf, *p, *pl;
2395 p1 = (unsigned char *) srcImage->data;
2396 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width * 3;
2401 for (; p < pl; p += 3)
2402 {
2403 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2404 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2405 p[2] = lookup_r[(p[2] & 0x0000ff)];
2406 }
2407 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 32:
2412 {
2413 RUINT32T *p1, *pf, *p, *pl;
2414 p1 = (RUINT32T *) srcImage->data;
2415 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416
2417 while (p1 < pf)
2418 {
2419 p = p1;
2420 pl = p1 + srcImage->width;
2421 for (; p < pl; p++)
2422 {
2423 *p = lookup_r[(*p & 0xff0000)>>16] |
2424 lookup_g[(*p & 0x00ff00)>> 8] |
2425 lookup_b[(*p & 0x0000ff)] |
2426 (*p & ~0xffffff);
2427 }
2428 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 }
2433
2434 free (lookup);
2435}
2436#endif
2437
2438/*
2439 * Check our parents are still who we think they are.
2440 * Do transparency updates if required
2441 */
2442int
2443rxvt_term::check_our_parents ()
2444{
2445 int i, pchanged, aformat, have_pixmap, rootdepth;
2446 unsigned long nitems, bytes_after;
2447 Atom atype;
2448 unsigned char *prop = NULL;
2449 Window root, oldp, *list;
2450 Pixmap rootpixmap = None;
2451 XWindowAttributes wattr, wrootattr;
2452 dDisp;
2453
2454 pchanged = 0;
2455
2456 if (!OPTION (Opt_transparent))
2457 return pchanged; /* Don't try any more */
2458
2459 XGetWindowAttributes (disp, display->root, &wrootattr);
2460 rootdepth = wrootattr.depth;
2461
2462 XGetWindowAttributes (disp, parent[0], &wattr);
2463
2464 if (rootdepth != wattr.depth)
2465 {
2466 if (am_transparent)
2467 {
2468 pchanged = 1;
2469 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2470 am_transparent = am_pixmap_trans = 0;
2471 }
2472
2473 return pchanged; /* Don't try any more */
2474 }
2475
2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2477 XSync (disp, False);
2478
2479 /*
2480 * Make the frame window set by the window manager have
2481 * the root background. Some window managers put multiple nested frame
2482 * windows for each client, so we have to take care about that.
2483 */
2484 i = (xa[XA_XROOTPMAP_ID]
2485 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2487 &nitems, &bytes_after, &prop) == Success);
2488
2489 if (!i || prop == NULL)
2490 i = (xa[XA_ESETROOT_PMAP_ID]
2491 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2493 &nitems, &bytes_after, &prop) == Success);
2494
2495 if (!i || prop == NULL
2496#if TINTING
2497 || !rs[Rs_color + Color_tint]
2498#endif
2499 )
2500 have_pixmap = 0;
2501 else
2502 {
2503 have_pixmap = 1;
2504 rootpixmap = *(Pixmap *)prop;
2505 XFree (prop);
2506 }
2507
2508 if (have_pixmap)
2509 {
2510 /*
2511 * Copy display->root pixmap transparency
2512 */
2513 int sx, sy, nx, ny;
2514 unsigned int nw, nh;
2515 Window cr;
2516 XImage *image;
2517 GC gc;
2518 XGCValues gcvalue;
2519
2520 XTranslateCoordinates (disp, parent[0], display->root,
2521 0, 0, &sx, &sy, &cr);
2522 nw = (unsigned int)szHint.width;
2523 nh = (unsigned int)szHint.height;
2524 nx = ny = 0;
2525
2526 if (sx < 0)
2527 {
2528 nw += sx;
2529 nx = -sx;
2530 sx = 0;
2531 }
2532
2533 if (sy < 0)
2534 {
2535 nh += sy;
2536 ny = -sy;
2537 sy = 0;
2538 }
2539
2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2542
2543 XSync (disp, False);
2544 allowedxerror = -1;
2545 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2546
2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2548 /* XXX: may need a delay here? */
2549 allowedxerror = 0;
2550
2551 if (image == NULL)
2552 {
2553 if (am_transparent && am_pixmap_trans)
2554 {
2555 pchanged = 1;
2556 if (pixmap != None)
2557 {
2558 XFreePixmap (disp, pixmap);
2559 pixmap = None;
2560 }
2561 }
2562
2563 am_pixmap_trans = 0;
2564 }
2565 else
2566 {
2567 if (pixmap != None)
2568 XFreePixmap (disp, pixmap);
2569
2570#if TINTING
2571 if (ISSET_PIXCOLOR (Color_tint))
2572 {
2573 unsigned short rm, gm, bm;
2574 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2575
2576 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2577
2578 ShadeXImage (display, image, shade, rm, gm, bm);
2579 }
2580#endif
2581
2582 pixmap = XCreatePixmap (disp, vt,
2583 szHint.width, szHint.height, image->depth);
2584 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2585 XPutImage (disp, pixmap, gc, image, 0, 0,
2586 nx, ny, image->width, image->height);
2587 XFreeGC (disp, gc);
2588 XDestroyImage (image);
2589 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2590 XClearWindow (disp, parent[0]);
2591
2592 if (!am_transparent || !am_pixmap_trans)
2593 pchanged = 1;
2594
2595 am_transparent = am_pixmap_trans = 1;
2596 }
2597 }
2598
2599 if (am_pixmap_trans)
2600 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2601 else
2602 {
2603 unsigned int n;
2604 /*
2605 * InheritPixmap transparency
2606 */
2607 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2608 {
2609 oldp = parent[i];
2610 XQueryTree (disp, parent[i - 1], &root,
2611 &parent[i], &list, &n);
2612 XFree (list);
2613
2614 if (parent[i] == display->root)
2615 {
2616 if (oldp != None)
2617 pchanged = 1;
2618
2619 break;
2620 }
2621
2622 if (oldp != parent[i])
2623 pchanged = 1;
2624 }
2625
2626 n = 0;
2627
2628 if (pchanged)
2629 {
2630 for (; n < (unsigned int)i; n++)
2631 {
2632 XGetWindowAttributes (disp, parent[n], &wattr);
2633 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2634 {
2635 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2636 break;
2637 }
2638 }
2639 }
2640
2641 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2642 {
2643 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2644 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2645 am_transparent = 0;
2646 /* XXX: also turn off Opt_transparent? */
2647 }
2648 else
2649 {
2650#if WAIT_FOR_WM
2651 /* wait (an arbitrary period) for the WM to do its thing
2652 * needed for fvwm2.2.2 (and before?) */
2653 sleep (1);
2654#endif
2655 for (n = 0; n < (unsigned int)i; n++)
2656 {
2657 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2658 XClearWindow (disp, parent[n]);
2659 }
2660
2661 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2662 am_transparent = 1;
2663 }
2664
2665 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2666 parent[i] = None;
2667 }
2668
2669 if (scrollBar.win)
2670 {
2671 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2672 scrollBar.setIdle ();
2673 scrollbar_show (0);
2674 }
2675
2676 if (am_transparent)
2677 {
2678 want_refresh = want_full_refresh = 1;
2679 if (am_pixmap_trans)
2680 flush ();
2681 }
2682
2683 return pchanged;
2684}
2685#endif
2686 2215
2687/*}}} */ 2216/*}}} */
2688 2217
2689bool 2218bool
2690rxvt_term::cmd_parse () 2219rxvt_term::cmd_parse ()
… …
2739 if (ch == C0_LF) 2268 if (ch == C0_LF)
2740 nlines++; 2269 nlines++;
2741 2270
2742 refresh_count++; 2271 refresh_count++;
2743 2272
2744 if (!OPTION (Opt_jumpScroll) 2273 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2745 || (refresh_count >= refresh_limit * (nrow - 1)))
2746 { 2274 {
2747 refreshnow = true;
2748 refresh_count = 0; 2275 refresh_count = 0;
2276
2277 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2278 {
2279 refreshnow = true;
2749 ch = NOCHAR; 2280 ch = NOCHAR;
2750 break; 2281 break;
2282 }
2751 } 2283 }
2752 2284
2753 // scr_add_lines only works for nlines <= nrow - 1. 2285 // scr_add_lines only works for nlines <= nrow - 1.
2754 if (nlines >= nrow - 1) 2286 if (nlines >= nrow - 1)
2755 { 2287 {
… …
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2315 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2316 scr_add_lines (buf, str - buf, nlines);
2785 2317
2786 /* 2318 /*
2787 * If there have been a lot of new lines, then update the screen 2319 * If there have been a lot of new lines, then update the screen
2788 * What the heck I'll cheat and only refresh less than every page-full. 2320 * What the heck we'll cheat and only refresh less than every page-full.
2789 * the number of pages between refreshes is refresh_limit, which 2321 * if skipScroll is enabled.
2790 * is incremented here because we must be doing flat-out scrolling.
2791 */ 2322 */
2792 if (refreshnow) 2323 if (refreshnow)
2793 { 2324 {
2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2795 refresh_limit++;
2796 else
2797 {
2798 flag = true; 2325 flag = true;
2799 scr_refresh (); 2326 scr_refresh ();
2800 want_refresh = 1; 2327 want_refresh = 1;
2801 }
2802 } 2328 }
2803 2329
2804 } 2330 }
2805 else 2331 else
2806 { 2332 {
… …
2822 return flag; 2348 return flag;
2823} 2349}
2824 2350
2825// read the next character 2351// read the next character
2826wchar_t 2352wchar_t
2827rxvt_term::next_char () 2353rxvt_term::next_char () NOTHROW
2828{ 2354{
2829 while (cmdbuf_ptr < cmdbuf_endp) 2355 while (cmdbuf_ptr < cmdbuf_endp)
2830 { 2356 {
2831 // assume 7-bit to be ascii ALWAYS 2357 // assume 7-bit to be ascii ALWAYS
2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2358 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2853 return NOCHAR; 2379 return NOCHAR;
2854} 2380}
2855 2381
2856// read the next octet 2382// read the next octet
2857uint32_t 2383uint32_t
2858rxvt_term::next_octet () 2384rxvt_term::next_octet () NOTHROW
2859{ 2385{
2860 return cmdbuf_ptr < cmdbuf_endp 2386 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++ 2387 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR; 2388 : NOCHAR;
2863} 2389}
2390
2391static class out_of_input out_of_input;
2864 2392
2865/* rxvt_cmd_getc () - Return next input character */ 2393/* rxvt_cmd_getc () - Return next input character */
2866/* 2394/*
2867 * Return the next input character after first passing any keyboard input 2395 * Return the next input character after first passing any keyboard input
2868 * to the command. 2396 * to the command.
2869 */ 2397 */
2870wchar_t 2398wchar_t
2871rxvt_term::cmd_getc () 2399rxvt_term::cmd_getc () THROW ((class out_of_input))
2872{ 2400{
2873 wchar_t c = next_char (); 2401 wchar_t c = next_char ();
2874 2402
2875 if (c == NOCHAR) 2403 if (c == NOCHAR)
2876 throw out_of_input; 2404 throw out_of_input;
2877 2405
2878 return c; 2406 return c;
2879} 2407}
2880 2408
2881uint32_t 2409uint32_t
2882rxvt_term::cmd_get8 () 2410rxvt_term::cmd_get8 () THROW ((class out_of_input))
2883{ 2411{
2884 uint32_t c = next_octet (); 2412 uint32_t c = next_octet ();
2885 2413
2886 if (c == NOCHAR) 2414 if (c == NOCHAR)
2887 throw out_of_input; 2415 throw out_of_input;
… …
2953 { 2481 {
2954 if ((buf[len++] = cmd_getc ()) == 'i') 2482 if ((buf[len++] = cmd_getc ()) == 'i')
2955 break; /* done = 1 */ 2483 break; /* done = 1 */
2956 } 2484 }
2957 } 2485 }
2958 2486
2959 for (i = 0; i < len; i++) 2487 for (i = 0; i < len; i++)
2960 if (putc (buf[i], fd) == EOF) 2488 if (putc (buf[i], fd) == EOF)
2961 { 2489 {
2962 done = 1; 2490 done = 1;
2963 break; 2491 break;
… …
3025 process_dcs_seq (); 2553 process_dcs_seq ();
3026 break; 2554 break;
3027 case 0x9b: /* CSI */ 2555 case 0x9b: /* CSI */
3028 process_csi_seq (); 2556 process_csi_seq ();
3029 break; 2557 break;
3030 case 0x9d: /* CSI */ 2558 case 0x9d: /* OSC */
3031 process_osc_seq (); 2559 process_osc_seq ();
3032 break; 2560 break;
3033#endif 2561#endif
3034 } 2562 }
3035} 2563}
… …
3125 scr_charset_set (2, (unsigned int)cmd_getc ()); 2653 scr_charset_set (2, (unsigned int)cmd_getc ());
3126 break; 2654 break;
3127 case '+': 2655 case '+':
3128 scr_charset_set (3, (unsigned int)cmd_getc ()); 2656 scr_charset_set (3, (unsigned int)cmd_getc ());
3129 break; 2657 break;
3130#if ENABLE_FRILLS 2658#if !ENABLE_MINIMAL
3131 case '6': 2659 case '6':
3132 scr_backindex (); 2660 scr_backindex ();
3133 break; 2661 break;
3134#endif 2662#endif
3135 case '7': 2663 case '7':
3136 scr_cursor (SAVE); 2664 scr_cursor (SAVE);
3137 break; 2665 break;
3138 case '8': 2666 case '8':
3139 scr_cursor (RESTORE); 2667 scr_cursor (RESTORE);
3140 break; 2668 break;
3141#if ENABLE_FRILLS 2669#if !ENABLE_MINIMAL
3142 case '9': 2670 case '9':
3143 scr_forwardindex (); 2671 scr_forwardindex ();
3144 break; 2672 break;
3145#endif 2673#endif
3146 case '=': 2674 case '=':
… …
3261rxvt_term::process_csi_seq () 2789rxvt_term::process_csi_seq ()
3262{ 2790{
3263 unicode_t ch, priv, i; 2791 unicode_t ch, priv, i;
3264 unsigned int nargs, p; 2792 unsigned int nargs, p;
3265 int n, ndef; 2793 int n, ndef;
3266 int arg[ESC_ARGS]; 2794 int arg[ESC_ARGS] = { };
3267 2795
3268 for (nargs = ESC_ARGS; nargs > 0;) 2796 nargs = 0;
3269 arg[--nargs] = 0;
3270 2797
3271 priv = 0; 2798 priv = 0;
3272 ch = cmd_getc (); 2799 ch = cmd_getc ();
3273 if (ch >= '<' && ch <= '?') 2800 if (ch >= '<' && ch <= '?')
3274 { /* '<' '=' '>' '?' */ 2801 { /* '<' '=' '>' '?' */
… …
3308 ndef = get_byte_array_bit (csi_defaults, i); 2835 ndef = get_byte_array_bit (csi_defaults, i);
3309 for (p = 0; p < nargs; p++) 2836 for (p = 0; p < nargs; p++)
3310 if (arg[p] == -1) 2837 if (arg[p] == -1)
3311 arg[p] = ndef; 2838 arg[p] = ndef;
3312 2839
3313#ifdef DEBUG_CMD
3314 fprintf (stderr, "CSI ");
3315 for (p = 0; p < nargs; p++)
3316 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3317 fprintf (stderr, "%c\n", ch);
3318#endif
3319
3320 /* 2840 /*
3321 * private mode handling 2841 * private mode handling
3322 */ 2842 */
3323 if (priv) 2843 if (priv)
3324 { 2844 {
3325 switch (priv) 2845 switch (priv)
3326 { 2846 {
3327 case '>': 2847 case '>':
3328 if (ch == CSI_DA) /* secondary device attributes */ 2848 if (ch == CSI_DA) /* secondary device attributes */
3329 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2849 {
2850 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2851 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2852 //
2853 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2854 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2855 // that we do not support xterm mouse reporting (should be 95 when we do).
2856 //
2857 tt_printf ("\033[>%d;94;0c", 'U');
2858 }
3330 break; 2859 break;
3331 case '?': 2860 case '?':
3332 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2861 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3333 process_terminal_mode (ch, priv, nargs, arg); 2862 process_terminal_mode (ch, priv, nargs, arg);
3334 break; 2863 break;
… …
3460 break; 2989 break;
3461 case 6: /* CPR requested */ 2990 case 6: /* CPR requested */
3462 scr_report_position (); 2991 scr_report_position ();
3463 break; 2992 break;
3464 case 7: /* unofficial extension */ 2993 case 7: /* unofficial extension */
3465 if (OPTION (Opt_insecure)) 2994 if (option (Opt_insecure))
3466 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2995 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3467 break; 2996 break;
3468 case 8: /* unofficial extension */ 2997 case 8: /* unofficial extension */
3469 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2998 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3470 break; 2999 break;
… …
3537 break; 3066 break;
3538 case CSI_75: 3067 case CSI_75:
3539 scr_cursor (RESTORE); 3068 scr_cursor (RESTORE);
3540 break; 3069 break;
3541 3070
3542#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3543 case CSI_74: 3072 case CSI_74:
3544 process_window_ops (arg, nargs); 3073 process_window_ops (arg, nargs);
3545 break; 3074 break;
3546#endif 3075#endif
3547 3076
… …
3554 break; 3083 break;
3555 } 3084 }
3556} 3085}
3557/*}}} */ 3086/*}}} */
3558 3087
3559#if ENABLE_FRILLS 3088#if !ENABLE_MINIMAL
3560/* ARGSUSED */ 3089/* ARGSUSED */
3561void 3090void
3562rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3091rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3563{ 3092{
3564 int x, y; 3093 int x, y;
3565 XWindowAttributes wattr; 3094 XWindowAttributes wattr;
3566 Window wdummy; 3095 Window wdummy;
3567 dDisp; 3096
3097 dLocal (Display *, dpy);
3568 3098
3569 if (nargs == 0) 3099 if (nargs == 0)
3570 return; 3100 return;
3571 3101
3572 switch (args[0]) 3102 switch (args[0])
3573 { 3103 {
3574 /* 3104 /*
3575 * commands 3105 * commands
3576 */ 3106 */
3577 case 1: /* deiconify window */ 3107 case 1: /* deiconify window */
3578 XMapWindow (disp, parent[0]); 3108 XMapWindow (dpy, parent[0]);
3579 break; 3109 break;
3580 case 2: /* iconify window */ 3110 case 2: /* iconify window */
3581 XIconifyWindow (disp, parent[0], display->screen); 3111 XIconifyWindow (dpy, parent[0], display->screen);
3582 break; 3112 break;
3583 case 3: /* set position (pixels) */ 3113 case 3: /* set position (pixels) */
3584 XMoveWindow (disp, parent[0], args[1], args[2]); 3114 XMoveWindow (dpy, parent[0], args[1], args[2]);
3585 break; 3115 break;
3586 case 4: /* set size (pixels) */ 3116 case 4: /* set size (pixels) */
3587 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3117 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3588 break; 3118 break;
3589 case 5: /* raise window */ 3119 case 5: /* raise window */
3590 XRaiseWindow (disp, parent[0]); 3120 XRaiseWindow (dpy, parent[0]);
3591 break; 3121 break;
3592 case 6: /* lower window */ 3122 case 6: /* lower window */
3593 XLowerWindow (disp, parent[0]); 3123 XLowerWindow (dpy, parent[0]);
3594 break; 3124 break;
3595 case 7: /* refresh window */ 3125 case 7: /* refresh window */
3596 scr_touch (true); 3126 scr_touch (true);
3597 break; 3127 break;
3598 case 8: /* set size (chars) */ 3128 case 8: /* set size (chars) */
… …
3605 if (args[0] >= 24) /* set height (chars) */ 3135 if (args[0] >= 24) /* set height (chars) */
3606 set_widthheight ((unsigned int)width, 3136 set_widthheight ((unsigned int)width,
3607 (unsigned int) (args[1] * fheight)); 3137 (unsigned int) (args[1] * fheight));
3608 break; 3138 break;
3609 3139
3610
3611 /* 3140 /*
3612 * reports - some output format copied from XTerm 3141 * reports - some output format copied from XTerm
3613 */ 3142 */
3614 case 11: /* report window state */ 3143 case 11: /* report window state */
3615 XGetWindowAttributes (disp, parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3616 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3145 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3617 break; 3146 break;
3618 case 13: /* report window position */ 3147 case 13: /* report window position */
3619 XGetWindowAttributes (disp, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent[0], &wattr);
3620 XTranslateCoordinates (disp, parent[0], wattr.root, 3149 XTranslateCoordinates (dpy, parent[0], wattr.root,
3621 -wattr.border_width, -wattr.border_width, 3150 -wattr.border_width, -wattr.border_width,
3622 &x, &y, &wdummy); 3151 &x, &y, &wdummy);
3623 tt_printf ("\033[3;%d;%dt", x, y); 3152 tt_printf ("\033[3;%d;%dt", x, y);
3624 break; 3153 break;
3625 case 14: /* report window size (pixels) */ 3154 case 14: /* report window size (pixels) */
3626 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3627 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3156 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3628 break; 3157 break;
3629 case 18: /* report text area size (chars) */ 3158 case 18: /* report text area size (chars) */
3630 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3159 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3631 break; 3160 break;
… …
3633 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3162 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3634 break; 3163 break;
3635 case 20: /* report icon label */ 3164 case 20: /* report icon label */
3636 { 3165 {
3637 char *s; 3166 char *s;
3638 XGetIconName (disp, parent[0], &s); 3167 XGetIconName (dpy, parent[0], &s);
3639 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 */
3640 XFree (s); 3169 XFree (s);
3641 } 3170 }
3642 break; 3171 break;
3643 case 21: /* report window title */ 3172 case 21: /* report window title */
3644 { 3173 {
3645 char *s; 3174 char *s;
3646 XFetchName (disp, parent[0], &s); 3175 XFetchName (dpy, parent[0], &s);
3647 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3176 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3648 XFree (s); 3177 XFree (s);
3649 } 3178 }
3650 break; 3179 break;
3651 } 3180 }
3652} 3181}
… …
3679 seen_esc = true; 3208 seen_esc = true;
3680 continue; 3209 continue;
3681 } 3210 }
3682 else if (ch == C0_BEL || ch == CHAR_ST) 3211 else if (ch == C0_BEL || ch == CHAR_ST)
3683 break; 3212 break;
3213 else if (ch == C0_SYN)
3214 ch = cmd_get8 ();
3684 else if (ch < 0x20) 3215 else if (ch < 0x20)
3685 return NULL; /* other control character - exit */ 3216 return NULL; /* other control character - exit */
3686 3217
3687 seen_esc = false; 3218 seen_esc = false;
3688 3219
3689 if (n >= STRING_MAX - 1) 3220 if (n >= STRING_MAX - 1)
3690 // stop at some sane length 3221 // stop at some sane length
3691 return NULL; 3222 return NULL;
3692 3223
3693 if (ch == C0_SYN)
3694 string[n++] = cmd_get8 ();
3695 else
3696 string[n++] = ch; 3224 string[n++] = ch;
3697 } 3225 }
3698 3226
3699 string[n++] = '\0'; 3227 string[n++] = '\0';
3700 3228
3701 ends_how = (ch == 0x5c ? C0_ESC : ch); 3229 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3752void 3280void
3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3281rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3754{ 3282{
3755 if (str[0] == '?' && !str[1]) 3283 if (str[0] == '?' && !str[1])
3756 { 3284 {
3757 unsigned short r, g, b; 3285 rgba c;
3758 pix_colors_focused[color].get (display, r, g, b); 3286 pix_colors_focused[color].get (c);
3287
3288#if XFT
3289 if (c.a != rgba::MAX_CC)
3290 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3291 else
3292#endif
3759 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3293 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3760 } 3294 }
3761 else 3295 else
3762 set_window_color (color, str); 3296 set_window_color (color, str);
3763} 3297}
3764 3298
… …
3770{ 3304{
3771 int color; 3305 int color;
3772 char *buf, *name; 3306 char *buf, *name;
3773 bool query = str[0] == '?' && !str[1]; 3307 bool query = str[0] == '?' && !str[1];
3774 int saveop = op; 3308 int saveop = op;
3775 dDisp; 3309
3310 dLocal (Display *, dpy);
3776 3311
3777 assert (str != NULL); 3312 assert (str != NULL);
3313
3314 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3315 return;
3316
3778 switch (op) 3317 switch (op)
3779 { 3318 {
3780 case XTerm_name: 3319 case XTerm_name:
3781 set_title (str); 3320 set_title (str);
3782 /* FALLTHROUGH */ 3321 /* FALLTHROUGH */
… …
3796 unsigned long bytes_after; 3335 unsigned long bytes_after;
3797 unsigned char *value = 0; 3336 unsigned char *value = 0;
3798 const char *str = ""; 3337 const char *str = "";
3799 3338
3800 if (prop 3339 if (prop
3801 && XGetWindowProperty (disp, parent[0], 3340 && XGetWindowProperty (dpy, parent[0],
3802 prop, 0, 1<<16, 0, AnyPropertyType, 3341 prop, 0, 1<<16, 0, AnyPropertyType,
3803 &actual_type, &actual_format, 3342 &actual_type, &actual_format,
3804 &nitems, &bytes_after, &value) == Success 3343 &nitems, &bytes_after, &value) == Success
3805 && actual_type != None 3344 && actual_type != None
3806 && actual_format == 8) 3345 && actual_format == 8)
3807 str = (const char *)(value); 3346 str = (const char *)(value);
3808 3347
3809 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3348 tt_printf ("\033]%d;%s%c", op, str, resp);
3810 3349
3811 XFree (value); 3350 XFree (value);
3812 } 3351 }
3813 else 3352 else
3814 { 3353 {
… …
3818 { 3357 {
3819 *eq = 0; 3358 *eq = 0;
3820 set_utf8_property (display->atom (str), eq + 1); 3359 set_utf8_property (display->atom (str), eq + 1);
3821 } 3360 }
3822 else 3361 else
3823 XDeleteProperty (disp, parent[0], 3362 XDeleteProperty (dpy, parent[0],
3824 display->atom (str)); 3363 display->atom (str));
3825 } 3364 }
3826 break; 3365 break;
3827 3366
3828 case XTerm_Color: 3367 case XTerm_Color:
… …
3838 break; 3377 break;
3839 3378
3840 if ((buf = strchr (name, ';')) != NULL) 3379 if ((buf = strchr (name, ';')) != NULL)
3841 *buf++ = '\0'; 3380 *buf++ = '\0';
3842 3381
3843 if (name[0] == '?' && !name[1]) 3382 process_color_seq (op, color, name, resp);
3844 {
3845 unsigned short r, g, b;
3846 pix_colors_focused[color].get (display, r, g, b);
3847 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3848 }
3849 else
3850 set_window_color (color, name);
3851 } 3383 }
3852 break; 3384 break;
3853 case XTerm_Color00: 3385 case XTerm_Color00:
3854 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3386 process_color_seq (op, Color_fg, str, resp);
3855 break; 3387 break;
3856 case XTerm_Color01: 3388 case XTerm_Color01:
3857 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3389 process_color_seq (op, Color_bg, str, resp);
3858 break; 3390 break;
3859#ifndef NO_CURSORCOLOR 3391#ifndef NO_CURSORCOLOR
3860 case XTerm_Color_cursor: 3392 case XTerm_Color_cursor:
3861 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3393 process_color_seq (op, Color_cursor, str, resp);
3862 break; 3394 break;
3863#endif 3395#endif
3864 case XTerm_Color_pointer_fg: 3396 case XTerm_Color_pointer_fg:
3865 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3397 process_color_seq (op, Color_pointer_fg, str, resp);
3866 break; 3398 break;
3867 case XTerm_Color_pointer_bg: 3399 case XTerm_Color_pointer_bg:
3868 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3400 process_color_seq (op, Color_pointer_bg, str, resp);
3869 break; 3401 break;
3870#ifndef NO_BOLD_UNDERLINE_REVERSE 3402#ifndef NO_BOLD_UNDERLINE_REVERSE
3871 case XTerm_Color_RV: 3403 case XTerm_Color_RV:
3872 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3404 process_color_seq (op, Color_RV, str, resp);
3873 break; 3405 break;
3874 case Rxvt_Color_BD: 3406 case Rxvt_Color_BD:
3875 case URxvt_Color_BD: 3407 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp); 3408 process_color_seq (op, Color_BD, str, resp);
3877 break; 3409 break;
3878 case Rxvt_Color_UL: 3410 case Rxvt_Color_UL:
3879 case URxvt_Color_UL: 3411 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp); 3412 process_color_seq (op, Color_UL, str, resp);
3881 break; 3413 break;
3882 case URxvt_Color_IT: 3414 case URxvt_Color_IT:
3883 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3415 process_color_seq (op, Color_IT, str, resp);
3884 break; 3416 break;
3885#endif 3417#endif
3886#if TRANSPARENT && TINTING 3418#if ENABLE_TRANSPARENCY
3887 case URxvt_Color_tint: 3419 case URxvt_Color_tint:
3888 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3420 process_color_seq (op, Color_tint, str, resp);
3889 check_our_parents (); 3421 {
3890 if (am_transparent) 3422 bool changed = false;
3891 want_full_refresh = want_refresh = 1; 3423 if (ISSET_PIXCOLOR (Color_tint))
3892 break; 3424 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3893#endif 3425 else
3426 changed = bgPixmap.unset_tint ();
3427 if (changed)
3428 update_background ();
3429 }
3894 3430
3431 break;
3432#endif
3433
3434#if BG_IMAGE_FROM_FILE
3895 case Rxvt_Pixmap: 3435 case Rxvt_Pixmap:
3896 { 3436 if (!strcmp (str, "?"))
3897 if (*str != ';')
3898 { 3437 {
3899#if XPM_BACKGROUND 3438 char str[256];
3900 scale_pixmap (""); /* reset to default scaling */ 3439
3901 set_bgPixmap (str); /* change pixmap */ 3440 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3902 scr_touch (true); 3441 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3903#endif 3442 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3443 process_xterm_seq (XTerm_title, str, CHAR_ST);
3904 } 3444 }
3905 3445 else
3446 {
3906 int changed = 0; 3447 int changed = 0;
3907 3448
3908 while ((str = strchr (str, ';')) != NULL) 3449 if (*str != ';')
3909 { 3450 {
3451 /* reset to default scaling :*/
3452 bgPixmap.unset_geometry ();
3453 if (bgPixmap.set_file (str)) /* change pixmap */
3454 changed++;
3455 str = strchr (str, ';');
3456 if (str == NULL)
3457 bgPixmap.set_defaultGeometry ();
3458 }
3459 while (str)
3460 {
3910 str++; 3461 str++;
3911#if XPM_BACKGROUND 3462 if (bgPixmap.set_geometry (str))
3912 changed += scale_pixmap (str); 3463 changed++;
3913#endif 3464 str = strchr (str, ';');
3914 } 3465 }
3915
3916 if (changed) 3466 if (changed)
3917 { 3467 update_background ();
3918#ifdef XPM_BACKGROUND
3919 resize_pixmap ();
3920 scr_touch (true);
3921#endif
3922 } 3468 }
3923 }
3924 break; 3469 break;
3470#endif
3925 3471
3926 case Rxvt_restoreFG: 3472 case Rxvt_restoreFG:
3927 set_window_color (Color_fg, str); 3473 set_window_color (Color_fg, str);
3928 break; 3474 break;
3929 case Rxvt_restoreBG: 3475 case Rxvt_restoreBG:
… …
3954 case URxvt_italicFont: 3500 case URxvt_italicFont:
3955 case URxvt_boldItalicFont: 3501 case URxvt_boldItalicFont:
3956#endif 3502#endif
3957 if (query) 3503 if (query)
3958 tt_printf ("\33]%d;%-.250s%c", saveop, 3504 tt_printf ("\33]%d;%-.250s%c", saveop,
3959 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3505 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3960 ? fontset[op - URxvt_font]->fontdesc : "", 3506 ? fontset[op - URxvt_font]->fontdesc : "",
3961 resp); 3507 resp);
3962 else 3508 else
3963 { 3509 {
3964 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3510 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3967 allocated.push_back ((void *)res); 3513 allocated.push_back ((void *)res);
3968 set_fonts (); 3514 set_fonts ();
3969 } 3515 }
3970 break; 3516 break;
3971 3517
3972#if ENABLE_FRILLS 3518 case URxvt_version:
3519 if (query)
3520 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3521 op,
3522 rs[Rs_name], VERSION[0], VERSION[2],
3523 resp);
3524 break;
3525
3526#if !ENABLE_MINIMAL
3973 case URxvt_locale: 3527 case URxvt_locale:
3974 if (query) 3528 if (query)
3975 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3529 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3976 else 3530 else
3977 { 3531 {
3978 set_locale (str); 3532 set_locale (str);
3979 pty->set_utf8_mode (enc_utf8); 3533 pty->set_utf8_mode (enc_utf8);
3980 init_xlocale (); 3534 init_xlocale ();
… …
3995 break; 3549 break;
3996#endif 3550#endif
3997 3551
3998#if ENABLE_PERL 3552#if ENABLE_PERL
3999 case URxvt_perl: 3553 case URxvt_perl:
4000 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3554 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4001 ; // no responses yet 3555 ; // no responses yet
4002 break; 3556 break;
4003#endif 3557#endif
4004 } 3558 }
4005} 3559}
… …
4037 return state; 3591 return state;
4038} 3592}
4039 3593
4040/* we're not using priv _yet_ */ 3594/* we're not using priv _yet_ */
4041void 3595void
4042rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3596rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4043{ 3597{
4044 unsigned int i, j; 3598 unsigned int i, j;
4045 int state; 3599 int state;
4046 3600
4047 static const struct 3601 static const struct
4048 { 3602 {
4049 const int argval; 3603 const int argval;
4050 const unsigned long bit; 3604 const unsigned long bit;
4051 }
4052
4053 argtopriv[] = { 3605 } argtopriv[] = {
4054 { 1, PrivMode_aplCUR }, 3606 { 1, PrivMode_aplCUR },
4055 { 2, PrivMode_vt52 }, 3607 { 2, PrivMode_vt52 },
4056 { 3, PrivMode_132 }, 3608 { 3, PrivMode_132 },
4057 { 4, PrivMode_smoothScroll }, 3609 { 4, PrivMode_smoothScroll },
4058 { 5, PrivMode_rVideo }, 3610 { 5, PrivMode_rVideo },
… …
4121 scr_touch (true); 3673 scr_touch (true);
4122 break; 3674 break;
4123#endif 3675#endif
4124 case 1048: /* alternative cursor save */ 3676 case 1048: /* alternative cursor save */
4125 case 1049: 3677 case 1049:
4126 if (OPTION (Opt_secondaryScreen)) 3678 if (option (Opt_secondaryScreen))
4127 if (mode == 0) 3679 if (mode == 0)
4128 scr_cursor (RESTORE); 3680 scr_cursor (RESTORE);
4129 else if (mode == 1) 3681 else if (mode == 1)
4130 scr_cursor (SAVE); 3682 scr_cursor (SAVE);
4131 break; 3683 break;
… …
4196 break; 3748 break;
4197 case 1011: /* scroll to bottom on key press */ 3749 case 1011: /* scroll to bottom on key press */
4198 set_option (Opt_scrollTtyKeypress, state); 3750 set_option (Opt_scrollTtyKeypress, state);
4199 break; 3751 break;
4200 case 1047: /* secondary screen w/ clearing last */ 3752 case 1047: /* secondary screen w/ clearing last */
4201 if (OPTION (Opt_secondaryScreen)) 3753 if (option (Opt_secondaryScreen))
4202 if (current_screen != PRIMARY) 3754 if (current_screen != PRIMARY)
4203 scr_erase_screen (2); 3755 scr_erase_screen (2);
4204 scr_change_screen (state); 3756 scr_change_screen (state);
4205 break; 3757 break;
4206 case 1049: /* secondary screen w/ clearing first */ 3758 case 1049: /* secondary screen w/ clearing first */
4207 scr_change_screen (state); 3759 scr_change_screen (state);
4208 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4209 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4210 scr_erase_screen (2); 3762 scr_erase_screen (2);
4211 break; 3763 break;
4212 default: 3764 default:
4213 break; 3765 break;
… …
4341 scr_color (Color_bg, Color_bg); 3893 scr_color (Color_bg, Color_bg);
4342 break; 3894 break;
4343 3895
4344 //case 50: // not variable spacing 3896 //case 50: // not variable spacing
4345 3897
4346#if ENABLE_FRILLS 3898#if !ENABLE_MINIMAL
4347 case 90: 3899 case 90:
4348 case 91: /* set bright fg color */ 3900 case 91: /* set bright fg color */
4349 case 92: 3901 case 92:
4350 case 93: 3902 case 93:
4351 case 94: 3903 case 94:
… …
4450 4002
4451 if (v_buflen == 0) 4003 if (v_buflen == 0)
4452 { 4004 {
4453 free (v_buffer); 4005 free (v_buffer);
4454 v_buffer = 0; 4006 v_buffer = 0;
4455 v_buflen = 0;
4456 4007
4457 pty_ev.set (EVENT_READ); 4008 pty_ev.set (EVENT_READ);
4458 return; 4009 return;
4459 } 4010 }
4460 4011

Diff Legend

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