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.266 by root, Mon Jan 16 08:57:02 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
1311 && SHOULD_INVOKE (HOOK_X_EVENT) 1380 && SHOULD_INVOKE (HOOK_X_EVENT)
1312 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1381 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1313 return; 1382 return;
… …
1318 unsigned int unused_mask; 1387 unsigned int unused_mask;
1319 1388
1320 switch (ev.type) 1389 switch (ev.type)
1321 { 1390 {
1322 case KeyPress: 1391 case KeyPress:
1323#if ISO_14755 1392 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1393 break;
1329 1394
1330 case KeyRelease: 1395 case KeyRelease:
1331 { 1396 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1397 break;
1403 }
1404 1398
1405 case ButtonPress: 1399 case ButtonPress:
1406 button_press (ev.xbutton); 1400 button_press (ev.xbutton);
1407 break; 1401 break;
1408 1402
… …
1410 button_release (ev.xbutton); 1404 button_release (ev.xbutton);
1411 break; 1405 break;
1412 1406
1413 case ClientMessage: 1407 case ClientMessage:
1414 if (ev.xclient.format == 32 1408 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1409 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 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 {
1417 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)))
1418 destroy (); 1418 destroy ();
1419 }
1419#if ENABLE_EWMH 1420#if ENABLE_EWMH
1420 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])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1422 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1423 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &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 }
1424#endif 1436#endif
1425 } 1437 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break;
1462
1463 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1438 break;
1466 1439
1467 /* 1440 /*
1468 * XXX: this is not the _current_ arrangement 1441 * XXX: this is not the _current_ arrangement
1469 * Here's my conclusion: 1442 * Here's my conclusion:
… …
1488 break; 1461 break;
1489 } 1462 }
1490 break; 1463 break;
1491 1464
1492 case FocusIn: 1465 case FocusIn:
1466 if (ev.xfocus.detail != NotifyInferior
1467 && ev.xfocus.detail != NotifyPointer
1468 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1469 focus_in ();
1494 break; 1470 break;
1495 1471
1496 case FocusOut: 1472 case FocusOut:
1473 if (ev.xfocus.detail != NotifyInferior
1474 && ev.xfocus.detail != NotifyPointer
1475 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1476 focus_out ();
1498 break; 1477 break;
1499 1478
1500 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);*/
1501 if (ev.xconfigure.window == parent[0]) 1483 if (ev.xconfigure.window == parent[0])
1502 { 1484 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1485 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1486 ;
1505 1487
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1489 {
1508 seen_resize = 1; 1490 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1492 }
1511 1493 else
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1494 {
1495#ifdef ENABLE_TRANSPARENCY
1513 if (OPTION (Opt_transparent)) 1496 if (option (Opt_transparent))
1514 check_our_parents (); 1497 update_background ();
1515#endif 1498#endif
1499 }
1500 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1516 } 1501 }
1517 break; 1502 break;
1518 1503
1519 case PropertyNotify: 1504 case PropertyNotify:
1505 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1506 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1507 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1508 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1509
1524 break; 1510 break;
1525 1511
1526 case SelectionClear: 1512 case SelectionClear:
1527 selection_clear (); 1513 selection_clear ();
… …
1550 text_blink_ev.stop (); 1536 text_blink_ev.stop ();
1551#endif 1537#endif
1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1538 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1553 break; 1539 break;
1554 1540
1555#ifdef TRANSPARENT 1541#ifdef ENABLE_TRANSPARENCY
1556 case ReparentNotify: 1542 case ReparentNotify:
1557 rootwin_cb (ev); 1543 rootwin_cb (ev);
1558 break; 1544 break;
1559#endif /* TRANSPARENT */ 1545#endif /* ENABLE_TRANSPARENCY */
1560 1546
1561 case GraphicsExpose: 1547 case GraphicsExpose:
1562 case Expose: 1548 case Expose:
1563 if (ev.xany.window == vt) 1549 if (ev.xany.window == vt)
1564 { 1550 {
1565 do 1551 do
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1555
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1557
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1559 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1560 ev.xexpose.width, ev.xexpose.height, False);
1575 1561
1576 want_refresh = 1; 1562 want_refresh = 1;
1577 } 1563 }
1578 else 1564 else
1579 { 1565 {
1580 XEvent unused_event; 1566 XEvent unused_event;
1581 1567
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1568 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1569 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1570 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1571 ;
1586 1572
1587 if (isScrollbarWindow (ev.xany.window)) 1573 if (isScrollbarWindow (ev.xany.window))
1588 { 1574 {
1589 scrollBar.setIdle (); 1575 scrollBar.setIdle ();
1590 scrollbar_show (0); 1576 scrollbar_show (0);
1591 } 1577 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1601 } 1578 }
1602 break; 1579 break;
1603 1580
1604 case MotionNotify: 1581 case MotionNotify:
1605#ifdef POINTER_BLANK 1582#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1583 if (hidden_pointer)
1607 pointer_unblank (); 1584 pointer_unblank ();
1608#endif
1609#if MENUBAR
1610 if (isMenuBarWindow (ev.xany.window))
1611 {
1612 menubar_control (ev.xbutton);
1613 break;
1614 }
1615#endif 1585#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1586 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1587 break;
1618 1588
1619 if (ev.xany.window == vt) 1589 if (ev.xany.window == vt)
… …
1621 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1591 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1622 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1592 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop 1593 ; // nop
1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1594 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1625 { 1595 {
1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1596 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1627 ; 1597 ;
1628 1598
1629 XQueryPointer (disp, vt, 1599 XQueryPointer (dpy, vt,
1630 &unused_root, &unused_child, 1600 &unused_root, &unused_child,
1631 &unused_root_x, &unused_root_y, 1601 &unused_root_x, &unused_root_y,
1632 &ev.xbutton.x, &ev.xbutton.y, 1602 &ev.xbutton.x, &ev.xbutton.y,
1633 &ev.xbutton.state); 1603 &ev.xbutton.state);
1634#ifdef MOUSE_THRESHOLD 1604#ifdef MOUSE_THRESHOLD
… …
1698#endif 1668#endif
1699 } 1669 }
1700 } 1670 }
1701 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1671 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1702 { 1672 {
1703 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1673 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1704 MotionNotify, &ev)) 1674 MotionNotify, &ev))
1705 ; 1675 ;
1706 1676
1707 XQueryPointer (disp, scrollBar.win, 1677 XQueryPointer (dpy, scrollBar.win,
1708 &unused_root, &unused_child, 1678 &unused_root, &unused_child,
1709 &unused_root_x, &unused_root_y, 1679 &unused_root_x, &unused_root_y,
1710 &ev.xbutton.x, &ev.xbutton.y, 1680 &ev.xbutton.x, &ev.xbutton.y,
1711 &unused_mask); 1681 &unused_mask);
1712 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1682 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1713 scrollbar_size ()); 1683 scrollbar_size ());
1714 want_refresh = 1; 1684 want_refresh = 1;
1715 refresh_limit = 0;
1716 scrollbar_show (1); 1685 scrollbar_show (1);
1717 } 1686 }
1718 break; 1687 break;
1719 } 1688 }
1720 1689
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK) 1690#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1691 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1725 { 1692 {
1726 if (hidden_cursor) 1693 if (hidden_cursor)
1727 { 1694 {
1728 hidden_cursor = 0; 1695 hidden_cursor = 0;
1729 want_refresh = 1; 1696 want_refresh = 1;
1730 } 1697 }
1731 1698
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733 } 1700 }
1734#endif 1701#endif
1735 1702
1736#if defined(POINTER_BLANK) 1703#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1704 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 { 1705 {
1739 if (ev.type == MotionNotify 1706 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress 1707 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease) 1708 || ev.type == ButtonRelease)
1742 if (hidden_pointer) 1709 if (hidden_pointer)
… …
1754 if (!focus) 1721 if (!focus)
1755 { 1722 {
1756 focus = 1; 1723 focus = 1;
1757 want_refresh = 1; 1724 want_refresh = 1;
1758 1725
1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1726 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1760 1727
1761#if USE_XIM 1728#if USE_XIM
1762 if (Input_Context != NULL) 1729 if (Input_Context != NULL)
1763 { 1730 {
1764 IMSetStatusPosition (); 1731 IMSetPosition ();
1765 XSetICFocus (Input_Context); 1732 XSetICFocus (Input_Context);
1766 } 1733 }
1767#endif 1734#endif
1768#if CURSOR_BLINK 1735#if CURSOR_BLINK
1769 if (OPTION (Opt_cursorBlink)) 1736 if (option (Opt_cursorBlink))
1770 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1771#endif 1738#endif
1772#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1774 { 1741 {
1775 pix_colors = pix_colors_focused; 1742 pix_colors = pix_colors_focused;
1776 scr_recolour (); 1743 scr_recolour ();
1777 } 1744 }
1778#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
1779 } 1759 }
1780} 1760}
1781 1761
1782void 1762void
1783rxvt_term::focus_out () 1763rxvt_term::focus_out ()
… …
1791 1771
1792#if ENABLE_FRILLS || ISO_14755 1772#if ENABLE_FRILLS || ISO_14755
1793 if (iso14755buf) 1773 if (iso14755buf)
1794 { 1774 {
1795 iso14755buf = 0; 1775 iso14755buf = 0;
1796# if ENABLE_OVERLAY 1776# if ISO_14755
1797 scr_overlay_off (); 1777 scr_overlay_off ();
1798# endif 1778# endif
1799 } 1779 }
1800#endif 1780#endif
1801#if USE_XIM 1781#if USE_XIM
1802 if (Input_Context != NULL) 1782 if (Input_Context != NULL)
1803 XUnsetICFocus (Input_Context); 1783 XUnsetICFocus (Input_Context);
1804#endif 1784#endif
1805#if CURSOR_BLINK 1785#if CURSOR_BLINK
1806 if (OPTION (Opt_cursorBlink)) 1786 if (option (Opt_cursorBlink))
1807 cursor_blink_ev.stop (); 1787 cursor_blink_ev.stop ();
1808 hidden_cursor = 0; 1788 hidden_cursor = 0;
1809#endif 1789#endif
1810#if OFF_FOCUS_FADING 1790#if OFF_FOCUS_FADING
1811 if (rs[Rs_fade]) 1791 if (rs[Rs_fade])
… …
1815 } 1795 }
1816#endif 1796#endif
1817 } 1797 }
1818} 1798}
1819 1799
1820#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
1821void 1814void
1822rxvt_term::rootwin_cb (XEvent &ev) 1815rxvt_term::rootwin_cb (XEvent &ev)
1823{ 1816{
1824 make_current (); 1817 make_current ();
1825 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
1826 switch (ev.type) 1824 switch (ev.type)
1827 { 1825 {
1828 case PropertyNotify: 1826 case PropertyNotify:
1829 /* 1827 /*
1830 * 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,
1831 * 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.
1832 */ 1830 */
1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1831 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1832 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 return; 1833 {
1836 1834 bgPixmap.set_root_pixmap ();
1837 /* FALLTHROUGH */ 1835 update_background ();
1838 case ReparentNotify: 1836 }
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1;
1841 break; 1837 break;
1842 } 1838 }
1839# endif
1843} 1840}
1844#endif 1841#endif
1845 1842
1846void 1843void
1847rxvt_term::button_press (XButtonEvent &ev) 1844rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1853 /*
1857 * VT window processing of button press 1854 * VT window processing of button press
1858 */ 1855 */
1859 if (ev.window == vt) 1856 if (ev.window == vt)
1860 { 1857 {
1858 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1859 return;
1860
1861#if ISO_14755 1861#if ISO_14755
1862 // 5.4 1862 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1864 {
1865 iso14755_54 (ev.x, ev.y); 1865 iso14755_54 (ev.x, ev.y);
… …
1907 else 1907 else
1908 { 1908 {
1909 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1911 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1912 switch (ev.button)
1914 { 1913 {
1915 case Button1: 1914 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1919#else
1921 selection.rect = false; 1920 selection.rect = false;
1922#endif 1921#endif
1923 1922
1924 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1925 {
1927 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1929 else 1928 else
1930 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1931 } 1930 }
1932 else 1931 else
1933 { 1932 {
1934 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1934 MEvent.clicks++;
1936 else 1935 else
1937 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1938 1937
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1939 }
1941 1940
1942 MEvent.button = Button1; 1941 MEvent.button = Button1;
1943 break; 1942 break;
1944 1943
1945 case Button3: 1944 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1948 else 1947 else
1949 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1950 1949
1951 MEvent.button = Button3; 1950 MEvent.button = Button3;
1952 break; 1951 break;
1953 } 1952 }
1954 } 1953 }
1955 1954
1956 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1957 return; 1956 return;
1958 } 1957 }
1959 1958
… …
2098 } 2097 }
2099 } 2098 }
2100 2099
2101 return; 2100 return;
2102 } 2101 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2102}
2112 2103
2113void 2104void
2114rxvt_term::button_release (XButtonEvent &ev) 2105rxvt_term::button_release (XButtonEvent &ev)
2115{ 2106{
… …
2121 2112
2122 if (scrollbar_isUpDn ()) 2113 if (scrollbar_isUpDn ())
2123 { 2114 {
2124 scrollBar.setIdle (); 2115 scrollBar.setIdle ();
2125 scrollbar_show (0); 2116 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2117 }
2130 2118
2131#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active) 2120 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2121 sel_scroll_ev.stop();
2134#endif 2122#endif
2135 2123
2136 if (ev.window == vt) 2124 if (ev.window == vt)
2137 { 2125 {
2126 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2127 return;
2128
2138#if ISO_14755 2129#if ISO_14755
2139 // 5.4 2130 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2131 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2132 return;
2142#endif 2133#endif
2134
2143 if (reportmode) 2135 if (reportmode)
2144 { 2136 {
2145 /* mouse report from vt window */ 2137 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2138 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2139 if (ev.button >= 4)
… …
2171 if (priv_modes & PrivMode_mouse_report 2163 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2164 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2165 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2166 selection_extend (ev.x, ev.y, 0);
2175 2167
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2168 switch (ev.button)
2180 { 2169 {
2181 case Button1: 2170 case Button1:
2182 case Button3: 2171 case Button3:
2183 selection_make (ev.time); 2172 selection_make (ev.time);
2184 break; 2173 break;
2174
2185 case Button2: 2175 case Button2:
2186 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);
2187 break; 2178 break;
2179
2188#ifdef MOUSE_WHEEL 2180#ifdef MOUSE_WHEEL
2189 case Button4: 2181 case Button4:
2190 case Button5: 2182 case Button5:
2191 { 2183 {
2192 int i; 2184 int i;
… …
2194 2186
2195 v = ev.button == Button4 ? UP : DN; 2187 v = ev.button == Button4 ? UP : DN;
2196 2188
2197 if (ev.state & ShiftMask) 2189 if (ev.state & ShiftMask)
2198 i = 1; 2190 i = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2191 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2192 i = nrow - 1;
2201 else 2193 else
2202 i = 5; 2194 i = 5;
2203 2195
2204# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
… …
2224 } 2216 }
2225 break; 2217 break;
2226#endif 2218#endif
2227 } 2219 }
2228 } 2220 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2221}
2234
2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
2467/*
2468 * Check our parents are still who we think they are.
2469 * Do transparency updates if required
2470 */
2471int
2472rxvt_term::check_our_parents ()
2473{
2474 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after;
2476 Atom atype;
2477 unsigned char *prop = NULL;
2478 Window root, oldp, *list;
2479 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482
2483 pchanged = 0;
2484
2485 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */
2487
2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth;
2490
2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
2493 if (rootdepth != wattr.depth)
2494 {
2495 if (am_transparent)
2496 {
2497 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0;
2500 }
2501
2502 return pchanged; /* Don't try any more */
2503 }
2504
2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False);
2507
2508 /*
2509 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that.
2512 */
2513 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success);
2517
2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
2529 have_pixmap = 0;
2530 else
2531 {
2532 have_pixmap = 1;
2533 rootpixmap = *(Pixmap *)prop;
2534 XFree (prop);
2535 }
2536
2537 if (have_pixmap)
2538 {
2539 /*
2540 * Copy display->root pixmap transparency
2541 */
2542 int sx, sy, nx, ny;
2543 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height;
2553 nx = ny = 0;
2554
2555 if (sx < 0)
2556 {
2557 nw += sx;
2558 nx = -sx;
2559 sx = 0;
2560 }
2561
2562 if (sy < 0)
2563 {
2564 nh += sy;
2565 ny = -sy;
2566 sy = 0;
2567 }
2568
2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2573 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */
2578 allowedxerror = 0;
2579
2580 if (image == NULL)
2581 {
2582 if (am_transparent && am_pixmap_trans)
2583 {
2584 pchanged = 1;
2585 if (pixmap != None)
2586 {
2587 XFreePixmap (disp, pixmap);
2588 pixmap = None;
2589 }
2590 }
2591
2592 am_pixmap_trans = 0;
2593 }
2594 else
2595 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]);
2620
2621 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1;
2623
2624 am_transparent = am_pixmap_trans = 1;
2625 }
2626 }
2627
2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2631 {
2632 unsigned int n;
2633 /*
2634 * InheritPixmap transparency
2635 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 {
2638 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root,
2640 &parent[i], &list, &n);
2641 XFree (list);
2642
2643 if (parent[i] == display->root)
2644 {
2645 if (oldp != None)
2646 pchanged = 1;
2647
2648 break;
2649 }
2650
2651 if (oldp != parent[i])
2652 pchanged = 1;
2653 }
2654
2655 n = 0;
2656
2657 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++)
2660 {
2661 XGetWindowAttributes (disp, parent[n], &wattr);
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break;
2666 }
2667 }
2668 }
2669
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */
2676 }
2677 else
2678 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2691 am_transparent = 1;
2692 }
2693
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2712 return pchanged;
2713}
2714#endif
2715 2222
2716/*}}} */ 2223/*}}} */
2717 2224
2718bool 2225bool
2719rxvt_term::cmd_parse () 2226rxvt_term::cmd_parse ()
… …
2768 if (ch == C0_LF) 2275 if (ch == C0_LF)
2769 nlines++; 2276 nlines++;
2770 2277
2771 refresh_count++; 2278 refresh_count++;
2772 2279
2773 if (!OPTION (Opt_jumpScroll) 2280 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2281 {
2776 refreshnow = true;
2777 refresh_count = 0; 2282 refresh_count = 0;
2283
2284 if (!option (Opt_skipScroll) || io_manager::now () > NOW + 1. / 60.)
2285 {
2286 refreshnow = true;
2778 ch = NOCHAR; 2287 ch = NOCHAR;
2779 break; 2288 break;
2289 }
2780 } 2290 }
2781 2291
2782 // scr_add_lines only works for nlines <= nrow - 1. 2292 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2293 if (nlines >= nrow - 1)
2784 { 2294 {
… …
2812 && 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))))
2813 scr_add_lines (buf, str - buf, nlines); 2323 scr_add_lines (buf, str - buf, nlines);
2814 2324
2815 /* 2325 /*
2816 * 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
2817 * 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.
2818 * the number of pages between refreshes is refresh_limit, which 2328 * if skipScroll is enabled.
2819 * is incremented here because we must be doing flat-out scrolling.
2820 */ 2329 */
2821 if (refreshnow) 2330 if (refreshnow)
2822 { 2331 {
2823 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2824 refresh_limit++;
2825 else
2826 {
2827 flag = true; 2332 flag = true;
2828 scr_refresh (refresh_type); 2333 scr_refresh ();
2829 want_refresh = 1; 2334 want_refresh = 1;
2830 }
2831 } 2335 }
2832 2336
2833 } 2337 }
2834 else 2338 else
2835 { 2339 {
… …
2851 return flag; 2355 return flag;
2852} 2356}
2853 2357
2854// read the next character 2358// read the next character
2855wchar_t 2359wchar_t
2856rxvt_term::next_char () 2360rxvt_term::next_char () NOTHROW
2857{ 2361{
2858 while (cmdbuf_ptr < cmdbuf_endp) 2362 while (cmdbuf_ptr < cmdbuf_endp)
2859 { 2363 {
2860 // assume 7-bit to be ascii ALWAYS 2364 // assume 7-bit to be ascii ALWAYS
2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2365 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2882 return NOCHAR; 2386 return NOCHAR;
2883} 2387}
2884 2388
2885// read the next octet 2389// read the next octet
2886uint32_t 2390uint32_t
2887rxvt_term::next_octet () 2391rxvt_term::next_octet () NOTHROW
2888{ 2392{
2889 return cmdbuf_ptr < cmdbuf_endp 2393 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++ 2394 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR; 2395 : NOCHAR;
2892} 2396}
2397
2398static class out_of_input out_of_input;
2893 2399
2894/* rxvt_cmd_getc () - Return next input character */ 2400/* rxvt_cmd_getc () - Return next input character */
2895/* 2401/*
2896 * Return the next input character after first passing any keyboard input 2402 * Return the next input character after first passing any keyboard input
2897 * to the command. 2403 * to the command.
2898 */ 2404 */
2899wchar_t 2405wchar_t
2900rxvt_term::cmd_getc () 2406rxvt_term::cmd_getc () THROW ((class out_of_input))
2901{ 2407{
2902 wchar_t c = next_char (); 2408 wchar_t c = next_char ();
2903 2409
2904 if (c == NOCHAR) 2410 if (c == NOCHAR)
2905 throw out_of_input; 2411 throw out_of_input;
2906 2412
2907 return c; 2413 return c;
2908} 2414}
2909 2415
2910uint32_t 2416uint32_t
2911rxvt_term::cmd_get8 () 2417rxvt_term::cmd_get8 () THROW ((class out_of_input))
2912{ 2418{
2913 uint32_t c = next_octet (); 2419 uint32_t c = next_octet ();
2914 2420
2915 if (c == NOCHAR) 2421 if (c == NOCHAR)
2916 throw out_of_input; 2422 throw out_of_input;
… …
2982 { 2488 {
2983 if ((buf[len++] = cmd_getc ()) == 'i') 2489 if ((buf[len++] = cmd_getc ()) == 'i')
2984 break; /* done = 1 */ 2490 break; /* done = 1 */
2985 } 2491 }
2986 } 2492 }
2987 2493
2988 for (i = 0; i < len; i++) 2494 for (i = 0; i < len; i++)
2989 if (putc (buf[i], fd) == EOF) 2495 if (putc (buf[i], fd) == EOF)
2990 { 2496 {
2991 done = 1; 2497 done = 1;
2992 break; 2498 break;
… …
3054 process_dcs_seq (); 2560 process_dcs_seq ();
3055 break; 2561 break;
3056 case 0x9b: /* CSI */ 2562 case 0x9b: /* CSI */
3057 process_csi_seq (); 2563 process_csi_seq ();
3058 break; 2564 break;
3059 case 0x9d: /* CSI */ 2565 case 0x9d: /* OSC */
3060 process_osc_seq (); 2566 process_osc_seq ();
3061 break; 2567 break;
3062#endif 2568#endif
3063 } 2569 }
3064} 2570}
… …
3154 scr_charset_set (2, (unsigned int)cmd_getc ()); 2660 scr_charset_set (2, (unsigned int)cmd_getc ());
3155 break; 2661 break;
3156 case '+': 2662 case '+':
3157 scr_charset_set (3, (unsigned int)cmd_getc ()); 2663 scr_charset_set (3, (unsigned int)cmd_getc ());
3158 break; 2664 break;
3159#if ENABLE_FRILLS 2665#if !ENABLE_MINIMAL
3160 case '6': 2666 case '6':
3161 scr_backindex (); 2667 scr_backindex ();
3162 break; 2668 break;
3163#endif 2669#endif
3164 case '7': 2670 case '7':
3165 scr_cursor (SAVE); 2671 scr_cursor (SAVE);
3166 break; 2672 break;
3167 case '8': 2673 case '8':
3168 scr_cursor (RESTORE); 2674 scr_cursor (RESTORE);
3169 break; 2675 break;
3170#if ENABLE_FRILLS 2676#if !ENABLE_MINIMAL
3171 case '9': 2677 case '9':
3172 scr_forwardindex (); 2678 scr_forwardindex ();
3173 break; 2679 break;
3174#endif 2680#endif
3175 case '=': 2681 case '=':
… …
3290rxvt_term::process_csi_seq () 2796rxvt_term::process_csi_seq ()
3291{ 2797{
3292 unicode_t ch, priv, i; 2798 unicode_t ch, priv, i;
3293 unsigned int nargs, p; 2799 unsigned int nargs, p;
3294 int n, ndef; 2800 int n, ndef;
3295 int arg[ESC_ARGS]; 2801 int arg[ESC_ARGS] = { };
3296 2802
3297 for (nargs = ESC_ARGS; nargs > 0;) 2803 nargs = 0;
3298 arg[--nargs] = 0;
3299 2804
3300 priv = 0; 2805 priv = 0;
3301 ch = cmd_getc (); 2806 ch = cmd_getc ();
3302 if (ch >= '<' && ch <= '?') 2807 if (ch >= '<' && ch <= '?')
3303 { /* '<' '=' '>' '?' */ 2808 { /* '<' '=' '>' '?' */
… …
3337 ndef = get_byte_array_bit (csi_defaults, i); 2842 ndef = get_byte_array_bit (csi_defaults, i);
3338 for (p = 0; p < nargs; p++) 2843 for (p = 0; p < nargs; p++)
3339 if (arg[p] == -1) 2844 if (arg[p] == -1)
3340 arg[p] = ndef; 2845 arg[p] = ndef;
3341 2846
3342#ifdef DEBUG_CMD
3343 fprintf (stderr, "CSI ");
3344 for (p = 0; p < nargs; p++)
3345 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3346 fprintf (stderr, "%c\n", ch);
3347#endif
3348
3349 /* 2847 /*
3350 * private mode handling 2848 * private mode handling
3351 */ 2849 */
3352 if (priv) 2850 if (priv)
3353 { 2851 {
3354 switch (priv) 2852 switch (priv)
3355 { 2853 {
3356 case '>': 2854 case '>':
3357 if (ch == CSI_DA) /* secondary device attributes */ 2855 if (ch == CSI_DA) /* secondary device attributes */
3358 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 }
3359 break; 2866 break;
3360 case '?': 2867 case '?':
3361 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2868 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3362 process_terminal_mode (ch, priv, nargs, arg); 2869 process_terminal_mode (ch, priv, nargs, arg);
3363 break; 2870 break;
… …
3489 break; 2996 break;
3490 case 6: /* CPR requested */ 2997 case 6: /* CPR requested */
3491 scr_report_position (); 2998 scr_report_position ();
3492 break; 2999 break;
3493 case 7: /* unofficial extension */ 3000 case 7: /* unofficial extension */
3494 if (OPTION (Opt_insecure)) 3001 if (option (Opt_insecure))
3495 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3002 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3496 break; 3003 break;
3497 case 8: /* unofficial extension */ 3004 case 8: /* unofficial extension */
3498 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3005 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3499 break; 3006 break;
… …
3566 break; 3073 break;
3567 case CSI_75: 3074 case CSI_75:
3568 scr_cursor (RESTORE); 3075 scr_cursor (RESTORE);
3569 break; 3076 break;
3570 3077
3571#if ENABLE_FRILLS 3078#if !ENABLE_MINIMAL
3572 case CSI_74: 3079 case CSI_74:
3573 process_window_ops (arg, nargs); 3080 process_window_ops (arg, nargs);
3574 break; 3081 break;
3575#endif 3082#endif
3576 3083
… …
3583 break; 3090 break;
3584 } 3091 }
3585} 3092}
3586/*}}} */ 3093/*}}} */
3587 3094
3588#if ENABLE_FRILLS 3095#if !ENABLE_MINIMAL
3589/* ARGSUSED */ 3096/* ARGSUSED */
3590void 3097void
3591rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3098rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3592{ 3099{
3593 int x, y; 3100 int x, y;
3594 XWindowAttributes wattr; 3101 XWindowAttributes wattr;
3595 Window wdummy; 3102 Window wdummy;
3596 dDisp; 3103
3104 dLocal (Display *, dpy);
3597 3105
3598 if (nargs == 0) 3106 if (nargs == 0)
3599 return; 3107 return;
3600 3108
3601 switch (args[0]) 3109 switch (args[0])
3602 { 3110 {
3603 /* 3111 /*
3604 * commands 3112 * commands
3605 */ 3113 */
3606 case 1: /* deiconify window */ 3114 case 1: /* deiconify window */
3607 XMapWindow (disp, parent[0]); 3115 XMapWindow (dpy, parent[0]);
3608 break; 3116 break;
3609 case 2: /* iconify window */ 3117 case 2: /* iconify window */
3610 XIconifyWindow (disp, parent[0], display->screen); 3118 XIconifyWindow (dpy, parent[0], display->screen);
3611 break; 3119 break;
3612 case 3: /* set position (pixels) */ 3120 case 3: /* set position (pixels) */
3613 XMoveWindow (disp, parent[0], args[1], args[2]); 3121 XMoveWindow (dpy, parent[0], args[1], args[2]);
3614 break; 3122 break;
3615 case 4: /* set size (pixels) */ 3123 case 4: /* set size (pixels) */
3616 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3124 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3617 break; 3125 break;
3618 case 5: /* raise window */ 3126 case 5: /* raise window */
3619 XRaiseWindow (disp, parent[0]); 3127 XRaiseWindow (dpy, parent[0]);
3620 break; 3128 break;
3621 case 6: /* lower window */ 3129 case 6: /* lower window */
3622 XLowerWindow (disp, parent[0]); 3130 XLowerWindow (dpy, parent[0]);
3623 break; 3131 break;
3624 case 7: /* refresh window */ 3132 case 7: /* refresh window */
3625 scr_touch (true); 3133 scr_touch (true);
3626 break; 3134 break;
3627 case 8: /* set size (chars) */ 3135 case 8: /* set size (chars) */
… …
3634 if (args[0] >= 24) /* set height (chars) */ 3142 if (args[0] >= 24) /* set height (chars) */
3635 set_widthheight ((unsigned int)width, 3143 set_widthheight ((unsigned int)width,
3636 (unsigned int) (args[1] * fheight)); 3144 (unsigned int) (args[1] * fheight));
3637 break; 3145 break;
3638 3146
3639
3640 /* 3147 /*
3641 * reports - some output format copied from XTerm 3148 * reports - some output format copied from XTerm
3642 */ 3149 */
3643 case 11: /* report window state */ 3150 case 11: /* report window state */
3644 XGetWindowAttributes (disp, parent[0], &wattr); 3151 XGetWindowAttributes (dpy, parent[0], &wattr);
3645 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3152 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3646 break; 3153 break;
3647 case 13: /* report window position */ 3154 case 13: /* report window position */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3155 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 XTranslateCoordinates (disp, parent[0], wattr.root, 3156 XTranslateCoordinates (dpy, parent[0], wattr.root,
3650 -wattr.border_width, -wattr.border_width, 3157 -wattr.border_width, -wattr.border_width,
3651 &x, &y, &wdummy); 3158 &x, &y, &wdummy);
3652 tt_printf ("\033[3;%d;%dt", x, y); 3159 tt_printf ("\033[3;%d;%dt", x, y);
3653 break; 3160 break;
3654 case 14: /* report window size (pixels) */ 3161 case 14: /* report window size (pixels) */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3162 XGetWindowAttributes (dpy, parent[0], &wattr);
3656 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3163 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3657 break; 3164 break;
3658 case 18: /* report text area size (chars) */ 3165 case 18: /* report text area size (chars) */
3659 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3166 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3660 break; 3167 break;
… …
3662 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3663 break; 3170 break;
3664 case 20: /* report icon label */ 3171 case 20: /* report icon label */
3665 { 3172 {
3666 char *s; 3173 char *s;
3667 XGetIconName (disp, parent[0], &s); 3174 XGetIconName (dpy, parent[0], &s);
3668 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 */
3669 XFree (s); 3176 XFree (s);
3670 } 3177 }
3671 break; 3178 break;
3672 case 21: /* report window title */ 3179 case 21: /* report window title */
3673 { 3180 {
3674 char *s; 3181 char *s;
3675 XFetchName (disp, parent[0], &s); 3182 XFetchName (dpy, parent[0], &s);
3676 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 */
3677 XFree (s); 3184 XFree (s);
3678 } 3185 }
3679 break; 3186 break;
3680 } 3187 }
3681} 3188}
… …
3708 seen_esc = true; 3215 seen_esc = true;
3709 continue; 3216 continue;
3710 } 3217 }
3711 else if (ch == C0_BEL || ch == CHAR_ST) 3218 else if (ch == C0_BEL || ch == CHAR_ST)
3712 break; 3219 break;
3220 else if (ch == C0_SYN)
3221 ch = cmd_get8 ();
3713 else if (ch < 0x20) 3222 else if (ch < 0x20)
3714 return NULL; /* other control character - exit */ 3223 return NULL; /* other control character - exit */
3715 3224
3716 seen_esc = false; 3225 seen_esc = false;
3717 3226
3718 if (n >= STRING_MAX - 1) 3227 if (n >= STRING_MAX - 1)
3719 // stop at some sane length 3228 // stop at some sane length
3720 return NULL; 3229 return NULL;
3721 3230
3722 if (ch == C0_SYN)
3723 string[n++] = cmd_get8 ();
3724 else
3725 string[n++] = ch; 3231 string[n++] = ch;
3726 } 3232 }
3727 3233
3728 string[n++] = '\0'; 3234 string[n++] = '\0';
3729 3235
3730 ends_how = (ch == 0x5c ? C0_ESC : ch); 3236 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3781void 3287void
3782rxvt_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)
3783{ 3289{
3784 if (str[0] == '?' && !str[1]) 3290 if (str[0] == '?' && !str[1])
3785 { 3291 {
3786 unsigned short r, g, b; 3292 rgba c;
3787 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
3788 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);
3789 } 3301 }
3790 else 3302 else
3791 set_window_color (color, str); 3303 set_window_color (color, str);
3792} 3304}
3793 3305
… …
3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3307 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3796 */ 3308 */
3797void 3309void
3798rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3310rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3799{ 3311{
3800 int changed = 0;
3801 int color; 3312 int color;
3802 char *buf, *name; 3313 char *buf, *name;
3803 bool query = str[0] == '?' && !str[1]; 3314 bool query = str[0] == '?' && !str[1];
3804 int saveop = op; 3315 int saveop = op;
3805 dDisp; 3316
3317 dLocal (Display *, dpy);
3806 3318
3807 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
3808 switch (op) 3324 switch (op)
3809 { 3325 {
3810 case XTerm_name: 3326 case XTerm_name:
3811 set_title (str); 3327 set_title (str);
3812 /* FALLTHROUGH */ 3328 /* FALLTHROUGH */
… …
3826 unsigned long bytes_after; 3342 unsigned long bytes_after;
3827 unsigned char *value = 0; 3343 unsigned char *value = 0;
3828 const char *str = ""; 3344 const char *str = "";
3829 3345
3830 if (prop 3346 if (prop
3831 && XGetWindowProperty (disp, parent[0], 3347 && XGetWindowProperty (dpy, parent[0],
3832 prop, 0, 1<<16, 0, AnyPropertyType, 3348 prop, 0, 1<<16, 0, AnyPropertyType,
3833 &actual_type, &actual_format, 3349 &actual_type, &actual_format,
3834 &nitems, &bytes_after, &value) == Success 3350 &nitems, &bytes_after, &value) == Success
3835 && actual_type != None 3351 && actual_type != None
3836 && actual_format == 8) 3352 && actual_format == 8)
3837 str = (const char *)(value); 3353 str = (const char *)(value);
3838 3354
3839 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3355 tt_printf ("\033]%d;%s%c", op, str, resp);
3840 3356
3841 XFree (value); 3357 XFree (value);
3842 } 3358 }
3843 else 3359 else
3844 { 3360 {
… …
3848 { 3364 {
3849 *eq = 0; 3365 *eq = 0;
3850 set_utf8_property (display->atom (str), eq + 1); 3366 set_utf8_property (display->atom (str), eq + 1);
3851 } 3367 }
3852 else 3368 else
3853 XDeleteProperty (disp, parent[0], 3369 XDeleteProperty (dpy, parent[0],
3854 display->atom (str)); 3370 display->atom (str));
3855 } 3371 }
3856 break; 3372 break;
3857 3373
3858 case XTerm_Color: 3374 case XTerm_Color:
… …
3868 break; 3384 break;
3869 3385
3870 if ((buf = strchr (name, ';')) != NULL) 3386 if ((buf = strchr (name, ';')) != NULL)
3871 *buf++ = '\0'; 3387 *buf++ = '\0';
3872 3388
3873 if (name[0] == '?' && !name[1]) 3389 process_color_seq (op, color, name, resp);
3874 {
3875 unsigned short r, g, b;
3876 pix_colors_focused[color].get (display, r, g, b);
3877 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3878 }
3879 else
3880 set_window_color (color, name);
3881 } 3390 }
3882 break; 3391 break;
3883 case XTerm_Color00: 3392 case XTerm_Color00:
3884 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3393 process_color_seq (op, Color_fg, str, resp);
3885 break; 3394 break;
3886 case XTerm_Color01: 3395 case XTerm_Color01:
3887 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3396 process_color_seq (op, Color_bg, str, resp);
3888 break; 3397 break;
3889#ifndef NO_CURSORCOLOR 3398#ifndef NO_CURSORCOLOR
3890 case XTerm_Color_cursor: 3399 case XTerm_Color_cursor:
3891 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3400 process_color_seq (op, Color_cursor, str, resp);
3892 break; 3401 break;
3893#endif 3402#endif
3894 case XTerm_Color_pointer_fg: 3403 case XTerm_Color_pointer_fg:
3895 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3404 process_color_seq (op, Color_pointer_fg, str, resp);
3896 break; 3405 break;
3897 case XTerm_Color_pointer_bg: 3406 case XTerm_Color_pointer_bg:
3898 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3407 process_color_seq (op, Color_pointer_bg, str, resp);
3899 break; 3408 break;
3900#ifndef NO_BOLD_UNDERLINE_REVERSE 3409#ifndef NO_BOLD_UNDERLINE_REVERSE
3901 case XTerm_Color_RV: 3410 case XTerm_Color_RV:
3902 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3411 process_color_seq (op, Color_RV, str, resp);
3903 break; 3412 break;
3904 case Rxvt_Color_BD: 3413 case Rxvt_Color_BD:
3905 case URxvt_Color_BD: 3414 case URxvt_Color_BD:
3906 process_color_seq (op, Color_BD, str, resp); 3415 process_color_seq (op, Color_BD, str, resp);
3907 break; 3416 break;
3908 case Rxvt_Color_UL: 3417 case Rxvt_Color_UL:
3909 case URxvt_Color_UL: 3418 case URxvt_Color_UL:
3910 process_color_seq (op, Color_UL, str, resp); 3419 process_color_seq (op, Color_UL, str, resp);
3911 break; 3420 break;
3912 case URxvt_Color_IT: 3421 case URxvt_Color_IT:
3913 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3422 process_color_seq (op, Color_IT, str, resp);
3914 break; 3423 break;
3915#endif 3424#endif
3916#if TRANSPARENT && TINTING 3425#if ENABLE_TRANSPARENCY
3917 case URxvt_Color_tint: 3426 case URxvt_Color_tint:
3918 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3427 process_color_seq (op, Color_tint, str, resp);
3919 check_our_parents (); 3428 {
3920 if (am_transparent) 3429 bool changed = false;
3921 want_full_refresh = want_refresh = 1; 3430 if (ISSET_PIXCOLOR (Color_tint))
3922 break; 3431 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3923#endif 3432 else
3433 changed = bgPixmap.unset_tint ();
3434 if (changed)
3435 update_background ();
3436 }
3924 3437
3438 break;
3439#endif
3440
3441#if XPM_BACKGROUND
3925 case Rxvt_Pixmap: 3442 case Rxvt_Pixmap:
3926 if (*str != ';') 3443 if (!strcmp (str, "?"))
3927 { 3444 {
3928#if XPM_BACKGROUND 3445 char str[256];
3929 scale_pixmap (""); /* reset to default scaling */ 3446
3930 set_bgPixmap (str); /* change pixmap */ 3447 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3931 scr_touch (true); 3448 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3932#endif 3449 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3450 process_xterm_seq (XTerm_title, str, CHAR_ST);
3933 } 3451 }
3934 3452 else
3935 while ((str = strchr (str, ';')) != NULL)
3936 { 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 {
3937 str++; 3468 str++;
3938#if XPM_BACKGROUND 3469 if (bgPixmap.set_geometry (str))
3939 changed += scale_pixmap (str); 3470 changed++;
3940#endif 3471 str = strchr (str, ';');
3472 }
3473 if (changed)
3474 update_background ();
3941 } 3475 }
3942
3943 if (changed)
3944 {
3945#ifdef XPM_BACKGROUND
3946 resize_pixmap ();
3947 scr_touch (true);
3948#endif
3949 }
3950 break; 3476 break;
3477#endif
3951 3478
3952 case Rxvt_restoreFG: 3479 case Rxvt_restoreFG:
3953 set_window_color (Color_fg, str); 3480 set_window_color (Color_fg, str);
3954 break; 3481 break;
3955 case Rxvt_restoreBG: 3482 case Rxvt_restoreBG:
… …
3958 3485
3959 case XTerm_logfile: 3486 case XTerm_logfile:
3960 // TODO, when secure mode? 3487 // TODO, when secure mode?
3961 break; 3488 break;
3962 3489
3963#ifdef MENUBAR
3964 case URxvt_Menu:
3965 if (OPTION (Opt_insecure))
3966 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3967 break;
3968#endif
3969#if 0 3490#if 0
3970 case Rxvt_dumpscreen: /* no error notices */ 3491 case Rxvt_dumpscreen: /* no error notices */
3971 { 3492 {
3972 int fd; 3493 int fd;
3973 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)
… …
3986 case URxvt_italicFont: 3507 case URxvt_italicFont:
3987 case URxvt_boldItalicFont: 3508 case URxvt_boldItalicFont:
3988#endif 3509#endif
3989 if (query) 3510 if (query)
3990 tt_printf ("\33]%d;%-.250s%c", saveop, 3511 tt_printf ("\33]%d;%-.250s%c", saveop,
3991 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3512 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3992 ? fontset[op - URxvt_font]->fontdesc : "", 3513 ? fontset[op - URxvt_font]->fontdesc : "",
3993 resp); 3514 resp);
3994 else 3515 else
3995 { 3516 {
3996 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3517 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3999 allocated.push_back ((void *)res); 3520 allocated.push_back ((void *)res);
4000 set_fonts (); 3521 set_fonts ();
4001 } 3522 }
4002 break; 3523 break;
4003 3524
4004#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
4005 case URxvt_locale: 3534 case URxvt_locale:
4006 if (query) 3535 if (query)
4007 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);
4008 else 3537 else
4009 { 3538 {
4010 set_locale (str); 3539 set_locale (str);
4011 pty.set_utf8_mode (enc_utf8); 3540 pty->set_utf8_mode (enc_utf8);
4012 init_xlocale (); 3541 init_xlocale ();
4013 } 3542 }
4014 break; 3543 break;
4015 3544
4016 case URxvt_view_up: 3545 case URxvt_view_up:
… …
4027 break; 3556 break;
4028#endif 3557#endif
4029 3558
4030#if ENABLE_PERL 3559#if ENABLE_PERL
4031 case URxvt_perl: 3560 case URxvt_perl:
4032 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)))
4033 ; // no responses yet 3562 ; // no responses yet
4034 break; 3563 break;
4035#endif 3564#endif
4036 } 3565 }
4037} 3566}
… …
4069 return state; 3598 return state;
4070} 3599}
4071 3600
4072/* we're not using priv _yet_ */ 3601/* we're not using priv _yet_ */
4073void 3602void
4074rxvt_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)
4075{ 3604{
4076 unsigned int i, j; 3605 unsigned int i, j;
4077 int state; 3606 int state;
4078 3607
4079 static const struct 3608 static const struct
4080 { 3609 {
4081 const int argval; 3610 const int argval;
4082 const unsigned long bit; 3611 const unsigned long bit;
4083 }
4084
4085 argtopriv[] = { 3612 } argtopriv[] = {
4086 { 1, PrivMode_aplCUR }, 3613 { 1, PrivMode_aplCUR },
4087 { 2, PrivMode_vt52 }, 3614 { 2, PrivMode_vt52 },
4088 { 3, PrivMode_132 }, 3615 { 3, PrivMode_132 },
4089 { 4, PrivMode_smoothScroll }, 3616 { 4, PrivMode_smoothScroll },
4090 { 5, PrivMode_rVideo }, 3617 { 5, PrivMode_rVideo },
4091 { 6, PrivMode_relOrigin }, 3618 { 6, PrivMode_relOrigin },
4092 { 7, PrivMode_Autowrap }, 3619 { 7, PrivMode_Autowrap },
4093 // 8, bi-directional support mode 3620 // 8, bi-directional support mode
4094 { 9, PrivMode_MouseX10 }, 3621 { 9, PrivMode_MouseX10 },
4095#ifdef menuBar_esc
4096 { menuBar_esc, PrivMode_menuBar },
4097#endif
4098 // 18, 19 printing-related 3622 // 18, 19 printing-related
4099 { 25, PrivMode_VisibleCursor }, 3623 { 25, PrivMode_VisibleCursor },
4100#ifdef scrollBar_esc 3624#ifdef scrollBar_esc
4101 { scrollBar_esc, PrivMode_scrollBar }, 3625 { scrollBar_esc, PrivMode_scrollBar },
4102#endif 3626#endif
… …
4156 scr_touch (true); 3680 scr_touch (true);
4157 break; 3681 break;
4158#endif 3682#endif
4159 case 1048: /* alternative cursor save */ 3683 case 1048: /* alternative cursor save */
4160 case 1049: 3684 case 1049:
4161 if (OPTION (Opt_secondaryScreen)) 3685 if (option (Opt_secondaryScreen))
4162 if (mode == 0) 3686 if (mode == 0)
4163 scr_cursor (RESTORE); 3687 scr_cursor (RESTORE);
4164 else if (mode == 1) 3688 else if (mode == 1)
4165 scr_cursor (SAVE); 3689 scr_cursor (SAVE);
4166 break; 3690 break;
… …
4197 /* 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 */
4198 case 9: /* X10 mouse reporting */ 3722 case 9: /* X10 mouse reporting */
4199 if (state) /* orthogonal */ 3723 if (state) /* orthogonal */
4200 priv_modes &= ~PrivMode_MouseX11; 3724 priv_modes &= ~PrivMode_MouseX11;
4201 break; 3725 break;
4202#ifdef menuBar_esc
4203 case menuBar_esc:
4204#ifdef MENUBAR
4205 map_menuBar (state);
4206#endif
4207 break;
4208#endif
4209#ifdef scrollBar_esc 3726#ifdef scrollBar_esc
4210 case scrollBar_esc: 3727 case scrollBar_esc:
4211 if (scrollbar_mapping (state)) 3728 if (scrollbar_mapping (state))
4212 { 3729 {
4213 resize_all_windows (0, 0, 0); 3730 resize_all_windows (0, 0, 0);
… …
4238 break; 3755 break;
4239 case 1011: /* scroll to bottom on key press */ 3756 case 1011: /* scroll to bottom on key press */
4240 set_option (Opt_scrollTtyKeypress, state); 3757 set_option (Opt_scrollTtyKeypress, state);
4241 break; 3758 break;
4242 case 1047: /* secondary screen w/ clearing last */ 3759 case 1047: /* secondary screen w/ clearing last */
4243 if (OPTION (Opt_secondaryScreen)) 3760 if (option (Opt_secondaryScreen))
4244 if (current_screen != PRIMARY) 3761 if (current_screen != PRIMARY)
4245 scr_erase_screen (2); 3762 scr_erase_screen (2);
4246 scr_change_screen (state); 3763 scr_change_screen (state);
4247 break; 3764 break;
4248 case 1049: /* secondary screen w/ clearing first */ 3765 case 1049: /* secondary screen w/ clearing first */
4249 scr_change_screen (state); 3766 scr_change_screen (state);
4250 if (OPTION (Opt_secondaryScreen)) 3767 if (option (Opt_secondaryScreen))
4251 if (current_screen != PRIMARY) 3768 if (current_screen != PRIMARY)
4252 scr_erase_screen (2); 3769 scr_erase_screen (2);
4253 break; 3770 break;
4254 default: 3771 default:
4255 break; 3772 break;
… …
4383 scr_color (Color_bg, Color_bg); 3900 scr_color (Color_bg, Color_bg);
4384 break; 3901 break;
4385 3902
4386 //case 50: // not variable spacing 3903 //case 50: // not variable spacing
4387 3904
4388#if ENABLE_FRILLS 3905#if !ENABLE_MINIMAL
4389 case 90: 3906 case 90:
4390 case 91: /* set bright fg color */ 3907 case 91: /* set bright fg color */
4391 case 92: 3908 case 92:
4392 case 93: 3909 case 93:
4393 case 94: 3910 case 94:
… …
4458rxvt_term::tt_write (const char *data, unsigned int len) 3975rxvt_term::tt_write (const char *data, unsigned int len)
4459{ 3976{
4460 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)))
4461 return; 3978 return;
4462 3979
4463 if (pty.pty < 0) 3980 if (pty->pty < 0)
4464 return; 3981 return;
4465 3982
4466 if (v_buflen == 0) 3983 if (v_buflen == 0)
4467 { 3984 {
4468 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));
4469 3986
4470 if ((unsigned int)written == len) 3987 if ((unsigned int)written == len)
4471 return; 3988 return;
4472 3989
4473 data += written; 3990 data += written;
… …
4482 pty_ev.set (EVENT_READ | EVENT_WRITE); 3999 pty_ev.set (EVENT_READ | EVENT_WRITE);
4483} 4000}
4484 4001
4485void rxvt_term::pty_write () 4002void rxvt_term::pty_write ()
4486{ 4003{
4487 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));
4488 4005
4489 if (written > 0) 4006 if (written > 0)
4490 { 4007 {
4491 v_buflen -= written; 4008 v_buflen -= written;
4492 4009

Diff Legend

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