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.247 by root, Sat Jan 7 20:23:52 2006 UTC vs.
Revision 1.379 by root, Fri Dec 14 02:29:48 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) \
… …
867#endif 827#endif
868 /* nil */ ; 828 /* nil */ ;
869 } 829 }
870 } 830 }
871 831
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 832 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
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;
1001 int end_row = row + nrow;
978 1002
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1003 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1004 --row;
981 1005
982 while (row < -view_start + nrow) 1006 do
983 { 1007 {
984 int start_row = row; 1008 int start_row = row;
985 line_t *l; 1009 line_t *l;
986 1010
987 do 1011 do
988 { 1012 {
989 l = &ROW (row); 1013 l = &ROW (row++);
990 1014
991 if (!(l->f & LINE_FILTERED)) 1015 if (!(l->f & LINE_FILTERED))
992 { 1016 {
993 // line not filtered, mark it as filtered 1017 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1018 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1019 while (l->is_longer ())
996 { 1020 {
997 l = &ROW (++row); 1021 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1022 l->f |= LINE_FILTERED;
999 } 1023 }
1000 1024
1001 // and filter it 1025 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1026 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1027
1004 break; 1028 break;
1005 } 1029 }
1006 } 1030 }
1007 while (l->is_longer ()); 1031 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1032 }
1033 while (row < end_row);
1011 1034 }
1012 }
1013 1035
1014 scr_refresh (refresh_type); 1036 scr_refresh ();
1015 scrollbar_show (1); 1037 scrollbar_show (1);
1016#ifdef USE_XIM 1038#ifdef USE_XIM
1017 IMSendSpot (); 1039 IMSendSpot ();
1018#endif 1040#endif
1019 } 1041 }
1020 1042
1021 display->flush (); 1043 display->flush ();
1022} 1044}
1023 1045
1024void 1046void
1025rxvt_term::check_cb (check_watcher &w) 1047rxvt_term::prepare_cb (ev::prepare &w, int revents)
1026{ 1048{
1027 SET_R (this); 1049 make_current ();
1028 SET_LOCALE (locale);
1029 1050
1030 display->flush (); 1051 display->flush ();
1031 1052
1032 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.is_active ())
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1034} 1055}
1035 1056
1036void 1057void
1037rxvt_term::flush_cb (time_watcher &w) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1038{ 1059{
1039 SET_R (this); 1060 make_current ();
1040 SET_LOCALE (locale);
1041 1061
1042 refresh_limit = 1;
1043 refresh_count = 0; 1062 refresh_count = 0;
1044 flush (); 1063 flush ();
1045} 1064}
1046 1065
1047#ifdef CURSOR_BLINK 1066#ifdef CURSOR_BLINK
1048void 1067void
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1068rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1050{ 1069{
1051 hidden_cursor = !hidden_cursor; 1070 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1071 want_refresh = 1;
1053
1054 w.start (w.at + BLINK_INTERVAL);
1055} 1072}
1056#endif 1073#endif
1057 1074
1058#ifdef TEXT_BLINK 1075#ifdef TEXT_BLINK
1059void 1076void
1060rxvt_term::text_blink_cb (time_watcher &w) 1077rxvt_term::text_blink_cb (ev::timer &w, int revents)
1061{ 1078{
1062 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1063 { 1080 {
1064 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1065 want_refresh = 1; 1082 want_refresh = 1;
1066 w.start (w.at + TEXT_BLINK_INTERVAL);
1067 } 1083 }
1084 else
1085 w.stop ();
1068} 1086}
1069#endif 1087#endif
1070 1088
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void 1090void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1091rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1074{ 1092{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1093 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1094 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1095 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 else
1081 } 1097 w.stop ();
1082} 1098}
1083#endif 1099#endif
1084 1100
1085#ifdef SELECTION_SCROLLING 1101#ifdef SELECTION_SCROLLING
1086void 1102void
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1103rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1088{ 1104{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1105 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1106 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1107 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1108 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1109 }
1110 else
1111 w.stop ();
1096} 1112}
1097#endif 1113#endif
1098 1114
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void 1116void
1101rxvt_term::slip_wheel_cb (time_watcher &w) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1102{ 1118{
1103 if (mouse_slip_wheel_speed == 0 1119 if (scr_page (mouse_slip_wheel_speed < 0 ? DN : UP, abs (mouse_slip_wheel_speed)))
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1120 want_refresh = 1;
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1121
1122 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1106 { 1123 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1124 mouse_slip_wheel_speed = 0;
1110 1125 w.stop ();
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1126 }
1115} 1127}
1116#endif 1128#endif
1117 1129
1118#if HAVE_SCHED_YIELD 1130#if LINUX_YIELD_HACK
1119static struct event_handler 1131static struct event_handler
1120{ 1132{
1121 check_watcher cw_yield; 1133 ev::prepare yield_ev;
1122 1134
1123 void yield (check_watcher &w) 1135 void yield_cb (ev::prepare &w, int revents)
1124 { 1136 {
1125 sched_yield (); 1137 // this should really be sched_yield(), but the linux guys thought
1138 // that giving a process calling sched_yield () less cpu time than
1139 // ones with high nice levels is a useful thing to do. It surely is is
1140 // allowed by the sus... as is returning ENOSYS.
1141
1142 struct timespec ts = { 0, 0 };
1143 nanosleep (&ts, 0);
1144
1126 w.stop (); 1145 w.stop ();
1127 } 1146 }
1128 1147
1129 event_handler () 1148 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1149 : yield_ev (this, &event_handler::yield_cb)
1131 { 1150 {
1132 } 1151 }
1133} event_handler; 1152} event_handler;
1134#endif 1153#endif
1135 1154
… …
1146 1165
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1166 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1167 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1168 cmdbuf_endp = cmdbuf_ptr + n;
1150 1169
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1170 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1171
1153 if (r > 0) 1172 if (r > 0)
1154 { 1173 {
1155 cmdbuf_endp += r; 1174 cmdbuf_endp += r;
1156 return true; 1175 return true;
1157 } 1176 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1177 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1178 {
1160#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1161 if (display->is_local) 1180 if (display->is_local)
1162 event_handler.cw_yield.start (); 1181 event_handler.yield_ev.start ();
1163#endif 1182#endif
1164 } 1183 }
1165 else 1184 else
1166 { 1185 {
1167 pty_ev.stop (); 1186 pty_ev.stop ();
1168 1187
1169 if (!OPTION (Opt_hold)) 1188 if (!option (Opt_hold))
1170 destroy (); 1189 destroy ();
1171 } 1190 }
1172 1191
1173 return false; 1192 return false;
1174} 1193}
1175 1194
1176void 1195void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1196rxvt_term::pty_cb (ev::io &w, int revents)
1178{ 1197{
1179 SET_R (this); 1198 make_current ();
1180 SET_LOCALE (locale);
1181 1199
1182 if (revents & EVENT_READ) 1200 if (revents & ev::READ)
1183 // loop, but don't allow a single term to monopolize us 1201 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1202 while (pty_fill ())
1185 if (cmd_parse ()) 1203 if (cmd_parse ())
1186 break; 1204 break;
1187 1205
1188 if (revents & EVENT_WRITE) 1206 if (revents & ev::WRITE)
1189 pty_write (); 1207 pty_write ();
1190} 1208}
1191 1209
1192void 1210void
1193rxvt_term::pointer_unblank () 1211rxvt_term::pointer_unblank ()
1194{ 1212{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1213 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1214 recolour_cursor ();
1197 1215
1198#ifdef POINTER_BLANK 1216#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1217 hidden_pointer = 0;
1200 1218
1201 if (OPTION (Opt_pointerBlank)) 1219 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1220 pointer_ev.start (pointerBlankDelay);
1203#endif 1221#endif
1204} 1222}
1205 1223
1206#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1207void 1225void
1208rxvt_term::pointer_blank () 1226rxvt_term::pointer_blank ()
1209{ 1227{
1210 if (!OPTION (Opt_pointerBlank)) 1228 if (!option (Opt_pointerBlank))
1211 return; 1229 return;
1212 1230
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1231 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1232 XFlush (dpy);
1215 1233
1216 hidden_pointer = 1; 1234 hidden_pointer = 1;
1217} 1235}
1218 1236
1219void 1237void
1220rxvt_term::pointer_cb (time_watcher &w) 1238rxvt_term::pointer_cb (ev::timer &w, int revents)
1221{ 1239{
1222 SET_R (this); 1240 make_current ();
1223 SET_LOCALE (locale);
1224 1241
1225 pointer_blank (); 1242 pointer_blank ();
1226} 1243}
1227#endif 1244#endif
1228 1245
1229void 1246void
1230rxvt_term::mouse_report (XButtonEvent &ev) 1247rxvt_term::mouse_report (XButtonEvent &ev)
1231{ 1248{
1232 int button_number, key_state = 0; 1249 int button_number, key_state = 0;
1233 int x, y; 1250 int x, y;
1251 int code = 32;
1234 1252
1235 x = ev.x; 1253 x = Pixel2Col (ev.x);
1236 y = ev.y; 1254 y = Pixel2Row (ev.y);
1237 pixel_position (&x, &y); 1255 if (ev.type == MotionNotify)
1256 {
1257 if (x == mouse_row && y == mouse_col)
1258 return;
1259 mouse_row = x;
1260 mouse_col = y;
1261 code += 32;
1262 }
1238 1263
1239 if (MEvent.button == AnyButton) 1264 if (MEvent.button == AnyButton)
1240 button_number = 3; 1265 button_number = 3;
1241 else 1266 else
1242 { 1267 {
… …
1288 x + 1, 1313 x + 1,
1289 y + 1); 1314 y + 1);
1290#endif 1315#endif
1291 1316
1292 tt_printf ("\033[M%c%c%c", 1317 tt_printf ("\033[M%c%c%c",
1293 (32 + button_number + key_state), 1318 (code + button_number + key_state),
1294 (32 + x + 1), 1319 (32 + x + 1),
1295 (32 + y + 1)); 1320 (32 + y + 1));
1296} 1321}
1297
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307 1322
1308/*{{{ process an X event */ 1323/*{{{ process an X event */
1309void 1324void
1310rxvt_term::x_cb (XEvent &ev) 1325rxvt_term::x_cb (XEvent &ev)
1311{ 1326{
1312 dDisp; 1327 make_current ();
1313 1328
1314 SET_R (this); 1329 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1330
1317#if defined(CURSOR_BLINK) 1331 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1332 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1333 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1334 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1335
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1336 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1337 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1338 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1339 unsigned int unused_mask;
1347 1340
1348 switch (ev.type) 1341 switch (ev.type)
1349 { 1342 {
1350 case KeyPress: 1343 case KeyPress:
1351#if ISO_14755 1344 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1345 break;
1357 1346
1358 case KeyRelease: 1347 case KeyRelease:
1359 { 1348 key_release (ev.xkey);
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1361 KeySym ks;
1362
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif
1365
1366#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support
1368 if (iso14755buf)
1369 if (iso14755buf & ISO_14755_52)
1370 {
1371# if ENABLE_OVERLAY
1372 scr_overlay_off ();
1373# endif
1374# if ISO_14755
1375 // iso14755 part 5.2 handling: release time
1376 // first: controls
1377 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f)))
1380 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1382 commit_iso14755 ();
1383 return; // case-break;
1384 }
1385
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks)
1388 {
1389 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 ();
1391 return; // case-break;
1392 }
1393
1394 scr_bell ();
1395# endif
1396 iso14755buf = 0;
1397 break;
1398 }
1399 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1400 {
1401# if ENABLE_OVERLAY
1402 scr_overlay_off ();
1403# endif
1404 if (iso14755buf & ISO_14755_51)
1405 commit_iso14755 ();
1406#if ISO_14755
1407 else if (iso14755buf & ISO_14755_STARTED)
1408 {
1409 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1410
1411 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1412 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1413 }
1414# endif
1415 else
1416 iso14755buf = 0;
1417 }
1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1423
1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1425 if (!(ev.xkey.state & ControlMask))
1426 slip_wheel_ev.stop ();
1427 else if (ks == XK_Control_L || ks == XK_Control_R)
1428 mouse_slip_wheel_speed = 0;
1429#endif
1430 break; 1349 break;
1431 }
1432 1350
1433 case ButtonPress: 1351 case ButtonPress:
1434 button_press (ev.xbutton); 1352 button_press (ev.xbutton);
1435 break; 1353 break;
1436 1354
… …
1438 button_release (ev.xbutton); 1356 button_release (ev.xbutton);
1439 break; 1357 break;
1440 1358
1441 case ClientMessage: 1359 case ClientMessage:
1442 if (ev.xclient.format == 32 1360 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1361 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 1362 {
1363 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1364 {
1365 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1366 {
1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1367 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1368 {
1369 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446 destroy (); 1370 destroy ();
1371 }
1447#if ENABLE_EWMH 1372#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1373 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1374 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1375 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev); 1376 &ev);
1377#endif
1378 }
1379 }
1380#if ENABLE_XEMBED
1381 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1382 {
1383 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1384 focus_in ();
1385 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1386 focus_out ();
1387 }
1452#endif 1388#endif
1453 } 1389 }
1454#if ENABLE_XEMBED
1455 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1456 {
1457 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1458 focus_in ();
1459 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1460 focus_out ();
1461 }
1462#endif
1463#ifdef OFFIX_DND
1464 /* OffiX Dnd (drag 'n' drop) protocol */
1465 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1466 && (ev.xclient.data.l[0] == DndFile
1467 || ev.xclient.data.l[0] == DndDir
1468 || ev.xclient.data.l[0] == DndLink))
1469 {
1470 /* Get Dnd data */
1471 Atom ActualType;
1472 int ActualFormat;
1473 unsigned char *data;
1474 unsigned long Size, RemainingBytes;
1475
1476 XGetWindowProperty (disp, display->root,
1477 xa[XA_DNDSELECTION],
1478 0L, 1000000L,
1479 False, AnyPropertyType,
1480 &ActualType, &ActualFormat,
1481 &Size, &RemainingBytes,
1482 &data);
1483 set_string_property (XA_CUT_BUFFER0, data);
1484 XFree (data);
1485 selection_paste (display->root, XA_CUT_BUFFER0, true);
1486 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1487 }
1488#endif /* OFFIX_DND */
1489 break;
1490
1491 case MappingNotify:
1492 XRefreshKeyboardMapping (&ev.xmapping);
1493 break; 1390 break;
1494 1391
1495 /* 1392 /*
1496 * XXX: this is not the _current_ arrangement 1393 * XXX: this is not the _current_ arrangement
1497 * Here's my conclusion: 1394 * Here's my conclusion:
… …
1516 break; 1413 break;
1517 } 1414 }
1518 break; 1415 break;
1519 1416
1520 case FocusIn: 1417 case FocusIn:
1418 if (ev.xfocus.detail != NotifyInferior
1419 && ev.xfocus.detail != NotifyPointer
1420 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1421 focus_in ();
1522 break; 1422 break;
1523 1423
1524 case FocusOut: 1424 case FocusOut:
1425 if (ev.xfocus.detail != NotifyInferior
1426 && ev.xfocus.detail != NotifyPointer
1427 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1428 focus_out ();
1526 break; 1429 break;
1527 1430
1528 case ConfigureNotify: 1431 case ConfigureNotify:
1432 /* fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height); */
1529 if (ev.xconfigure.window == parent[0]) 1435 if (ev.xconfigure.window == parent[0])
1530 { 1436 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1438 ;
1533 1439
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1441 {
1536 seen_resize = 1; 1442 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 } 1444 }
1539 1445 else
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1446 {
1541 if (OPTION (Opt_transparent)) 1447#ifdef HAVE_BG_PIXMAP
1542 check_our_parents (); 1448 if (bgPixmap.window_position_sensitive ())
1449 update_background ();
1543#endif 1450#endif
1451 }
1452 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 } 1453 }
1545 break; 1454 break;
1546 1455
1547 case PropertyNotify: 1456 case PropertyNotify:
1457 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1459 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1460 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1461
1552 break; 1462 break;
1553 1463
1554 case SelectionClear: 1464 case SelectionClear:
1555 selection_clear (); 1465 selection_clear ();
… …
1565 break; 1475 break;
1566 1476
1567 case MapNotify: 1477 case MapNotify:
1568 mapped = 1; 1478 mapped = 1;
1569#ifdef TEXT_BLINK 1479#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1480 text_blink_ev.start ();
1571#endif 1481#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break; 1483 break;
1574 1484
1575 case UnmapNotify: 1485 case UnmapNotify:
… …
1577#ifdef TEXT_BLINK 1487#ifdef TEXT_BLINK
1578 text_blink_ev.stop (); 1488 text_blink_ev.stop ();
1579#endif 1489#endif
1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1490 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1581 break; 1491 break;
1582
1583#ifdef TRANSPARENT
1584 case ReparentNotify:
1585 rootwin_cb (ev);
1586 break;
1587#endif /* TRANSPARENT */
1588 1492
1589 case GraphicsExpose: 1493 case GraphicsExpose:
1590 case Expose: 1494 case Expose:
1591 if (ev.xany.window == vt) 1495 if (ev.xany.window == vt)
1592 { 1496 {
1593 do 1497 do
1498 {
1594 scr_expose (ev.xexpose.x, ev.xexpose.y, 1499 scr_expose (ev.xexpose.x, ev.xexpose.y,
1595 ev.xexpose.width, ev.xexpose.height, False); 1500 ev.xexpose.width, ev.xexpose.height, False);
1501 }
1596 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1502 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1597 1503
1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1504 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1599 1505
1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1506 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1507 {
1601 scr_expose (ev.xexpose.x, ev.xexpose.y, 1508 scr_expose (ev.xexpose.x, ev.xexpose.y,
1602 ev.xexpose.width, ev.xexpose.height, False); 1509 ev.xexpose.width, ev.xexpose.height, False);
1603 1510 }
1604 scr_refresh (refresh_type); 1511 want_refresh = 1;
1605 } 1512 }
1606 else 1513 else
1607 { 1514 {
1608 XEvent unused_event; 1515 XEvent unused_event;
1609 1516
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1517 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1611 ; 1518 ;
1612 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1519 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1613 ; 1520 ;
1614 1521
1615 if (isScrollbarWindow (ev.xany.window)) 1522 if (isScrollbarWindow (ev.xany.window))
1616 { 1523 {
1617 scrollBar.setIdle (); 1524 scrollBar.setIdle ();
1618 scrollbar_show (0); 1525 scrollbar_show (0);
1619 } 1526 }
1620#ifdef MENUBAR
1621 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1622 menubar_expose ();
1623#endif
1624
1625#ifdef TRANSPARENT
1626 if (am_transparent && ev.xany.window == parent[0])
1627 XClearWindow (disp, ev.xany.window);
1628#endif
1629 } 1527 }
1630 break; 1528 break;
1631 1529
1632 case MotionNotify: 1530 case MotionNotify:
1633#ifdef POINTER_BLANK 1531#ifdef POINTER_BLANK
1634 if (hidden_pointer) 1532 if (hidden_pointer)
1635 pointer_unblank (); 1533 pointer_unblank ();
1636#endif 1534#endif
1637#if MENUBAR 1535 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1638 if (isMenuBarWindow (ev.xany.window)) 1536 || priv_modes & PrivMode_MouseAnyEvent)
1639 {
1640 menubar_control (ev.xbutton); 1537 mouse_report (ev.xbutton);
1641 break;
1642 }
1643#endif
1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1538 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1645 break; 1539 break;
1646 1540
1647 if (ev.xany.window == vt) 1541 if (ev.xany.window == vt)
1648 { 1542 {
1543 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1544 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop 1545 ; // nop
1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1546 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1652 { 1547 {
1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1548 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1654 ; 1549 ;
1655 1550
1656 XQueryPointer (disp, vt, 1551 XQueryPointer (dpy, vt,
1657 &unused_root, &unused_child, 1552 &unused_root, &unused_child,
1658 &unused_root_x, &unused_root_y, 1553 &unused_root_x, &unused_root_y,
1659 &ev.xbutton.x, &ev.xbutton.y, 1554 &ev.xbutton.x, &ev.xbutton.y,
1660 &ev.xbutton.state); 1555 &ev.xbutton.state);
1661#ifdef MOUSE_THRESHOLD 1556#ifdef MOUSE_THRESHOLD
… …
1681 int dist; 1576 int dist;
1682 1577
1683 /* don't clobber the current delay if we are 1578 /* don't clobber the current delay if we are
1684 * already in the middle of scrolling. 1579 * already in the middle of scrolling.
1685 */ 1580 */
1686 if (!sel_scroll_ev.active) 1581 if (!sel_scroll_ev.is_active ())
1687 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1688 1583
1689 /* save the event params so we can highlight 1584 /* save the event params so we can highlight
1690 * the selection in the pending-scroll loop 1585 * the selection in the pending-scroll loop
1691 */ 1586 */
1692 selection_save_x = ev.xbutton.x; 1587 selection_save_x = ev.xbutton.x;
… …
1714 else 1609 else
1715 { 1610 {
1716 /* we are within the text window, so we 1611 /* we are within the text window, so we
1717 * shouldn't be scrolling 1612 * shouldn't be scrolling
1718 */ 1613 */
1719 if (sel_scroll_ev.active)
1720 sel_scroll_ev.stop(); 1614 sel_scroll_ev.stop();
1721 } 1615 }
1722#endif 1616#endif
1723#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
1724 } 1618 }
1725#endif 1619#endif
1726 } 1620 }
1727 } 1621 }
1728 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1622 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1729 { 1623 {
1730 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1624 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1731 MotionNotify, &ev)) 1625 MotionNotify, &ev))
1732 ; 1626 ;
1733 1627
1734 XQueryPointer (disp, scrollBar.win, 1628 XQueryPointer (dpy, scrollBar.win,
1735 &unused_root, &unused_child, 1629 &unused_root, &unused_child,
1736 &unused_root_x, &unused_root_y, 1630 &unused_root_x, &unused_root_y,
1737 &ev.xbutton.x, &ev.xbutton.y, 1631 &ev.xbutton.x, &ev.xbutton.y,
1738 &unused_mask); 1632 &unused_mask);
1739 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1633 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1740 scrollbar_size ()); 1634 scrollbar_size ());
1741 scr_refresh (refresh_type);
1742 refresh_limit = 0; 1635 want_refresh = 1;
1743 scrollbar_show (1); 1636 scrollbar_show (1);
1744 } 1637 }
1745 break; 1638 break;
1746 } 1639 }
1640
1641#if defined(CURSOR_BLINK)
1642 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1643 {
1644 if (hidden_cursor)
1645 {
1646 hidden_cursor = 0;
1647 want_refresh = 1;
1648 }
1649
1650 cursor_blink_ev.again ();
1651 }
1652#endif
1653
1654#if defined(POINTER_BLANK)
1655 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1656 {
1657 if (ev.type == MotionNotify
1658 || ev.type == ButtonPress
1659 || ev.type == ButtonRelease)
1660 if (hidden_pointer)
1661 pointer_unblank ();
1662
1663 if (ev.type == KeyPress && hidden_pointer == 0)
1664 pointer_blank ();
1665 }
1666#endif
1747} 1667}
1748 1668
1749void 1669void
1750rxvt_term::focus_in () 1670rxvt_term::focus_in ()
1751{ 1671{
1752 if (!focus) 1672 if (!focus)
1753 { 1673 {
1754 focus = 1; 1674 focus = 1;
1755 want_refresh = 1; 1675 want_refresh = 1;
1756 1676
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1677 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 1678
1759#if USE_XIM 1679#if USE_XIM
1760 if (Input_Context != NULL) 1680 if (Input_Context != NULL)
1761 { 1681 {
1762 IMSetStatusPosition (); 1682 IMSetPosition ();
1763 XSetICFocus (Input_Context); 1683 XSetICFocus (Input_Context);
1764 } 1684 }
1765#endif 1685#endif
1766#if CURSOR_BLINK 1686#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1687 if (option (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1688 cursor_blink_ev.again ();
1769#endif 1689#endif
1770#if OFF_FOCUS_FADING 1690#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1691 if (rs[Rs_fade])
1772 { 1692 {
1773 pix_colors = pix_colors_focused; 1693 pix_colors = pix_colors_focused;
1774 scr_recolour (); 1694 scr_recolour ();
1775 } 1695 }
1776#endif 1696#endif
1697#if ENABLE_FRILLS
1698 if (option (Opt_urgentOnBell))
1699 {
1700 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1701 {
1702 h->flags &= ~XUrgencyHint;
1703 XSetWMHints (dpy, parent[0], h);
1704 }
1705 }
1706#endif
1777 } 1707 }
1778} 1708}
1779 1709
1780void 1710void
1781rxvt_term::focus_out () 1711rxvt_term::focus_out ()
… …
1789 1719
1790#if ENABLE_FRILLS || ISO_14755 1720#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf) 1721 if (iso14755buf)
1792 { 1722 {
1793 iso14755buf = 0; 1723 iso14755buf = 0;
1794# if ENABLE_OVERLAY 1724# if ISO_14755
1795 scr_overlay_off (); 1725 scr_overlay_off ();
1796# endif 1726# endif
1797 } 1727 }
1798#endif 1728#endif
1799#if USE_XIM 1729#if USE_XIM
1800 if (Input_Context != NULL) 1730 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context); 1731 XUnsetICFocus (Input_Context);
1802#endif 1732#endif
1803#if CURSOR_BLINK 1733#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink)) 1734 if (option (Opt_cursorBlink))
1805 cursor_blink_ev.stop (); 1735 cursor_blink_ev.stop ();
1736
1806 hidden_cursor = 0; 1737 hidden_cursor = 0;
1807#endif 1738#endif
1808#if OFF_FOCUS_FADING 1739#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1740 if (rs[Rs_fade])
1810 { 1741 {
… …
1813 } 1744 }
1814#endif 1745#endif
1815 } 1746 }
1816} 1747}
1817 1748
1818#if TRANSPARENT 1749void
1750rxvt_term::update_fade_color (unsigned int idx)
1751{
1752#if OFF_FOCUS_FADING
1753 if (rs[Rs_fade])
1754 {
1755 rgba c;
1756 pix_colors [Color_fade].get (c);
1757 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1758 }
1759#endif
1760}
1761
1762#if ENABLE_TRANSPARENCY || ENABLE_PERL
1819void 1763void
1820rxvt_term::rootwin_cb (XEvent &ev) 1764rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1765{
1822 SET_R (this); 1766 make_current ();
1823 SET_LOCALE (locale);
1824 1767
1768 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1769 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1770 return;
1771
1772# if ENABLE_TRANSPARENCY
1825 switch (ev.type) 1773 switch (ev.type)
1826 { 1774 {
1827 case PropertyNotify: 1775 case PropertyNotify:
1828 /* 1776 /*
1829 * if user used some Esetroot compatible prog to set the root bg, 1777 * if user used some Esetroot compatible prog to set the root bg,
1830 * use the property to determine the pixmap. We use it later on. 1778 * use the property to determine the pixmap. We use it later on.
1831 */ 1779 */
1832 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1780 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1781 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1834 return; 1782 {
1835 1783 bgPixmap.set_root_pixmap ();
1836 /* FALLTHROUGH */ 1784 update_background ();
1837 case ReparentNotify: 1785 }
1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1839 want_refresh = want_full_refresh = 1;
1840 break; 1786 break;
1841 } 1787 }
1788# endif
1842} 1789}
1843#endif 1790#endif
1844 1791
1845void 1792void
1846rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
… …
1855 /* 1802 /*
1856 * VT window processing of button press 1803 * VT window processing of button press
1857 */ 1804 */
1858 if (ev.window == vt) 1805 if (ev.window == vt)
1859 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1860#if ISO_14755 1810#if ISO_14755
1861 // 5.4 1811 // 5.4
1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1863 { 1813 {
1864 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1898 mouse_report (ev); 1848 mouse_report (ev);
1899 } 1849 }
1900#else 1850#else
1901 MEvent.button = ev.button; 1851 MEvent.button = ev.button;
1902 mouse_report (ev); 1852 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1853#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1854
1905 } 1855 }
1906 else 1856 else
1907 { 1857 {
1908 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1909 MEvent.clicks = 0; 1859 MEvent.clicks = 0;
1910 1860
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1912 switch (ev.button) 1861 switch (ev.button)
1913 { 1862 {
1914 case Button1: 1863 case Button1:
1915 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1916 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1917#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1918 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1919#else 1868#else
1920 selection.rect = false; 1869 selection.rect = false;
1921#endif 1870#endif
1922 1871
1923 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1925 { 1874 {
1926 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1927 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1928 else 1877 else
1929 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1930 } 1879 }
1931 else 1880 else
1932 { 1881 {
1933 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1934 MEvent.clicks++; 1883 MEvent.clicks++;
1935 else 1884 else
1936 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1937 1886
1938 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1939 } 1888 }
1940 1889
1941 MEvent.button = Button1; 1890 MEvent.button = Button1;
1942 break; 1891 break;
1943 1892
1944 case Button3: 1893 case Button3:
1945 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1946 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1947 else 1896 else
1948 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1949 1898
1950 MEvent.button = Button3; 1899 MEvent.button = Button3;
1951 break; 1900 break;
1952 } 1901 }
1953 } 1902 }
1954 1903
1955 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1956 return; 1905 return;
1957 } 1906 }
1958 1907
… …
2003 tt_printf ("\033[5~"); 1952 tt_printf ("\033[5~");
2004 break; 1953 break;
2005 } 1954 }
2006 } 1955 }
2007 else 1956 else
2008#endif /* NO_SCROLLBAR_REPORT */ 1957#endif /* NO_SCROLLBAR_REPORT */
2009 1958
2010 { 1959 {
2011 char upordown = 0; 1960 char upordown = 0;
2012 1961
2013 if (scrollBar.style == R_SB_NEXT) 1962 if (scrollBar.style == R_SB_NEXT)
2014 { 1963 {
2015 if (scrollbarnext_upButton (ev.y)) 1964 if (scrollbarnext_upButton (ev.y))
2016 upordown = -1; /* up */ 1965 upordown = -1; /* up */
… …
2022 if (scrollbarrxvt_upButton (ev.y)) 1971 if (scrollbarrxvt_upButton (ev.y))
2023 upordown = -1; /* up */ 1972 upordown = -1; /* up */
2024 else if (scrollbarrxvt_dnButton (ev.y)) 1973 else if (scrollbarrxvt_dnButton (ev.y))
2025 upordown = 1; /* down */ 1974 upordown = 1; /* down */
2026 } 1975 }
1976
2027 if (upordown) 1977 if (upordown)
2028 { 1978 {
2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1979#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1980 if (!cont_scroll_ev.is_active ())
2030 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2031#endif 1982#endif
2032 if (scr_page (upordown < 0 ? UP : DN, 1)) 1983 if (scr_page (upordown < 0 ? UP : DN, 1))
2033 { 1984 {
2034 if (upordown < 0) 1985 if (upordown < 0)
2035 scrollBar.setUp (); 1986 scrollBar.setUp ();
… …
2097 } 2048 }
2098 } 2049 }
2099 2050
2100 return; 2051 return;
2101 } 2052 }
2102
2103#if MENUBAR
2104 /*
2105 * Menubar window processing of button press
2106 */
2107 if (isMenuBarWindow (ev.window))
2108 menubar_control (ev);
2109#endif
2110} 2053}
2111 2054
2112void 2055void
2113rxvt_term::button_release (XButtonEvent &ev) 2056rxvt_term::button_release (XButtonEvent &ev)
2114{ 2057{
… …
2120 2063
2121 if (scrollbar_isUpDn ()) 2064 if (scrollbar_isUpDn ())
2122 { 2065 {
2123 scrollBar.setIdle (); 2066 scrollBar.setIdle ();
2124 scrollbar_show (0); 2067 scrollbar_show (0);
2125#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2126 refresh_type &= ~SMOOTH_REFRESH;
2127#endif
2128 } 2068 }
2129 2069
2130#ifdef SELECTION_SCROLLING 2070#ifdef SELECTION_SCROLLING
2131 if (sel_scroll_ev.active)
2132 sel_scroll_ev.stop(); 2071 sel_scroll_ev.stop();
2133#endif 2072#endif
2134 2073
2135 if (ev.window == vt) 2074 if (ev.window == vt)
2136 { 2075 {
2076 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2077 return;
2078
2137#if ISO_14755 2079#if ISO_14755
2138 // 5.4 2080 // 5.4
2139 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2081 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2140 return; 2082 return;
2141#endif 2083#endif
2084
2142 if (reportmode) 2085 if (reportmode)
2143 { 2086 {
2144 /* mouse report from vt window */ 2087 /* mouse report from vt window */
2145 /* don't report release of wheel "buttons" */ 2088 /* don't report release of wheel "buttons" */
2146 if (ev.button >= 4) 2089 if (ev.button >= 4)
… …
2157 mouse_report (ev); 2100 mouse_report (ev);
2158 } 2101 }
2159#else /* MOUSE_REPORT_DOUBLECLICK */ 2102#else /* MOUSE_REPORT_DOUBLECLICK */
2160 MEvent.button = AnyButton; 2103 MEvent.button = AnyButton;
2161 mouse_report (ev); 2104 mouse_report (ev);
2162#endif /* MOUSE_REPORT_DOUBLECLICK */ 2105#endif /* MOUSE_REPORT_DOUBLECLICK */
2163 return; 2106 return;
2164 } 2107 }
2165 2108
2166 /* 2109 /*
2167 * dumb hack to compensate for the failure of click-and-drag 2110 * dumb hack to compensate for the failure of click-and-drag
… …
2170 if (priv_modes & PrivMode_mouse_report 2113 if (priv_modes & PrivMode_mouse_report
2171 && bypass_keystate 2114 && bypass_keystate
2172 && ev.button == Button1 && MEvent.clicks <= 1) 2115 && ev.button == Button1 && MEvent.clicks <= 1)
2173 selection_extend (ev.x, ev.y, 0); 2116 selection_extend (ev.x, ev.y, 0);
2174 2117
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2177
2178 switch (ev.button) 2118 switch (ev.button)
2179 { 2119 {
2180 case Button1: 2120 case Button1:
2181 case Button3: 2121 case Button3:
2182 selection_make (ev.time); 2122 selection_make (ev.time);
2183 break; 2123 break;
2124
2184 case Button2: 2125 case Button2:
2185 selection_request (ev.time, ev.x, ev.y); 2126 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2127 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2186 break; 2128 break;
2129
2187#ifdef MOUSE_WHEEL 2130#ifdef MOUSE_WHEEL
2188 case Button4: 2131 case Button4:
2189 case Button5: 2132 case Button5:
2190 { 2133 {
2191 int i; 2134 int i;
… …
2193 2136
2194 v = ev.button == Button4 ? UP : DN; 2137 v = ev.button == Button4 ? UP : DN;
2195 2138
2196 if (ev.state & ShiftMask) 2139 if (ev.state & ShiftMask)
2197 i = 1; 2140 i = 1;
2198 else if (OPTION (Opt_mouseWheelScrollPage)) 2141 else if (option (Opt_mouseWheelScrollPage))
2199 i = nrow - 1; 2142 i = nrow - 1;
2200 else 2143 else
2201 i = 5; 2144 i = 5;
2202 2145
2203# ifdef MOUSE_SLIP_WHEELING 2146# ifdef MOUSE_SLIP_WHEELING
… …
2205 { 2148 {
2206 mouse_slip_wheel_speed += v ? -1 : 1; 2149 mouse_slip_wheel_speed += v ? -1 : 1;
2207 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2150 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2208 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2151 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2209 2152
2210 if (slip_wheel_ev.at < NOW) 2153 if (!slip_wheel_ev.is_active ())
2211 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2212
2213 slip_wheel_ev.start ();
2214 } 2155 }
2215 else 2156 else
2216 { 2157 {
2217# endif 2158# endif
2218# ifdef JUMP_MOUSE_WHEEL
2219 scr_page (v, i); 2159 scr_page (v, i);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1); 2160 scrollbar_show (1);
2222# else
2223 while (i--)
2224 {
2225 scr_page (v, 1);
2226 scr_refresh (SMOOTH_REFRESH);
2227 scrollbar_show (1);
2228 }
2229# endif
2230# ifdef MOUSE_SLIP_WHEELING 2161# ifdef MOUSE_SLIP_WHEELING
2231 } 2162 }
2232#endif 2163# endif
2233 } 2164 }
2234 break; 2165 break;
2235#endif 2166#endif
2236 } 2167 }
2237 } 2168 }
2238#ifdef MENUBAR
2239 else if (isMenuBarWindow (ev.window))
2240 menubar_control (ev);
2241#endif
2242} 2169}
2243
2244#ifdef TRANSPARENT
2245#if TINTING
2246/* taken from aterm-0.4.2 */
2247
2248typedef uint32_t RUINT32T;
2249
2250void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2251{
2252 int sh_r, sh_g, sh_b;
2253 RUINT32T mask_r, mask_g, mask_b;
2254 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2255 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2256 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2257 int i;
2258
2259 Visual *visual = display->visual;
2260
2261 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2262
2263 /* for convenience */
2264 mask_r = visual->red_mask;
2265 mask_g = visual->green_mask;
2266 mask_b = visual->blue_mask;
2267
2268 /* boring lookup table pre-initialization */
2269 switch (srcImage->bits_per_pixel) {
2270 case 15:
2271 if ((mask_r != 0x7c00) ||
2272 (mask_g != 0x03e0) ||
2273 (mask_b != 0x001f))
2274 return;
2275 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2276 lookup_r = lookup;
2277 lookup_g = lookup+32;
2278 lookup_b = lookup+32+32;
2279 sh_r = 10;
2280 sh_g = 5;
2281 sh_b = 0;
2282 break;
2283 case 16:
2284 if ((mask_r != 0xf800) ||
2285 (mask_g != 0x07e0) ||
2286 (mask_b != 0x001f))
2287 return;
2288 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2289 lookup_r = lookup;
2290 lookup_g = lookup+32;
2291 lookup_b = lookup+32+64;
2292 sh_r = 11;
2293 sh_g = 5;
2294 sh_b = 0;
2295 break;
2296 case 24:
2297 if ((mask_r != 0xff0000) ||
2298 (mask_g != 0x00ff00) ||
2299 (mask_b != 0x0000ff))
2300 return;
2301 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2302 lookup_r = lookup;
2303 lookup_g = lookup+256;
2304 lookup_b = lookup+256+256;
2305 sh_r = 16;
2306 sh_g = 8;
2307 sh_b = 0;
2308 break;
2309 case 32:
2310 if ((mask_r != 0xff0000) ||
2311 (mask_g != 0x00ff00) ||
2312 (mask_b != 0x0000ff))
2313 return;
2314 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2315 lookup_r = lookup;
2316 lookup_g = lookup+256;
2317 lookup_b = lookup+256+256;
2318 sh_r = 16;
2319 sh_g = 8;
2320 sh_b = 0;
2321 break;
2322 default:
2323 return; /* we do not support this color depth */
2324 }
2325
2326 /* prepare limits for color transformation (each channel is handled separately) */
2327 if (shade < 0) {
2328 shade = -shade;
2329 if (shade < 0) shade = 0;
2330 if (shade > 100) shade = 100;
2331
2332 lower_lim_r = 65535-rm;
2333 lower_lim_g = 65535-gm;
2334 lower_lim_b = 65535-bm;
2335
2336 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2337 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2338 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2339
2340 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2341 } else {
2342 if (shade < 0) shade = 0;
2343 if (shade > 100) shade = 100;
2344
2345 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2346
2347 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2348 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2349 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2350 }
2351
2352 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2353 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2354 {
2355 unsigned int tmp;
2356
2357 tmp = lower_lim_r;
2358 lower_lim_r = lower_lim_b;
2359 lower_lim_b = tmp;
2360
2361 tmp = upper_lim_r;
2362 upper_lim_r = upper_lim_b;
2363 upper_lim_b = tmp;
2364 }
2365
2366 /* fill our lookup tables */
2367 for (i = 0; i <= mask_r>>sh_r; i++)
2368 {
2369 RUINT32T tmp;
2370 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2371 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2372 lookup_r[i] = (tmp/65535)<<sh_r;
2373 }
2374 for (i = 0; i <= mask_g>>sh_g; i++)
2375 {
2376 RUINT32T tmp;
2377 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2378 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2379 lookup_g[i] = (tmp/65535)<<sh_g;
2380 }
2381 for (i = 0; i <= mask_b>>sh_b; i++)
2382 {
2383 RUINT32T tmp;
2384 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2385 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2386 lookup_b[i] = (tmp/65535)<<sh_b;
2387 }
2388
2389 /* apply table to input image (replacing colors by newly calculated ones) */
2390 switch (srcImage->bits_per_pixel)
2391 {
2392 case 15:
2393 {
2394 unsigned short *p1, *pf, *p, *pl;
2395 p1 = (unsigned short *) srcImage->data;
2396 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2397 while (p1 < pf)
2398 {
2399 p = p1;
2400 pl = p1 + srcImage->width;
2401 for (; p < pl; p++)
2402 {
2403 *p = lookup_r[(*p & 0x7c00)>>10] |
2404 lookup_g[(*p & 0x03e0)>> 5] |
2405 lookup_b[(*p & 0x001f)];
2406 }
2407 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2408 }
2409 break;
2410 }
2411 case 16:
2412 {
2413 unsigned short *p1, *pf, *p, *pl;
2414 p1 = (unsigned short *) srcImage->data;
2415 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2416 while (p1 < pf)
2417 {
2418 p = p1;
2419 pl = p1 + srcImage->width;
2420 for (; p < pl; p++)
2421 {
2422 *p = lookup_r[(*p & 0xf800)>>11] |
2423 lookup_g[(*p & 0x07e0)>> 5] |
2424 lookup_b[(*p & 0x001f)];
2425 }
2426 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2427 }
2428 break;
2429 }
2430 case 24:
2431 {
2432 unsigned char *p1, *pf, *p, *pl;
2433 p1 = (unsigned char *) srcImage->data;
2434 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2435 while (p1 < pf)
2436 {
2437 p = p1;
2438 pl = p1 + srcImage->width * 3;
2439 for (; p < pl; p += 3)
2440 {
2441 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2442 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2443 p[2] = lookup_r[(p[2] & 0x0000ff)];
2444 }
2445 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2446 }
2447 break;
2448 }
2449 case 32:
2450 {
2451 RUINT32T *p1, *pf, *p, *pl;
2452 p1 = (RUINT32T *) srcImage->data;
2453 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2454
2455 while (p1 < pf)
2456 {
2457 p = p1;
2458 pl = p1 + srcImage->width;
2459 for (; p < pl; p++)
2460 {
2461 *p = lookup_r[(*p & 0xff0000)>>16] |
2462 lookup_g[(*p & 0x00ff00)>> 8] |
2463 lookup_b[(*p & 0x0000ff)] |
2464 (*p & ~0xffffff);
2465 }
2466 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2467 }
2468 break;
2469 }
2470 }
2471
2472 free (lookup);
2473}
2474#endif
2475
2476/*
2477 * Check our parents are still who we think they are.
2478 * Do transparency updates if required
2479 */
2480int
2481rxvt_term::check_our_parents ()
2482{
2483 int i, pchanged, aformat, have_pixmap, rootdepth;
2484 unsigned long nitems, bytes_after;
2485 Atom atype;
2486 unsigned char *prop = NULL;
2487 Window root, oldp, *list;
2488 Pixmap rootpixmap = None;
2489 XWindowAttributes wattr, wrootattr;
2490 dDisp;
2491
2492 pchanged = 0;
2493
2494 if (!OPTION (Opt_transparent))
2495 return pchanged; /* Don't try any more */
2496
2497 XGetWindowAttributes (disp, display->root, &wrootattr);
2498 rootdepth = wrootattr.depth;
2499
2500 XGetWindowAttributes (disp, parent[0], &wattr);
2501
2502 if (rootdepth != wattr.depth)
2503 {
2504 if (am_transparent)
2505 {
2506 pchanged = 1;
2507 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2508 am_transparent = am_pixmap_trans = 0;
2509 }
2510
2511 return pchanged; /* Don't try any more */
2512 }
2513
2514 /* Get all X ops out of the queue so that our information is up-to-date. */
2515 XSync (disp, False);
2516
2517 /*
2518 * Make the frame window set by the window manager have
2519 * the root background. Some window managers put multiple nested frame
2520 * windows for each client, so we have to take care about that.
2521 */
2522 i = (xa[XA_XROOTPMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success);
2526
2527 if (!i || prop == NULL)
2528 i = (xa[XA_ESETROOT_PMAP_ID]
2529 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2530 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2531 &nitems, &bytes_after, &prop) == Success);
2532
2533 if (!i || prop == NULL
2534#if TINTING
2535 || !rs[Rs_color + Color_tint]
2536#endif
2537 )
2538 have_pixmap = 0;
2539 else
2540 {
2541 have_pixmap = 1;
2542 rootpixmap = *(Pixmap *)prop;
2543 XFree (prop);
2544 }
2545
2546 if (have_pixmap)
2547 {
2548 /*
2549 * Copy display->root pixmap transparency
2550 */
2551 int sx, sy, nx, ny;
2552 unsigned int nw, nh;
2553 Window cr;
2554 XImage *image;
2555 GC gc;
2556 XGCValues gcvalue;
2557
2558 XTranslateCoordinates (disp, parent[0], display->root,
2559 0, 0, &sx, &sy, &cr);
2560 nw = (unsigned int)szHint.width;
2561 nh = (unsigned int)szHint.height;
2562 nx = ny = 0;
2563
2564 if (sx < 0)
2565 {
2566 nw += sx;
2567 nx = -sx;
2568 sx = 0;
2569 }
2570
2571 if (sy < 0)
2572 {
2573 nh += sy;
2574 ny = -sy;
2575 sy = 0;
2576 }
2577
2578 min_it (nw, (unsigned int) (wrootattr.width - sx));
2579 min_it (nh, (unsigned int) (wrootattr.height - sy));
2580
2581 XSync (disp, False);
2582 allowedxerror = -1;
2583 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2584
2585 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2586 /* XXX: may need a delay here? */
2587 allowedxerror = 0;
2588
2589 if (image == NULL)
2590 {
2591 if (am_transparent && am_pixmap_trans)
2592 {
2593 pchanged = 1;
2594 if (pixmap != None)
2595 {
2596 XFreePixmap (disp, pixmap);
2597 pixmap = None;
2598 }
2599 }
2600
2601 am_pixmap_trans = 0;
2602 }
2603 else
2604 {
2605 if (pixmap != None)
2606 XFreePixmap (disp, pixmap);
2607
2608#if TINTING
2609 if (ISSET_PIXCOLOR (Color_tint))
2610 {
2611 unsigned short rm, gm, bm;
2612 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2613
2614 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2615
2616 ShadeXImage (display, image, shade, rm, gm, bm);
2617 }
2618#endif
2619
2620 pixmap = XCreatePixmap (disp, vt,
2621 szHint.width, szHint.height, image->depth);
2622 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2623 XPutImage (disp, pixmap, gc, image, 0, 0,
2624 nx, ny, image->width, image->height);
2625 XFreeGC (disp, gc);
2626 XDestroyImage (image);
2627 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2628 XClearWindow (disp, parent[0]);
2629
2630 if (!am_transparent || !am_pixmap_trans)
2631 pchanged = 1;
2632
2633 am_transparent = am_pixmap_trans = 1;
2634 }
2635 }
2636
2637 if (am_pixmap_trans)
2638 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2639 else
2640 {
2641 unsigned int n;
2642 /*
2643 * InheritPixmap transparency
2644 */
2645 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2646 {
2647 oldp = parent[i];
2648 XQueryTree (disp, parent[i - 1], &root,
2649 &parent[i], &list, &n);
2650 XFree (list);
2651
2652 if (parent[i] == display->root)
2653 {
2654 if (oldp != None)
2655 pchanged = 1;
2656
2657 break;
2658 }
2659
2660 if (oldp != parent[i])
2661 pchanged = 1;
2662 }
2663
2664 n = 0;
2665
2666 if (pchanged)
2667 {
2668 for (; n < (unsigned int)i; n++)
2669 {
2670 XGetWindowAttributes (disp, parent[n], &wattr);
2671 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2672 {
2673 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2674 break;
2675 }
2676 }
2677 }
2678
2679 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2680 {
2681 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2682 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2683 am_transparent = 0;
2684 /* XXX: also turn off Opt_transparent? */
2685 }
2686 else
2687 {
2688#if WAIT_FOR_WM
2689 /* wait (an arbitrary period) for the WM to do its thing
2690 * needed for fvwm2.2.2 (and before?) */
2691 sleep (1);
2692#endif
2693 for (n = 0; n < (unsigned int)i; n++)
2694 {
2695 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2696 XClearWindow (disp, parent[n]);
2697 }
2698
2699 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2700 am_transparent = 1;
2701 }
2702
2703 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2704 parent[i] = None;
2705 }
2706
2707 if (scrollBar.win)
2708 {
2709 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2710 scrollBar.setIdle ();
2711 scrollbar_show (0);
2712 }
2713
2714 if (am_transparent)
2715 {
2716 want_refresh = want_full_refresh = 1;
2717 if (am_pixmap_trans)
2718 flush ();
2719 }
2720
2721 return pchanged;
2722}
2723#endif
2724 2170
2725/*}}} */ 2171/*}}} */
2726 2172
2727bool 2173bool
2728rxvt_term::cmd_parse () 2174rxvt_term::cmd_parse ()
… …
2777 if (ch == C0_LF) 2223 if (ch == C0_LF)
2778 nlines++; 2224 nlines++;
2779 2225
2780 refresh_count++; 2226 refresh_count++;
2781 2227
2782 if (!OPTION (Opt_jumpScroll) 2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2784 { 2229 {
2785 refreshnow = true;
2786 refresh_count = 0; 2230 refresh_count = 0;
2231
2232 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 {
2234 refreshnow = true;
2787 ch = NOCHAR; 2235 ch = NOCHAR;
2788 break; 2236 break;
2237 }
2789 } 2238 }
2790 2239
2791 // scr_add_lines only works for nlines <= nrow - 1. 2240 // scr_add_lines only works for nlines <= nrow - 1.
2792 if (nlines >= nrow - 1) 2241 if (nlines >= nrow - 1)
2793 { 2242 {
2243 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2244 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2795 scr_add_lines (buf, str - buf, nlines); 2245 scr_add_lines (buf, str - buf, nlines);
2796 2246
2797 nlines = 0; 2247 nlines = 0;
2798 str = buf; 2248 str = buf;
2799 eol = str + min (ncol, UBUFSIZ); 2249 eol = str + min (ncol, UBUFSIZ);
… …
2814 2264
2815 seq_begin = cmdbuf_ptr; 2265 seq_begin = cmdbuf_ptr;
2816 ch = next_char (); 2266 ch = next_char ();
2817 } 2267 }
2818 2268
2269 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2270 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2820 scr_add_lines (buf, str - buf, nlines); 2271 scr_add_lines (buf, str - buf, nlines);
2821 2272
2822 /* 2273 /*
2823 * If there have been a lot of new lines, then update the screen 2274 * If there have been a lot of new lines, then update the screen
2824 * What the heck I'll cheat and only refresh less than every page-full. 2275 * What the heck we'll cheat and only refresh less than every page-full.
2825 * the number of pages between refreshes is refresh_limit, which 2276 * if skipScroll is enabled.
2826 * is incremented here because we must be doing flat-out scrolling.
2827 */ 2277 */
2828 if (refreshnow) 2278 if (refreshnow)
2829 { 2279 {
2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2831 refresh_limit++;
2832 else
2833 {
2834 flag = true; 2280 flag = true;
2835 scr_refresh (refresh_type); 2281 scr_refresh ();
2836 flush_ev.stop (); 2282 want_refresh = 1;
2837 }
2838 } 2283 }
2839 2284
2840 } 2285 }
2841 else 2286 else
2842 { 2287 {
… …
2858 return flag; 2303 return flag;
2859} 2304}
2860 2305
2861// read the next character 2306// read the next character
2862wchar_t 2307wchar_t
2863rxvt_term::next_char () 2308rxvt_term::next_char () NOTHROW
2864{ 2309{
2865 while (cmdbuf_ptr < cmdbuf_endp) 2310 while (cmdbuf_ptr < cmdbuf_endp)
2866 { 2311 {
2867 // assume 7-bit to be ascii ALWAYS 2312 // assume 7-bit to be ascii ALWAYS
2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2313 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2889 return NOCHAR; 2334 return NOCHAR;
2890} 2335}
2891 2336
2892// read the next octet 2337// read the next octet
2893uint32_t 2338uint32_t
2894rxvt_term::next_octet () 2339rxvt_term::next_octet () NOTHROW
2895{ 2340{
2896 return cmdbuf_ptr < cmdbuf_endp 2341 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++ 2342 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR; 2343 : NOCHAR;
2899} 2344}
2345
2346static class out_of_input out_of_input;
2900 2347
2901/* rxvt_cmd_getc () - Return next input character */ 2348/* rxvt_cmd_getc () - Return next input character */
2902/* 2349/*
2903 * Return the next input character after first passing any keyboard input 2350 * Return the next input character after first passing any keyboard input
2904 * to the command. 2351 * to the command.
2905 */ 2352 */
2906wchar_t 2353wchar_t
2907rxvt_term::cmd_getc () 2354rxvt_term::cmd_getc () THROW ((class out_of_input))
2908{ 2355{
2909 wchar_t c = next_char (); 2356 wchar_t c = next_char ();
2910 2357
2911 if (c == NOCHAR) 2358 if (c == NOCHAR)
2912 throw out_of_input; 2359 throw out_of_input;
2913 2360
2914 return c; 2361 return c;
2915} 2362}
2916 2363
2917uint32_t 2364uint32_t
2918rxvt_term::cmd_get8 () 2365rxvt_term::cmd_get8 () THROW ((class out_of_input))
2919{ 2366{
2920 uint32_t c = next_octet (); 2367 uint32_t c = next_octet ();
2921 2368
2922 if (c == NOCHAR) 2369 if (c == NOCHAR)
2923 throw out_of_input; 2370 throw out_of_input;
… …
2989 { 2436 {
2990 if ((buf[len++] = cmd_getc ()) == 'i') 2437 if ((buf[len++] = cmd_getc ()) == 'i')
2991 break; /* done = 1 */ 2438 break; /* done = 1 */
2992 } 2439 }
2993 } 2440 }
2994 2441
2995 for (i = 0; i < len; i++) 2442 for (i = 0; i < len; i++)
2996 if (putc (buf[i], fd) == EOF) 2443 if (putc (buf[i], fd) == EOF)
2997 { 2444 {
2998 done = 1; 2445 done = 1;
2999 break; 2446 break;
… …
3001 } 2448 }
3002 } 2449 }
3003 2450
3004 pclose_printer (fd); 2451 pclose_printer (fd);
3005} 2452}
3006#endif /* PRINTPIPE */ 2453#endif /* PRINTPIPE */
3007/*}}} */ 2454/*}}} */
3008 2455
3009/* *INDENT-OFF* */ 2456/* *INDENT-OFF* */
3010enum { 2457enum {
3011 C1_40 = 0x40, 2458 C1_40 = 0x40,
… …
3061 process_dcs_seq (); 2508 process_dcs_seq ();
3062 break; 2509 break;
3063 case 0x9b: /* CSI */ 2510 case 0x9b: /* CSI */
3064 process_csi_seq (); 2511 process_csi_seq ();
3065 break; 2512 break;
3066 case 0x9d: /* CSI */ 2513 case 0x9d: /* OSC */
3067 process_osc_seq (); 2514 process_osc_seq ();
3068 break; 2515 break;
3069#endif 2516#endif
3070 } 2517 }
3071} 2518}
… …
3161 scr_charset_set (2, (unsigned int)cmd_getc ()); 2608 scr_charset_set (2, (unsigned int)cmd_getc ());
3162 break; 2609 break;
3163 case '+': 2610 case '+':
3164 scr_charset_set (3, (unsigned int)cmd_getc ()); 2611 scr_charset_set (3, (unsigned int)cmd_getc ());
3165 break; 2612 break;
3166#if ENABLE_FRILLS 2613#if !ENABLE_MINIMAL
3167 case '6': 2614 case '6':
3168 scr_backindex (); 2615 scr_backindex ();
3169 break; 2616 break;
3170#endif 2617#endif
3171 case '7': 2618 case '7':
3172 scr_cursor (SAVE); 2619 scr_cursor (SAVE);
3173 break; 2620 break;
3174 case '8': 2621 case '8':
3175 scr_cursor (RESTORE); 2622 scr_cursor (RESTORE);
3176 break; 2623 break;
3177#if ENABLE_FRILLS 2624#if !ENABLE_MINIMAL
3178 case '9': 2625 case '9':
3179 scr_forwardindex (); 2626 scr_forwardindex ();
3180 break; 2627 break;
3181#endif 2628#endif
3182 case '=': 2629 case '=':
… …
3297rxvt_term::process_csi_seq () 2744rxvt_term::process_csi_seq ()
3298{ 2745{
3299 unicode_t ch, priv, i; 2746 unicode_t ch, priv, i;
3300 unsigned int nargs, p; 2747 unsigned int nargs, p;
3301 int n, ndef; 2748 int n, ndef;
3302 int arg[ESC_ARGS]; 2749 int arg[ESC_ARGS] = { };
3303 2750
3304 for (nargs = ESC_ARGS; nargs > 0;) 2751 nargs = 0;
3305 arg[--nargs] = 0;
3306 2752
3307 priv = 0; 2753 priv = 0;
3308 ch = cmd_getc (); 2754 ch = cmd_getc ();
3309 if (ch >= '<' && ch <= '?') 2755 if (ch >= '<' && ch <= '?')
2756 {
3310 { /* '<' '=' '>' '?' */ 2757 /* '<' '=' '>' '?' */
3311 priv = ch; 2758 priv = ch;
3312 ch = cmd_getc (); 2759 ch = cmd_getc ();
3313 } 2760 }
3314 2761
3315 /* read any numerical arguments */ 2762 /* read any numerical arguments */
… …
3344 ndef = get_byte_array_bit (csi_defaults, i); 2791 ndef = get_byte_array_bit (csi_defaults, i);
3345 for (p = 0; p < nargs; p++) 2792 for (p = 0; p < nargs; p++)
3346 if (arg[p] == -1) 2793 if (arg[p] == -1)
3347 arg[p] = ndef; 2794 arg[p] = ndef;
3348 2795
3349#ifdef DEBUG_CMD
3350 fprintf (stderr, "CSI ");
3351 for (p = 0; p < nargs; p++)
3352 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3353 fprintf (stderr, "%c\n", ch);
3354#endif
3355
3356 /* 2796 /*
3357 * private mode handling 2797 * private mode handling
3358 */ 2798 */
3359 if (priv) 2799 if (priv)
3360 { 2800 {
3361 switch (priv) 2801 switch (priv)
3362 { 2802 {
3363 case '>': 2803 case '>':
3364 if (ch == CSI_DA) /* secondary device attributes */ 2804 if (ch == CSI_DA) /* secondary device attributes */
3365 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2805 {
2806 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2807 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2808 //
2809 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2810 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2811 // versions.
2812 //
2813 tt_printf ("\033[>%d;95;0c", 'U');
2814 }
3366 break; 2815 break;
3367 case '?': 2816 case '?':
3368 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2817 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3369 process_terminal_mode (ch, priv, nargs, arg); 2818 process_terminal_mode (ch, priv, nargs, arg);
3370 break; 2819 break;
… …
3496 break; 2945 break;
3497 case 6: /* CPR requested */ 2946 case 6: /* CPR requested */
3498 scr_report_position (); 2947 scr_report_position ();
3499 break; 2948 break;
3500 case 7: /* unofficial extension */ 2949 case 7: /* unofficial extension */
3501 if (OPTION (Opt_insecure)) 2950 if (option (Opt_insecure))
3502 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2951 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3503 break; 2952 break;
3504 case 8: /* unofficial extension */ 2953 case 8: /* unofficial extension */
3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2954 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3506 break; 2955 break;
… …
3573 break; 3022 break;
3574 case CSI_75: 3023 case CSI_75:
3575 scr_cursor (RESTORE); 3024 scr_cursor (RESTORE);
3576 break; 3025 break;
3577 3026
3578#if ENABLE_FRILLS 3027#if !ENABLE_MINIMAL
3579 case CSI_74: 3028 case CSI_74:
3580 process_window_ops (arg, nargs); 3029 process_window_ops (arg, nargs);
3581 break; 3030 break;
3582#endif 3031#endif
3583 3032
… …
3590 break; 3039 break;
3591 } 3040 }
3592} 3041}
3593/*}}} */ 3042/*}}} */
3594 3043
3595#if ENABLE_FRILLS 3044#if !ENABLE_MINIMAL
3596/* ARGSUSED */ 3045/* ARGSUSED */
3597void 3046void
3598rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3047rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3599{ 3048{
3600 int x, y; 3049 int x, y;
3601 XWindowAttributes wattr; 3050 XWindowAttributes wattr;
3602 Window wdummy; 3051 Window wdummy;
3603 dDisp; 3052
3053 dLocal (Display *, dpy);
3604 3054
3605 if (nargs == 0) 3055 if (nargs == 0)
3606 return; 3056 return;
3607 3057
3608 switch (args[0]) 3058 switch (args[0])
3609 { 3059 {
3610 /* 3060 /*
3611 * commands 3061 * commands
3612 */ 3062 */
3613 case 1: /* deiconify window */ 3063 case 1: /* deiconify window */
3614 XMapWindow (disp, parent[0]); 3064 XMapWindow (dpy, parent[0]);
3615 break; 3065 break;
3616 case 2: /* iconify window */ 3066 case 2: /* iconify window */
3617 XIconifyWindow (disp, parent[0], display->screen); 3067 XIconifyWindow (dpy, parent[0], display->screen);
3618 break; 3068 break;
3619 case 3: /* set position (pixels) */ 3069 case 3: /* set position (pixels) */
3620 XMoveWindow (disp, parent[0], args[1], args[2]); 3070 XMoveWindow (dpy, parent[0], args[1], args[2]);
3621 break; 3071 break;
3622 case 4: /* set size (pixels) */ 3072 case 4: /* set size (pixels) */
3623 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3073 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3624 break; 3074 break;
3625 case 5: /* raise window */ 3075 case 5: /* raise window */
3626 XRaiseWindow (disp, parent[0]); 3076 XRaiseWindow (dpy, parent[0]);
3627 break; 3077 break;
3628 case 6: /* lower window */ 3078 case 6: /* lower window */
3629 XLowerWindow (disp, parent[0]); 3079 XLowerWindow (dpy, parent[0]);
3630 break; 3080 break;
3631 case 7: /* refresh window */ 3081 case 7: /* refresh window */
3632 scr_touch (true); 3082 scr_touch (true);
3633 break; 3083 break;
3634 case 8: /* set size (chars) */ 3084 case 8: /* set size (chars) */
… …
3641 if (args[0] >= 24) /* set height (chars) */ 3091 if (args[0] >= 24) /* set height (chars) */
3642 set_widthheight ((unsigned int)width, 3092 set_widthheight ((unsigned int)width,
3643 (unsigned int) (args[1] * fheight)); 3093 (unsigned int) (args[1] * fheight));
3644 break; 3094 break;
3645 3095
3646
3647 /* 3096 /*
3648 * reports - some output format copied from XTerm 3097 * reports - some output format copied from XTerm
3649 */ 3098 */
3650 case 11: /* report window state */ 3099 case 11: /* report window state */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3100 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3101 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3653 break; 3102 break;
3654 case 13: /* report window position */ 3103 case 13: /* report window position */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3104 XGetWindowAttributes (dpy, parent[0], &wattr);
3656 XTranslateCoordinates (disp, parent[0], wattr.root, 3105 XTranslateCoordinates (dpy, parent[0], wattr.root,
3657 -wattr.border_width, -wattr.border_width, 3106 -wattr.border_width, -wattr.border_width,
3658 &x, &y, &wdummy); 3107 &x, &y, &wdummy);
3659 tt_printf ("\033[3;%d;%dt", x, y); 3108 tt_printf ("\033[3;%d;%dt", x, y);
3660 break; 3109 break;
3661 case 14: /* report window size (pixels) */ 3110 case 14: /* report window size (pixels) */
3662 XGetWindowAttributes (disp, parent[0], &wattr); 3111 XGetWindowAttributes (dpy, parent[0], &wattr);
3663 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3112 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3664 break; 3113 break;
3665 case 18: /* report text area size (chars) */ 3114 case 18: /* report text area size (chars) */
3666 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3115 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3667 break; 3116 break;
… …
3669 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3118 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3670 break; 3119 break;
3671 case 20: /* report icon label */ 3120 case 20: /* report icon label */
3672 { 3121 {
3673 char *s; 3122 char *s;
3674 XGetIconName (disp, parent[0], &s); 3123 XGetIconName (dpy, parent[0], &s);
3675 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3124 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3676 XFree (s); 3125 XFree (s);
3677 } 3126 }
3678 break; 3127 break;
3679 case 21: /* report window title */ 3128 case 21: /* report window title */
3680 { 3129 {
3681 char *s; 3130 char *s;
3682 XFetchName (disp, parent[0], &s); 3131 XFetchName (dpy, parent[0], &s);
3683 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3132 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3684 XFree (s); 3133 XFree (s);
3685 } 3134 }
3686 break; 3135 break;
3687 } 3136 }
3688} 3137}
… …
3715 seen_esc = true; 3164 seen_esc = true;
3716 continue; 3165 continue;
3717 } 3166 }
3718 else if (ch == C0_BEL || ch == CHAR_ST) 3167 else if (ch == C0_BEL || ch == CHAR_ST)
3719 break; 3168 break;
3169 else if (ch == C0_SYN)
3170 ch = cmd_get8 ();
3720 else if (ch < 0x20) 3171 else if (ch < 0x20)
3721 return NULL; /* other control character - exit */ 3172 return NULL; /* other control character - exit */
3722 3173
3723 seen_esc = false; 3174 seen_esc = false;
3724 3175
3725 if (n >= STRING_MAX - 1) 3176 if (n >= STRING_MAX - 1)
3726 // stop at some sane length 3177 // stop at some sane length
3727 return NULL; 3178 return NULL;
3728 3179
3729 if (ch == C0_SYN)
3730 string[n++] = cmd_get8 ();
3731 else
3732 string[n++] = ch; 3180 string[n++] = ch;
3733 } 3181 }
3734 3182
3735 string[n++] = '\0'; 3183 string[n++] = '\0';
3736 3184
3737 ends_how = (ch == 0x5c ? C0_ESC : ch); 3185 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3788void 3236void
3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3237rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3790{ 3238{
3791 if (str[0] == '?' && !str[1]) 3239 if (str[0] == '?' && !str[1])
3792 { 3240 {
3793 unsigned short r, g, b; 3241 rgba c;
3794 pix_colors_focused[color].get (display, r, g, b); 3242 pix_colors_focused[color].get (c);
3243
3244#if XFT
3245 if (c.a != rgba::MAX_CC)
3246 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3247 else
3248#endif
3795 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3249 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3796 } 3250 }
3797 else 3251 else
3798 set_window_color (color, str); 3252 set_window_color (color, str);
3799} 3253}
3800 3254
… …
3802 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3256 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3803 */ 3257 */
3804void 3258void
3805rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3259rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3806{ 3260{
3807 int changed = 0;
3808 int color; 3261 int color;
3809 char *buf, *name; 3262 char *buf, *name;
3810 bool query = str[0] == '?' && !str[1]; 3263 bool query = str[0] == '?' && !str[1];
3811 int saveop = op; 3264 int saveop = op;
3812 dDisp; 3265
3266 dLocal (Display *, dpy);
3813 3267
3814 assert (str != NULL); 3268 assert (str != NULL);
3269
3270 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3271 return;
3272
3815 switch (op) 3273 switch (op)
3816 { 3274 {
3817 case XTerm_name: 3275 case XTerm_name:
3818 set_title (str); 3276 set_title (str);
3819 /* FALLTHROUGH */ 3277 /* FALLTHROUGH */
… …
3833 unsigned long bytes_after; 3291 unsigned long bytes_after;
3834 unsigned char *value = 0; 3292 unsigned char *value = 0;
3835 const char *str = ""; 3293 const char *str = "";
3836 3294
3837 if (prop 3295 if (prop
3838 && XGetWindowProperty (disp, parent[0], 3296 && XGetWindowProperty (dpy, parent[0],
3839 prop, 0, 1<<16, 0, AnyPropertyType, 3297 prop, 0, 1<<16, 0, AnyPropertyType,
3840 &actual_type, &actual_format, 3298 &actual_type, &actual_format,
3841 &nitems, &bytes_after, &value) == Success 3299 &nitems, &bytes_after, &value) == Success
3842 && actual_type != None 3300 && actual_type != None
3843 && actual_format == 8) 3301 && actual_format == 8)
3844 str = (const char *)(value); 3302 str = (const char *)(value);
3845 3303
3846 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3304 tt_printf ("\033]%d;%s%c", op, str, resp);
3847 3305
3848 XFree (value); 3306 XFree (value);
3849 } 3307 }
3850 else 3308 else
3851 { 3309 {
… …
3855 { 3313 {
3856 *eq = 0; 3314 *eq = 0;
3857 set_utf8_property (display->atom (str), eq + 1); 3315 set_utf8_property (display->atom (str), eq + 1);
3858 } 3316 }
3859 else 3317 else
3860 XDeleteProperty (disp, parent[0], 3318 XDeleteProperty (dpy, parent[0],
3861 display->atom (str)); 3319 display->atom (str));
3862 } 3320 }
3863 break; 3321 break;
3864 3322
3865 case XTerm_Color: 3323 case XTerm_Color:
… …
3867 { 3325 {
3868 if ((name = strchr (buf, ';')) == NULL) 3326 if ((name = strchr (buf, ';')) == NULL)
3869 break; 3327 break;
3870 3328
3871 *name++ = '\0'; 3329 *name++ = '\0';
3872 color = atoi (buf); 3330 color = atoi (buf) + minCOLOR;
3873 3331
3874 if (color < 0 || color >= TOTAL_COLORS) 3332 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3875 break; 3333 break;
3876 3334
3877 if ((buf = strchr (name, ';')) != NULL) 3335 if ((buf = strchr (name, ';')) != NULL)
3878 *buf++ = '\0'; 3336 *buf++ = '\0';
3879 3337
3880 if (name[0] == '?' && !name[1]) 3338 process_color_seq (op, color, name, resp);
3881 {
3882 unsigned short r, g, b;
3883 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3884 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3885 }
3886 else
3887 set_window_color (color + minCOLOR, name);
3888 } 3339 }
3889 break; 3340 break;
3890 case XTerm_Color00: 3341 case XTerm_Color00:
3891 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3342 process_color_seq (op, Color_fg, str, resp);
3892 break; 3343 break;
3893 case XTerm_Color01: 3344 case XTerm_Color01:
3894 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3345 process_color_seq (op, Color_bg, str, resp);
3895 break; 3346 break;
3896#ifndef NO_CURSORCOLOR 3347#ifndef NO_CURSORCOLOR
3897 case XTerm_Color_cursor: 3348 case XTerm_Color_cursor:
3898 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3349 process_color_seq (op, Color_cursor, str, resp);
3899 break; 3350 break;
3900#endif 3351#endif
3901 case XTerm_Color_pointer_fg: 3352 case XTerm_Color_pointer_fg:
3902 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3353 process_color_seq (op, Color_pointer_fg, str, resp);
3903 break; 3354 break;
3904 case XTerm_Color_pointer_bg: 3355 case XTerm_Color_pointer_bg:
3905 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3356 process_color_seq (op, Color_pointer_bg, str, resp);
3906 break; 3357 break;
3907#ifndef NO_BOLD_UNDERLINE_REVERSE 3358#ifndef NO_BOLD_UNDERLINE_REVERSE
3908 case XTerm_Color_BD:
3909 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3910 break;
3911 case XTerm_Color_UL:
3912 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3913 break;
3914 case XTerm_Color_RV: 3359 case XTerm_Color_RV:
3915 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3360 process_color_seq (op, Color_RV, str, resp);
3361 break;
3362 case Rxvt_Color_BD:
3363 case URxvt_Color_BD:
3364 process_color_seq (op, Color_BD, str, resp);
3365 break;
3366 case Rxvt_Color_UL:
3367 case URxvt_Color_UL:
3368 process_color_seq (op, Color_UL, str, resp);
3916 break; 3369 break;
3917 case URxvt_Color_IT: 3370 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3371 process_color_seq (op, Color_IT, str, resp);
3919 break; 3372 break;
3920#endif 3373#endif
3921#if TRANSPARENT && TINTING 3374#if ENABLE_TRANSPARENCY
3922 case URxvt_Color_tint: 3375 case URxvt_Color_tint:
3923 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3376 process_color_seq (op, Color_tint, str, resp);
3924 check_our_parents (); 3377 {
3925 if (am_transparent) 3378 bool changed = false;
3926 want_full_refresh = want_refresh = 1; 3379 if (ISSET_PIXCOLOR (Color_tint))
3927 break; 3380 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3928#endif 3381 else
3382 changed = bgPixmap.unset_tint ();
3383 if (changed)
3384 update_background ();
3385 }
3929 3386
3387 break;
3388#endif
3389
3390#if BG_IMAGE_FROM_FILE
3930 case XTerm_Pixmap: 3391 case Rxvt_Pixmap:
3931 if (*str != ';') 3392 if (!strcmp (str, "?"))
3932 { 3393 {
3933#if XPM_BACKGROUND 3394 char str[256];
3934 scale_pixmap (""); /* reset to default scaling */ 3395
3935 set_bgPixmap (str); /* change pixmap */ 3396 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3936#endif 3397 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3937 scr_touch (true); 3398 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3399 process_xterm_seq (XTerm_title, str, CHAR_ST);
3938 } 3400 }
3939 while ((str = strchr (str, ';')) != NULL) 3401 else
3940 { 3402 {
3403 int changed = 0;
3404
3405 if (*str != ';')
3406 {
3407 /* reset to default scaling :*/
3408 bgPixmap.unset_geometry ();
3409 if (bgPixmap.set_file (str)) /* change pixmap */
3410 changed++;
3411 str = strchr (str, ';');
3412 if (str == NULL)
3413 bgPixmap.set_defaultGeometry ();
3414 }
3415 while (str)
3416 {
3941 str++; 3417 str++;
3942#if XPM_BACKGROUND 3418 if (bgPixmap.set_geometry (str))
3943 changed += scale_pixmap (str); 3419 changed++;
3944#endif 3420 str = strchr (str, ';');
3421 }
3422 if (changed)
3423 update_background ();
3945 } 3424 }
3946
3947 if (changed)
3948 {
3949#ifdef XPM_BACKGROUND
3950 resize_pixmap ();
3951#endif
3952 scr_touch (true);
3953 }
3954 break; 3425 break;
3426#endif
3955 3427
3956 case XTerm_restoreFG: 3428 case Rxvt_restoreFG:
3957 set_window_color (Color_fg, str); 3429 set_window_color (Color_fg, str);
3958 break; 3430 break;
3959 case XTerm_restoreBG: 3431 case Rxvt_restoreBG:
3960 set_window_color (Color_bg, str); 3432 set_window_color (Color_bg, str);
3961 break; 3433 break;
3962 3434
3963 case XTerm_logfile: 3435 case XTerm_logfile:
3964 // TODO, when secure mode? 3436 // TODO, when secure mode?
3965 break; 3437 break;
3966 3438
3967#ifdef MENUBAR
3968 case URxvt_Menu:
3969 if (OPTION (Opt_insecure))
3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3971 break;
3972#endif
3973#if 0 3439#if 0
3974 case XTerm_dumpscreen: /* no error notices */ 3440 case Rxvt_dumpscreen: /* no error notices */
3975 { 3441 {
3976 int fd; 3442 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3443 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3978 { 3444 {
3979 scr_dump (fd); 3445 scr_dump (fd);
… …
3990 case URxvt_italicFont: 3456 case URxvt_italicFont:
3991 case URxvt_boldItalicFont: 3457 case URxvt_boldItalicFont:
3992#endif 3458#endif
3993 if (query) 3459 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", saveop, 3460 tt_printf ("\33]%d;%-.250s%c", saveop,
3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3461 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3996 ? fontset[op - URxvt_font]->fontdesc : "", 3462 ? fontset[op - URxvt_font]->fontdesc : "",
3997 resp); 3463 resp);
3998 else 3464 else
3999 { 3465 {
4000 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3466 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4003 allocated.push_back ((void *)res); 3469 allocated.push_back ((void *)res);
4004 set_fonts (); 3470 set_fonts ();
4005 } 3471 }
4006 break; 3472 break;
4007 3473
4008#if ENABLE_FRILLS 3474 case URxvt_version:
3475 if (query)
3476 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3477 op,
3478 rs[Rs_name], VERSION[0], VERSION[2],
3479 resp);
3480 break;
3481
3482#if !ENABLE_MINIMAL
4009 case URxvt_locale: 3483 case URxvt_locale:
4010 if (query) 3484 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3485 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4012 else 3486 else
4013 { 3487 {
4014 set_locale (str); 3488 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8); 3489 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale (); 3490 init_xlocale ();
4017 } 3491 }
4018 break; 3492 break;
4019 3493
4020 case URxvt_view_up: 3494 case URxvt_view_up:
… …
4031 break; 3505 break;
4032#endif 3506#endif
4033 3507
4034#if ENABLE_PERL 3508#if ENABLE_PERL
4035 case URxvt_perl: 3509 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3510 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet 3511 ; // no responses yet
4038 break; 3512 break;
4039#endif 3513#endif
4040 } 3514 }
4041} 3515}
… …
4073 return state; 3547 return state;
4074} 3548}
4075 3549
4076/* we're not using priv _yet_ */ 3550/* we're not using priv _yet_ */
4077void 3551void
4078rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3552rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4079{ 3553{
4080 unsigned int i, j; 3554 unsigned int i, j;
4081 int state; 3555 int state;
4082 3556
4083 static const struct 3557 static const struct
4084 { 3558 {
4085 const int argval; 3559 const int argval;
4086 const unsigned long bit; 3560 const unsigned long bit;
4087 }
4088
4089 argtopriv[] = { 3561 } argtopriv[] = {
4090 { 1, PrivMode_aplCUR }, 3562 { 1, PrivMode_aplCUR },
4091 { 2, PrivMode_vt52 }, 3563 { 2, PrivMode_vt52 },
4092 { 3, PrivMode_132 }, 3564 { 3, PrivMode_132 },
4093 { 4, PrivMode_smoothScroll }, 3565 { 4, PrivMode_smoothScroll },
4094 { 5, PrivMode_rVideo }, 3566 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 3567 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 3568 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 3569 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 3570 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 3571 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 3572 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 3573#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 3574 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 3575#endif
… …
4113 { 66, PrivMode_aplKP }, 3582 { 66, PrivMode_aplKP },
4114#ifndef NO_BACKSPACE_KEY 3583#ifndef NO_BACKSPACE_KEY
4115 { 67, PrivMode_BackSpace }, 3584 { 67, PrivMode_BackSpace },
4116#endif 3585#endif
4117 { 1000, PrivMode_MouseX11 }, 3586 { 1000, PrivMode_MouseX11 },
4118 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3587 { 1002, PrivMode_MouseBtnEvent },
4119 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3588 { 1003, PrivMode_MouseAnyEvent },
4120 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4121 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4122 { 1011, PrivMode_Keypress }, // rxvt extension 3590 { 1011, PrivMode_Keypress }, // rxvt extension
4123 // 1035 enable modifiers for alt, numlock NYI 3591 // 1035 enable modifiers for alt, numlock NYI
4124 // 1036 send ESC for meta keys NYI 3592 // 1036 send ESC for meta keys NYI
4125 // 1037 send DEL for keypad delete NYI 3593 // 1037 send DEL for keypad delete NYI
… …
4153 /* extra handling for values with state unkept */ 3621 /* extra handling for values with state unkept */
4154 switch (arg[i]) 3622 switch (arg[i])
4155 { 3623 {
4156#if ENABLE_STYLES 3624#if ENABLE_STYLES
4157 case 1021: 3625 case 1021:
4158 if (mode) 3626 set_option (Opt_intensityStyles, mode);
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162 3627
4163 scr_touch (true); 3628 scr_touch (true);
4164 break; 3629 break;
4165#endif 3630#endif
4166 case 1048: /* alternative cursor save */ 3631 case 1048: /* alternative cursor save */
4167 case 1049: 3632 case 1049:
4168 if (OPTION (Opt_secondaryScreen)) 3633 if (option (Opt_secondaryScreen))
4169 if (mode == 0) 3634 if (mode == 0)
4170 scr_cursor (RESTORE); 3635 scr_cursor (RESTORE);
4171 else if (mode == 1) 3636 else if (mode == 1)
4172 scr_cursor (SAVE); 3637 scr_cursor (SAVE);
4173 break; 3638 break;
… …
4188 case 3: /* 80/132 */ 3653 case 3: /* 80/132 */
4189 if (priv_modes & PrivMode_132OK) 3654 if (priv_modes & PrivMode_132OK)
4190 set_widthheight (((state ? 132 : 80) * fwidth), height); 3655 set_widthheight (((state ? 132 : 80) * fwidth), height);
4191 break; 3656 break;
4192 case 4: /* smooth scrolling */ 3657 case 4: /* smooth scrolling */
4193 if (!state) 3658 set_option (Opt_jumpScroll, !state);
4194 SET_OPTION (Opt_jumpScroll);
4195 else
4196 CLR_OPTION (Opt_jumpScroll);
4197 break; 3659 break;
4198 case 5: /* reverse video */ 3660 case 5: /* reverse video */
4199 scr_rvideo_mode (state); 3661 scr_rvideo_mode (state);
4200 break; 3662 break;
4201 case 6: /* relative/absolute origins */ 3663 case 6: /* relative/absolute origins */
… …
4205 scr_autowrap (state); 3667 scr_autowrap (state);
4206 break; 3668 break;
4207 /* case 8: - auto repeat, can't do on a per window basis */ 3669 /* case 8: - auto repeat, can't do on a per window basis */
4208 case 9: /* X10 mouse reporting */ 3670 case 9: /* X10 mouse reporting */
4209 if (state) /* orthogonal */ 3671 if (state) /* orthogonal */
4210 priv_modes &= ~PrivMode_MouseX11; 3672 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4211 break; 3673 break;
4212#ifdef menuBar_esc
4213 case menuBar_esc:
4214#ifdef MENUBAR
4215 map_menuBar (state);
4216#endif
4217 break;
4218#endif
4219#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
4220 case scrollBar_esc: 3675 case scrollBar_esc:
4221 if (scrollbar_mapping (state)) 3676 if (scrollbar_mapping (state))
4222 { 3677 {
4223 resize_all_windows (0, 0, 0); 3678 resize_all_windows (0, 0, 0);
… …
4235 break; 3690 break;
4236 /* case 66: - application key pad */ 3691 /* case 66: - application key pad */
4237 /* case 67: - backspace key */ 3692 /* case 67: - backspace key */
4238 case 1000: /* X11 mouse reporting */ 3693 case 1000: /* X11 mouse reporting */
4239 if (state) /* orthogonal */ 3694 if (state) /* orthogonal */
4240 priv_modes &= ~PrivMode_MouseX10; 3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4241 break; 3696 break;
4242#if 0
4243 case 1001: 3697 case 1002:
4244 break; /* X11 mouse highlighting */ 3698 case 1003:
4245#endif 3699 if (state)
3700 {
3701 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3702 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3703 vt_emask_mouse = PointerMotionMask;
3704 }
3705 else
3706 vt_emask_mouse = NoEventMask;
3707 vt_select_input ();
3708 break;
4246 case 1010: /* scroll to bottom on TTY output inhibit */ 3709 case 1010: /* scroll to bottom on TTY output inhibit */
4247 if (!state) 3710 set_option (Opt_scrollTtyOutput, !state);
4248 SET_OPTION (Opt_scrollTtyOutput);
4249 else
4250 CLR_OPTION (Opt_scrollTtyOutput);
4251 break; 3711 break;
4252 case 1011: /* scroll to bottom on key press */ 3712 case 1011: /* scroll to bottom on key press */
4253 if (state) 3713 set_option (Opt_scrollTtyKeypress, state);
4254 SET_OPTION (Opt_scrollTtyKeypress);
4255 else
4256 CLR_OPTION (Opt_scrollTtyKeypress);
4257 break; 3714 break;
4258 case 1047: /* secondary screen w/ clearing last */ 3715 case 1047: /* secondary screen w/ clearing last */
4259 if (OPTION (Opt_secondaryScreen)) 3716 if (option (Opt_secondaryScreen))
4260 if (current_screen != PRIMARY) 3717 if (current_screen != PRIMARY)
4261 scr_erase_screen (2); 3718 scr_erase_screen (2);
4262 scr_change_screen (state); 3719 scr_change_screen (state);
4263 break; 3720 break;
4264 case 1049: /* secondary screen w/ clearing first */ 3721 case 1049: /* secondary screen w/ clearing first */
4265 scr_change_screen (state); 3722 scr_change_screen (state);
4266 if (OPTION (Opt_secondaryScreen)) 3723 if (option (Opt_secondaryScreen))
4267 if (current_screen != PRIMARY) 3724 if (current_screen != PRIMARY)
4268 scr_erase_screen (2); 3725 scr_erase_screen (2);
4269 break; 3726 break;
4270 default: 3727 default:
4271 break; 3728 break;
… …
4399 scr_color (Color_bg, Color_bg); 3856 scr_color (Color_bg, Color_bg);
4400 break; 3857 break;
4401 3858
4402 //case 50: // not variable spacing 3859 //case 50: // not variable spacing
4403 3860
4404#if ENABLE_FRILLS 3861#if !ENABLE_MINIMAL
4405 case 90: 3862 case 90:
4406 case 91: /* set bright fg color */ 3863 case 91: /* set bright fg color */
4407 case 92: 3864 case 92:
4408 case 93: 3865 case 93:
4409 case 94: 3866 case 94:
… …
4433rxvt_term::process_graphics () 3890rxvt_term::process_graphics ()
4434{ 3891{
4435 unicode_t ch, cmd = cmd_getc (); 3892 unicode_t ch, cmd = cmd_getc ();
4436 3893
4437 if (cmd == 'Q') 3894 if (cmd == 'Q')
3895 {
4438 { /* query graphics */ 3896 /* query graphics */
4439 tt_printf ("\033G0\012"); /* no graphics */ 3897 tt_printf ("\033G0\012"); /* no graphics */
4440 return; 3898 return;
4441 } 3899 }
4442 /* swallow other graphics sequences until terminating ':' */ 3900 /* swallow other graphics sequences until terminating ':' */
4443 do 3901 do
… …
4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3929const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4472 3930
4473void 3931void
4474rxvt_term::tt_write (const char *data, unsigned int len) 3932rxvt_term::tt_write (const char *data, unsigned int len)
4475{ 3933{
4476 if (pty.pty < 0) 3934 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4477 return; 3935 return;
4478 3936
3937 if (pty->pty < 0)
3938 return;
3939
4479 if (v_buflen == 0) 3940 if (v_buflen == 0)
4480 { 3941 {
4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3942 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4482 3943
4483 if ((unsigned int)written == len) 3944 if ((unsigned int)written == len)
4484 return; 3945 return;
4485 3946
4486 data += written; 3947 data += written;
… …
4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3951 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4491 3952
4492 memcpy (v_buffer + v_buflen, data, len); 3953 memcpy (v_buffer + v_buflen, data, len);
4493 v_buflen += len; 3954 v_buflen += len;
4494 3955
4495 pty_ev.set (EVENT_READ | EVENT_WRITE); 3956 pty_ev.set (ev::READ | ev::WRITE);
4496} 3957}
4497 3958
4498void rxvt_term::pty_write () 3959void rxvt_term::pty_write ()
4499{ 3960{
4500 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 3961 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4501 3962
4502 if (written > 0) 3963 if (written > 0)
4503 { 3964 {
4504 v_buflen -= written; 3965 v_buflen -= written;
4505 3966
4506 if (v_buflen == 0) 3967 if (v_buflen == 0)
4507 { 3968 {
4508 free (v_buffer); 3969 free (v_buffer);
4509 v_buffer = 0; 3970 v_buffer = 0;
4510 v_buflen = 0;
4511 3971
4512 pty_ev.set (EVENT_READ); 3972 pty_ev.set (ev::READ);
4513 return; 3973 return;
4514 } 3974 }
4515 3975
4516 memmove (v_buffer, v_buffer + written, v_buflen); 3976 memmove (v_buffer, v_buffer + written, v_buflen);
4517 } 3977 }
4518 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3978 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4519 pty_ev.set (EVENT_READ); 3979 pty_ev.set (ev::READ);
4520} 3980}
4521 3981
4522/*----------------------- end-of-file (C source) -----------------------*/ 3982/*----------------------- end-of-file (C source) -----------------------*/
4523 3983

Diff Legend

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