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

Diff Legend

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