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.262 by root, Sun Jan 15 06:02:40 2006 UTC vs.
Revision 1.356 by root, Mon Sep 17 08:31:54 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 *
… …
443 scr_move_to (0, 1); 446 scr_move_to (0, 1);
444 return; 447 return;
445 } 448 }
446 else if (keysym == XK_End) 449 else if (keysym == XK_End)
447 { 450 {
448 scr_move_to (1, 0); 451 scr_move_to (1, 1);
449 return; 452 return;
450 } 453 }
451 } 454 }
452#endif 455#endif
453 } 456 }
… …
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/*}}} */
923 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}
1001
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 1003unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 1005{
930 unsigned int n, s; 1006 unsigned int n, s;
931 1007
… …
958 1034
959void 1035void
960rxvt_term::flush () 1036rxvt_term::flush ()
961{ 1037{
962 flush_ev.stop (); 1038 flush_ev.stop ();
963
964#ifdef TRANSPARENT
965 if (want_full_refresh)
966 {
967 want_full_refresh = 0;
968 scr_clear ();
969 scr_touch (false);
970 }
971#endif
972 1039
973 if (want_refresh) 1040 if (want_refresh)
974 { 1041 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1042 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1043 {
… …
1008 while (l->is_longer () && row < end_row); 1075 while (l->is_longer () && row < end_row);
1009 } 1076 }
1010 while (row < end_row); 1077 while (row < end_row);
1011 } 1078 }
1012 1079
1013 scr_refresh (refresh_type); 1080 scr_refresh ();
1014 scrollbar_show (1); 1081 scrollbar_show (1);
1015#ifdef USE_XIM 1082#ifdef USE_XIM
1016 IMSendSpot (); 1083 IMSendSpot ();
1017#endif 1084#endif
1018 } 1085 }
… …
1021} 1088}
1022 1089
1023void 1090void
1024rxvt_term::check_cb (check_watcher &w) 1091rxvt_term::check_cb (check_watcher &w)
1025{ 1092{
1026 SET_R (this); 1093 make_current ();
1027 SET_LOCALE (locale);
1028 1094
1029 display->flush (); 1095 display->flush ();
1030 1096
1031 if (want_refresh && !flush_ev.active) 1097 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1098 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1099}
1034 1100
1035void 1101void
1036rxvt_term::flush_cb (time_watcher &w) 1102rxvt_term::flush_cb (time_watcher &w)
1037{ 1103{
1038 SET_R (this); 1104 make_current ();
1039 SET_LOCALE (locale);
1040 1105
1041 refresh_limit = 1;
1042 refresh_count = 0; 1106 refresh_count = 0;
1043 flush (); 1107 flush ();
1044} 1108}
1045 1109
1046#ifdef CURSOR_BLINK 1110#ifdef CURSOR_BLINK
… …
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1112rxvt_term::cursor_blink_cb (time_watcher &w)
1049{ 1113{
1050 hidden_cursor = !hidden_cursor; 1114 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1115 want_refresh = 1;
1052 1116
1053 w.start (w.at + BLINK_INTERVAL); 1117 w.start (w.at + CURSOR_BLINK_INTERVAL);
1054} 1118}
1055#endif 1119#endif
1056 1120
1057#ifdef TEXT_BLINK 1121#ifdef TEXT_BLINK
1058void 1122void
… …
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1136rxvt_term::cont_scroll_cb (time_watcher &w)
1073{ 1137{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1138 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1139 scr_page (scrollbar_isUp() ? UP : DN, 1))
1076 { 1140 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1141 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1142 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1080 } 1143 }
1081} 1144}
1082#endif 1145#endif
… …
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1149rxvt_term::sel_scroll_cb (time_watcher &w)
1087{ 1150{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1151 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1152 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1153 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1154 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1155 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1094 } 1156 }
1095} 1157}
1096#endif 1158#endif
… …
1104 : scr_page (UP, mouse_slip_wheel_speed)) 1166 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1167 {
1106 if (view_start == top_row || view_start == 0) 1168 if (view_start == top_row || view_start == 0)
1107 mouse_slip_wheel_speed = 0; 1169 mouse_slip_wheel_speed = 0;
1108 1170
1109 refresh_type |= SMOOTH_REFRESH;
1110 want_refresh = 1; 1171 want_refresh = 1;
1111 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1172 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1112 } 1173 }
1113} 1174}
1114#endif 1175#endif
1115 1176
1116#if HAVE_SCHED_YIELD 1177#if LINUX_YIELD_HACK
1117static struct event_handler 1178static struct event_handler
1118{ 1179{
1119 check_watcher cw_yield; 1180 check_watcher yield_ev;
1120 1181
1121 void yield (check_watcher &w) 1182 void yield_cb (check_watcher &w)
1122 { 1183 {
1123 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
1124 w.stop (); 1192 w.stop ();
1125 } 1193 }
1126 1194
1127 event_handler () 1195 event_handler ()
1128 : cw_yield (this, &event_handler::yield) 1196 : yield_ev (this, &event_handler::yield_cb)
1129 { 1197 {
1130 } 1198 }
1131} event_handler; 1199} event_handler;
1132#endif 1200#endif
1133 1201
… …
1144 1212
1145 memmove (cmdbuf_base, cmdbuf_ptr, n); 1213 memmove (cmdbuf_base, cmdbuf_ptr, n);
1146 cmdbuf_ptr = cmdbuf_base; 1214 cmdbuf_ptr = cmdbuf_base;
1147 cmdbuf_endp = cmdbuf_ptr + n; 1215 cmdbuf_endp = cmdbuf_ptr + n;
1148 1216
1149 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1217 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1150 1218
1151 if (r > 0) 1219 if (r > 0)
1152 { 1220 {
1153 cmdbuf_endp += r; 1221 cmdbuf_endp += r;
1154 return true; 1222 return true;
1155 } 1223 }
1156 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1224 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1157 { 1225 {
1158#if HAVE_SCHED_YIELD 1226#if LINUX_YIELD_HACK
1159 if (display->is_local) 1227 if (display->is_local)
1160 event_handler.cw_yield.start (); 1228 event_handler.yield_ev.start ();
1161#endif 1229#endif
1162 } 1230 }
1163 else 1231 else
1164 { 1232 {
1165 pty_ev.stop (); 1233 pty_ev.stop ();
1166 1234
1167 if (!OPTION (Opt_hold)) 1235 if (!option (Opt_hold))
1168 destroy (); 1236 destroy ();
1169 } 1237 }
1170 1238
1171 return false; 1239 return false;
1172} 1240}
1173 1241
1174void 1242void
1175rxvt_term::pty_cb (io_watcher &w, short revents) 1243rxvt_term::pty_cb (io_watcher &w, short revents)
1176{ 1244{
1177 SET_R (this); 1245 make_current ();
1178 SET_LOCALE (locale);
1179 1246
1180 if (revents & EVENT_READ) 1247 if (revents & EVENT_READ)
1181 // loop, but don't allow a single term to monopolize us 1248 // loop, but don't allow a single term to monopolize us
1182 while (pty_fill ()) 1249 while (pty_fill ())
1183 if (cmd_parse ()) 1250 if (cmd_parse ())
… …
1188} 1255}
1189 1256
1190void 1257void
1191rxvt_term::pointer_unblank () 1258rxvt_term::pointer_unblank ()
1192{ 1259{
1193 XDefineCursor (display->display, vt, TermWin_cursor); 1260 XDefineCursor (dpy, vt, TermWin_cursor);
1194 recolour_cursor (); 1261 recolour_cursor ();
1195 1262
1196#ifdef POINTER_BLANK 1263#ifdef POINTER_BLANK
1197 hidden_pointer = 0; 1264 hidden_pointer = 0;
1198 1265
1199 if (OPTION (Opt_pointerBlank)) 1266 if (option (Opt_pointerBlank))
1200 pointer_ev.start (NOW + pointerBlankDelay); 1267 pointer_ev.start (NOW + pointerBlankDelay);
1201#endif 1268#endif
1202} 1269}
1203 1270
1204#ifdef POINTER_BLANK 1271#ifdef POINTER_BLANK
1205void 1272void
1206rxvt_term::pointer_blank () 1273rxvt_term::pointer_blank ()
1207{ 1274{
1208 if (!OPTION (Opt_pointerBlank)) 1275 if (!option (Opt_pointerBlank))
1209 return; 1276 return;
1210 1277
1211 XDefineCursor (display->display, vt, display->blank_cursor); 1278 XDefineCursor (dpy, vt, display->blank_cursor);
1212 XFlush (display->display); 1279 XFlush (dpy);
1213 1280
1214 hidden_pointer = 1; 1281 hidden_pointer = 1;
1215} 1282}
1216 1283
1217void 1284void
1218rxvt_term::pointer_cb (time_watcher &w) 1285rxvt_term::pointer_cb (time_watcher &w)
1219{ 1286{
1220 SET_R (this); 1287 make_current ();
1221 SET_LOCALE (locale);
1222 1288
1223 pointer_blank (); 1289 pointer_blank ();
1224} 1290}
1225#endif 1291#endif
1226 1292
… …
1291 (32 + button_number + key_state), 1357 (32 + button_number + key_state),
1292 (32 + x + 1), 1358 (32 + x + 1),
1293 (32 + y + 1)); 1359 (32 + y + 1));
1294} 1360}
1295 1361
1296#ifdef USING_W11LIB
1297void
1298rxvt_W11_process_x_event (XEvent *ev)
1299{
1300 rxvt_t *r = rxvt_get_r ();
1301
1302 x_cb (*ev);
1303}
1304#endif
1305
1306/*{{{ process an X event */ 1362/*{{{ process an X event */
1307void 1363void
1308rxvt_term::x_cb (XEvent &ev) 1364rxvt_term::x_cb (XEvent &ev)
1309{ 1365{
1310 dDisp; 1366 make_current ();
1311 1367
1312 SET_R (this); 1368 dLocal (Display *, dpy);
1313 SET_LOCALE (locale);
1314 1369
1315 if (ev.xany.window == vt 1370 if (ev.xany.window == vt
1371 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1372 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 return; 1373 return;
1318 1374
1319 // for XQueryPointer 1375 // for XQueryPointer
1320 Window unused_root, unused_child; 1376 Window unused_root, unused_child;
… …
1322 unsigned int unused_mask; 1378 unsigned int unused_mask;
1323 1379
1324 switch (ev.type) 1380 switch (ev.type)
1325 { 1381 {
1326 case KeyPress: 1382 case KeyPress:
1327#if ISO_14755 1383 key_press (ev.xkey);
1328 if (!(iso14755buf & ISO_14755_52))
1329#endif
1330 lookup_key (ev.xkey);
1331
1332 break; 1384 break;
1333 1385
1334 case KeyRelease: 1386 case KeyRelease:
1335 { 1387 key_release (ev.xkey);
1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1337 KeySym keysym;
1338
1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1340#endif
1341
1342#if ENABLE_FRILLS || ISO_14755
1343 // ISO 14755 support
1344 if (iso14755buf)
1345 if (iso14755buf & ISO_14755_52)
1346 {
1347# if ENABLE_OVERLAY
1348 scr_overlay_off ();
1349# endif
1350# if ISO_14755
1351 // iso14755 part 5.2 handling: release time
1352 // first: controls
1353 if ((ev.xkey.state & ControlMask)
1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1356 {
1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1358 commit_iso14755 ();
1359 goto skip_switch;
1360 }
1361
1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1363 if (i[0] == keysym)
1364 {
1365 iso14755buf = ISO_14755_51 | i[1];
1366 commit_iso14755 ();
1367 goto skip_switch;
1368 }
1369
1370 scr_bell ();
1371# endif
1372 iso14755buf = 0;
1373 break;
1374 }
1375 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1376 {
1377# if ENABLE_OVERLAY
1378 scr_overlay_off ();
1379# endif
1380 if (iso14755buf & ISO_14755_51)
1381 commit_iso14755 ();
1382#if ISO_14755
1383 else if (iso14755buf & ISO_14755_STARTED)
1384 {
1385 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1386
1387 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1388 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1389 }
1390# endif
1391 else
1392 iso14755buf = 0;
1393 }
1394#endif
1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1401 if (!(ev.xkey.state & ControlMask))
1402 slip_wheel_ev.stop ();
1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1404 mouse_slip_wheel_speed = 0;
1405#endif
1406 break; 1388 break;
1407 }
1408 1389
1409 case ButtonPress: 1390 case ButtonPress:
1410 button_press (ev.xbutton); 1391 button_press (ev.xbutton);
1411 break; 1392 break;
1412 1393
… …
1414 button_release (ev.xbutton); 1395 button_release (ev.xbutton);
1415 break; 1396 break;
1416 1397
1417 case ClientMessage: 1398 case ClientMessage:
1418 if (ev.xclient.format == 32 1399 if (ev.xclient.format == 32
1419 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1400 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1420 { 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 {
1421 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)))
1422 destroy (); 1409 destroy ();
1410 }
1423#if ENABLE_EWMH 1411#if ENABLE_EWMH
1424 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])
1425 XSendEvent (disp, ev.xclient.window = display->root, 1413 XSendEvent (dpy, ev.xclient.window = display->root,
1426 False, SubstructureRedirectMask | SubstructureNotifyMask, 1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1427 &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 }
1428#endif 1427#endif
1429 } 1428 }
1430#if ENABLE_XEMBED
1431 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1432 {
1433 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1434 focus_in ();
1435 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1436 focus_out ();
1437 }
1438#endif
1439#ifdef OFFIX_DND
1440 /* OffiX Dnd (drag 'n' drop) protocol */
1441 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1442 && (ev.xclient.data.l[0] == DndFile
1443 || ev.xclient.data.l[0] == DndDir
1444 || ev.xclient.data.l[0] == DndLink))
1445 {
1446 /* Get Dnd data */
1447 Atom ActualType;
1448 int ActualFormat;
1449 unsigned char *data;
1450 unsigned long Size, RemainingBytes;
1451
1452 XGetWindowProperty (disp, display->root,
1453 xa[XA_DNDSELECTION],
1454 0L, 1000000L,
1455 False, AnyPropertyType,
1456 &ActualType, &ActualFormat,
1457 &Size, &RemainingBytes,
1458 &data);
1459 set_string_property (XA_CUT_BUFFER0, data);
1460 XFree (data);
1461 selection_paste (display->root, XA_CUT_BUFFER0, true);
1462 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1463 }
1464#endif /* OFFIX_DND */
1465 break;
1466
1467 case MappingNotify:
1468 XRefreshKeyboardMapping (&ev.xmapping);
1469 break; 1429 break;
1470 1430
1471 /* 1431 /*
1472 * XXX: this is not the _current_ arrangement 1432 * XXX: this is not the _current_ arrangement
1473 * Here's my conclusion: 1433 * Here's my conclusion:
… …
1492 break; 1452 break;
1493 } 1453 }
1494 break; 1454 break;
1495 1455
1496 case FocusIn: 1456 case FocusIn:
1457 if (ev.xfocus.detail != NotifyInferior
1458 && ev.xfocus.detail != NotifyPointer
1459 && ev.xfocus.mode != NotifyGrab)
1497 focus_in (); 1460 focus_in ();
1498 break; 1461 break;
1499 1462
1500 case FocusOut: 1463 case FocusOut:
1464 if (ev.xfocus.detail != NotifyInferior
1465 && ev.xfocus.detail != NotifyPointer
1466 && ev.xfocus.mode != NotifyGrab)
1501 focus_out (); 1467 focus_out ();
1502 break; 1468 break;
1503 1469
1504 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);*/
1505 if (ev.xconfigure.window == parent[0]) 1474 if (ev.xconfigure.window == parent[0])
1506 { 1475 {
1507 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1476 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1508 ; 1477 ;
1509 1478
1510 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1479 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1511 { 1480 {
1512 seen_resize = 1; 1481 seen_resize = 1;
1513 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1482 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1514 } 1483 }
1515 1484 else
1516#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485 {
1517 if (OPTION (Opt_transparent)) 1486#ifdef HAVE_BG_PIXMAP
1518 check_our_parents (); 1487 if (bgPixmap.window_position_sensitive ())
1488 update_background ();
1519#endif 1489#endif
1490 }
1491 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1520 } 1492 }
1521 break; 1493 break;
1522 1494
1523 case PropertyNotify: 1495 case PropertyNotify:
1496 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1524 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1497 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1525 && ev.xproperty.state == PropertyNewValue) 1498 && ev.xproperty.state == PropertyNewValue)
1526 selection_property (ev.xproperty.window, ev.xproperty.atom); 1499 selection_property (ev.xproperty.window, ev.xproperty.atom);
1527 1500
1528 break; 1501 break;
1529 1502
1530 case SelectionClear: 1503 case SelectionClear:
1531 selection_clear (); 1504 selection_clear ();
… …
1553#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1554 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1555#endif 1528#endif
1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1557 break; 1530 break;
1558
1559#ifdef TRANSPARENT
1560 case ReparentNotify:
1561 rootwin_cb (ev);
1562 break;
1563#endif /* TRANSPARENT */
1564 1531
1565 case GraphicsExpose: 1532 case GraphicsExpose:
1566 case Expose: 1533 case Expose:
1567 if (ev.xany.window == vt) 1534 if (ev.xany.window == vt)
1568 { 1535 {
1569 do 1536 do
1570 scr_expose (ev.xexpose.x, ev.xexpose.y, 1537 scr_expose (ev.xexpose.x, ev.xexpose.y,
1571 ev.xexpose.width, ev.xexpose.height, False); 1538 ev.xexpose.width, ev.xexpose.height, False);
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1573 1540
1574 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1541 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1575 1542
1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1577 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1578 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1579 1546
1580 want_refresh = 1; 1547 want_refresh = 1;
1581 } 1548 }
1582 else 1549 else
1583 { 1550 {
1584 XEvent unused_event; 1551 XEvent unused_event;
1585 1552
1586 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1587 ; 1554 ;
1588 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1555 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1589 ; 1556 ;
1590 1557
1591 if (isScrollbarWindow (ev.xany.window)) 1558 if (isScrollbarWindow (ev.xany.window))
1592 { 1559 {
1593 scrollBar.setIdle (); 1560 scrollBar.setIdle ();
1594 scrollbar_show (0); 1561 scrollbar_show (0);
1595 } 1562 }
1596#ifdef MENUBAR
1597 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1598 menubar_expose ();
1599#endif
1600
1601#ifdef TRANSPARENT
1602 if (am_transparent && ev.xany.window == parent[0])
1603 XClearWindow (disp, ev.xany.window);
1604#endif
1605 } 1563 }
1606 break; 1564 break;
1607 1565
1608 case MotionNotify: 1566 case MotionNotify:
1609#ifdef POINTER_BLANK 1567#ifdef POINTER_BLANK
1610 if (hidden_pointer) 1568 if (hidden_pointer)
1611 pointer_unblank (); 1569 pointer_unblank ();
1612#endif 1570#endif
1613#if MENUBAR
1614 if (isMenuBarWindow (ev.xany.window))
1615 {
1616 menubar_control (ev.xbutton);
1617 break;
1618 }
1619#endif
1620 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1571 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1621 break; 1572 break;
1622 1573
1623 if (ev.xany.window == vt) 1574 if (ev.xany.window == vt)
1624 { 1575 {
1576 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1625 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1577 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1626 ; // nop 1578 ; // nop
1627 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1579 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1628 { 1580 {
1629 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1581 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1630 ; 1582 ;
1631 1583
1632 XQueryPointer (disp, vt, 1584 XQueryPointer (dpy, vt,
1633 &unused_root, &unused_child, 1585 &unused_root, &unused_child,
1634 &unused_root_x, &unused_root_y, 1586 &unused_root_x, &unused_root_y,
1635 &ev.xbutton.x, &ev.xbutton.y, 1587 &ev.xbutton.x, &ev.xbutton.y,
1636 &ev.xbutton.state); 1588 &ev.xbutton.state);
1637#ifdef MOUSE_THRESHOLD 1589#ifdef MOUSE_THRESHOLD
… …
1701#endif 1653#endif
1702 } 1654 }
1703 } 1655 }
1704 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1705 { 1657 {
1706 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1707 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1708 ; 1660 ;
1709 1661
1710 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1711 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1712 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1713 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1714 &unused_mask); 1666 &unused_mask);
1715 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1716 scrollbar_size ()); 1668 scrollbar_size ());
1717 want_refresh = 1; 1669 want_refresh = 1;
1718 refresh_limit = 0;
1719 scrollbar_show (1); 1670 scrollbar_show (1);
1720 } 1671 }
1721 break; 1672 break;
1722 } 1673 }
1723 1674
1724skip_switch: ;
1725
1726#if defined(CURSOR_BLINK) 1675#if defined(CURSOR_BLINK)
1727 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1728 { 1677 {
1729 if (hidden_cursor) 1678 if (hidden_cursor)
1730 { 1679 {
1731 hidden_cursor = 0; 1680 hidden_cursor = 0;
1732 want_refresh = 1; 1681 want_refresh = 1;
1733 } 1682 }
1734 1683
1735 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1684 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1736 } 1685 }
1737#endif 1686#endif
1738 1687
1739#if defined(POINTER_BLANK) 1688#if defined(POINTER_BLANK)
1740 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1741 { 1690 {
1742 if (ev.type == MotionNotify 1691 if (ev.type == MotionNotify
1743 || ev.type == ButtonPress 1692 || ev.type == ButtonPress
1744 || ev.type == ButtonRelease) 1693 || ev.type == ButtonRelease)
1745 if (hidden_pointer) 1694 if (hidden_pointer)
… …
1757 if (!focus) 1706 if (!focus)
1758 { 1707 {
1759 focus = 1; 1708 focus = 1;
1760 want_refresh = 1; 1709 want_refresh = 1;
1761 1710
1762 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1711 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1763 1712
1764#if USE_XIM 1713#if USE_XIM
1765 if (Input_Context != NULL) 1714 if (Input_Context != NULL)
1766 { 1715 {
1767 IMSetStatusPosition (); 1716 IMSetPosition ();
1768 XSetICFocus (Input_Context); 1717 XSetICFocus (Input_Context);
1769 } 1718 }
1770#endif 1719#endif
1771#if CURSOR_BLINK 1720#if CURSOR_BLINK
1772 if (OPTION (Opt_cursorBlink)) 1721 if (option (Opt_cursorBlink))
1773 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1722 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1774#endif 1723#endif
1775#if OFF_FOCUS_FADING 1724#if OFF_FOCUS_FADING
1776 if (rs[Rs_fade]) 1725 if (rs[Rs_fade])
1777 { 1726 {
1778 pix_colors = pix_colors_focused; 1727 pix_colors = pix_colors_focused;
1779 scr_recolour (); 1728 scr_recolour ();
1780 } 1729 }
1781#endif 1730#endif
1731#if ENABLE_FRILLS
1732 if (option (Opt_urgentOnBell))
1733 {
1734 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1735 {
1736 h->flags &= ~XUrgencyHint;
1737 XSetWMHints (dpy, parent[0], h);
1738 }
1739 }
1740#endif
1782 } 1741 }
1783} 1742}
1784 1743
1785void 1744void
1786rxvt_term::focus_out () 1745rxvt_term::focus_out ()
… …
1794 1753
1795#if ENABLE_FRILLS || ISO_14755 1754#if ENABLE_FRILLS || ISO_14755
1796 if (iso14755buf) 1755 if (iso14755buf)
1797 { 1756 {
1798 iso14755buf = 0; 1757 iso14755buf = 0;
1799# if ENABLE_OVERLAY 1758# if ISO_14755
1800 scr_overlay_off (); 1759 scr_overlay_off ();
1801# endif 1760# endif
1802 } 1761 }
1803#endif 1762#endif
1804#if USE_XIM 1763#if USE_XIM
1805 if (Input_Context != NULL) 1764 if (Input_Context != NULL)
1806 XUnsetICFocus (Input_Context); 1765 XUnsetICFocus (Input_Context);
1807#endif 1766#endif
1808#if CURSOR_BLINK 1767#if CURSOR_BLINK
1809 if (OPTION (Opt_cursorBlink)) 1768 if (option (Opt_cursorBlink))
1810 cursor_blink_ev.stop (); 1769 cursor_blink_ev.stop ();
1811 hidden_cursor = 0; 1770 hidden_cursor = 0;
1812#endif 1771#endif
1813#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1814 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
… …
1818 } 1777 }
1819#endif 1778#endif
1820 } 1779 }
1821} 1780}
1822 1781
1823#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if ENABLE_TRANSPARENCY || ENABLE_PERL
1824void 1796void
1825rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1826{ 1798{
1827 SET_R (this); 1799 make_current ();
1828 SET_LOCALE (locale);
1829 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if ENABLE_TRANSPARENCY
1830 switch (ev.type) 1806 switch (ev.type)
1831 { 1807 {
1832 case PropertyNotify: 1808 case PropertyNotify:
1833 /* 1809 /*
1834 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
1835 * use the property to determine the pixmap. We use it later on. 1811 * use the property to determine the pixmap. We use it later on.
1836 */ 1812 */
1837 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1838 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1839 return; 1815 {
1840 1816 bgPixmap.set_root_pixmap ();
1841 /* FALLTHROUGH */ 1817 update_background ();
1842 case ReparentNotify: 1818 }
1843 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1844 want_refresh = want_full_refresh = 1;
1845 break; 1819 break;
1846 } 1820 }
1821# endif
1847} 1822}
1848#endif 1823#endif
1849 1824
1850void 1825void
1851rxvt_term::button_press (XButtonEvent &ev) 1826rxvt_term::button_press (XButtonEvent &ev)
… …
1860 /* 1835 /*
1861 * VT window processing of button press 1836 * VT window processing of button press
1862 */ 1837 */
1863 if (ev.window == vt) 1838 if (ev.window == vt)
1864 { 1839 {
1840 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1841 return;
1842
1865#if ISO_14755 1843#if ISO_14755
1866 // 5.4 1844 // 5.4
1867 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1845 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1868 { 1846 {
1869 iso14755_54 (ev.x, ev.y); 1847 iso14755_54 (ev.x, ev.y);
… …
1911 else 1889 else
1912 { 1890 {
1913 if (ev.button != MEvent.button) 1891 if (ev.button != MEvent.button)
1914 MEvent.clicks = 0; 1892 MEvent.clicks = 0;
1915 1893
1916 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1917 switch (ev.button) 1894 switch (ev.button)
1918 { 1895 {
1919 case Button1: 1896 case Button1:
1920 /* allow meta + click to select rectangular areas */ 1897 /* allow meta + click to select rectangular areas */
1921 /* should be done in screen.C */ 1898 /* should be done in screen.C */
1922#if ENABLE_FRILLS 1899#if ENABLE_FRILLS
1923 selection.rect = !!(ev.state & ModMetaMask); 1900 selection.rect = !!(ev.state & ModMetaMask);
1924#else 1901#else
1925 selection.rect = false; 1902 selection.rect = false;
1926#endif 1903#endif
1927 1904
1928 /* allow shift+left click to extend selection */ 1905 /* allow shift+left click to extend selection */
1929 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1906 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1930 { 1907 {
1931 if (MEvent.button == Button1 && clickintime) 1908 if (MEvent.button == Button1 && clickintime)
1932 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1933 else 1910 else
1934 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1935 } 1912 }
1936 else 1913 else
1937 { 1914 {
1938 if (MEvent.button == Button1 && clickintime) 1915 if (MEvent.button == Button1 && clickintime)
1939 MEvent.clicks++; 1916 MEvent.clicks++;
1940 else 1917 else
1941 MEvent.clicks = 1; 1918 MEvent.clicks = 1;
1942 1919
1943 selection_click (MEvent.clicks, ev.x, ev.y); 1920 selection_click (MEvent.clicks, ev.x, ev.y);
1944 } 1921 }
1945 1922
1946 MEvent.button = Button1; 1923 MEvent.button = Button1;
1947 break; 1924 break;
1948 1925
1949 case Button3: 1926 case Button3:
1950 if (MEvent.button == Button3 && clickintime) 1927 if (MEvent.button == Button3 && clickintime)
1951 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1952 else 1929 else
1953 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1954 1931
1955 MEvent.button = Button3; 1932 MEvent.button = Button3;
1956 break; 1933 break;
1957 } 1934 }
1958 } 1935 }
1959 1936
1960 MEvent.time = ev.time; 1937 MEvent.time = ev.time;
1961 return; 1938 return;
1962 } 1939 }
1963 1940
… …
2102 } 2079 }
2103 } 2080 }
2104 2081
2105 return; 2082 return;
2106 } 2083 }
2107
2108#if MENUBAR
2109 /*
2110 * Menubar window processing of button press
2111 */
2112 if (isMenuBarWindow (ev.window))
2113 menubar_control (ev);
2114#endif
2115} 2084}
2116 2085
2117void 2086void
2118rxvt_term::button_release (XButtonEvent &ev) 2087rxvt_term::button_release (XButtonEvent &ev)
2119{ 2088{
… …
2125 2094
2126 if (scrollbar_isUpDn ()) 2095 if (scrollbar_isUpDn ())
2127 { 2096 {
2128 scrollBar.setIdle (); 2097 scrollBar.setIdle ();
2129 scrollbar_show (0); 2098 scrollbar_show (0);
2130#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2131 refresh_type &= ~SMOOTH_REFRESH;
2132#endif
2133 } 2099 }
2134 2100
2135#ifdef SELECTION_SCROLLING 2101#ifdef SELECTION_SCROLLING
2136 if (sel_scroll_ev.active) 2102 if (sel_scroll_ev.active)
2137 sel_scroll_ev.stop(); 2103 sel_scroll_ev.stop();
2138#endif 2104#endif
2139 2105
2140 if (ev.window == vt) 2106 if (ev.window == vt)
2141 { 2107 {
2108 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2109 return;
2110
2142#if ISO_14755 2111#if ISO_14755
2143 // 5.4 2112 // 5.4
2144 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2113 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2145 return; 2114 return;
2146#endif 2115#endif
2116
2147 if (reportmode) 2117 if (reportmode)
2148 { 2118 {
2149 /* mouse report from vt window */ 2119 /* mouse report from vt window */
2150 /* don't report release of wheel "buttons" */ 2120 /* don't report release of wheel "buttons" */
2151 if (ev.button >= 4) 2121 if (ev.button >= 4)
… …
2175 if (priv_modes & PrivMode_mouse_report 2145 if (priv_modes & PrivMode_mouse_report
2176 && bypass_keystate 2146 && bypass_keystate
2177 && ev.button == Button1 && MEvent.clicks <= 1) 2147 && ev.button == Button1 && MEvent.clicks <= 1)
2178 selection_extend (ev.x, ev.y, 0); 2148 selection_extend (ev.x, ev.y, 0);
2179 2149
2180 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2181 return;
2182
2183 switch (ev.button) 2150 switch (ev.button)
2184 { 2151 {
2185 case Button1: 2152 case Button1:
2186 case Button3: 2153 case Button3:
2187 selection_make (ev.time); 2154 selection_make (ev.time);
2188 break; 2155 break;
2156
2189 case Button2: 2157 case Button2:
2190 selection_request (ev.time, ev.x, ev.y); 2158 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2159 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2191 break; 2160 break;
2161
2192#ifdef MOUSE_WHEEL 2162#ifdef MOUSE_WHEEL
2193 case Button4: 2163 case Button4:
2194 case Button5: 2164 case Button5:
2195 { 2165 {
2196 int i; 2166 int i;
… …
2198 2168
2199 v = ev.button == Button4 ? UP : DN; 2169 v = ev.button == Button4 ? UP : DN;
2200 2170
2201 if (ev.state & ShiftMask) 2171 if (ev.state & ShiftMask)
2202 i = 1; 2172 i = 1;
2203 else if (OPTION (Opt_mouseWheelScrollPage)) 2173 else if (option (Opt_mouseWheelScrollPage))
2204 i = nrow - 1; 2174 i = nrow - 1;
2205 else 2175 else
2206 i = 5; 2176 i = 5;
2207 2177
2208# ifdef MOUSE_SLIP_WHEELING 2178# ifdef MOUSE_SLIP_WHEELING
… …
2228 } 2198 }
2229 break; 2199 break;
2230#endif 2200#endif
2231 } 2201 }
2232 } 2202 }
2233#ifdef MENUBAR
2234 else if (isMenuBarWindow (ev.window))
2235 menubar_control (ev);
2236#endif
2237} 2203}
2238
2239#ifdef TRANSPARENT
2240#if TINTING
2241/* taken from aterm-0.4.2 */
2242
2243typedef uint32_t RUINT32T;
2244
2245void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2246{
2247 int sh_r, sh_g, sh_b;
2248 RUINT32T mask_r, mask_g, mask_b;
2249 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2250 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2251 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2252 int i;
2253
2254 Visual *visual = display->visual;
2255
2256 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2257
2258 /* for convenience */
2259 mask_r = visual->red_mask;
2260 mask_g = visual->green_mask;
2261 mask_b = visual->blue_mask;
2262
2263 /* boring lookup table pre-initialization */
2264 switch (srcImage->bits_per_pixel) {
2265 case 15:
2266 if ((mask_r != 0x7c00) ||
2267 (mask_g != 0x03e0) ||
2268 (mask_b != 0x001f))
2269 return;
2270 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2271 lookup_r = lookup;
2272 lookup_g = lookup+32;
2273 lookup_b = lookup+32+32;
2274 sh_r = 10;
2275 sh_g = 5;
2276 sh_b = 0;
2277 break;
2278 case 16:
2279 if ((mask_r != 0xf800) ||
2280 (mask_g != 0x07e0) ||
2281 (mask_b != 0x001f))
2282 return;
2283 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2284 lookup_r = lookup;
2285 lookup_g = lookup+32;
2286 lookup_b = lookup+32+64;
2287 sh_r = 11;
2288 sh_g = 5;
2289 sh_b = 0;
2290 break;
2291 case 24:
2292 if ((mask_r != 0xff0000) ||
2293 (mask_g != 0x00ff00) ||
2294 (mask_b != 0x0000ff))
2295 return;
2296 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2297 lookup_r = lookup;
2298 lookup_g = lookup+256;
2299 lookup_b = lookup+256+256;
2300 sh_r = 16;
2301 sh_g = 8;
2302 sh_b = 0;
2303 break;
2304 case 32:
2305 if ((mask_r != 0xff0000) ||
2306 (mask_g != 0x00ff00) ||
2307 (mask_b != 0x0000ff))
2308 return;
2309 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2310 lookup_r = lookup;
2311 lookup_g = lookup+256;
2312 lookup_b = lookup+256+256;
2313 sh_r = 16;
2314 sh_g = 8;
2315 sh_b = 0;
2316 break;
2317 default:
2318 return; /* we do not support this color depth */
2319 }
2320
2321 /* prepare limits for color transformation (each channel is handled separately) */
2322 if (shade < 0) {
2323 shade = -shade;
2324 if (shade < 0) shade = 0;
2325 if (shade > 100) shade = 100;
2326
2327 lower_lim_r = 65535-rm;
2328 lower_lim_g = 65535-gm;
2329 lower_lim_b = 65535-bm;
2330
2331 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2332 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2333 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2334
2335 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2336 } else {
2337 if (shade < 0) shade = 0;
2338 if (shade > 100) shade = 100;
2339
2340 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2341
2342 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2343 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2344 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2345 }
2346
2347 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2348 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2349 {
2350 unsigned int tmp;
2351
2352 tmp = lower_lim_r;
2353 lower_lim_r = lower_lim_b;
2354 lower_lim_b = tmp;
2355
2356 tmp = upper_lim_r;
2357 upper_lim_r = upper_lim_b;
2358 upper_lim_b = tmp;
2359 }
2360
2361 /* fill our lookup tables */
2362 for (i = 0; i <= mask_r>>sh_r; i++)
2363 {
2364 RUINT32T tmp;
2365 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2366 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2367 lookup_r[i] = (tmp/65535)<<sh_r;
2368 }
2369 for (i = 0; i <= mask_g>>sh_g; i++)
2370 {
2371 RUINT32T tmp;
2372 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2373 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2374 lookup_g[i] = (tmp/65535)<<sh_g;
2375 }
2376 for (i = 0; i <= mask_b>>sh_b; i++)
2377 {
2378 RUINT32T tmp;
2379 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2380 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2381 lookup_b[i] = (tmp/65535)<<sh_b;
2382 }
2383
2384 /* apply table to input image (replacing colors by newly calculated ones) */
2385 switch (srcImage->bits_per_pixel)
2386 {
2387 case 15:
2388 {
2389 unsigned short *p1, *pf, *p, *pl;
2390 p1 = (unsigned short *) srcImage->data;
2391 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2392 while (p1 < pf)
2393 {
2394 p = p1;
2395 pl = p1 + srcImage->width;
2396 for (; p < pl; p++)
2397 {
2398 *p = lookup_r[(*p & 0x7c00)>>10] |
2399 lookup_g[(*p & 0x03e0)>> 5] |
2400 lookup_b[(*p & 0x001f)];
2401 }
2402 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 case 16:
2407 {
2408 unsigned short *p1, *pf, *p, *pl;
2409 p1 = (unsigned short *) srcImage->data;
2410 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2411 while (p1 < pf)
2412 {
2413 p = p1;
2414 pl = p1 + srcImage->width;
2415 for (; p < pl; p++)
2416 {
2417 *p = lookup_r[(*p & 0xf800)>>11] |
2418 lookup_g[(*p & 0x07e0)>> 5] |
2419 lookup_b[(*p & 0x001f)];
2420 }
2421 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2422 }
2423 break;
2424 }
2425 case 24:
2426 {
2427 unsigned char *p1, *pf, *p, *pl;
2428 p1 = (unsigned char *) srcImage->data;
2429 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2430 while (p1 < pf)
2431 {
2432 p = p1;
2433 pl = p1 + srcImage->width * 3;
2434 for (; p < pl; p += 3)
2435 {
2436 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2437 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2438 p[2] = lookup_r[(p[2] & 0x0000ff)];
2439 }
2440 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2441 }
2442 break;
2443 }
2444 case 32:
2445 {
2446 RUINT32T *p1, *pf, *p, *pl;
2447 p1 = (RUINT32T *) srcImage->data;
2448 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2449
2450 while (p1 < pf)
2451 {
2452 p = p1;
2453 pl = p1 + srcImage->width;
2454 for (; p < pl; p++)
2455 {
2456 *p = lookup_r[(*p & 0xff0000)>>16] |
2457 lookup_g[(*p & 0x00ff00)>> 8] |
2458 lookup_b[(*p & 0x0000ff)] |
2459 (*p & ~0xffffff);
2460 }
2461 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2462 }
2463 break;
2464 }
2465 }
2466
2467 free (lookup);
2468}
2469#endif
2470
2471/*
2472 * Check our parents are still who we think they are.
2473 * Do transparency updates if required
2474 */
2475int
2476rxvt_term::check_our_parents ()
2477{
2478 int i, pchanged, aformat, have_pixmap, rootdepth;
2479 unsigned long nitems, bytes_after;
2480 Atom atype;
2481 unsigned char *prop = NULL;
2482 Window root, oldp, *list;
2483 Pixmap rootpixmap = None;
2484 XWindowAttributes wattr, wrootattr;
2485 dDisp;
2486
2487 pchanged = 0;
2488
2489 if (!OPTION (Opt_transparent))
2490 return pchanged; /* Don't try any more */
2491
2492 XGetWindowAttributes (disp, display->root, &wrootattr);
2493 rootdepth = wrootattr.depth;
2494
2495 XGetWindowAttributes (disp, parent[0], &wattr);
2496
2497 if (rootdepth != wattr.depth)
2498 {
2499 if (am_transparent)
2500 {
2501 pchanged = 1;
2502 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2503 am_transparent = am_pixmap_trans = 0;
2504 }
2505
2506 return pchanged; /* Don't try any more */
2507 }
2508
2509 /* Get all X ops out of the queue so that our information is up-to-date. */
2510 XSync (disp, False);
2511
2512 /*
2513 * Make the frame window set by the window manager have
2514 * the root background. Some window managers put multiple nested frame
2515 * windows for each client, so we have to take care about that.
2516 */
2517 i = (xa[XA_XROOTPMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success);
2521
2522 if (!i || prop == NULL)
2523 i = (xa[XA_ESETROOT_PMAP_ID]
2524 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2525 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2526 &nitems, &bytes_after, &prop) == Success);
2527
2528 if (!i || prop == NULL
2529#if TINTING
2530 || !rs[Rs_color + Color_tint]
2531#endif
2532 )
2533 have_pixmap = 0;
2534 else
2535 {
2536 have_pixmap = 1;
2537 rootpixmap = *(Pixmap *)prop;
2538 XFree (prop);
2539 }
2540
2541 if (have_pixmap)
2542 {
2543 /*
2544 * Copy display->root pixmap transparency
2545 */
2546 int sx, sy, nx, ny;
2547 unsigned int nw, nh;
2548 Window cr;
2549 XImage *image;
2550 GC gc;
2551 XGCValues gcvalue;
2552
2553 XTranslateCoordinates (disp, parent[0], display->root,
2554 0, 0, &sx, &sy, &cr);
2555 nw = (unsigned int)szHint.width;
2556 nh = (unsigned int)szHint.height;
2557 nx = ny = 0;
2558
2559 if (sx < 0)
2560 {
2561 nw += sx;
2562 nx = -sx;
2563 sx = 0;
2564 }
2565
2566 if (sy < 0)
2567 {
2568 nh += sy;
2569 ny = -sy;
2570 sy = 0;
2571 }
2572
2573 min_it (nw, (unsigned int) (wrootattr.width - sx));
2574 min_it (nh, (unsigned int) (wrootattr.height - sy));
2575
2576 XSync (disp, False);
2577 allowedxerror = -1;
2578 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2579
2580 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2581 /* XXX: may need a delay here? */
2582 allowedxerror = 0;
2583
2584 if (image == NULL)
2585 {
2586 if (am_transparent && am_pixmap_trans)
2587 {
2588 pchanged = 1;
2589 if (pixmap != None)
2590 {
2591 XFreePixmap (disp, pixmap);
2592 pixmap = None;
2593 }
2594 }
2595
2596 am_pixmap_trans = 0;
2597 }
2598 else
2599 {
2600 if (pixmap != None)
2601 XFreePixmap (disp, pixmap);
2602
2603#if TINTING
2604 if (ISSET_PIXCOLOR (Color_tint))
2605 {
2606 unsigned short rm, gm, bm;
2607 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2608
2609 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2610
2611 ShadeXImage (display, image, shade, rm, gm, bm);
2612 }
2613#endif
2614
2615 pixmap = XCreatePixmap (disp, vt,
2616 szHint.width, szHint.height, image->depth);
2617 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2618 XPutImage (disp, pixmap, gc, image, 0, 0,
2619 nx, ny, image->width, image->height);
2620 XFreeGC (disp, gc);
2621 XDestroyImage (image);
2622 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2623 XClearWindow (disp, parent[0]);
2624
2625 if (!am_transparent || !am_pixmap_trans)
2626 pchanged = 1;
2627
2628 am_transparent = am_pixmap_trans = 1;
2629 }
2630 }
2631
2632 if (am_pixmap_trans)
2633 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2634 else
2635 {
2636 unsigned int n;
2637 /*
2638 * InheritPixmap transparency
2639 */
2640 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2641 {
2642 oldp = parent[i];
2643 XQueryTree (disp, parent[i - 1], &root,
2644 &parent[i], &list, &n);
2645 XFree (list);
2646
2647 if (parent[i] == display->root)
2648 {
2649 if (oldp != None)
2650 pchanged = 1;
2651
2652 break;
2653 }
2654
2655 if (oldp != parent[i])
2656 pchanged = 1;
2657 }
2658
2659 n = 0;
2660
2661 if (pchanged)
2662 {
2663 for (; n < (unsigned int)i; n++)
2664 {
2665 XGetWindowAttributes (disp, parent[n], &wattr);
2666 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2667 {
2668 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2669 break;
2670 }
2671 }
2672 }
2673
2674 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2675 {
2676 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2677 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2678 am_transparent = 0;
2679 /* XXX: also turn off Opt_transparent? */
2680 }
2681 else
2682 {
2683#if WAIT_FOR_WM
2684 /* wait (an arbitrary period) for the WM to do its thing
2685 * needed for fvwm2.2.2 (and before?) */
2686 sleep (1);
2687#endif
2688 for (n = 0; n < (unsigned int)i; n++)
2689 {
2690 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2691 XClearWindow (disp, parent[n]);
2692 }
2693
2694 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2695 am_transparent = 1;
2696 }
2697
2698 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2699 parent[i] = None;
2700 }
2701
2702 if (scrollBar.win)
2703 {
2704 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2705 scrollBar.setIdle ();
2706 scrollbar_show (0);
2707 }
2708
2709 if (am_transparent)
2710 {
2711 want_refresh = want_full_refresh = 1;
2712 if (am_pixmap_trans)
2713 flush ();
2714 }
2715
2716 return pchanged;
2717}
2718#endif
2719 2204
2720/*}}} */ 2205/*}}} */
2721 2206
2722bool 2207bool
2723rxvt_term::cmd_parse () 2208rxvt_term::cmd_parse ()
… …
2772 if (ch == C0_LF) 2257 if (ch == C0_LF)
2773 nlines++; 2258 nlines++;
2774 2259
2775 refresh_count++; 2260 refresh_count++;
2776 2261
2777 if (!OPTION (Opt_jumpScroll) 2262 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2778 || (refresh_count >= refresh_limit * (nrow - 1)))
2779 { 2263 {
2780 refreshnow = true;
2781 refresh_count = 0; 2264 refresh_count = 0;
2265
2266 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2267 {
2268 refreshnow = true;
2782 ch = NOCHAR; 2269 ch = NOCHAR;
2783 break; 2270 break;
2271 }
2784 } 2272 }
2785 2273
2786 // scr_add_lines only works for nlines <= nrow - 1. 2274 // scr_add_lines only works for nlines <= nrow - 1.
2787 if (nlines >= nrow - 1) 2275 if (nlines >= nrow - 1)
2788 { 2276 {
2277 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2278 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2790 scr_add_lines (buf, str - buf, nlines); 2279 scr_add_lines (buf, str - buf, nlines);
2791 2280
2792 nlines = 0; 2281 nlines = 0;
2793 str = buf; 2282 str = buf;
2794 eol = str + min (ncol, UBUFSIZ); 2283 eol = str + min (ncol, UBUFSIZ);
… …
2809 2298
2810 seq_begin = cmdbuf_ptr; 2299 seq_begin = cmdbuf_ptr;
2811 ch = next_char (); 2300 ch = next_char ();
2812 } 2301 }
2813 2302
2303 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2814 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2304 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2815 scr_add_lines (buf, str - buf, nlines); 2305 scr_add_lines (buf, str - buf, nlines);
2816 2306
2817 /* 2307 /*
2818 * If there have been a lot of new lines, then update the screen 2308 * If there have been a lot of new lines, then update the screen
2819 * What the heck I'll cheat and only refresh less than every page-full. 2309 * What the heck we'll cheat and only refresh less than every page-full.
2820 * the number of pages between refreshes is refresh_limit, which 2310 * if skipScroll is enabled.
2821 * is incremented here because we must be doing flat-out scrolling.
2822 */ 2311 */
2823 if (refreshnow) 2312 if (refreshnow)
2824 { 2313 {
2825 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2826 refresh_limit++;
2827 else
2828 {
2829 flag = true; 2314 flag = true;
2830 scr_refresh (refresh_type); 2315 scr_refresh ();
2831 want_refresh = 1; 2316 want_refresh = 1;
2832 }
2833 } 2317 }
2834 2318
2835 } 2319 }
2836 else 2320 else
2837 { 2321 {
… …
2853 return flag; 2337 return flag;
2854} 2338}
2855 2339
2856// read the next character 2340// read the next character
2857wchar_t 2341wchar_t
2858rxvt_term::next_char () 2342rxvt_term::next_char () NOTHROW
2859{ 2343{
2860 while (cmdbuf_ptr < cmdbuf_endp) 2344 while (cmdbuf_ptr < cmdbuf_endp)
2861 { 2345 {
2862 // assume 7-bit to be ascii ALWAYS 2346 // assume 7-bit to be ascii ALWAYS
2863 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2347 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2884 return NOCHAR; 2368 return NOCHAR;
2885} 2369}
2886 2370
2887// read the next octet 2371// read the next octet
2888uint32_t 2372uint32_t
2889rxvt_term::next_octet () 2373rxvt_term::next_octet () NOTHROW
2890{ 2374{
2891 return cmdbuf_ptr < cmdbuf_endp 2375 return cmdbuf_ptr < cmdbuf_endp
2892 ? (unsigned char)*cmdbuf_ptr++ 2376 ? (unsigned char)*cmdbuf_ptr++
2893 : NOCHAR; 2377 : NOCHAR;
2894} 2378}
2379
2380static class out_of_input out_of_input;
2895 2381
2896/* rxvt_cmd_getc () - Return next input character */ 2382/* rxvt_cmd_getc () - Return next input character */
2897/* 2383/*
2898 * Return the next input character after first passing any keyboard input 2384 * Return the next input character after first passing any keyboard input
2899 * to the command. 2385 * to the command.
2900 */ 2386 */
2901wchar_t 2387wchar_t
2902rxvt_term::cmd_getc () 2388rxvt_term::cmd_getc () THROW ((class out_of_input))
2903{ 2389{
2904 wchar_t c = next_char (); 2390 wchar_t c = next_char ();
2905 2391
2906 if (c == NOCHAR) 2392 if (c == NOCHAR)
2907 throw out_of_input; 2393 throw out_of_input;
2908 2394
2909 return c; 2395 return c;
2910} 2396}
2911 2397
2912uint32_t 2398uint32_t
2913rxvt_term::cmd_get8 () 2399rxvt_term::cmd_get8 () THROW ((class out_of_input))
2914{ 2400{
2915 uint32_t c = next_octet (); 2401 uint32_t c = next_octet ();
2916 2402
2917 if (c == NOCHAR) 2403 if (c == NOCHAR)
2918 throw out_of_input; 2404 throw out_of_input;
… …
2984 { 2470 {
2985 if ((buf[len++] = cmd_getc ()) == 'i') 2471 if ((buf[len++] = cmd_getc ()) == 'i')
2986 break; /* done = 1 */ 2472 break; /* done = 1 */
2987 } 2473 }
2988 } 2474 }
2989 2475
2990 for (i = 0; i < len; i++) 2476 for (i = 0; i < len; i++)
2991 if (putc (buf[i], fd) == EOF) 2477 if (putc (buf[i], fd) == EOF)
2992 { 2478 {
2993 done = 1; 2479 done = 1;
2994 break; 2480 break;
… …
3056 process_dcs_seq (); 2542 process_dcs_seq ();
3057 break; 2543 break;
3058 case 0x9b: /* CSI */ 2544 case 0x9b: /* CSI */
3059 process_csi_seq (); 2545 process_csi_seq ();
3060 break; 2546 break;
3061 case 0x9d: /* CSI */ 2547 case 0x9d: /* OSC */
3062 process_osc_seq (); 2548 process_osc_seq ();
3063 break; 2549 break;
3064#endif 2550#endif
3065 } 2551 }
3066} 2552}
… …
3156 scr_charset_set (2, (unsigned int)cmd_getc ()); 2642 scr_charset_set (2, (unsigned int)cmd_getc ());
3157 break; 2643 break;
3158 case '+': 2644 case '+':
3159 scr_charset_set (3, (unsigned int)cmd_getc ()); 2645 scr_charset_set (3, (unsigned int)cmd_getc ());
3160 break; 2646 break;
3161#if ENABLE_FRILLS 2647#if !ENABLE_MINIMAL
3162 case '6': 2648 case '6':
3163 scr_backindex (); 2649 scr_backindex ();
3164 break; 2650 break;
3165#endif 2651#endif
3166 case '7': 2652 case '7':
3167 scr_cursor (SAVE); 2653 scr_cursor (SAVE);
3168 break; 2654 break;
3169 case '8': 2655 case '8':
3170 scr_cursor (RESTORE); 2656 scr_cursor (RESTORE);
3171 break; 2657 break;
3172#if ENABLE_FRILLS 2658#if !ENABLE_MINIMAL
3173 case '9': 2659 case '9':
3174 scr_forwardindex (); 2660 scr_forwardindex ();
3175 break; 2661 break;
3176#endif 2662#endif
3177 case '=': 2663 case '=':
… …
3292rxvt_term::process_csi_seq () 2778rxvt_term::process_csi_seq ()
3293{ 2779{
3294 unicode_t ch, priv, i; 2780 unicode_t ch, priv, i;
3295 unsigned int nargs, p; 2781 unsigned int nargs, p;
3296 int n, ndef; 2782 int n, ndef;
3297 int arg[ESC_ARGS]; 2783 int arg[ESC_ARGS] = { };
3298 2784
3299 for (nargs = ESC_ARGS; nargs > 0;) 2785 nargs = 0;
3300 arg[--nargs] = 0;
3301 2786
3302 priv = 0; 2787 priv = 0;
3303 ch = cmd_getc (); 2788 ch = cmd_getc ();
3304 if (ch >= '<' && ch <= '?') 2789 if (ch >= '<' && ch <= '?')
3305 { /* '<' '=' '>' '?' */ 2790 { /* '<' '=' '>' '?' */
… …
3339 ndef = get_byte_array_bit (csi_defaults, i); 2824 ndef = get_byte_array_bit (csi_defaults, i);
3340 for (p = 0; p < nargs; p++) 2825 for (p = 0; p < nargs; p++)
3341 if (arg[p] == -1) 2826 if (arg[p] == -1)
3342 arg[p] = ndef; 2827 arg[p] = ndef;
3343 2828
3344#ifdef DEBUG_CMD
3345 fprintf (stderr, "CSI ");
3346 for (p = 0; p < nargs; p++)
3347 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3348 fprintf (stderr, "%c\n", ch);
3349#endif
3350
3351 /* 2829 /*
3352 * private mode handling 2830 * private mode handling
3353 */ 2831 */
3354 if (priv) 2832 if (priv)
3355 { 2833 {
3356 switch (priv) 2834 switch (priv)
3357 { 2835 {
3358 case '>': 2836 case '>':
3359 if (ch == CSI_DA) /* secondary device attributes */ 2837 if (ch == CSI_DA) /* secondary device attributes */
3360 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2838 {
2839 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2840 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2841 //
2842 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2843 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2844 // that we do not support xterm mouse reporting (should be 95 when we do).
2845 //
2846 tt_printf ("\033[>%d;94;0c", 'U');
2847 }
3361 break; 2848 break;
3362 case '?': 2849 case '?':
3363 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2850 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3364 process_terminal_mode (ch, priv, nargs, arg); 2851 process_terminal_mode (ch, priv, nargs, arg);
3365 break; 2852 break;
… …
3491 break; 2978 break;
3492 case 6: /* CPR requested */ 2979 case 6: /* CPR requested */
3493 scr_report_position (); 2980 scr_report_position ();
3494 break; 2981 break;
3495 case 7: /* unofficial extension */ 2982 case 7: /* unofficial extension */
3496 if (OPTION (Opt_insecure)) 2983 if (option (Opt_insecure))
3497 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2984 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3498 break; 2985 break;
3499 case 8: /* unofficial extension */ 2986 case 8: /* unofficial extension */
3500 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2987 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3501 break; 2988 break;
… …
3568 break; 3055 break;
3569 case CSI_75: 3056 case CSI_75:
3570 scr_cursor (RESTORE); 3057 scr_cursor (RESTORE);
3571 break; 3058 break;
3572 3059
3573#if ENABLE_FRILLS 3060#if !ENABLE_MINIMAL
3574 case CSI_74: 3061 case CSI_74:
3575 process_window_ops (arg, nargs); 3062 process_window_ops (arg, nargs);
3576 break; 3063 break;
3577#endif 3064#endif
3578 3065
… …
3585 break; 3072 break;
3586 } 3073 }
3587} 3074}
3588/*}}} */ 3075/*}}} */
3589 3076
3590#if ENABLE_FRILLS 3077#if !ENABLE_MINIMAL
3591/* ARGSUSED */ 3078/* ARGSUSED */
3592void 3079void
3593rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3080rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3594{ 3081{
3595 int x, y; 3082 int x, y;
3596 XWindowAttributes wattr; 3083 XWindowAttributes wattr;
3597 Window wdummy; 3084 Window wdummy;
3598 dDisp; 3085
3086 dLocal (Display *, dpy);
3599 3087
3600 if (nargs == 0) 3088 if (nargs == 0)
3601 return; 3089 return;
3602 3090
3603 switch (args[0]) 3091 switch (args[0])
3604 { 3092 {
3605 /* 3093 /*
3606 * commands 3094 * commands
3607 */ 3095 */
3608 case 1: /* deiconify window */ 3096 case 1: /* deiconify window */
3609 XMapWindow (disp, parent[0]); 3097 XMapWindow (dpy, parent[0]);
3610 break; 3098 break;
3611 case 2: /* iconify window */ 3099 case 2: /* iconify window */
3612 XIconifyWindow (disp, parent[0], display->screen); 3100 XIconifyWindow (dpy, parent[0], display->screen);
3613 break; 3101 break;
3614 case 3: /* set position (pixels) */ 3102 case 3: /* set position (pixels) */
3615 XMoveWindow (disp, parent[0], args[1], args[2]); 3103 XMoveWindow (dpy, parent[0], args[1], args[2]);
3616 break; 3104 break;
3617 case 4: /* set size (pixels) */ 3105 case 4: /* set size (pixels) */
3618 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3106 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3619 break; 3107 break;
3620 case 5: /* raise window */ 3108 case 5: /* raise window */
3621 XRaiseWindow (disp, parent[0]); 3109 XRaiseWindow (dpy, parent[0]);
3622 break; 3110 break;
3623 case 6: /* lower window */ 3111 case 6: /* lower window */
3624 XLowerWindow (disp, parent[0]); 3112 XLowerWindow (dpy, parent[0]);
3625 break; 3113 break;
3626 case 7: /* refresh window */ 3114 case 7: /* refresh window */
3627 scr_touch (true); 3115 scr_touch (true);
3628 break; 3116 break;
3629 case 8: /* set size (chars) */ 3117 case 8: /* set size (chars) */
… …
3636 if (args[0] >= 24) /* set height (chars) */ 3124 if (args[0] >= 24) /* set height (chars) */
3637 set_widthheight ((unsigned int)width, 3125 set_widthheight ((unsigned int)width,
3638 (unsigned int) (args[1] * fheight)); 3126 (unsigned int) (args[1] * fheight));
3639 break; 3127 break;
3640 3128
3641
3642 /* 3129 /*
3643 * reports - some output format copied from XTerm 3130 * reports - some output format copied from XTerm
3644 */ 3131 */
3645 case 11: /* report window state */ 3132 case 11: /* report window state */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3133 XGetWindowAttributes (dpy, parent[0], &wattr);
3647 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3134 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3648 break; 3135 break;
3649 case 13: /* report window position */ 3136 case 13: /* report window position */
3650 XGetWindowAttributes (disp, parent[0], &wattr); 3137 XGetWindowAttributes (dpy, parent[0], &wattr);
3651 XTranslateCoordinates (disp, parent[0], wattr.root, 3138 XTranslateCoordinates (dpy, parent[0], wattr.root,
3652 -wattr.border_width, -wattr.border_width, 3139 -wattr.border_width, -wattr.border_width,
3653 &x, &y, &wdummy); 3140 &x, &y, &wdummy);
3654 tt_printf ("\033[3;%d;%dt", x, y); 3141 tt_printf ("\033[3;%d;%dt", x, y);
3655 break; 3142 break;
3656 case 14: /* report window size (pixels) */ 3143 case 14: /* report window size (pixels) */
3657 XGetWindowAttributes (disp, parent[0], &wattr); 3144 XGetWindowAttributes (dpy, parent[0], &wattr);
3658 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3145 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3659 break; 3146 break;
3660 case 18: /* report text area size (chars) */ 3147 case 18: /* report text area size (chars) */
3661 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3148 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3662 break; 3149 break;
… …
3664 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3151 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3665 break; 3152 break;
3666 case 20: /* report icon label */ 3153 case 20: /* report icon label */
3667 { 3154 {
3668 char *s; 3155 char *s;
3669 XGetIconName (disp, parent[0], &s); 3156 XGetIconName (dpy, parent[0], &s);
3670 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3157 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3671 XFree (s); 3158 XFree (s);
3672 } 3159 }
3673 break; 3160 break;
3674 case 21: /* report window title */ 3161 case 21: /* report window title */
3675 { 3162 {
3676 char *s; 3163 char *s;
3677 XFetchName (disp, parent[0], &s); 3164 XFetchName (dpy, parent[0], &s);
3678 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3165 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3679 XFree (s); 3166 XFree (s);
3680 } 3167 }
3681 break; 3168 break;
3682 } 3169 }
3683} 3170}
… …
3710 seen_esc = true; 3197 seen_esc = true;
3711 continue; 3198 continue;
3712 } 3199 }
3713 else if (ch == C0_BEL || ch == CHAR_ST) 3200 else if (ch == C0_BEL || ch == CHAR_ST)
3714 break; 3201 break;
3202 else if (ch == C0_SYN)
3203 ch = cmd_get8 ();
3715 else if (ch < 0x20) 3204 else if (ch < 0x20)
3716 return NULL; /* other control character - exit */ 3205 return NULL; /* other control character - exit */
3717 3206
3718 seen_esc = false; 3207 seen_esc = false;
3719 3208
3720 if (n >= STRING_MAX - 1) 3209 if (n >= STRING_MAX - 1)
3721 // stop at some sane length 3210 // stop at some sane length
3722 return NULL; 3211 return NULL;
3723 3212
3724 if (ch == C0_SYN)
3725 string[n++] = cmd_get8 ();
3726 else
3727 string[n++] = ch; 3213 string[n++] = ch;
3728 } 3214 }
3729 3215
3730 string[n++] = '\0'; 3216 string[n++] = '\0';
3731 3217
3732 ends_how = (ch == 0x5c ? C0_ESC : ch); 3218 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3783void 3269void
3784rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3270rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3785{ 3271{
3786 if (str[0] == '?' && !str[1]) 3272 if (str[0] == '?' && !str[1])
3787 { 3273 {
3788 unsigned short r, g, b; 3274 rgba c;
3789 pix_colors_focused[color].get (display, r, g, b); 3275 pix_colors_focused[color].get (c);
3276
3277#if XFT
3278 if (c.a != rgba::MAX_CC)
3279 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3280 else
3281#endif
3790 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3282 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3791 } 3283 }
3792 else 3284 else
3793 set_window_color (color, str); 3285 set_window_color (color, str);
3794} 3286}
3795 3287
… …
3797 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3289 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3798 */ 3290 */
3799void 3291void
3800rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3292rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3801{ 3293{
3802 int changed = 0;
3803 int color; 3294 int color;
3804 char *buf, *name; 3295 char *buf, *name;
3805 bool query = str[0] == '?' && !str[1]; 3296 bool query = str[0] == '?' && !str[1];
3806 int saveop = op; 3297 int saveop = op;
3807 dDisp; 3298
3299 dLocal (Display *, dpy);
3808 3300
3809 assert (str != NULL); 3301 assert (str != NULL);
3302
3303 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3304 return;
3305
3810 switch (op) 3306 switch (op)
3811 { 3307 {
3812 case XTerm_name: 3308 case XTerm_name:
3813 set_title (str); 3309 set_title (str);
3814 /* FALLTHROUGH */ 3310 /* FALLTHROUGH */
… …
3828 unsigned long bytes_after; 3324 unsigned long bytes_after;
3829 unsigned char *value = 0; 3325 unsigned char *value = 0;
3830 const char *str = ""; 3326 const char *str = "";
3831 3327
3832 if (prop 3328 if (prop
3833 && XGetWindowProperty (disp, parent[0], 3329 && XGetWindowProperty (dpy, parent[0],
3834 prop, 0, 1<<16, 0, AnyPropertyType, 3330 prop, 0, 1<<16, 0, AnyPropertyType,
3835 &actual_type, &actual_format, 3331 &actual_type, &actual_format,
3836 &nitems, &bytes_after, &value) == Success 3332 &nitems, &bytes_after, &value) == Success
3837 && actual_type != None 3333 && actual_type != None
3838 && actual_format == 8) 3334 && actual_format == 8)
3839 str = (const char *)(value); 3335 str = (const char *)(value);
3840 3336
3841 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3337 tt_printf ("\033]%d;%s%c", op, str, resp);
3842 3338
3843 XFree (value); 3339 XFree (value);
3844 } 3340 }
3845 else 3341 else
3846 { 3342 {
… …
3850 { 3346 {
3851 *eq = 0; 3347 *eq = 0;
3852 set_utf8_property (display->atom (str), eq + 1); 3348 set_utf8_property (display->atom (str), eq + 1);
3853 } 3349 }
3854 else 3350 else
3855 XDeleteProperty (disp, parent[0], 3351 XDeleteProperty (dpy, parent[0],
3856 display->atom (str)); 3352 display->atom (str));
3857 } 3353 }
3858 break; 3354 break;
3859 3355
3860 case XTerm_Color: 3356 case XTerm_Color:
… …
3870 break; 3366 break;
3871 3367
3872 if ((buf = strchr (name, ';')) != NULL) 3368 if ((buf = strchr (name, ';')) != NULL)
3873 *buf++ = '\0'; 3369 *buf++ = '\0';
3874 3370
3875 if (name[0] == '?' && !name[1]) 3371 process_color_seq (op, color, name, resp);
3876 {
3877 unsigned short r, g, b;
3878 pix_colors_focused[color].get (display, r, g, b);
3879 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3880 }
3881 else
3882 set_window_color (color, name);
3883 } 3372 }
3884 break; 3373 break;
3885 case XTerm_Color00: 3374 case XTerm_Color00:
3886 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3375 process_color_seq (op, Color_fg, str, resp);
3887 break; 3376 break;
3888 case XTerm_Color01: 3377 case XTerm_Color01:
3889 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3378 process_color_seq (op, Color_bg, str, resp);
3890 break; 3379 break;
3891#ifndef NO_CURSORCOLOR 3380#ifndef NO_CURSORCOLOR
3892 case XTerm_Color_cursor: 3381 case XTerm_Color_cursor:
3893 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3382 process_color_seq (op, Color_cursor, str, resp);
3894 break; 3383 break;
3895#endif 3384#endif
3896 case XTerm_Color_pointer_fg: 3385 case XTerm_Color_pointer_fg:
3897 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3386 process_color_seq (op, Color_pointer_fg, str, resp);
3898 break; 3387 break;
3899 case XTerm_Color_pointer_bg: 3388 case XTerm_Color_pointer_bg:
3900 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3389 process_color_seq (op, Color_pointer_bg, str, resp);
3901 break; 3390 break;
3902#ifndef NO_BOLD_UNDERLINE_REVERSE 3391#ifndef NO_BOLD_UNDERLINE_REVERSE
3903 case XTerm_Color_RV: 3392 case XTerm_Color_RV:
3904 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3393 process_color_seq (op, Color_RV, str, resp);
3905 break; 3394 break;
3906 case Rxvt_Color_BD: 3395 case Rxvt_Color_BD:
3907 case URxvt_Color_BD: 3396 case URxvt_Color_BD:
3908 process_color_seq (op, Color_BD, str, resp); 3397 process_color_seq (op, Color_BD, str, resp);
3909 break; 3398 break;
3910 case Rxvt_Color_UL: 3399 case Rxvt_Color_UL:
3911 case URxvt_Color_UL: 3400 case URxvt_Color_UL:
3912 process_color_seq (op, Color_UL, str, resp); 3401 process_color_seq (op, Color_UL, str, resp);
3913 break; 3402 break;
3914 case URxvt_Color_IT: 3403 case URxvt_Color_IT:
3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3404 process_color_seq (op, Color_IT, str, resp);
3916 break; 3405 break;
3917#endif 3406#endif
3918#if TRANSPARENT && TINTING 3407#if ENABLE_TRANSPARENCY
3919 case URxvt_Color_tint: 3408 case URxvt_Color_tint:
3920 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3409 process_color_seq (op, Color_tint, str, resp);
3921 check_our_parents (); 3410 {
3922 if (am_transparent) 3411 bool changed = false;
3923 want_full_refresh = want_refresh = 1; 3412 if (ISSET_PIXCOLOR (Color_tint))
3924 break; 3413 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3925#endif 3414 else
3415 changed = bgPixmap.unset_tint ();
3416 if (changed)
3417 update_background ();
3418 }
3926 3419
3420 break;
3421#endif
3422
3423#if BG_IMAGE_FROM_FILE
3927 case Rxvt_Pixmap: 3424 case Rxvt_Pixmap:
3928 if (*str != ';') 3425 if (!strcmp (str, "?"))
3929 { 3426 {
3930#if XPM_BACKGROUND 3427 char str[256];
3931 scale_pixmap (""); /* reset to default scaling */ 3428
3932 set_bgPixmap (str); /* change pixmap */ 3429 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3933 scr_touch (true); 3430 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3934#endif 3431 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3432 process_xterm_seq (XTerm_title, str, CHAR_ST);
3935 } 3433 }
3936 3434 else
3937 while ((str = strchr (str, ';')) != NULL)
3938 { 3435 {
3436 int changed = 0;
3437
3438 if (*str != ';')
3439 {
3440 /* reset to default scaling :*/
3441 bgPixmap.unset_geometry ();
3442 if (bgPixmap.set_file (str)) /* change pixmap */
3443 changed++;
3444 str = strchr (str, ';');
3445 if (str == NULL)
3446 bgPixmap.set_defaultGeometry ();
3447 }
3448 while (str)
3449 {
3939 str++; 3450 str++;
3940#if XPM_BACKGROUND 3451 if (bgPixmap.set_geometry (str))
3941 changed += scale_pixmap (str); 3452 changed++;
3942#endif 3453 str = strchr (str, ';');
3454 }
3455 if (changed)
3456 update_background ();
3943 } 3457 }
3944
3945 if (changed)
3946 {
3947#ifdef XPM_BACKGROUND
3948 resize_pixmap ();
3949 scr_touch (true);
3950#endif
3951 }
3952 break; 3458 break;
3459#endif
3953 3460
3954 case Rxvt_restoreFG: 3461 case Rxvt_restoreFG:
3955 set_window_color (Color_fg, str); 3462 set_window_color (Color_fg, str);
3956 break; 3463 break;
3957 case Rxvt_restoreBG: 3464 case Rxvt_restoreBG:
… …
3960 3467
3961 case XTerm_logfile: 3468 case XTerm_logfile:
3962 // TODO, when secure mode? 3469 // TODO, when secure mode?
3963 break; 3470 break;
3964 3471
3965#ifdef MENUBAR
3966 case URxvt_Menu:
3967 if (OPTION (Opt_insecure))
3968 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3969 break;
3970#endif
3971#if 0 3472#if 0
3972 case Rxvt_dumpscreen: /* no error notices */ 3473 case Rxvt_dumpscreen: /* no error notices */
3973 { 3474 {
3974 int fd; 3475 int fd;
3975 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3476 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3988 case URxvt_italicFont: 3489 case URxvt_italicFont:
3989 case URxvt_boldItalicFont: 3490 case URxvt_boldItalicFont:
3990#endif 3491#endif
3991 if (query) 3492 if (query)
3992 tt_printf ("\33]%d;%-.250s%c", saveop, 3493 tt_printf ("\33]%d;%-.250s%c", saveop,
3993 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3494 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3994 ? fontset[op - URxvt_font]->fontdesc : "", 3495 ? fontset[op - URxvt_font]->fontdesc : "",
3995 resp); 3496 resp);
3996 else 3497 else
3997 { 3498 {
3998 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3499 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4001 allocated.push_back ((void *)res); 3502 allocated.push_back ((void *)res);
4002 set_fonts (); 3503 set_fonts ();
4003 } 3504 }
4004 break; 3505 break;
4005 3506
4006#if ENABLE_FRILLS 3507 case URxvt_version:
3508 if (query)
3509 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3510 op,
3511 rs[Rs_name], VERSION[0], VERSION[2],
3512 resp);
3513 break;
3514
3515#if !ENABLE_MINIMAL
4007 case URxvt_locale: 3516 case URxvt_locale:
4008 if (query) 3517 if (query)
4009 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3518 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4010 else 3519 else
4011 { 3520 {
4012 set_locale (str); 3521 set_locale (str);
4013 pty.set_utf8_mode (enc_utf8); 3522 pty->set_utf8_mode (enc_utf8);
4014 init_xlocale (); 3523 init_xlocale ();
4015 } 3524 }
4016 break; 3525 break;
4017 3526
4018 case URxvt_view_up: 3527 case URxvt_view_up:
… …
4029 break; 3538 break;
4030#endif 3539#endif
4031 3540
4032#if ENABLE_PERL 3541#if ENABLE_PERL
4033 case URxvt_perl: 3542 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3543 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4035 ; // no responses yet 3544 ; // no responses yet
4036 break; 3545 break;
4037#endif 3546#endif
4038 } 3547 }
4039} 3548}
… …
4071 return state; 3580 return state;
4072} 3581}
4073 3582
4074/* we're not using priv _yet_ */ 3583/* we're not using priv _yet_ */
4075void 3584void
4076rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3585rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4077{ 3586{
4078 unsigned int i, j; 3587 unsigned int i, j;
4079 int state; 3588 int state;
4080 3589
4081 static const struct 3590 static const struct
4082 { 3591 {
4083 const int argval; 3592 const int argval;
4084 const unsigned long bit; 3593 const unsigned long bit;
4085 }
4086
4087 argtopriv[] = { 3594 } argtopriv[] = {
4088 { 1, PrivMode_aplCUR }, 3595 { 1, PrivMode_aplCUR },
4089 { 2, PrivMode_vt52 }, 3596 { 2, PrivMode_vt52 },
4090 { 3, PrivMode_132 }, 3597 { 3, PrivMode_132 },
4091 { 4, PrivMode_smoothScroll }, 3598 { 4, PrivMode_smoothScroll },
4092 { 5, PrivMode_rVideo }, 3599 { 5, PrivMode_rVideo },
4093 { 6, PrivMode_relOrigin }, 3600 { 6, PrivMode_relOrigin },
4094 { 7, PrivMode_Autowrap }, 3601 { 7, PrivMode_Autowrap },
4095 // 8, bi-directional support mode 3602 // 8, bi-directional support mode
4096 { 9, PrivMode_MouseX10 }, 3603 { 9, PrivMode_MouseX10 },
4097#ifdef menuBar_esc
4098 { menuBar_esc, PrivMode_menuBar },
4099#endif
4100 // 18, 19 printing-related 3604 // 18, 19 printing-related
4101 { 25, PrivMode_VisibleCursor }, 3605 { 25, PrivMode_VisibleCursor },
4102#ifdef scrollBar_esc 3606#ifdef scrollBar_esc
4103 { scrollBar_esc, PrivMode_scrollBar }, 3607 { scrollBar_esc, PrivMode_scrollBar },
4104#endif 3608#endif
… …
4158 scr_touch (true); 3662 scr_touch (true);
4159 break; 3663 break;
4160#endif 3664#endif
4161 case 1048: /* alternative cursor save */ 3665 case 1048: /* alternative cursor save */
4162 case 1049: 3666 case 1049:
4163 if (OPTION (Opt_secondaryScreen)) 3667 if (option (Opt_secondaryScreen))
4164 if (mode == 0) 3668 if (mode == 0)
4165 scr_cursor (RESTORE); 3669 scr_cursor (RESTORE);
4166 else if (mode == 1) 3670 else if (mode == 1)
4167 scr_cursor (SAVE); 3671 scr_cursor (SAVE);
4168 break; 3672 break;
… …
4199 /* case 8: - auto repeat, can't do on a per window basis */ 3703 /* case 8: - auto repeat, can't do on a per window basis */
4200 case 9: /* X10 mouse reporting */ 3704 case 9: /* X10 mouse reporting */
4201 if (state) /* orthogonal */ 3705 if (state) /* orthogonal */
4202 priv_modes &= ~PrivMode_MouseX11; 3706 priv_modes &= ~PrivMode_MouseX11;
4203 break; 3707 break;
4204#ifdef menuBar_esc
4205 case menuBar_esc:
4206#ifdef MENUBAR
4207 map_menuBar (state);
4208#endif
4209 break;
4210#endif
4211#ifdef scrollBar_esc 3708#ifdef scrollBar_esc
4212 case scrollBar_esc: 3709 case scrollBar_esc:
4213 if (scrollbar_mapping (state)) 3710 if (scrollbar_mapping (state))
4214 { 3711 {
4215 resize_all_windows (0, 0, 0); 3712 resize_all_windows (0, 0, 0);
… …
4240 break; 3737 break;
4241 case 1011: /* scroll to bottom on key press */ 3738 case 1011: /* scroll to bottom on key press */
4242 set_option (Opt_scrollTtyKeypress, state); 3739 set_option (Opt_scrollTtyKeypress, state);
4243 break; 3740 break;
4244 case 1047: /* secondary screen w/ clearing last */ 3741 case 1047: /* secondary screen w/ clearing last */
4245 if (OPTION (Opt_secondaryScreen)) 3742 if (option (Opt_secondaryScreen))
4246 if (current_screen != PRIMARY) 3743 if (current_screen != PRIMARY)
4247 scr_erase_screen (2); 3744 scr_erase_screen (2);
4248 scr_change_screen (state); 3745 scr_change_screen (state);
4249 break; 3746 break;
4250 case 1049: /* secondary screen w/ clearing first */ 3747 case 1049: /* secondary screen w/ clearing first */
4251 scr_change_screen (state); 3748 scr_change_screen (state);
4252 if (OPTION (Opt_secondaryScreen)) 3749 if (option (Opt_secondaryScreen))
4253 if (current_screen != PRIMARY) 3750 if (current_screen != PRIMARY)
4254 scr_erase_screen (2); 3751 scr_erase_screen (2);
4255 break; 3752 break;
4256 default: 3753 default:
4257 break; 3754 break;
… …
4385 scr_color (Color_bg, Color_bg); 3882 scr_color (Color_bg, Color_bg);
4386 break; 3883 break;
4387 3884
4388 //case 50: // not variable spacing 3885 //case 50: // not variable spacing
4389 3886
4390#if ENABLE_FRILLS 3887#if !ENABLE_MINIMAL
4391 case 90: 3888 case 90:
4392 case 91: /* set bright fg color */ 3889 case 91: /* set bright fg color */
4393 case 92: 3890 case 92:
4394 case 93: 3891 case 93:
4395 case 94: 3892 case 94:
… …
4460rxvt_term::tt_write (const char *data, unsigned int len) 3957rxvt_term::tt_write (const char *data, unsigned int len)
4461{ 3958{
4462 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3959 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4463 return; 3960 return;
4464 3961
4465 if (pty.pty < 0) 3962 if (pty->pty < 0)
4466 return; 3963 return;
4467 3964
4468 if (v_buflen == 0) 3965 if (v_buflen == 0)
4469 { 3966 {
4470 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3967 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4471 3968
4472 if ((unsigned int)written == len) 3969 if ((unsigned int)written == len)
4473 return; 3970 return;
4474 3971
4475 data += written; 3972 data += written;
… …
4484 pty_ev.set (EVENT_READ | EVENT_WRITE); 3981 pty_ev.set (EVENT_READ | EVENT_WRITE);
4485} 3982}
4486 3983
4487void rxvt_term::pty_write () 3984void rxvt_term::pty_write ()
4488{ 3985{
4489 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3986 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4490 3987
4491 if (written > 0) 3988 if (written > 0)
4492 { 3989 {
4493 v_buflen -= written; 3990 v_buflen -= written;
4494 3991
4495 if (v_buflen == 0) 3992 if (v_buflen == 0)
4496 { 3993 {
4497 free (v_buffer); 3994 free (v_buffer);
4498 v_buffer = 0; 3995 v_buffer = 0;
4499 v_buflen = 0;
4500 3996
4501 pty_ev.set (EVENT_READ); 3997 pty_ev.set (EVENT_READ);
4502 return; 3998 return;
4503 } 3999 }
4504 4000

Diff Legend

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