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.264 by root, Mon Jan 16 06:37:51 2006 UTC vs.
Revision 1.352 by ayin, Sun Sep 9 10:35:00 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 95 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 96 XK_Shift_R, 0x21e7,
101 97
102 XK_Shift_Lock, 0x21eb, 98 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 99 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 100 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 101 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 102 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 103 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 104 XK_ISO_Group_Lock, 0x21f0,
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 newlen = 1;
542 switch (keysym) 554 switch (keysym)
543 { 555 {
544#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 557 case XK_BackSpace:
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
551 } 563 }
552 else 564 else
553 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 566 break;
555#endif 567#endif
556#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
558 case XK_KP_Delete: 570 case XK_KP_Delete:
559 /* allow shift to override */ 571 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
561 { 573 {
562 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
563 break; 575 break;
564 } 576 }
565 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
566# endif 578# endif
567 case XK_Delete: 579 case XK_Delete:
568 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 581 break;
570#endif 582#endif
571 case XK_Tab: 583 case XK_Tab:
572 if (shft) 584 if (shft)
573 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
588#ifdef XK_KP_Left 600#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */ 601 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */ 602 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */ 603 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */ 604 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 605 if (kp)
594 { 606 {
595 strcpy (kbuf, "\033OZ"); 607 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left]; 608 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break; 609 break;
598 } 610 }
… …
621 633
622#ifndef UNSHIFTED_SCROLLKEYS 634#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior 635# ifdef XK_KP_Prior
624 case XK_KP_Prior: 636 case XK_KP_Prior:
625 /* allow shift to override */ 637 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 638 if (kp)
627 { 639 {
628 strcpy (kbuf, "\033Oy"); 640 strcpy (kbuf, "\033Oy");
629 break; 641 break;
630 } 642 }
631 /* FALLTHROUGH */ 643 /* FALLTHROUGH */
… …
634 strcpy (kbuf, "\033[5~"); 646 strcpy (kbuf, "\033[5~");
635 break; 647 break;
636# ifdef XK_KP_Next 648# ifdef XK_KP_Next
637 case XK_KP_Next: 649 case XK_KP_Next:
638 /* allow shift to override */ 650 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 651 if (kp)
640 { 652 {
641 strcpy (kbuf, "\033Os"); 653 strcpy (kbuf, "\033Os");
642 break; 654 break;
643 } 655 }
644 /* FALLTHROUGH */ 656 /* FALLTHROUGH */
… …
647 strcpy (kbuf, "\033[6~"); 659 strcpy (kbuf, "\033[6~");
648 break; 660 break;
649#endif 661#endif
650 case XK_KP_Enter: 662 case XK_KP_Enter:
651 /* allow shift to override */ 663 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 664 if (kp)
653 { 665 {
654 strcpy (kbuf, "\033OM"); 666 strcpy (kbuf, "\033OM");
655 break; 667 break;
656 } 668 }
657 669
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 712 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 713 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 714 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 715 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 716 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 717 if (kp)
706 { 718 {
707 strcpy (kbuf, "\033Oj"); 719 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 720 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 721 }
710 else 722 else
… …
716 728
717 case XK_Find: 729 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 730 strcpy (kbuf, "\033[1~");
719 break; 731 break;
720 732
721#ifdef XK_KP_End 733#ifdef XK_KP_Insert
722 case XK_KP_Insert: 734 case XK_KP_Insert:
723 /* allow shift to override */ 735 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 736 if (kp)
725 { 737 {
726 strcpy (kbuf, "\033Op"); 738 strcpy (kbuf, "\033Op");
727 break; 739 break;
728 } 740 }
729 /* FALLTHROUGH */ 741 /* FALLTHROUGH */
… …
742 strcpy (kbuf, "\033[4~"); 754 strcpy (kbuf, "\033[4~");
743 break; 755 break;
744#ifdef XK_KP_End 756#ifdef XK_KP_End
745 case XK_KP_End: 757 case XK_KP_End:
746 /* allow shift to override */ 758 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 759 if (kp)
748 { 760 {
749 strcpy (kbuf, "\033Oq"); 761 strcpy (kbuf, "\033Oq");
750 break; 762 break;
751 } 763 }
752 /* FALLTHROUGH */ 764 /* FALLTHROUGH */
… …
755 strcpy (kbuf, KS_END); 767 strcpy (kbuf, KS_END);
756 break; 768 break;
757#ifdef XK_KP_Home 769#ifdef XK_KP_Home
758 case XK_KP_Home: 770 case XK_KP_Home:
759 /* allow shift to override */ 771 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 772 if (kp)
761 { 773 {
762 strcpy (kbuf, "\033Ow"); 774 strcpy (kbuf, "\033Ow");
763 break; 775 break;
764 } 776 }
765 /* FALLTHROUGH */ 777 /* FALLTHROUGH */
… …
873 return; 885 return;
874 886
875 if (len <= 0) 887 if (len <= 0)
876 return; /* not mapped */ 888 return; /* not mapped */
877 889
878 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 891 if (view_start)
880 { 892 {
881 view_start = 0; 893 view_start = 0;
882 want_refresh = 1; 894 want_refresh = 1;
883 } 895 }
… …
905 { 917 {
906 const char ch = C0_ESC; 918 const char ch = C0_ESC;
907 tt_write (&ch, 1); 919 tt_write (&ch, 1);
908 } 920 }
909 921
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
921} 923}
922/*}}} */
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
… …
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 ENABLE_TRANSPARENCY
965 if (want_full_refresh) 1041 if (want_full_refresh)
966 { 1042 {
967 want_full_refresh = 0; 1043 want_full_refresh = 0;
968 scr_clear (); 1044 scr_clear ();
969 scr_touch (false); 1045 scr_touch (false);
… …
1008 while (l->is_longer () && row < end_row); 1084 while (l->is_longer () && row < end_row);
1009 } 1085 }
1010 while (row < end_row); 1086 while (row < end_row);
1011 } 1087 }
1012 1088
1013 scr_refresh (refresh_type); 1089 scr_refresh ();
1014 scrollbar_show (1); 1090 scrollbar_show (1);
1015#ifdef USE_XIM 1091#ifdef USE_XIM
1016 IMSendSpot (); 1092 IMSendSpot ();
1017#endif 1093#endif
1018 } 1094 }
… …
1034void 1110void
1035rxvt_term::flush_cb (time_watcher &w) 1111rxvt_term::flush_cb (time_watcher &w)
1036{ 1112{
1037 make_current (); 1113 make_current ();
1038 1114
1039 refresh_limit = 1;
1040 refresh_count = 0; 1115 refresh_count = 0;
1041 flush (); 1116 flush ();
1042} 1117}
1043 1118
1044#ifdef CURSOR_BLINK 1119#ifdef CURSOR_BLINK
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1121rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1122{
1048 hidden_cursor = !hidden_cursor; 1123 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1124 want_refresh = 1;
1050 1125
1051 w.start (w.at + BLINK_INTERVAL); 1126 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1127}
1053#endif 1128#endif
1054 1129
1055#ifdef TEXT_BLINK 1130#ifdef TEXT_BLINK
1056void 1131void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1145rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1146{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1147 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1148 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1149 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1150 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1151 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1152 }
1079} 1153}
1080#endif 1154#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1158rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1159{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1160 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1161 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1162 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1163 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1164 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1165 }
1093} 1166}
1094#endif 1167#endif
… …
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1175 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1176 {
1104 if (view_start == top_row || view_start == 0) 1177 if (view_start == top_row || view_start == 0)
1105 mouse_slip_wheel_speed = 0; 1178 mouse_slip_wheel_speed = 0;
1106 1179
1107 refresh_type |= SMOOTH_REFRESH;
1108 want_refresh = 1; 1180 want_refresh = 1;
1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1181 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1110 } 1182 }
1111} 1183}
1112#endif 1184#endif
1113 1185
1114#if HAVE_SCHED_YIELD 1186#if LINUX_YIELD_HACK
1115static struct event_handler 1187static struct event_handler
1116{ 1188{
1117 check_watcher cw_yield; 1189 check_watcher yield_ev;
1118 1190
1119 void yield (check_watcher &w) 1191 void yield_cb (check_watcher &w)
1120 { 1192 {
1121 sched_yield (); 1193 // this should really be sched_yield(), but the linux guys thought
1194 // that giving a process calling sched_yield () less cpu time than
1195 // ones with high nice levels is a useful thing to do. It surely is is
1196 // allowed by the sus... as is returning ENOSYS.
1197
1198 struct timespec ts = { 0, 0 };
1199 nanosleep (&ts, 0);
1200
1122 w.stop (); 1201 w.stop ();
1123 } 1202 }
1124 1203
1125 event_handler () 1204 event_handler ()
1126 : cw_yield (this, &event_handler::yield) 1205 : yield_ev (this, &event_handler::yield_cb)
1127 { 1206 {
1128 } 1207 }
1129} event_handler; 1208} event_handler;
1130#endif 1209#endif
1131 1210
… …
1142 1221
1143 memmove (cmdbuf_base, cmdbuf_ptr, n); 1222 memmove (cmdbuf_base, cmdbuf_ptr, n);
1144 cmdbuf_ptr = cmdbuf_base; 1223 cmdbuf_ptr = cmdbuf_base;
1145 cmdbuf_endp = cmdbuf_ptr + n; 1224 cmdbuf_endp = cmdbuf_ptr + n;
1146 1225
1147 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1226 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1148 1227
1149 if (r > 0) 1228 if (r > 0)
1150 { 1229 {
1151 cmdbuf_endp += r; 1230 cmdbuf_endp += r;
1152 return true; 1231 return true;
1153 } 1232 }
1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1233 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1155 { 1234 {
1156#if HAVE_SCHED_YIELD 1235#if LINUX_YIELD_HACK
1157 if (display->is_local) 1236 if (display->is_local)
1158 event_handler.cw_yield.start (); 1237 event_handler.yield_ev.start ();
1159#endif 1238#endif
1160 } 1239 }
1161 else 1240 else
1162 { 1241 {
1163 pty_ev.stop (); 1242 pty_ev.stop ();
1164 1243
1165 if (!OPTION (Opt_hold)) 1244 if (!option (Opt_hold))
1166 destroy (); 1245 destroy ();
1167 } 1246 }
1168 1247
1169 return false; 1248 return false;
1170} 1249}
1171 1250
1172void 1251void
1173rxvt_term::pty_cb (io_watcher &w, short revents) 1252rxvt_term::pty_cb (io_watcher &w, short revents)
… …
1185} 1264}
1186 1265
1187void 1266void
1188rxvt_term::pointer_unblank () 1267rxvt_term::pointer_unblank ()
1189{ 1268{
1190 XDefineCursor (display->display, vt, TermWin_cursor); 1269 XDefineCursor (dpy, vt, TermWin_cursor);
1191 recolour_cursor (); 1270 recolour_cursor ();
1192 1271
1193#ifdef POINTER_BLANK 1272#ifdef POINTER_BLANK
1194 hidden_pointer = 0; 1273 hidden_pointer = 0;
1195 1274
1196 if (OPTION (Opt_pointerBlank)) 1275 if (option (Opt_pointerBlank))
1197 pointer_ev.start (NOW + pointerBlankDelay); 1276 pointer_ev.start (NOW + pointerBlankDelay);
1198#endif 1277#endif
1199} 1278}
1200 1279
1201#ifdef POINTER_BLANK 1280#ifdef POINTER_BLANK
1202void 1281void
1203rxvt_term::pointer_blank () 1282rxvt_term::pointer_blank ()
1204{ 1283{
1205 if (!OPTION (Opt_pointerBlank)) 1284 if (!option (Opt_pointerBlank))
1206 return; 1285 return;
1207 1286
1208 XDefineCursor (display->display, vt, display->blank_cursor); 1287 XDefineCursor (dpy, vt, display->blank_cursor);
1209 XFlush (display->display); 1288 XFlush (dpy);
1210 1289
1211 hidden_pointer = 1; 1290 hidden_pointer = 1;
1212} 1291}
1213 1292
1214void 1293void
… …
1287 (32 + button_number + key_state), 1366 (32 + button_number + key_state),
1288 (32 + x + 1), 1367 (32 + x + 1),
1289 (32 + y + 1)); 1368 (32 + y + 1));
1290} 1369}
1291 1370
1292#ifdef USING_W11LIB
1293void
1294rxvt_W11_process_x_event (XEvent *ev)
1295{
1296 rxvt_t *r = rxvt_get_r ();
1297
1298 x_cb (*ev);
1299}
1300#endif
1301
1302/*{{{ process an X event */ 1371/*{{{ process an X event */
1303void 1372void
1304rxvt_term::x_cb (XEvent &ev) 1373rxvt_term::x_cb (XEvent &ev)
1305{ 1374{
1306 make_current (); 1375 make_current ();
1307 1376
1308 dDisp; 1377 dLocal (Display *, dpy);
1309 1378
1310 if (ev.xany.window == vt 1379 if (ev.xany.window == vt
1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return; 1382 return;
1313 1383
1314 // for XQueryPointer 1384 // for XQueryPointer
1315 Window unused_root, unused_child; 1385 Window unused_root, unused_child;
… …
1317 unsigned int unused_mask; 1387 unsigned int unused_mask;
1318 1388
1319 switch (ev.type) 1389 switch (ev.type)
1320 { 1390 {
1321 case KeyPress: 1391 case KeyPress:
1322#if ISO_14755 1392 key_press (ev.xkey);
1323 if (!(iso14755buf & ISO_14755_52))
1324#endif
1325 lookup_key (ev.xkey);
1326
1327 break; 1393 break;
1328 1394
1329 case KeyRelease: 1395 case KeyRelease:
1330 { 1396 key_release (ev.xkey);
1331#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1332 KeySym keysym;
1333
1334 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1335#endif
1336
1337#if ENABLE_FRILLS || ISO_14755
1338 // ISO 14755 support
1339 if (iso14755buf)
1340 if (iso14755buf & ISO_14755_52)
1341 {
1342# if ENABLE_OVERLAY
1343 scr_overlay_off ();
1344# endif
1345# if ISO_14755
1346 // iso14755 part 5.2 handling: release time
1347 // first: controls
1348 if ((ev.xkey.state & ControlMask)
1349 && ((keysym >= 0x40 && keysym <= 0x5f)
1350 || (keysym >= 0x61 && keysym <= 0x7f)))
1351 {
1352 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1353 commit_iso14755 ();
1354 goto skip_switch;
1355 }
1356
1357 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1358 if (i[0] == keysym)
1359 {
1360 iso14755buf = ISO_14755_51 | i[1];
1361 commit_iso14755 ();
1362 goto skip_switch;
1363 }
1364
1365 scr_bell ();
1366# endif
1367 iso14755buf = 0;
1368 break;
1369 }
1370 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1371 {
1372# if ENABLE_OVERLAY
1373 scr_overlay_off ();
1374# endif
1375 if (iso14755buf & ISO_14755_51)
1376 commit_iso14755 ();
1377#if ISO_14755
1378 else if (iso14755buf & ISO_14755_STARTED)
1379 {
1380 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1381
1382 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1383 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1384 }
1385# endif
1386 else
1387 iso14755buf = 0;
1388 }
1389#endif
1390
1391 if (ev.xany.window == vt
1392 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1393 break;
1394
1395#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1396 if (!(ev.xkey.state & ControlMask))
1397 slip_wheel_ev.stop ();
1398 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1399 mouse_slip_wheel_speed = 0;
1400#endif
1401 break; 1397 break;
1402 }
1403 1398
1404 case ButtonPress: 1399 case ButtonPress:
1405 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1406 break; 1401 break;
1407 1402
… …
1409 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1410 break; 1405 break;
1411 1406
1412 case ClientMessage: 1407 case ClientMessage:
1413 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1414 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1415 { 1410 {
1411 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1412 {
1413 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1414 {
1416 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1415 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1417 destroy (); 1418 destroy ();
1419 }
1418#if ENABLE_EWMH 1420#if ENABLE_EWMH
1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1421 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1420 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1422 &ev); 1424 &ev);
1425#endif
1426 }
1427 }
1428#if ENABLE_XEMBED
1429 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1430 {
1431 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1432 focus_in ();
1433 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1434 focus_out ();
1435 }
1423#endif 1436#endif
1424 } 1437 }
1425#if ENABLE_XEMBED
1426 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1427 {
1428 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1429 focus_in ();
1430 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1431 focus_out ();
1432 }
1433#endif
1434#ifdef OFFIX_DND
1435 /* OffiX Dnd (drag 'n' drop) protocol */
1436 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1437 && (ev.xclient.data.l[0] == DndFile
1438 || ev.xclient.data.l[0] == DndDir
1439 || ev.xclient.data.l[0] == DndLink))
1440 {
1441 /* Get Dnd data */
1442 Atom ActualType;
1443 int ActualFormat;
1444 unsigned char *data;
1445 unsigned long Size, RemainingBytes;
1446
1447 XGetWindowProperty (disp, display->root,
1448 xa[XA_DNDSELECTION],
1449 0L, 1000000L,
1450 False, AnyPropertyType,
1451 &ActualType, &ActualFormat,
1452 &Size, &RemainingBytes,
1453 &data);
1454 set_string_property (XA_CUT_BUFFER0, data);
1455 XFree (data);
1456 selection_paste (display->root, XA_CUT_BUFFER0, true);
1457 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1458 }
1459#endif /* OFFIX_DND */
1460 break;
1461
1462 case MappingNotify:
1463 XRefreshKeyboardMapping (&ev.xmapping);
1464 break; 1438 break;
1465 1439
1466 /* 1440 /*
1467 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1468 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1487 break; 1461 break;
1488 } 1462 }
1489 break; 1463 break;
1490 1464
1491 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1492 focus_in (); 1469 focus_in ();
1493 break; 1470 break;
1494 1471
1495 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1496 focus_out (); 1476 focus_out ();
1497 break; 1477 break;
1498 1478
1499 case ConfigureNotify: 1479 case ConfigureNotify:
1480/* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1481 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1482 szHint.width, szHint.height);*/
1500 if (ev.xconfigure.window == parent[0]) 1483 if (ev.xconfigure.window == parent[0])
1501 { 1484 {
1502 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1485 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1503 ; 1486 ;
1504 1487
1505 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1506 { 1489 {
1507 seen_resize = 1; 1490 seen_resize = 1;
1508 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1509 } 1492 }
1510 1493 else
1511#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494 {
1495#ifdef ENABLE_TRANSPARENCY
1512 if (OPTION (Opt_transparent)) 1496 if (option (Opt_transparent))
1513 check_our_parents (); 1497 update_background ();
1514#endif 1498#endif
1499 }
1500 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1515 } 1501 }
1516 break; 1502 break;
1517 1503
1518 case PropertyNotify: 1504 case PropertyNotify:
1505 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1519 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1506 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1520 && ev.xproperty.state == PropertyNewValue) 1507 && ev.xproperty.state == PropertyNewValue)
1521 selection_property (ev.xproperty.window, ev.xproperty.atom); 1508 selection_property (ev.xproperty.window, ev.xproperty.atom);
1522 1509
1523 break; 1510 break;
1524 1511
1525 case SelectionClear: 1512 case SelectionClear:
1526 selection_clear (); 1513 selection_clear ();
… …
1549 text_blink_ev.stop (); 1536 text_blink_ev.stop ();
1550#endif 1537#endif
1551 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1538 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1552 break; 1539 break;
1553 1540
1554#ifdef TRANSPARENT 1541#ifdef ENABLE_TRANSPARENCY
1555 case ReparentNotify: 1542 case ReparentNotify:
1556 rootwin_cb (ev); 1543 rootwin_cb (ev);
1557 break; 1544 break;
1558#endif /* TRANSPARENT */ 1545#endif /* ENABLE_TRANSPARENCY */
1559 1546
1560 case GraphicsExpose: 1547 case GraphicsExpose:
1561 case Expose: 1548 case Expose:
1562 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1563 { 1550 {
1564 do 1551 do
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1567 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1568 1555
1569 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1570 1557
1571 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1572 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1573 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1574 1561
1575 want_refresh = 1; 1562 want_refresh = 1;
1576 } 1563 }
1577 else 1564 else
1578 { 1565 {
1579 XEvent unused_event; 1566 XEvent unused_event;
1580 1567
1581 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1568 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1582 ; 1569 ;
1583 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1570 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1584 ; 1571 ;
1585 1572
1586 if (isScrollbarWindow (ev.xany.window)) 1573 if (isScrollbarWindow (ev.xany.window))
1587 { 1574 {
1588 scrollBar.setIdle (); 1575 scrollBar.setIdle ();
1589 scrollbar_show (0); 1576 scrollbar_show (0);
1590 } 1577 }
1591#ifdef MENUBAR
1592 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1593 menubar_expose ();
1594#endif
1595
1596#ifdef TRANSPARENT
1597 if (am_transparent && ev.xany.window == parent[0])
1598 XClearWindow (disp, ev.xany.window);
1599#endif
1600 } 1578 }
1601 break; 1579 break;
1602 1580
1603 case MotionNotify: 1581 case MotionNotify:
1604#ifdef POINTER_BLANK 1582#ifdef POINTER_BLANK
1605 if (hidden_pointer) 1583 if (hidden_pointer)
1606 pointer_unblank (); 1584 pointer_unblank ();
1607#endif 1585#endif
1608#if MENUBAR
1609 if (isMenuBarWindow (ev.xany.window))
1610 {
1611 menubar_control (ev.xbutton);
1612 break;
1613 }
1614#endif
1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1616 break; 1587 break;
1617 1588
1618 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
1619 { 1590 {
1591 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1592 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop 1593 ; // nop
1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1594 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1623 { 1595 {
1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1625 ; 1597 ;
1626 1598
1627 XQueryPointer (disp, vt, 1599 XQueryPointer (dpy, vt,
1628 &unused_root, &unused_child, 1600 &unused_root, &unused_child,
1629 &unused_root_x, &unused_root_y, 1601 &unused_root_x, &unused_root_y,
1630 &ev.xbutton.x, &ev.xbutton.y, 1602 &ev.xbutton.x, &ev.xbutton.y,
1631 &ev.xbutton.state); 1603 &ev.xbutton.state);
1632#ifdef MOUSE_THRESHOLD 1604#ifdef MOUSE_THRESHOLD
… …
1696#endif 1668#endif
1697 } 1669 }
1698 } 1670 }
1699 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1671 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1700 { 1672 {
1701 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1673 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1702 MotionNotify, &ev)) 1674 MotionNotify, &ev))
1703 ; 1675 ;
1704 1676
1705 XQueryPointer (disp, scrollBar.win, 1677 XQueryPointer (dpy, scrollBar.win,
1706 &unused_root, &unused_child, 1678 &unused_root, &unused_child,
1707 &unused_root_x, &unused_root_y, 1679 &unused_root_x, &unused_root_y,
1708 &ev.xbutton.x, &ev.xbutton.y, 1680 &ev.xbutton.x, &ev.xbutton.y,
1709 &unused_mask); 1681 &unused_mask);
1710 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1682 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1711 scrollbar_size ()); 1683 scrollbar_size ());
1712 want_refresh = 1; 1684 want_refresh = 1;
1713 refresh_limit = 0;
1714 scrollbar_show (1); 1685 scrollbar_show (1);
1715 } 1686 }
1716 break; 1687 break;
1717 } 1688 }
1718 1689
1719skip_switch: ;
1720
1721#if defined(CURSOR_BLINK) 1690#if defined(CURSOR_BLINK)
1722 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1691 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1723 { 1692 {
1724 if (hidden_cursor) 1693 if (hidden_cursor)
1725 { 1694 {
1726 hidden_cursor = 0; 1695 hidden_cursor = 0;
1727 want_refresh = 1; 1696 want_refresh = 1;
1728 } 1697 }
1729 1698
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1731 } 1700 }
1732#endif 1701#endif
1733 1702
1734#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1736 { 1705 {
1737 if (ev.type == MotionNotify 1706 if (ev.type == MotionNotify
1738 || ev.type == ButtonPress 1707 || ev.type == ButtonPress
1739 || ev.type == ButtonRelease) 1708 || ev.type == ButtonRelease)
1740 if (hidden_pointer) 1709 if (hidden_pointer)
… …
1752 if (!focus) 1721 if (!focus)
1753 { 1722 {
1754 focus = 1; 1723 focus = 1;
1755 want_refresh = 1; 1724 want_refresh = 1;
1756 1725
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1726 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 1727
1759#if USE_XIM 1728#if USE_XIM
1760 if (Input_Context != NULL) 1729 if (Input_Context != NULL)
1761 { 1730 {
1762 IMSetStatusPosition (); 1731 IMSetPosition ();
1763 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1764 } 1733 }
1765#endif 1734#endif
1766#if CURSOR_BLINK 1735#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1769#endif 1738#endif
1770#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1772 { 1741 {
1773 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
1774 scr_recolour (); 1743 scr_recolour ();
1775 } 1744 }
1776#endif 1745#endif
1746#if ENABLE_FRILLS
1747 if (option (Opt_urgentOnBell))
1748 {
1749 XWMHints *h;
1750
1751 h = XGetWMHints(dpy, parent[0]);
1752 if (h != NULL)
1753 {
1754 h->flags &= ~XUrgencyHint;
1755 XSetWMHints(dpy, parent[0], h);
1756 }
1757 }
1758#endif
1777 } 1759 }
1778} 1760}
1779 1761
1780void 1762void
1781rxvt_term::focus_out () 1763rxvt_term::focus_out ()
… …
1789 1771
1790#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf) 1773 if (iso14755buf)
1792 { 1774 {
1793 iso14755buf = 0; 1775 iso14755buf = 0;
1794# if ENABLE_OVERLAY 1776# if ISO_14755
1795 scr_overlay_off (); 1777 scr_overlay_off ();
1796# endif 1778# endif
1797 } 1779 }
1798#endif 1780#endif
1799#if USE_XIM 1781#if USE_XIM
1800 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context); 1783 XUnsetICFocus (Input_Context);
1802#endif 1784#endif
1803#if CURSOR_BLINK 1785#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1805 cursor_blink_ev.stop (); 1787 cursor_blink_ev.stop ();
1806 hidden_cursor = 0; 1788 hidden_cursor = 0;
1807#endif 1789#endif
1808#if OFF_FOCUS_FADING 1790#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1791 if (rs[Rs_fade])
… …
1813 } 1795 }
1814#endif 1796#endif
1815 } 1797 }
1816} 1798}
1817 1799
1818#if TRANSPARENT 1800void
1801rxvt_term::update_fade_color (unsigned int idx)
1802{
1803#if OFF_FOCUS_FADING
1804 if (rs[Rs_fade])
1805 {
1806 rgba c;
1807 pix_colors [Color_fade].get (c);
1808 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1809 }
1810#endif
1811}
1812
1813#if ENABLE_TRANSPARENCY || ENABLE_PERL
1819void 1814void
1820rxvt_term::rootwin_cb (XEvent &ev) 1815rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1816{
1822 make_current (); 1817 make_current ();
1823 1818
1819 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1820 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1821 return;
1822
1823# if ENABLE_TRANSPARENCY
1824 switch (ev.type) 1824 switch (ev.type)
1825 { 1825 {
1826 case PropertyNotify: 1826 case PropertyNotify:
1827 /* 1827 /*
1828 * if user used some Esetroot compatible prog to set the root bg, 1828 * if user used some Esetroot compatible prog to set the root bg,
1829 * use the property to determine the pixmap. We use it later on. 1829 * use the property to determine the pixmap. We use it later on.
1830 */ 1830 */
1831 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1831 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1832 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1832 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1833 return; 1833 {
1834 1834 bgPixmap.set_root_pixmap ();
1835 /* FALLTHROUGH */ 1835 update_background ();
1836 case ReparentNotify: 1836 }
1837 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1838 want_refresh = want_full_refresh = 1;
1839 break; 1837 break;
1840 } 1838 }
1839# endif
1841} 1840}
1842#endif 1841#endif
1843 1842
1844void 1843void
1845rxvt_term::button_press (XButtonEvent &ev) 1844rxvt_term::button_press (XButtonEvent &ev)
… …
1854 /* 1853 /*
1855 * VT window processing of button press 1854 * VT window processing of button press
1856 */ 1855 */
1857 if (ev.window == vt) 1856 if (ev.window == vt)
1858 { 1857 {
1858 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1859 return;
1860
1859#if ISO_14755 1861#if ISO_14755
1860 // 5.4 1862 // 5.4
1861 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1862 { 1864 {
1863 iso14755_54 (ev.x, ev.y); 1865 iso14755_54 (ev.x, ev.y);
… …
1905 else 1907 else
1906 { 1908 {
1907 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1908 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1909 1911
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1911 switch (ev.button) 1912 switch (ev.button)
1912 { 1913 {
1913 case Button1: 1914 case Button1:
1914 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1915 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1916#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1917 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1918#else 1919#else
1919 selection.rect = false; 1920 selection.rect = false;
1920#endif 1921#endif
1921 1922
1922 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1924 { 1925 {
1925 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1926 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1927 else 1928 else
1928 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1929 } 1930 }
1930 else 1931 else
1931 { 1932 {
1932 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1933 MEvent.clicks++; 1934 MEvent.clicks++;
1934 else 1935 else
1935 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1936 1937
1937 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1938 } 1939 }
1939 1940
1940 MEvent.button = Button1; 1941 MEvent.button = Button1;
1941 break; 1942 break;
1942 1943
1943 case Button3: 1944 case Button3:
1944 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1945 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1946 else 1947 else
1947 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1948 1949
1949 MEvent.button = Button3; 1950 MEvent.button = Button3;
1950 break; 1951 break;
1951 } 1952 }
1952 } 1953 }
1953 1954
1954 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1955 return; 1956 return;
1956 } 1957 }
1957 1958
… …
2096 } 2097 }
2097 } 2098 }
2098 2099
2099 return; 2100 return;
2100 } 2101 }
2101
2102#if MENUBAR
2103 /*
2104 * Menubar window processing of button press
2105 */
2106 if (isMenuBarWindow (ev.window))
2107 menubar_control (ev);
2108#endif
2109} 2102}
2110 2103
2111void 2104void
2112rxvt_term::button_release (XButtonEvent &ev) 2105rxvt_term::button_release (XButtonEvent &ev)
2113{ 2106{
… …
2119 2112
2120 if (scrollbar_isUpDn ()) 2113 if (scrollbar_isUpDn ())
2121 { 2114 {
2122 scrollBar.setIdle (); 2115 scrollBar.setIdle ();
2123 scrollbar_show (0); 2116 scrollbar_show (0);
2124#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2125 refresh_type &= ~SMOOTH_REFRESH;
2126#endif
2127 } 2117 }
2128 2118
2129#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2130 if (sel_scroll_ev.active) 2120 if (sel_scroll_ev.active)
2131 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2132#endif 2122#endif
2133 2123
2134 if (ev.window == vt) 2124 if (ev.window == vt)
2135 { 2125 {
2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2127 return;
2128
2136#if ISO_14755 2129#if ISO_14755
2137 // 5.4 2130 // 5.4
2138 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2131 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2139 return; 2132 return;
2140#endif 2133#endif
2134
2141 if (reportmode) 2135 if (reportmode)
2142 { 2136 {
2143 /* mouse report from vt window */ 2137 /* mouse report from vt window */
2144 /* don't report release of wheel "buttons" */ 2138 /* don't report release of wheel "buttons" */
2145 if (ev.button >= 4) 2139 if (ev.button >= 4)
… …
2169 if (priv_modes & PrivMode_mouse_report 2163 if (priv_modes & PrivMode_mouse_report
2170 && bypass_keystate 2164 && bypass_keystate
2171 && ev.button == Button1 && MEvent.clicks <= 1) 2165 && ev.button == Button1 && MEvent.clicks <= 1)
2172 selection_extend (ev.x, ev.y, 0); 2166 selection_extend (ev.x, ev.y, 0);
2173 2167
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2177 switch (ev.button) 2168 switch (ev.button)
2178 { 2169 {
2179 case Button1: 2170 case Button1:
2180 case Button3: 2171 case Button3:
2181 selection_make (ev.time); 2172 selection_make (ev.time);
2182 break; 2173 break;
2174
2183 case Button2: 2175 case Button2:
2184 selection_request (ev.time, ev.x, ev.y); 2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2185 break; 2178 break;
2179
2186#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2187 case Button4: 2181 case Button4:
2188 case Button5: 2182 case Button5:
2189 { 2183 {
2190 int i; 2184 int i;
… …
2192 2186
2193 v = ev.button == Button4 ? UP : DN; 2187 v = ev.button == Button4 ? UP : DN;
2194 2188
2195 if (ev.state & ShiftMask) 2189 if (ev.state & ShiftMask)
2196 i = 1; 2190 i = 1;
2197 else if (OPTION (Opt_mouseWheelScrollPage)) 2191 else if (option (Opt_mouseWheelScrollPage))
2198 i = nrow - 1; 2192 i = nrow - 1;
2199 else 2193 else
2200 i = 5; 2194 i = 5;
2201 2195
2202# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
… …
2222 } 2216 }
2223 break; 2217 break;
2224#endif 2218#endif
2225 } 2219 }
2226 } 2220 }
2227#ifdef MENUBAR
2228 else if (isMenuBarWindow (ev.window))
2229 menubar_control (ev);
2230#endif
2231} 2221}
2232
2233#ifdef TRANSPARENT
2234#if TINTING
2235/* taken from aterm-0.4.2 */
2236
2237typedef uint32_t RUINT32T;
2238
2239void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2240{
2241 int sh_r, sh_g, sh_b;
2242 RUINT32T mask_r, mask_g, mask_b;
2243 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2244 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2245 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2246 int i;
2247
2248 Visual *visual = display->visual;
2249
2250 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2251
2252 /* for convenience */
2253 mask_r = visual->red_mask;
2254 mask_g = visual->green_mask;
2255 mask_b = visual->blue_mask;
2256
2257 /* boring lookup table pre-initialization */
2258 switch (srcImage->bits_per_pixel) {
2259 case 15:
2260 if ((mask_r != 0x7c00) ||
2261 (mask_g != 0x03e0) ||
2262 (mask_b != 0x001f))
2263 return;
2264 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2265 lookup_r = lookup;
2266 lookup_g = lookup+32;
2267 lookup_b = lookup+32+32;
2268 sh_r = 10;
2269 sh_g = 5;
2270 sh_b = 0;
2271 break;
2272 case 16:
2273 if ((mask_r != 0xf800) ||
2274 (mask_g != 0x07e0) ||
2275 (mask_b != 0x001f))
2276 return;
2277 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2278 lookup_r = lookup;
2279 lookup_g = lookup+32;
2280 lookup_b = lookup+32+64;
2281 sh_r = 11;
2282 sh_g = 5;
2283 sh_b = 0;
2284 break;
2285 case 24:
2286 if ((mask_r != 0xff0000) ||
2287 (mask_g != 0x00ff00) ||
2288 (mask_b != 0x0000ff))
2289 return;
2290 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2291 lookup_r = lookup;
2292 lookup_g = lookup+256;
2293 lookup_b = lookup+256+256;
2294 sh_r = 16;
2295 sh_g = 8;
2296 sh_b = 0;
2297 break;
2298 case 32:
2299 if ((mask_r != 0xff0000) ||
2300 (mask_g != 0x00ff00) ||
2301 (mask_b != 0x0000ff))
2302 return;
2303 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2304 lookup_r = lookup;
2305 lookup_g = lookup+256;
2306 lookup_b = lookup+256+256;
2307 sh_r = 16;
2308 sh_g = 8;
2309 sh_b = 0;
2310 break;
2311 default:
2312 return; /* we do not support this color depth */
2313 }
2314
2315 /* prepare limits for color transformation (each channel is handled separately) */
2316 if (shade < 0) {
2317 shade = -shade;
2318 if (shade < 0) shade = 0;
2319 if (shade > 100) shade = 100;
2320
2321 lower_lim_r = 65535-rm;
2322 lower_lim_g = 65535-gm;
2323 lower_lim_b = 65535-bm;
2324
2325 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2326 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2327 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2328
2329 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2330 } else {
2331 if (shade < 0) shade = 0;
2332 if (shade > 100) shade = 100;
2333
2334 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2335
2336 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2337 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2338 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2339 }
2340
2341 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2342 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2343 {
2344 unsigned int tmp;
2345
2346 tmp = lower_lim_r;
2347 lower_lim_r = lower_lim_b;
2348 lower_lim_b = tmp;
2349
2350 tmp = upper_lim_r;
2351 upper_lim_r = upper_lim_b;
2352 upper_lim_b = tmp;
2353 }
2354
2355 /* fill our lookup tables */
2356 for (i = 0; i <= mask_r>>sh_r; i++)
2357 {
2358 RUINT32T tmp;
2359 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2360 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2361 lookup_r[i] = (tmp/65535)<<sh_r;
2362 }
2363 for (i = 0; i <= mask_g>>sh_g; i++)
2364 {
2365 RUINT32T tmp;
2366 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2367 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2368 lookup_g[i] = (tmp/65535)<<sh_g;
2369 }
2370 for (i = 0; i <= mask_b>>sh_b; i++)
2371 {
2372 RUINT32T tmp;
2373 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2374 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2375 lookup_b[i] = (tmp/65535)<<sh_b;
2376 }
2377
2378 /* apply table to input image (replacing colors by newly calculated ones) */
2379 switch (srcImage->bits_per_pixel)
2380 {
2381 case 15:
2382 {
2383 unsigned short *p1, *pf, *p, *pl;
2384 p1 = (unsigned short *) srcImage->data;
2385 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2386 while (p1 < pf)
2387 {
2388 p = p1;
2389 pl = p1 + srcImage->width;
2390 for (; p < pl; p++)
2391 {
2392 *p = lookup_r[(*p & 0x7c00)>>10] |
2393 lookup_g[(*p & 0x03e0)>> 5] |
2394 lookup_b[(*p & 0x001f)];
2395 }
2396 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2397 }
2398 break;
2399 }
2400 case 16:
2401 {
2402 unsigned short *p1, *pf, *p, *pl;
2403 p1 = (unsigned short *) srcImage->data;
2404 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2405 while (p1 < pf)
2406 {
2407 p = p1;
2408 pl = p1 + srcImage->width;
2409 for (; p < pl; p++)
2410 {
2411 *p = lookup_r[(*p & 0xf800)>>11] |
2412 lookup_g[(*p & 0x07e0)>> 5] |
2413 lookup_b[(*p & 0x001f)];
2414 }
2415 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2416 }
2417 break;
2418 }
2419 case 24:
2420 {
2421 unsigned char *p1, *pf, *p, *pl;
2422 p1 = (unsigned char *) srcImage->data;
2423 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2424 while (p1 < pf)
2425 {
2426 p = p1;
2427 pl = p1 + srcImage->width * 3;
2428 for (; p < pl; p += 3)
2429 {
2430 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2431 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2432 p[2] = lookup_r[(p[2] & 0x0000ff)];
2433 }
2434 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2435 }
2436 break;
2437 }
2438 case 32:
2439 {
2440 RUINT32T *p1, *pf, *p, *pl;
2441 p1 = (RUINT32T *) srcImage->data;
2442 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2443
2444 while (p1 < pf)
2445 {
2446 p = p1;
2447 pl = p1 + srcImage->width;
2448 for (; p < pl; p++)
2449 {
2450 *p = lookup_r[(*p & 0xff0000)>>16] |
2451 lookup_g[(*p & 0x00ff00)>> 8] |
2452 lookup_b[(*p & 0x0000ff)] |
2453 (*p & ~0xffffff);
2454 }
2455 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2456 }
2457 break;
2458 }
2459 }
2460
2461 free (lookup);
2462}
2463#endif
2464
2465/*
2466 * Check our parents are still who we think they are.
2467 * Do transparency updates if required
2468 */
2469int
2470rxvt_term::check_our_parents ()
2471{
2472 int i, pchanged, aformat, have_pixmap, rootdepth;
2473 unsigned long nitems, bytes_after;
2474 Atom atype;
2475 unsigned char *prop = NULL;
2476 Window root, oldp, *list;
2477 Pixmap rootpixmap = None;
2478 XWindowAttributes wattr, wrootattr;
2479 dDisp;
2480
2481 pchanged = 0;
2482
2483 if (!OPTION (Opt_transparent))
2484 return pchanged; /* Don't try any more */
2485
2486 XGetWindowAttributes (disp, display->root, &wrootattr);
2487 rootdepth = wrootattr.depth;
2488
2489 XGetWindowAttributes (disp, parent[0], &wattr);
2490
2491 if (rootdepth != wattr.depth)
2492 {
2493 if (am_transparent)
2494 {
2495 pchanged = 1;
2496 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2497 am_transparent = am_pixmap_trans = 0;
2498 }
2499
2500 return pchanged; /* Don't try any more */
2501 }
2502
2503 /* Get all X ops out of the queue so that our information is up-to-date. */
2504 XSync (disp, False);
2505
2506 /*
2507 * Make the frame window set by the window manager have
2508 * the root background. Some window managers put multiple nested frame
2509 * windows for each client, so we have to take care about that.
2510 */
2511 i = (xa[XA_XROOTPMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success);
2515
2516 if (!i || prop == NULL)
2517 i = (xa[XA_ESETROOT_PMAP_ID]
2518 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2519 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2520 &nitems, &bytes_after, &prop) == Success);
2521
2522 if (!i || prop == NULL
2523#if TINTING
2524 || !rs[Rs_color + Color_tint]
2525#endif
2526 )
2527 have_pixmap = 0;
2528 else
2529 {
2530 have_pixmap = 1;
2531 rootpixmap = *(Pixmap *)prop;
2532 XFree (prop);
2533 }
2534
2535 if (have_pixmap)
2536 {
2537 /*
2538 * Copy display->root pixmap transparency
2539 */
2540 int sx, sy, nx, ny;
2541 unsigned int nw, nh;
2542 Window cr;
2543 XImage *image;
2544 GC gc;
2545 XGCValues gcvalue;
2546
2547 XTranslateCoordinates (disp, parent[0], display->root,
2548 0, 0, &sx, &sy, &cr);
2549 nw = (unsigned int)szHint.width;
2550 nh = (unsigned int)szHint.height;
2551 nx = ny = 0;
2552
2553 if (sx < 0)
2554 {
2555 nw += sx;
2556 nx = -sx;
2557 sx = 0;
2558 }
2559
2560 if (sy < 0)
2561 {
2562 nh += sy;
2563 ny = -sy;
2564 sy = 0;
2565 }
2566
2567 min_it (nw, (unsigned int) (wrootattr.width - sx));
2568 min_it (nh, (unsigned int) (wrootattr.height - sy));
2569
2570 XSync (disp, False);
2571 allowedxerror = -1;
2572 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2573
2574 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2575 /* XXX: may need a delay here? */
2576 allowedxerror = 0;
2577
2578 if (image == NULL)
2579 {
2580 if (am_transparent && am_pixmap_trans)
2581 {
2582 pchanged = 1;
2583 if (pixmap != None)
2584 {
2585 XFreePixmap (disp, pixmap);
2586 pixmap = None;
2587 }
2588 }
2589
2590 am_pixmap_trans = 0;
2591 }
2592 else
2593 {
2594 if (pixmap != None)
2595 XFreePixmap (disp, pixmap);
2596
2597#if TINTING
2598 if (ISSET_PIXCOLOR (Color_tint))
2599 {
2600 unsigned short rm, gm, bm;
2601 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2602
2603 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2604
2605 ShadeXImage (display, image, shade, rm, gm, bm);
2606 }
2607#endif
2608
2609 pixmap = XCreatePixmap (disp, vt,
2610 szHint.width, szHint.height, image->depth);
2611 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2612 XPutImage (disp, pixmap, gc, image, 0, 0,
2613 nx, ny, image->width, image->height);
2614 XFreeGC (disp, gc);
2615 XDestroyImage (image);
2616 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2617 XClearWindow (disp, parent[0]);
2618
2619 if (!am_transparent || !am_pixmap_trans)
2620 pchanged = 1;
2621
2622 am_transparent = am_pixmap_trans = 1;
2623 }
2624 }
2625
2626 if (am_pixmap_trans)
2627 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2628 else
2629 {
2630 unsigned int n;
2631 /*
2632 * InheritPixmap transparency
2633 */
2634 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 {
2636 oldp = parent[i];
2637 XQueryTree (disp, parent[i - 1], &root,
2638 &parent[i], &list, &n);
2639 XFree (list);
2640
2641 if (parent[i] == display->root)
2642 {
2643 if (oldp != None)
2644 pchanged = 1;
2645
2646 break;
2647 }
2648
2649 if (oldp != parent[i])
2650 pchanged = 1;
2651 }
2652
2653 n = 0;
2654
2655 if (pchanged)
2656 {
2657 for (; n < (unsigned int)i; n++)
2658 {
2659 XGetWindowAttributes (disp, parent[n], &wattr);
2660 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2661 {
2662 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2663 break;
2664 }
2665 }
2666 }
2667
2668 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2669 {
2670 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2671 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2672 am_transparent = 0;
2673 /* XXX: also turn off Opt_transparent? */
2674 }
2675 else
2676 {
2677#if WAIT_FOR_WM
2678 /* wait (an arbitrary period) for the WM to do its thing
2679 * needed for fvwm2.2.2 (and before?) */
2680 sleep (1);
2681#endif
2682 for (n = 0; n < (unsigned int)i; n++)
2683 {
2684 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2685 XClearWindow (disp, parent[n]);
2686 }
2687
2688 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2689 am_transparent = 1;
2690 }
2691
2692 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2693 parent[i] = None;
2694 }
2695
2696 if (scrollBar.win)
2697 {
2698 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2699 scrollBar.setIdle ();
2700 scrollbar_show (0);
2701 }
2702
2703 if (am_transparent)
2704 {
2705 want_refresh = want_full_refresh = 1;
2706 if (am_pixmap_trans)
2707 flush ();
2708 }
2709
2710 return pchanged;
2711}
2712#endif
2713 2222
2714/*}}} */ 2223/*}}} */
2715 2224
2716bool 2225bool
2717rxvt_term::cmd_parse () 2226rxvt_term::cmd_parse ()
… …
2766 if (ch == C0_LF) 2275 if (ch == C0_LF)
2767 nlines++; 2276 nlines++;
2768 2277
2769 refresh_count++; 2278 refresh_count++;
2770 2279
2771 if (!OPTION (Opt_jumpScroll) 2280 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2772 || (refresh_count >= refresh_limit * (nrow - 1)))
2773 { 2281 {
2774 refreshnow = true;
2775 refresh_count = 0; 2282 refresh_count = 0;
2283
2284 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2285 {
2286 refreshnow = true;
2776 ch = NOCHAR; 2287 ch = NOCHAR;
2777 break; 2288 break;
2289 }
2778 } 2290 }
2779 2291
2780 // scr_add_lines only works for nlines <= nrow - 1. 2292 // scr_add_lines only works for nlines <= nrow - 1.
2781 if (nlines >= nrow - 1) 2293 if (nlines >= nrow - 1)
2782 { 2294 {
2295 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2296 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2784 scr_add_lines (buf, str - buf, nlines); 2297 scr_add_lines (buf, str - buf, nlines);
2785 2298
2786 nlines = 0; 2299 nlines = 0;
2787 str = buf; 2300 str = buf;
2788 eol = str + min (ncol, UBUFSIZ); 2301 eol = str + min (ncol, UBUFSIZ);
… …
2803 2316
2804 seq_begin = cmdbuf_ptr; 2317 seq_begin = cmdbuf_ptr;
2805 ch = next_char (); 2318 ch = next_char ();
2806 } 2319 }
2807 2320
2321 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2808 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2322 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2809 scr_add_lines (buf, str - buf, nlines); 2323 scr_add_lines (buf, str - buf, nlines);
2810 2324
2811 /* 2325 /*
2812 * If there have been a lot of new lines, then update the screen 2326 * If there have been a lot of new lines, then update the screen
2813 * What the heck I'll cheat and only refresh less than every page-full. 2327 * What the heck we'll cheat and only refresh less than every page-full.
2814 * the number of pages between refreshes is refresh_limit, which 2328 * if skipScroll is enabled.
2815 * is incremented here because we must be doing flat-out scrolling.
2816 */ 2329 */
2817 if (refreshnow) 2330 if (refreshnow)
2818 { 2331 {
2819 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2820 refresh_limit++;
2821 else
2822 {
2823 flag = true; 2332 flag = true;
2824 scr_refresh (refresh_type); 2333 scr_refresh ();
2825 want_refresh = 1; 2334 want_refresh = 1;
2826 }
2827 } 2335 }
2828 2336
2829 } 2337 }
2830 else 2338 else
2831 { 2339 {
… …
2847 return flag; 2355 return flag;
2848} 2356}
2849 2357
2850// read the next character 2358// read the next character
2851wchar_t 2359wchar_t
2852rxvt_term::next_char () 2360rxvt_term::next_char () NOTHROW
2853{ 2361{
2854 while (cmdbuf_ptr < cmdbuf_endp) 2362 while (cmdbuf_ptr < cmdbuf_endp)
2855 { 2363 {
2856 // assume 7-bit to be ascii ALWAYS 2364 // assume 7-bit to be ascii ALWAYS
2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2365 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2878 return NOCHAR; 2386 return NOCHAR;
2879} 2387}
2880 2388
2881// read the next octet 2389// read the next octet
2882uint32_t 2390uint32_t
2883rxvt_term::next_octet () 2391rxvt_term::next_octet () NOTHROW
2884{ 2392{
2885 return cmdbuf_ptr < cmdbuf_endp 2393 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++ 2394 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR; 2395 : NOCHAR;
2888} 2396}
2397
2398static class out_of_input out_of_input;
2889 2399
2890/* rxvt_cmd_getc () - Return next input character */ 2400/* rxvt_cmd_getc () - Return next input character */
2891/* 2401/*
2892 * Return the next input character after first passing any keyboard input 2402 * Return the next input character after first passing any keyboard input
2893 * to the command. 2403 * to the command.
2894 */ 2404 */
2895wchar_t 2405wchar_t
2896rxvt_term::cmd_getc () 2406rxvt_term::cmd_getc () THROW ((class out_of_input))
2897{ 2407{
2898 wchar_t c = next_char (); 2408 wchar_t c = next_char ();
2899 2409
2900 if (c == NOCHAR) 2410 if (c == NOCHAR)
2901 throw out_of_input; 2411 throw out_of_input;
2902 2412
2903 return c; 2413 return c;
2904} 2414}
2905 2415
2906uint32_t 2416uint32_t
2907rxvt_term::cmd_get8 () 2417rxvt_term::cmd_get8 () THROW ((class out_of_input))
2908{ 2418{
2909 uint32_t c = next_octet (); 2419 uint32_t c = next_octet ();
2910 2420
2911 if (c == NOCHAR) 2421 if (c == NOCHAR)
2912 throw out_of_input; 2422 throw out_of_input;
… …
2978 { 2488 {
2979 if ((buf[len++] = cmd_getc ()) == 'i') 2489 if ((buf[len++] = cmd_getc ()) == 'i')
2980 break; /* done = 1 */ 2490 break; /* done = 1 */
2981 } 2491 }
2982 } 2492 }
2983 2493
2984 for (i = 0; i < len; i++) 2494 for (i = 0; i < len; i++)
2985 if (putc (buf[i], fd) == EOF) 2495 if (putc (buf[i], fd) == EOF)
2986 { 2496 {
2987 done = 1; 2497 done = 1;
2988 break; 2498 break;
… …
3050 process_dcs_seq (); 2560 process_dcs_seq ();
3051 break; 2561 break;
3052 case 0x9b: /* CSI */ 2562 case 0x9b: /* CSI */
3053 process_csi_seq (); 2563 process_csi_seq ();
3054 break; 2564 break;
3055 case 0x9d: /* CSI */ 2565 case 0x9d: /* OSC */
3056 process_osc_seq (); 2566 process_osc_seq ();
3057 break; 2567 break;
3058#endif 2568#endif
3059 } 2569 }
3060} 2570}
… …
3150 scr_charset_set (2, (unsigned int)cmd_getc ()); 2660 scr_charset_set (2, (unsigned int)cmd_getc ());
3151 break; 2661 break;
3152 case '+': 2662 case '+':
3153 scr_charset_set (3, (unsigned int)cmd_getc ()); 2663 scr_charset_set (3, (unsigned int)cmd_getc ());
3154 break; 2664 break;
3155#if ENABLE_FRILLS 2665#if !ENABLE_MINIMAL
3156 case '6': 2666 case '6':
3157 scr_backindex (); 2667 scr_backindex ();
3158 break; 2668 break;
3159#endif 2669#endif
3160 case '7': 2670 case '7':
3161 scr_cursor (SAVE); 2671 scr_cursor (SAVE);
3162 break; 2672 break;
3163 case '8': 2673 case '8':
3164 scr_cursor (RESTORE); 2674 scr_cursor (RESTORE);
3165 break; 2675 break;
3166#if ENABLE_FRILLS 2676#if !ENABLE_MINIMAL
3167 case '9': 2677 case '9':
3168 scr_forwardindex (); 2678 scr_forwardindex ();
3169 break; 2679 break;
3170#endif 2680#endif
3171 case '=': 2681 case '=':
… …
3286rxvt_term::process_csi_seq () 2796rxvt_term::process_csi_seq ()
3287{ 2797{
3288 unicode_t ch, priv, i; 2798 unicode_t ch, priv, i;
3289 unsigned int nargs, p; 2799 unsigned int nargs, p;
3290 int n, ndef; 2800 int n, ndef;
3291 int arg[ESC_ARGS]; 2801 int arg[ESC_ARGS] = { };
3292 2802
3293 for (nargs = ESC_ARGS; nargs > 0;) 2803 nargs = 0;
3294 arg[--nargs] = 0;
3295 2804
3296 priv = 0; 2805 priv = 0;
3297 ch = cmd_getc (); 2806 ch = cmd_getc ();
3298 if (ch >= '<' && ch <= '?') 2807 if (ch >= '<' && ch <= '?')
3299 { /* '<' '=' '>' '?' */ 2808 { /* '<' '=' '>' '?' */
… …
3333 ndef = get_byte_array_bit (csi_defaults, i); 2842 ndef = get_byte_array_bit (csi_defaults, i);
3334 for (p = 0; p < nargs; p++) 2843 for (p = 0; p < nargs; p++)
3335 if (arg[p] == -1) 2844 if (arg[p] == -1)
3336 arg[p] = ndef; 2845 arg[p] = ndef;
3337 2846
3338#ifdef DEBUG_CMD
3339 fprintf (stderr, "CSI ");
3340 for (p = 0; p < nargs; p++)
3341 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3342 fprintf (stderr, "%c\n", ch);
3343#endif
3344
3345 /* 2847 /*
3346 * private mode handling 2848 * private mode handling
3347 */ 2849 */
3348 if (priv) 2850 if (priv)
3349 { 2851 {
3350 switch (priv) 2852 switch (priv)
3351 { 2853 {
3352 case '>': 2854 case '>':
3353 if (ch == CSI_DA) /* secondary device attributes */ 2855 if (ch == CSI_DA) /* secondary device attributes */
3354 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2856 {
2857 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2858 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2859 //
2860 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2861 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
2862 // that we do not support xterm mouse reporting (should be 95 when we do).
2863 //
2864 tt_printf ("\033[>%d;94;0c", 'U');
2865 }
3355 break; 2866 break;
3356 case '?': 2867 case '?':
3357 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3358 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3359 break; 2870 break;
… …
3485 break; 2996 break;
3486 case 6: /* CPR requested */ 2997 case 6: /* CPR requested */
3487 scr_report_position (); 2998 scr_report_position ();
3488 break; 2999 break;
3489 case 7: /* unofficial extension */ 3000 case 7: /* unofficial extension */
3490 if (OPTION (Opt_insecure)) 3001 if (option (Opt_insecure))
3491 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3002 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3492 break; 3003 break;
3493 case 8: /* unofficial extension */ 3004 case 8: /* unofficial extension */
3494 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3005 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3495 break; 3006 break;
… …
3562 break; 3073 break;
3563 case CSI_75: 3074 case CSI_75:
3564 scr_cursor (RESTORE); 3075 scr_cursor (RESTORE);
3565 break; 3076 break;
3566 3077
3567#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3568 case CSI_74: 3079 case CSI_74:
3569 process_window_ops (arg, nargs); 3080 process_window_ops (arg, nargs);
3570 break; 3081 break;
3571#endif 3082#endif
3572 3083
… …
3579 break; 3090 break;
3580 } 3091 }
3581} 3092}
3582/*}}} */ 3093/*}}} */
3583 3094
3584#if ENABLE_FRILLS 3095#if !ENABLE_MINIMAL
3585/* ARGSUSED */ 3096/* ARGSUSED */
3586void 3097void
3587rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3588{ 3099{
3589 int x, y; 3100 int x, y;
3590 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3591 Window wdummy; 3102 Window wdummy;
3592 dDisp; 3103
3104 dLocal (Display *, dpy);
3593 3105
3594 if (nargs == 0) 3106 if (nargs == 0)
3595 return; 3107 return;
3596 3108
3597 switch (args[0]) 3109 switch (args[0])
3598 { 3110 {
3599 /* 3111 /*
3600 * commands 3112 * commands
3601 */ 3113 */
3602 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3603 XMapWindow (disp, parent[0]); 3115 XMapWindow (dpy, parent[0]);
3604 break; 3116 break;
3605 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3606 XIconifyWindow (disp, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent[0], display->screen);
3607 break; 3119 break;
3608 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3609 XMoveWindow (disp, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent[0], args[1], args[2]);
3610 break; 3122 break;
3611 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3612 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3613 break; 3125 break;
3614 case 5: /* raise window */ 3126 case 5: /* raise window */
3615 XRaiseWindow (disp, parent[0]); 3127 XRaiseWindow (dpy, parent[0]);
3616 break; 3128 break;
3617 case 6: /* lower window */ 3129 case 6: /* lower window */
3618 XLowerWindow (disp, parent[0]); 3130 XLowerWindow (dpy, parent[0]);
3619 break; 3131 break;
3620 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3621 scr_touch (true); 3133 scr_touch (true);
3622 break; 3134 break;
3623 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3630 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3631 set_widthheight ((unsigned int)width, 3143 set_widthheight ((unsigned int)width,
3632 (unsigned int) (args[1] * fheight)); 3144 (unsigned int) (args[1] * fheight));
3633 break; 3145 break;
3634 3146
3635
3636 /* 3147 /*
3637 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3638 */ 3149 */
3639 case 11: /* report window state */ 3150 case 11: /* report window state */
3640 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3641 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3642 break; 3153 break;
3643 case 13: /* report window position */ 3154 case 13: /* report window position */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 XTranslateCoordinates (disp, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent[0], wattr.root,
3646 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3647 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3648 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3649 break; 3160 break;
3650 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3653 break; 3164 break;
3654 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3655 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3656 break; 3167 break;
… …
3658 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3659 break; 3170 break;
3660 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3661 { 3172 {
3662 char *s; 3173 char *s;
3663 XGetIconName (disp, parent[0], &s); 3174 XGetIconName (dpy, parent[0], &s);
3664 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3175 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3665 XFree (s); 3176 XFree (s);
3666 } 3177 }
3667 break; 3178 break;
3668 case 21: /* report window title */ 3179 case 21: /* report window title */
3669 { 3180 {
3670 char *s; 3181 char *s;
3671 XFetchName (disp, parent[0], &s); 3182 XFetchName (dpy, parent[0], &s);
3672 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3183 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673 XFree (s); 3184 XFree (s);
3674 } 3185 }
3675 break; 3186 break;
3676 } 3187 }
3677} 3188}
… …
3704 seen_esc = true; 3215 seen_esc = true;
3705 continue; 3216 continue;
3706 } 3217 }
3707 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3708 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3709 else if (ch < 0x20) 3222 else if (ch < 0x20)
3710 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3711 3224
3712 seen_esc = false; 3225 seen_esc = false;
3713 3226
3714 if (n >= STRING_MAX - 1) 3227 if (n >= STRING_MAX - 1)
3715 // stop at some sane length 3228 // stop at some sane length
3716 return NULL; 3229 return NULL;
3717 3230
3718 if (ch == C0_SYN)
3719 string[n++] = cmd_get8 ();
3720 else
3721 string[n++] = ch; 3231 string[n++] = ch;
3722 } 3232 }
3723 3233
3724 string[n++] = '\0'; 3234 string[n++] = '\0';
3725 3235
3726 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3777void 3287void
3778rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3288rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3779{ 3289{
3780 if (str[0] == '?' && !str[1]) 3290 if (str[0] == '?' && !str[1])
3781 { 3291 {
3782 unsigned short r, g, b; 3292 rgba c;
3783 pix_colors_focused[color].get (display, r, g, b); 3293 pix_colors_focused[color].get (c);
3294
3295#if XFT
3296 if (c.a != rgba::MAX_CC)
3297 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3298 else
3299#endif
3784 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3300 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3785 } 3301 }
3786 else 3302 else
3787 set_window_color (color, str); 3303 set_window_color (color, str);
3788} 3304}
3789 3305
… …
3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3307 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3792 */ 3308 */
3793void 3309void
3794rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3310rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3795{ 3311{
3796 int changed = 0;
3797 int color; 3312 int color;
3798 char *buf, *name; 3313 char *buf, *name;
3799 bool query = str[0] == '?' && !str[1]; 3314 bool query = str[0] == '?' && !str[1];
3800 int saveop = op; 3315 int saveop = op;
3801 dDisp; 3316
3317 dLocal (Display *, dpy);
3802 3318
3803 assert (str != NULL); 3319 assert (str != NULL);
3320
3321 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3322 return;
3323
3804 switch (op) 3324 switch (op)
3805 { 3325 {
3806 case XTerm_name: 3326 case XTerm_name:
3807 set_title (str); 3327 set_title (str);
3808 /* FALLTHROUGH */ 3328 /* FALLTHROUGH */
… …
3822 unsigned long bytes_after; 3342 unsigned long bytes_after;
3823 unsigned char *value = 0; 3343 unsigned char *value = 0;
3824 const char *str = ""; 3344 const char *str = "";
3825 3345
3826 if (prop 3346 if (prop
3827 && XGetWindowProperty (disp, parent[0], 3347 && XGetWindowProperty (dpy, parent[0],
3828 prop, 0, 1<<16, 0, AnyPropertyType, 3348 prop, 0, 1<<16, 0, AnyPropertyType,
3829 &actual_type, &actual_format, 3349 &actual_type, &actual_format,
3830 &nitems, &bytes_after, &value) == Success 3350 &nitems, &bytes_after, &value) == Success
3831 && actual_type != None 3351 && actual_type != None
3832 && actual_format == 8) 3352 && actual_format == 8)
3833 str = (const char *)(value); 3353 str = (const char *)(value);
3834 3354
3835 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3355 tt_printf ("\033]%d;%s%c", op, str, resp);
3836 3356
3837 XFree (value); 3357 XFree (value);
3838 } 3358 }
3839 else 3359 else
3840 { 3360 {
… …
3844 { 3364 {
3845 *eq = 0; 3365 *eq = 0;
3846 set_utf8_property (display->atom (str), eq + 1); 3366 set_utf8_property (display->atom (str), eq + 1);
3847 } 3367 }
3848 else 3368 else
3849 XDeleteProperty (disp, parent[0], 3369 XDeleteProperty (dpy, parent[0],
3850 display->atom (str)); 3370 display->atom (str));
3851 } 3371 }
3852 break; 3372 break;
3853 3373
3854 case XTerm_Color: 3374 case XTerm_Color:
… …
3864 break; 3384 break;
3865 3385
3866 if ((buf = strchr (name, ';')) != NULL) 3386 if ((buf = strchr (name, ';')) != NULL)
3867 *buf++ = '\0'; 3387 *buf++ = '\0';
3868 3388
3869 if (name[0] == '?' && !name[1]) 3389 process_color_seq (op, color, name, resp);
3870 {
3871 unsigned short r, g, b;
3872 pix_colors_focused[color].get (display, r, g, b);
3873 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3874 }
3875 else
3876 set_window_color (color, name);
3877 } 3390 }
3878 break; 3391 break;
3879 case XTerm_Color00: 3392 case XTerm_Color00:
3880 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3881 break; 3394 break;
3882 case XTerm_Color01: 3395 case XTerm_Color01:
3883 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3396 process_color_seq (op, Color_bg, str, resp);
3884 break; 3397 break;
3885#ifndef NO_CURSORCOLOR 3398#ifndef NO_CURSORCOLOR
3886 case XTerm_Color_cursor: 3399 case XTerm_Color_cursor:
3887 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3400 process_color_seq (op, Color_cursor, str, resp);
3888 break; 3401 break;
3889#endif 3402#endif
3890 case XTerm_Color_pointer_fg: 3403 case XTerm_Color_pointer_fg:
3891 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3404 process_color_seq (op, Color_pointer_fg, str, resp);
3892 break; 3405 break;
3893 case XTerm_Color_pointer_bg: 3406 case XTerm_Color_pointer_bg:
3894 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3407 process_color_seq (op, Color_pointer_bg, str, resp);
3895 break; 3408 break;
3896#ifndef NO_BOLD_UNDERLINE_REVERSE 3409#ifndef NO_BOLD_UNDERLINE_REVERSE
3897 case XTerm_Color_RV: 3410 case XTerm_Color_RV:
3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3411 process_color_seq (op, Color_RV, str, resp);
3899 break; 3412 break;
3900 case Rxvt_Color_BD: 3413 case Rxvt_Color_BD:
3901 case URxvt_Color_BD: 3414 case URxvt_Color_BD:
3902 process_color_seq (op, Color_BD, str, resp); 3415 process_color_seq (op, Color_BD, str, resp);
3903 break; 3416 break;
3904 case Rxvt_Color_UL: 3417 case Rxvt_Color_UL:
3905 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3906 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3907 break; 3420 break;
3908 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3910 break; 3423 break;
3911#endif 3424#endif
3912#if TRANSPARENT && TINTING 3425#if ENABLE_TRANSPARENCY
3913 case URxvt_Color_tint: 3426 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3915 check_our_parents (); 3428 {
3916 if (am_transparent) 3429 bool changed = false;
3917 want_full_refresh = want_refresh = 1; 3430 if (ISSET_PIXCOLOR (Color_tint))
3918 break; 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3919#endif 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3920 3437
3438 break;
3439#endif
3440
3441#if XPM_BACKGROUND
3921 case Rxvt_Pixmap: 3442 case Rxvt_Pixmap:
3922 if (*str != ';') 3443 if (!strcmp (str, "?"))
3923 { 3444 {
3924#if XPM_BACKGROUND 3445 char str[256];
3925 scale_pixmap (""); /* reset to default scaling */ 3446
3926 set_bgPixmap (str); /* change pixmap */ 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3927 scr_touch (true); 3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3928#endif 3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3929 } 3451 }
3930 3452 else
3931 while ((str = strchr (str, ';')) != NULL)
3932 { 3453 {
3454 int changed = 0;
3455
3456 if (*str != ';')
3457 {
3458 /* reset to default scaling :*/
3459 bgPixmap.unset_geometry ();
3460 if (bgPixmap.set_file (str)) /* change pixmap */
3461 changed++;
3462 str = strchr (str, ';');
3463 if (str == NULL)
3464 bgPixmap.set_defaultGeometry ();
3465 }
3466 while (str)
3467 {
3933 str++; 3468 str++;
3934#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3935 changed += scale_pixmap (str); 3470 changed++;
3936#endif 3471 str = strchr (str, ';');
3472 }
3473 if (changed)
3474 update_background ();
3937 } 3475 }
3938
3939 if (changed)
3940 {
3941#ifdef XPM_BACKGROUND
3942 resize_pixmap ();
3943 scr_touch (true);
3944#endif
3945 }
3946 break; 3476 break;
3477#endif
3947 3478
3948 case Rxvt_restoreFG: 3479 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3950 break; 3481 break;
3951 case Rxvt_restoreBG: 3482 case Rxvt_restoreBG:
… …
3954 3485
3955 case XTerm_logfile: 3486 case XTerm_logfile:
3956 // TODO, when secure mode? 3487 // TODO, when secure mode?
3957 break; 3488 break;
3958 3489
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0 3490#if 0
3966 case Rxvt_dumpscreen: /* no error notices */ 3491 case Rxvt_dumpscreen: /* no error notices */
3967 { 3492 {
3968 int fd; 3493 int fd;
3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3494 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3982 case URxvt_italicFont: 3507 case URxvt_italicFont:
3983 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3984#endif 3509#endif
3985 if (query) 3510 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3987 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3988 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3989 resp); 3514 resp);
3990 else 3515 else
3991 { 3516 {
3992 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3995 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
3996 set_fonts (); 3521 set_fonts ();
3997 } 3522 }
3998 break; 3523 break;
3999 3524
4000#if ENABLE_FRILLS 3525 case URxvt_version:
3526 if (query)
3527 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3528 op,
3529 rs[Rs_name], VERSION[0], VERSION[2],
3530 resp);
3531 break;
3532
3533#if !ENABLE_MINIMAL
4001 case URxvt_locale: 3534 case URxvt_locale:
4002 if (query) 3535 if (query)
4003 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3536 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4004 else 3537 else
4005 { 3538 {
4006 set_locale (str); 3539 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3541 init_xlocale ();
4009 } 3542 }
4010 break; 3543 break;
4011 3544
4012 case URxvt_view_up: 3545 case URxvt_view_up:
… …
4023 break; 3556 break;
4024#endif 3557#endif
4025 3558
4026#if ENABLE_PERL 3559#if ENABLE_PERL
4027 case URxvt_perl: 3560 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3561 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4029 ; // no responses yet 3562 ; // no responses yet
4030 break; 3563 break;
4031#endif 3564#endif
4032 } 3565 }
4033} 3566}
… …
4065 return state; 3598 return state;
4066} 3599}
4067 3600
4068/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4069void 3602void
4070rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3603rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4071{ 3604{
4072 unsigned int i, j; 3605 unsigned int i, j;
4073 int state; 3606 int state;
4074 3607
4075 static const struct 3608 static const struct
4076 { 3609 {
4077 const int argval; 3610 const int argval;
4078 const unsigned long bit; 3611 const unsigned long bit;
4079 }
4080
4081 argtopriv[] = { 3612 } argtopriv[] = {
4082 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
4083 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
4084 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
4085 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
4086 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 3620 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 3622 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 3623 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 3624#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 3625 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 3626#endif
… …
4152 scr_touch (true); 3680 scr_touch (true);
4153 break; 3681 break;
4154#endif 3682#endif
4155 case 1048: /* alternative cursor save */ 3683 case 1048: /* alternative cursor save */
4156 case 1049: 3684 case 1049:
4157 if (OPTION (Opt_secondaryScreen)) 3685 if (option (Opt_secondaryScreen))
4158 if (mode == 0) 3686 if (mode == 0)
4159 scr_cursor (RESTORE); 3687 scr_cursor (RESTORE);
4160 else if (mode == 1) 3688 else if (mode == 1)
4161 scr_cursor (SAVE); 3689 scr_cursor (SAVE);
4162 break; 3690 break;
… …
4193 /* case 8: - auto repeat, can't do on a per window basis */ 3721 /* case 8: - auto repeat, can't do on a per window basis */
4194 case 9: /* X10 mouse reporting */ 3722 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 3723 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 3724 priv_modes &= ~PrivMode_MouseX11;
4197 break; 3725 break;
4198#ifdef menuBar_esc
4199 case menuBar_esc:
4200#ifdef MENUBAR
4201 map_menuBar (state);
4202#endif
4203 break;
4204#endif
4205#ifdef scrollBar_esc 3726#ifdef scrollBar_esc
4206 case scrollBar_esc: 3727 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 3728 if (scrollbar_mapping (state))
4208 { 3729 {
4209 resize_all_windows (0, 0, 0); 3730 resize_all_windows (0, 0, 0);
… …
4234 break; 3755 break;
4235 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4236 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4237 break; 3758 break;
4238 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4239 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4240 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4241 scr_erase_screen (2); 3762 scr_erase_screen (2);
4242 scr_change_screen (state); 3763 scr_change_screen (state);
4243 break; 3764 break;
4244 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
4245 scr_change_screen (state); 3766 scr_change_screen (state);
4246 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 3769 scr_erase_screen (2);
4249 break; 3770 break;
4250 default: 3771 default:
4251 break; 3772 break;
… …
4379 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4380 break; 3901 break;
4381 3902
4382 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4383 3904
4384#if ENABLE_FRILLS 3905#if !ENABLE_MINIMAL
4385 case 90: 3906 case 90:
4386 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4387 case 92: 3908 case 92:
4388 case 93: 3909 case 93:
4389 case 94: 3910 case 94:
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 3976{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3977 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return; 3978 return;
4458 3979
4459 if (pty.pty < 0) 3980 if (pty->pty < 0)
4460 return; 3981 return;
4461 3982
4462 if (v_buflen == 0) 3983 if (v_buflen == 0)
4463 { 3984 {
4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3985 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4465 3986
4466 if ((unsigned int)written == len) 3987 if ((unsigned int)written == len)
4467 return; 3988 return;
4468 3989
4469 data += written; 3990 data += written;
… …
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 3999 pty_ev.set (EVENT_READ | EVENT_WRITE);
4479} 4000}
4480 4001
4481void rxvt_term::pty_write () 4002void rxvt_term::pty_write ()
4482{ 4003{
4483 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4004 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4484 4005
4485 if (written > 0) 4006 if (written > 0)
4486 { 4007 {
4487 v_buflen -= written; 4008 v_buflen -= written;
4488 4009

Diff Legend

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