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.256 by root, Wed Jan 11 05:14:26 2006 UTC vs.
Revision 1.383 by root, Fri Dec 14 06:29:28 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 ();
1216
1217 refresh_check ();
1189} 1218}
1190 1219
1191void 1220void
1192rxvt_term::pointer_unblank () 1221rxvt_term::pointer_unblank ()
1193{ 1222{
1194 XDefineCursor (display->display, vt, TermWin_cursor); 1223 XDefineCursor (dpy, vt, TermWin_cursor);
1195 recolour_cursor (); 1224 recolour_cursor ();
1196 1225
1197#ifdef POINTER_BLANK 1226#ifdef POINTER_BLANK
1198 hidden_pointer = 0; 1227 hidden_pointer = 0;
1199 1228
1200 if (OPTION (Opt_pointerBlank)) 1229 if (option (Opt_pointerBlank))
1201 pointer_ev.start (NOW + pointerBlankDelay); 1230 pointer_ev.start (pointerBlankDelay);
1202#endif 1231#endif
1203} 1232}
1204 1233
1205#ifdef POINTER_BLANK 1234#ifdef POINTER_BLANK
1206void 1235void
1207rxvt_term::pointer_blank () 1236rxvt_term::pointer_blank ()
1208{ 1237{
1209 if (!OPTION (Opt_pointerBlank)) 1238 if (!option (Opt_pointerBlank))
1210 return; 1239 return;
1211 1240
1212 XDefineCursor (display->display, vt, display->blank_cursor); 1241 XDefineCursor (dpy, vt, display->blank_cursor);
1213 XFlush (display->display); 1242 XFlush (dpy);
1214 1243
1215 hidden_pointer = 1; 1244 hidden_pointer = 1;
1216} 1245}
1217 1246
1218void 1247void
1219rxvt_term::pointer_cb (time_watcher &w) 1248rxvt_term::pointer_cb (ev::timer &w, int revents)
1220{ 1249{
1221 SET_R (this); 1250 make_current ();
1222 SET_LOCALE (locale);
1223 1251
1224 pointer_blank (); 1252 pointer_blank ();
1225} 1253}
1226#endif 1254#endif
1227 1255
1228void 1256void
1229rxvt_term::mouse_report (XButtonEvent &ev) 1257rxvt_term::mouse_report (XButtonEvent &ev)
1230{ 1258{
1231 int button_number, key_state = 0; 1259 int button_number, key_state = 0;
1232 int x, y; 1260 int x, y;
1261 int code = 32;
1233 1262
1234 x = ev.x; 1263 x = Pixel2Col (ev.x);
1235 y = ev.y; 1264 y = Pixel2Row (ev.y);
1236 pixel_position (&x, &y); 1265 if (ev.type == MotionNotify)
1266 {
1267 if (x == mouse_row && y == mouse_col)
1268 return;
1269 mouse_row = x;
1270 mouse_col = y;
1271 code += 32;
1272 }
1237 1273
1238 if (MEvent.button == AnyButton) 1274 if (MEvent.button == AnyButton)
1239 button_number = 3; 1275 button_number = 3;
1240 else 1276 else
1241 { 1277 {
… …
1287 x + 1, 1323 x + 1,
1288 y + 1); 1324 y + 1);
1289#endif 1325#endif
1290 1326
1291 tt_printf ("\033[M%c%c%c", 1327 tt_printf ("\033[M%c%c%c",
1292 (32 + button_number + key_state), 1328 (code + button_number + key_state),
1293 (32 + x + 1), 1329 (32 + x + 1),
1294 (32 + y + 1)); 1330 (32 + y + 1));
1295} 1331}
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 1332
1307/*{{{ process an X event */ 1333/*{{{ process an X event */
1308void 1334void
1309rxvt_term::x_cb (XEvent &ev) 1335rxvt_term::x_cb (XEvent &ev)
1310{ 1336{
1311 dDisp; 1337 make_current ();
1312 1338
1313 SET_R (this); 1339 dLocal (Display *, dpy);
1314 SET_LOCALE (locale);
1315 1340
1341 if (ev.xany.window == vt
1342 && SHOULD_INVOKE (HOOK_X_EVENT)
1343 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1344 return;
1345
1346 // for XQueryPointer
1316 Window unused_root, unused_child; 1347 Window unused_root, unused_child;
1317 int unused_root_x, unused_root_y; 1348 int unused_root_x, unused_root_y;
1318 unsigned int unused_mask; 1349 unsigned int unused_mask;
1319 1350
1320 switch (ev.type) 1351 switch (ev.type)
1321 { 1352 {
1322 case KeyPress: 1353 case KeyPress:
1323#if ISO_14755 1354 key_press (ev.xkey);
1324 if (!(iso14755buf & ISO_14755_52))
1325#endif
1326 lookup_key (ev.xkey);
1327
1328 break; 1355 break;
1329 1356
1330 case KeyRelease: 1357 case KeyRelease:
1331 { 1358 key_release (ev.xkey);
1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1333 KeySym keysym;
1334
1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1336#endif
1337
1338#if ENABLE_FRILLS || ISO_14755
1339 // ISO 14755 support
1340 if (iso14755buf)
1341 if (iso14755buf & ISO_14755_52)
1342 {
1343# if ENABLE_OVERLAY
1344 scr_overlay_off ();
1345# endif
1346# if ISO_14755
1347 // iso14755 part 5.2 handling: release time
1348 // first: controls
1349 if ((ev.xkey.state & ControlMask)
1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1352 {
1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1354 commit_iso14755 ();
1355 goto skip_switch;
1356 }
1357
1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1359 if (i[0] == keysym)
1360 {
1361 iso14755buf = ISO_14755_51 | i[1];
1362 commit_iso14755 ();
1363 goto skip_switch;
1364 }
1365
1366 scr_bell ();
1367# endif
1368 iso14755buf = 0;
1369 break;
1370 }
1371 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1372 {
1373# if ENABLE_OVERLAY
1374 scr_overlay_off ();
1375# endif
1376 if (iso14755buf & ISO_14755_51)
1377 commit_iso14755 ();
1378#if ISO_14755
1379 else if (iso14755buf & ISO_14755_STARTED)
1380 {
1381 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1382
1383 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1384 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1385 }
1386# endif
1387 else
1388 iso14755buf = 0;
1389 }
1390#endif
1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1397 if (!(ev.xkey.state & ControlMask))
1398 slip_wheel_ev.stop ();
1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1400 mouse_slip_wheel_speed = 0;
1401#endif
1402 break; 1359 break;
1403 }
1404 1360
1405 case ButtonPress: 1361 case ButtonPress:
1406 button_press (ev.xbutton); 1362 button_press (ev.xbutton);
1407 break; 1363 break;
1408 1364
… …
1410 button_release (ev.xbutton); 1366 button_release (ev.xbutton);
1411 break; 1367 break;
1412 1368
1413 case ClientMessage: 1369 case ClientMessage:
1414 if (ev.xclient.format == 32 1370 if (ev.xclient.format == 32
1415 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1371 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1416 { 1372 {
1373 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1374 {
1375 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1376 {
1417 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1377 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1378 {
1379 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1418 destroy (); 1380 destroy ();
1381 }
1419#if ENABLE_EWMH 1382#if ENABLE_EWMH
1420 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1383 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1421 XSendEvent (disp, ev.xclient.window = display->root, 1384 XSendEvent (dpy, ev.xclient.window = display->root,
1422 False, SubstructureRedirectMask | SubstructureNotifyMask, 1385 False, SubstructureRedirectMask | SubstructureNotifyMask,
1423 &ev); 1386 &ev);
1387#endif
1388 }
1389 }
1390#if ENABLE_XEMBED
1391 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1392 {
1393 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1394 focus_in ();
1395 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1396 focus_out ();
1397 }
1424#endif 1398#endif
1425 } 1399 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1435#ifdef OFFIX_DND
1436 /* OffiX Dnd (drag 'n' drop) protocol */
1437 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1438 && (ev.xclient.data.l[0] == DndFile
1439 || ev.xclient.data.l[0] == DndDir
1440 || ev.xclient.data.l[0] == DndLink))
1441 {
1442 /* Get Dnd data */
1443 Atom ActualType;
1444 int ActualFormat;
1445 unsigned char *data;
1446 unsigned long Size, RemainingBytes;
1447
1448 XGetWindowProperty (disp, display->root,
1449 xa[XA_DNDSELECTION],
1450 0L, 1000000L,
1451 False, AnyPropertyType,
1452 &ActualType, &ActualFormat,
1453 &Size, &RemainingBytes,
1454 &data);
1455 set_string_property (XA_CUT_BUFFER0, data);
1456 XFree (data);
1457 selection_paste (display->root, XA_CUT_BUFFER0, true);
1458 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1459 }
1460#endif /* OFFIX_DND */
1461 break;
1462
1463 case MappingNotify:
1464 XRefreshKeyboardMapping (&ev.xmapping);
1465 break; 1400 break;
1466 1401
1467 /* 1402 /*
1468 * XXX: this is not the _current_ arrangement 1403 * XXX: this is not the _current_ arrangement
1469 * Here's my conclusion: 1404 * Here's my conclusion:
… …
1488 break; 1423 break;
1489 } 1424 }
1490 break; 1425 break;
1491 1426
1492 case FocusIn: 1427 case FocusIn:
1428 if (ev.xfocus.detail != NotifyInferior
1429 && ev.xfocus.detail != NotifyPointer
1430 && ev.xfocus.mode != NotifyGrab)
1493 focus_in (); 1431 focus_in ();
1494 break; 1432 break;
1495 1433
1496 case FocusOut: 1434 case FocusOut:
1435 if (ev.xfocus.detail != NotifyInferior
1436 && ev.xfocus.detail != NotifyPointer
1437 && ev.xfocus.mode != NotifyGrab)
1497 focus_out (); 1438 focus_out ();
1498 break; 1439 break;
1499 1440
1500 case ConfigureNotify: 1441 case ConfigureNotify:
1442 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1443 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1444 szHint.width, szHint.height); */
1501 if (ev.xconfigure.window == parent[0]) 1445 if (ev.xconfigure.window == parent[0])
1502 { 1446 {
1503 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1504 ; 1448 ;
1505 1449
1506 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1450 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1507 { 1451 {
1508 seen_resize = 1; 1452 seen_resize = 1;
1509 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1453 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1510 } 1454 }
1511 1455 else
1512#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1456 {
1513 if (OPTION (Opt_transparent)) 1457#ifdef HAVE_BG_PIXMAP
1514 check_our_parents (); 1458 if (bgPixmap.window_position_sensitive ())
1459 update_background ();
1515#endif 1460#endif
1461 }
1462 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1516 } 1463 }
1517 break; 1464 break;
1518 1465
1519 case PropertyNotify: 1466 case PropertyNotify:
1467 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1520 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1468 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1521 && ev.xproperty.state == PropertyNewValue) 1469 && ev.xproperty.state == PropertyNewValue)
1522 selection_property (ev.xproperty.window, ev.xproperty.atom); 1470 selection_property (ev.xproperty.window, ev.xproperty.atom);
1523 1471
1524 break; 1472 break;
1525 1473
1526 case SelectionClear: 1474 case SelectionClear:
1527 selection_clear (); 1475 selection_clear ();
… …
1537 break; 1485 break;
1538 1486
1539 case MapNotify: 1487 case MapNotify:
1540 mapped = 1; 1488 mapped = 1;
1541#ifdef TEXT_BLINK 1489#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1490 text_blink_ev.start ();
1543#endif 1491#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1492 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break; 1493 break;
1546 1494
1547 case UnmapNotify: 1495 case UnmapNotify:
… …
1549#ifdef TEXT_BLINK 1497#ifdef TEXT_BLINK
1550 text_blink_ev.stop (); 1498 text_blink_ev.stop ();
1551#endif 1499#endif
1552 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1500 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1553 break; 1501 break;
1554
1555#ifdef TRANSPARENT
1556 case ReparentNotify:
1557 rootwin_cb (ev);
1558 break;
1559#endif /* TRANSPARENT */
1560 1502
1561 case GraphicsExpose: 1503 case GraphicsExpose:
1562 case Expose: 1504 case Expose:
1563 if (ev.xany.window == vt) 1505 if (ev.xany.window == vt)
1564 { 1506 {
1565 do 1507 do
1508 {
1566 scr_expose (ev.xexpose.x, ev.xexpose.y, 1509 scr_expose (ev.xexpose.x, ev.xexpose.y,
1567 ev.xexpose.width, ev.xexpose.height, False); 1510 ev.xexpose.width, ev.xexpose.height, False);
1511 }
1568 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1512 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1569 1513
1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1514 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1571 1515
1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1516 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1517 {
1573 scr_expose (ev.xexpose.x, ev.xexpose.y, 1518 scr_expose (ev.xexpose.x, ev.xexpose.y,
1574 ev.xexpose.width, ev.xexpose.height, False); 1519 ev.xexpose.width, ev.xexpose.height, False);
1520 }
1575 1521
1576 want_refresh = 1; 1522 want_refresh = 1;
1577 } 1523 }
1578 else 1524 else
1579 { 1525 {
1580 XEvent unused_event; 1526 XEvent unused_event;
1581 1527
1582 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1528 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1583 ; 1529 ;
1584 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1530 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1585 ; 1531 ;
1586 1532
1587 if (isScrollbarWindow (ev.xany.window)) 1533 if (isScrollbarWindow (ev.xany.window))
1588 { 1534 {
1589 scrollBar.setIdle (); 1535 scrollBar.setIdle ();
1590 scrollbar_show (0); 1536 scrollbar_show (0);
1591 } 1537 }
1592#ifdef MENUBAR
1593 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1594 menubar_expose ();
1595#endif
1596
1597#ifdef TRANSPARENT
1598 if (am_transparent && ev.xany.window == parent[0])
1599 XClearWindow (disp, ev.xany.window);
1600#endif
1601 } 1538 }
1602 break; 1539 break;
1603 1540
1604 case MotionNotify: 1541 case MotionNotify:
1605#ifdef POINTER_BLANK 1542#ifdef POINTER_BLANK
1606 if (hidden_pointer) 1543 if (hidden_pointer)
1607 pointer_unblank (); 1544 pointer_unblank ();
1608#endif 1545#endif
1609#if MENUBAR 1546 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1610 if (isMenuBarWindow (ev.xany.window)) 1547 || priv_modes & PrivMode_MouseAnyEvent)
1611 {
1612 menubar_control (ev.xbutton); 1548 mouse_report (ev.xbutton);
1613 break;
1614 }
1615#endif
1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1549 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1617 break; 1550 break;
1618 1551
1619 if (ev.xany.window == vt) 1552 if (ev.xany.window == vt)
1620 { 1553 {
1554 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1555 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop 1556 ; // nop
1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1557 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1624 { 1558 {
1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1626 ; 1560 ;
1627 1561
1628 XQueryPointer (disp, vt, 1562 XQueryPointer (dpy, vt,
1629 &unused_root, &unused_child, 1563 &unused_root, &unused_child,
1630 &unused_root_x, &unused_root_y, 1564 &unused_root_x, &unused_root_y,
1631 &ev.xbutton.x, &ev.xbutton.y, 1565 &ev.xbutton.x, &ev.xbutton.y,
1632 &ev.xbutton.state); 1566 &ev.xbutton.state);
1633#ifdef MOUSE_THRESHOLD 1567#ifdef MOUSE_THRESHOLD
… …
1653 int dist; 1587 int dist;
1654 1588
1655 /* don't clobber the current delay if we are 1589 /* don't clobber the current delay if we are
1656 * already in the middle of scrolling. 1590 * already in the middle of scrolling.
1657 */ 1591 */
1658 if (!sel_scroll_ev.active) 1592 if (!sel_scroll_ev.is_active ())
1659 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1593 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1660 1594
1661 /* save the event params so we can highlight 1595 /* save the event params so we can highlight
1662 * the selection in the pending-scroll loop 1596 * the selection in the pending-scroll loop
1663 */ 1597 */
1664 selection_save_x = ev.xbutton.x; 1598 selection_save_x = ev.xbutton.x;
… …
1686 else 1620 else
1687 { 1621 {
1688 /* we are within the text window, so we 1622 /* we are within the text window, so we
1689 * shouldn't be scrolling 1623 * shouldn't be scrolling
1690 */ 1624 */
1691 if (sel_scroll_ev.active)
1692 sel_scroll_ev.stop(); 1625 sel_scroll_ev.stop();
1693 } 1626 }
1694#endif 1627#endif
1695#ifdef MOUSE_THRESHOLD 1628#ifdef MOUSE_THRESHOLD
1696 } 1629 }
1697#endif 1630#endif
1698 } 1631 }
1699 } 1632 }
1700 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1633 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1701 { 1634 {
1702 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1635 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1703 MotionNotify, &ev)) 1636 MotionNotify, &ev))
1704 ; 1637 ;
1705 1638
1706 XQueryPointer (disp, scrollBar.win, 1639 XQueryPointer (dpy, scrollBar.win,
1707 &unused_root, &unused_child, 1640 &unused_root, &unused_child,
1708 &unused_root_x, &unused_root_y, 1641 &unused_root_x, &unused_root_y,
1709 &ev.xbutton.x, &ev.xbutton.y, 1642 &ev.xbutton.x, &ev.xbutton.y,
1710 &unused_mask); 1643 &unused_mask);
1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1644 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1712 scrollbar_size ()); 1645 scrollbar_size ());
1713 want_refresh = 1; 1646 want_refresh = 1;
1714 refresh_limit = 0;
1715 scrollbar_show (1); 1647 scrollbar_show (1);
1716 } 1648 }
1717 break; 1649 break;
1718 } 1650 }
1719 1651
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK) 1652#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1653 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1724 { 1654 {
1725 if (hidden_cursor) 1655 if (hidden_cursor)
1726 { 1656 {
1727 hidden_cursor = 0; 1657 hidden_cursor = 0;
1728 want_refresh = 1; 1658 want_refresh = 1;
1729 } 1659 }
1730 1660
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1661 cursor_blink_ev.again ();
1732 } 1662 }
1733#endif 1663#endif
1734 1664
1735#if defined(POINTER_BLANK) 1665#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1666 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 { 1667 {
1738 if (ev.type == MotionNotify 1668 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress 1669 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease) 1670 || ev.type == ButtonRelease)
1741 if (hidden_pointer) 1671 if (hidden_pointer)
… …
1743 1673
1744 if (ev.type == KeyPress && hidden_pointer == 0) 1674 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank (); 1675 pointer_blank ();
1746 } 1676 }
1747#endif 1677#endif
1678
1679 refresh_check ();
1748} 1680}
1749 1681
1750void 1682void
1751rxvt_term::focus_in () 1683rxvt_term::focus_in ()
1752{ 1684{
1753 if (!focus) 1685 if (!focus)
1754 { 1686 {
1755 focus = 1; 1687 focus = 1;
1756 want_refresh = 1; 1688 want_refresh = 1;
1757 1689
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1690 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1759 1691
1760#if USE_XIM 1692#if USE_XIM
1761 if (Input_Context != NULL) 1693 if (Input_Context != NULL)
1762 { 1694 {
1763 IMSetStatusPosition (); 1695 IMSetPosition ();
1764 XSetICFocus (Input_Context); 1696 XSetICFocus (Input_Context);
1765 } 1697 }
1766#endif 1698#endif
1767#if CURSOR_BLINK 1699#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink)) 1700 if (option (Opt_cursorBlink))
1769 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1701 cursor_blink_ev.again ();
1770#endif 1702#endif
1771#if OFF_FOCUS_FADING 1703#if OFF_FOCUS_FADING
1772 if (rs[Rs_fade]) 1704 if (rs[Rs_fade])
1773 { 1705 {
1774 pix_colors = pix_colors_focused; 1706 pix_colors = pix_colors_focused;
1775 scr_recolour (); 1707 scr_recolour ();
1776 } 1708 }
1777#endif 1709#endif
1710#if ENABLE_FRILLS
1711 if (option (Opt_urgentOnBell))
1712 {
1713 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1714 {
1715 h->flags &= ~XUrgencyHint;
1716 XSetWMHints (dpy, parent[0], h);
1717 }
1718 }
1719#endif
1778 } 1720 }
1779} 1721}
1780 1722
1781void 1723void
1782rxvt_term::focus_out () 1724rxvt_term::focus_out ()
… …
1790 1732
1791#if ENABLE_FRILLS || ISO_14755 1733#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf) 1734 if (iso14755buf)
1793 { 1735 {
1794 iso14755buf = 0; 1736 iso14755buf = 0;
1795# if ENABLE_OVERLAY 1737# if ISO_14755
1796 scr_overlay_off (); 1738 scr_overlay_off ();
1797# endif 1739# endif
1798 } 1740 }
1799#endif 1741#endif
1800#if USE_XIM 1742#if USE_XIM
1801 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1802 XUnsetICFocus (Input_Context); 1744 XUnsetICFocus (Input_Context);
1803#endif 1745#endif
1804#if CURSOR_BLINK 1746#if CURSOR_BLINK
1805 if (OPTION (Opt_cursorBlink)) 1747 if (option (Opt_cursorBlink))
1806 cursor_blink_ev.stop (); 1748 cursor_blink_ev.stop ();
1749
1807 hidden_cursor = 0; 1750 hidden_cursor = 0;
1808#endif 1751#endif
1809#if OFF_FOCUS_FADING 1752#if OFF_FOCUS_FADING
1810 if (rs[Rs_fade]) 1753 if (rs[Rs_fade])
1811 { 1754 {
… …
1814 } 1757 }
1815#endif 1758#endif
1816 } 1759 }
1817} 1760}
1818 1761
1819#if TRANSPARENT 1762void
1763rxvt_term::update_fade_color (unsigned int idx)
1764{
1765#if OFF_FOCUS_FADING
1766 if (rs[Rs_fade])
1767 {
1768 rgba c;
1769 pix_colors [Color_fade].get (c);
1770 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1771 }
1772#endif
1773}
1774
1775#if ENABLE_TRANSPARENCY || ENABLE_PERL
1820void 1776void
1821rxvt_term::rootwin_cb (XEvent &ev) 1777rxvt_term::rootwin_cb (XEvent &ev)
1822{ 1778{
1823 SET_R (this); 1779 make_current ();
1824 SET_LOCALE (locale);
1825 1780
1781 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1782 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1783 return;
1784
1785# if ENABLE_TRANSPARENCY
1826 switch (ev.type) 1786 switch (ev.type)
1827 { 1787 {
1828 case PropertyNotify: 1788 case PropertyNotify:
1829 /* 1789 /*
1830 * if user used some Esetroot compatible prog to set the root bg, 1790 * if user used some Esetroot compatible prog to set the root bg,
1831 * use the property to determine the pixmap. We use it later on. 1791 * use the property to determine the pixmap. We use it later on.
1832 */ 1792 */
1833 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1793 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1834 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1794 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1835 return; 1795 {
1836 1796 bgPixmap.set_root_pixmap ();
1837 /* FALLTHROUGH */ 1797 update_background ();
1838 case ReparentNotify: 1798 }
1839 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1840 want_refresh = want_full_refresh = 1;
1841 break; 1799 break;
1842 } 1800 }
1801# endif
1802
1803 refresh_check ();
1843} 1804}
1844#endif 1805#endif
1845 1806
1846void 1807void
1847rxvt_term::button_press (XButtonEvent &ev) 1808rxvt_term::button_press (XButtonEvent &ev)
… …
1856 /* 1817 /*
1857 * VT window processing of button press 1818 * VT window processing of button press
1858 */ 1819 */
1859 if (ev.window == vt) 1820 if (ev.window == vt)
1860 { 1821 {
1822 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1823 return;
1824
1861#if ISO_14755 1825#if ISO_14755
1862 // 5.4 1826 // 5.4
1863 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1827 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1864 { 1828 {
1865 iso14755_54 (ev.x, ev.y); 1829 iso14755_54 (ev.x, ev.y);
… …
1899 mouse_report (ev); 1863 mouse_report (ev);
1900 } 1864 }
1901#else 1865#else
1902 MEvent.button = ev.button; 1866 MEvent.button = ev.button;
1903 mouse_report (ev); 1867 mouse_report (ev);
1904#endif /* MOUSE_REPORT_DOUBLECLICK */ 1868#endif /* MOUSE_REPORT_DOUBLECLICK */
1905 1869
1906 } 1870 }
1907 else 1871 else
1908 { 1872 {
1909 if (ev.button != MEvent.button) 1873 if (ev.button != MEvent.button)
1910 MEvent.clicks = 0; 1874 MEvent.clicks = 0;
1911 1875
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1913 switch (ev.button) 1876 switch (ev.button)
1914 { 1877 {
1915 case Button1: 1878 case Button1:
1916 /* allow meta + click to select rectangular areas */ 1879 /* allow meta + click to select rectangular areas */
1917 /* should be done in screen.C */ 1880 /* should be done in screen.C */
1918#if ENABLE_FRILLS 1881#if ENABLE_FRILLS
1919 selection.rect = !!(ev.state & ModMetaMask); 1882 selection.rect = !!(ev.state & ModMetaMask);
1920#else 1883#else
1921 selection.rect = false; 1884 selection.rect = false;
1922#endif 1885#endif
1923 1886
1924 /* allow shift+left click to extend selection */ 1887 /* allow shift+left click to extend selection */
1925 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1888 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1926 { 1889 {
1927 if (MEvent.button == Button1 && clickintime) 1890 if (MEvent.button == Button1 && clickintime)
1928 selection_rotate (ev.x, ev.y); 1891 selection_rotate (ev.x, ev.y);
1929 else 1892 else
1930 selection_extend (ev.x, ev.y, 1); 1893 selection_extend (ev.x, ev.y, 1);
1931 } 1894 }
1932 else 1895 else
1933 { 1896 {
1934 if (MEvent.button == Button1 && clickintime) 1897 if (MEvent.button == Button1 && clickintime)
1935 MEvent.clicks++; 1898 MEvent.clicks++;
1936 else 1899 else
1937 MEvent.clicks = 1; 1900 MEvent.clicks = 1;
1938 1901
1939 selection_click (MEvent.clicks, ev.x, ev.y); 1902 selection_click (MEvent.clicks, ev.x, ev.y);
1940 } 1903 }
1941 1904
1942 MEvent.button = Button1; 1905 MEvent.button = Button1;
1943 break; 1906 break;
1944 1907
1945 case Button3: 1908 case Button3:
1946 if (MEvent.button == Button3 && clickintime) 1909 if (MEvent.button == Button3 && clickintime)
1947 selection_rotate (ev.x, ev.y); 1910 selection_rotate (ev.x, ev.y);
1948 else 1911 else
1949 selection_extend (ev.x, ev.y, 1); 1912 selection_extend (ev.x, ev.y, 1);
1950 1913
1951 MEvent.button = Button3; 1914 MEvent.button = Button3;
1952 break; 1915 break;
1953 } 1916 }
1954 } 1917 }
1955 1918
1956 MEvent.time = ev.time; 1919 MEvent.time = ev.time;
1957 return; 1920 return;
1958 } 1921 }
1959 1922
… …
2004 tt_printf ("\033[5~"); 1967 tt_printf ("\033[5~");
2005 break; 1968 break;
2006 } 1969 }
2007 } 1970 }
2008 else 1971 else
2009#endif /* NO_SCROLLBAR_REPORT */ 1972#endif /* NO_SCROLLBAR_REPORT */
2010 1973
2011 { 1974 {
2012 char upordown = 0; 1975 char upordown = 0;
2013 1976
2014 if (scrollBar.style == R_SB_NEXT) 1977 if (scrollBar.style == R_SB_NEXT)
2015 { 1978 {
2016 if (scrollbarnext_upButton (ev.y)) 1979 if (scrollbarnext_upButton (ev.y))
2017 upordown = -1; /* up */ 1980 upordown = -1; /* up */
… …
2023 if (scrollbarrxvt_upButton (ev.y)) 1986 if (scrollbarrxvt_upButton (ev.y))
2024 upordown = -1; /* up */ 1987 upordown = -1; /* up */
2025 else if (scrollbarrxvt_dnButton (ev.y)) 1988 else if (scrollbarrxvt_dnButton (ev.y))
2026 upordown = 1; /* down */ 1989 upordown = 1; /* down */
2027 } 1990 }
1991
2028 if (upordown) 1992 if (upordown)
2029 { 1993 {
2030#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1994#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1995 if (!cont_scroll_ev.is_active ())
2031 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1996 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 1997#endif
2033 if (scr_page (upordown < 0 ? UP : DN, 1)) 1998 if (scr_page (upordown < 0 ? UP : DN, 1))
2034 { 1999 {
2035 if (upordown < 0) 2000 if (upordown < 0)
2036 scrollBar.setUp (); 2001 scrollBar.setUp ();
… …
2098 } 2063 }
2099 } 2064 }
2100 2065
2101 return; 2066 return;
2102 } 2067 }
2103
2104#if MENUBAR
2105 /*
2106 * Menubar window processing of button press
2107 */
2108 if (isMenuBarWindow (ev.window))
2109 menubar_control (ev);
2110#endif
2111} 2068}
2112 2069
2113void 2070void
2114rxvt_term::button_release (XButtonEvent &ev) 2071rxvt_term::button_release (XButtonEvent &ev)
2115{ 2072{
… …
2121 2078
2122 if (scrollbar_isUpDn ()) 2079 if (scrollbar_isUpDn ())
2123 { 2080 {
2124 scrollBar.setIdle (); 2081 scrollBar.setIdle ();
2125 scrollbar_show (0); 2082 scrollbar_show (0);
2126#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2127 refresh_type &= ~SMOOTH_REFRESH;
2128#endif
2129 } 2083 }
2130 2084
2131#ifdef SELECTION_SCROLLING 2085#ifdef SELECTION_SCROLLING
2132 if (sel_scroll_ev.active)
2133 sel_scroll_ev.stop(); 2086 sel_scroll_ev.stop();
2134#endif 2087#endif
2135 2088
2136 if (ev.window == vt) 2089 if (ev.window == vt)
2137 { 2090 {
2091 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2092 return;
2093
2138#if ISO_14755 2094#if ISO_14755
2139 // 5.4 2095 // 5.4
2140 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2141 return; 2097 return;
2142#endif 2098#endif
2099
2143 if (reportmode) 2100 if (reportmode)
2144 { 2101 {
2145 /* mouse report from vt window */ 2102 /* mouse report from vt window */
2146 /* don't report release of wheel "buttons" */ 2103 /* don't report release of wheel "buttons" */
2147 if (ev.button >= 4) 2104 if (ev.button >= 4)
… …
2158 mouse_report (ev); 2115 mouse_report (ev);
2159 } 2116 }
2160#else /* MOUSE_REPORT_DOUBLECLICK */ 2117#else /* MOUSE_REPORT_DOUBLECLICK */
2161 MEvent.button = AnyButton; 2118 MEvent.button = AnyButton;
2162 mouse_report (ev); 2119 mouse_report (ev);
2163#endif /* MOUSE_REPORT_DOUBLECLICK */ 2120#endif /* MOUSE_REPORT_DOUBLECLICK */
2164 return; 2121 return;
2165 } 2122 }
2166 2123
2167 /* 2124 /*
2168 * dumb hack to compensate for the failure of click-and-drag 2125 * dumb hack to compensate for the failure of click-and-drag
… …
2171 if (priv_modes & PrivMode_mouse_report 2128 if (priv_modes & PrivMode_mouse_report
2172 && bypass_keystate 2129 && bypass_keystate
2173 && ev.button == Button1 && MEvent.clicks <= 1) 2130 && ev.button == Button1 && MEvent.clicks <= 1)
2174 selection_extend (ev.x, ev.y, 0); 2131 selection_extend (ev.x, ev.y, 0);
2175 2132
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2179 switch (ev.button) 2133 switch (ev.button)
2180 { 2134 {
2181 case Button1: 2135 case Button1:
2182 case Button3: 2136 case Button3:
2183 selection_make (ev.time); 2137 selection_make (ev.time);
2184 break; 2138 break;
2139
2185 case Button2: 2140 case Button2:
2186 selection_request (ev.time, ev.x, ev.y); 2141 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2142 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2143 break;
2144
2188#ifdef MOUSE_WHEEL 2145#ifdef MOUSE_WHEEL
2189 case Button4: 2146 case Button4:
2190 case Button5: 2147 case Button5:
2191 { 2148 {
2192 int i; 2149 int i;
… …
2194 2151
2195 v = ev.button == Button4 ? UP : DN; 2152 v = ev.button == Button4 ? UP : DN;
2196 2153
2197 if (ev.state & ShiftMask) 2154 if (ev.state & ShiftMask)
2198 i = 1; 2155 i = 1;
2199 else if (OPTION (Opt_mouseWheelScrollPage)) 2156 else if (option (Opt_mouseWheelScrollPage))
2200 i = nrow - 1; 2157 i = nrow - 1;
2201 else 2158 else
2202 i = 5; 2159 i = 5;
2203 2160
2204# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
… …
2206 { 2163 {
2207 mouse_slip_wheel_speed += v ? -1 : 1; 2164 mouse_slip_wheel_speed += v ? -1 : 1;
2208 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2165 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2209 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2166 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2210 2167
2211 if (slip_wheel_ev.at < NOW) 2168 if (!slip_wheel_ev.is_active ())
2212 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2169 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2213
2214 slip_wheel_ev.start ();
2215 } 2170 }
2216 else 2171 else
2217 { 2172 {
2218# endif 2173# endif
2219 scr_page (v, i); 2174 scr_page (v, i);
… …
2224 } 2179 }
2225 break; 2180 break;
2226#endif 2181#endif
2227 } 2182 }
2228 } 2183 }
2229#ifdef MENUBAR
2230 else if (isMenuBarWindow (ev.window))
2231 menubar_control (ev);
2232#endif
2233} 2184}
2234
2235#ifdef TRANSPARENT
2236#if TINTING
2237/* taken from aterm-0.4.2 */
2238
2239typedef uint32_t RUINT32T;
2240
2241void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2242{
2243 int sh_r, sh_g, sh_b;
2244 RUINT32T mask_r, mask_g, mask_b;
2245 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2246 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2247 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2248 int i;
2249
2250 Visual *visual = display->visual;
2251
2252 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2253
2254 /* for convenience */
2255 mask_r = visual->red_mask;
2256 mask_g = visual->green_mask;
2257 mask_b = visual->blue_mask;
2258
2259 /* boring lookup table pre-initialization */
2260 switch (srcImage->bits_per_pixel) {
2261 case 15:
2262 if ((mask_r != 0x7c00) ||
2263 (mask_g != 0x03e0) ||
2264 (mask_b != 0x001f))
2265 return;
2266 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2267 lookup_r = lookup;
2268 lookup_g = lookup+32;
2269 lookup_b = lookup+32+32;
2270 sh_r = 10;
2271 sh_g = 5;
2272 sh_b = 0;
2273 break;
2274 case 16:
2275 if ((mask_r != 0xf800) ||
2276 (mask_g != 0x07e0) ||
2277 (mask_b != 0x001f))
2278 return;
2279 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2280 lookup_r = lookup;
2281 lookup_g = lookup+32;
2282 lookup_b = lookup+32+64;
2283 sh_r = 11;
2284 sh_g = 5;
2285 sh_b = 0;
2286 break;
2287 case 24:
2288 if ((mask_r != 0xff0000) ||
2289 (mask_g != 0x00ff00) ||
2290 (mask_b != 0x0000ff))
2291 return;
2292 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2293 lookup_r = lookup;
2294 lookup_g = lookup+256;
2295 lookup_b = lookup+256+256;
2296 sh_r = 16;
2297 sh_g = 8;
2298 sh_b = 0;
2299 break;
2300 case 32:
2301 if ((mask_r != 0xff0000) ||
2302 (mask_g != 0x00ff00) ||
2303 (mask_b != 0x0000ff))
2304 return;
2305 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2306 lookup_r = lookup;
2307 lookup_g = lookup+256;
2308 lookup_b = lookup+256+256;
2309 sh_r = 16;
2310 sh_g = 8;
2311 sh_b = 0;
2312 break;
2313 default:
2314 return; /* we do not support this color depth */
2315 }
2316
2317 /* prepare limits for color transformation (each channel is handled separately) */
2318 if (shade < 0) {
2319 shade = -shade;
2320 if (shade < 0) shade = 0;
2321 if (shade > 100) shade = 100;
2322
2323 lower_lim_r = 65535-rm;
2324 lower_lim_g = 65535-gm;
2325 lower_lim_b = 65535-bm;
2326
2327 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2328 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2329 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2330
2331 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2332 } else {
2333 if (shade < 0) shade = 0;
2334 if (shade > 100) shade = 100;
2335
2336 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2337
2338 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2339 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2340 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2341 }
2342
2343 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2344 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2345 {
2346 unsigned int tmp;
2347
2348 tmp = lower_lim_r;
2349 lower_lim_r = lower_lim_b;
2350 lower_lim_b = tmp;
2351
2352 tmp = upper_lim_r;
2353 upper_lim_r = upper_lim_b;
2354 upper_lim_b = tmp;
2355 }
2356
2357 /* fill our lookup tables */
2358 for (i = 0; i <= mask_r>>sh_r; i++)
2359 {
2360 RUINT32T tmp;
2361 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2362 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2363 lookup_r[i] = (tmp/65535)<<sh_r;
2364 }
2365 for (i = 0; i <= mask_g>>sh_g; i++)
2366 {
2367 RUINT32T tmp;
2368 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2369 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2370 lookup_g[i] = (tmp/65535)<<sh_g;
2371 }
2372 for (i = 0; i <= mask_b>>sh_b; i++)
2373 {
2374 RUINT32T tmp;
2375 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2376 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2377 lookup_b[i] = (tmp/65535)<<sh_b;
2378 }
2379
2380 /* apply table to input image (replacing colors by newly calculated ones) */
2381 switch (srcImage->bits_per_pixel)
2382 {
2383 case 15:
2384 {
2385 unsigned short *p1, *pf, *p, *pl;
2386 p1 = (unsigned short *) srcImage->data;
2387 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2388 while (p1 < pf)
2389 {
2390 p = p1;
2391 pl = p1 + srcImage->width;
2392 for (; p < pl; p++)
2393 {
2394 *p = lookup_r[(*p & 0x7c00)>>10] |
2395 lookup_g[(*p & 0x03e0)>> 5] |
2396 lookup_b[(*p & 0x001f)];
2397 }
2398 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2399 }
2400 break;
2401 }
2402 case 16:
2403 {
2404 unsigned short *p1, *pf, *p, *pl;
2405 p1 = (unsigned short *) srcImage->data;
2406 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2407 while (p1 < pf)
2408 {
2409 p = p1;
2410 pl = p1 + srcImage->width;
2411 for (; p < pl; p++)
2412 {
2413 *p = lookup_r[(*p & 0xf800)>>11] |
2414 lookup_g[(*p & 0x07e0)>> 5] |
2415 lookup_b[(*p & 0x001f)];
2416 }
2417 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2418 }
2419 break;
2420 }
2421 case 24:
2422 {
2423 unsigned char *p1, *pf, *p, *pl;
2424 p1 = (unsigned char *) srcImage->data;
2425 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2426 while (p1 < pf)
2427 {
2428 p = p1;
2429 pl = p1 + srcImage->width * 3;
2430 for (; p < pl; p += 3)
2431 {
2432 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2433 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2434 p[2] = lookup_r[(p[2] & 0x0000ff)];
2435 }
2436 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2437 }
2438 break;
2439 }
2440 case 32:
2441 {
2442 RUINT32T *p1, *pf, *p, *pl;
2443 p1 = (RUINT32T *) srcImage->data;
2444 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2445
2446 while (p1 < pf)
2447 {
2448 p = p1;
2449 pl = p1 + srcImage->width;
2450 for (; p < pl; p++)
2451 {
2452 *p = lookup_r[(*p & 0xff0000)>>16] |
2453 lookup_g[(*p & 0x00ff00)>> 8] |
2454 lookup_b[(*p & 0x0000ff)] |
2455 (*p & ~0xffffff);
2456 }
2457 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2458 }
2459 break;
2460 }
2461 }
2462
2463 free (lookup);
2464}
2465#endif
2466
2467/*
2468 * Check our parents are still who we think they are.
2469 * Do transparency updates if required
2470 */
2471int
2472rxvt_term::check_our_parents ()
2473{
2474 int i, pchanged, aformat, have_pixmap, rootdepth;
2475 unsigned long nitems, bytes_after;
2476 Atom atype;
2477 unsigned char *prop = NULL;
2478 Window root, oldp, *list;
2479 Pixmap rootpixmap = None;
2480 XWindowAttributes wattr, wrootattr;
2481 dDisp;
2482
2483 pchanged = 0;
2484
2485 if (!OPTION (Opt_transparent))
2486 return pchanged; /* Don't try any more */
2487
2488 XGetWindowAttributes (disp, display->root, &wrootattr);
2489 rootdepth = wrootattr.depth;
2490
2491 XGetWindowAttributes (disp, parent[0], &wattr);
2492
2493 if (rootdepth != wattr.depth)
2494 {
2495 if (am_transparent)
2496 {
2497 pchanged = 1;
2498 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2499 am_transparent = am_pixmap_trans = 0;
2500 }
2501
2502 return pchanged; /* Don't try any more */
2503 }
2504
2505 /* Get all X ops out of the queue so that our information is up-to-date. */
2506 XSync (disp, False);
2507
2508 /*
2509 * Make the frame window set by the window manager have
2510 * the root background. Some window managers put multiple nested frame
2511 * windows for each client, so we have to take care about that.
2512 */
2513 i = (xa[XA_XROOTPMAP_ID]
2514 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2515 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2516 &nitems, &bytes_after, &prop) == Success);
2517
2518 if (!i || prop == NULL)
2519 i = (xa[XA_ESETROOT_PMAP_ID]
2520 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2521 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2522 &nitems, &bytes_after, &prop) == Success);
2523
2524 if (!i || prop == NULL
2525#if TINTING
2526 || !rs[Rs_color + Color_tint]
2527#endif
2528 )
2529 have_pixmap = 0;
2530 else
2531 {
2532 have_pixmap = 1;
2533 rootpixmap = *(Pixmap *)prop;
2534 XFree (prop);
2535 }
2536
2537 if (have_pixmap)
2538 {
2539 /*
2540 * Copy display->root pixmap transparency
2541 */
2542 int sx, sy, nx, ny;
2543 unsigned int nw, nh;
2544 Window cr;
2545 XImage *image;
2546 GC gc;
2547 XGCValues gcvalue;
2548
2549 XTranslateCoordinates (disp, parent[0], display->root,
2550 0, 0, &sx, &sy, &cr);
2551 nw = (unsigned int)szHint.width;
2552 nh = (unsigned int)szHint.height;
2553 nx = ny = 0;
2554
2555 if (sx < 0)
2556 {
2557 nw += sx;
2558 nx = -sx;
2559 sx = 0;
2560 }
2561
2562 if (sy < 0)
2563 {
2564 nh += sy;
2565 ny = -sy;
2566 sy = 0;
2567 }
2568
2569 min_it (nw, (unsigned int) (wrootattr.width - sx));
2570 min_it (nh, (unsigned int) (wrootattr.height - sy));
2571
2572 XSync (disp, False);
2573 allowedxerror = -1;
2574 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2575
2576 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2577 /* XXX: may need a delay here? */
2578 allowedxerror = 0;
2579
2580 if (image == NULL)
2581 {
2582 if (am_transparent && am_pixmap_trans)
2583 {
2584 pchanged = 1;
2585 if (pixmap != None)
2586 {
2587 XFreePixmap (disp, pixmap);
2588 pixmap = None;
2589 }
2590 }
2591
2592 am_pixmap_trans = 0;
2593 }
2594 else
2595 {
2596 if (pixmap != None)
2597 XFreePixmap (disp, pixmap);
2598
2599#if TINTING
2600 if (ISSET_PIXCOLOR (Color_tint))
2601 {
2602 unsigned short rm, gm, bm;
2603 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2604
2605 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2606
2607 ShadeXImage (display, image, shade, rm, gm, bm);
2608 }
2609#endif
2610
2611 pixmap = XCreatePixmap (disp, vt,
2612 szHint.width, szHint.height, image->depth);
2613 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2614 XPutImage (disp, pixmap, gc, image, 0, 0,
2615 nx, ny, image->width, image->height);
2616 XFreeGC (disp, gc);
2617 XDestroyImage (image);
2618 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2619 XClearWindow (disp, parent[0]);
2620
2621 if (!am_transparent || !am_pixmap_trans)
2622 pchanged = 1;
2623
2624 am_transparent = am_pixmap_trans = 1;
2625 }
2626 }
2627
2628 if (am_pixmap_trans)
2629 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2630 else
2631 {
2632 unsigned int n;
2633 /*
2634 * InheritPixmap transparency
2635 */
2636 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2637 {
2638 oldp = parent[i];
2639 XQueryTree (disp, parent[i - 1], &root,
2640 &parent[i], &list, &n);
2641 XFree (list);
2642
2643 if (parent[i] == display->root)
2644 {
2645 if (oldp != None)
2646 pchanged = 1;
2647
2648 break;
2649 }
2650
2651 if (oldp != parent[i])
2652 pchanged = 1;
2653 }
2654
2655 n = 0;
2656
2657 if (pchanged)
2658 {
2659 for (; n < (unsigned int)i; n++)
2660 {
2661 XGetWindowAttributes (disp, parent[n], &wattr);
2662 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2663 {
2664 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2665 break;
2666 }
2667 }
2668 }
2669
2670 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2671 {
2672 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2673 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2674 am_transparent = 0;
2675 /* XXX: also turn off Opt_transparent? */
2676 }
2677 else
2678 {
2679#if WAIT_FOR_WM
2680 /* wait (an arbitrary period) for the WM to do its thing
2681 * needed for fvwm2.2.2 (and before?) */
2682 sleep (1);
2683#endif
2684 for (n = 0; n < (unsigned int)i; n++)
2685 {
2686 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2687 XClearWindow (disp, parent[n]);
2688 }
2689
2690 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2691 am_transparent = 1;
2692 }
2693
2694 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2695 parent[i] = None;
2696 }
2697
2698 if (scrollBar.win)
2699 {
2700 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2701 scrollBar.setIdle ();
2702 scrollbar_show (0);
2703 }
2704
2705 if (am_transparent)
2706 {
2707 want_refresh = want_full_refresh = 1;
2708 if (am_pixmap_trans)
2709 flush ();
2710 }
2711
2712 return pchanged;
2713}
2714#endif
2715 2185
2716/*}}} */ 2186/*}}} */
2717 2187
2718bool 2188bool
2719rxvt_term::cmd_parse () 2189rxvt_term::cmd_parse ()
… …
2768 if (ch == C0_LF) 2238 if (ch == C0_LF)
2769 nlines++; 2239 nlines++;
2770 2240
2771 refresh_count++; 2241 refresh_count++;
2772 2242
2773 if (!OPTION (Opt_jumpScroll) 2243 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2775 { 2244 {
2776 refreshnow = true;
2777 refresh_count = 0; 2245 refresh_count = 0;
2246
2247 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2248 {
2249 refreshnow = true;
2778 ch = NOCHAR; 2250 ch = NOCHAR;
2779 break; 2251 break;
2252 }
2780 } 2253 }
2781 2254
2782 // scr_add_lines only works for nlines <= nrow - 1. 2255 // scr_add_lines only works for nlines <= nrow - 1.
2783 if (nlines >= nrow - 1) 2256 if (nlines >= nrow - 1)
2784 { 2257 {
2258 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2259 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2786 scr_add_lines (buf, str - buf, nlines); 2260 scr_add_lines (buf, str - buf, nlines);
2787 2261
2788 nlines = 0; 2262 nlines = 0;
2789 str = buf; 2263 str = buf;
2790 eol = str + min (ncol, UBUFSIZ); 2264 eol = str + min (ncol, UBUFSIZ);
… …
2805 2279
2806 seq_begin = cmdbuf_ptr; 2280 seq_begin = cmdbuf_ptr;
2807 ch = next_char (); 2281 ch = next_char ();
2808 } 2282 }
2809 2283
2284 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2285 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2811 scr_add_lines (buf, str - buf, nlines); 2286 scr_add_lines (buf, str - buf, nlines);
2812 2287
2813 /* 2288 /*
2814 * If there have been a lot of new lines, then update the screen 2289 * If there have been a lot of new lines, then update the screen
2815 * What the heck I'll cheat and only refresh less than every page-full. 2290 * What the heck we'll cheat and only refresh less than every page-full.
2816 * the number of pages between refreshes is refresh_limit, which 2291 * if skipScroll is enabled.
2817 * is incremented here because we must be doing flat-out scrolling.
2818 */ 2292 */
2819 if (refreshnow) 2293 if (refreshnow)
2820 { 2294 {
2821 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2822 refresh_limit++;
2823 else
2824 {
2825 flag = true; 2295 flag = true;
2826 scr_refresh (refresh_type); 2296 scr_refresh ();
2827 want_refresh = 1; 2297 want_refresh = 1;
2828 }
2829 } 2298 }
2830 2299
2831 } 2300 }
2832 else 2301 else
2833 { 2302 {
… …
2849 return flag; 2318 return flag;
2850} 2319}
2851 2320
2852// read the next character 2321// read the next character
2853wchar_t 2322wchar_t
2854rxvt_term::next_char () 2323rxvt_term::next_char () NOTHROW
2855{ 2324{
2856 while (cmdbuf_ptr < cmdbuf_endp) 2325 while (cmdbuf_ptr < cmdbuf_endp)
2857 { 2326 {
2858 // assume 7-bit to be ascii ALWAYS 2327 // assume 7-bit to be ascii ALWAYS
2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2328 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 return NOCHAR; 2349 return NOCHAR;
2881} 2350}
2882 2351
2883// read the next octet 2352// read the next octet
2884uint32_t 2353uint32_t
2885rxvt_term::next_octet () 2354rxvt_term::next_octet () NOTHROW
2886{ 2355{
2887 return cmdbuf_ptr < cmdbuf_endp 2356 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++ 2357 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR; 2358 : NOCHAR;
2890} 2359}
2360
2361static class out_of_input out_of_input;
2891 2362
2892/* rxvt_cmd_getc () - Return next input character */ 2363/* rxvt_cmd_getc () - Return next input character */
2893/* 2364/*
2894 * Return the next input character after first passing any keyboard input 2365 * Return the next input character after first passing any keyboard input
2895 * to the command. 2366 * to the command.
2896 */ 2367 */
2897wchar_t 2368wchar_t
2898rxvt_term::cmd_getc () 2369rxvt_term::cmd_getc () THROW ((class out_of_input))
2899{ 2370{
2900 wchar_t c = next_char (); 2371 wchar_t c = next_char ();
2901 2372
2902 if (c == NOCHAR) 2373 if (c == NOCHAR)
2903 throw out_of_input; 2374 throw out_of_input;
2904 2375
2905 return c; 2376 return c;
2906} 2377}
2907 2378
2908uint32_t 2379uint32_t
2909rxvt_term::cmd_get8 () 2380rxvt_term::cmd_get8 () THROW ((class out_of_input))
2910{ 2381{
2911 uint32_t c = next_octet (); 2382 uint32_t c = next_octet ();
2912 2383
2913 if (c == NOCHAR) 2384 if (c == NOCHAR)
2914 throw out_of_input; 2385 throw out_of_input;
… …
2980 { 2451 {
2981 if ((buf[len++] = cmd_getc ()) == 'i') 2452 if ((buf[len++] = cmd_getc ()) == 'i')
2982 break; /* done = 1 */ 2453 break; /* done = 1 */
2983 } 2454 }
2984 } 2455 }
2985 2456
2986 for (i = 0; i < len; i++) 2457 for (i = 0; i < len; i++)
2987 if (putc (buf[i], fd) == EOF) 2458 if (putc (buf[i], fd) == EOF)
2988 { 2459 {
2989 done = 1; 2460 done = 1;
2990 break; 2461 break;
… …
2992 } 2463 }
2993 } 2464 }
2994 2465
2995 pclose_printer (fd); 2466 pclose_printer (fd);
2996} 2467}
2997#endif /* PRINTPIPE */ 2468#endif /* PRINTPIPE */
2998/*}}} */ 2469/*}}} */
2999 2470
3000/* *INDENT-OFF* */ 2471/* *INDENT-OFF* */
3001enum { 2472enum {
3002 C1_40 = 0x40, 2473 C1_40 = 0x40,
… …
3052 process_dcs_seq (); 2523 process_dcs_seq ();
3053 break; 2524 break;
3054 case 0x9b: /* CSI */ 2525 case 0x9b: /* CSI */
3055 process_csi_seq (); 2526 process_csi_seq ();
3056 break; 2527 break;
3057 case 0x9d: /* CSI */ 2528 case 0x9d: /* OSC */
3058 process_osc_seq (); 2529 process_osc_seq ();
3059 break; 2530 break;
3060#endif 2531#endif
3061 } 2532 }
3062} 2533}
… …
3152 scr_charset_set (2, (unsigned int)cmd_getc ()); 2623 scr_charset_set (2, (unsigned int)cmd_getc ());
3153 break; 2624 break;
3154 case '+': 2625 case '+':
3155 scr_charset_set (3, (unsigned int)cmd_getc ()); 2626 scr_charset_set (3, (unsigned int)cmd_getc ());
3156 break; 2627 break;
3157#if ENABLE_FRILLS 2628#if !ENABLE_MINIMAL
3158 case '6': 2629 case '6':
3159 scr_backindex (); 2630 scr_backindex ();
3160 break; 2631 break;
3161#endif 2632#endif
3162 case '7': 2633 case '7':
3163 scr_cursor (SAVE); 2634 scr_cursor (SAVE);
3164 break; 2635 break;
3165 case '8': 2636 case '8':
3166 scr_cursor (RESTORE); 2637 scr_cursor (RESTORE);
3167 break; 2638 break;
3168#if ENABLE_FRILLS 2639#if !ENABLE_MINIMAL
3169 case '9': 2640 case '9':
3170 scr_forwardindex (); 2641 scr_forwardindex ();
3171 break; 2642 break;
3172#endif 2643#endif
3173 case '=': 2644 case '=':
… …
3288rxvt_term::process_csi_seq () 2759rxvt_term::process_csi_seq ()
3289{ 2760{
3290 unicode_t ch, priv, i; 2761 unicode_t ch, priv, i;
3291 unsigned int nargs, p; 2762 unsigned int nargs, p;
3292 int n, ndef; 2763 int n, ndef;
3293 int arg[ESC_ARGS]; 2764 int arg[ESC_ARGS] = { };
3294 2765
3295 for (nargs = ESC_ARGS; nargs > 0;) 2766 nargs = 0;
3296 arg[--nargs] = 0;
3297 2767
3298 priv = 0; 2768 priv = 0;
3299 ch = cmd_getc (); 2769 ch = cmd_getc ();
3300 if (ch >= '<' && ch <= '?') 2770 if (ch >= '<' && ch <= '?')
2771 {
3301 { /* '<' '=' '>' '?' */ 2772 /* '<' '=' '>' '?' */
3302 priv = ch; 2773 priv = ch;
3303 ch = cmd_getc (); 2774 ch = cmd_getc ();
3304 } 2775 }
3305 2776
3306 /* read any numerical arguments */ 2777 /* read any numerical arguments */
… …
3335 ndef = get_byte_array_bit (csi_defaults, i); 2806 ndef = get_byte_array_bit (csi_defaults, i);
3336 for (p = 0; p < nargs; p++) 2807 for (p = 0; p < nargs; p++)
3337 if (arg[p] == -1) 2808 if (arg[p] == -1)
3338 arg[p] = ndef; 2809 arg[p] = ndef;
3339 2810
3340#ifdef DEBUG_CMD
3341 fprintf (stderr, "CSI ");
3342 for (p = 0; p < nargs; p++)
3343 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3344 fprintf (stderr, "%c\n", ch);
3345#endif
3346
3347 /* 2811 /*
3348 * private mode handling 2812 * private mode handling
3349 */ 2813 */
3350 if (priv) 2814 if (priv)
3351 { 2815 {
3352 switch (priv) 2816 switch (priv)
3353 { 2817 {
3354 case '>': 2818 case '>':
3355 if (ch == CSI_DA) /* secondary device attributes */ 2819 if (ch == CSI_DA) /* secondary device attributes */
3356 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 }
3357 break; 2830 break;
3358 case '?': 2831 case '?':
3359 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2832 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3360 process_terminal_mode (ch, priv, nargs, arg); 2833 process_terminal_mode (ch, priv, nargs, arg);
3361 break; 2834 break;
… …
3487 break; 2960 break;
3488 case 6: /* CPR requested */ 2961 case 6: /* CPR requested */
3489 scr_report_position (); 2962 scr_report_position ();
3490 break; 2963 break;
3491 case 7: /* unofficial extension */ 2964 case 7: /* unofficial extension */
3492 if (OPTION (Opt_insecure)) 2965 if (option (Opt_insecure))
3493 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2966 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3494 break; 2967 break;
3495 case 8: /* unofficial extension */ 2968 case 8: /* unofficial extension */
3496 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2969 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3497 break; 2970 break;
… …
3564 break; 3037 break;
3565 case CSI_75: 3038 case CSI_75:
3566 scr_cursor (RESTORE); 3039 scr_cursor (RESTORE);
3567 break; 3040 break;
3568 3041
3569#if ENABLE_FRILLS 3042#if !ENABLE_MINIMAL
3570 case CSI_74: 3043 case CSI_74:
3571 process_window_ops (arg, nargs); 3044 process_window_ops (arg, nargs);
3572 break; 3045 break;
3573#endif 3046#endif
3574 3047
… …
3581 break; 3054 break;
3582 } 3055 }
3583} 3056}
3584/*}}} */ 3057/*}}} */
3585 3058
3586#if ENABLE_FRILLS 3059#if !ENABLE_MINIMAL
3587/* ARGSUSED */ 3060/* ARGSUSED */
3588void 3061void
3589rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3062rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3590{ 3063{
3591 int x, y; 3064 int x, y;
3592 XWindowAttributes wattr; 3065 XWindowAttributes wattr;
3593 Window wdummy; 3066 Window wdummy;
3594 dDisp; 3067
3068 dLocal (Display *, dpy);
3595 3069
3596 if (nargs == 0) 3070 if (nargs == 0)
3597 return; 3071 return;
3598 3072
3599 switch (args[0]) 3073 switch (args[0])
3600 { 3074 {
3601 /* 3075 /*
3602 * commands 3076 * commands
3603 */ 3077 */
3604 case 1: /* deiconify window */ 3078 case 1: /* deiconify window */
3605 XMapWindow (disp, parent[0]); 3079 XMapWindow (dpy, parent[0]);
3606 break; 3080 break;
3607 case 2: /* iconify window */ 3081 case 2: /* iconify window */
3608 XIconifyWindow (disp, parent[0], display->screen); 3082 XIconifyWindow (dpy, parent[0], display->screen);
3609 break; 3083 break;
3610 case 3: /* set position (pixels) */ 3084 case 3: /* set position (pixels) */
3611 XMoveWindow (disp, parent[0], args[1], args[2]); 3085 XMoveWindow (dpy, parent[0], args[1], args[2]);
3612 break; 3086 break;
3613 case 4: /* set size (pixels) */ 3087 case 4: /* set size (pixels) */
3614 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3088 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3615 break; 3089 break;
3616 case 5: /* raise window */ 3090 case 5: /* raise window */
3617 XRaiseWindow (disp, parent[0]); 3091 XRaiseWindow (dpy, parent[0]);
3618 break; 3092 break;
3619 case 6: /* lower window */ 3093 case 6: /* lower window */
3620 XLowerWindow (disp, parent[0]); 3094 XLowerWindow (dpy, parent[0]);
3621 break; 3095 break;
3622 case 7: /* refresh window */ 3096 case 7: /* refresh window */
3623 scr_touch (true); 3097 scr_touch (true);
3624 break; 3098 break;
3625 case 8: /* set size (chars) */ 3099 case 8: /* set size (chars) */
… …
3632 if (args[0] >= 24) /* set height (chars) */ 3106 if (args[0] >= 24) /* set height (chars) */
3633 set_widthheight ((unsigned int)width, 3107 set_widthheight ((unsigned int)width,
3634 (unsigned int) (args[1] * fheight)); 3108 (unsigned int) (args[1] * fheight));
3635 break; 3109 break;
3636 3110
3637
3638 /* 3111 /*
3639 * reports - some output format copied from XTerm 3112 * reports - some output format copied from XTerm
3640 */ 3113 */
3641 case 11: /* report window state */ 3114 case 11: /* report window state */
3642 XGetWindowAttributes (disp, parent[0], &wattr); 3115 XGetWindowAttributes (dpy, parent[0], &wattr);
3643 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3116 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3644 break; 3117 break;
3645 case 13: /* report window position */ 3118 case 13: /* report window position */
3646 XGetWindowAttributes (disp, parent[0], &wattr); 3119 XGetWindowAttributes (dpy, parent[0], &wattr);
3647 XTranslateCoordinates (disp, parent[0], wattr.root, 3120 XTranslateCoordinates (dpy, parent[0], wattr.root,
3648 -wattr.border_width, -wattr.border_width, 3121 -wattr.border_width, -wattr.border_width,
3649 &x, &y, &wdummy); 3122 &x, &y, &wdummy);
3650 tt_printf ("\033[3;%d;%dt", x, y); 3123 tt_printf ("\033[3;%d;%dt", x, y);
3651 break; 3124 break;
3652 case 14: /* report window size (pixels) */ 3125 case 14: /* report window size (pixels) */
3653 XGetWindowAttributes (disp, parent[0], &wattr); 3126 XGetWindowAttributes (dpy, parent[0], &wattr);
3654 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3127 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3655 break; 3128 break;
3656 case 18: /* report text area size (chars) */ 3129 case 18: /* report text area size (chars) */
3657 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3130 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3658 break; 3131 break;
… …
3660 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3661 break; 3134 break;
3662 case 20: /* report icon label */ 3135 case 20: /* report icon label */
3663 { 3136 {
3664 char *s; 3137 char *s;
3665 XGetIconName (disp, parent[0], &s); 3138 XGetIconName (dpy, parent[0], &s);
3666 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 */
3667 XFree (s); 3140 XFree (s);
3668 } 3141 }
3669 break; 3142 break;
3670 case 21: /* report window title */ 3143 case 21: /* report window title */
3671 { 3144 {
3672 char *s; 3145 char *s;
3673 XFetchName (disp, parent[0], &s); 3146 XFetchName (dpy, parent[0], &s);
3674 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 */
3675 XFree (s); 3148 XFree (s);
3676 } 3149 }
3677 break; 3150 break;
3678 } 3151 }
3679} 3152}
… …
3706 seen_esc = true; 3179 seen_esc = true;
3707 continue; 3180 continue;
3708 } 3181 }
3709 else if (ch == C0_BEL || ch == CHAR_ST) 3182 else if (ch == C0_BEL || ch == CHAR_ST)
3710 break; 3183 break;
3184 else if (ch == C0_SYN)
3185 ch = cmd_get8 ();
3711 else if (ch < 0x20) 3186 else if (ch < 0x20)
3712 return NULL; /* other control character - exit */ 3187 return NULL; /* other control character - exit */
3713 3188
3714 seen_esc = false; 3189 seen_esc = false;
3715 3190
3716 if (n >= STRING_MAX - 1) 3191 if (n >= STRING_MAX - 1)
3717 // stop at some sane length 3192 // stop at some sane length
3718 return NULL; 3193 return NULL;
3719 3194
3720 if (ch == C0_SYN)
3721 string[n++] = cmd_get8 ();
3722 else
3723 string[n++] = ch; 3195 string[n++] = ch;
3724 } 3196 }
3725 3197
3726 string[n++] = '\0'; 3198 string[n++] = '\0';
3727 3199
3728 ends_how = (ch == 0x5c ? C0_ESC : ch); 3200 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3779void 3251void
3780rxvt_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)
3781{ 3253{
3782 if (str[0] == '?' && !str[1]) 3254 if (str[0] == '?' && !str[1])
3783 { 3255 {
3784 unsigned short r, g, b; 3256 rgba c;
3785 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
3786 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);
3787 } 3265 }
3788 else 3266 else
3789 set_window_color (color, str); 3267 set_window_color (color, str);
3790} 3268}
3791 3269
… …
3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3271 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3794 */ 3272 */
3795void 3273void
3796rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3274rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3797{ 3275{
3798 int changed = 0;
3799 int color; 3276 int color;
3800 char *buf, *name; 3277 char *buf, *name;
3801 bool query = str[0] == '?' && !str[1]; 3278 bool query = str[0] == '?' && !str[1];
3802 int saveop = op; 3279 int saveop = op;
3803 dDisp; 3280
3281 dLocal (Display *, dpy);
3804 3282
3805 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
3806 switch (op) 3288 switch (op)
3807 { 3289 {
3808 case XTerm_name: 3290 case XTerm_name:
3809 set_title (str); 3291 set_title (str);
3810 /* FALLTHROUGH */ 3292 /* FALLTHROUGH */
… …
3824 unsigned long bytes_after; 3306 unsigned long bytes_after;
3825 unsigned char *value = 0; 3307 unsigned char *value = 0;
3826 const char *str = ""; 3308 const char *str = "";
3827 3309
3828 if (prop 3310 if (prop
3829 && XGetWindowProperty (disp, parent[0], 3311 && XGetWindowProperty (dpy, parent[0],
3830 prop, 0, 1<<16, 0, AnyPropertyType, 3312 prop, 0, 1<<16, 0, AnyPropertyType,
3831 &actual_type, &actual_format, 3313 &actual_type, &actual_format,
3832 &nitems, &bytes_after, &value) == Success 3314 &nitems, &bytes_after, &value) == Success
3833 && actual_type != None 3315 && actual_type != None
3834 && actual_format == 8) 3316 && actual_format == 8)
3835 str = (const char *)(value); 3317 str = (const char *)(value);
3836 3318
3837 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3319 tt_printf ("\033]%d;%s%c", op, str, resp);
3838 3320
3839 XFree (value); 3321 XFree (value);
3840 } 3322 }
3841 else 3323 else
3842 { 3324 {
… …
3846 { 3328 {
3847 *eq = 0; 3329 *eq = 0;
3848 set_utf8_property (display->atom (str), eq + 1); 3330 set_utf8_property (display->atom (str), eq + 1);
3849 } 3331 }
3850 else 3332 else
3851 XDeleteProperty (disp, parent[0], 3333 XDeleteProperty (dpy, parent[0],
3852 display->atom (str)); 3334 display->atom (str));
3853 } 3335 }
3854 break; 3336 break;
3855 3337
3856 case XTerm_Color: 3338 case XTerm_Color:
… …
3860 break; 3342 break;
3861 3343
3862 *name++ = '\0'; 3344 *name++ = '\0';
3863 color = atoi (buf) + minCOLOR; 3345 color = atoi (buf) + minCOLOR;
3864 3346
3865 if (!IN_RANGE_EXC (color, minCOLOR, TOTAL_COLORS)) 3347 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3866 break; 3348 break;
3867 3349
3868 if ((buf = strchr (name, ';')) != NULL) 3350 if ((buf = strchr (name, ';')) != NULL)
3869 *buf++ = '\0'; 3351 *buf++ = '\0';
3870 3352
3871 if (name[0] == '?' && !name[1]) 3353 process_color_seq (op, color, name, resp);
3872 {
3873 unsigned short r, g, b;
3874 pix_colors_focused[color].get (display, r, g, b);
3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3876 }
3877 else
3878 set_window_color (color, name);
3879 } 3354 }
3880 break; 3355 break;
3881 case XTerm_Color00: 3356 case XTerm_Color00:
3882 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3357 process_color_seq (op, Color_fg, str, resp);
3883 break; 3358 break;
3884 case XTerm_Color01: 3359 case XTerm_Color01:
3885 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3360 process_color_seq (op, Color_bg, str, resp);
3886 break; 3361 break;
3887#ifndef NO_CURSORCOLOR 3362#ifndef NO_CURSORCOLOR
3888 case XTerm_Color_cursor: 3363 case XTerm_Color_cursor:
3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3364 process_color_seq (op, Color_cursor, str, resp);
3890 break; 3365 break;
3891#endif 3366#endif
3892 case XTerm_Color_pointer_fg: 3367 case XTerm_Color_pointer_fg:
3893 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3368 process_color_seq (op, Color_pointer_fg, str, resp);
3894 break; 3369 break;
3895 case XTerm_Color_pointer_bg: 3370 case XTerm_Color_pointer_bg:
3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3371 process_color_seq (op, Color_pointer_bg, str, resp);
3897 break; 3372 break;
3898#ifndef NO_BOLD_UNDERLINE_REVERSE 3373#ifndef NO_BOLD_UNDERLINE_REVERSE
3899 case XTerm_Color_BD:
3900 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3901 break;
3902 case XTerm_Color_UL:
3903 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3904 break;
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);
3376 break;
3377 case Rxvt_Color_BD:
3378 case URxvt_Color_BD:
3379 process_color_seq (op, Color_BD, str, resp);
3380 break;
3381 case Rxvt_Color_UL:
3382 case URxvt_Color_UL:
3383 process_color_seq (op, Color_UL, str, resp);
3907 break; 3384 break;
3908 case URxvt_Color_IT: 3385 case URxvt_Color_IT:
3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3386 process_color_seq (op, Color_IT, str, resp);
3910 break; 3387 break;
3911#endif 3388#endif
3912#if TRANSPARENT && TINTING 3389#if ENABLE_TRANSPARENCY
3913 case URxvt_Color_tint: 3390 case URxvt_Color_tint:
3914 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3391 process_color_seq (op, Color_tint, str, resp);
3915 check_our_parents (); 3392 {
3916 if (am_transparent) 3393 bool changed = false;
3917 want_full_refresh = want_refresh = 1; 3394 if (ISSET_PIXCOLOR (Color_tint))
3918 break; 3395 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3919#endif 3396 else
3397 changed = bgPixmap.unset_tint ();
3398 if (changed)
3399 update_background ();
3400 }
3920 3401
3402 break;
3403#endif
3404
3405#if BG_IMAGE_FROM_FILE
3921 case XTerm_Pixmap: 3406 case Rxvt_Pixmap:
3922 if (*str != ';') 3407 if (!strcmp (str, "?"))
3923 { 3408 {
3924#if XPM_BACKGROUND 3409 char str[256];
3925 scale_pixmap (""); /* reset to default scaling */ 3410
3926 set_bgPixmap (str); /* change pixmap */ 3411 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3927 scr_touch (true); 3412 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3928#endif 3413 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3414 process_xterm_seq (XTerm_title, str, CHAR_ST);
3929 } 3415 }
3930 3416 else
3931 while ((str = strchr (str, ';')) != NULL)
3932 { 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 {
3933 str++; 3432 str++;
3934#if XPM_BACKGROUND 3433 if (bgPixmap.set_geometry (str))
3935 changed += scale_pixmap (str); 3434 changed++;
3936#endif 3435 str = strchr (str, ';');
3436 }
3437 if (changed)
3438 update_background ();
3937 } 3439 }
3938
3939 if (changed)
3940 {
3941#ifdef XPM_BACKGROUND
3942 resize_pixmap ();
3943 scr_touch (true);
3944#endif
3945 }
3946 break; 3440 break;
3441#endif
3947 3442
3948 case XTerm_restoreFG: 3443 case Rxvt_restoreFG:
3949 set_window_color (Color_fg, str); 3444 set_window_color (Color_fg, str);
3950 break; 3445 break;
3951 case XTerm_restoreBG: 3446 case Rxvt_restoreBG:
3952 set_window_color (Color_bg, str); 3447 set_window_color (Color_bg, str);
3953 break; 3448 break;
3954 3449
3955 case XTerm_logfile: 3450 case XTerm_logfile:
3956 // TODO, when secure mode? 3451 // TODO, when secure mode?
3957 break; 3452 break;
3958 3453
3959#ifdef MENUBAR
3960 case URxvt_Menu:
3961 if (OPTION (Opt_insecure))
3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3963 break;
3964#endif
3965#if 0 3454#if 0
3966 case XTerm_dumpscreen: /* no error notices */ 3455 case Rxvt_dumpscreen: /* no error notices */
3967 { 3456 {
3968 int fd; 3457 int fd;
3969 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)
3970 { 3459 {
3971 scr_dump (fd); 3460 scr_dump (fd);
… …
3982 case URxvt_italicFont: 3471 case URxvt_italicFont:
3983 case URxvt_boldItalicFont: 3472 case URxvt_boldItalicFont:
3984#endif 3473#endif
3985 if (query) 3474 if (query)
3986 tt_printf ("\33]%d;%-.250s%c", saveop, 3475 tt_printf ("\33]%d;%-.250s%c", saveop,
3987 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3476 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3988 ? fontset[op - URxvt_font]->fontdesc : "", 3477 ? fontset[op - URxvt_font]->fontdesc : "",
3989 resp); 3478 resp);
3990 else 3479 else
3991 { 3480 {
3992 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3481 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3995 allocated.push_back ((void *)res); 3484 allocated.push_back ((void *)res);
3996 set_fonts (); 3485 set_fonts ();
3997 } 3486 }
3998 break; 3487 break;
3999 3488
4000#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
4001 case URxvt_locale: 3498 case URxvt_locale:
4002 if (query) 3499 if (query)
4003 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);
4004 else 3501 else
4005 { 3502 {
4006 set_locale (str); 3503 set_locale (str);
4007 pty.set_utf8_mode (enc_utf8); 3504 pty->set_utf8_mode (enc_utf8);
4008 init_xlocale (); 3505 init_xlocale ();
4009 } 3506 }
4010 break; 3507 break;
4011 3508
4012 case URxvt_view_up: 3509 case URxvt_view_up:
… …
4023 break; 3520 break;
4024#endif 3521#endif
4025 3522
4026#if ENABLE_PERL 3523#if ENABLE_PERL
4027 case URxvt_perl: 3524 case URxvt_perl:
4028 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)))
4029 ; // no responses yet 3526 ; // no responses yet
4030 break; 3527 break;
4031#endif 3528#endif
4032 } 3529 }
4033} 3530}
… …
4065 return state; 3562 return state;
4066} 3563}
4067 3564
4068/* we're not using priv _yet_ */ 3565/* we're not using priv _yet_ */
4069void 3566void
4070rxvt_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)
4071{ 3568{
4072 unsigned int i, j; 3569 unsigned int i, j;
4073 int state; 3570 int state;
4074 3571
4075 static const struct 3572 static const struct
4076 { 3573 {
4077 const int argval; 3574 const int argval;
4078 const unsigned long bit; 3575 const unsigned long bit;
4079 }
4080
4081 argtopriv[] = { 3576 } argtopriv[] = {
4082 { 1, PrivMode_aplCUR }, 3577 { 1, PrivMode_aplCUR },
4083 { 2, PrivMode_vt52 }, 3578 { 2, PrivMode_vt52 },
4084 { 3, PrivMode_132 }, 3579 { 3, PrivMode_132 },
4085 { 4, PrivMode_smoothScroll }, 3580 { 4, PrivMode_smoothScroll },
4086 { 5, PrivMode_rVideo }, 3581 { 5, PrivMode_rVideo },
4087 { 6, PrivMode_relOrigin }, 3582 { 6, PrivMode_relOrigin },
4088 { 7, PrivMode_Autowrap }, 3583 { 7, PrivMode_Autowrap },
4089 // 8, bi-directional support mode 3584 // 8, bi-directional support mode
4090 { 9, PrivMode_MouseX10 }, 3585 { 9, PrivMode_MouseX10 },
4091#ifdef menuBar_esc
4092 { menuBar_esc, PrivMode_menuBar },
4093#endif
4094 // 18, 19 printing-related 3586 // 18, 19 printing-related
4095 { 25, PrivMode_VisibleCursor }, 3587 { 25, PrivMode_VisibleCursor },
4096#ifdef scrollBar_esc 3588#ifdef scrollBar_esc
4097 { scrollBar_esc, PrivMode_scrollBar }, 3589 { scrollBar_esc, PrivMode_scrollBar },
4098#endif 3590#endif
… …
4105 { 66, PrivMode_aplKP }, 3597 { 66, PrivMode_aplKP },
4106#ifndef NO_BACKSPACE_KEY 3598#ifndef NO_BACKSPACE_KEY
4107 { 67, PrivMode_BackSpace }, 3599 { 67, PrivMode_BackSpace },
4108#endif 3600#endif
4109 { 1000, PrivMode_MouseX11 }, 3601 { 1000, PrivMode_MouseX11 },
4110 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3602 { 1002, PrivMode_MouseBtnEvent },
4111 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3603 { 1003, PrivMode_MouseAnyEvent },
4112 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4113 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3604 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4114 { 1011, PrivMode_Keypress }, // rxvt extension 3605 { 1011, PrivMode_Keypress }, // rxvt extension
4115 // 1035 enable modifiers for alt, numlock NYI 3606 // 1035 enable modifiers for alt, numlock NYI
4116 // 1036 send ESC for meta keys NYI 3607 // 1036 send ESC for meta keys NYI
4117 // 1037 send DEL for keypad delete NYI 3608 // 1037 send DEL for keypad delete NYI
… …
4152 scr_touch (true); 3643 scr_touch (true);
4153 break; 3644 break;
4154#endif 3645#endif
4155 case 1048: /* alternative cursor save */ 3646 case 1048: /* alternative cursor save */
4156 case 1049: 3647 case 1049:
4157 if (OPTION (Opt_secondaryScreen)) 3648 if (option (Opt_secondaryScreen))
4158 if (mode == 0) 3649 if (mode == 0)
4159 scr_cursor (RESTORE); 3650 scr_cursor (RESTORE);
4160 else if (mode == 1) 3651 else if (mode == 1)
4161 scr_cursor (SAVE); 3652 scr_cursor (SAVE);
4162 break; 3653 break;
… …
4191 scr_autowrap (state); 3682 scr_autowrap (state);
4192 break; 3683 break;
4193 /* 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 */
4194 case 9: /* X10 mouse reporting */ 3685 case 9: /* X10 mouse reporting */
4195 if (state) /* orthogonal */ 3686 if (state) /* orthogonal */
4196 priv_modes &= ~PrivMode_MouseX11; 3687 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4197 break; 3688 break;
4198#ifdef menuBar_esc
4199 case menuBar_esc:
4200#ifdef MENUBAR
4201 map_menuBar (state);
4202#endif
4203 break;
4204#endif
4205#ifdef scrollBar_esc 3689#ifdef scrollBar_esc
4206 case scrollBar_esc: 3690 case scrollBar_esc:
4207 if (scrollbar_mapping (state)) 3691 if (scrollbar_mapping (state))
4208 { 3692 {
4209 resize_all_windows (0, 0, 0); 3693 resize_all_windows (0, 0, 0);
… …
4221 break; 3705 break;
4222 /* case 66: - application key pad */ 3706 /* case 66: - application key pad */
4223 /* case 67: - backspace key */ 3707 /* case 67: - backspace key */
4224 case 1000: /* X11 mouse reporting */ 3708 case 1000: /* X11 mouse reporting */
4225 if (state) /* orthogonal */ 3709 if (state) /* orthogonal */
4226 priv_modes &= ~PrivMode_MouseX10; 3710 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4227 break; 3711 break;
4228#if 0
4229 case 1001: 3712 case 1002:
4230 break; /* X11 mouse highlighting */ 3713 case 1003:
4231#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;
4232 case 1010: /* scroll to bottom on TTY output inhibit */ 3724 case 1010: /* scroll to bottom on TTY output inhibit */
4233 set_option (Opt_scrollTtyOutput, !state); 3725 set_option (Opt_scrollTtyOutput, !state);
4234 break; 3726 break;
4235 case 1011: /* scroll to bottom on key press */ 3727 case 1011: /* scroll to bottom on key press */
4236 set_option (Opt_scrollTtyKeypress, state); 3728 set_option (Opt_scrollTtyKeypress, state);
4237 break; 3729 break;
4238 case 1047: /* secondary screen w/ clearing last */ 3730 case 1047: /* secondary screen w/ clearing last */
4239 if (OPTION (Opt_secondaryScreen)) 3731 if (option (Opt_secondaryScreen))
4240 if (current_screen != PRIMARY) 3732 if (current_screen != PRIMARY)
4241 scr_erase_screen (2); 3733 scr_erase_screen (2);
4242 scr_change_screen (state); 3734 scr_change_screen (state);
4243 break; 3735 break;
4244 case 1049: /* secondary screen w/ clearing first */ 3736 case 1049: /* secondary screen w/ clearing first */
4245 scr_change_screen (state); 3737 scr_change_screen (state);
4246 if (OPTION (Opt_secondaryScreen)) 3738 if (option (Opt_secondaryScreen))
4247 if (current_screen != PRIMARY) 3739 if (current_screen != PRIMARY)
4248 scr_erase_screen (2); 3740 scr_erase_screen (2);
4249 break; 3741 break;
4250 default: 3742 default:
4251 break; 3743 break;
… …
4379 scr_color (Color_bg, Color_bg); 3871 scr_color (Color_bg, Color_bg);
4380 break; 3872 break;
4381 3873
4382 //case 50: // not variable spacing 3874 //case 50: // not variable spacing
4383 3875
4384#if ENABLE_FRILLS 3876#if !ENABLE_MINIMAL
4385 case 90: 3877 case 90:
4386 case 91: /* set bright fg color */ 3878 case 91: /* set bright fg color */
4387 case 92: 3879 case 92:
4388 case 93: 3880 case 93:
4389 case 94: 3881 case 94:
… …
4413rxvt_term::process_graphics () 3905rxvt_term::process_graphics ()
4414{ 3906{
4415 unicode_t ch, cmd = cmd_getc (); 3907 unicode_t ch, cmd = cmd_getc ();
4416 3908
4417 if (cmd == 'Q') 3909 if (cmd == 'Q')
3910 {
4418 { /* query graphics */ 3911 /* query graphics */
4419 tt_printf ("\033G0\012"); /* no graphics */ 3912 tt_printf ("\033G0\012"); /* no graphics */
4420 return; 3913 return;
4421 } 3914 }
4422 /* swallow other graphics sequences until terminating ':' */ 3915 /* swallow other graphics sequences until terminating ':' */
4423 do 3916 do
… …
4454rxvt_term::tt_write (const char *data, unsigned int len) 3947rxvt_term::tt_write (const char *data, unsigned int len)
4455{ 3948{
4456 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)))
4457 return; 3950 return;
4458 3951
4459 if (pty.pty < 0) 3952 if (pty->pty < 0)
4460 return; 3953 return;
4461 3954
4462 if (v_buflen == 0) 3955 if (v_buflen == 0)
4463 { 3956 {
4464 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));
4465 3958
4466 if ((unsigned int)written == len) 3959 if ((unsigned int)written == len)
4467 return; 3960 return;
4468 3961
4469 data += written; 3962 data += written;
… …
4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3966 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4474 3967
4475 memcpy (v_buffer + v_buflen, data, len); 3968 memcpy (v_buffer + v_buflen, data, len);
4476 v_buflen += len; 3969 v_buflen += len;
4477 3970
4478 pty_ev.set (EVENT_READ | EVENT_WRITE); 3971 pty_ev.set (ev::READ | ev::WRITE);
4479} 3972}
4480 3973
4481void rxvt_term::pty_write () 3974void rxvt_term::pty_write ()
4482{ 3975{
4483 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));
4484 3977
4485 if (written > 0) 3978 if (written > 0)
4486 { 3979 {
4487 v_buflen -= written; 3980 v_buflen -= written;
4488 3981
4489 if (v_buflen == 0) 3982 if (v_buflen == 0)
4490 { 3983 {
4491 free (v_buffer); 3984 free (v_buffer);
4492 v_buffer = 0; 3985 v_buffer = 0;
4493 v_buflen = 0;
4494 3986
4495 pty_ev.set (EVENT_READ); 3987 pty_ev.set (ev::READ);
4496 return; 3988 return;
4497 } 3989 }
4498 3990
4499 memmove (v_buffer, v_buffer + written, v_buflen); 3991 memmove (v_buffer, v_buffer + written, v_buflen);
4500 } 3992 }
4501 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3993 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4502 pty_ev.set (EVENT_READ); 3994 pty_ev.set (ev::READ);
4503} 3995}
4504 3996
4505/*----------------------- end-of-file (C source) -----------------------*/ 3997/*----------------------- end-of-file (C source) -----------------------*/
4506 3998

Diff Legend

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