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.243 by root, Fri Jan 6 05:43:36 2006 UTC vs.
Revision 1.363 by root, Sun Nov 11 04:08: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,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 142 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 143 return;
149 144
150 for (;;) 145 for (;;)
151 { 146 {
152 const line_t &l = ROW(y - view_start); 147 const line_t &l = ROW(y + view_start);
153 148
154 text_t t = l.t[x]; 149 text_t t = l.t[x];
155 150
156 if (t != NOCHAR || !x) 151 if (t != NOCHAR || !x)
157 { 152 {
… …
230# if !UNICODE3 225# if !UNICODE3
231 if (ch >= 0x10000) 226 if (ch >= 0x10000)
232 ch = 0xfffd; 227 ch = 0xfffd;
233# endif 228# endif
234 scr_overlay_set (11, y, ch, r); 229 scr_overlay_set (11, y, ch, r);
230
231 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
236 } 233 }
237 234
235// {
236// char buf[4+4+3+1];
237// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
238// scr_overlay_set (0, 0, buf);
239// }
238 scr_overlay_set (0, len , attr); 240 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 241 scr_overlay_set (0, len + 1, fname);
240 242
241 free (fname); 243 free (fname);
242 244
… …
295 297
296 return -1; 298 return -1;
297} 299}
298#endif 300#endif
299 301
300/*{{{ Convert the keypress event into a string */
301void 302void
302rxvt_term::lookup_key (XKeyEvent &ev) 303rxvt_term::key_press (XKeyEvent &ev)
303{ 304{
304 int ctrl, meta, shft, len; 305 int ctrl, meta, shft, len;
305 unsigned int newlen; 306 unsigned int newlen;
306 KeySym keysym; 307 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 308 int valid_keysym;
311 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
312 315
313 /* 316 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 317 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
316 * 319 *
… …
443 scr_move_to (0, 1); 446 scr_move_to (0, 1);
444 return; 447 return;
445 } 448 }
446 else if (keysym == XK_End) 449 else if (keysym == XK_End)
447 { 450 {
448 scr_move_to (1, 0); 451 scr_move_to (1, 1);
449 return; 452 return;
450 } 453 }
451 } 454 }
452#endif 455#endif
453 } 456 }
… …
464 { 467 {
465 switch (keysym) 468 switch (keysym)
466 { 469 {
467 /* normal XTerm key bindings */ 470 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 471 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 472 selection_request (ev.time);
470 return; 473 return;
471#if TODO 474#if TODO
472 /* rxvt extras */ 475 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 476 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 477 change_font (FONT_UP);
… …
493 { 496 {
494 commit_iso14755 (); 497 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 498 iso14755buf = ISO_14755_51;
496# if ISO_14755 499# if ISO_14755
497 iso14755_51 (0); 500 iso14755_51 (0);
501# endif
502 return;
503 }
504 else if (keysym == XK_BackSpace)
505 {
506 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
507# if ISO_14755
508 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 509# endif
499 return; 510 return;
500 } 511 }
501 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
502 { 513 {
… …
507# endif 518# endif
508 return; 519 return;
509 } 520 }
510 else 521 else
511 { 522 {
512# if ENABLE_OVERLAY 523# if ISO_14755
513 scr_overlay_off (); 524 scr_overlay_off ();
514# endif 525# endif
515 iso14755buf = 0; 526 iso14755buf = 0;
516 } 527 }
517 } 528 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
521 { 532 {
522 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 534# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 537# endif
527 } 538 }
528#endif 539#endif
529 540
530#ifdef PRINTPIPE 541#ifdef PRINTPIPE
531 if (keysym == XK_Print) 542 if (keysym == XK_Print)
532 { 543 {
533 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
534 return; 545 return;
… …
536#endif 547#endif
537 548
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 550 {
540 { 551 {
552 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 553 newlen = 1;
542 switch (keysym) 554 switch (keysym)
543 { 555 {
544#ifndef NO_BACKSPACE_KEY 556#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 557 case XK_BackSpace:
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 560 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 561 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 562 kbuf[1] = '\0';
551 } 563 }
552 else 564 else
553 strcpy (kbuf, key_backspace); 565 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 566 break;
555#endif 567#endif
556#ifndef NO_DELETE_KEY 568#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior 569# ifdef XK_KP_Delete
558 case XK_KP_Delete: 570 case XK_KP_Delete:
559 /* allow shift to override */ 571 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 572 if (kp)
561 { 573 {
562 strcpy (kbuf, "\033On"); 574 strcpy (kbuf, "\033On");
563 break; 575 break;
564 } 576 }
565 /* FALLTHROUGH */ 577 /* FALLTHROUGH */
566# endif 578# endif
567 case XK_Delete: 579 case XK_Delete:
568 strcpy (kbuf, key_delete); 580 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 581 break;
570#endif 582#endif
571 case XK_Tab: 583 case XK_Tab:
572 if (shft) 584 if (shft)
573 strcpy (kbuf, "\033[Z"); 585 strcpy (kbuf, "\033[Z");
… …
584 newlen = 0; 596 newlen = 0;
585 } 597 }
586 break; 598 break;
587 599
588#ifdef XK_KP_Left 600#ifdef XK_KP_Left
601 case XK_KP_Left: /* \033Ot or standard */
589 case XK_KP_Up: /* \033Ox or standard */ 602 case XK_KP_Up: /* \033Ox or standard */
603 case XK_KP_Right: /* \033Ov or standard */
590 case XK_KP_Down: /* \033Or or standard */ 604 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */ 605 if (kp)
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
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 */
… …
867#endif 879#endif
868 /* nil */ ; 880 /* nil */ ;
869 } 881 }
870 } 882 }
871 883
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
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 HAVE_BG_PIXMAP
965 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
966 { 1042 {
967 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 1044 scr_touch (false);
970 } 1045 }
971#endif 1046#endif
972 1047
973 if (want_refresh) 1048 if (want_refresh)
974 { 1049 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1051 {
977 int row = -view_start; 1052 int row = view_start;
1053 int end_row = row + nrow;
978 1054
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1055 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1056 --row;
981 1057
982 while (row < -view_start + nrow) 1058 do
983 { 1059 {
984 int start_row = row; 1060 int start_row = row;
985 line_t *l; 1061 line_t *l;
986 1062
987 do 1063 do
988 { 1064 {
989 l = &ROW (row); 1065 l = &ROW (row++);
990 1066
991 if (!(l->f & LINE_FILTERED)) 1067 if (!(l->f & LINE_FILTERED))
992 { 1068 {
993 // line not filtered, mark it as filtered 1069 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1070 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1071 while (l->is_longer ())
996 { 1072 {
997 l = &ROW (++row); 1073 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1074 l->f |= LINE_FILTERED;
999 } 1075 }
1000 1076
1001 // and filter it 1077 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1078 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1079
1004 break; 1080 break;
1005 } 1081 }
1006 } 1082 }
1007 while (l->is_longer ()); 1083 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1084 }
1085 while (row < end_row);
1011 1086 }
1012 }
1013 1087
1014 scr_refresh (refresh_type); 1088 scr_refresh ();
1015 scrollbar_show (1); 1089 scrollbar_show (1);
1016#ifdef USE_XIM 1090#ifdef USE_XIM
1017 IMSendSpot (); 1091 IMSendSpot ();
1018#endif 1092#endif
1019 } 1093 }
1020 1094
1021 display->flush (); 1095 display->flush ();
1022} 1096}
1023 1097
1024void 1098void
1025rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1026{ 1100{
1027 SET_R (this); 1101 make_current ();
1028 SET_LOCALE (locale);
1029 1102
1030 display->flush (); 1103 display->flush ();
1031 1104
1032 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1034} 1107}
1035 1108
1036void 1109void
1037rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1038{ 1111{
1039 SET_R (this); 1112 make_current ();
1040 SET_LOCALE (locale);
1041 1113
1042 refresh_limit = 1;
1043 refresh_count = 0; 1114 refresh_count = 0;
1044 flush (); 1115 flush ();
1045} 1116}
1046 1117
1047#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1048void 1119void
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1050{ 1121{
1051 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1123 want_refresh = 1;
1053
1054 w.start (w.at + BLINK_INTERVAL);
1055} 1124}
1056#endif 1125#endif
1057 1126
1058#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1059void 1128void
1060rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1061{ 1130{
1062 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1063 { 1132 {
1064 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1065 want_refresh = 1; 1134 want_refresh = 1;
1066 w.start (w.at + TEXT_BLINK_INTERVAL);
1067 } 1135 }
1068} 1136}
1069#endif 1137#endif
1070 1138
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void 1140void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1074{ 1142{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1145 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1081 } 1147 w.stop ();
1082} 1148}
1083#endif 1149#endif
1084 1150
1085#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1086void 1152void
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1088{ 1154{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1156 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1158 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1159 }
1160 else
1161 w.stop ();
1096} 1162}
1097#endif 1163#endif
1098 1164
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void 1166void
1101rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1102{ 1168{
1103 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1170 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1172 {
1107 if (view_start == nsaved || 1173 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1110 1175
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1176 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1177 }
1178 else
1179 w.stop ();
1115} 1180}
1116#endif 1181#endif
1117 1182
1118#if HAVE_SCHED_YIELD 1183#if LINUX_YIELD_HACK
1119static struct event_handler 1184static struct event_handler
1120{ 1185{
1121 check_watcher cw_yield; 1186 ev::prepare yield_ev;
1122 1187
1123 void yield (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1124 { 1189 {
1125 sched_yield (); 1190 // this should really be sched_yield(), but the linux guys thought
1191 // that giving a process calling sched_yield () less cpu time than
1192 // ones with high nice levels is a useful thing to do. It surely is is
1193 // allowed by the sus... as is returning ENOSYS.
1194
1195 struct timespec ts = { 0, 0 };
1196 nanosleep (&ts, 0);
1197
1126 w.stop (); 1198 w.stop ();
1127 } 1199 }
1128 1200
1129 event_handler () 1201 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1202 : yield_ev (this, &event_handler::yield_cb)
1131 { 1203 {
1132 } 1204 }
1133} event_handler; 1205} event_handler;
1134#endif 1206#endif
1135 1207
… …
1146 1218
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1219 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1220 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1221 cmdbuf_endp = cmdbuf_ptr + n;
1150 1222
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1223 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1224
1153 if (r > 0) 1225 if (r > 0)
1154 { 1226 {
1155 cmdbuf_endp += r; 1227 cmdbuf_endp += r;
1156 return true; 1228 return true;
1157 } 1229 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1230 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1231 {
1160#if HAVE_SCHED_YIELD 1232#if LINUX_YIELD_HACK
1161 if (display->is_local) 1233 if (display->is_local)
1162 event_handler.cw_yield.start (); 1234 event_handler.yield_ev.start ();
1163#endif 1235#endif
1164 } 1236 }
1165 else 1237 else
1166 { 1238 {
1167 pty_ev.stop (); 1239 pty_ev.stop ();
1168 1240
1169 if (!OPTION (Opt_hold)) 1241 if (!option (Opt_hold))
1170 destroy (); 1242 destroy ();
1171 } 1243 }
1172 1244
1173 return false; 1245 return false;
1174} 1246}
1175 1247
1176void 1248void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1178{ 1250{
1179 SET_R (this); 1251 make_current ();
1180 SET_LOCALE (locale);
1181 1252
1182 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1183 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1255 while (pty_fill ())
1185 if (cmd_parse ()) 1256 if (cmd_parse ())
1186 break; 1257 break;
1187 1258
1188 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1189 pty_write (); 1260 pty_write ();
1190} 1261}
1191 1262
1192void 1263void
1193rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
1194{ 1265{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1266 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1267 recolour_cursor ();
1197 1268
1198#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1270 hidden_pointer = 0;
1200 1271
1201 if (OPTION (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1203#endif 1274#endif
1204} 1275}
1205 1276
1206#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1207void 1278void
1208rxvt_term::pointer_blank () 1279rxvt_term::pointer_blank ()
1209{ 1280{
1210 if (!OPTION (Opt_pointerBlank)) 1281 if (!option (Opt_pointerBlank))
1211 return; 1282 return;
1212 1283
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1284 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1285 XFlush (dpy);
1215 1286
1216 hidden_pointer = 1; 1287 hidden_pointer = 1;
1217} 1288}
1218 1289
1219void 1290void
1220rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1221{ 1292{
1222 SET_R (this); 1293 make_current ();
1223 SET_LOCALE (locale);
1224 1294
1225 pointer_blank (); 1295 pointer_blank ();
1226} 1296}
1227#endif 1297#endif
1228 1298
1229void 1299void
1230rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1231{ 1301{
1232 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1233 int x, y; 1303 int x, y;
1304 int code = 32;
1234 1305
1235 x = ev.x; 1306 x = Pixel2Col (ev.x);
1236 y = ev.y; 1307 y = Pixel2Row (ev.y);
1237 pixel_position (&x, &y); 1308 if (ev.type == MotionNotify) {
1309 if (x == mouse_row && y == mouse_col)
1310 return;
1311 mouse_row = x;
1312 mouse_col = y;
1313 code += 32;
1314 }
1238 1315
1239 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1240 button_number = 3; 1317 button_number = 3;
1241 else 1318 else
1242 { 1319 {
… …
1288 x + 1, 1365 x + 1,
1289 y + 1); 1366 y + 1);
1290#endif 1367#endif
1291 1368
1292 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1293 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1294 (32 + x + 1), 1371 (32 + x + 1),
1295 (32 + y + 1)); 1372 (32 + y + 1));
1296} 1373}
1297
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307 1374
1308/*{{{ process an X event */ 1375/*{{{ process an X event */
1309void 1376void
1310rxvt_term::x_cb (XEvent &ev) 1377rxvt_term::x_cb (XEvent &ev)
1311{ 1378{
1312 dDisp; 1379 make_current ();
1313 1380
1314 SET_R (this); 1381 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1382
1317#if defined(CURSOR_BLINK) 1383 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1384 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1385 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1386 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1387
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1388 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1389 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1390 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1391 unsigned int unused_mask;
1347 1392
1348 switch (ev.type) 1393 switch (ev.type)
1349 { 1394 {
1350 case KeyPress: 1395 case KeyPress:
1351#if ISO_14755 1396 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1397 break;
1357 1398
1358 case KeyRelease: 1399 case KeyRelease:
1359 { 1400 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1422
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R)
1427 mouse_slip_wheel_speed = 0;
1428#endif
1429 break; 1401 break;
1430 }
1431 1402
1432 case ButtonPress: 1403 case ButtonPress:
1433 button_press (ev.xbutton); 1404 button_press (ev.xbutton);
1434 break; 1405 break;
1435 1406
… …
1437 button_release (ev.xbutton); 1408 button_release (ev.xbutton);
1438 break; 1409 break;
1439 1410
1440 case ClientMessage: 1411 case ClientMessage:
1441 if (ev.xclient.format == 32 1412 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1413 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 1414 {
1415 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1416 {
1417 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1418 {
1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1419 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1420 {
1421 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1445 destroy (); 1422 destroy ();
1423 }
1446#if ENABLE_EWMH 1424#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1425 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1426 XSendEvent (dpy, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1427 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev); 1428 &ev);
1429#endif
1430 }
1431 }
1432#if ENABLE_XEMBED
1433 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1434 {
1435 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1436 focus_in ();
1437 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1438 focus_out ();
1439 }
1451#endif 1440#endif
1452 } 1441 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1462#ifdef OFFIX_DND
1463 /* OffiX Dnd (drag 'n' drop) protocol */
1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1465 && (ev.xclient.data.l[0] == DndFile
1466 || ev.xclient.data.l[0] == DndDir
1467 || ev.xclient.data.l[0] == DndLink))
1468 {
1469 /* Get Dnd data */
1470 Atom ActualType;
1471 int ActualFormat;
1472 unsigned char *data;
1473 unsigned long Size, RemainingBytes;
1474
1475 XGetWindowProperty (disp, display->root,
1476 xa[XA_DNDSELECTION],
1477 0L, 1000000L,
1478 False, AnyPropertyType,
1479 &ActualType, &ActualFormat,
1480 &Size, &RemainingBytes,
1481 &data);
1482 set_string_property (XA_CUT_BUFFER0, data);
1483 XFree (data);
1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1486 }
1487#endif /* OFFIX_DND */
1488 break;
1489
1490 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1442 break;
1493 1443
1494 /* 1444 /*
1495 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1496 * Here's my conclusion: 1446 * Here's my conclusion:
… …
1515 break; 1465 break;
1516 } 1466 }
1517 break; 1467 break;
1518 1468
1519 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1520 focus_in (); 1473 focus_in ();
1521 break; 1474 break;
1522 1475
1523 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1524 focus_out (); 1480 focus_out ();
1525 break; 1481 break;
1526 1482
1527 case ConfigureNotify: 1483 case ConfigureNotify:
1484 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1485 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1486 szHint.width, szHint.height); */
1528 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1529 { 1488 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1490 ;
1532 1491
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1493 {
1535 seen_resize = 1; 1494 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1496 }
1538 1497 else
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498 {
1540 if (OPTION (Opt_transparent)) 1499#ifdef HAVE_BG_PIXMAP
1541 check_our_parents (); 1500 if (bgPixmap.window_position_sensitive ())
1501 update_background ();
1542#endif 1502#endif
1503 }
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 } 1505 }
1544 break; 1506 break;
1545 1507
1546 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1513
1551 break; 1514 break;
1552 1515
1553 case SelectionClear: 1516 case SelectionClear:
1554 selection_clear (); 1517 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1523 break;
1561 1524
1562 case SelectionRequest: 1525 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1526 selection_send (ev.xselectionrequest);
1527 break;
1528
1529 case MapNotify:
1530 mapped = 1;
1531#ifdef TEXT_BLINK
1532 text_blink_ev.start (TEXT_BLINK_INTERVAL);
1533#endif
1534 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564 break; 1535 break;
1565 1536
1566 case UnmapNotify: 1537 case UnmapNotify:
1567 mapped = 0; 1538 mapped = 0;
1568#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1570#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1571 break; 1543 break;
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break;
1579
1580#ifdef TRANSPARENT
1581 case ReparentNotify:
1582 rootwin_cb (ev);
1583 break;
1584#endif /* TRANSPARENT */
1585 1544
1586 case GraphicsExpose: 1545 case GraphicsExpose:
1587 case Expose: 1546 case Expose:
1588 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1589 { 1548 {
1590 do 1549 do
1550 {
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1594 1555
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1557
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1600 1562 }
1601 scr_refresh (refresh_type); 1563 want_refresh = 1;
1602 } 1564 }
1603 else 1565 else
1604 { 1566 {
1605 XEvent unused_event; 1567 XEvent unused_event;
1606 1568
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1608 ; 1570 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1572 ;
1611 1573
1612 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1613 { 1575 {
1614 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1615 scrollbar_show (0); 1577 scrollbar_show (0);
1616 } 1578 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621
1622#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window);
1625#endif
1626 } 1579 }
1627 break; 1580 break;
1628 1581
1629 case MotionNotify: 1582 case MotionNotify:
1630#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1584 if (hidden_pointer)
1632 pointer_unblank (); 1585 pointer_unblank ();
1633#endif 1586#endif
1634#if MENUBAR 1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1635 if (isMenuBarWindow (ev.xany.window)) 1588 || priv_modes & PrivMode_MouseAnyEvent)
1636 {
1637 menubar_control (ev.xbutton); 1589 mouse_report (ev.xbutton);
1638 break;
1639 }
1640#endif
1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1591 break;
1643 1592
1644 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1645 { 1594 {
1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1597 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1599 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1651 ; 1601 ;
1652 1602
1653 XQueryPointer (disp, vt, 1603 XQueryPointer (dpy, vt,
1654 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1607 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
… …
1679 1629
1680 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1681 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1682 */ 1632 */
1683 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1684 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1685 1635
1686 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1687 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1688 */ 1638 */
1689 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1722#endif 1672#endif
1723 } 1673 }
1724 } 1674 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1676 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1728 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1729 ; 1679 ;
1730 1680
1731 XQueryPointer (disp, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1732 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1685 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1687 scrollbar_size ());
1738 scr_refresh (refresh_type);
1739 refresh_limit = 0; 1688 want_refresh = 1;
1740 scrollbar_show (1); 1689 scrollbar_show (1);
1741 } 1690 }
1742 break; 1691 break;
1743 } 1692 }
1693
1694#if defined(CURSOR_BLINK)
1695 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1696 {
1697 if (hidden_cursor)
1698 {
1699 hidden_cursor = 0;
1700 want_refresh = 1;
1701 }
1702
1703 cursor_blink_ev.again ();
1704 }
1705#endif
1706
1707#if defined(POINTER_BLANK)
1708 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1709 {
1710 if (ev.type == MotionNotify
1711 || ev.type == ButtonPress
1712 || ev.type == ButtonRelease)
1713 if (hidden_pointer)
1714 pointer_unblank ();
1715
1716 if (ev.type == KeyPress && hidden_pointer == 0)
1717 pointer_blank ();
1718 }
1719#endif
1744} 1720}
1745 1721
1746void 1722void
1747rxvt_term::focus_in () 1723rxvt_term::focus_in ()
1748{ 1724{
1749 if (!focus) 1725 if (!focus)
1750 { 1726 {
1751 focus = 1; 1727 focus = 1;
1752 want_refresh = 1; 1728 want_refresh = 1;
1753 1729
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1755 1731
1756#if USE_XIM 1732#if USE_XIM
1757 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1758 { 1734 {
1759 IMSetStatusPosition (); 1735 IMSetPosition ();
1760 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1761 } 1737 }
1762#endif 1738#endif
1763#if CURSOR_BLINK 1739#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1766#endif 1742#endif
1767#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1769 { 1745 {
1770 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
1771 scr_recolour (); 1747 scr_recolour ();
1772 } 1748 }
1773#endif 1749#endif
1750#if ENABLE_FRILLS
1751 if (option (Opt_urgentOnBell))
1752 {
1753 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1754 {
1755 h->flags &= ~XUrgencyHint;
1756 XSetWMHints (dpy, parent[0], h);
1757 }
1758 }
1759#endif
1774 } 1760 }
1775} 1761}
1776 1762
1777void 1763void
1778rxvt_term::focus_out () 1764rxvt_term::focus_out ()
… …
1786 1772
1787#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1788 if (iso14755buf) 1774 if (iso14755buf)
1789 { 1775 {
1790 iso14755buf = 0; 1776 iso14755buf = 0;
1791# if ENABLE_OVERLAY 1777# if ISO_14755
1792 scr_overlay_off (); 1778 scr_overlay_off ();
1793# endif 1779# endif
1794 } 1780 }
1795#endif 1781#endif
1796#if USE_XIM 1782#if USE_XIM
1797 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1798 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1799#endif 1785#endif
1800#if CURSOR_BLINK 1786#if CURSOR_BLINK
1801 if (OPTION (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1802 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1803 hidden_cursor = 0; 1790 hidden_cursor = 0;
1804#endif 1791#endif
1805#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1807 { 1794 {
… …
1810 } 1797 }
1811#endif 1798#endif
1812 } 1799 }
1813} 1800}
1814 1801
1815#if TRANSPARENT 1802void
1803rxvt_term::update_fade_color (unsigned int idx)
1804{
1805#if OFF_FOCUS_FADING
1806 if (rs[Rs_fade])
1807 {
1808 rgba c;
1809 pix_colors [Color_fade].get (c);
1810 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1811 }
1812#endif
1813}
1814
1815#if ENABLE_TRANSPARENCY || ENABLE_PERL
1816void 1816void
1817rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1818{
1819 SET_R (this); 1819 make_current ();
1820 SET_LOCALE (locale);
1821 1820
1821 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1822 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1823 return;
1824
1825# if ENABLE_TRANSPARENCY
1822 switch (ev.type) 1826 switch (ev.type)
1823 { 1827 {
1824 case PropertyNotify: 1828 case PropertyNotify:
1825 /* 1829 /*
1826 * if user used some Esetroot compatible prog to set the root bg, 1830 * if user used some Esetroot compatible prog to set the root bg,
1827 * use the property to determine the pixmap. We use it later on. 1831 * use the property to determine the pixmap. We use it later on.
1828 */ 1832 */
1829 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1830 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1831 return; 1835 {
1832 1836 bgPixmap.set_root_pixmap ();
1833 /* FALLTHROUGH */ 1837 update_background ();
1834 case ReparentNotify: 1838 }
1835 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1836 want_refresh = want_full_refresh = 1;
1837 break; 1839 break;
1838 } 1840 }
1841# endif
1839} 1842}
1840#endif 1843#endif
1841 1844
1842void 1845void
1843rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
… …
1852 /* 1855 /*
1853 * VT window processing of button press 1856 * VT window processing of button press
1854 */ 1857 */
1855 if (ev.window == vt) 1858 if (ev.window == vt)
1856 { 1859 {
1860 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 return;
1862
1857#if ISO_14755 1863#if ISO_14755
1858 // 5.4 1864 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1866 {
1861 iso14755_54 (ev.x, ev.y); 1867 iso14755_54 (ev.x, ev.y);
… …
1903 else 1909 else
1904 { 1910 {
1905 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1906 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1907 1913
1908 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1909 switch (ev.button) 1914 switch (ev.button)
1910 { 1915 {
1911 case Button1: 1916 case Button1:
1912 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1913 /* should be done in screen.C */ 1918 /* should be done in screen.C */
1914#if ENABLE_FRILLS 1919#if ENABLE_FRILLS
1915 selection.rect = !!(ev.state & ModMetaMask); 1920 selection.rect = !!(ev.state & ModMetaMask);
1916#else 1921#else
1917 selection.rect = false; 1922 selection.rect = false;
1918#endif 1923#endif
1919 1924
1920 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1921 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1922 { 1927 {
1923 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1924 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1925 else 1930 else
1926 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1927 } 1932 }
1928 else 1933 else
1929 { 1934 {
1930 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1931 MEvent.clicks++; 1936 MEvent.clicks++;
1932 else 1937 else
1933 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1934 1939
1935 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1936 } 1941 }
1937 1942
1938 MEvent.button = Button1; 1943 MEvent.button = Button1;
1939 break; 1944 break;
1940 1945
1941 case Button3: 1946 case Button3:
1942 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1943 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1944 else 1949 else
1945 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1946 1951
1947 MEvent.button = Button3; 1952 MEvent.button = Button3;
1948 break; 1953 break;
1949 } 1954 }
1950 } 1955 }
1951 1956
1952 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1953 return; 1958 return;
1954 } 1959 }
1955 1960
… …
2022 upordown = 1; /* down */ 2027 upordown = 1; /* down */
2023 } 2028 }
2024 if (upordown) 2029 if (upordown)
2025 { 2030 {
2026#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2027 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2028#endif 2033#endif
2029 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
2030 { 2035 {
2031 if (upordown < 0) 2036 if (upordown < 0)
2032 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2094 } 2099 }
2095 } 2100 }
2096 2101
2097 return; 2102 return;
2098 } 2103 }
2099
2100#if MENUBAR
2101 /*
2102 * Menubar window processing of button press
2103 */
2104 if (isMenuBarWindow (ev.window))
2105 menubar_control (ev);
2106#endif
2107} 2104}
2108 2105
2109void 2106void
2110rxvt_term::button_release (XButtonEvent &ev) 2107rxvt_term::button_release (XButtonEvent &ev)
2111{ 2108{
… …
2117 2114
2118 if (scrollbar_isUpDn ()) 2115 if (scrollbar_isUpDn ())
2119 { 2116 {
2120 scrollBar.setIdle (); 2117 scrollBar.setIdle ();
2121 scrollbar_show (0); 2118 scrollbar_show (0);
2122#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2123 refresh_type &= ~SMOOTH_REFRESH;
2124#endif
2125 } 2119 }
2126 2120
2127#ifdef SELECTION_SCROLLING 2121#ifdef SELECTION_SCROLLING
2128 if (sel_scroll_ev.active) 2122 if (sel_scroll_ev.active)
2129 sel_scroll_ev.stop(); 2123 sel_scroll_ev.stop();
2130#endif 2124#endif
2131 2125
2132 if (ev.window == vt) 2126 if (ev.window == vt)
2133 { 2127 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2129 return;
2130
2134#if ISO_14755 2131#if ISO_14755
2135 // 5.4 2132 // 5.4
2136 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2137 return; 2134 return;
2138#endif 2135#endif
2136
2139 if (reportmode) 2137 if (reportmode)
2140 { 2138 {
2141 /* mouse report from vt window */ 2139 /* mouse report from vt window */
2142 /* don't report release of wheel "buttons" */ 2140 /* don't report release of wheel "buttons" */
2143 if (ev.button >= 4) 2141 if (ev.button >= 4)
… …
2167 if (priv_modes & PrivMode_mouse_report 2165 if (priv_modes & PrivMode_mouse_report
2168 && bypass_keystate 2166 && bypass_keystate
2169 && ev.button == Button1 && MEvent.clicks <= 1) 2167 && ev.button == Button1 && MEvent.clicks <= 1)
2170 selection_extend (ev.x, ev.y, 0); 2168 selection_extend (ev.x, ev.y, 0);
2171 2169
2172 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2173 return;
2174
2175 switch (ev.button) 2170 switch (ev.button)
2176 { 2171 {
2177 case Button1: 2172 case Button1:
2178 case Button3: 2173 case Button3:
2179 selection_make (ev.time); 2174 selection_make (ev.time);
2180 break; 2175 break;
2176
2181 case Button2: 2177 case Button2:
2182 selection_request (ev.time, ev.x, ev.y); 2178 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2179 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2183 break; 2180 break;
2181
2184#ifdef MOUSE_WHEEL 2182#ifdef MOUSE_WHEEL
2185 case Button4: 2183 case Button4:
2186 case Button5: 2184 case Button5:
2187 { 2185 {
2188 int i; 2186 int i;
… …
2190 2188
2191 v = ev.button == Button4 ? UP : DN; 2189 v = ev.button == Button4 ? UP : DN;
2192 2190
2193 if (ev.state & ShiftMask) 2191 if (ev.state & ShiftMask)
2194 i = 1; 2192 i = 1;
2195 else if (OPTION (Opt_mouseWheelScrollPage)) 2193 else if (option (Opt_mouseWheelScrollPage))
2196 i = nrow - 1; 2194 i = nrow - 1;
2197 else 2195 else
2198 i = 5; 2196 i = 5;
2199 2197
2200# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
… …
2202 { 2200 {
2203 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2204 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2205 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2206 2204
2207 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2208 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2209
2210 slip_wheel_ev.start ();
2211 } 2206 }
2212 else 2207 else
2213 { 2208 {
2214# endif 2209# endif
2215# ifdef JUMP_MOUSE_WHEEL
2216 scr_page (v, i); 2210 scr_page (v, i);
2217 scr_refresh (SMOOTH_REFRESH);
2218 scrollbar_show (1); 2211 scrollbar_show (1);
2219# else
2220 while (i--)
2221 {
2222 scr_page (v, 1);
2223 scr_refresh (SMOOTH_REFRESH);
2224 scrollbar_show (1);
2225 }
2226# endif
2227# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2228 } 2213 }
2229#endif 2214# endif
2230 } 2215 }
2231 break; 2216 break;
2232#endif 2217#endif
2233 } 2218 }
2234 } 2219 }
2235#ifdef MENUBAR
2236 else if (isMenuBarWindow (ev.window))
2237 menubar_control (ev);
2238#endif
2239} 2220}
2240
2241#ifdef TRANSPARENT
2242#if TINTING
2243/* taken from aterm-0.4.2 */
2244
2245typedef uint32_t RUINT32T;
2246
2247void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2248{
2249 int sh_r, sh_g, sh_b;
2250 RUINT32T mask_r, mask_g, mask_b;
2251 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2252 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2253 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2254 int i;
2255
2256 Visual *visual = display->visual;
2257
2258 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2259
2260 /* for convenience */
2261 mask_r = visual->red_mask;
2262 mask_g = visual->green_mask;
2263 mask_b = visual->blue_mask;
2264
2265 /* boring lookup table pre-initialization */
2266 switch (srcImage->bits_per_pixel) {
2267 case 15:
2268 if ((mask_r != 0x7c00) ||
2269 (mask_g != 0x03e0) ||
2270 (mask_b != 0x001f))
2271 return;
2272 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2273 lookup_r = lookup;
2274 lookup_g = lookup+32;
2275 lookup_b = lookup+32+32;
2276 sh_r = 10;
2277 sh_g = 5;
2278 sh_b = 0;
2279 break;
2280 case 16:
2281 if ((mask_r != 0xf800) ||
2282 (mask_g != 0x07e0) ||
2283 (mask_b != 0x001f))
2284 return;
2285 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2286 lookup_r = lookup;
2287 lookup_g = lookup+32;
2288 lookup_b = lookup+32+64;
2289 sh_r = 11;
2290 sh_g = 5;
2291 sh_b = 0;
2292 break;
2293 case 24:
2294 if ((mask_r != 0xff0000) ||
2295 (mask_g != 0x00ff00) ||
2296 (mask_b != 0x0000ff))
2297 return;
2298 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2299 lookup_r = lookup;
2300 lookup_g = lookup+256;
2301 lookup_b = lookup+256+256;
2302 sh_r = 16;
2303 sh_g = 8;
2304 sh_b = 0;
2305 break;
2306 case 32:
2307 if ((mask_r != 0xff0000) ||
2308 (mask_g != 0x00ff00) ||
2309 (mask_b != 0x0000ff))
2310 return;
2311 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2312 lookup_r = lookup;
2313 lookup_g = lookup+256;
2314 lookup_b = lookup+256+256;
2315 sh_r = 16;
2316 sh_g = 8;
2317 sh_b = 0;
2318 break;
2319 default:
2320 return; /* we do not support this color depth */
2321 }
2322
2323 /* prepare limits for color transformation (each channel is handled separately) */
2324 if (shade < 0) {
2325 shade = -shade;
2326 if (shade < 0) shade = 0;
2327 if (shade > 100) shade = 100;
2328
2329 lower_lim_r = 65535-rm;
2330 lower_lim_g = 65535-gm;
2331 lower_lim_b = 65535-bm;
2332
2333 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2334 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2335 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2336
2337 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2338 } else {
2339 if (shade < 0) shade = 0;
2340 if (shade > 100) shade = 100;
2341
2342 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2343
2344 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2345 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2346 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2347 }
2348
2349 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2350 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2351 {
2352 unsigned int tmp;
2353
2354 tmp = lower_lim_r;
2355 lower_lim_r = lower_lim_b;
2356 lower_lim_b = tmp;
2357
2358 tmp = upper_lim_r;
2359 upper_lim_r = upper_lim_b;
2360 upper_lim_b = tmp;
2361 }
2362
2363 /* fill our lookup tables */
2364 for (i = 0; i <= mask_r>>sh_r; i++)
2365 {
2366 RUINT32T tmp;
2367 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2368 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2369 lookup_r[i] = (tmp/65535)<<sh_r;
2370 }
2371 for (i = 0; i <= mask_g>>sh_g; i++)
2372 {
2373 RUINT32T tmp;
2374 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2375 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2376 lookup_g[i] = (tmp/65535)<<sh_g;
2377 }
2378 for (i = 0; i <= mask_b>>sh_b; i++)
2379 {
2380 RUINT32T tmp;
2381 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2382 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2383 lookup_b[i] = (tmp/65535)<<sh_b;
2384 }
2385
2386 /* apply table to input image (replacing colors by newly calculated ones) */
2387 switch (srcImage->bits_per_pixel)
2388 {
2389 case 15:
2390 {
2391 unsigned short *p1, *pf, *p, *pl;
2392 p1 = (unsigned short *) srcImage->data;
2393 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2394 while (p1 < pf)
2395 {
2396 p = p1;
2397 pl = p1 + srcImage->width;
2398 for (; p < pl; p++)
2399 {
2400 *p = lookup_r[(*p & 0x7c00)>>10] |
2401 lookup_g[(*p & 0x03e0)>> 5] |
2402 lookup_b[(*p & 0x001f)];
2403 }
2404 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2405 }
2406 break;
2407 }
2408 case 16:
2409 {
2410 unsigned short *p1, *pf, *p, *pl;
2411 p1 = (unsigned short *) srcImage->data;
2412 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2413 while (p1 < pf)
2414 {
2415 p = p1;
2416 pl = p1 + srcImage->width;
2417 for (; p < pl; p++)
2418 {
2419 *p = lookup_r[(*p & 0xf800)>>11] |
2420 lookup_g[(*p & 0x07e0)>> 5] |
2421 lookup_b[(*p & 0x001f)];
2422 }
2423 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2424 }
2425 break;
2426 }
2427 case 24:
2428 {
2429 unsigned char *p1, *pf, *p, *pl;
2430 p1 = (unsigned char *) srcImage->data;
2431 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2432 while (p1 < pf)
2433 {
2434 p = p1;
2435 pl = p1 + srcImage->width * 3;
2436 for (; p < pl; p += 3)
2437 {
2438 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2439 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2440 p[2] = lookup_r[(p[2] & 0x0000ff)];
2441 }
2442 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2443 }
2444 break;
2445 }
2446 case 32:
2447 {
2448 RUINT32T *p1, *pf, *p, *pl;
2449 p1 = (RUINT32T *) srcImage->data;
2450 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2451
2452 while (p1 < pf)
2453 {
2454 p = p1;
2455 pl = p1 + srcImage->width;
2456 for (; p < pl; p++)
2457 {
2458 *p = lookup_r[(*p & 0xff0000)>>16] |
2459 lookup_g[(*p & 0x00ff00)>> 8] |
2460 lookup_b[(*p & 0x0000ff)] |
2461 (*p & ~0xffffff);
2462 }
2463 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2464 }
2465 break;
2466 }
2467 }
2468
2469 free (lookup);
2470}
2471#endif
2472
2473/*
2474 * Check our parents are still who we think they are.
2475 * Do transparency updates if required
2476 */
2477int
2478rxvt_term::check_our_parents ()
2479{
2480 int i, pchanged, aformat, have_pixmap, rootdepth;
2481 unsigned long nitems, bytes_after;
2482 Atom atype;
2483 unsigned char *prop = NULL;
2484 Window root, oldp, *list;
2485 Pixmap rootpixmap = None;
2486 XWindowAttributes wattr, wrootattr;
2487 dDisp;
2488
2489 pchanged = 0;
2490
2491 if (!OPTION (Opt_transparent))
2492 return pchanged; /* Don't try any more */
2493
2494 XGetWindowAttributes (disp, display->root, &wrootattr);
2495 rootdepth = wrootattr.depth;
2496
2497 XGetWindowAttributes (disp, parent[0], &wattr);
2498
2499 if (rootdepth != wattr.depth)
2500 {
2501 if (am_transparent)
2502 {
2503 pchanged = 1;
2504 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2505 am_transparent = am_pixmap_trans = 0;
2506 }
2507
2508 return pchanged; /* Don't try any more */
2509 }
2510
2511 /* Get all X ops out of the queue so that our information is up-to-date. */
2512 XSync (disp, False);
2513
2514 /*
2515 * Make the frame window set by the window manager have
2516 * the root background. Some window managers put multiple nested frame
2517 * windows for each client, so we have to take care about that.
2518 */
2519 i = (xa[XA_XROOTPMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL)
2525 i = (xa[XA_ESETROOT_PMAP_ID]
2526 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2527 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528 &nitems, &bytes_after, &prop) == Success);
2529
2530 if (!i || prop == NULL
2531#if TINTING
2532 || !rs[Rs_color + Color_tint]
2533#endif
2534 )
2535 have_pixmap = 0;
2536 else
2537 {
2538 have_pixmap = 1;
2539 rootpixmap = *(Pixmap *)prop;
2540 XFree (prop);
2541 }
2542
2543 if (have_pixmap)
2544 {
2545 /*
2546 * Copy display->root pixmap transparency
2547 */
2548 int sx, sy, nx, ny;
2549 unsigned int nw, nh;
2550 Window cr;
2551 XImage *image;
2552 GC gc;
2553 XGCValues gcvalue;
2554
2555 XTranslateCoordinates (disp, parent[0], display->root,
2556 0, 0, &sx, &sy, &cr);
2557 nw = (unsigned int)szHint.width;
2558 nh = (unsigned int)szHint.height;
2559 nx = ny = 0;
2560
2561 if (sx < 0)
2562 {
2563 nw += sx;
2564 nx = -sx;
2565 sx = 0;
2566 }
2567
2568 if (sy < 0)
2569 {
2570 nh += sy;
2571 ny = -sy;
2572 sy = 0;
2573 }
2574
2575 min_it (nw, (unsigned int) (wrootattr.width - sx));
2576 min_it (nh, (unsigned int) (wrootattr.height - sy));
2577
2578 XSync (disp, False);
2579 allowedxerror = -1;
2580 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2581
2582 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2583 /* XXX: may need a delay here? */
2584 allowedxerror = 0;
2585
2586 if (image == NULL)
2587 {
2588 if (am_transparent && am_pixmap_trans)
2589 {
2590 pchanged = 1;
2591 if (pixmap != None)
2592 {
2593 XFreePixmap (disp, pixmap);
2594 pixmap = None;
2595 }
2596 }
2597
2598 am_pixmap_trans = 0;
2599 }
2600 else
2601 {
2602 if (pixmap != None)
2603 XFreePixmap (disp, pixmap);
2604
2605#if TINTING
2606 if (ISSET_PIXCOLOR (Color_tint))
2607 {
2608 unsigned short rm, gm, bm;
2609 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2610
2611 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2612
2613 ShadeXImage (display, image, shade, rm, gm, bm);
2614 }
2615#endif
2616
2617 pixmap = XCreatePixmap (disp, vt,
2618 szHint.width, szHint.height, image->depth);
2619 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2620 XPutImage (disp, pixmap, gc, image, 0, 0,
2621 nx, ny, image->width, image->height);
2622 XFreeGC (disp, gc);
2623 XDestroyImage (image);
2624 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2625 XClearWindow (disp, parent[0]);
2626
2627 if (!am_transparent || !am_pixmap_trans)
2628 pchanged = 1;
2629
2630 am_transparent = am_pixmap_trans = 1;
2631 }
2632 }
2633
2634 if (am_pixmap_trans)
2635 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2636 else
2637 {
2638 unsigned int n;
2639 /*
2640 * InheritPixmap transparency
2641 */
2642 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2643 {
2644 oldp = parent[i];
2645 XQueryTree (disp, parent[i - 1], &root,
2646 &parent[i], &list, &n);
2647 XFree (list);
2648
2649 if (parent[i] == display->root)
2650 {
2651 if (oldp != None)
2652 pchanged = 1;
2653
2654 break;
2655 }
2656
2657 if (oldp != parent[i])
2658 pchanged = 1;
2659 }
2660
2661 n = 0;
2662
2663 if (pchanged)
2664 {
2665 for (; n < (unsigned int)i; n++)
2666 {
2667 XGetWindowAttributes (disp, parent[n], &wattr);
2668 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2669 {
2670 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2671 break;
2672 }
2673 }
2674 }
2675
2676 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2677 {
2678 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2679 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2680 am_transparent = 0;
2681 /* XXX: also turn off Opt_transparent? */
2682 }
2683 else
2684 {
2685#if WAIT_FOR_WM
2686 /* wait (an arbitrary period) for the WM to do its thing
2687 * needed for fvwm2.2.2 (and before?) */
2688 sleep (1);
2689#endif
2690 for (n = 0; n < (unsigned int)i; n++)
2691 {
2692 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2693 XClearWindow (disp, parent[n]);
2694 }
2695
2696 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2697 am_transparent = 1;
2698 }
2699
2700 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2701 parent[i] = None;
2702 }
2703
2704 if (scrollBar.win)
2705 {
2706 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2707 scrollBar.setIdle ();
2708 scrollbar_show (0);
2709 }
2710
2711 if (am_transparent)
2712 {
2713 want_refresh = want_full_refresh = 1;
2714 if (am_pixmap_trans)
2715 flush ();
2716 }
2717
2718 return pchanged;
2719}
2720#endif
2721 2221
2722/*}}} */ 2222/*}}} */
2723 2223
2724bool 2224bool
2725rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
2726{ 2226{
2727 bool flag = false; 2227 bool flag = false;
2728 unicode_t ch = NOCHAR; 2228 wchar_t ch = NOCHAR;
2729 char *seq_begin; // remember start of esc-sequence here 2229 char *seq_begin; // remember start of esc-sequence here
2730 2230
2731 for (;;) 2231 for (;;)
2732 { 2232 {
2733 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
… …
2754 if (seen_resize && cmd_pid) 2254 if (seen_resize && cmd_pid)
2755 kill (-cmd_pid, SIGWINCH); 2255 kill (-cmd_pid, SIGWINCH);
2756 } 2256 }
2757 2257
2758 /* Read a text string from the input buffer */ 2258 /* Read a text string from the input buffer */
2759 unicode_t buf[UBUFSIZ]; 2259 wchar_t buf[UBUFSIZ];
2760 bool refreshnow = false; 2260 bool refreshnow = false;
2761 int nlines = 0; 2261 int nlines = 0;
2762 unicode_t *str = buf; 2262 wchar_t *str = buf;
2763 unicode_t *eol = str + min (ncol, UBUFSIZ); 2263 wchar_t *eol = str + min (ncol, UBUFSIZ);
2764 2264
2765 for (;;) 2265 for (;;)
2766 { 2266 {
2767 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2267 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2768 break; 2268 break;
… …
2774 if (ch == C0_LF) 2274 if (ch == C0_LF)
2775 nlines++; 2275 nlines++;
2776 2276
2777 refresh_count++; 2277 refresh_count++;
2778 2278
2779 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2780 || (refresh_count >= refresh_limit * (nrow - 1)))
2781 { 2280 {
2782 refreshnow = true;
2783 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2784 ch = NOCHAR; 2286 ch = NOCHAR;
2785 break; 2287 break;
2288 }
2786 } 2289 }
2787 2290
2788 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2790 { 2293 {
2294 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2295 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792 scr_add_lines (buf, nlines, str - buf); 2296 scr_add_lines (buf, str - buf, nlines);
2793 2297
2794 nlines = 0; 2298 nlines = 0;
2795 str = buf; 2299 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2300 eol = str + min (ncol, UBUFSIZ);
2797 } 2301 }
… …
2811 2315
2812 seq_begin = cmdbuf_ptr; 2316 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2317 ch = next_char ();
2814 } 2318 }
2815 2319
2320 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2321 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817 scr_add_lines (buf, nlines, str - buf); 2322 scr_add_lines (buf, str - buf, nlines);
2818 2323
2819 /* 2324 /*
2820 * If there have been a lot of new lines, then update the screen 2325 * If there have been a lot of new lines, then update the screen
2821 * What the heck I'll cheat and only refresh less than every page-full. 2326 * What the heck we'll cheat and only refresh less than every page-full.
2822 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2823 * is incremented here because we must be doing flat-out scrolling.
2824 */ 2328 */
2825 if (refreshnow) 2329 if (refreshnow)
2826 { 2330 {
2827 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2828 refresh_limit++;
2829 else
2830 {
2831 flag = true; 2331 flag = true;
2832 scr_refresh (refresh_type); 2332 scr_refresh ();
2833 flush_ev.stop (); 2333 want_refresh = 1;
2834 }
2835 } 2334 }
2836 2335
2837 } 2336 }
2838 else 2337 else
2839 { 2338 {
… …
2853 } 2352 }
2854 2353
2855 return flag; 2354 return flag;
2856} 2355}
2857 2356
2858// read the next octet
2859unicode_t
2860rxvt_term::next_octet ()
2861{
2862 return cmdbuf_ptr < cmdbuf_endp
2863 ? *cmdbuf_ptr++
2864 : NOCHAR;
2865}
2866
2867// read the next character 2357// read the next character
2868unicode_t 2358wchar_t
2869rxvt_term::next_char () 2359rxvt_term::next_char () NOTHROW
2870{ 2360{
2871 while (cmdbuf_ptr < cmdbuf_endp) 2361 while (cmdbuf_ptr < cmdbuf_endp)
2872 { 2362 {
2873 // assume 7-bit to be ascii ALWAYS 2363 // assume 7-bit to be ascii ALWAYS
2874 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2883 cmdbuf_ptr = cmdbuf_endp; 2373 cmdbuf_ptr = cmdbuf_endp;
2884 break; 2374 break;
2885 } 2375 }
2886 2376
2887 if (len == (size_t)-1) 2377 if (len == (size_t)-1)
2888 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2378 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2889 2379
2890 // assume wchar == unicode 2380 // assume wchar == unicode
2891 cmdbuf_ptr += len; 2381 cmdbuf_ptr += len;
2892 return wc & UNICODE_MASK; 2382 return wc & UNICODE_MASK;
2893 } 2383 }
2894 2384
2895 return NOCHAR; 2385 return NOCHAR;
2896} 2386}
2387
2388// read the next octet
2389uint32_t
2390rxvt_term::next_octet () NOTHROW
2391{
2392 return cmdbuf_ptr < cmdbuf_endp
2393 ? (unsigned char)*cmdbuf_ptr++
2394 : NOCHAR;
2395}
2396
2397static class out_of_input out_of_input;
2897 2398
2898/* rxvt_cmd_getc () - Return next input character */ 2399/* rxvt_cmd_getc () - Return next input character */
2899/* 2400/*
2900 * Return the next input character after first passing any keyboard input 2401 * Return the next input character after first passing any keyboard input
2901 * to the command. 2402 * to the command.
2902 */ 2403 */
2903unicode_t 2404wchar_t
2904rxvt_term::cmd_getc () 2405rxvt_term::cmd_getc () THROW ((class out_of_input))
2905{ 2406{
2906 unicode_t c = next_char (); 2407 wchar_t c = next_char ();
2907 2408
2908 if (c == NOCHAR) 2409 if (c == NOCHAR)
2909 throw out_of_input; 2410 throw out_of_input;
2910 2411
2911 return c; 2412 return c;
2912} 2413}
2913 2414
2914unicode_t 2415uint32_t
2915rxvt_term::cmd_get8 () 2416rxvt_term::cmd_get8 () THROW ((class out_of_input))
2916{ 2417{
2917 unicode_t c = next_octet (); 2418 uint32_t c = next_octet ();
2918 2419
2919 if (c == NOCHAR) 2420 if (c == NOCHAR)
2920 throw out_of_input; 2421 throw out_of_input;
2921 2422
2922 return c; 2423 return c;
… …
2986 { 2487 {
2987 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2988 break; /* done = 1 */ 2489 break; /* done = 1 */
2989 } 2490 }
2990 } 2491 }
2991 2492
2992 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2993 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2994 { 2495 {
2995 done = 1; 2496 done = 1;
2996 break; 2497 break;
… …
3058 process_dcs_seq (); 2559 process_dcs_seq ();
3059 break; 2560 break;
3060 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
3061 process_csi_seq (); 2562 process_csi_seq ();
3062 break; 2563 break;
3063 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
3064 process_osc_seq (); 2565 process_osc_seq ();
3065 break; 2566 break;
3066#endif 2567#endif
3067 } 2568 }
3068} 2569}
… …
3158 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
3159 break; 2660 break;
3160 case '+': 2661 case '+':
3161 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
3162 break; 2663 break;
3163#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3164 case '6': 2665 case '6':
3165 scr_backindex (); 2666 scr_backindex ();
3166 break; 2667 break;
3167#endif 2668#endif
3168 case '7': 2669 case '7':
3169 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
3170 break; 2671 break;
3171 case '8': 2672 case '8':
3172 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
3173 break; 2674 break;
3174#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3175 case '9': 2676 case '9':
3176 scr_forwardindex (); 2677 scr_forwardindex ();
3177 break; 2678 break;
3178#endif 2679#endif
3179 case '=': 2680 case '=':
… …
3189 break; 2690 break;
3190 2691
3191 /* 8.3.87: NEXT LINE */ 2692 /* 8.3.87: NEXT LINE */
3192 case C1_NEL: /* ESC E */ 2693 case C1_NEL: /* ESC E */
3193 { 2694 {
3194 unicode_t nlcr[] = { C0_LF, C0_CR }; 2695 wchar_t nlcr[] = { C0_LF, C0_CR };
3195 scr_add_lines (nlcr, 1, 2); 2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3196 } 2697 }
3197 break; 2698 break;
3198 2699
3199 /* kidnapped escape sequence: Should be 8.3.48 */ 2700 /* kidnapped escape sequence: Should be 8.3.48 */
3200 case C1_ESA: /* ESC G */ 2701 case C1_ESA: /* ESC G */
… …
3294rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
3295{ 2796{
3296 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3297 unsigned int nargs, p; 2798 unsigned int nargs, p;
3298 int n, ndef; 2799 int n, ndef;
3299 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
3300 2801
3301 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
3302 arg[--nargs] = 0;
3303 2803
3304 priv = 0; 2804 priv = 0;
3305 ch = cmd_getc (); 2805 ch = cmd_getc ();
3306 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3307 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
… …
3341 ndef = get_byte_array_bit (csi_defaults, i); 2841 ndef = get_byte_array_bit (csi_defaults, i);
3342 for (p = 0; p < nargs; p++) 2842 for (p = 0; p < nargs; p++)
3343 if (arg[p] == -1) 2843 if (arg[p] == -1)
3344 arg[p] = ndef; 2844 arg[p] = ndef;
3345 2845
3346#ifdef DEBUG_CMD
3347 fprintf (stderr, "CSI ");
3348 for (p = 0; p < nargs; p++)
3349 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3350 fprintf (stderr, "%c\n", ch);
3351#endif
3352
3353 /* 2846 /*
3354 * private mode handling 2847 * private mode handling
3355 */ 2848 */
3356 if (priv) 2849 if (priv)
3357 { 2850 {
3358 switch (priv) 2851 switch (priv)
3359 { 2852 {
3360 case '>': 2853 case '>':
3361 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3362 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2855 {
2856 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2857 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2858 //
2859 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2860 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2861 // versions.
2862 //
2863 tt_printf ("\033[>%d;95;0c", 'U');
2864 }
3363 break; 2865 break;
3364 case '?': 2866 case '?':
3365 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3366 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
3367 break; 2869 break;
… …
3493 break; 2995 break;
3494 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
3495 scr_report_position (); 2997 scr_report_position ();
3496 break; 2998 break;
3497 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
3498 if (OPTION (Opt_insecure)) 3000 if (option (Opt_insecure))
3499 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3500 break; 3002 break;
3501 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
3502 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3503 break; 3005 break;
… …
3570 break; 3072 break;
3571 case CSI_75: 3073 case CSI_75:
3572 scr_cursor (RESTORE); 3074 scr_cursor (RESTORE);
3573 break; 3075 break;
3574 3076
3575#if ENABLE_FRILLS 3077#if !ENABLE_MINIMAL
3576 case CSI_74: 3078 case CSI_74:
3577 process_window_ops (arg, nargs); 3079 process_window_ops (arg, nargs);
3578 break; 3080 break;
3579#endif 3081#endif
3580 3082
… …
3587 break; 3089 break;
3588 } 3090 }
3589} 3091}
3590/*}}} */ 3092/*}}} */
3591 3093
3592#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3593/* ARGSUSED */ 3095/* ARGSUSED */
3594void 3096void
3595rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3097rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3596{ 3098{
3597 int x, y; 3099 int x, y;
3598 XWindowAttributes wattr; 3100 XWindowAttributes wattr;
3599 Window wdummy; 3101 Window wdummy;
3600 dDisp; 3102
3103 dLocal (Display *, dpy);
3601 3104
3602 if (nargs == 0) 3105 if (nargs == 0)
3603 return; 3106 return;
3604 3107
3605 switch (args[0]) 3108 switch (args[0])
3606 { 3109 {
3607 /* 3110 /*
3608 * commands 3111 * commands
3609 */ 3112 */
3610 case 1: /* deiconify window */ 3113 case 1: /* deiconify window */
3611 XMapWindow (disp, parent[0]); 3114 XMapWindow (dpy, parent[0]);
3612 break; 3115 break;
3613 case 2: /* iconify window */ 3116 case 2: /* iconify window */
3614 XIconifyWindow (disp, parent[0], display->screen); 3117 XIconifyWindow (dpy, parent[0], display->screen);
3615 break; 3118 break;
3616 case 3: /* set position (pixels) */ 3119 case 3: /* set position (pixels) */
3617 XMoveWindow (disp, parent[0], args[1], args[2]); 3120 XMoveWindow (dpy, parent[0], args[1], args[2]);
3618 break; 3121 break;
3619 case 4: /* set size (pixels) */ 3122 case 4: /* set size (pixels) */
3620 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3621 break; 3124 break;
3622 case 5: /* raise window */ 3125 case 5: /* raise window */
3623 XRaiseWindow (disp, parent[0]); 3126 XRaiseWindow (dpy, parent[0]);
3624 break; 3127 break;
3625 case 6: /* lower window */ 3128 case 6: /* lower window */
3626 XLowerWindow (disp, parent[0]); 3129 XLowerWindow (dpy, parent[0]);
3627 break; 3130 break;
3628 case 7: /* refresh window */ 3131 case 7: /* refresh window */
3629 scr_touch (true); 3132 scr_touch (true);
3630 break; 3133 break;
3631 case 8: /* set size (chars) */ 3134 case 8: /* set size (chars) */
… …
3638 if (args[0] >= 24) /* set height (chars) */ 3141 if (args[0] >= 24) /* set height (chars) */
3639 set_widthheight ((unsigned int)width, 3142 set_widthheight ((unsigned int)width,
3640 (unsigned int) (args[1] * fheight)); 3143 (unsigned int) (args[1] * fheight));
3641 break; 3144 break;
3642 3145
3643
3644 /* 3146 /*
3645 * reports - some output format copied from XTerm 3147 * reports - some output format copied from XTerm
3646 */ 3148 */
3647 case 11: /* report window state */ 3149 case 11: /* report window state */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3650 break; 3152 break;
3651 case 13: /* report window position */ 3153 case 13: /* report window position */
3652 XGetWindowAttributes (disp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3653 XTranslateCoordinates (disp, parent[0], wattr.root, 3155 XTranslateCoordinates (dpy, parent[0], wattr.root,
3654 -wattr.border_width, -wattr.border_width, 3156 -wattr.border_width, -wattr.border_width,
3655 &x, &y, &wdummy); 3157 &x, &y, &wdummy);
3656 tt_printf ("\033[3;%d;%dt", x, y); 3158 tt_printf ("\033[3;%d;%dt", x, y);
3657 break; 3159 break;
3658 case 14: /* report window size (pixels) */ 3160 case 14: /* report window size (pixels) */
3659 XGetWindowAttributes (disp, parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3660 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3661 break; 3163 break;
3662 case 18: /* report text area size (chars) */ 3164 case 18: /* report text area size (chars) */
3663 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3664 break; 3166 break;
… …
3666 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3168 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3667 break; 3169 break;
3668 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3669 { 3171 {
3670 char *s; 3172 char *s;
3671 XGetIconName (disp, parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3672 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3174 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673 XFree (s); 3175 XFree (s);
3674 } 3176 }
3675 break; 3177 break;
3676 case 21: /* report window title */ 3178 case 21: /* report window title */
3677 { 3179 {
3678 char *s; 3180 char *s;
3679 XFetchName (disp, parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3680 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3182 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3681 XFree (s); 3183 XFree (s);
3682 } 3184 }
3683 break; 3185 break;
3684 } 3186 }
3685} 3187}
… …
3712 seen_esc = true; 3214 seen_esc = true;
3713 continue; 3215 continue;
3714 } 3216 }
3715 else if (ch == C0_BEL || ch == CHAR_ST) 3217 else if (ch == C0_BEL || ch == CHAR_ST)
3716 break; 3218 break;
3219 else if (ch == C0_SYN)
3220 ch = cmd_get8 ();
3717 else if (ch < 0x20) 3221 else if (ch < 0x20)
3718 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3719 3223
3720 seen_esc = false; 3224 seen_esc = false;
3721 3225
3722 if (n >= STRING_MAX - 1) 3226 if (n >= STRING_MAX - 1)
3723 // stop at some sane length 3227 // stop at some sane length
3724 return NULL; 3228 return NULL;
3725 3229
3726 if (ch == C0_SYN)
3727 string[n++] = cmd_get8 ();
3728 else
3729 string[n++] = ch; 3230 string[n++] = ch;
3730 } 3231 }
3731 3232
3732 string[n++] = '\0'; 3233 string[n++] = '\0';
3733 3234
3734 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3785void 3286void
3786rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3287rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3787{ 3288{
3788 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3789 { 3290 {
3790 unsigned short r, g, b; 3291 rgba c;
3791 pix_colors_focused[color].get (display, r, g, b); 3292 pix_colors_focused[color].get (c);
3293
3294#if XFT
3295 if (c.a != rgba::MAX_CC)
3296 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3297 else
3298#endif
3792 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3299 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3793 } 3300 }
3794 else 3301 else
3795 set_window_color (color, str); 3302 set_window_color (color, str);
3796} 3303}
3797 3304
… …
3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3800 */ 3307 */
3801void 3308void
3802rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3309rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3803{ 3310{
3804 int changed = 0;
3805 int color; 3311 int color;
3806 char *buf, *name; 3312 char *buf, *name;
3807 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3808 int saveop = op; 3314 int saveop = op;
3809 dDisp; 3315
3316 dLocal (Display *, dpy);
3810 3317
3811 assert (str != NULL); 3318 assert (str != NULL);
3319
3320 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3321 return;
3322
3812 switch (op) 3323 switch (op)
3813 { 3324 {
3814 case XTerm_name: 3325 case XTerm_name:
3815 set_title (str); 3326 set_title (str);
3816 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3830 unsigned long bytes_after; 3341 unsigned long bytes_after;
3831 unsigned char *value = 0; 3342 unsigned char *value = 0;
3832 const char *str = ""; 3343 const char *str = "";
3833 3344
3834 if (prop 3345 if (prop
3835 && XGetWindowProperty (disp, parent[0], 3346 && XGetWindowProperty (dpy, parent[0],
3836 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3837 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3838 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3839 && actual_type != None 3350 && actual_type != None
3840 && actual_format == 8) 3351 && actual_format == 8)
3841 str = (const char *)(value); 3352 str = (const char *)(value);
3842 3353
3843 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3844 3355
3845 XFree (value); 3356 XFree (value);
3846 } 3357 }
3847 else 3358 else
3848 { 3359 {
… …
3852 { 3363 {
3853 *eq = 0; 3364 *eq = 0;
3854 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3855 } 3366 }
3856 else 3367 else
3857 XDeleteProperty (disp, parent[0], 3368 XDeleteProperty (dpy, parent[0],
3858 display->atom (str)); 3369 display->atom (str));
3859 } 3370 }
3860 break; 3371 break;
3861 3372
3862 case XTerm_Color: 3373 case XTerm_Color:
… …
3864 { 3375 {
3865 if ((name = strchr (buf, ';')) == NULL) 3376 if ((name = strchr (buf, ';')) == NULL)
3866 break; 3377 break;
3867 3378
3868 *name++ = '\0'; 3379 *name++ = '\0';
3869 color = atoi (buf); 3380 color = atoi (buf) + minCOLOR;
3870 3381
3871 if (color < 0 || color >= TOTAL_COLORS) 3382 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3872 break; 3383 break;
3873 3384
3874 if ((buf = strchr (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3875 *buf++ = '\0'; 3386 *buf++ = '\0';
3876 3387
3877 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3878 {
3879 unsigned short r, g, b;
3880 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3881 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3882 }
3883 else
3884 set_window_color (color + minCOLOR, name);
3885 } 3389 }
3886 break; 3390 break;
3887 case XTerm_Color00: 3391 case XTerm_Color00:
3888 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3392 process_color_seq (op, Color_fg, str, resp);
3889 break; 3393 break;
3890 case XTerm_Color01: 3394 case XTerm_Color01:
3891 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3395 process_color_seq (op, Color_bg, str, resp);
3892 break; 3396 break;
3893#ifndef NO_CURSORCOLOR 3397#ifndef NO_CURSORCOLOR
3894 case XTerm_Color_cursor: 3398 case XTerm_Color_cursor:
3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3399 process_color_seq (op, Color_cursor, str, resp);
3896 break; 3400 break;
3897#endif 3401#endif
3898 case XTerm_Color_pointer_fg: 3402 case XTerm_Color_pointer_fg:
3899 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3403 process_color_seq (op, Color_pointer_fg, str, resp);
3900 break; 3404 break;
3901 case XTerm_Color_pointer_bg: 3405 case XTerm_Color_pointer_bg:
3902 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3406 process_color_seq (op, Color_pointer_bg, str, resp);
3903 break; 3407 break;
3904#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3905 case XTerm_Color_BD:
3906 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3907 break;
3908 case XTerm_Color_UL:
3909 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3910 break;
3911 case XTerm_Color_RV: 3409 case XTerm_Color_RV:
3912 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3410 process_color_seq (op, Color_RV, str, resp);
3411 break;
3412 case Rxvt_Color_BD:
3413 case URxvt_Color_BD:
3414 process_color_seq (op, Color_BD, str, resp);
3415 break;
3416 case Rxvt_Color_UL:
3417 case URxvt_Color_UL:
3418 process_color_seq (op, Color_UL, str, resp);
3913 break; 3419 break;
3914 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3915 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3916 break; 3422 break;
3917#endif 3423#endif
3918#if TRANSPARENT && TINTING 3424#if ENABLE_TRANSPARENCY
3919 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3920 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3921 check_our_parents (); 3427 {
3922 if (am_transparent) 3428 bool changed = false;
3923 want_full_refresh = want_refresh = 1; 3429 if (ISSET_PIXCOLOR (Color_tint))
3924 break; 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3925#endif 3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3926 3436
3437 break;
3438#endif
3439
3440#if BG_IMAGE_FROM_FILE
3927 case XTerm_Pixmap: 3441 case Rxvt_Pixmap:
3928 if (*str != ';') 3442 if (!strcmp (str, "?"))
3929 { 3443 {
3930#if XPM_BACKGROUND 3444 char str[256];
3931 scale_pixmap (""); /* reset to default scaling */ 3445
3932 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3933#endif 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3934 scr_touch (true); 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3935 } 3450 }
3936 while ((str = strchr (str, ';')) != NULL) 3451 else
3937 { 3452 {
3453 int changed = 0;
3454
3455 if (*str != ';')
3456 {
3457 /* reset to default scaling :*/
3458 bgPixmap.unset_geometry ();
3459 if (bgPixmap.set_file (str)) /* change pixmap */
3460 changed++;
3461 str = strchr (str, ';');
3462 if (str == NULL)
3463 bgPixmap.set_defaultGeometry ();
3464 }
3465 while (str)
3466 {
3938 str++; 3467 str++;
3939#if XPM_BACKGROUND 3468 if (bgPixmap.set_geometry (str))
3940 changed += scale_pixmap (str); 3469 changed++;
3941#endif 3470 str = strchr (str, ';');
3471 }
3472 if (changed)
3473 update_background ();
3942 } 3474 }
3943
3944 if (changed)
3945 {
3946#ifdef XPM_BACKGROUND
3947 resize_pixmap ();
3948#endif
3949 scr_touch (true);
3950 }
3951 break; 3475 break;
3476#endif
3952 3477
3953 case XTerm_restoreFG: 3478 case Rxvt_restoreFG:
3954 set_window_color (Color_fg, str); 3479 set_window_color (Color_fg, str);
3955 break; 3480 break;
3956 case XTerm_restoreBG: 3481 case Rxvt_restoreBG:
3957 set_window_color (Color_bg, str); 3482 set_window_color (Color_bg, str);
3958 break; 3483 break;
3959 3484
3960 case XTerm_logfile: 3485 case XTerm_logfile:
3961 // TODO, when secure mode? 3486 // TODO, when secure mode?
3962 break; 3487 break;
3963 3488
3964#ifdef MENUBAR
3965 case URxvt_Menu:
3966 if (OPTION (Opt_insecure))
3967 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3968 break;
3969#endif
3970#if 0 3489#if 0
3971 case XTerm_dumpscreen: /* no error notices */ 3490 case Rxvt_dumpscreen: /* no error notices */
3972 { 3491 {
3973 int fd; 3492 int fd;
3974 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3493 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3975 { 3494 {
3976 scr_dump (fd); 3495 scr_dump (fd);
… …
3987 case URxvt_italicFont: 3506 case URxvt_italicFont:
3988 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3989#endif 3508#endif
3990 if (query) 3509 if (query)
3991 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3992 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3993 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3994 resp); 3513 resp);
3995 else 3514 else
3996 { 3515 {
3997 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4000 allocated.push_back ((void *)res); 3519 allocated.push_back ((void *)res);
4001 set_fonts (); 3520 set_fonts ();
4002 } 3521 }
4003 break; 3522 break;
4004 3523
4005#if ENABLE_FRILLS 3524 case URxvt_version:
3525 if (query)
3526 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3527 op,
3528 rs[Rs_name], VERSION[0], VERSION[2],
3529 resp);
3530 break;
3531
3532#if !ENABLE_MINIMAL
4006 case URxvt_locale: 3533 case URxvt_locale:
4007 if (query) 3534 if (query)
4008 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3535 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4009 else 3536 else
4010 { 3537 {
4011 set_locale (str); 3538 set_locale (str);
4012 pty.set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
4013 init_xlocale (); 3540 init_xlocale ();
4014 } 3541 }
4015 break; 3542 break;
4016 3543
4017 case URxvt_view_up: 3544 case URxvt_view_up:
… …
4028 break; 3555 break;
4029#endif 3556#endif
4030 3557
4031#if ENABLE_PERL 3558#if ENABLE_PERL
4032 case URxvt_perl: 3559 case URxvt_perl:
4033 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3560 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4034 ; // no responses yet 3561 ; // no responses yet
4035 break; 3562 break;
4036#endif 3563#endif
4037 } 3564 }
4038} 3565}
… …
4070 return state; 3597 return state;
4071} 3598}
4072 3599
4073/* we're not using priv _yet_ */ 3600/* we're not using priv _yet_ */
4074void 3601void
4075rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3602rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4076{ 3603{
4077 unsigned int i, j; 3604 unsigned int i, j;
4078 int state; 3605 int state;
4079 3606
4080 static const struct 3607 static const struct
4081 { 3608 {
4082 const int argval; 3609 const int argval;
4083 const unsigned long bit; 3610 const unsigned long bit;
4084 }
4085
4086 argtopriv[] = { 3611 } argtopriv[] = {
4087 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
4088 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
4089 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
4090 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
4091 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
4092 { 6, PrivMode_relOrigin }, 3617 { 6, PrivMode_relOrigin },
4093 { 7, PrivMode_Autowrap }, 3618 { 7, PrivMode_Autowrap },
4094 // 8, bi-directional support mode 3619 // 8, bi-directional support mode
4095 { 9, PrivMode_MouseX10 }, 3620 { 9, PrivMode_MouseX10 },
4096#ifdef menuBar_esc
4097 { menuBar_esc, PrivMode_menuBar },
4098#endif
4099 // 18, 19 printing-related 3621 // 18, 19 printing-related
4100 { 25, PrivMode_VisibleCursor }, 3622 { 25, PrivMode_VisibleCursor },
4101#ifdef scrollBar_esc 3623#ifdef scrollBar_esc
4102 { scrollBar_esc, PrivMode_scrollBar }, 3624 { scrollBar_esc, PrivMode_scrollBar },
4103#endif 3625#endif
… …
4111#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
4112 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
4113#endif 3635#endif
4114 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
4115 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4116 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
4117 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
4118 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4119 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
4120 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
4121 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
4122 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
4150 /* extra handling for values with state unkept */ 3672 /* extra handling for values with state unkept */
4151 switch (arg[i]) 3673 switch (arg[i])
4152 { 3674 {
4153#if ENABLE_STYLES 3675#if ENABLE_STYLES
4154 case 1021: 3676 case 1021:
4155 if (mode) 3677 set_option (Opt_intensityStyles, mode);
4156 SET_OPTION (Opt_intensityStyles);
4157 else
4158 CLR_OPTION (Opt_intensityStyles);
4159 3678
4160 scr_touch (true); 3679 scr_touch (true);
4161 break; 3680 break;
4162#endif 3681#endif
4163 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
4164 case 1049: 3683 case 1049:
4165 if (OPTION (Opt_secondaryScreen)) 3684 if (option (Opt_secondaryScreen))
4166 if (mode == 0) 3685 if (mode == 0)
4167 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
4168 else if (mode == 1) 3687 else if (mode == 1)
4169 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
4170 break; 3689 break;
… …
4185 case 3: /* 80/132 */ 3704 case 3: /* 80/132 */
4186 if (priv_modes & PrivMode_132OK) 3705 if (priv_modes & PrivMode_132OK)
4187 set_widthheight (((state ? 132 : 80) * fwidth), height); 3706 set_widthheight (((state ? 132 : 80) * fwidth), height);
4188 break; 3707 break;
4189 case 4: /* smooth scrolling */ 3708 case 4: /* smooth scrolling */
4190 if (!state) 3709 set_option (Opt_jumpScroll, !state);
4191 SET_OPTION (Opt_jumpScroll);
4192 else
4193 CLR_OPTION (Opt_jumpScroll);
4194 break; 3710 break;
4195 case 5: /* reverse video */ 3711 case 5: /* reverse video */
4196 scr_rvideo_mode (state); 3712 scr_rvideo_mode (state);
4197 break; 3713 break;
4198 case 6: /* relative/absolute origins */ 3714 case 6: /* relative/absolute origins */
… …
4202 scr_autowrap (state); 3718 scr_autowrap (state);
4203 break; 3719 break;
4204 /* case 8: - auto repeat, can't do on a per window basis */ 3720 /* case 8: - auto repeat, can't do on a per window basis */
4205 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
4206 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4207 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4208 break; 3724 break;
4209#ifdef menuBar_esc
4210 case menuBar_esc:
4211#ifdef MENUBAR
4212 map_menuBar (state);
4213#endif
4214 break;
4215#endif
4216#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
4217 case scrollBar_esc: 3726 case scrollBar_esc:
4218 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
4219 { 3728 {
4220 resize_all_windows (0, 0, 0); 3729 resize_all_windows (0, 0, 0);
… …
4232 break; 3741 break;
4233 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
4234 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
4235 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
4236 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4237 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4238 break; 3747 break;
4239#if 0 3748#if 0
4240 case 1001: 3749 case 1001:
4241 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
4242#endif 3751#endif
3752 case 1002:
3753 case 1003:
3754 if (state) {
3755 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3756 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3757 vt_emask_mouse = PointerMotionMask;
3758 } else
3759 vt_emask_mouse = NoEventMask;
3760 vt_select_input ();
3761 break;
4243 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
4244 if (!state) 3763 set_option (Opt_scrollTtyOutput, !state);
4245 SET_OPTION (Opt_scrollTtyOutput);
4246 else
4247 CLR_OPTION (Opt_scrollTtyOutput);
4248 break; 3764 break;
4249 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
4250 if (state) 3766 set_option (Opt_scrollTtyKeypress, state);
4251 SET_OPTION (Opt_scrollTtyKeypress);
4252 else
4253 CLR_OPTION (Opt_scrollTtyKeypress);
4254 break; 3767 break;
4255 case 1047: /* secondary screen w/ clearing last */ 3768 case 1047: /* secondary screen w/ clearing last */
4256 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4257 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4258 scr_erase_screen (2); 3771 scr_erase_screen (2);
4259 scr_change_screen (state); 3772 scr_change_screen (state);
4260 break; 3773 break;
4261 case 1049: /* secondary screen w/ clearing first */ 3774 case 1049: /* secondary screen w/ clearing first */
4262 scr_change_screen (state); 3775 scr_change_screen (state);
4263 if (OPTION (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
4264 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4265 scr_erase_screen (2); 3778 scr_erase_screen (2);
4266 break; 3779 break;
4267 default: 3780 default:
4268 break; 3781 break;
… …
4396 scr_color (Color_bg, Color_bg); 3909 scr_color (Color_bg, Color_bg);
4397 break; 3910 break;
4398 3911
4399 //case 50: // not variable spacing 3912 //case 50: // not variable spacing
4400 3913
4401#if ENABLE_FRILLS 3914#if !ENABLE_MINIMAL
4402 case 90: 3915 case 90:
4403 case 91: /* set bright fg color */ 3916 case 91: /* set bright fg color */
4404 case 92: 3917 case 92:
4405 case 93: 3918 case 93:
4406 case 94: 3919 case 94:
… …
4468const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4469 3982
4470void 3983void
4471rxvt_term::tt_write (const char *data, unsigned int len) 3984rxvt_term::tt_write (const char *data, unsigned int len)
4472{ 3985{
4473 if (pty.pty < 0) 3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4474 return; 3987 return;
4475 3988
3989 if (pty->pty < 0)
3990 return;
3991
4476 if (v_buflen == 0) 3992 if (v_buflen == 0)
4477 { 3993 {
4478 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4479 3995
4480 if ((unsigned int)written == len) 3996 if ((unsigned int)written == len)
4481 return; 3997 return;
4482 3998
4483 data += written; 3999 data += written;
… …
4487 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4488 4004
4489 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4490 v_buflen += len; 4006 v_buflen += len;
4491 4007
4492 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4493} 4009}
4494 4010
4495void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4496{ 4012{
4497 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4013 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4498 4014
4499 if (written > 0) 4015 if (written > 0)
4500 { 4016 {
4501 v_buflen -= written; 4017 v_buflen -= written;
4502 4018
4503 if (v_buflen == 0) 4019 if (v_buflen == 0)
4504 { 4020 {
4505 free (v_buffer); 4021 free (v_buffer);
4506 v_buffer = 0; 4022 v_buffer = 0;
4507 v_buflen = 0;
4508 4023
4509 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4510 return; 4025 return;
4511 } 4026 }
4512 4027
4513 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4514 } 4029 }
4515 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4516 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4517} 4032}
4518 4033
4519/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4520 4035

Diff Legend

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