ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC vs.
Revision 1.382 by root, Fri Dec 14 06:04:56 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 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;
554#ifdef XK_KP_Home
555 static const KeySym keypadtrans[] = {
556 XK_KP_7, // XK_KP_Home
557 XK_KP_4, // XK_KP_Left
558 XK_KP_8, // XK_KP_Up
559 XK_KP_6, // XK_KP_Right
560 XK_KP_2, // XK_KP_Down
561#ifndef UNSHIFTED_SCROLLKEYS
562 XK_KP_9, // XK_KP_Prior
563 XK_KP_3, // XK_KP_Next
564#else
565 XK_Prior,
566 XK_Next,
567#endif
568 XK_KP_1, // XK_KP_End
569 XK_KP_5, // XK_KP_Begin
570 };
571
572 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
573 {
574 unsigned int index = keysym - XK_KP_Home;
575 keysym = kp ? keypadtrans[index] : XK_Home + index;
576 }
577 else if (keysym == XK_KP_Insert)
578 keysym = kp ? XK_KP_0 : XK_Insert;
579#ifndef NO_DELETE_KEY
580 else if (keysym == XK_KP_Delete)
581 keysym = kp ? XK_KP_Decimal : XK_Delete;
582#endif
583#endif
542 switch (keysym) 584 switch (keysym)
543 { 585 {
544#ifndef NO_BACKSPACE_KEY 586#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 587 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 588 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 590 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 591 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 592 kbuf[1] = '\0';
551 } 593 }
552 else 594 else
553 strcpy (kbuf, key_backspace); 595 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 596 break;
555#endif 597#endif
556#ifndef NO_DELETE_KEY 598#ifndef NO_DELETE_KEY
557# ifdef XK_KP_Prior
558 case XK_KP_Delete:
559 /* allow shift to override */
560 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
561 {
562 strcpy (kbuf, "\033On");
563 break;
564 }
565 /* FALLTHROUGH */
566# endif
567 case XK_Delete: 599 case XK_Delete:
568 strcpy (kbuf, key_delete); 600 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 601 break;
570#endif 602#endif
571 case XK_Tab: 603 case XK_Tab:
572 if (shft) 604 if (shft)
573 strcpy (kbuf, "\033[Z"); 605 strcpy (kbuf, "\033[Z");
… …
583#endif 615#endif
584 newlen = 0; 616 newlen = 0;
585 } 617 }
586 break; 618 break;
587 619
588#ifdef XK_KP_Left
589 case XK_KP_Up: /* \033Ox or standard */
590 case XK_KP_Down: /* \033Or or standard */
591 case XK_KP_Right: /* \033Ov or standard */
592 case XK_KP_Left: /* \033Ot or standard */
593 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
594 {
595 strcpy (kbuf, "\033OZ");
596 kbuf[2] = "txvr"[keysym - XK_KP_Left];
597 break;
598 }
599 else
600 /* translate to std. cursor key */
601 keysym = XK_Left + (keysym - XK_KP_Left);
602 /* FALLTHROUGH */
603#endif
604 case XK_Up: /* "\033[A" */ 620 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 621 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 622 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 623 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 624 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 634 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 635 kbuf[1] = 'O';
620 break; 636 break;
621 637
622#ifndef UNSHIFTED_SCROLLKEYS 638#ifndef UNSHIFTED_SCROLLKEYS
623# ifdef XK_KP_Prior
624 case XK_KP_Prior:
625 /* allow shift to override */
626 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
627 {
628 strcpy (kbuf, "\033Oy");
629 break;
630 }
631 /* FALLTHROUGH */
632# endif
633 case XK_Prior: 639 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 640 strcpy (kbuf, "\033[5~");
635 break; 641 break;
636# ifdef XK_KP_Next
637 case XK_KP_Next:
638 /* allow shift to override */
639 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
640 {
641 strcpy (kbuf, "\033Os");
642 break;
643 }
644 /* FALLTHROUGH */
645# endif
646 case XK_Next: 642 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 643 strcpy (kbuf, "\033[6~");
648 break; 644 break;
649#endif 645#endif
650 case XK_KP_Enter: 646 case XK_KP_Enter:
651 /* allow shift to override */ 647 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 648 if (kp)
653 { 649 {
654 strcpy (kbuf, "\033OM"); 650 strcpy (kbuf, "\033OM");
655 break; 651 break;
656 } 652 }
657 653
… …
669 kbuf[0] = '\015'; 665 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 666 kbuf[1] = '\0';
671 } 667 }
672 break; 668 break;
673 669
674#ifdef XK_KP_Begin
675 case XK_KP_Begin:
676 strcpy (kbuf, "\033Ou");
677 break;
678
679#endif
680 case XK_KP_F1: /* "\033OP" */ 670 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 671 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 672 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 673 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 674 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 690 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 691 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 692 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 693 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 694 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 695 if (kp)
706 { 696 {
707 strcpy (kbuf, "\033Oj"); 697 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 698 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 699 }
710 else 700 else
… …
716 706
717 case XK_Find: 707 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 708 strcpy (kbuf, "\033[1~");
719 break; 709 break;
720 710
721#ifdef XK_KP_End
722 case XK_KP_Insert:
723 /* allow shift to override */
724 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
725 {
726 strcpy (kbuf, "\033Op");
727 break;
728 }
729 /* FALLTHROUGH */
730#endif
731 case XK_Insert: 711 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 712 strcpy (kbuf, "\033[2~");
733 break; 713 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 714#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 715 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 719 strcpy (kbuf, "\033[3~");
740 break; 720 break;
741 case XK_Select: 721 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 722 strcpy (kbuf, "\033[4~");
743 break; 723 break;
744#ifdef XK_KP_End
745 case XK_KP_End:
746 /* allow shift to override */
747 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
748 {
749 strcpy (kbuf, "\033Oq");
750 break;
751 }
752 /* FALLTHROUGH */
753#endif
754 case XK_End: 724 case XK_End:
755 strcpy (kbuf, KS_END); 725 strcpy (kbuf, KS_END);
756 break; 726 break;
757#ifdef XK_KP_Home
758 case XK_KP_Home:
759 /* allow shift to override */
760 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
761 {
762 strcpy (kbuf, "\033Ow");
763 break;
764 }
765 /* FALLTHROUGH */
766#endif
767 case XK_Home: 727 case XK_Home:
768 strcpy (kbuf, KS_HOME); 728 strcpy (kbuf, KS_HOME);
769 break; 729 break;
770 730
771#define FKEY(n, fkey) \ 731#define FKEY(n, fkey) \
… …
873 return; 833 return;
874 834
875 if (len <= 0) 835 if (len <= 0)
876 return; /* not mapped */ 836 return; /* not mapped */
877 837
878 if (OPTION (Opt_scrollTtyKeypress)) 838 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 839 if (view_start)
880 { 840 {
881 view_start = 0; 841 view_start = 0;
882 want_refresh = 1; 842 want_refresh = 1;
883 } 843 }
… …
905 { 865 {
906 const char ch = C0_ESC; 866 const char ch = C0_ESC;
907 tt_write (&ch, 1); 867 tt_write (&ch, 1);
908 } 868 }
909 869
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 870 tt_write (kbuf, (unsigned int)len);
921} 871}
922/*}}} */
923 872
873void
874rxvt_term::key_release (XKeyEvent &ev)
875{
876#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
877 KeySym keysym;
878
879 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
880#endif
881
882#if ENABLE_FRILLS || ISO_14755
883 // ISO 14755 support
884 if (iso14755buf)
885 if (iso14755buf & ISO_14755_52)
886 {
887# if ISO_14755
888 scr_overlay_off ();
889# endif
890# if ISO_14755
891 // iso14755 part 5.2 handling: release time
892 // first: controls
893 if ((ev.state & ControlMask)
894 && ((keysym >= 0x40 && keysym <= 0x5f)
895 || (keysym >= 0x61 && keysym <= 0x7f)))
896 {
897 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
898 commit_iso14755 ();
899
900 return;
901 }
902
903 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
904 if (i[0] == keysym)
905 {
906 iso14755buf = ISO_14755_51 | i[1];
907 commit_iso14755 ();
908
909 return;
910 }
911
912 scr_bell ();
913# endif
914 iso14755buf = 0;
915
916 return;
917 }
918 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
919 {
920# if ISO_14755
921 scr_overlay_off ();
922# endif
923 if (iso14755buf & ISO_14755_51)
924 commit_iso14755 ();
925#if ISO_14755
926 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
927 {
928 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
929
930 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
931 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
932 }
933# endif
934 else
935 iso14755buf = 0;
936 }
937#endif
938
939 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
940 return;
941
942#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
943 if (!(ev.state & ControlMask))
944 slip_wheel_ev.stop ();
945 else if (keysym == XK_Control_L || keysym == XK_Control_R)
946 mouse_slip_wheel_speed = 0;
947#endif
948}
949
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 950#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 951unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 952rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 953{
930 unsigned int n, s; 954 unsigned int n, s;
931 955
… …
959void 983void
960rxvt_term::flush () 984rxvt_term::flush ()
961{ 985{
962 flush_ev.stop (); 986 flush_ev.stop ();
963 987
964#ifdef TRANSPARENT 988#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 989 if (bgPixmap.check_clearChanged ())
966 { 990 {
967 want_full_refresh = 0; 991// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 992 scr_touch (false);
970 } 993 }
971#endif 994#endif
972 995
973 if (want_refresh) 996 if (want_refresh)
974 { 997 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 998 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 999 {
977 int row = -view_start; 1000 int row = view_start;
978 int end_row = row + nrow; 1001 int end_row = row + nrow;
979 1002
980 while (row > -nsaved && ROW (row - 1).is_longer ()) 1003 while (row > top_row && ROW (row - 1).is_longer ())
981 --row; 1004 --row;
982 1005
983 do 1006 do
984 { 1007 {
985 int start_row = row; 1008 int start_row = row;
… …
1008 while (l->is_longer () && row < end_row); 1031 while (l->is_longer () && row < end_row);
1009 } 1032 }
1010 while (row < end_row); 1033 while (row < end_row);
1011 } 1034 }
1012 1035
1013 scr_refresh (refresh_type); 1036 scr_refresh ();
1014 scrollbar_show (1); 1037 scrollbar_show (1);
1015#ifdef USE_XIM 1038#ifdef USE_XIM
1016 IMSendSpot (); 1039 IMSendSpot ();
1017#endif 1040#endif
1018 } 1041 }
1019 1042
1020 display->flush (); 1043 display->flush ();
1021} 1044}
1022 1045
1046/* checks wether a refresh is requested and starts the refresh timer */
1023void 1047void
1024rxvt_term::check_cb (check_watcher &w) 1048rxvt_term::refresh_check ()
1025{ 1049{
1026 SET_R (this); 1050 if (want_refresh && !flush_ev.is_active ())
1027 SET_LOCALE (locale); 1051 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1028 1052
1029 display->flush (); 1053 display->flush ();
1030
1031 if (want_refresh && !flush_ev.active)
1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1033} 1054}
1034 1055
1035void 1056void
1036rxvt_term::flush_cb (time_watcher &w) 1057rxvt_term::flush_cb (ev::timer &w, int revents)
1037{ 1058{
1038 SET_R (this); 1059 make_current ();
1039 SET_LOCALE (locale);
1040 1060
1041 refresh_limit = 1;
1042 refresh_count = 0; 1061 refresh_count = 0;
1043 flush (); 1062 flush ();
1044} 1063}
1045 1064
1046#ifdef CURSOR_BLINK 1065#ifdef CURSOR_BLINK
1047void 1066void
1048rxvt_term::cursor_blink_cb (time_watcher &w) 1067rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1049{ 1068{
1050 hidden_cursor = !hidden_cursor; 1069 hidden_cursor = !hidden_cursor;
1051 want_refresh = 1; 1070 want_refresh = 1;
1052 1071 refresh_check ();
1053 w.start (w.at + BLINK_INTERVAL);
1054} 1072}
1055#endif 1073#endif
1056 1074
1057#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1058void 1076void
1059rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1060{ 1078{
1061 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1062 { 1080 {
1063 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1064 want_refresh = 1; 1082 want_refresh = 1;
1065 w.start (w.at + TEXT_BLINK_INTERVAL); 1083 refresh_check ();
1066 } 1084 }
1085 else
1086 w.stop ();
1067} 1087}
1068#endif 1088#endif
1069 1089
1070#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1090#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1071void 1091void
1072rxvt_term::cont_scroll_cb (time_watcher &w) 1092rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1073{ 1093{
1074 if ((scrollbar_isUp() || scrollbar_isDn()) && 1094 if ((scrollbar_isUp () || scrollbar_isDn ())
1075 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1095 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1076 { 1096 {
1077 refresh_type |= SMOOTH_REFRESH;
1078 want_refresh = 1; 1097 want_refresh = 1;
1079 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1098 refresh_check ();
1080 } 1099 }
1100 else
1101 w.stop ();
1081} 1102}
1082#endif 1103#endif
1083 1104
1084#ifdef SELECTION_SCROLLING 1105#ifdef SELECTION_SCROLLING
1085void 1106void
1086rxvt_term::sel_scroll_cb (time_watcher &w) 1107rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1087{ 1108{
1088 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1109 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1089 { 1110 {
1090 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1111 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1091 refresh_type |= SMOOTH_REFRESH;
1092 want_refresh = 1; 1112 want_refresh = 1;
1093 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 refresh_check ();
1094 } 1114 }
1115 else
1116 w.stop ();
1095} 1117}
1096#endif 1118#endif
1097 1119
1098#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1120#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1099void 1121void
1100rxvt_term::slip_wheel_cb (time_watcher &w) 1122rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1101{ 1123{
1102 if (mouse_slip_wheel_speed == 0 1124 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1103 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1104 : scr_page (UP, mouse_slip_wheel_speed))
1105 { 1125 {
1106 if (view_start == nsaved ||
1107 view_start == 0)
1108 mouse_slip_wheel_speed = 0;
1109
1110 refresh_type |= SMOOTH_REFRESH;
1111 want_refresh = 1; 1126 want_refresh = 1;
1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1127 refresh_check ();
1128 }
1129
1130 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1113 } 1131 {
1132 mouse_slip_wheel_speed = 0;
1133 w.stop ();
1134 }
1114} 1135}
1115#endif 1136#endif
1116 1137
1117#if HAVE_SCHED_YIELD 1138#if LINUX_YIELD_HACK
1118static struct event_handler 1139static struct event_handler
1119{ 1140{
1120 check_watcher cw_yield; 1141 ev::prepare yield_ev;
1121 1142
1122 void yield (check_watcher &w) 1143 void yield_cb (ev::prepare &w, int revents)
1123 { 1144 {
1124 sched_yield (); 1145 // this should really be sched_yield(), but the linux guys thought
1146 // that giving a process calling sched_yield () less cpu time than
1147 // ones with high nice levels is a useful thing to do. It surely is is
1148 // allowed by the sus... as is returning ENOSYS.
1149
1150 struct timespec ts = { 0, 0 };
1151 nanosleep (&ts, 0);
1152
1125 w.stop (); 1153 w.stop ();
1126 } 1154 }
1127 1155
1128 event_handler () 1156 event_handler ()
1129 : cw_yield (this, &event_handler::yield) 1157 : yield_ev (this, &event_handler::yield_cb)
1130 { 1158 {
1131 } 1159 }
1132} event_handler; 1160} event_handler;
1133#endif 1161#endif
1134 1162
… …
1145 1173
1146 memmove (cmdbuf_base, cmdbuf_ptr, n); 1174 memmove (cmdbuf_base, cmdbuf_ptr, n);
1147 cmdbuf_ptr = cmdbuf_base; 1175 cmdbuf_ptr = cmdbuf_base;
1148 cmdbuf_endp = cmdbuf_ptr + n; 1176 cmdbuf_endp = cmdbuf_ptr + n;
1149 1177
1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1178 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1151 1179
1152 if (r > 0) 1180 if (r > 0)
1153 { 1181 {
1154 cmdbuf_endp += r; 1182 cmdbuf_endp += r;
1155 return true; 1183 return true;
1156 } 1184 }
1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1185 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 { 1186 {
1159#if HAVE_SCHED_YIELD 1187#if LINUX_YIELD_HACK
1160 if (display->is_local) 1188 if (display->is_local)
1161 event_handler.cw_yield.start (); 1189 event_handler.yield_ev.start ();
1162#endif 1190#endif
1163 } 1191 }
1164 else 1192 else
1165 { 1193 {
1166 pty_ev.stop (); 1194 pty_ev.stop ();
1167 1195
1168 if (!OPTION (Opt_hold)) 1196 if (!option (Opt_hold))
1169 destroy (); 1197 destroy ();
1170 } 1198 }
1171 1199
1172 return false; 1200 return false;
1173} 1201}
1174 1202
1175void 1203void
1176rxvt_term::pty_cb (io_watcher &w, short revents) 1204rxvt_term::pty_cb (ev::io &w, int revents)
1177{ 1205{
1178 SET_R (this); 1206 make_current ();
1179 SET_LOCALE (locale);
1180 1207
1181 if (revents & EVENT_READ) 1208 if (revents & ev::READ)
1182 // loop, but don't allow a single term to monopolize us 1209 // loop, but don't allow a single term to monopolize us
1183 while (pty_fill ()) 1210 while (pty_fill ())
1184 if (cmd_parse ()) 1211 if (cmd_parse ())
1185 break; 1212 break;
1186 1213
1187 if (revents & EVENT_WRITE) 1214 if (revents & ev::WRITE)
1188 pty_write (); 1215 pty_write ();
1189} 1216}
1190 1217
1191void 1218void
1192rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1193{ 1220{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1221 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1222 recolour_cursor ();
1196 1223
1197#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1225 hidden_pointer = 0;
1199 1226
1200 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1202#endif 1229#endif
1203} 1230}
1204 1231
1205#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1206void 1233void
1207rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1208{ 1235{
1209 if (!OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1210 return; 1237 return;
1211 1238
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1240 XFlush (dpy);
1214 1241
1215 hidden_pointer = 1; 1242 hidden_pointer = 1;
1216} 1243}
1217 1244
1218void 1245void
1219rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1220{ 1247{
1221 SET_R (this); 1248 make_current ();
1222 SET_LOCALE (locale);
1223 1249
1224 pointer_blank (); 1250 pointer_blank ();
1225} 1251}
1226#endif 1252#endif
1227 1253
1228void 1254void
1229rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1230{ 1256{
1231 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1232 int x, y; 1258 int x, y;
1259 int code = 32;
1233 1260
1234 x = ev.x; 1261 x = Pixel2Col (ev.x);
1235 y = ev.y; 1262 y = Pixel2Row (ev.y);
1236 pixel_position (&x, &y); 1263 if (ev.type == MotionNotify)
1264 {
1265 if (x == mouse_row && y == mouse_col)
1266 return;
1267 mouse_row = x;
1268 mouse_col = y;
1269 code += 32;
1270 }
1237 1271
1238 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1239 button_number = 3; 1273 button_number = 3;
1240 else 1274 else
1241 { 1275 {
… …
1287 x + 1, 1321 x + 1,
1288 y + 1); 1322 y + 1);
1289#endif 1323#endif
1290 1324
1291 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1292 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1293 (32 + x + 1), 1327 (32 + x + 1),
1294 (32 + y + 1)); 1328 (32 + y + 1));
1295} 1329}
1296
1297#ifdef USING_W11LIB
1298void
1299rxvt_W11_process_x_event (XEvent *ev)
1300{
1301 rxvt_t *r = rxvt_get_r ();
1302
1303 x_cb (*ev);
1304}
1305#endif
1306 1330
1307/*{{{ process an X event */ 1331/*{{{ process an X event */
1308void 1332void
1309rxvt_term::x_cb (XEvent &ev) 1333rxvt_term::x_cb (XEvent &ev)
1310{ 1334{
1311 dDisp; 1335 make_current ();
1312 1336
1313 SET_R (this); 1337 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1338
1316 if (ev.xany.window == vt 1339 if (ev.xany.window == vt
1340 && SHOULD_INVOKE (HOOK_X_EVENT)
1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1341 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1318 return; 1342 return;
1319 1343
1320 // for XQueryPointer 1344 // for XQueryPointer
1321 Window unused_root, unused_child; 1345 Window unused_root, unused_child;
… …
1323 unsigned int unused_mask; 1347 unsigned int unused_mask;
1324 1348
1325 switch (ev.type) 1349 switch (ev.type)
1326 { 1350 {
1327 case KeyPress: 1351 case KeyPress:
1328#if ISO_14755 1352 key_press (ev.xkey);
1329 if (!(iso14755buf & ISO_14755_52))
1330#endif
1331 lookup_key (ev.xkey);
1332
1333 break; 1353 break;
1334 1354
1335 case KeyRelease: 1355 case KeyRelease:
1336 { 1356 key_release (ev.xkey);
1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1338 KeySym keysym;
1339
1340 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1341#endif
1342
1343#if ENABLE_FRILLS || ISO_14755
1344 // ISO 14755 support
1345 if (iso14755buf)
1346 if (iso14755buf & ISO_14755_52)
1347 {
1348# if ENABLE_OVERLAY
1349 scr_overlay_off ();
1350# endif
1351# if ISO_14755
1352 // iso14755 part 5.2 handling: release time
1353 // first: controls
1354 if ((ev.xkey.state & ControlMask)
1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1357 {
1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1359 commit_iso14755 ();
1360 goto skip_switch;
1361 }
1362
1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1364 if (i[0] == keysym)
1365 {
1366 iso14755buf = ISO_14755_51 | i[1];
1367 commit_iso14755 ();
1368 goto skip_switch;
1369 }
1370
1371 scr_bell ();
1372# endif
1373 iso14755buf = 0;
1374 break;
1375 }
1376 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1377 {
1378# if ENABLE_OVERLAY
1379 scr_overlay_off ();
1380# endif
1381 if (iso14755buf & ISO_14755_51)
1382 commit_iso14755 ();
1383#if ISO_14755
1384 else if (iso14755buf & ISO_14755_STARTED)
1385 {
1386 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1387
1388 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1389 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1390 }
1391# endif
1392 else
1393 iso14755buf = 0;
1394 }
1395#endif
1396
1397 if (ev.xany.window == vt
1398 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1399 break;
1400
1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1402 if (!(ev.xkey.state & ControlMask))
1403 slip_wheel_ev.stop ();
1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1405 mouse_slip_wheel_speed = 0;
1406#endif
1407 break; 1357 break;
1408 }
1409 1358
1410 case ButtonPress: 1359 case ButtonPress:
1411 button_press (ev.xbutton); 1360 button_press (ev.xbutton);
1412 break; 1361 break;
1413 1362
… …
1415 button_release (ev.xbutton); 1364 button_release (ev.xbutton);
1416 break; 1365 break;
1417 1366
1418 case ClientMessage: 1367 case ClientMessage:
1419 if (ev.xclient.format == 32 1368 if (ev.xclient.format == 32
1420 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1369 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1421 { 1370 {
1371 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1372 {
1373 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1374 {
1422 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1375 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1376 {
1377 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1423 destroy (); 1378 destroy ();
1379 }
1424#if ENABLE_EWMH 1380#if ENABLE_EWMH
1425 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1381 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1426 XSendEvent (disp, ev.xclient.window = display->root, 1382 XSendEvent (dpy, ev.xclient.window = display->root,
1427 False, SubstructureRedirectMask | SubstructureNotifyMask, 1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1428 &ev); 1384 &ev);
1385#endif
1386 }
1387 }
1388#if ENABLE_XEMBED
1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1390 {
1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1429#endif 1396#endif
1430 } 1397 }
1431#if ENABLE_XEMBED
1432 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1433 {
1434 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1435 focus_in ();
1436 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1437 focus_out ();
1438 }
1439#endif
1440#ifdef OFFIX_DND
1441 /* OffiX Dnd (drag 'n' drop) protocol */
1442 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1443 && (ev.xclient.data.l[0] == DndFile
1444 || ev.xclient.data.l[0] == DndDir
1445 || ev.xclient.data.l[0] == DndLink))
1446 {
1447 /* Get Dnd data */
1448 Atom ActualType;
1449 int ActualFormat;
1450 unsigned char *data;
1451 unsigned long Size, RemainingBytes;
1452
1453 XGetWindowProperty (disp, display->root,
1454 xa[XA_DNDSELECTION],
1455 0L, 1000000L,
1456 False, AnyPropertyType,
1457 &ActualType, &ActualFormat,
1458 &Size, &RemainingBytes,
1459 &data);
1460 set_string_property (XA_CUT_BUFFER0, data);
1461 XFree (data);
1462 selection_paste (display->root, XA_CUT_BUFFER0, true);
1463 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1464 }
1465#endif /* OFFIX_DND */
1466 break;
1467
1468 case MappingNotify:
1469 XRefreshKeyboardMapping (&ev.xmapping);
1470 break; 1398 break;
1471 1399
1472 /* 1400 /*
1473 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1474 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1493 break; 1421 break;
1494 } 1422 }
1495 break; 1423 break;
1496 1424
1497 case FocusIn: 1425 case FocusIn:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1498 focus_in (); 1429 focus_in ();
1499 break; 1430 break;
1500 1431
1501 case FocusOut: 1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1502 focus_out (); 1436 focus_out ();
1503 break; 1437 break;
1504 1438
1505 case ConfigureNotify: 1439 case ConfigureNotify:
1440 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1441 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1442 szHint.width, szHint.height); */
1506 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1507 { 1444 {
1508 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1509 ; 1446 ;
1510 1447
1511 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1512 { 1449 {
1513 seen_resize = 1; 1450 seen_resize = 1;
1514 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1515 } 1452 }
1516 1453 else
1517#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1454 {
1518 if (OPTION (Opt_transparent)) 1455#ifdef HAVE_BG_PIXMAP
1519 check_our_parents (); 1456 if (bgPixmap.window_position_sensitive ())
1457 update_background ();
1520#endif 1458#endif
1459 }
1460 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1521 } 1461 }
1522 break; 1462 break;
1523 1463
1524 case PropertyNotify: 1464 case PropertyNotify:
1465 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1525 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1466 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1526 && ev.xproperty.state == PropertyNewValue) 1467 && ev.xproperty.state == PropertyNewValue)
1527 selection_property (ev.xproperty.window, ev.xproperty.atom); 1468 selection_property (ev.xproperty.window, ev.xproperty.atom);
1528 1469
1529 break; 1470 break;
1530 1471
1531 case SelectionClear: 1472 case SelectionClear:
1532 selection_clear (); 1473 selection_clear ();
… …
1542 break; 1483 break;
1543 1484
1544 case MapNotify: 1485 case MapNotify:
1545 mapped = 1; 1486 mapped = 1;
1546#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1547 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1488 text_blink_ev.start ();
1548#endif 1489#endif
1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break; 1491 break;
1551 1492
1552 case UnmapNotify: 1493 case UnmapNotify:
… …
1554#ifdef TEXT_BLINK 1495#ifdef TEXT_BLINK
1555 text_blink_ev.stop (); 1496 text_blink_ev.stop ();
1556#endif 1497#endif
1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1558 break; 1499 break;
1559
1560#ifdef TRANSPARENT
1561 case ReparentNotify:
1562 rootwin_cb (ev);
1563 break;
1564#endif /* TRANSPARENT */
1565 1500
1566 case GraphicsExpose: 1501 case GraphicsExpose:
1567 case Expose: 1502 case Expose:
1568 if (ev.xany.window == vt) 1503 if (ev.xany.window == vt)
1569 { 1504 {
1570 do 1505 do
1506 {
1571 scr_expose (ev.xexpose.x, ev.xexpose.y, 1507 scr_expose (ev.xexpose.x, ev.xexpose.y,
1572 ev.xexpose.width, ev.xexpose.height, False); 1508 ev.xexpose.width, ev.xexpose.height, False);
1509 }
1573 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1510 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1574 1511
1575 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1512 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1576 1513
1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1514 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1515 {
1578 scr_expose (ev.xexpose.x, ev.xexpose.y, 1516 scr_expose (ev.xexpose.x, ev.xexpose.y,
1579 ev.xexpose.width, ev.xexpose.height, False); 1517 ev.xexpose.width, ev.xexpose.height, False);
1518 }
1580 1519
1581 want_refresh = 1; 1520 want_refresh = 1;
1582 } 1521 }
1583 else 1522 else
1584 { 1523 {
1585 XEvent unused_event; 1524 XEvent unused_event;
1586 1525
1587 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1526 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1588 ; 1527 ;
1589 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1590 ; 1529 ;
1591 1530
1592 if (isScrollbarWindow (ev.xany.window)) 1531 if (isScrollbarWindow (ev.xany.window))
1593 { 1532 {
1594 scrollBar.setIdle (); 1533 scrollBar.setIdle ();
1595 scrollbar_show (0); 1534 scrollbar_show (0);
1596 } 1535 }
1597#ifdef MENUBAR
1598 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1599 menubar_expose ();
1600#endif
1601
1602#ifdef TRANSPARENT
1603 if (am_transparent && ev.xany.window == parent[0])
1604 XClearWindow (disp, ev.xany.window);
1605#endif
1606 } 1536 }
1607 break; 1537 break;
1608 1538
1609 case MotionNotify: 1539 case MotionNotify:
1610 printf ("motion notify\n");//D
1611#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1612 if (hidden_pointer) 1541 if (hidden_pointer)
1613 pointer_unblank (); 1542 pointer_unblank ();
1614#endif 1543#endif
1615#if MENUBAR 1544 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1616 if (isMenuBarWindow (ev.xany.window)) 1545 || priv_modes & PrivMode_MouseAnyEvent)
1617 {
1618 menubar_control (ev.xbutton); 1546 mouse_report (ev.xbutton);
1619 break;
1620 }
1621#endif
1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1547 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1623 break; 1548 break;
1624 1549
1625 if (ev.xany.window == vt) 1550 if (ev.xany.window == vt)
1626 { 1551 {
1552 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1553 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop 1554 ; // nop
1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1555 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1630 { 1556 {
1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1557 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1632 ; 1558 ;
1633 1559
1634 XQueryPointer (disp, vt, 1560 XQueryPointer (dpy, vt,
1635 &unused_root, &unused_child, 1561 &unused_root, &unused_child,
1636 &unused_root_x, &unused_root_y, 1562 &unused_root_x, &unused_root_y,
1637 &ev.xbutton.x, &ev.xbutton.y, 1563 &ev.xbutton.x, &ev.xbutton.y,
1638 &ev.xbutton.state); 1564 &ev.xbutton.state);
1639#ifdef MOUSE_THRESHOLD 1565#ifdef MOUSE_THRESHOLD
… …
1659 int dist; 1585 int dist;
1660 1586
1661 /* don't clobber the current delay if we are 1587 /* don't clobber the current delay if we are
1662 * already in the middle of scrolling. 1588 * already in the middle of scrolling.
1663 */ 1589 */
1664 if (!sel_scroll_ev.active) 1590 if (!sel_scroll_ev.is_active ())
1665 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1591 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1666 1592
1667 /* save the event params so we can highlight 1593 /* save the event params so we can highlight
1668 * the selection in the pending-scroll loop 1594 * the selection in the pending-scroll loop
1669 */ 1595 */
1670 selection_save_x = ev.xbutton.x; 1596 selection_save_x = ev.xbutton.x;
… …
1692 else 1618 else
1693 { 1619 {
1694 /* we are within the text window, so we 1620 /* we are within the text window, so we
1695 * shouldn't be scrolling 1621 * shouldn't be scrolling
1696 */ 1622 */
1697 if (sel_scroll_ev.active)
1698 sel_scroll_ev.stop(); 1623 sel_scroll_ev.stop();
1699 } 1624 }
1700#endif 1625#endif
1701#ifdef MOUSE_THRESHOLD 1626#ifdef MOUSE_THRESHOLD
1702 } 1627 }
1703#endif 1628#endif
1704 } 1629 }
1705 } 1630 }
1706 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1631 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1707 { 1632 {
1708 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1633 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1709 MotionNotify, &ev)) 1634 MotionNotify, &ev))
1710 ; 1635 ;
1711 1636
1712 XQueryPointer (disp, scrollBar.win, 1637 XQueryPointer (dpy, scrollBar.win,
1713 &unused_root, &unused_child, 1638 &unused_root, &unused_child,
1714 &unused_root_x, &unused_root_y, 1639 &unused_root_x, &unused_root_y,
1715 &ev.xbutton.x, &ev.xbutton.y, 1640 &ev.xbutton.x, &ev.xbutton.y,
1716 &unused_mask); 1641 &unused_mask);
1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1642 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1718 scrollbar_size ()); 1643 scrollbar_size ());
1719 want_refresh = 1; 1644 want_refresh = 1;
1720 refresh_limit = 0;
1721 scrollbar_show (1); 1645 scrollbar_show (1);
1722 } 1646 }
1723 break; 1647 break;
1724 } 1648 }
1725 1649
1726skip_switch: ;
1727
1728#if defined(CURSOR_BLINK) 1650#if defined(CURSOR_BLINK)
1729 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1651 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1730 { 1652 {
1731 if (hidden_cursor) 1653 if (hidden_cursor)
1732 { 1654 {
1733 hidden_cursor = 0; 1655 hidden_cursor = 0;
1734 want_refresh = 1; 1656 want_refresh = 1;
1735 } 1657 }
1736 1658
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1659 cursor_blink_ev.again ();
1738 } 1660 }
1739#endif 1661#endif
1740 1662
1741#if defined(POINTER_BLANK) 1663#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1664 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1743 { 1665 {
1744 if (ev.type == MotionNotify 1666 if (ev.type == MotionNotify
1745 || ev.type == ButtonPress 1667 || ev.type == ButtonPress
1746 || ev.type == ButtonRelease) 1668 || ev.type == ButtonRelease)
1747 if (hidden_pointer) 1669 if (hidden_pointer)
… …
1749 1671
1750 if (ev.type == KeyPress && hidden_pointer == 0) 1672 if (ev.type == KeyPress && hidden_pointer == 0)
1751 pointer_blank (); 1673 pointer_blank ();
1752 } 1674 }
1753#endif 1675#endif
1676
1677 refresh_check ();
1754} 1678}
1755 1679
1756void 1680void
1757rxvt_term::focus_in () 1681rxvt_term::focus_in ()
1758{ 1682{
1759 if (!focus) 1683 if (!focus)
1760 { 1684 {
1761 focus = 1; 1685 focus = 1;
1762 want_refresh = 1; 1686 want_refresh = 1;
1763 1687
1764 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1688 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765 1689
1766#if USE_XIM 1690#if USE_XIM
1767 if (Input_Context != NULL) 1691 if (Input_Context != NULL)
1768 { 1692 {
1769 IMSetStatusPosition (); 1693 IMSetPosition ();
1770 XSetICFocus (Input_Context); 1694 XSetICFocus (Input_Context);
1771 } 1695 }
1772#endif 1696#endif
1773#if CURSOR_BLINK 1697#if CURSOR_BLINK
1774 if (OPTION (Opt_cursorBlink)) 1698 if (option (Opt_cursorBlink))
1775 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1699 cursor_blink_ev.again ();
1776#endif 1700#endif
1777#if OFF_FOCUS_FADING 1701#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade]) 1702 if (rs[Rs_fade])
1779 { 1703 {
1780 pix_colors = pix_colors_focused; 1704 pix_colors = pix_colors_focused;
1781 scr_recolour (); 1705 scr_recolour ();
1782 } 1706 }
1783#endif 1707#endif
1708#if ENABLE_FRILLS
1709 if (option (Opt_urgentOnBell))
1710 {
1711 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1712 {
1713 h->flags &= ~XUrgencyHint;
1714 XSetWMHints (dpy, parent[0], h);
1715 }
1716 }
1717#endif
1784 } 1718 }
1785} 1719}
1786 1720
1787void 1721void
1788rxvt_term::focus_out () 1722rxvt_term::focus_out ()
… …
1796 1730
1797#if ENABLE_FRILLS || ISO_14755 1731#if ENABLE_FRILLS || ISO_14755
1798 if (iso14755buf) 1732 if (iso14755buf)
1799 { 1733 {
1800 iso14755buf = 0; 1734 iso14755buf = 0;
1801# if ENABLE_OVERLAY 1735# if ISO_14755
1802 scr_overlay_off (); 1736 scr_overlay_off ();
1803# endif 1737# endif
1804 } 1738 }
1805#endif 1739#endif
1806#if USE_XIM 1740#if USE_XIM
1807 if (Input_Context != NULL) 1741 if (Input_Context != NULL)
1808 XUnsetICFocus (Input_Context); 1742 XUnsetICFocus (Input_Context);
1809#endif 1743#endif
1810#if CURSOR_BLINK 1744#if CURSOR_BLINK
1811 if (OPTION (Opt_cursorBlink)) 1745 if (option (Opt_cursorBlink))
1812 cursor_blink_ev.stop (); 1746 cursor_blink_ev.stop ();
1747
1813 hidden_cursor = 0; 1748 hidden_cursor = 0;
1814#endif 1749#endif
1815#if OFF_FOCUS_FADING 1750#if OFF_FOCUS_FADING
1816 if (rs[Rs_fade]) 1751 if (rs[Rs_fade])
1817 { 1752 {
… …
1820 } 1755 }
1821#endif 1756#endif
1822 } 1757 }
1823} 1758}
1824 1759
1825#if TRANSPARENT 1760void
1761rxvt_term::update_fade_color (unsigned int idx)
1762{
1763#if OFF_FOCUS_FADING
1764 if (rs[Rs_fade])
1765 {
1766 rgba c;
1767 pix_colors [Color_fade].get (c);
1768 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1769 }
1770#endif
1771}
1772
1773#if ENABLE_TRANSPARENCY || ENABLE_PERL
1826void 1774void
1827rxvt_term::rootwin_cb (XEvent &ev) 1775rxvt_term::rootwin_cb (XEvent &ev)
1828{ 1776{
1829 SET_R (this); 1777 make_current ();
1830 SET_LOCALE (locale);
1831 1778
1779 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1780 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1781 return;
1782
1783# if ENABLE_TRANSPARENCY
1832 switch (ev.type) 1784 switch (ev.type)
1833 { 1785 {
1834 case PropertyNotify: 1786 case PropertyNotify:
1835 /* 1787 /*
1836 * if user used some Esetroot compatible prog to set the root bg, 1788 * if user used some Esetroot compatible prog to set the root bg,
1837 * use the property to determine the pixmap. We use it later on. 1789 * use the property to determine the pixmap. We use it later on.
1838 */ 1790 */
1839 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1791 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1792 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 return; 1793 {
1842 1794 bgPixmap.set_root_pixmap ();
1843 /* FALLTHROUGH */ 1795 update_background ();
1844 case ReparentNotify: 1796 }
1845 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1846 want_refresh = want_full_refresh = 1;
1847 break; 1797 break;
1848 } 1798 }
1799# endif
1800
1801 refresh_check ();
1849} 1802}
1850#endif 1803#endif
1851 1804
1852void 1805void
1853rxvt_term::button_press (XButtonEvent &ev) 1806rxvt_term::button_press (XButtonEvent &ev)
… …
1862 /* 1815 /*
1863 * VT window processing of button press 1816 * VT window processing of button press
1864 */ 1817 */
1865 if (ev.window == vt) 1818 if (ev.window == vt)
1866 { 1819 {
1820 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1821 return;
1822
1867#if ISO_14755 1823#if ISO_14755
1868 // 5.4 1824 // 5.4
1869 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1870 { 1826 {
1871 iso14755_54 (ev.x, ev.y); 1827 iso14755_54 (ev.x, ev.y);
… …
1905 mouse_report (ev); 1861 mouse_report (ev);
1906 } 1862 }
1907#else 1863#else
1908 MEvent.button = ev.button; 1864 MEvent.button = ev.button;
1909 mouse_report (ev); 1865 mouse_report (ev);
1910#endif /* MOUSE_REPORT_DOUBLECLICK */ 1866#endif /* MOUSE_REPORT_DOUBLECLICK */
1911 1867
1912 } 1868 }
1913 else 1869 else
1914 { 1870 {
1915 if (ev.button != MEvent.button) 1871 if (ev.button != MEvent.button)
1916 MEvent.clicks = 0; 1872 MEvent.clicks = 0;
1917 1873
1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1919 switch (ev.button) 1874 switch (ev.button)
1920 { 1875 {
1921 case Button1: 1876 case Button1:
1922 /* allow meta + click to select rectangular areas */ 1877 /* allow meta + click to select rectangular areas */
1923 /* should be done in screen.C */ 1878 /* should be done in screen.C */
1924#if ENABLE_FRILLS 1879#if ENABLE_FRILLS
1925 selection.rect = !!(ev.state & ModMetaMask); 1880 selection.rect = !!(ev.state & ModMetaMask);
1926#else 1881#else
1927 selection.rect = false; 1882 selection.rect = false;
1928#endif 1883#endif
1929 1884
1930 /* allow shift+left click to extend selection */ 1885 /* allow shift+left click to extend selection */
1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) 1886 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1932 { 1887 {
1933 if (MEvent.button == Button1 && clickintime) 1888 if (MEvent.button == Button1 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1889 selection_rotate (ev.x, ev.y);
1935 else 1890 else
1936 selection_extend (ev.x, ev.y, 1); 1891 selection_extend (ev.x, ev.y, 1);
1937 } 1892 }
1938 else 1893 else
1939 { 1894 {
1940 if (MEvent.button == Button1 && clickintime) 1895 if (MEvent.button == Button1 && clickintime)
1941 MEvent.clicks++; 1896 MEvent.clicks++;
1942 else 1897 else
1943 MEvent.clicks = 1; 1898 MEvent.clicks = 1;
1944 1899
1945 selection_click (MEvent.clicks, ev.x, ev.y); 1900 selection_click (MEvent.clicks, ev.x, ev.y);
1946 } 1901 }
1947 1902
1948 MEvent.button = Button1; 1903 MEvent.button = Button1;
1949 break; 1904 break;
1950 1905
1951 case Button3: 1906 case Button3:
1952 if (MEvent.button == Button3 && clickintime) 1907 if (MEvent.button == Button3 && clickintime)
1953 selection_rotate (ev.x, ev.y); 1908 selection_rotate (ev.x, ev.y);
1954 else 1909 else
1955 selection_extend (ev.x, ev.y, 1); 1910 selection_extend (ev.x, ev.y, 1);
1956 1911
1957 MEvent.button = Button3; 1912 MEvent.button = Button3;
1958 break; 1913 break;
1959 } 1914 }
1960 } 1915 }
1961 1916
1962 MEvent.time = ev.time; 1917 MEvent.time = ev.time;
1963 return; 1918 return;
1964 } 1919 }
1965 1920
… …
2010 tt_printf ("\033[5~"); 1965 tt_printf ("\033[5~");
2011 break; 1966 break;
2012 } 1967 }
2013 } 1968 }
2014 else 1969 else
2015#endif /* NO_SCROLLBAR_REPORT */ 1970#endif /* NO_SCROLLBAR_REPORT */
2016 1971
2017 { 1972 {
2018 char upordown = 0; 1973 char upordown = 0;
2019 1974
2020 if (scrollBar.style == R_SB_NEXT) 1975 if (scrollBar.style == R_SB_NEXT)
2021 { 1976 {
2022 if (scrollbarnext_upButton (ev.y)) 1977 if (scrollbarnext_upButton (ev.y))
2023 upordown = -1; /* up */ 1978 upordown = -1; /* up */
… …
2029 if (scrollbarrxvt_upButton (ev.y)) 1984 if (scrollbarrxvt_upButton (ev.y))
2030 upordown = -1; /* up */ 1985 upordown = -1; /* up */
2031 else if (scrollbarrxvt_dnButton (ev.y)) 1986 else if (scrollbarrxvt_dnButton (ev.y))
2032 upordown = 1; /* down */ 1987 upordown = 1; /* down */
2033 } 1988 }
1989
2034 if (upordown) 1990 if (upordown)
2035 { 1991 {
2036#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1992#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1993 if (!cont_scroll_ev.is_active ())
2037 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1994 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2038#endif 1995#endif
2039 if (scr_page (upordown < 0 ? UP : DN, 1)) 1996 if (scr_page (upordown < 0 ? UP : DN, 1))
2040 { 1997 {
2041 if (upordown < 0) 1998 if (upordown < 0)
2042 scrollBar.setUp (); 1999 scrollBar.setUp ();
… …
2104 } 2061 }
2105 } 2062 }
2106 2063
2107 return; 2064 return;
2108 } 2065 }
2109
2110#if MENUBAR
2111 /*
2112 * Menubar window processing of button press
2113 */
2114 if (isMenuBarWindow (ev.window))
2115 menubar_control (ev);
2116#endif
2117} 2066}
2118 2067
2119void 2068void
2120rxvt_term::button_release (XButtonEvent &ev) 2069rxvt_term::button_release (XButtonEvent &ev)
2121{ 2070{
… …
2127 2076
2128 if (scrollbar_isUpDn ()) 2077 if (scrollbar_isUpDn ())
2129 { 2078 {
2130 scrollBar.setIdle (); 2079 scrollBar.setIdle ();
2131 scrollbar_show (0); 2080 scrollbar_show (0);
2132#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2133 refresh_type &= ~SMOOTH_REFRESH;
2134#endif
2135 } 2081 }
2136 2082
2137#ifdef SELECTION_SCROLLING 2083#ifdef SELECTION_SCROLLING
2138 if (sel_scroll_ev.active)
2139 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
2140#endif 2085#endif
2141 2086
2142 if (ev.window == vt) 2087 if (ev.window == vt)
2143 { 2088 {
2089 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2090 return;
2091
2144#if ISO_14755 2092#if ISO_14755
2145 // 5.4 2093 // 5.4
2146 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2094 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2147 return; 2095 return;
2148#endif 2096#endif
2097
2149 if (reportmode) 2098 if (reportmode)
2150 { 2099 {
2151 /* mouse report from vt window */ 2100 /* mouse report from vt window */
2152 /* don't report release of wheel "buttons" */ 2101 /* don't report release of wheel "buttons" */
2153 if (ev.button >= 4) 2102 if (ev.button >= 4)
… …
2164 mouse_report (ev); 2113 mouse_report (ev);
2165 } 2114 }
2166#else /* MOUSE_REPORT_DOUBLECLICK */ 2115#else /* MOUSE_REPORT_DOUBLECLICK */
2167 MEvent.button = AnyButton; 2116 MEvent.button = AnyButton;
2168 mouse_report (ev); 2117 mouse_report (ev);
2169#endif /* MOUSE_REPORT_DOUBLECLICK */ 2118#endif /* MOUSE_REPORT_DOUBLECLICK */
2170 return; 2119 return;
2171 } 2120 }
2172 2121
2173 /* 2122 /*
2174 * dumb hack to compensate for the failure of click-and-drag 2123 * dumb hack to compensate for the failure of click-and-drag
… …
2177 if (priv_modes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
2178 && bypass_keystate 2127 && bypass_keystate
2179 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
2180 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
2181 2130
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2185 switch (ev.button) 2131 switch (ev.button)
2186 { 2132 {
2187 case Button1: 2133 case Button1:
2188 case Button3: 2134 case Button3:
2189 selection_make (ev.time); 2135 selection_make (ev.time);
2190 break; 2136 break;
2137
2191 case Button2: 2138 case Button2:
2192 selection_request (ev.time, ev.x, ev.y); 2139 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2140 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2193 break; 2141 break;
2142
2194#ifdef MOUSE_WHEEL 2143#ifdef MOUSE_WHEEL
2195 case Button4: 2144 case Button4:
2196 case Button5: 2145 case Button5:
2197 { 2146 {
2198 int i; 2147 int i;
… …
2200 2149
2201 v = ev.button == Button4 ? UP : DN; 2150 v = ev.button == Button4 ? UP : DN;
2202 2151
2203 if (ev.state & ShiftMask) 2152 if (ev.state & ShiftMask)
2204 i = 1; 2153 i = 1;
2205 else if (OPTION (Opt_mouseWheelScrollPage)) 2154 else if (option (Opt_mouseWheelScrollPage))
2206 i = nrow - 1; 2155 i = nrow - 1;
2207 else 2156 else
2208 i = 5; 2157 i = 5;
2209 2158
2210# ifdef MOUSE_SLIP_WHEELING 2159# ifdef MOUSE_SLIP_WHEELING
… …
2212 { 2161 {
2213 mouse_slip_wheel_speed += v ? -1 : 1; 2162 mouse_slip_wheel_speed += v ? -1 : 1;
2214 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2163 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2215 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2164 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2216 2165
2217 if (slip_wheel_ev.at < NOW) 2166 if (!slip_wheel_ev.is_active ())
2218 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2167 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2219
2220 slip_wheel_ev.start ();
2221 } 2168 }
2222 else 2169 else
2223 { 2170 {
2224# endif 2171# endif
2225 scr_page (v, i); 2172 scr_page (v, i);
… …
2230 } 2177 }
2231 break; 2178 break;
2232#endif 2179#endif
2233 } 2180 }
2234 } 2181 }
2235#ifdef MENUBAR
2236 else if (isMenuBarWindow (ev.window))
2237 menubar_control (ev);
2238#endif
2239} 2182}
2240
2241#ifdef TRANSPARENT
2242#if TINTING
2243/* taken from aterm-0.4.2 */
2244
2245typedef uint32_t RUINT32T;
2246
2247void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2248{
2249 int sh_r, sh_g, sh_b;
2250 RUINT32T mask_r, mask_g, mask_b;
2251 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2252 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2253 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2254 int i;
2255
2256 Visual *visual = display->visual;
2257
2258 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2259
2260 /* for convenience */
2261 mask_r = visual->red_mask;
2262 mask_g = visual->green_mask;
2263 mask_b = visual->blue_mask;
2264
2265 /* boring lookup table pre-initialization */
2266 switch (srcImage->bits_per_pixel) {
2267 case 15:
2268 if ((mask_r != 0x7c00) ||
2269 (mask_g != 0x03e0) ||
2270 (mask_b != 0x001f))
2271 return;
2272 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2273 lookup_r = lookup;
2274 lookup_g = lookup+32;
2275 lookup_b = lookup+32+32;
2276 sh_r = 10;
2277 sh_g = 5;
2278 sh_b = 0;
2279 break;
2280 case 16:
2281 if ((mask_r != 0xf800) ||
2282 (mask_g != 0x07e0) ||
2283 (mask_b != 0x001f))
2284 return;
2285 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2286 lookup_r = lookup;
2287 lookup_g = lookup+32;
2288 lookup_b = lookup+32+64;
2289 sh_r = 11;
2290 sh_g = 5;
2291 sh_b = 0;
2292 break;
2293 case 24:
2294 if ((mask_r != 0xff0000) ||
2295 (mask_g != 0x00ff00) ||
2296 (mask_b != 0x0000ff))
2297 return;
2298 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2299 lookup_r = lookup;
2300 lookup_g = lookup+256;
2301 lookup_b = lookup+256+256;
2302 sh_r = 16;
2303 sh_g = 8;
2304 sh_b = 0;
2305 break;
2306 case 32:
2307 if ((mask_r != 0xff0000) ||
2308 (mask_g != 0x00ff00) ||
2309 (mask_b != 0x0000ff))
2310 return;
2311 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2312 lookup_r = lookup;
2313 lookup_g = lookup+256;
2314 lookup_b = lookup+256+256;
2315 sh_r = 16;
2316 sh_g = 8;
2317 sh_b = 0;
2318 break;
2319 default:
2320 return; /* we do not support this color depth */
2321 }
2322
2323 /* prepare limits for color transformation (each channel is handled separately) */
2324 if (shade < 0) {
2325 shade = -shade;
2326 if (shade < 0) shade = 0;
2327 if (shade > 100) shade = 100;
2328
2329 lower_lim_r = 65535-rm;
2330 lower_lim_g = 65535-gm;
2331 lower_lim_b = 65535-bm;
2332
2333 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2334 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2335 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2336
2337 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2338 } else {
2339 if (shade < 0) shade = 0;
2340 if (shade > 100) shade = 100;
2341
2342 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2343
2344 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2345 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2346 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2347 }
2348
2349 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2350 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2351 {
2352 unsigned int tmp;
2353
2354 tmp = lower_lim_r;
2355 lower_lim_r = lower_lim_b;
2356 lower_lim_b = tmp;
2357
2358 tmp = upper_lim_r;
2359 upper_lim_r = upper_lim_b;
2360 upper_lim_b = tmp;
2361 }
2362
2363 /* fill our lookup tables */
2364 for (i = 0; i <= mask_r>>sh_r; i++)
2365 {
2366 RUINT32T tmp;
2367 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2368 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2369 lookup_r[i] = (tmp/65535)<<sh_r;
2370 }
2371 for (i = 0; i <= mask_g>>sh_g; i++)
2372 {
2373 RUINT32T tmp;
2374 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2375 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2376 lookup_g[i] = (tmp/65535)<<sh_g;
2377 }
2378 for (i = 0; i <= mask_b>>sh_b; i++)
2379 {
2380 RUINT32T tmp;
2381 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2382 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2383 lookup_b[i] = (tmp/65535)<<sh_b;
2384 }
2385
2386 /* apply table to input image (replacing colors by newly calculated ones) */
2387 switch (srcImage->bits_per_pixel)
2388 {
2389 case 15:
2390 {
2391 unsigned short *p1, *pf, *p, *pl;
2392 p1 = (unsigned short *) srcImage->data;
2393 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2394 while (p1 < pf)
2395 {
2396 p = p1;
2397 pl = p1 + srcImage->width;
2398 for (; p < pl; p++)
2399 {
2400 *p = lookup_r[(*p & 0x7c00)>>10] |
2401 lookup_g[(*p & 0x03e0)>> 5] |
2402 lookup_b[(*p & 0x001f)];
2403 }
2404 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2405 }
2406 break;
2407 }
2408 case 16:
2409 {
2410 unsigned short *p1, *pf, *p, *pl;
2411 p1 = (unsigned short *) srcImage->data;
2412 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2413 while (p1 < pf)
2414 {
2415 p = p1;
2416 pl = p1 + srcImage->width;
2417 for (; p < pl; p++)
2418 {
2419 *p = lookup_r[(*p & 0xf800)>>11] |
2420 lookup_g[(*p & 0x07e0)>> 5] |
2421 lookup_b[(*p & 0x001f)];
2422 }
2423 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2424 }
2425 break;
2426 }
2427 case 24:
2428 {
2429 unsigned char *p1, *pf, *p, *pl;
2430 p1 = (unsigned char *) srcImage->data;
2431 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2432 while (p1 < pf)
2433 {
2434 p = p1;
2435 pl = p1 + srcImage->width * 3;
2436 for (; p < pl; p += 3)
2437 {
2438 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2439 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2440 p[2] = lookup_r[(p[2] & 0x0000ff)];
2441 }
2442 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2443 }
2444 break;
2445 }
2446 case 32:
2447 {
2448 RUINT32T *p1, *pf, *p, *pl;
2449 p1 = (RUINT32T *) srcImage->data;
2450 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2451
2452 while (p1 < pf)
2453 {
2454 p = p1;
2455 pl = p1 + srcImage->width;
2456 for (; p < pl; p++)
2457 {
2458 *p = lookup_r[(*p & 0xff0000)>>16] |
2459 lookup_g[(*p & 0x00ff00)>> 8] |
2460 lookup_b[(*p & 0x0000ff)] |
2461 (*p & ~0xffffff);
2462 }
2463 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2464 }
2465 break;
2466 }
2467 }
2468
2469 free (lookup);
2470}
2471#endif
2472
2473/*
2474 * Check our parents are still who we think they are.
2475 * Do transparency updates if required
2476 */
2477int
2478rxvt_term::check_our_parents ()
2479{
2480 int i, pchanged, aformat, have_pixmap, rootdepth;
2481 unsigned long nitems, bytes_after;
2482 Atom atype;
2483 unsigned char *prop = NULL;
2484 Window root, oldp, *list;
2485 Pixmap rootpixmap = None;
2486 XWindowAttributes wattr, wrootattr;
2487 dDisp;
2488
2489 pchanged = 0;
2490
2491 if (!OPTION (Opt_transparent))
2492 return pchanged; /* Don't try any more */
2493
2494 XGetWindowAttributes (disp, display->root, &wrootattr);
2495 rootdepth = wrootattr.depth;
2496
2497 XGetWindowAttributes (disp, parent[0], &wattr);
2498
2499 if (rootdepth != wattr.depth)
2500 {
2501 if (am_transparent)
2502 {
2503 pchanged = 1;
2504 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2505 am_transparent = am_pixmap_trans = 0;
2506 }
2507
2508 return pchanged; /* Don't try any more */
2509 }
2510
2511 /* Get all X ops out of the queue so that our information is up-to-date. */
2512 XSync (disp, False);
2513
2514 /*
2515 * Make the frame window set by the window manager have
2516 * the root background. Some window managers put multiple nested frame
2517 * windows for each client, so we have to take care about that.
2518 */
2519 i = (xa[XA_XROOTPMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL)
2525 i = (xa[XA_ESETROOT_PMAP_ID]
2526 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2527 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2528 &nitems, &bytes_after, &prop) == Success);
2529
2530 if (!i || prop == NULL
2531#if TINTING
2532 || !rs[Rs_color + Color_tint]
2533#endif
2534 )
2535 have_pixmap = 0;
2536 else
2537 {
2538 have_pixmap = 1;
2539 rootpixmap = *(Pixmap *)prop;
2540 XFree (prop);
2541 }
2542
2543 if (have_pixmap)
2544 {
2545 /*
2546 * Copy display->root pixmap transparency
2547 */
2548 int sx, sy, nx, ny;
2549 unsigned int nw, nh;
2550 Window cr;
2551 XImage *image;
2552 GC gc;
2553 XGCValues gcvalue;
2554
2555 XTranslateCoordinates (disp, parent[0], display->root,
2556 0, 0, &sx, &sy, &cr);
2557 nw = (unsigned int)szHint.width;
2558 nh = (unsigned int)szHint.height;
2559 nx = ny = 0;
2560
2561 if (sx < 0)
2562 {
2563 nw += sx;
2564 nx = -sx;
2565 sx = 0;
2566 }
2567
2568 if (sy < 0)
2569 {
2570 nh += sy;
2571 ny = -sy;
2572 sy = 0;
2573 }
2574
2575 min_it (nw, (unsigned int) (wrootattr.width - sx));
2576 min_it (nh, (unsigned int) (wrootattr.height - sy));
2577
2578 XSync (disp, False);
2579 allowedxerror = -1;
2580 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2581
2582 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2583 /* XXX: may need a delay here? */
2584 allowedxerror = 0;
2585
2586 if (image == NULL)
2587 {
2588 if (am_transparent && am_pixmap_trans)
2589 {
2590 pchanged = 1;
2591 if (pixmap != None)
2592 {
2593 XFreePixmap (disp, pixmap);
2594 pixmap = None;
2595 }
2596 }
2597
2598 am_pixmap_trans = 0;
2599 }
2600 else
2601 {
2602 if (pixmap != None)
2603 XFreePixmap (disp, pixmap);
2604
2605#if TINTING
2606 if (ISSET_PIXCOLOR (Color_tint))
2607 {
2608 unsigned short rm, gm, bm;
2609 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2610
2611 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2612
2613 ShadeXImage (display, image, shade, rm, gm, bm);
2614 }
2615#endif
2616
2617 pixmap = XCreatePixmap (disp, vt,
2618 szHint.width, szHint.height, image->depth);
2619 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2620 XPutImage (disp, pixmap, gc, image, 0, 0,
2621 nx, ny, image->width, image->height);
2622 XFreeGC (disp, gc);
2623 XDestroyImage (image);
2624 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2625 XClearWindow (disp, parent[0]);
2626
2627 if (!am_transparent || !am_pixmap_trans)
2628 pchanged = 1;
2629
2630 am_transparent = am_pixmap_trans = 1;
2631 }
2632 }
2633
2634 if (am_pixmap_trans)
2635 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2636 else
2637 {
2638 unsigned int n;
2639 /*
2640 * InheritPixmap transparency
2641 */
2642 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2643 {
2644 oldp = parent[i];
2645 XQueryTree (disp, parent[i - 1], &root,
2646 &parent[i], &list, &n);
2647 XFree (list);
2648
2649 if (parent[i] == display->root)
2650 {
2651 if (oldp != None)
2652 pchanged = 1;
2653
2654 break;
2655 }
2656
2657 if (oldp != parent[i])
2658 pchanged = 1;
2659 }
2660
2661 n = 0;
2662
2663 if (pchanged)
2664 {
2665 for (; n < (unsigned int)i; n++)
2666 {
2667 XGetWindowAttributes (disp, parent[n], &wattr);
2668 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2669 {
2670 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2671 break;
2672 }
2673 }
2674 }
2675
2676 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2677 {
2678 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2679 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2680 am_transparent = 0;
2681 /* XXX: also turn off Opt_transparent? */
2682 }
2683 else
2684 {
2685#if WAIT_FOR_WM
2686 /* wait (an arbitrary period) for the WM to do its thing
2687 * needed for fvwm2.2.2 (and before?) */
2688 sleep (1);
2689#endif
2690 for (n = 0; n < (unsigned int)i; n++)
2691 {
2692 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2693 XClearWindow (disp, parent[n]);
2694 }
2695
2696 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2697 am_transparent = 1;
2698 }
2699
2700 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2701 parent[i] = None;
2702 }
2703
2704 if (scrollBar.win)
2705 {
2706 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2707 scrollBar.setIdle ();
2708 scrollbar_show (0);
2709 }
2710
2711 if (am_transparent)
2712 {
2713 want_refresh = want_full_refresh = 1;
2714 if (am_pixmap_trans)
2715 flush ();
2716 }
2717
2718 return pchanged;
2719}
2720#endif
2721 2183
2722/*}}} */ 2184/*}}} */
2723 2185
2724bool 2186bool
2725rxvt_term::cmd_parse () 2187rxvt_term::cmd_parse ()
… …
2774 if (ch == C0_LF) 2236 if (ch == C0_LF)
2775 nlines++; 2237 nlines++;
2776 2238
2777 refresh_count++; 2239 refresh_count++;
2778 2240
2779 if (!OPTION (Opt_jumpScroll) 2241 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2780 || (refresh_count >= refresh_limit * (nrow - 1)))
2781 { 2242 {
2782 refreshnow = true;
2783 refresh_count = 0; 2243 refresh_count = 0;
2244
2245 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2246 {
2247 refreshnow = true;
2784 ch = NOCHAR; 2248 ch = NOCHAR;
2785 break; 2249 break;
2250 }
2786 } 2251 }
2787 2252
2788 // scr_add_lines only works for nlines <= nrow - 1. 2253 // scr_add_lines only works for nlines <= nrow - 1.
2789 if (nlines >= nrow - 1) 2254 if (nlines >= nrow - 1)
2790 { 2255 {
2256 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2257 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2792 scr_add_lines (buf, str - buf, nlines); 2258 scr_add_lines (buf, str - buf, nlines);
2793 2259
2794 nlines = 0; 2260 nlines = 0;
2795 str = buf; 2261 str = buf;
2796 eol = str + min (ncol, UBUFSIZ); 2262 eol = str + min (ncol, UBUFSIZ);
… …
2811 2277
2812 seq_begin = cmdbuf_ptr; 2278 seq_begin = cmdbuf_ptr;
2813 ch = next_char (); 2279 ch = next_char ();
2814 } 2280 }
2815 2281
2282 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2283 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2817 scr_add_lines (buf, str - buf, nlines); 2284 scr_add_lines (buf, str - buf, nlines);
2818 2285
2819 /* 2286 /*
2820 * If there have been a lot of new lines, then update the screen 2287 * If there have been a lot of new lines, then update the screen
2821 * What the heck I'll cheat and only refresh less than every page-full. 2288 * What the heck we'll cheat and only refresh less than every page-full.
2822 * the number of pages between refreshes is refresh_limit, which 2289 * if skipScroll is enabled.
2823 * is incremented here because we must be doing flat-out scrolling.
2824 */ 2290 */
2825 if (refreshnow) 2291 if (refreshnow)
2826 { 2292 {
2827 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2828 refresh_limit++;
2829 else
2830 {
2831 flag = true; 2293 flag = true;
2832 scr_refresh (refresh_type); 2294 scr_refresh ();
2833 want_refresh = 1; 2295 want_refresh = 1;
2834 }
2835 } 2296 }
2836 2297
2837 } 2298 }
2838 else 2299 else
2839 { 2300 {
… …
2850 2311
2851 ch = NOCHAR; 2312 ch = NOCHAR;
2852 } 2313 }
2853 } 2314 }
2854 2315
2316 refresh_check ();
2317
2855 return flag; 2318 return flag;
2856} 2319}
2857 2320
2858// read the next character 2321// read the next character
2859wchar_t 2322wchar_t
2860rxvt_term::next_char () 2323rxvt_term::next_char () NOTHROW
2861{ 2324{
2862 while (cmdbuf_ptr < cmdbuf_endp) 2325 while (cmdbuf_ptr < cmdbuf_endp)
2863 { 2326 {
2864 // assume 7-bit to be ascii ALWAYS 2327 // assume 7-bit to be ascii ALWAYS
2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2886 return NOCHAR; 2349 return NOCHAR;
2887} 2350}
2888 2351
2889// read the next octet 2352// read the next octet
2890uint32_t 2353uint32_t
2891rxvt_term::next_octet () 2354rxvt_term::next_octet () NOTHROW
2892{ 2355{
2893 return cmdbuf_ptr < cmdbuf_endp 2356 return cmdbuf_ptr < cmdbuf_endp
2894 ? (unsigned char)*cmdbuf_ptr++ 2357 ? (unsigned char)*cmdbuf_ptr++
2895 : NOCHAR; 2358 : NOCHAR;
2896} 2359}
2360
2361static class out_of_input out_of_input;
2897 2362
2898/* rxvt_cmd_getc () - Return next input character */ 2363/* rxvt_cmd_getc () - Return next input character */
2899/* 2364/*
2900 * Return the next input character after first passing any keyboard input 2365 * Return the next input character after first passing any keyboard input
2901 * to the command. 2366 * to the command.
2902 */ 2367 */
2903wchar_t 2368wchar_t
2904rxvt_term::cmd_getc () 2369rxvt_term::cmd_getc () THROW ((class out_of_input))
2905{ 2370{
2906 wchar_t c = next_char (); 2371 wchar_t c = next_char ();
2907 2372
2908 if (c == NOCHAR) 2373 if (c == NOCHAR)
2909 throw out_of_input; 2374 throw out_of_input;
2910 2375
2911 return c; 2376 return c;
2912} 2377}
2913 2378
2914uint32_t 2379uint32_t
2915rxvt_term::cmd_get8 () 2380rxvt_term::cmd_get8 () THROW ((class out_of_input))
2916{ 2381{
2917 uint32_t c = next_octet (); 2382 uint32_t c = next_octet ();
2918 2383
2919 if (c == NOCHAR) 2384 if (c == NOCHAR)
2920 throw out_of_input; 2385 throw out_of_input;
… …
2986 { 2451 {
2987 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2988 break; /* done = 1 */ 2453 break; /* done = 1 */
2989 } 2454 }
2990 } 2455 }
2991 2456
2992 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2993 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2994 { 2459 {
2995 done = 1; 2460 done = 1;
2996 break; 2461 break;
… …
2998 } 2463 }
2999 } 2464 }
3000 2465
3001 pclose_printer (fd); 2466 pclose_printer (fd);
3002} 2467}
3003#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
3004/*}}} */ 2469/*}}} */
3005 2470
3006/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
3007enum { 2472enum {
3008 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
3058 process_dcs_seq (); 2523 process_dcs_seq ();
3059 break; 2524 break;
3060 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
3061 process_csi_seq (); 2526 process_csi_seq ();
3062 break; 2527 break;
3063 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
3064 process_osc_seq (); 2529 process_osc_seq ();
3065 break; 2530 break;
3066#endif 2531#endif
3067 } 2532 }
3068} 2533}
… …
3158 scr_charset_set (2, (unsigned int)cmd_getc ()); 2623 scr_charset_set (2, (unsigned int)cmd_getc ());
3159 break; 2624 break;
3160 case '+': 2625 case '+':
3161 scr_charset_set (3, (unsigned int)cmd_getc ()); 2626 scr_charset_set (3, (unsigned int)cmd_getc ());
3162 break; 2627 break;
3163#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3164 case '6': 2629 case '6':
3165 scr_backindex (); 2630 scr_backindex ();
3166 break; 2631 break;
3167#endif 2632#endif
3168 case '7': 2633 case '7':
3169 scr_cursor (SAVE); 2634 scr_cursor (SAVE);
3170 break; 2635 break;
3171 case '8': 2636 case '8':
3172 scr_cursor (RESTORE); 2637 scr_cursor (RESTORE);
3173 break; 2638 break;
3174#if ENABLE_FRILLS 2639#if !ENABLE_MINIMAL
3175 case '9': 2640 case '9':
3176 scr_forwardindex (); 2641 scr_forwardindex ();
3177 break; 2642 break;
3178#endif 2643#endif
3179 case '=': 2644 case '=':
… …
3294rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
3295{ 2760{
3296 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
3297 unsigned int nargs, p; 2762 unsigned int nargs, p;
3298 int n, ndef; 2763 int n, ndef;
3299 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
3300 2765
3301 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
3302 arg[--nargs] = 0;
3303 2767
3304 priv = 0; 2768 priv = 0;
3305 ch = cmd_getc (); 2769 ch = cmd_getc ();
3306 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
3307 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
3308 priv = ch; 2773 priv = ch;
3309 ch = cmd_getc (); 2774 ch = cmd_getc ();
3310 } 2775 }
3311 2776
3312 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
3341 ndef = get_byte_array_bit (csi_defaults, i); 2806 ndef = get_byte_array_bit (csi_defaults, i);
3342 for (p = 0; p < nargs; p++) 2807 for (p = 0; p < nargs; p++)
3343 if (arg[p] == -1) 2808 if (arg[p] == -1)
3344 arg[p] = ndef; 2809 arg[p] = ndef;
3345 2810
3346#ifdef DEBUG_CMD
3347 fprintf (stderr, "CSI ");
3348 for (p = 0; p < nargs; p++)
3349 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3350 fprintf (stderr, "%c\n", ch);
3351#endif
3352
3353 /* 2811 /*
3354 * private mode handling 2812 * private mode handling
3355 */ 2813 */
3356 if (priv) 2814 if (priv)
3357 { 2815 {
3358 switch (priv) 2816 switch (priv)
3359 { 2817 {
3360 case '>': 2818 case '>':
3361 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
3362 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2820 {
2821 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2822 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2823 //
2824 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2825 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2826 // versions.
2827 //
2828 tt_printf ("\033[>%d;95;0c", 'U');
2829 }
3363 break; 2830 break;
3364 case '?': 2831 case '?':
3365 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3366 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
3367 break; 2834 break;
… …
3493 break; 2960 break;
3494 case 6: /* CPR requested */ 2961 case 6: /* CPR requested */
3495 scr_report_position (); 2962 scr_report_position ();
3496 break; 2963 break;
3497 case 7: /* unofficial extension */ 2964 case 7: /* unofficial extension */
3498 if (OPTION (Opt_insecure)) 2965 if (option (Opt_insecure))
3499 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2966 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3500 break; 2967 break;
3501 case 8: /* unofficial extension */ 2968 case 8: /* unofficial extension */
3502 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2969 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3503 break; 2970 break;
… …
3570 break; 3037 break;
3571 case CSI_75: 3038 case CSI_75:
3572 scr_cursor (RESTORE); 3039 scr_cursor (RESTORE);
3573 break; 3040 break;
3574 3041
3575#if ENABLE_FRILLS 3042#if !ENABLE_MINIMAL
3576 case CSI_74: 3043 case CSI_74:
3577 process_window_ops (arg, nargs); 3044 process_window_ops (arg, nargs);
3578 break; 3045 break;
3579#endif 3046#endif
3580 3047
… …
3587 break; 3054 break;
3588 } 3055 }
3589} 3056}
3590/*}}} */ 3057/*}}} */
3591 3058
3592#if ENABLE_FRILLS 3059#if !ENABLE_MINIMAL
3593/* ARGSUSED */ 3060/* ARGSUSED */
3594void 3061void
3595rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3062rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3596{ 3063{
3597 int x, y; 3064 int x, y;
3598 XWindowAttributes wattr; 3065 XWindowAttributes wattr;
3599 Window wdummy; 3066 Window wdummy;
3600 dDisp; 3067
3068 dLocal (Display *, dpy);
3601 3069
3602 if (nargs == 0) 3070 if (nargs == 0)
3603 return; 3071 return;
3604 3072
3605 switch (args[0]) 3073 switch (args[0])
3606 { 3074 {
3607 /* 3075 /*
3608 * commands 3076 * commands
3609 */ 3077 */
3610 case 1: /* deiconify window */ 3078 case 1: /* deiconify window */
3611 XMapWindow (disp, parent[0]); 3079 XMapWindow (dpy, parent[0]);
3612 break; 3080 break;
3613 case 2: /* iconify window */ 3081 case 2: /* iconify window */
3614 XIconifyWindow (disp, parent[0], display->screen); 3082 XIconifyWindow (dpy, parent[0], display->screen);
3615 break; 3083 break;
3616 case 3: /* set position (pixels) */ 3084 case 3: /* set position (pixels) */
3617 XMoveWindow (disp, parent[0], args[1], args[2]); 3085 XMoveWindow (dpy, parent[0], args[1], args[2]);
3618 break; 3086 break;
3619 case 4: /* set size (pixels) */ 3087 case 4: /* set size (pixels) */
3620 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3621 break; 3089 break;
3622 case 5: /* raise window */ 3090 case 5: /* raise window */
3623 XRaiseWindow (disp, parent[0]); 3091 XRaiseWindow (dpy, parent[0]);
3624 break; 3092 break;
3625 case 6: /* lower window */ 3093 case 6: /* lower window */
3626 XLowerWindow (disp, parent[0]); 3094 XLowerWindow (dpy, parent[0]);
3627 break; 3095 break;
3628 case 7: /* refresh window */ 3096 case 7: /* refresh window */
3629 scr_touch (true); 3097 scr_touch (true);
3630 break; 3098 break;
3631 case 8: /* set size (chars) */ 3099 case 8: /* set size (chars) */
… …
3638 if (args[0] >= 24) /* set height (chars) */ 3106 if (args[0] >= 24) /* set height (chars) */
3639 set_widthheight ((unsigned int)width, 3107 set_widthheight ((unsigned int)width,
3640 (unsigned int) (args[1] * fheight)); 3108 (unsigned int) (args[1] * fheight));
3641 break; 3109 break;
3642 3110
3643
3644 /* 3111 /*
3645 * reports - some output format copied from XTerm 3112 * reports - some output format copied from XTerm
3646 */ 3113 */
3647 case 11: /* report window state */ 3114 case 11: /* report window state */
3648 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3649 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3650 break; 3117 break;
3651 case 13: /* report window position */ 3118 case 13: /* report window position */
3652 XGetWindowAttributes (disp, parent[0], &wattr); 3119 XGetWindowAttributes (dpy, parent[0], &wattr);
3653 XTranslateCoordinates (disp, parent[0], wattr.root, 3120 XTranslateCoordinates (dpy, parent[0], wattr.root,
3654 -wattr.border_width, -wattr.border_width, 3121 -wattr.border_width, -wattr.border_width,
3655 &x, &y, &wdummy); 3122 &x, &y, &wdummy);
3656 tt_printf ("\033[3;%d;%dt", x, y); 3123 tt_printf ("\033[3;%d;%dt", x, y);
3657 break; 3124 break;
3658 case 14: /* report window size (pixels) */ 3125 case 14: /* report window size (pixels) */
3659 XGetWindowAttributes (disp, parent[0], &wattr); 3126 XGetWindowAttributes (dpy, parent[0], &wattr);
3660 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3661 break; 3128 break;
3662 case 18: /* report text area size (chars) */ 3129 case 18: /* report text area size (chars) */
3663 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3130 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3664 break; 3131 break;
… …
3666 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3667 break; 3134 break;
3668 case 20: /* report icon label */ 3135 case 20: /* report icon label */
3669 { 3136 {
3670 char *s; 3137 char *s;
3671 XGetIconName (disp, parent[0], &s); 3138 XGetIconName (dpy, parent[0], &s);
3672 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3139 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3673 XFree (s); 3140 XFree (s);
3674 } 3141 }
3675 break; 3142 break;
3676 case 21: /* report window title */ 3143 case 21: /* report window title */
3677 { 3144 {
3678 char *s; 3145 char *s;
3679 XFetchName (disp, parent[0], &s); 3146 XFetchName (dpy, parent[0], &s);
3680 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3147 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3681 XFree (s); 3148 XFree (s);
3682 } 3149 }
3683 break; 3150 break;
3684 } 3151 }
3685} 3152}
… …
3712 seen_esc = true; 3179 seen_esc = true;
3713 continue; 3180 continue;
3714 } 3181 }
3715 else if (ch == C0_BEL || ch == CHAR_ST) 3182 else if (ch == C0_BEL || ch == CHAR_ST)
3716 break; 3183 break;
3184 else if (ch == C0_SYN)
3185 ch = cmd_get8 ();
3717 else if (ch < 0x20) 3186 else if (ch < 0x20)
3718 return NULL; /* other control character - exit */ 3187 return NULL; /* other control character - exit */
3719 3188
3720 seen_esc = false; 3189 seen_esc = false;
3721 3190
3722 if (n >= STRING_MAX - 1) 3191 if (n >= STRING_MAX - 1)
3723 // stop at some sane length 3192 // stop at some sane length
3724 return NULL; 3193 return NULL;
3725 3194
3726 if (ch == C0_SYN)
3727 string[n++] = cmd_get8 ();
3728 else
3729 string[n++] = ch; 3195 string[n++] = ch;
3730 } 3196 }
3731 3197
3732 string[n++] = '\0'; 3198 string[n++] = '\0';
3733 3199
3734 ends_how = (ch == 0x5c ? C0_ESC : ch); 3200 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3785void 3251void
3786rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3252rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3787{ 3253{
3788 if (str[0] == '?' && !str[1]) 3254 if (str[0] == '?' && !str[1])
3789 { 3255 {
3790 unsigned short r, g, b; 3256 rgba c;
3791 pix_colors_focused[color].get (display, r, g, b); 3257 pix_colors_focused[color].get (c);
3258
3259#if XFT
3260 if (c.a != rgba::MAX_CC)
3261 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3262 else
3263#endif
3792 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3264 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3793 } 3265 }
3794 else 3266 else
3795 set_window_color (color, str); 3267 set_window_color (color, str);
3796} 3268}
3797 3269
… …
3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3271 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3800 */ 3272 */
3801void 3273void
3802rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3274rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3803{ 3275{
3804 int changed = 0;
3805 int color; 3276 int color;
3806 char *buf, *name; 3277 char *buf, *name;
3807 bool query = str[0] == '?' && !str[1]; 3278 bool query = str[0] == '?' && !str[1];
3808 int saveop = op; 3279 int saveop = op;
3809 dDisp; 3280
3281 dLocal (Display *, dpy);
3810 3282
3811 assert (str != NULL); 3283 assert (str != NULL);
3284
3285 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3286 return;
3287
3812 switch (op) 3288 switch (op)
3813 { 3289 {
3814 case XTerm_name: 3290 case XTerm_name:
3815 set_title (str); 3291 set_title (str);
3816 /* FALLTHROUGH */ 3292 /* FALLTHROUGH */
… …
3830 unsigned long bytes_after; 3306 unsigned long bytes_after;
3831 unsigned char *value = 0; 3307 unsigned char *value = 0;
3832 const char *str = ""; 3308 const char *str = "";
3833 3309
3834 if (prop 3310 if (prop
3835 && XGetWindowProperty (disp, parent[0], 3311 && XGetWindowProperty (dpy, parent[0],
3836 prop, 0, 1<<16, 0, AnyPropertyType, 3312 prop, 0, 1<<16, 0, AnyPropertyType,
3837 &actual_type, &actual_format, 3313 &actual_type, &actual_format,
3838 &nitems, &bytes_after, &value) == Success 3314 &nitems, &bytes_after, &value) == Success
3839 && actual_type != None 3315 && actual_type != None
3840 && actual_format == 8) 3316 && actual_format == 8)
3841 str = (const char *)(value); 3317 str = (const char *)(value);
3842 3318
3843 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3319 tt_printf ("\033]%d;%s%c", op, str, resp);
3844 3320
3845 XFree (value); 3321 XFree (value);
3846 } 3322 }
3847 else 3323 else
3848 { 3324 {
… …
3852 { 3328 {
3853 *eq = 0; 3329 *eq = 0;
3854 set_utf8_property (display->atom (str), eq + 1); 3330 set_utf8_property (display->atom (str), eq + 1);
3855 } 3331 }
3856 else 3332 else
3857 XDeleteProperty (disp, parent[0], 3333 XDeleteProperty (dpy, parent[0],
3858 display->atom (str)); 3334 display->atom (str));
3859 } 3335 }
3860 break; 3336 break;
3861 3337
3862 case XTerm_Color: 3338 case XTerm_Color:
… …
3872 break; 3348 break;
3873 3349
3874 if ((buf = strchr (name, ';')) != NULL) 3350 if ((buf = strchr (name, ';')) != NULL)
3875 *buf++ = '\0'; 3351 *buf++ = '\0';
3876 3352
3877 if (name[0] == '?' && !name[1]) 3353 process_color_seq (op, color, name, resp);
3878 {
3879 unsigned short r, g, b;
3880 pix_colors_focused[color].get (display, r, g, b);
3881 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3882 }
3883 else
3884 set_window_color (color, name);
3885 } 3354 }
3886 break; 3355 break;
3887 case XTerm_Color00: 3356 case XTerm_Color00:
3888 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3357 process_color_seq (op, Color_fg, str, resp);
3889 break; 3358 break;
3890 case XTerm_Color01: 3359 case XTerm_Color01:
3891 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3360 process_color_seq (op, Color_bg, str, resp);
3892 break; 3361 break;
3893#ifndef NO_CURSORCOLOR 3362#ifndef NO_CURSORCOLOR
3894 case XTerm_Color_cursor: 3363 case XTerm_Color_cursor:
3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3364 process_color_seq (op, Color_cursor, str, resp);
3896 break; 3365 break;
3897#endif 3366#endif
3898 case XTerm_Color_pointer_fg: 3367 case XTerm_Color_pointer_fg:
3899 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3368 process_color_seq (op, Color_pointer_fg, str, resp);
3900 break; 3369 break;
3901 case XTerm_Color_pointer_bg: 3370 case XTerm_Color_pointer_bg:
3902 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3371 process_color_seq (op, Color_pointer_bg, str, resp);
3903 break; 3372 break;
3904#ifndef NO_BOLD_UNDERLINE_REVERSE 3373#ifndef NO_BOLD_UNDERLINE_REVERSE
3905 case XTerm_Color_RV: 3374 case XTerm_Color_RV:
3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3375 process_color_seq (op, Color_RV, str, resp);
3907 break; 3376 break;
3908 case Rxvt_Color_BD: 3377 case Rxvt_Color_BD:
3909 case URxvt_Color_BD: 3378 case URxvt_Color_BD:
3910 process_color_seq (op, Color_BD, str, resp); 3379 process_color_seq (op, Color_BD, str, resp);
3911 break; 3380 break;
3912 case Rxvt_Color_UL: 3381 case Rxvt_Color_UL:
3913 case URxvt_Color_UL: 3382 case URxvt_Color_UL:
3914 process_color_seq (op, Color_UL, str, resp); 3383 process_color_seq (op, Color_UL, str, resp);
3915 break; 3384 break;
3916 case URxvt_Color_IT: 3385 case URxvt_Color_IT:
3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3386 process_color_seq (op, Color_IT, str, resp);
3918 break; 3387 break;
3919#endif 3388#endif
3920#if TRANSPARENT && TINTING 3389#if ENABLE_TRANSPARENCY
3921 case URxvt_Color_tint: 3390 case URxvt_Color_tint:
3922 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3391 process_color_seq (op, Color_tint, str, resp);
3923 check_our_parents (); 3392 {
3924 if (am_transparent) 3393 bool changed = false;
3925 want_full_refresh = want_refresh = 1; 3394 if (ISSET_PIXCOLOR (Color_tint))
3926 break; 3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3927#endif 3396 else
3397 changed = bgPixmap.unset_tint ();
3398 if (changed)
3399 update_background ();
3400 }
3928 3401
3402 break;
3403#endif
3404
3405#if BG_IMAGE_FROM_FILE
3929 case Rxvt_Pixmap: 3406 case Rxvt_Pixmap:
3930 if (*str != ';') 3407 if (!strcmp (str, "?"))
3931 { 3408 {
3932#if XPM_BACKGROUND 3409 char str[256];
3933 scale_pixmap (""); /* reset to default scaling */ 3410
3934 set_bgPixmap (str); /* change pixmap */ 3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3935 scr_touch (true); 3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3936#endif 3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST);
3937 } 3415 }
3938 3416 else
3939 while ((str = strchr (str, ';')) != NULL)
3940 { 3417 {
3418 int changed = 0;
3419
3420 if (*str != ';')
3421 {
3422 /* reset to default scaling :*/
3423 bgPixmap.unset_geometry ();
3424 if (bgPixmap.set_file (str)) /* change pixmap */
3425 changed++;
3426 str = strchr (str, ';');
3427 if (str == NULL)
3428 bgPixmap.set_defaultGeometry ();
3429 }
3430 while (str)
3431 {
3941 str++; 3432 str++;
3942#if XPM_BACKGROUND 3433 if (bgPixmap.set_geometry (str))
3943 changed += scale_pixmap (str); 3434 changed++;
3944#endif 3435 str = strchr (str, ';');
3436 }
3437 if (changed)
3438 update_background ();
3945 } 3439 }
3946
3947 if (changed)
3948 {
3949#ifdef XPM_BACKGROUND
3950 resize_pixmap ();
3951 scr_touch (true);
3952#endif
3953 }
3954 break; 3440 break;
3441#endif
3955 3442
3956 case Rxvt_restoreFG: 3443 case Rxvt_restoreFG:
3957 set_window_color (Color_fg, str); 3444 set_window_color (Color_fg, str);
3958 break; 3445 break;
3959 case Rxvt_restoreBG: 3446 case Rxvt_restoreBG:
… …
3962 3449
3963 case XTerm_logfile: 3450 case XTerm_logfile:
3964 // TODO, when secure mode? 3451 // TODO, when secure mode?
3965 break; 3452 break;
3966 3453
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0 3454#if 0
3974 case Rxvt_dumpscreen: /* no error notices */ 3455 case Rxvt_dumpscreen: /* no error notices */
3975 { 3456 {
3976 int fd; 3457 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3458 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
… …
3990 case URxvt_italicFont: 3471 case URxvt_italicFont:
3991 case URxvt_boldItalicFont: 3472 case URxvt_boldItalicFont:
3992#endif 3473#endif
3993 if (query) 3474 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", saveop, 3475 tt_printf ("\33]%d;%-.250s%c", saveop,
3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3476 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3996 ? fontset[op - URxvt_font]->fontdesc : "", 3477 ? fontset[op - URxvt_font]->fontdesc : "",
3997 resp); 3478 resp);
3998 else 3479 else
3999 { 3480 {
4000 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3481 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4003 allocated.push_back ((void *)res); 3484 allocated.push_back ((void *)res);
4004 set_fonts (); 3485 set_fonts ();
4005 } 3486 }
4006 break; 3487 break;
4007 3488
4008#if ENABLE_FRILLS 3489 case URxvt_version:
3490 if (query)
3491 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3492 op,
3493 rs[Rs_name], VERSION[0], VERSION[2],
3494 resp);
3495 break;
3496
3497#if !ENABLE_MINIMAL
4009 case URxvt_locale: 3498 case URxvt_locale:
4010 if (query) 3499 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3500 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4012 else 3501 else
4013 { 3502 {
4014 set_locale (str); 3503 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8); 3504 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale (); 3505 init_xlocale ();
4017 } 3506 }
4018 break; 3507 break;
4019 3508
4020 case URxvt_view_up: 3509 case URxvt_view_up:
… …
4031 break; 3520 break;
4032#endif 3521#endif
4033 3522
4034#if ENABLE_PERL 3523#if ENABLE_PERL
4035 case URxvt_perl: 3524 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3525 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet 3526 ; // no responses yet
4038 break; 3527 break;
4039#endif 3528#endif
4040 } 3529 }
4041} 3530}
… …
4073 return state; 3562 return state;
4074} 3563}
4075 3564
4076/* we're not using priv _yet_ */ 3565/* we're not using priv _yet_ */
4077void 3566void
4078rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3567rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4079{ 3568{
4080 unsigned int i, j; 3569 unsigned int i, j;
4081 int state; 3570 int state;
4082 3571
4083 static const struct 3572 static const struct
4084 { 3573 {
4085 const int argval; 3574 const int argval;
4086 const unsigned long bit; 3575 const unsigned long bit;
4087 }
4088
4089 argtopriv[] = { 3576 } argtopriv[] = {
4090 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
4091 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
4092 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
4093 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
4094 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 3582 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 3583 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 3584 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 3585 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 3586 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 3587 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 3588#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 3589 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 3590#endif
… …
4113 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
4114#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
4115 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
4116#endif 3600#endif
4117 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
4118 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
4119 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
4120 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4121 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4122 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
4123 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
4124 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
4125 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
4160 scr_touch (true); 3643 scr_touch (true);
4161 break; 3644 break;
4162#endif 3645#endif
4163 case 1048: /* alternative cursor save */ 3646 case 1048: /* alternative cursor save */
4164 case 1049: 3647 case 1049:
4165 if (OPTION (Opt_secondaryScreen)) 3648 if (option (Opt_secondaryScreen))
4166 if (mode == 0) 3649 if (mode == 0)
4167 scr_cursor (RESTORE); 3650 scr_cursor (RESTORE);
4168 else if (mode == 1) 3651 else if (mode == 1)
4169 scr_cursor (SAVE); 3652 scr_cursor (SAVE);
4170 break; 3653 break;
… …
4199 scr_autowrap (state); 3682 scr_autowrap (state);
4200 break; 3683 break;
4201 /* case 8: - auto repeat, can't do on a per window basis */ 3684 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4205 break; 3688 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
4214 case scrollBar_esc: 3690 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
4216 { 3692 {
4217 resize_all_windows (0, 0, 0); 3693 resize_all_windows (0, 0, 0);
… …
4229 break; 3705 break;
4230 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
4231 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
4232 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
4233 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
4234 priv_modes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4235 break; 3711 break;
4236#if 0
4237 case 1001: 3712 case 1002:
4238 break; /* X11 mouse highlighting */ 3713 case 1003:
4239#endif 3714 if (state)
3715 {
3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3717 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3718 vt_emask_mouse = PointerMotionMask;
3719 }
3720 else
3721 vt_emask_mouse = NoEventMask;
3722 vt_select_input ();
3723 break;
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
4241 set_option (Opt_scrollTtyOutput, !state); 3725 set_option (Opt_scrollTtyOutput, !state);
4242 break; 3726 break;
4243 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
4244 set_option (Opt_scrollTtyKeypress, state); 3728 set_option (Opt_scrollTtyKeypress, state);
4245 break; 3729 break;
4246 case 1047: /* secondary screen w/ clearing last */ 3730 case 1047: /* secondary screen w/ clearing last */
4247 if (OPTION (Opt_secondaryScreen)) 3731 if (option (Opt_secondaryScreen))
4248 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4249 scr_erase_screen (2); 3733 scr_erase_screen (2);
4250 scr_change_screen (state); 3734 scr_change_screen (state);
4251 break; 3735 break;
4252 case 1049: /* secondary screen w/ clearing first */ 3736 case 1049: /* secondary screen w/ clearing first */
4253 scr_change_screen (state); 3737 scr_change_screen (state);
4254 if (OPTION (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
4255 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
4256 scr_erase_screen (2); 3740 scr_erase_screen (2);
4257 break; 3741 break;
4258 default: 3742 default:
4259 break; 3743 break;
… …
4387 scr_color (Color_bg, Color_bg); 3871 scr_color (Color_bg, Color_bg);
4388 break; 3872 break;
4389 3873
4390 //case 50: // not variable spacing 3874 //case 50: // not variable spacing
4391 3875
4392#if ENABLE_FRILLS 3876#if !ENABLE_MINIMAL
4393 case 90: 3877 case 90:
4394 case 91: /* set bright fg color */ 3878 case 91: /* set bright fg color */
4395 case 92: 3879 case 92:
4396 case 93: 3880 case 93:
4397 case 94: 3881 case 94:
… …
4421rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
4422{ 3906{
4423 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
4424 3908
4425 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
4426 { /* query graphics */ 3911 /* query graphics */
4427 tt_printf ("\033G0\012"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
4428 return; 3913 return;
4429 } 3914 }
4430 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
4431 do 3916 do
… …
4462rxvt_term::tt_write (const char *data, unsigned int len) 3947rxvt_term::tt_write (const char *data, unsigned int len)
4463{ 3948{
4464 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 3949 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4465 return; 3950 return;
4466 3951
4467 if (pty.pty < 0) 3952 if (pty->pty < 0)
4468 return; 3953 return;
4469 3954
4470 if (v_buflen == 0) 3955 if (v_buflen == 0)
4471 { 3956 {
4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3957 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4473 3958
4474 if ((unsigned int)written == len) 3959 if ((unsigned int)written == len)
4475 return; 3960 return;
4476 3961
4477 data += written; 3962 data += written;
… …
4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4482 3967
4483 memcpy (v_buffer + v_buflen, data, len); 3968 memcpy (v_buffer + v_buflen, data, len);
4484 v_buflen += len; 3969 v_buflen += len;
4485 3970
4486 pty_ev.set (EVENT_READ | EVENT_WRITE); 3971 pty_ev.set (ev::READ | ev::WRITE);
4487} 3972}
4488 3973
4489void rxvt_term::pty_write () 3974void rxvt_term::pty_write ()
4490{ 3975{
4491 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3976 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4492 3977
4493 if (written > 0) 3978 if (written > 0)
4494 { 3979 {
4495 v_buflen -= written; 3980 v_buflen -= written;
4496 3981
4497 if (v_buflen == 0) 3982 if (v_buflen == 0)
4498 { 3983 {
4499 free (v_buffer); 3984 free (v_buffer);
4500 v_buffer = 0; 3985 v_buffer = 0;
4501 v_buflen = 0;
4502 3986
4503 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4504 return; 3988 return;
4505 } 3989 }
4506 3990
4507 memmove (v_buffer, v_buffer + written, v_buflen); 3991 memmove (v_buffer, v_buffer + written, v_buflen);
4508 } 3992 }
4509 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4510 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4511} 3995}
4512 3996
4513/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
4514 3998

Diff Legend

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