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.238 by root, Fri Jan 6 02:58:02 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>
… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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
884 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
885 return;
886
872 if (len <= 0) 887 if (len <= 0)
873 return; /* not mapped */ 888 return; /* not mapped */
874 889
875 if (OPTION (Opt_scrollTtyKeypress)) 890 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 891 if (view_start)
877 { 892 {
878 view_start = 0; 893 view_start = 0;
879 want_refresh = 1; 894 want_refresh = 1;
880 } 895 }
… …
902 { 917 {
903 const char ch = C0_ESC; 918 const char ch = C0_ESC;
904 tt_write (&ch, 1); 919 tt_write (&ch, 1);
905 } 920 }
906 921
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 922 tt_write (kbuf, (unsigned int)len);
918} 923}
919/*}}} */
920 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
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 1002#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 1003unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 1004rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 1005{
927 unsigned int n, s; 1006 unsigned int n, s;
928 1007
… …
956void 1035void
957rxvt_term::flush () 1036rxvt_term::flush ()
958{ 1037{
959 flush_ev.stop (); 1038 flush_ev.stop ();
960 1039
961#ifdef TRANSPARENT 1040#ifdef HAVE_BG_PIXMAP
962 if (want_full_refresh) 1041 if (bgPixmap.check_clearChanged ())
963 { 1042 {
964 want_full_refresh = 0; 1043// scr_clear (true); This needs to be researched further!
965 scr_clear ();
966 scr_touch (false); 1044 scr_touch (false);
967 } 1045 }
968#endif 1046#endif
969 1047
970 if (want_refresh) 1048 if (want_refresh)
971 { 1049 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1050 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 { 1051 {
974 int row = -view_start; 1052 int row = view_start;
1053 int end_row = row + nrow;
975 1054
976 while (row > -nsaved && ROW (row - 1).is_longer ()) 1055 while (row > top_row && ROW (row - 1).is_longer ())
977 --row; 1056 --row;
978 1057
979 while (row < -view_start + nrow) 1058 do
980 { 1059 {
981 int start_row = row; 1060 int start_row = row;
982 line_t *l; 1061 line_t *l;
983 1062
984 do 1063 do
985 { 1064 {
986 l = &ROW (row); 1065 l = &ROW (row++);
987 1066
988 if (!(l->f & LINE_FILTERED)) 1067 if (!(l->f & LINE_FILTERED))
989 { 1068 {
990 // line not filtered, mark it as filtered 1069 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED; 1070 l->f |= LINE_FILTERED;
992 while (l->is_longer ()) 1071 while (l->is_longer ())
993 { 1072 {
994 l = &ROW (++row); 1073 l = &ROW (row++);
995 l->f |= LINE_FILTERED; 1074 l->f |= LINE_FILTERED;
996 } 1075 }
997 1076
998 // and filter it 1077 // and filter it
999 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));
1000 1079
1001 break; 1080 break;
1002 } 1081 }
1003 } 1082 }
1004 while (l->is_longer ()); 1083 while (l->is_longer () && row < end_row);
1005
1006 row++;
1007 } 1084 }
1085 while (row < end_row);
1008 1086 }
1009 }
1010 1087
1011 scr_refresh (refresh_type); 1088 scr_refresh ();
1012 scrollbar_show (1); 1089 scrollbar_show (1);
1013#ifdef USE_XIM 1090#ifdef USE_XIM
1014 IMSendSpot (); 1091 IMSendSpot ();
1015#endif 1092#endif
1016 } 1093 }
1017 1094
1018 display->flush (); 1095 display->flush ();
1019} 1096}
1020 1097
1021void 1098void
1022rxvt_term::check_cb (check_watcher &w) 1099rxvt_term::prepare_cb (ev::prepare &w, int revents)
1023{ 1100{
1024 SET_R (this); 1101 make_current ();
1025 SET_LOCALE (locale);
1026 1102
1027 display->flush (); 1103 display->flush ();
1028 1104
1029 if (want_refresh && !flush_ev.active) 1105 if (want_refresh && !flush_ev.active)
1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1106 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally
1031} 1107}
1032 1108
1033void 1109void
1034rxvt_term::flush_cb (time_watcher &w) 1110rxvt_term::flush_cb (ev::timer &w, int revents)
1035{ 1111{
1036 SET_R (this); 1112 make_current ();
1037 SET_LOCALE (locale);
1038 1113
1039 refresh_limit = 1;
1040 refresh_count = 0; 1114 refresh_count = 0;
1041 flush (); 1115 flush ();
1042} 1116}
1043 1117
1044#ifdef CURSOR_BLINK 1118#ifdef CURSOR_BLINK
1045void 1119void
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1120rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1047{ 1121{
1048 hidden_cursor = !hidden_cursor; 1122 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1123 want_refresh = 1;
1050
1051 w.start (w.at + BLINK_INTERVAL);
1052} 1124}
1053#endif 1125#endif
1054 1126
1055#ifdef TEXT_BLINK 1127#ifdef TEXT_BLINK
1056void 1128void
1057rxvt_term::text_blink_cb (time_watcher &w) 1129rxvt_term::text_blink_cb (ev::timer &w, int revents)
1058{ 1130{
1059 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1131 if (scr_refresh_rend (RS_Blink, RS_Blink))
1060 { 1132 {
1061 hidden_text = !hidden_text; 1133 hidden_text = !hidden_text;
1062 want_refresh = 1; 1134 want_refresh = 1;
1063 w.start (w.at + TEXT_BLINK_INTERVAL);
1064 } 1135 }
1065} 1136}
1066#endif 1137#endif
1067 1138
1068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1139#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1069void 1140void
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1141rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1071{ 1142{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1143 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1144 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1145 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1146 else
1078 } 1147 w.stop ();
1079} 1148}
1080#endif 1149#endif
1081 1150
1082#ifdef SELECTION_SCROLLING 1151#ifdef SELECTION_SCROLLING
1083void 1152void
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1153rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1085{ 1154{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1155 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1156 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1157 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1158 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1159 }
1160 else
1161 w.stop ();
1093} 1162}
1094#endif 1163#endif
1095 1164
1096#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1165#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1097void 1166void
1098rxvt_term::slip_wheel_cb (time_watcher &w) 1167rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1099{ 1168{
1100 if (mouse_slip_wheel_speed == 0 1169 if (mouse_slip_wheel_speed == 0
1101 || 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)
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1171 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1172 {
1104 if (view_start == nsaved || 1173 if (view_start == top_row || view_start == 0)
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0; 1174 mouse_slip_wheel_speed = 0;
1107 1175
1108 refresh_type |= SMOOTH_REFRESH;
1109 want_refresh = 1; 1176 want_refresh = 1;
1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111 } 1177 }
1178 else
1179 w.stop ();
1112} 1180}
1113#endif 1181#endif
1114 1182
1115#if HAVE_SCHED_YIELD 1183#if LINUX_YIELD_HACK
1116static struct event_handler 1184static struct event_handler
1117{ 1185{
1118 check_watcher cw_yield; 1186 ev::prepare yield_ev;
1119 1187
1120 void yield (check_watcher &w) 1188 void yield_cb (ev::prepare &w, int revents)
1121 { 1189 {
1122 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
1123 w.stop (); 1198 w.stop ();
1124 } 1199 }
1125 1200
1126 event_handler () 1201 event_handler ()
1127 : cw_yield (this, &event_handler::yield) 1202 : yield_ev (this, &event_handler::yield_cb)
1128 { 1203 {
1129 } 1204 }
1130} event_handler; 1205} event_handler;
1131#endif 1206#endif
1132 1207
… …
1143 1218
1144 memmove (cmdbuf_base, cmdbuf_ptr, n); 1219 memmove (cmdbuf_base, cmdbuf_ptr, n);
1145 cmdbuf_ptr = cmdbuf_base; 1220 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + n; 1221 cmdbuf_endp = cmdbuf_ptr + n;
1147 1222
1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1223 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149 1224
1150 if (r > 0) 1225 if (r > 0)
1151 { 1226 {
1152 cmdbuf_endp += r; 1227 cmdbuf_endp += r;
1153 return true; 1228 return true;
1154 } 1229 }
1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1230 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 { 1231 {
1157#if HAVE_SCHED_YIELD 1232#if LINUX_YIELD_HACK
1158 if (display->is_local) 1233 if (display->is_local)
1159 event_handler.cw_yield.start (); 1234 event_handler.yield_ev.start ();
1160#endif 1235#endif
1161 } 1236 }
1162 else 1237 else
1163 { 1238 {
1164 pty_ev.stop (); 1239 pty_ev.stop ();
1165 1240
1166 if (!OPTION (Opt_hold)) 1241 if (!option (Opt_hold))
1167 destroy (); 1242 destroy ();
1168 } 1243 }
1169 1244
1170 return false; 1245 return false;
1171} 1246}
1172 1247
1173void 1248void
1174rxvt_term::pty_cb (io_watcher &w, short revents) 1249rxvt_term::pty_cb (ev::io &w, int revents)
1175{ 1250{
1176 SET_R (this); 1251 make_current ();
1177 SET_LOCALE (locale);
1178 1252
1179 if (revents & EVENT_READ) 1253 if (revents & ev::READ)
1180 // loop, but don't allow a single term to monopolize us 1254 // loop, but don't allow a single term to monopolize us
1181 while (pty_fill ()) 1255 while (pty_fill ())
1182 if (cmd_parse ()) 1256 if (cmd_parse ())
1183 break; 1257 break;
1184 1258
1185 if (revents & EVENT_WRITE) 1259 if (revents & ev::WRITE)
1186 pty_write (); 1260 pty_write ();
1187} 1261}
1188 1262
1189void 1263void
1190rxvt_term::pointer_unblank () 1264rxvt_term::pointer_unblank ()
1191{ 1265{
1192 XDefineCursor (display->display, vt, TermWin_cursor); 1266 XDefineCursor (dpy, vt, TermWin_cursor);
1193 recolour_cursor (); 1267 recolour_cursor ();
1194 1268
1195#ifdef POINTER_BLANK 1269#ifdef POINTER_BLANK
1196 hidden_pointer = 0; 1270 hidden_pointer = 0;
1197 1271
1198 if (OPTION (Opt_pointerBlank)) 1272 if (option (Opt_pointerBlank))
1199 pointer_ev.start (NOW + pointerBlankDelay); 1273 pointer_ev.start (pointerBlankDelay);
1200#endif 1274#endif
1201} 1275}
1202 1276
1203#ifdef POINTER_BLANK 1277#ifdef POINTER_BLANK
1204void 1278void
1205rxvt_term::pointer_blank () 1279rxvt_term::pointer_blank ()
1206{ 1280{
1207 if (! OPTION (Opt_pointerBlank)) 1281 if (!option (Opt_pointerBlank))
1208 return; 1282 return;
1209 1283
1210 XDefineCursor (display->display, vt, display->blank_cursor); 1284 XDefineCursor (dpy, vt, display->blank_cursor);
1211 XFlush (display->display); 1285 XFlush (dpy);
1212 1286
1213 hidden_pointer = 1; 1287 hidden_pointer = 1;
1214} 1288}
1215 1289
1216void 1290void
1217rxvt_term::pointer_cb (time_watcher &w) 1291rxvt_term::pointer_cb (ev::timer &w, int revents)
1218{ 1292{
1219 SET_R (this); 1293 make_current ();
1220 SET_LOCALE (locale);
1221 1294
1222 pointer_blank (); 1295 pointer_blank ();
1223} 1296}
1224#endif 1297#endif
1225 1298
1226void 1299void
1227rxvt_term::mouse_report (XButtonEvent &ev) 1300rxvt_term::mouse_report (XButtonEvent &ev)
1228{ 1301{
1229 int button_number, key_state = 0; 1302 int button_number, key_state = 0;
1230 int x, y; 1303 int x, y;
1304 int code = 32;
1231 1305
1232 x = ev.x; 1306 x = Pixel2Col (ev.x);
1233 y = ev.y; 1307 y = Pixel2Row (ev.y);
1234 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 }
1235 1315
1236 if (MEvent.button == AnyButton) 1316 if (MEvent.button == AnyButton)
1237 button_number = 3; 1317 button_number = 3;
1238 else 1318 else
1239 { 1319 {
… …
1285 x + 1, 1365 x + 1,
1286 y + 1); 1366 y + 1);
1287#endif 1367#endif
1288 1368
1289 tt_printf ("\033[M%c%c%c", 1369 tt_printf ("\033[M%c%c%c",
1290 (32 + button_number + key_state), 1370 (code + button_number + key_state),
1291 (32 + x + 1), 1371 (32 + x + 1),
1292 (32 + y + 1)); 1372 (32 + y + 1));
1293} 1373}
1294
1295#ifdef USING_W11LIB
1296void
1297rxvt_W11_process_x_event (XEvent *ev)
1298{
1299 rxvt_t *r = rxvt_get_r ();
1300
1301 x_cb (*ev);
1302}
1303#endif
1304 1374
1305/*{{{ process an X event */ 1375/*{{{ process an X event */
1306void 1376void
1307rxvt_term::x_cb (XEvent &ev) 1377rxvt_term::x_cb (XEvent &ev)
1308{ 1378{
1309 dDisp; 1379 make_current ();
1310 1380
1311 SET_R (this); 1381 dLocal (Display *, dpy);
1312 SET_LOCALE (locale);
1313 1382
1314#if defined(CURSOR_BLINK) 1383 if (ev.xany.window == vt
1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1384 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 { 1385 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 if (hidden_cursor) 1386 return;
1318 {
1319 hidden_cursor = 0;
1320 want_refresh = 1;
1321 }
1322 1387
1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1388 // for XQueryPointer
1324 }
1325#endif
1326
1327#if defined(POINTER_BLANK)
1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329 {
1330 if (ev.type == MotionNotify
1331 || ev.type == ButtonPress
1332 || ev.type == ButtonRelease)
1333 if (hidden_pointer)
1334 pointer_unblank ();
1335
1336 if (ev.type == KeyPress && hidden_pointer == 0)
1337 pointer_blank ();
1338 }
1339#endif
1340
1341 Window unused_root, unused_child; 1389 Window unused_root, unused_child;
1342 int unused_root_x, unused_root_y; 1390 int unused_root_x, unused_root_y;
1343 unsigned int unused_mask; 1391 unsigned int unused_mask;
1344 1392
1345 switch (ev.type) 1393 switch (ev.type)
1346 { 1394 {
1347 case KeyPress: 1395 case KeyPress:
1348#if ISO_14755 1396 key_press (ev.xkey);
1349 if (!(iso14755buf & ISO_14755_52))
1350#endif
1351 lookup_key (ev.xkey);
1352
1353 break; 1397 break;
1354 1398
1355 case KeyRelease: 1399 case KeyRelease:
1356 { 1400 key_release (ev.xkey);
1357#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1358 KeySym ks;
1359
1360 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361#endif
1362
1363#if ENABLE_FRILLS || ISO_14755
1364 // ISO 14755 support
1365 if (iso14755buf)
1366 if (iso14755buf & ISO_14755_52)
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371# if ISO_14755
1372 // iso14755 part 5.2 handling: release time
1373 // first: controls
1374 if ((ev.xkey.state & ControlMask)
1375 && ((ks >= 0x40 && ks <= 0x5f)
1376 || (ks >= 0x61 && ks <= 0x7f)))
1377 {
1378 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1379 commit_iso14755 ();
1380 return; // case-break;
1381 }
1382
1383 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384 if (i[0] == ks)
1385 {
1386 iso14755buf = ISO_14755_51 | i[1];
1387 commit_iso14755 ();
1388 return; // case-break;
1389 }
1390
1391 scr_bell ();
1392# endif
1393 iso14755buf = 0;
1394 break;
1395 }
1396 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1397 {
1398# if ENABLE_OVERLAY
1399 scr_overlay_off ();
1400# endif
1401 if (iso14755buf & ISO_14755_51)
1402 commit_iso14755 ();
1403#if ISO_14755
1404 else if (iso14755buf & ISO_14755_STARTED)
1405 {
1406 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1407
1408 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1409 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1410 }
1411# endif
1412 else
1413 iso14755buf = 0;
1414 }
1415#endif
1416
1417#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418 if (!(ev.xkey.state & ControlMask))
1419 slip_wheel_ev.stop ();
1420 else if (ks == XK_Control_L || ks == XK_Control_R)
1421 mouse_slip_wheel_speed = 0;
1422#endif
1423 break; 1401 break;
1424 }
1425 1402
1426 case ButtonPress: 1403 case ButtonPress:
1427 button_press (ev.xbutton); 1404 button_press (ev.xbutton);
1428 break; 1405 break;
1429 1406
… …
1431 button_release (ev.xbutton); 1408 button_release (ev.xbutton);
1432 break; 1409 break;
1433 1410
1434 case ClientMessage: 1411 case ClientMessage:
1435 if (ev.xclient.format == 32 1412 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1413 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1437 { 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 {
1438 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)))
1439 destroy (); 1422 destroy ();
1423 }
1440#if ENABLE_EWMH 1424#if ENABLE_EWMH
1441 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])
1442 XSendEvent (disp, ev.xclient.window = display->root, 1426 XSendEvent (dpy, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask, 1427 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &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 }
1445#endif 1440#endif
1446 } 1441 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1455#endif
1456#ifdef OFFIX_DND
1457 /* OffiX Dnd (drag 'n' drop) protocol */
1458 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1459 && (ev.xclient.data.l[0] == DndFile
1460 || ev.xclient.data.l[0] == DndDir
1461 || ev.xclient.data.l[0] == DndLink))
1462 {
1463 /* Get Dnd data */
1464 Atom ActualType;
1465 int ActualFormat;
1466 unsigned char *data;
1467 unsigned long Size, RemainingBytes;
1468
1469 XGetWindowProperty (disp, display->root,
1470 xa[XA_DNDSELECTION],
1471 0L, 1000000L,
1472 False, AnyPropertyType,
1473 &ActualType, &ActualFormat,
1474 &Size, &RemainingBytes,
1475 &data);
1476 set_string_property (XA_CUT_BUFFER0, data);
1477 XFree (data);
1478 selection_paste (display->root, XA_CUT_BUFFER0, true);
1479 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1480 }
1481#endif /* OFFIX_DND */
1482 break;
1483
1484 case MappingNotify:
1485 XRefreshKeyboardMapping (&ev.xmapping);
1486 break; 1442 break;
1487 1443
1488 /* 1444 /*
1489 * XXX: this is not the _current_ arrangement 1445 * XXX: this is not the _current_ arrangement
1490 * Here's my conclusion: 1446 * Here's my conclusion:
… …
1509 break; 1465 break;
1510 } 1466 }
1511 break; 1467 break;
1512 1468
1513 case FocusIn: 1469 case FocusIn:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1514 focus_in (); 1473 focus_in ();
1515 break; 1474 break;
1516 1475
1517 case FocusOut: 1476 case FocusOut:
1477 if (ev.xfocus.detail != NotifyInferior
1478 && ev.xfocus.detail != NotifyPointer
1479 && ev.xfocus.mode != NotifyGrab)
1518 focus_out (); 1480 focus_out ();
1519 break; 1481 break;
1520 1482
1521 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); */
1522 if (ev.xconfigure.window == parent[0]) 1487 if (ev.xconfigure.window == parent[0])
1523 { 1488 {
1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1489 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1525 ; 1490 ;
1526 1491
1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1492 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1528 { 1493 {
1529 seen_resize = 1; 1494 seen_resize = 1;
1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1495 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531 } 1496 }
1532 1497 else
1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1498 {
1534 if (OPTION (Opt_transparent)) 1499#ifdef HAVE_BG_PIXMAP
1535 check_our_parents (); 1500 if (bgPixmap.window_position_sensitive ())
1501 update_background ();
1536#endif 1502#endif
1503 }
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1537 } 1505 }
1538 break; 1506 break;
1539 1507
1540 case PropertyNotify: 1508 case PropertyNotify:
1509 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1541 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1510 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1542 && ev.xproperty.state == PropertyNewValue) 1511 && ev.xproperty.state == PropertyNewValue)
1543 selection_property (ev.xproperty.window, ev.xproperty.atom); 1512 selection_property (ev.xproperty.window, ev.xproperty.atom);
1544 1513
1545 break; 1514 break;
1546 1515
1547 case SelectionClear: 1516 case SelectionClear:
1548 selection_clear (); 1517 selection_clear ();
… …
1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1522 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1554 break; 1523 break;
1555 1524
1556 case SelectionRequest: 1525 case SelectionRequest:
1557 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));
1558 break; 1535 break;
1559 1536
1560 case UnmapNotify: 1537 case UnmapNotify:
1561 mapped = 0; 1538 mapped = 0;
1562#ifdef TEXT_BLINK 1539#ifdef TEXT_BLINK
1563 text_blink_ev.stop (); 1540 text_blink_ev.stop ();
1564#endif 1541#endif
1542 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1565 break; 1543 break;
1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 break;
1573
1574#ifdef TRANSPARENT
1575 case ReparentNotify:
1576 rootwin_cb (ev);
1577 break;
1578#endif /* TRANSPARENT */
1579 1544
1580 case GraphicsExpose: 1545 case GraphicsExpose:
1581 case Expose: 1546 case Expose:
1582 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1583 { 1548 {
1584 do 1549 do
1550 {
1585 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1586 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1553 }
1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1554 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1588 1555
1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1556 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1590 1557
1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1559 {
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1594 1562 }
1595 scr_refresh (refresh_type); 1563 want_refresh = 1;
1596 } 1564 }
1597 else 1565 else
1598 { 1566 {
1599 XEvent unused_event; 1567 XEvent unused_event;
1600 1568
1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1569 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1602 ; 1570 ;
1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1571 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1604 ; 1572 ;
1605 1573
1606 if (isScrollbarWindow (ev.xany.window)) 1574 if (isScrollbarWindow (ev.xany.window))
1607 { 1575 {
1608 scrollBar.setIdle (); 1576 scrollBar.setIdle ();
1609 scrollbar_show (0); 1577 scrollbar_show (0);
1610 } 1578 }
1611#ifdef MENUBAR
1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613 menubar_expose ();
1614#endif
1615
1616#ifdef TRANSPARENT
1617 if (am_transparent && ev.xany.window == parent[0])
1618 XClearWindow (disp, ev.xany.window);
1619#endif
1620 } 1579 }
1621 break; 1580 break;
1622 1581
1623 case MotionNotify: 1582 case MotionNotify:
1624#ifdef POINTER_BLANK 1583#ifdef POINTER_BLANK
1625 if (hidden_pointer) 1584 if (hidden_pointer)
1626 pointer_unblank (); 1585 pointer_unblank ();
1627#endif 1586#endif
1628#if MENUBAR 1587 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1629 if (isMenuBarWindow (ev.xany.window)) 1588 || priv_modes & PrivMode_MouseAnyEvent)
1630 {
1631 menubar_control (ev.xbutton); 1589 mouse_report (ev.xbutton);
1632 break;
1633 }
1634#endif
1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1590 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636 break; 1591 break;
1637 1592
1638 if (ev.xany.window == vt) 1593 if (ev.xany.window == vt)
1639 { 1594 {
1595 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1596 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1597 ; // nop
1640 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1598 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1641 { 1599 {
1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1600 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1643 ; 1601 ;
1644 1602
1645 XQueryPointer (disp, vt, 1603 XQueryPointer (dpy, vt,
1646 &unused_root, &unused_child, 1604 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1605 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1606 &ev.xbutton.x, &ev.xbutton.y,
1649 &ev.xbutton.state); 1607 &ev.xbutton.state);
1650#ifdef MOUSE_THRESHOLD 1608#ifdef MOUSE_THRESHOLD
… …
1671 1629
1672 /* don't clobber the current delay if we are 1630 /* don't clobber the current delay if we are
1673 * already in the middle of scrolling. 1631 * already in the middle of scrolling.
1674 */ 1632 */
1675 if (!sel_scroll_ev.active) 1633 if (!sel_scroll_ev.active)
1676 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1634 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1677 1635
1678 /* save the event params so we can highlight 1636 /* save the event params so we can highlight
1679 * the selection in the pending-scroll loop 1637 * the selection in the pending-scroll loop
1680 */ 1638 */
1681 selection_save_x = ev.xbutton.x; 1639 selection_save_x = ev.xbutton.x;
… …
1714#endif 1672#endif
1715 } 1673 }
1716 } 1674 }
1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1675 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1718 { 1676 {
1719 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1677 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1720 MotionNotify, &ev)) 1678 MotionNotify, &ev))
1721 ; 1679 ;
1722 1680
1723 XQueryPointer (disp, scrollBar.win, 1681 XQueryPointer (dpy, scrollBar.win,
1724 &unused_root, &unused_child, 1682 &unused_root, &unused_child,
1725 &unused_root_x, &unused_root_y, 1683 &unused_root_x, &unused_root_y,
1726 &ev.xbutton.x, &ev.xbutton.y, 1684 &ev.xbutton.x, &ev.xbutton.y,
1727 &unused_mask); 1685 &unused_mask);
1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1686 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729 scrollbar_size ()); 1687 scrollbar_size ());
1730 scr_refresh (refresh_type);
1731 refresh_limit = 0; 1688 want_refresh = 1;
1732 scrollbar_show (1); 1689 scrollbar_show (1);
1733 } 1690 }
1734 break; 1691 break;
1735 } 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
1736} 1720}
1737 1721
1738void 1722void
1739rxvt_term::focus_in () 1723rxvt_term::focus_in ()
1740{ 1724{
1741 if (!focus) 1725 if (!focus)
1742 { 1726 {
1743 focus = 1; 1727 focus = 1;
1744 want_refresh = 1; 1728 want_refresh = 1;
1745 1729
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1730 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1731
1748#if USE_XIM 1732#if USE_XIM
1749 if (Input_Context != NULL) 1733 if (Input_Context != NULL)
1750 { 1734 {
1751 IMSetStatusPosition (); 1735 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1736 XSetICFocus (Input_Context);
1753 } 1737 }
1754#endif 1738#endif
1755#if CURSOR_BLINK 1739#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1740 if (option (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1741 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL);
1758#endif 1742#endif
1759#if OFF_FOCUS_FADING 1743#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1744 if (rs[Rs_fade])
1761 { 1745 {
1762 pix_colors = pix_colors_focused; 1746 pix_colors = pix_colors_focused;
1763 scr_recolour (); 1747 scr_recolour ();
1764 } 1748 }
1765#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
1766 } 1760 }
1767} 1761}
1768 1762
1769void 1763void
1770rxvt_term::focus_out () 1764rxvt_term::focus_out ()
… …
1778 1772
1779#if ENABLE_FRILLS || ISO_14755 1773#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf) 1774 if (iso14755buf)
1781 { 1775 {
1782 iso14755buf = 0; 1776 iso14755buf = 0;
1783# if ENABLE_OVERLAY 1777# if ISO_14755
1784 scr_overlay_off (); 1778 scr_overlay_off ();
1785# endif 1779# endif
1786 } 1780 }
1787#endif 1781#endif
1788#if USE_XIM 1782#if USE_XIM
1789 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1790 XUnsetICFocus (Input_Context); 1784 XUnsetICFocus (Input_Context);
1791#endif 1785#endif
1792#if CURSOR_BLINK 1786#if CURSOR_BLINK
1793 if (OPTION (Opt_cursorBlink)) 1787 if (option (Opt_cursorBlink))
1794 cursor_blink_ev.stop (); 1788 cursor_blink_ev.stop ();
1789
1795 hidden_cursor = 0; 1790 hidden_cursor = 0;
1796#endif 1791#endif
1797#if OFF_FOCUS_FADING 1792#if OFF_FOCUS_FADING
1798 if (rs[Rs_fade]) 1793 if (rs[Rs_fade])
1799 { 1794 {
… …
1802 } 1797 }
1803#endif 1798#endif
1804 } 1799 }
1805} 1800}
1806 1801
1807#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
1808void 1816void
1809rxvt_term::rootwin_cb (XEvent &ev) 1817rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1818{
1811 SET_R (this); 1819 make_current ();
1812 SET_LOCALE (locale);
1813 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
1814 switch (ev.type) 1826 switch (ev.type)
1815 { 1827 {
1816 case PropertyNotify: 1828 case PropertyNotify:
1817 /* 1829 /*
1818 * 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,
1819 * 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.
1820 */ 1832 */
1821 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1833 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1822 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1834 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1823 return; 1835 {
1824 1836 bgPixmap.set_root_pixmap ();
1825 /* FALLTHROUGH */ 1837 update_background ();
1826 case ReparentNotify: 1838 }
1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1828 want_refresh = want_full_refresh = 1;
1829 break; 1839 break;
1830 } 1840 }
1841# endif
1831} 1842}
1832#endif 1843#endif
1833 1844
1834void 1845void
1835rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
… …
1844 /* 1855 /*
1845 * VT window processing of button press 1856 * VT window processing of button press
1846 */ 1857 */
1847 if (ev.window == vt) 1858 if (ev.window == vt)
1848 { 1859 {
1860 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 return;
1862
1849#if ISO_14755 1863#if ISO_14755
1850 // 5.4 1864 // 5.4
1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1865 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1852 { 1866 {
1853 iso14755_54 (ev.x, ev.y); 1867 iso14755_54 (ev.x, ev.y);
… …
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1867 { 1881 {
1868 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1869 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1870 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1871 { 1886 {
1872 /* only report double clicks */ 1887 /* only report double clicks */
1873 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1874 mouse_report (ev); 1889 mouse_report (ev);
… …
1894 else 1909 else
1895 { 1910 {
1896 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1898 1913
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1914 switch (ev.button)
1901 { 1915 {
1902 case Button1: 1916 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1918 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1919#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1920 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1921#else
1908 selection.rect = false; 1922 selection.rect = false;
1909#endif 1923#endif
1910 1924
1911 /* allow shift+left click to extend selection */ 1925 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1926 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1927 {
1914 if (MEvent.button == Button1 && clickintime) 1928 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1929 selection_rotate (ev.x, ev.y);
1916 else 1930 else
1917 selection_extend (ev.x, ev.y, 1); 1931 selection_extend (ev.x, ev.y, 1);
1918 } 1932 }
1919 else 1933 else
1920 { 1934 {
1921 if (MEvent.button == Button1 && clickintime) 1935 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1936 MEvent.clicks++;
1923 else 1937 else
1924 MEvent.clicks = 1; 1938 MEvent.clicks = 1;
1925 1939
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1940 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1941 }
1928 1942
1929 MEvent.button = Button1; 1943 MEvent.button = Button1;
1930 break; 1944 break;
1931 1945
1932 case Button3: 1946 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1947 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1948 selection_rotate (ev.x, ev.y);
1935 else 1949 else
1936 selection_extend (ev.x, ev.y, 1); 1950 selection_extend (ev.x, ev.y, 1);
1937 1951
1938 MEvent.button = Button3; 1952 MEvent.button = Button3;
1939 break; 1953 break;
1940 } 1954 }
1941 } 1955 }
1942 1956
1943 MEvent.time = ev.time; 1957 MEvent.time = ev.time;
1944 return; 1958 return;
1945 } 1959 }
1946 1960
… …
2013 upordown = 1; /* down */ 2027 upordown = 1; /* down */
2014 } 2028 }
2015 if (upordown) 2029 if (upordown)
2016 { 2030 {
2017#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2018 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2032 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2019#endif 2033#endif
2020 if (scr_page (upordown < 0 ? UP : DN, 1)) 2034 if (scr_page (upordown < 0 ? UP : DN, 1))
2021 { 2035 {
2022 if (upordown < 0) 2036 if (upordown < 0)
2023 scrollBar.setUp (); 2037 scrollBar.setUp ();
… …
2082 } 2096 }
2083 2097
2084 break; 2098 break;
2085 } 2099 }
2086 } 2100 }
2101
2087 return; 2102 return;
2088 } 2103 }
2089#if MENUBAR
2090 /*
2091 * Menubar window processing of button press
2092 */
2093 if (isMenuBarWindow (ev.window))
2094 menubar_control (ev);
2095#endif
2096} 2104}
2097 2105
2098void 2106void
2099rxvt_term::button_release (XButtonEvent &ev) 2107rxvt_term::button_release (XButtonEvent &ev)
2100{ 2108{
… …
2106 2114
2107 if (scrollbar_isUpDn ()) 2115 if (scrollbar_isUpDn ())
2108 { 2116 {
2109 scrollBar.setIdle (); 2117 scrollBar.setIdle ();
2110 scrollbar_show (0); 2118 scrollbar_show (0);
2111#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112 refresh_type &= ~SMOOTH_REFRESH;
2113#endif
2114 } 2119 }
2115 2120
2116#ifdef SELECTION_SCROLLING 2121#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active) 2122 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2123 sel_scroll_ev.stop();
2119#endif 2124#endif
2120 2125
2121 if (ev.window == vt) 2126 if (ev.window == vt)
2122 { 2127 {
2128 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2129 return;
2130
2123#if ISO_14755 2131#if ISO_14755
2124 // 5.4 2132 // 5.4
2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2126 return; 2134 return;
2127#endif 2135#endif
2136
2128 if (reportmode) 2137 if (reportmode)
2129 { 2138 {
2130 /* mouse report from vt window */ 2139 /* mouse report from vt window */
2131 /* don't report release of wheel "buttons" */ 2140 /* don't report release of wheel "buttons" */
2132 if (ev.button >= 4) 2141 if (ev.button >= 4)
… …
2162 { 2171 {
2163 case Button1: 2172 case Button1:
2164 case Button3: 2173 case Button3:
2165 selection_make (ev.time); 2174 selection_make (ev.time);
2166 break; 2175 break;
2176
2167 case Button2: 2177 case Button2:
2168 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);
2169 break; 2180 break;
2181
2170#ifdef MOUSE_WHEEL 2182#ifdef MOUSE_WHEEL
2171 case Button4: 2183 case Button4:
2172 case Button5: 2184 case Button5:
2173 { 2185 {
2174 int i; 2186 int i;
… …
2176 2188
2177 v = ev.button == Button4 ? UP : DN; 2189 v = ev.button == Button4 ? UP : DN;
2178 2190
2179 if (ev.state & ShiftMask) 2191 if (ev.state & ShiftMask)
2180 i = 1; 2192 i = 1;
2181 else if (OPTION (Opt_mouseWheelScrollPage)) 2193 else if (option (Opt_mouseWheelScrollPage))
2182 i = nrow - 1; 2194 i = nrow - 1;
2183 else 2195 else
2184 i = 5; 2196 i = 5;
2185 2197
2186# ifdef MOUSE_SLIP_WHEELING 2198# ifdef MOUSE_SLIP_WHEELING
… …
2188 { 2200 {
2189 mouse_slip_wheel_speed += v ? -1 : 1; 2201 mouse_slip_wheel_speed += v ? -1 : 1;
2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2202 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2203 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2192 2204
2193 if (slip_wheel_ev.at < NOW) 2205 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2194 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2195
2196 slip_wheel_ev.start ();
2197 } 2206 }
2198 else 2207 else
2199 { 2208 {
2200# endif 2209# endif
2201# ifdef JUMP_MOUSE_WHEEL
2202 scr_page (v, i); 2210 scr_page (v, i);
2203 scr_refresh (SMOOTH_REFRESH);
2204 scrollbar_show (1); 2211 scrollbar_show (1);
2205# else
2206 while (i--)
2207 {
2208 scr_page (v, 1);
2209 scr_refresh (SMOOTH_REFRESH);
2210 scrollbar_show (1);
2211 }
2212# endif
2213# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2214 } 2213 }
2215#endif 2214# endif
2216 } 2215 }
2217 break; 2216 break;
2218#endif 2217#endif
2219 } 2218 }
2220 } 2219 }
2221#ifdef MENUBAR
2222 else if (isMenuBarWindow (ev.window))
2223 menubar_control (ev);
2224#endif
2225} 2220}
2226
2227#ifdef TRANSPARENT
2228#if TINTING
2229/* taken from aterm-0.4.2 */
2230
2231typedef uint32_t RUINT32T;
2232
2233void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2234{
2235 int sh_r, sh_g, sh_b;
2236 RUINT32T mask_r, mask_g, mask_b;
2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2240 int i;
2241
2242 Visual *visual = display->visual;
2243
2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2245
2246 /* for convenience */
2247 mask_r = visual->red_mask;
2248 mask_g = visual->green_mask;
2249 mask_b = visual->blue_mask;
2250
2251 /* boring lookup table pre-initialization */
2252 switch (srcImage->bits_per_pixel) {
2253 case 15:
2254 if ((mask_r != 0x7c00) ||
2255 (mask_g != 0x03e0) ||
2256 (mask_b != 0x001f))
2257 return;
2258 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2259 lookup_r = lookup;
2260 lookup_g = lookup+32;
2261 lookup_b = lookup+32+32;
2262 sh_r = 10;
2263 sh_g = 5;
2264 sh_b = 0;
2265 break;
2266 case 16:
2267 if ((mask_r != 0xf800) ||
2268 (mask_g != 0x07e0) ||
2269 (mask_b != 0x001f))
2270 return;
2271 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2272 lookup_r = lookup;
2273 lookup_g = lookup+32;
2274 lookup_b = lookup+32+64;
2275 sh_r = 11;
2276 sh_g = 5;
2277 sh_b = 0;
2278 break;
2279 case 24:
2280 if ((mask_r != 0xff0000) ||
2281 (mask_g != 0x00ff00) ||
2282 (mask_b != 0x0000ff))
2283 return;
2284 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2285 lookup_r = lookup;
2286 lookup_g = lookup+256;
2287 lookup_b = lookup+256+256;
2288 sh_r = 16;
2289 sh_g = 8;
2290 sh_b = 0;
2291 break;
2292 case 32:
2293 if ((mask_r != 0xff0000) ||
2294 (mask_g != 0x00ff00) ||
2295 (mask_b != 0x0000ff))
2296 return;
2297 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2298 lookup_r = lookup;
2299 lookup_g = lookup+256;
2300 lookup_b = lookup+256+256;
2301 sh_r = 16;
2302 sh_g = 8;
2303 sh_b = 0;
2304 break;
2305 default:
2306 return; /* we do not support this color depth */
2307 }
2308
2309 /* prepare limits for color transformation (each channel is handled separately) */
2310 if (shade < 0) {
2311 shade = -shade;
2312 if (shade < 0) shade = 0;
2313 if (shade > 100) shade = 100;
2314
2315 lower_lim_r = 65535-rm;
2316 lower_lim_g = 65535-gm;
2317 lower_lim_b = 65535-bm;
2318
2319 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2320 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2321 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2322
2323 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2324 } else {
2325 if (shade < 0) shade = 0;
2326 if (shade > 100) shade = 100;
2327
2328 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2329
2330 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2331 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2332 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2333 }
2334
2335 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2336 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2337 {
2338 unsigned int tmp;
2339
2340 tmp = lower_lim_r;
2341 lower_lim_r = lower_lim_b;
2342 lower_lim_b = tmp;
2343
2344 tmp = upper_lim_r;
2345 upper_lim_r = upper_lim_b;
2346 upper_lim_b = tmp;
2347 }
2348
2349 /* fill our lookup tables */
2350 for (i = 0; i <= mask_r>>sh_r; i++)
2351 {
2352 RUINT32T tmp;
2353 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2354 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2355 lookup_r[i] = (tmp/65535)<<sh_r;
2356 }
2357 for (i = 0; i <= mask_g>>sh_g; i++)
2358 {
2359 RUINT32T tmp;
2360 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2361 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2362 lookup_g[i] = (tmp/65535)<<sh_g;
2363 }
2364 for (i = 0; i <= mask_b>>sh_b; i++)
2365 {
2366 RUINT32T tmp;
2367 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2368 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2369 lookup_b[i] = (tmp/65535)<<sh_b;
2370 }
2371
2372 /* apply table to input image (replacing colors by newly calculated ones) */
2373 switch (srcImage->bits_per_pixel)
2374 {
2375 case 15:
2376 {
2377 unsigned short *p1, *pf, *p, *pl;
2378 p1 = (unsigned short *) srcImage->data;
2379 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2380 while (p1 < pf)
2381 {
2382 p = p1;
2383 pl = p1 + srcImage->width;
2384 for (; p < pl; p++)
2385 {
2386 *p = lookup_r[(*p & 0x7c00)>>10] |
2387 lookup_g[(*p & 0x03e0)>> 5] |
2388 lookup_b[(*p & 0x001f)];
2389 }
2390 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2391 }
2392 break;
2393 }
2394 case 16:
2395 {
2396 unsigned short *p1, *pf, *p, *pl;
2397 p1 = (unsigned short *) srcImage->data;
2398 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2399 while (p1 < pf)
2400 {
2401 p = p1;
2402 pl = p1 + srcImage->width;
2403 for (; p < pl; p++)
2404 {
2405 *p = lookup_r[(*p & 0xf800)>>11] |
2406 lookup_g[(*p & 0x07e0)>> 5] |
2407 lookup_b[(*p & 0x001f)];
2408 }
2409 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2410 }
2411 break;
2412 }
2413 case 24:
2414 {
2415 unsigned char *p1, *pf, *p, *pl;
2416 p1 = (unsigned char *) srcImage->data;
2417 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2418 while (p1 < pf)
2419 {
2420 p = p1;
2421 pl = p1 + srcImage->width * 3;
2422 for (; p < pl; p += 3)
2423 {
2424 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2425 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2426 p[2] = lookup_r[(p[2] & 0x0000ff)];
2427 }
2428 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2429 }
2430 break;
2431 }
2432 case 32:
2433 {
2434 RUINT32T *p1, *pf, *p, *pl;
2435 p1 = (RUINT32T *) srcImage->data;
2436 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2437
2438 while (p1 < pf)
2439 {
2440 p = p1;
2441 pl = p1 + srcImage->width;
2442 for (; p < pl; p++)
2443 {
2444 *p = lookup_r[(*p & 0xff0000)>>16] |
2445 lookup_g[(*p & 0x00ff00)>> 8] |
2446 lookup_b[(*p & 0x0000ff)] |
2447 (*p & ~0xffffff);
2448 }
2449 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2450 }
2451 break;
2452 }
2453 }
2454
2455 free (lookup);
2456}
2457#endif
2458
2459/*
2460 * Check our parents are still who we think they are.
2461 * Do transparency updates if required
2462 */
2463int
2464rxvt_term::check_our_parents ()
2465{
2466 int i, pchanged, aformat, have_pixmap, rootdepth;
2467 unsigned long nitems, bytes_after;
2468 Atom atype;
2469 unsigned char *prop = NULL;
2470 Window root, oldp, *list;
2471 Pixmap rootpixmap = None;
2472 XWindowAttributes wattr, wrootattr;
2473 dDisp;
2474
2475 pchanged = 0;
2476
2477 if (!OPTION (Opt_transparent))
2478 return pchanged; /* Don't try any more */
2479
2480 XGetWindowAttributes (disp, display->root, &wrootattr);
2481 rootdepth = wrootattr.depth;
2482
2483 XGetWindowAttributes (disp, parent[0], &wattr);
2484
2485 if (rootdepth != wattr.depth)
2486 {
2487 if (am_transparent)
2488 {
2489 pchanged = 1;
2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2491 am_transparent = am_pixmap_trans = 0;
2492 }
2493
2494 return pchanged; /* Don't try any more */
2495 }
2496
2497 /* Get all X ops out of the queue so that our information is up-to-date. */
2498 XSync (disp, False);
2499
2500 /*
2501 * Make the frame window set by the window manager have
2502 * the root background. Some window managers put multiple nested frame
2503 * windows for each client, so we have to take care about that.
2504 */
2505 i = (xa[XA_XROOTPMAP_ID]
2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2508 &nitems, &bytes_after, &prop) == Success);
2509
2510 if (!i || prop == NULL)
2511 i = (xa[XA_ESETROOT_PMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success);
2515
2516 if (!i || prop == NULL
2517#if TINTING
2518 || !rs[Rs_color + Color_tint]
2519#endif
2520 )
2521 have_pixmap = 0;
2522 else
2523 {
2524 have_pixmap = 1;
2525 rootpixmap = *(Pixmap *)prop;
2526 XFree (prop);
2527 }
2528
2529 if (have_pixmap)
2530 {
2531 /*
2532 * Copy display->root pixmap transparency
2533 */
2534 int sx, sy, nx, ny;
2535 unsigned int nw, nh;
2536 Window cr;
2537 XImage *image;
2538 GC gc;
2539 XGCValues gcvalue;
2540
2541 XTranslateCoordinates (disp, parent[0], display->root,
2542 0, 0, &sx, &sy, &cr);
2543 nw = (unsigned int)szHint.width;
2544 nh = (unsigned int)szHint.height;
2545 nx = ny = 0;
2546
2547 if (sx < 0)
2548 {
2549 nw += sx;
2550 nx = -sx;
2551 sx = 0;
2552 }
2553
2554 if (sy < 0)
2555 {
2556 nh += sy;
2557 ny = -sy;
2558 sy = 0;
2559 }
2560
2561 min_it (nw, (unsigned int) (wrootattr.width - sx));
2562 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563
2564 XSync (disp, False);
2565 allowedxerror = -1;
2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2567
2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2569 /* XXX: may need a delay here? */
2570 allowedxerror = 0;
2571
2572 if (image == NULL)
2573 {
2574 if (am_transparent && am_pixmap_trans)
2575 {
2576 pchanged = 1;
2577 if (pixmap != None)
2578 {
2579 XFreePixmap (disp, pixmap);
2580 pixmap = None;
2581 }
2582 }
2583
2584 am_pixmap_trans = 0;
2585 }
2586 else
2587 {
2588 if (pixmap != None)
2589 XFreePixmap (disp, pixmap);
2590
2591#if TINTING
2592 if (ISSET_PIXCOLOR (Color_tint))
2593 {
2594 unsigned short rm, gm, bm;
2595 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2596
2597 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2598
2599 ShadeXImage (display, image, shade, rm, gm, bm);
2600 }
2601#endif
2602
2603 pixmap = XCreatePixmap (disp, vt,
2604 szHint.width, szHint.height, image->depth);
2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2606 XPutImage (disp, pixmap, gc, image, 0, 0,
2607 nx, ny, image->width, image->height);
2608 XFreeGC (disp, gc);
2609 XDestroyImage (image);
2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2611 XClearWindow (disp, parent[0]);
2612
2613 if (!am_transparent || !am_pixmap_trans)
2614 pchanged = 1;
2615
2616 am_transparent = am_pixmap_trans = 1;
2617 }
2618 }
2619
2620 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2622 else
2623 {
2624 unsigned int n;
2625 /*
2626 * InheritPixmap transparency
2627 */
2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2629 {
2630 oldp = parent[i];
2631 XQueryTree (disp, parent[i - 1], &root,
2632 &parent[i], &list, &n);
2633 XFree (list);
2634
2635 if (parent[i] == display->root)
2636 {
2637 if (oldp != None)
2638 pchanged = 1;
2639
2640 break;
2641 }
2642
2643 if (oldp != parent[i])
2644 pchanged = 1;
2645 }
2646
2647 n = 0;
2648
2649 if (pchanged)
2650 {
2651 for (; n < (unsigned int)i; n++)
2652 {
2653 XGetWindowAttributes (disp, parent[n], &wattr);
2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2655 {
2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2657 break;
2658 }
2659 }
2660 }
2661
2662 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2663 {
2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2666 am_transparent = 0;
2667 /* XXX: also turn off Opt_transparent? */
2668 }
2669 else
2670 {
2671#if WAIT_FOR_WM
2672 /* wait (an arbitrary period) for the WM to do its thing
2673 * needed for fvwm2.2.2 (and before?) */
2674 sleep (1);
2675#endif
2676 for (n = 0; n < (unsigned int)i; n++)
2677 {
2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2679 XClearWindow (disp, parent[n]);
2680 }
2681
2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2683 am_transparent = 1;
2684 }
2685
2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2687 parent[i] = None;
2688 }
2689
2690 if (scrollBar.win)
2691 {
2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2693 scrollBar.setIdle ();
2694 scrollbar_show (0);
2695 }
2696
2697 if (am_transparent)
2698 {
2699 want_refresh = want_full_refresh = 1;
2700 if (am_pixmap_trans)
2701 flush ();
2702 }
2703
2704 return pchanged;
2705}
2706#endif
2707 2221
2708/*}}} */ 2222/*}}} */
2709 2223
2710bool 2224bool
2711rxvt_term::cmd_parse () 2225rxvt_term::cmd_parse ()
2712{ 2226{
2713 bool flag = false; 2227 bool flag = false;
2714 unicode_t ch = NOCHAR; 2228 wchar_t ch = NOCHAR;
2715 char *seq_begin; // remember start of esc-sequence here 2229 char *seq_begin; // remember start of esc-sequence here
2716 2230
2717 for (;;) 2231 for (;;)
2718 { 2232 {
2719 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
… …
2740 if (seen_resize && cmd_pid) 2254 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH); 2255 kill (-cmd_pid, SIGWINCH);
2742 } 2256 }
2743 2257
2744 /* Read a text string from the input buffer */ 2258 /* Read a text string from the input buffer */
2745 unicode_t buf[UBUFSIZ]; 2259 wchar_t buf[UBUFSIZ];
2746 bool refreshnow = false; 2260 bool refreshnow = false;
2747 int nlines = 0; 2261 int nlines = 0;
2748 unicode_t *str = buf; 2262 wchar_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ); 2263 wchar_t *eol = str + min (ncol, UBUFSIZ);
2750 2264
2751 for (;;) 2265 for (;;)
2752 { 2266 {
2753 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))
2754 break; 2268 break;
… …
2760 if (ch == C0_LF) 2274 if (ch == C0_LF)
2761 nlines++; 2275 nlines++;
2762 2276
2763 refresh_count++; 2277 refresh_count++;
2764 2278
2765 if (!OPTION (Opt_jumpScroll) 2279 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2767 { 2280 {
2768 refreshnow = true;
2769 refresh_count = 0; 2281 refresh_count = 0;
2282
2283 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.)
2284 {
2285 refreshnow = true;
2770 ch = NOCHAR; 2286 ch = NOCHAR;
2771 break; 2287 break;
2288 }
2772 } 2289 }
2773 2290
2774 // scr_add_lines only works for nlines <= nrow - 1. 2291 // scr_add_lines only works for nlines <= nrow - 1.
2775 if (nlines >= nrow - 1) 2292 if (nlines >= nrow - 1)
2776 { 2293 {
2294 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777 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))))
2778 scr_add_lines (buf, nlines, str - buf); 2296 scr_add_lines (buf, str - buf, nlines);
2779 2297
2780 nlines = 0; 2298 nlines = 0;
2781 str = buf; 2299 str = buf;
2782 eol = str + min (ncol, UBUFSIZ); 2300 eol = str + min (ncol, UBUFSIZ);
2783 } 2301 }
… …
2797 2315
2798 seq_begin = cmdbuf_ptr; 2316 seq_begin = cmdbuf_ptr;
2799 ch = next_char (); 2317 ch = next_char ();
2800 } 2318 }
2801 2319
2320 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802 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))))
2803 scr_add_lines (buf, nlines, str - buf); 2322 scr_add_lines (buf, str - buf, nlines);
2804 2323
2805 /* 2324 /*
2806 * 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
2807 * 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.
2808 * the number of pages between refreshes is refresh_limit, which 2327 * if skipScroll is enabled.
2809 * is incremented here because we must be doing flat-out scrolling.
2810 */ 2328 */
2811 if (refreshnow) 2329 if (refreshnow)
2812 { 2330 {
2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814 refresh_limit++;
2815 else
2816 {
2817 flag = true; 2331 flag = true;
2818 scr_refresh (refresh_type); 2332 scr_refresh ();
2819 flush_ev.stop (); 2333 want_refresh = 1;
2820 }
2821 } 2334 }
2822 2335
2823 } 2336 }
2824 else 2337 else
2825 { 2338 {
… …
2839 } 2352 }
2840 2353
2841 return flag; 2354 return flag;
2842} 2355}
2843 2356
2844// read the next octet
2845unicode_t
2846rxvt_term::next_octet ()
2847{
2848 return cmdbuf_ptr < cmdbuf_endp
2849 ? *cmdbuf_ptr++
2850 : NOCHAR;
2851}
2852
2853// read the next character 2357// read the next character
2854unicode_t 2358wchar_t
2855rxvt_term::next_char () 2359rxvt_term::next_char () NOTHROW
2856{ 2360{
2857 while (cmdbuf_ptr < cmdbuf_endp) 2361 while (cmdbuf_ptr < cmdbuf_endp)
2858 { 2362 {
2859 // assume 7-bit to be ascii ALWAYS 2363 // assume 7-bit to be ascii ALWAYS
2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2364 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2869 cmdbuf_ptr = cmdbuf_endp; 2373 cmdbuf_ptr = cmdbuf_endp;
2870 break; 2374 break;
2871 } 2375 }
2872 2376
2873 if (len == (size_t)-1) 2377 if (len == (size_t)-1)
2874 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
2875 2379
2876 // assume wchar == unicode 2380 // assume wchar == unicode
2877 cmdbuf_ptr += len; 2381 cmdbuf_ptr += len;
2878 return wc & UNICODE_MASK; 2382 return wc & UNICODE_MASK;
2879 } 2383 }
2880 2384
2881 return NOCHAR; 2385 return NOCHAR;
2882} 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;
2883 2398
2884/* rxvt_cmd_getc () - Return next input character */ 2399/* rxvt_cmd_getc () - Return next input character */
2885/* 2400/*
2886 * Return the next input character after first passing any keyboard input 2401 * Return the next input character after first passing any keyboard input
2887 * to the command. 2402 * to the command.
2888 */ 2403 */
2889unicode_t 2404wchar_t
2890rxvt_term::cmd_getc () 2405rxvt_term::cmd_getc () THROW ((class out_of_input))
2891{ 2406{
2892 unicode_t c = next_char (); 2407 wchar_t c = next_char ();
2893 2408
2894 if (c == NOCHAR) 2409 if (c == NOCHAR)
2895 throw out_of_input; 2410 throw out_of_input;
2896 2411
2897 return c; 2412 return c;
2898} 2413}
2899 2414
2900unicode_t 2415uint32_t
2901rxvt_term::cmd_get8 () 2416rxvt_term::cmd_get8 () THROW ((class out_of_input))
2902{ 2417{
2903 unicode_t c = next_octet (); 2418 uint32_t c = next_octet ();
2904 2419
2905 if (c == NOCHAR) 2420 if (c == NOCHAR)
2906 throw out_of_input; 2421 throw out_of_input;
2907 2422
2908 return c; 2423 return c;
… …
2972 { 2487 {
2973 if ((buf[len++] = cmd_getc ()) == 'i') 2488 if ((buf[len++] = cmd_getc ()) == 'i')
2974 break; /* done = 1 */ 2489 break; /* done = 1 */
2975 } 2490 }
2976 } 2491 }
2977 2492
2978 for (i = 0; i < len; i++) 2493 for (i = 0; i < len; i++)
2979 if (putc (buf[i], fd) == EOF) 2494 if (putc (buf[i], fd) == EOF)
2980 { 2495 {
2981 done = 1; 2496 done = 1;
2982 break; 2497 break;
… …
3044 process_dcs_seq (); 2559 process_dcs_seq ();
3045 break; 2560 break;
3046 case 0x9b: /* CSI */ 2561 case 0x9b: /* CSI */
3047 process_csi_seq (); 2562 process_csi_seq ();
3048 break; 2563 break;
3049 case 0x9d: /* CSI */ 2564 case 0x9d: /* OSC */
3050 process_osc_seq (); 2565 process_osc_seq ();
3051 break; 2566 break;
3052#endif 2567#endif
3053 } 2568 }
3054} 2569}
… …
3144 scr_charset_set (2, (unsigned int)cmd_getc ()); 2659 scr_charset_set (2, (unsigned int)cmd_getc ());
3145 break; 2660 break;
3146 case '+': 2661 case '+':
3147 scr_charset_set (3, (unsigned int)cmd_getc ()); 2662 scr_charset_set (3, (unsigned int)cmd_getc ());
3148 break; 2663 break;
3149#if ENABLE_FRILLS 2664#if !ENABLE_MINIMAL
3150 case '6': 2665 case '6':
3151 scr_backindex (); 2666 scr_backindex ();
3152 break; 2667 break;
3153#endif 2668#endif
3154 case '7': 2669 case '7':
3155 scr_cursor (SAVE); 2670 scr_cursor (SAVE);
3156 break; 2671 break;
3157 case '8': 2672 case '8':
3158 scr_cursor (RESTORE); 2673 scr_cursor (RESTORE);
3159 break; 2674 break;
3160#if ENABLE_FRILLS 2675#if !ENABLE_MINIMAL
3161 case '9': 2676 case '9':
3162 scr_forwardindex (); 2677 scr_forwardindex ();
3163 break; 2678 break;
3164#endif 2679#endif
3165 case '=': 2680 case '=':
… …
3175 break; 2690 break;
3176 2691
3177 /* 8.3.87: NEXT LINE */ 2692 /* 8.3.87: NEXT LINE */
3178 case C1_NEL: /* ESC E */ 2693 case C1_NEL: /* ESC E */
3179 { 2694 {
3180 unicode_t nlcr[] = { C0_LF, C0_CR }; 2695 wchar_t nlcr[] = { C0_LF, C0_CR };
3181 scr_add_lines (nlcr, 1, 2); 2696 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182 } 2697 }
3183 break; 2698 break;
3184 2699
3185 /* kidnapped escape sequence: Should be 8.3.48 */ 2700 /* kidnapped escape sequence: Should be 8.3.48 */
3186 case C1_ESA: /* ESC G */ 2701 case C1_ESA: /* ESC G */
… …
3280rxvt_term::process_csi_seq () 2795rxvt_term::process_csi_seq ()
3281{ 2796{
3282 unicode_t ch, priv, i; 2797 unicode_t ch, priv, i;
3283 unsigned int nargs, p; 2798 unsigned int nargs, p;
3284 int n, ndef; 2799 int n, ndef;
3285 int arg[ESC_ARGS]; 2800 int arg[ESC_ARGS] = { };
3286 2801
3287 for (nargs = ESC_ARGS; nargs > 0;) 2802 nargs = 0;
3288 arg[--nargs] = 0;
3289 2803
3290 priv = 0; 2804 priv = 0;
3291 ch = cmd_getc (); 2805 ch = cmd_getc ();
3292 if (ch >= '<' && ch <= '?') 2806 if (ch >= '<' && ch <= '?')
3293 { /* '<' '=' '>' '?' */ 2807 { /* '<' '=' '>' '?' */
… …
3327 ndef = get_byte_array_bit (csi_defaults, i); 2841 ndef = get_byte_array_bit (csi_defaults, i);
3328 for (p = 0; p < nargs; p++) 2842 for (p = 0; p < nargs; p++)
3329 if (arg[p] == -1) 2843 if (arg[p] == -1)
3330 arg[p] = ndef; 2844 arg[p] = ndef;
3331 2845
3332#ifdef DEBUG_CMD
3333 fprintf (stderr, "CSI ");
3334 for (p = 0; p < nargs; p++)
3335 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3336 fprintf (stderr, "%c\n", ch);
3337#endif
3338
3339 /* 2846 /*
3340 * private mode handling 2847 * private mode handling
3341 */ 2848 */
3342 if (priv) 2849 if (priv)
3343 { 2850 {
3344 switch (priv) 2851 switch (priv)
3345 { 2852 {
3346 case '>': 2853 case '>':
3347 if (ch == CSI_DA) /* secondary device attributes */ 2854 if (ch == CSI_DA) /* secondary device attributes */
3348 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 }
3349 break; 2865 break;
3350 case '?': 2866 case '?':
3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2867 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3352 process_terminal_mode (ch, priv, nargs, arg); 2868 process_terminal_mode (ch, priv, nargs, arg);
3353 break; 2869 break;
… …
3479 break; 2995 break;
3480 case 6: /* CPR requested */ 2996 case 6: /* CPR requested */
3481 scr_report_position (); 2997 scr_report_position ();
3482 break; 2998 break;
3483 case 7: /* unofficial extension */ 2999 case 7: /* unofficial extension */
3484 if (OPTION (Opt_insecure)) 3000 if (option (Opt_insecure))
3485 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3001 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3486 break; 3002 break;
3487 case 8: /* unofficial extension */ 3003 case 8: /* unofficial extension */
3488 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3004 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3489 break; 3005 break;
… …
3556 break; 3072 break;
3557 case CSI_75: 3073 case CSI_75:
3558 scr_cursor (RESTORE); 3074 scr_cursor (RESTORE);
3559 break; 3075 break;
3560 3076
3561#if ENABLE_FRILLS 3077#if !ENABLE_MINIMAL
3562 case CSI_74: 3078 case CSI_74:
3563 process_window_ops (arg, nargs); 3079 process_window_ops (arg, nargs);
3564 break; 3080 break;
3565#endif 3081#endif
3566 3082
… …
3573 break; 3089 break;
3574 } 3090 }
3575} 3091}
3576/*}}} */ 3092/*}}} */
3577 3093
3578#if ENABLE_FRILLS 3094#if !ENABLE_MINIMAL
3579/* ARGSUSED */ 3095/* ARGSUSED */
3580void 3096void
3581rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3097rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3582{ 3098{
3583 int x, y; 3099 int x, y;
3584 XWindowAttributes wattr; 3100 XWindowAttributes wattr;
3585 Window wdummy; 3101 Window wdummy;
3586 dDisp; 3102
3103 dLocal (Display *, dpy);
3587 3104
3588 if (nargs == 0) 3105 if (nargs == 0)
3589 return; 3106 return;
3590 3107
3591 switch (args[0]) 3108 switch (args[0])
3592 { 3109 {
3593 /* 3110 /*
3594 * commands 3111 * commands
3595 */ 3112 */
3596 case 1: /* deiconify window */ 3113 case 1: /* deiconify window */
3597 XMapWindow (disp, parent[0]); 3114 XMapWindow (dpy, parent[0]);
3598 break; 3115 break;
3599 case 2: /* iconify window */ 3116 case 2: /* iconify window */
3600 XIconifyWindow (disp, parent[0], display->screen); 3117 XIconifyWindow (dpy, parent[0], display->screen);
3601 break; 3118 break;
3602 case 3: /* set position (pixels) */ 3119 case 3: /* set position (pixels) */
3603 XMoveWindow (disp, parent[0], args[1], args[2]); 3120 XMoveWindow (dpy, parent[0], args[1], args[2]);
3604 break; 3121 break;
3605 case 4: /* set size (pixels) */ 3122 case 4: /* set size (pixels) */
3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3123 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3607 break; 3124 break;
3608 case 5: /* raise window */ 3125 case 5: /* raise window */
3609 XRaiseWindow (disp, parent[0]); 3126 XRaiseWindow (dpy, parent[0]);
3610 break; 3127 break;
3611 case 6: /* lower window */ 3128 case 6: /* lower window */
3612 XLowerWindow (disp, parent[0]); 3129 XLowerWindow (dpy, parent[0]);
3613 break; 3130 break;
3614 case 7: /* refresh window */ 3131 case 7: /* refresh window */
3615 scr_touch (true); 3132 scr_touch (true);
3616 break; 3133 break;
3617 case 8: /* set size (chars) */ 3134 case 8: /* set size (chars) */
… …
3624 if (args[0] >= 24) /* set height (chars) */ 3141 if (args[0] >= 24) /* set height (chars) */
3625 set_widthheight ((unsigned int)width, 3142 set_widthheight ((unsigned int)width,
3626 (unsigned int) (args[1] * fheight)); 3143 (unsigned int) (args[1] * fheight));
3627 break; 3144 break;
3628 3145
3629
3630 /* 3146 /*
3631 * reports - some output format copied from XTerm 3147 * reports - some output format copied from XTerm
3632 */ 3148 */
3633 case 11: /* report window state */ 3149 case 11: /* report window state */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3150 XGetWindowAttributes (dpy, parent[0], &wattr);
3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3151 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3636 break; 3152 break;
3637 case 13: /* report window position */ 3153 case 13: /* report window position */
3638 XGetWindowAttributes (disp, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent[0], &wattr);
3639 XTranslateCoordinates (disp, parent[0], wattr.root, 3155 XTranslateCoordinates (dpy, parent[0], wattr.root,
3640 -wattr.border_width, -wattr.border_width, 3156 -wattr.border_width, -wattr.border_width,
3641 &x, &y, &wdummy); 3157 &x, &y, &wdummy);
3642 tt_printf ("\033[3;%d;%dt", x, y); 3158 tt_printf ("\033[3;%d;%dt", x, y);
3643 break; 3159 break;
3644 case 14: /* report window size (pixels) */ 3160 case 14: /* report window size (pixels) */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3161 XGetWindowAttributes (dpy, parent[0], &wattr);
3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3162 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3647 break; 3163 break;
3648 case 18: /* report text area size (chars) */ 3164 case 18: /* report text area size (chars) */
3649 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3165 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3650 break; 3166 break;
… …
3652 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3168 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3653 break; 3169 break;
3654 case 20: /* report icon label */ 3170 case 20: /* report icon label */
3655 { 3171 {
3656 char *s; 3172 char *s;
3657 XGetIconName (disp, parent[0], &s); 3173 XGetIconName (dpy, parent[0], &s);
3658 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 */
3659 XFree (s); 3175 XFree (s);
3660 } 3176 }
3661 break; 3177 break;
3662 case 21: /* report window title */ 3178 case 21: /* report window title */
3663 { 3179 {
3664 char *s; 3180 char *s;
3665 XFetchName (disp, parent[0], &s); 3181 XFetchName (dpy, parent[0], &s);
3666 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 */
3667 XFree (s); 3183 XFree (s);
3668 } 3184 }
3669 break; 3185 break;
3670 } 3186 }
3671} 3187}
… …
3698 seen_esc = true; 3214 seen_esc = true;
3699 continue; 3215 continue;
3700 } 3216 }
3701 else if (ch == C0_BEL || ch == CHAR_ST) 3217 else if (ch == C0_BEL || ch == CHAR_ST)
3702 break; 3218 break;
3219 else if (ch == C0_SYN)
3220 ch = cmd_get8 ();
3703 else if (ch < 0x20) 3221 else if (ch < 0x20)
3704 return NULL; /* other control character - exit */ 3222 return NULL; /* other control character - exit */
3705 3223
3706 seen_esc = false; 3224 seen_esc = false;
3707 3225
3708 if (n >= STRING_MAX - 1) 3226 if (n >= STRING_MAX - 1)
3709 // stop at some sane length 3227 // stop at some sane length
3710 return NULL; 3228 return NULL;
3711 3229
3712 if (ch == C0_SYN)
3713 string[n++] = cmd_get8 ();
3714 else
3715 string[n++] = ch; 3230 string[n++] = ch;
3716 } 3231 }
3717 3232
3718 string[n++] = '\0'; 3233 string[n++] = '\0';
3719 3234
3720 ends_how = (ch == 0x5c ? C0_ESC : ch); 3235 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3771void 3286void
3772rxvt_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)
3773{ 3288{
3774 if (str[0] == '?' && !str[1]) 3289 if (str[0] == '?' && !str[1])
3775 { 3290 {
3776 unsigned short r, g, b; 3291 rgba c;
3777 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
3778 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);
3779 } 3300 }
3780 else 3301 else
3781 set_window_color (color, str); 3302 set_window_color (color, str);
3782} 3303}
3783 3304
… …
3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3306 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3786 */ 3307 */
3787void 3308void
3788rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3309rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789{ 3310{
3790 int changed = 0;
3791 int color; 3311 int color;
3792 char *buf, *name; 3312 char *buf, *name;
3793 bool query = str[0] == '?' && !str[1]; 3313 bool query = str[0] == '?' && !str[1];
3794 int saveop = op; 3314 int saveop = op;
3795 dDisp; 3315
3316 dLocal (Display *, dpy);
3796 3317
3797 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
3798 switch (op) 3323 switch (op)
3799 { 3324 {
3800 case XTerm_name: 3325 case XTerm_name:
3801 set_title (str); 3326 set_title (str);
3802 /* FALLTHROUGH */ 3327 /* FALLTHROUGH */
… …
3816 unsigned long bytes_after; 3341 unsigned long bytes_after;
3817 unsigned char *value = 0; 3342 unsigned char *value = 0;
3818 const char *str = ""; 3343 const char *str = "";
3819 3344
3820 if (prop 3345 if (prop
3821 && XGetWindowProperty (disp, parent[0], 3346 && XGetWindowProperty (dpy, parent[0],
3822 prop, 0, 1<<16, 0, AnyPropertyType, 3347 prop, 0, 1<<16, 0, AnyPropertyType,
3823 &actual_type, &actual_format, 3348 &actual_type, &actual_format,
3824 &nitems, &bytes_after, &value) == Success 3349 &nitems, &bytes_after, &value) == Success
3825 && actual_type != None 3350 && actual_type != None
3826 && actual_format == 8) 3351 && actual_format == 8)
3827 str = (const char *)(value); 3352 str = (const char *)(value);
3828 3353
3829 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3354 tt_printf ("\033]%d;%s%c", op, str, resp);
3830 3355
3831 XFree (value); 3356 XFree (value);
3832 } 3357 }
3833 else 3358 else
3834 { 3359 {
… …
3838 { 3363 {
3839 *eq = 0; 3364 *eq = 0;
3840 set_utf8_property (display->atom (str), eq + 1); 3365 set_utf8_property (display->atom (str), eq + 1);
3841 } 3366 }
3842 else 3367 else
3843 XDeleteProperty (disp, parent[0], 3368 XDeleteProperty (dpy, parent[0],
3844 display->atom (str)); 3369 display->atom (str));
3845 } 3370 }
3846 break; 3371 break;
3847 3372
3848 case XTerm_Color: 3373 case XTerm_Color:
… …
3850 { 3375 {
3851 if ((name = strchr (buf, ';')) == NULL) 3376 if ((name = strchr (buf, ';')) == NULL)
3852 break; 3377 break;
3853 3378
3854 *name++ = '\0'; 3379 *name++ = '\0';
3855 color = atoi (buf); 3380 color = atoi (buf) + minCOLOR;
3856 3381
3857 if (color < 0 || color >= TOTAL_COLORS) 3382 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858 break; 3383 break;
3859 3384
3860 if ((buf = strchr (name, ';')) != NULL) 3385 if ((buf = strchr (name, ';')) != NULL)
3861 *buf++ = '\0'; 3386 *buf++ = '\0';
3862 3387
3863 if (name[0] == '?' && !name[1]) 3388 process_color_seq (op, color, name, resp);
3864 {
3865 unsigned short r, g, b;
3866 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3867 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868 }
3869 else
3870 set_window_color (color + minCOLOR, name);
3871 } 3389 }
3872 break; 3390 break;
3873 case XTerm_Color00: 3391 case XTerm_Color00:
3874 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3392 process_color_seq (op, Color_fg, str, resp);
3875 break; 3393 break;
3876 case XTerm_Color01: 3394 case XTerm_Color01:
3877 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3395 process_color_seq (op, Color_bg, str, resp);
3878 break; 3396 break;
3879#ifndef NO_CURSORCOLOR 3397#ifndef NO_CURSORCOLOR
3880 case XTerm_Color_cursor: 3398 case XTerm_Color_cursor:
3881 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3399 process_color_seq (op, Color_cursor, str, resp);
3882 break; 3400 break;
3883#endif 3401#endif
3884 case XTerm_Color_pointer_fg: 3402 case XTerm_Color_pointer_fg:
3885 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3403 process_color_seq (op, Color_pointer_fg, str, resp);
3886 break; 3404 break;
3887 case XTerm_Color_pointer_bg: 3405 case XTerm_Color_pointer_bg:
3888 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3406 process_color_seq (op, Color_pointer_bg, str, resp);
3889 break; 3407 break;
3890#ifndef NO_BOLD_UNDERLINE_REVERSE 3408#ifndef NO_BOLD_UNDERLINE_REVERSE
3891 case XTerm_Color_BD:
3892 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893 break;
3894 case XTerm_Color_UL:
3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896 break;
3897 case XTerm_Color_RV: 3409 case XTerm_Color_RV:
3898 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);
3899 break; 3419 break;
3900 case URxvt_Color_IT: 3420 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3421 process_color_seq (op, Color_IT, str, resp);
3902 break; 3422 break;
3903#endif 3423#endif
3904#if TRANSPARENT && TINTING 3424#if ENABLE_TRANSPARENCY
3905 case URxvt_Color_tint: 3425 case URxvt_Color_tint:
3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3426 process_color_seq (op, Color_tint, str, resp);
3907 check_our_parents (); 3427 {
3908 if (am_transparent) 3428 bool changed = false;
3909 want_full_refresh = want_refresh = 1; 3429 if (ISSET_PIXCOLOR (Color_tint))
3910 break; 3430 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3911#endif 3431 else
3432 changed = bgPixmap.unset_tint ();
3433 if (changed)
3434 update_background ();
3435 }
3912 3436
3437 break;
3438#endif
3439
3440#if BG_IMAGE_FROM_FILE
3913 case XTerm_Pixmap: 3441 case Rxvt_Pixmap:
3914 if (*str != ';') 3442 if (!strcmp (str, "?"))
3915 { 3443 {
3916#if XPM_BACKGROUND 3444 char str[256];
3917 scale_pixmap (""); /* reset to default scaling */ 3445
3918 set_bgPixmap (str); /* change pixmap */ 3446 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3919#endif 3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3920 scr_touch (true); 3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3449 process_xterm_seq (XTerm_title, str, CHAR_ST);
3921 } 3450 }
3922 while ((str = strchr (str, ';')) != NULL) 3451 else
3923 { 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 {
3924 str++; 3467 str++;
3925#if XPM_BACKGROUND 3468 if (bgPixmap.set_geometry (str))
3926 changed += scale_pixmap (str); 3469 changed++;
3927#endif 3470 str = strchr (str, ';');
3471 }
3472 if (changed)
3473 update_background ();
3928 } 3474 }
3929
3930 if (changed)
3931 {
3932#ifdef XPM_BACKGROUND
3933 resize_pixmap ();
3934#endif
3935 scr_touch (true);
3936 }
3937 break; 3475 break;
3476#endif
3938 3477
3939 case XTerm_restoreFG: 3478 case Rxvt_restoreFG:
3940 set_window_color (Color_fg, str); 3479 set_window_color (Color_fg, str);
3941 break; 3480 break;
3942 case XTerm_restoreBG: 3481 case Rxvt_restoreBG:
3943 set_window_color (Color_bg, str); 3482 set_window_color (Color_bg, str);
3944 break; 3483 break;
3945 3484
3946 case XTerm_logfile: 3485 case XTerm_logfile:
3947 // TODO, when secure mode? 3486 // TODO, when secure mode?
3948 break; 3487 break;
3949 3488
3950#ifdef MENUBAR
3951 case URxvt_Menu:
3952 if (OPTION (Opt_insecure))
3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954 break;
3955#endif
3956#if 0 3489#if 0
3957 case XTerm_dumpscreen: /* no error notices */ 3490 case Rxvt_dumpscreen: /* no error notices */
3958 { 3491 {
3959 int fd; 3492 int fd;
3960 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)
3961 { 3494 {
3962 scr_dump (fd); 3495 scr_dump (fd);
… …
3973 case URxvt_italicFont: 3506 case URxvt_italicFont:
3974 case URxvt_boldItalicFont: 3507 case URxvt_boldItalicFont:
3975#endif 3508#endif
3976 if (query) 3509 if (query)
3977 tt_printf ("\33]%d;%-.250s%c", saveop, 3510 tt_printf ("\33]%d;%-.250s%c", saveop,
3978 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3511 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3979 ? fontset[op - URxvt_font]->fontdesc : "", 3512 ? fontset[op - URxvt_font]->fontdesc : "",
3980 resp); 3513 resp);
3981 else 3514 else
3982 { 3515 {
3983 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3516 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3986 allocated.push_back ((void *)res); 3519 allocated.push_back ((void *)res);
3987 set_fonts (); 3520 set_fonts ();
3988 } 3521 }
3989 break; 3522 break;
3990 3523
3991#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
3992 case URxvt_locale: 3533 case URxvt_locale:
3993 if (query) 3534 if (query)
3994 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);
3995 else 3536 else
3996 { 3537 {
3997 set_locale (str); 3538 set_locale (str);
3998 pty.set_utf8_mode (enc_utf8); 3539 pty->set_utf8_mode (enc_utf8);
3999 init_xlocale (); 3540 init_xlocale ();
4000 } 3541 }
4001 break; 3542 break;
4002 3543
4003 case URxvt_view_up: 3544 case URxvt_view_up:
… …
4014 break; 3555 break;
4015#endif 3556#endif
4016 3557
4017#if ENABLE_PERL 3558#if ENABLE_PERL
4018 case URxvt_perl: 3559 case URxvt_perl:
4019 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)))
4020 ; // no responses yet 3561 ; // no responses yet
4021 break; 3562 break;
4022#endif 3563#endif
4023 } 3564 }
4024} 3565}
… …
4056 return state; 3597 return state;
4057} 3598}
4058 3599
4059/* we're not using priv _yet_ */ 3600/* we're not using priv _yet_ */
4060void 3601void
4061rxvt_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)
4062{ 3603{
4063 unsigned int i, j; 3604 unsigned int i, j;
4064 int state; 3605 int state;
4065 3606
4066 static const struct 3607 static const struct
4067 { 3608 {
4068 const int argval; 3609 const int argval;
4069 const unsigned long bit; 3610 const unsigned long bit;
4070 }
4071
4072 argtopriv[] = { 3611 } argtopriv[] = {
4073 { 1, PrivMode_aplCUR }, 3612 { 1, PrivMode_aplCUR },
4074 { 2, PrivMode_vt52 }, 3613 { 2, PrivMode_vt52 },
4075 { 3, PrivMode_132 }, 3614 { 3, PrivMode_132 },
4076 { 4, PrivMode_smoothScroll }, 3615 { 4, PrivMode_smoothScroll },
4077 { 5, PrivMode_rVideo }, 3616 { 5, PrivMode_rVideo },
4078 { 6, PrivMode_relOrigin }, 3617 { 6, PrivMode_relOrigin },
4079 { 7, PrivMode_Autowrap }, 3618 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode 3619 // 8, bi-directional support mode
4081 { 9, PrivMode_MouseX10 }, 3620 { 9, PrivMode_MouseX10 },
4082#ifdef menuBar_esc
4083 { menuBar_esc, PrivMode_menuBar },
4084#endif
4085 // 18, 19 printing-related 3621 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor }, 3622 { 25, PrivMode_VisibleCursor },
4087#ifdef scrollBar_esc 3623#ifdef scrollBar_esc
4088 { scrollBar_esc, PrivMode_scrollBar }, 3624 { scrollBar_esc, PrivMode_scrollBar },
4089#endif 3625#endif
… …
4097#ifndef NO_BACKSPACE_KEY 3633#ifndef NO_BACKSPACE_KEY
4098 { 67, PrivMode_BackSpace }, 3634 { 67, PrivMode_BackSpace },
4099#endif 3635#endif
4100 { 1000, PrivMode_MouseX11 }, 3636 { 1000, PrivMode_MouseX11 },
4101 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3637 // 1001 Use Hilite Mouse Tracking. NYI, TODO
4102 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3638 { 1002, PrivMode_MouseBtnEvent },
4103 // 1003 Use All Motion Mouse Tracking. NYI, TODO 3639 { 1003, PrivMode_MouseAnyEvent },
4104 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3640 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4105 { 1011, PrivMode_Keypress }, // rxvt extension 3641 { 1011, PrivMode_Keypress }, // rxvt extension
4106 // 1035 enable modifiers for alt, numlock NYI 3642 // 1035 enable modifiers for alt, numlock NYI
4107 // 1036 send ESC for meta keys NYI 3643 // 1036 send ESC for meta keys NYI
4108 // 1037 send DEL for keypad delete NYI 3644 // 1037 send DEL for keypad delete NYI
… …
4136 /* extra handling for values with state unkept */ 3672 /* extra handling for values with state unkept */
4137 switch (arg[i]) 3673 switch (arg[i])
4138 { 3674 {
4139#if ENABLE_STYLES 3675#if ENABLE_STYLES
4140 case 1021: 3676 case 1021:
4141 if (mode) 3677 set_option (Opt_intensityStyles, mode);
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145 3678
4146 scr_touch (true); 3679 scr_touch (true);
4147 break; 3680 break;
4148#endif 3681#endif
4149 case 1048: /* alternative cursor save */ 3682 case 1048: /* alternative cursor save */
4150 case 1049: 3683 case 1049:
4151 if (OPTION (Opt_secondaryScreen)) 3684 if (option (Opt_secondaryScreen))
4152 if (mode == 0) 3685 if (mode == 0)
4153 scr_cursor (RESTORE); 3686 scr_cursor (RESTORE);
4154 else if (mode == 1) 3687 else if (mode == 1)
4155 scr_cursor (SAVE); 3688 scr_cursor (SAVE);
4156 break; 3689 break;
… …
4171 case 3: /* 80/132 */ 3704 case 3: /* 80/132 */
4172 if (priv_modes & PrivMode_132OK) 3705 if (priv_modes & PrivMode_132OK)
4173 set_widthheight (((state ? 132 : 80) * fwidth), height); 3706 set_widthheight (((state ? 132 : 80) * fwidth), height);
4174 break; 3707 break;
4175 case 4: /* smooth scrolling */ 3708 case 4: /* smooth scrolling */
4176 if (!state) 3709 set_option (Opt_jumpScroll, !state);
4177 SET_OPTION (Opt_jumpScroll);
4178 else
4179 CLR_OPTION (Opt_jumpScroll);
4180 break; 3710 break;
4181 case 5: /* reverse video */ 3711 case 5: /* reverse video */
4182 scr_rvideo_mode (state); 3712 scr_rvideo_mode (state);
4183 break; 3713 break;
4184 case 6: /* relative/absolute origins */ 3714 case 6: /* relative/absolute origins */
… …
4188 scr_autowrap (state); 3718 scr_autowrap (state);
4189 break; 3719 break;
4190 /* 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 */
4191 case 9: /* X10 mouse reporting */ 3721 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 3722 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 3723 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4194 break; 3724 break;
4195#ifdef menuBar_esc
4196 case menuBar_esc:
4197#ifdef MENUBAR
4198 map_menuBar (state);
4199#endif
4200 break;
4201#endif
4202#ifdef scrollBar_esc 3725#ifdef scrollBar_esc
4203 case scrollBar_esc: 3726 case scrollBar_esc:
4204 if (scrollbar_mapping (state)) 3727 if (scrollbar_mapping (state))
4205 { 3728 {
4206 resize_all_windows (0, 0, 0); 3729 resize_all_windows (0, 0, 0);
… …
4218 break; 3741 break;
4219 /* case 66: - application key pad */ 3742 /* case 66: - application key pad */
4220 /* case 67: - backspace key */ 3743 /* case 67: - backspace key */
4221 case 1000: /* X11 mouse reporting */ 3744 case 1000: /* X11 mouse reporting */
4222 if (state) /* orthogonal */ 3745 if (state) /* orthogonal */
4223 priv_modes &= ~PrivMode_MouseX10; 3746 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4224 break; 3747 break;
4225#if 0 3748#if 0
4226 case 1001: 3749 case 1001:
4227 break; /* X11 mouse highlighting */ 3750 break; /* X11 mouse highlighting */
4228#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;
4229 case 1010: /* scroll to bottom on TTY output inhibit */ 3762 case 1010: /* scroll to bottom on TTY output inhibit */
4230 if (!state) 3763 set_option (Opt_scrollTtyOutput, !state);
4231 SET_OPTION (Opt_scrollTtyOutput);
4232 else
4233 CLR_OPTION (Opt_scrollTtyOutput);
4234 break; 3764 break;
4235 case 1011: /* scroll to bottom on key press */ 3765 case 1011: /* scroll to bottom on key press */
4236 if (state) 3766 set_option (Opt_scrollTtyKeypress, state);
4237 SET_OPTION (Opt_scrollTtyKeypress);
4238 else
4239 CLR_OPTION (Opt_scrollTtyKeypress);
4240 break; 3767 break;
4241 case 1047: /* secondary screen w/ clearing last */ 3768 case 1047: /* secondary screen w/ clearing last */
4242 if (OPTION (Opt_secondaryScreen)) 3769 if (option (Opt_secondaryScreen))
4243 if (current_screen != PRIMARY) 3770 if (current_screen != PRIMARY)
4244 scr_erase_screen (2); 3771 scr_erase_screen (2);
4245 scr_change_screen (state); 3772 scr_change_screen (state);
4246 break; 3773 break;
4247 case 1049: /* secondary screen w/ clearing first */ 3774 case 1049: /* secondary screen w/ clearing first */
4248 scr_change_screen (state); 3775 scr_change_screen (state);
4249 if (OPTION (Opt_secondaryScreen)) 3776 if (option (Opt_secondaryScreen))
4250 if (current_screen != PRIMARY) 3777 if (current_screen != PRIMARY)
4251 scr_erase_screen (2); 3778 scr_erase_screen (2);
4252 break; 3779 break;
4253 default: 3780 default:
4254 break; 3781 break;
… …
4382 scr_color (Color_bg, Color_bg); 3909 scr_color (Color_bg, Color_bg);
4383 break; 3910 break;
4384 3911
4385 //case 50: // not variable spacing 3912 //case 50: // not variable spacing
4386 3913
4387#if ENABLE_FRILLS 3914#if !ENABLE_MINIMAL
4388 case 90: 3915 case 90:
4389 case 91: /* set bright fg color */ 3916 case 91: /* set bright fg color */
4390 case 92: 3917 case 92:
4391 case 93: 3918 case 93:
4392 case 94: 3919 case 94:
… …
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455 3982
4456void 3983void
4457rxvt_term::tt_write (const char *data, unsigned int len) 3984rxvt_term::tt_write (const char *data, unsigned int len)
4458{ 3985{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
3987 return;
3988
3989 if (pty->pty < 0)
3990 return;
3991
4459 if (v_buflen == 0) 3992 if (v_buflen == 0)
4460 { 3993 {
4461 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));
4462 3995
4463 if ((unsigned int)written == len) 3996 if ((unsigned int)written == len)
4464 return; 3997 return;
4465 3998
4466 data += written; 3999 data += written;
… …
4470 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4471 4004
4472 memcpy (v_buffer + v_buflen, data, len); 4005 memcpy (v_buffer + v_buflen, data, len);
4473 v_buflen += len; 4006 v_buflen += len;
4474 4007
4475 pty_ev.set (EVENT_READ | EVENT_WRITE); 4008 pty_ev.set (ev::READ | ev::WRITE);
4476} 4009}
4477 4010
4478void rxvt_term::pty_write () 4011void rxvt_term::pty_write ()
4479{ 4012{
4480 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));
4481 4014
4482 if (written > 0) 4015 if (written > 0)
4483 { 4016 {
4484 v_buflen -= written; 4017 v_buflen -= written;
4485 4018
4486 if (v_buflen == 0) 4019 if (v_buflen == 0)
4487 { 4020 {
4488 free (v_buffer); 4021 free (v_buffer);
4489 v_buffer = 0; 4022 v_buffer = 0;
4490 v_buflen = 0;
4491 4023
4492 pty_ev.set (EVENT_READ); 4024 pty_ev.set (ev::READ);
4493 return; 4025 return;
4494 } 4026 }
4495 4027
4496 memmove (v_buffer, v_buffer + written, v_buflen); 4028 memmove (v_buffer, v_buffer + written, v_buflen);
4497 } 4029 }
4498 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4030 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4499 pty_ev.set (EVENT_READ); 4031 pty_ev.set (ev::READ);
4500} 4032}
4501 4033
4502/*----------------------- end-of-file (C source) -----------------------*/ 4034/*----------------------- end-of-file (C source) -----------------------*/
4503 4035

Diff Legend

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