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.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.358 by sasha, Tue Sep 18 22:27:41 2007 UTC

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

Diff Legend

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