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.394 by ayin, Sat Jan 19 15:00:49 2008 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 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
31 * 32 *
32 * This program is free software; you can redistribute it and/or modify 33 * 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 34 * 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 35 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 36 * (at your option) any later version.
… …
49#include "rxvt.h" 50#include "rxvt.h"
50#include "rxvtperl.h" 51#include "rxvtperl.h"
51#include "version.h" 52#include "version.h"
52#include "command.h" 53#include "command.h"
53 54
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 55#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 56# include "keyboard.h"
61#endif 57#endif
62 58
63#include <csignal> 59#include <csignal>
64 60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#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 68
72#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
73 70
74#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
99 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
100 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
101 98
102 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
103 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
104 XK_ISO_Lock, 0x21eb,
105 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
106 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
107 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
108 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
109 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
203 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
204 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
205 201
206 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
207 203
208 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
210 206
211 if (y >= 0) 207 if (y >= 0)
212 { 208 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
225 ch = *chr++; 221 ch = *chr++;
226 222
227 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
229 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
230# if !UNICODE3 226# if !UNICODE_3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
493 { 497 {
494 commit_iso14755 (); 498 commit_iso14755 ();
495 iso14755buf = ISO_14755_51; 499 iso14755buf = ISO_14755_51;
496# if ISO_14755 500# if ISO_14755
497 iso14755_51 (0); 501 iso14755_51 (0);
502# endif
503 return;
504 }
505 else if (keysym == XK_BackSpace)
506 {
507 iso14755buf = ((iso14755buf & ISO_14755_MASK) >> 4) | ISO_14755_51;
508# if ISO_14755
509 iso14755_51 (iso14755buf & ISO_14755_MASK);
498# endif 510# endif
499 return; 511 return;
500 } 512 }
501 else if ((hv = hex_keyval (ev)) >= 0) 513 else if ((hv = hex_keyval (ev)) >= 0)
502 { 514 {
… …
507# endif 519# endif
508 return; 520 return;
509 } 521 }
510 else 522 else
511 { 523 {
512# if ENABLE_OVERLAY 524# if ISO_14755
513 scr_overlay_off (); 525 scr_overlay_off ();
514# endif 526# endif
515 iso14755buf = 0; 527 iso14755buf = 0;
516 } 528 }
517 } 529 }
518 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 530 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
519 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 531 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
520 if (!(iso14755buf & ISO_14755_STARTED)) 532 if (!(iso14755buf & ISO_14755_STARTED))
521 { 533 {
522 iso14755buf |= ISO_14755_STARTED; 534 iso14755buf |= ISO_14755_STARTED;
523# if ENABLE_OVERLAY 535# if ISO_14755
524 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 536 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
525 scr_overlay_set (0, 0, "ISO 14755 mode"); 537 scr_overlay_set (0, 0, "ISO 14755 mode");
526# endif 538# endif
527 } 539 }
528#endif 540#endif
529 541
530#ifdef PRINTPIPE 542#ifdef PRINTPIPE
531 if (keysym == XK_Print) 543 if (keysym == XK_Print)
532 { 544 {
533 scr_printscreen (ctrl | shft); 545 scr_printscreen (ctrl | shft);
534 return; 546 return;
… …
536#endif 548#endif
537 549
538 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 550 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
539 { 551 {
540 { 552 {
553 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
541 newlen = 1; 554 newlen = 1;
555#ifdef XK_KP_Home
556 static const KeySym keypadtrans[] = {
557 XK_KP_7, // XK_KP_Home
558 XK_KP_4, // XK_KP_Left
559 XK_KP_8, // XK_KP_Up
560 XK_KP_6, // XK_KP_Right
561 XK_KP_2, // XK_KP_Down
562#ifndef UNSHIFTED_SCROLLKEYS
563 XK_KP_9, // XK_KP_Prior
564 XK_KP_3, // XK_KP_Next
565#else
566 XK_Prior,
567 XK_Next,
568#endif
569 XK_KP_1, // XK_KP_End
570 XK_KP_5, // XK_KP_Begin
571 };
572
573 if (IN_RANGE_INC (keysym, XK_KP_Home, XK_KP_Begin))
574 {
575 unsigned int index = keysym - XK_KP_Home;
576 keysym = kp ? keypadtrans[index] : XK_Home + index;
577 }
578 else if (keysym == XK_KP_Insert)
579 keysym = kp ? XK_KP_0 : XK_Insert;
580#ifndef NO_DELETE_KEY
581 else if (keysym == XK_KP_Delete)
582 keysym = kp ? XK_KP_Decimal : XK_Delete;
583#endif
584#endif
542 switch (keysym) 585 switch (keysym)
543 { 586 {
544#ifndef NO_BACKSPACE_KEY 587#ifndef NO_BACKSPACE_KEY
545 case XK_BackSpace: 588 case XK_BackSpace:
546 if (priv_modes & PrivMode_HaveBackSpace) 589 if (priv_modes & PrivMode_HaveBackSpace)
… …
548 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 591 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
549 ^ !!ctrl) ? '\b' : '\177'; 592 ^ !!ctrl) ? '\b' : '\177';
550 kbuf[1] = '\0'; 593 kbuf[1] = '\0';
551 } 594 }
552 else 595 else
553 strcpy (kbuf, key_backspace); 596 strcpy (kbuf, rs[Rs_backspace_key]);
554 break; 597 break;
555#endif 598#endif
556#ifndef NO_DELETE_KEY 599#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: 600 case XK_Delete:
568 strcpy (kbuf, key_delete); 601 strcpy (kbuf, rs[Rs_delete_key]);
569 break; 602 break;
570#endif 603#endif
571 case XK_Tab: 604 case XK_Tab:
572 if (shft) 605 if (shft)
573 strcpy (kbuf, "\033[Z"); 606 strcpy (kbuf, "\033[Z");
… …
583#endif 616#endif
584 newlen = 0; 617 newlen = 0;
585 } 618 }
586 break; 619 break;
587 620
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" */ 621 case XK_Up: /* "\033[A" */
605 case XK_Down: /* "\033[B" */ 622 case XK_Down: /* "\033[B" */
606 case XK_Right: /* "\033[C" */ 623 case XK_Right: /* "\033[C" */
607 case XK_Left: /* "\033[D" */ 624 case XK_Left: /* "\033[D" */
608 strcpy (kbuf, "\033[Z"); 625 strcpy (kbuf, "\033[Z");
… …
618 else if (priv_modes & PrivMode_aplCUR) 635 else if (priv_modes & PrivMode_aplCUR)
619 kbuf[1] = 'O'; 636 kbuf[1] = 'O';
620 break; 637 break;
621 638
622#ifndef UNSHIFTED_SCROLLKEYS 639#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: 640 case XK_Prior:
634 strcpy (kbuf, "\033[5~"); 641 strcpy (kbuf, "\033[5~");
635 break; 642 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: 643 case XK_Next:
647 strcpy (kbuf, "\033[6~"); 644 strcpy (kbuf, "\033[6~");
648 break; 645 break;
649#endif 646#endif
650 case XK_KP_Enter: 647 case XK_KP_Enter:
651 /* allow shift to override */ 648 /* allow shift to override */
652 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 649 if (kp)
653 { 650 {
654 strcpy (kbuf, "\033OM"); 651 strcpy (kbuf, "\033OM");
655 break; 652 break;
656 } 653 }
657 654
… …
669 kbuf[0] = '\015'; 666 kbuf[0] = '\015';
670 kbuf[1] = '\0'; 667 kbuf[1] = '\0';
671 } 668 }
672 break; 669 break;
673 670
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" */ 671 case XK_KP_F1: /* "\033OP" */
681 case XK_KP_F2: /* "\033OQ" */ 672 case XK_KP_F2: /* "\033OQ" */
682 case XK_KP_F3: /* "\033OR" */ 673 case XK_KP_F3: /* "\033OR" */
683 case XK_KP_F4: /* "\033OS" */ 674 case XK_KP_F4: /* "\033OS" */
684 strcpy (kbuf, "\033OP"); 675 strcpy (kbuf, "\033OP");
… …
700 case XK_KP_6: /* "\033Ov" : "6" */ 691 case XK_KP_6: /* "\033Ov" : "6" */
701 case XK_KP_7: /* "\033Ow" : "7" */ 692 case XK_KP_7: /* "\033Ow" : "7" */
702 case XK_KP_8: /* "\033Ox" : "8" */ 693 case XK_KP_8: /* "\033Ox" : "8" */
703 case XK_KP_9: /* "\033Oy" : "9" */ 694 case XK_KP_9: /* "\033Oy" : "9" */
704 /* allow shift to override */ 695 /* allow shift to override */
705 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 696 if (kp)
706 { 697 {
707 strcpy (kbuf, "\033Oj"); 698 strcpy (kbuf, "\033Oj");
708 kbuf[2] += (keysym - XK_KP_Multiply); 699 kbuf[2] += (keysym - XK_KP_Multiply);
709 } 700 }
710 else 701 else
… …
716 707
717 case XK_Find: 708 case XK_Find:
718 strcpy (kbuf, "\033[1~"); 709 strcpy (kbuf, "\033[1~");
719 break; 710 break;
720 711
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: 712 case XK_Insert:
732 strcpy (kbuf, "\033[2~"); 713 strcpy (kbuf, "\033[2~");
733 break; 714 break;
734#ifdef DXK_Remove /* support for DEC remove like key */ 715#ifdef DXK_Remove /* support for DEC remove like key */
735 case DXK_Remove: 716 case DXK_Remove:
… …
739 strcpy (kbuf, "\033[3~"); 720 strcpy (kbuf, "\033[3~");
740 break; 721 break;
741 case XK_Select: 722 case XK_Select:
742 strcpy (kbuf, "\033[4~"); 723 strcpy (kbuf, "\033[4~");
743 break; 724 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: 725 case XK_End:
755 strcpy (kbuf, KS_END); 726 strcpy (kbuf, KS_END);
756 break; 727 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: 728 case XK_Home:
768 strcpy (kbuf, KS_HOME); 729 strcpy (kbuf, KS_HOME);
769 break; 730 break;
770 731
771#define FKEY(n, fkey) \ 732#define FKEY(n, fkey) \
… …
867#endif 828#endif
868 /* nil */ ; 829 /* nil */ ;
869 } 830 }
870 } 831 }
871 832
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END))) 833 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 834 return;
874 835
875 if (len <= 0) 836 if (len <= 0)
876 return; /* not mapped */ 837 return; /* not mapped */
877 838
878 if (OPTION (Opt_scrollTtyKeypress)) 839 if (option (Opt_scrollTtyKeypress))
879 if (view_start) 840 if (view_start)
880 { 841 {
881 view_start = 0; 842 view_start = 0;
882 want_refresh = 1; 843 want_refresh = 1;
883 } 844 }
… …
905 { 866 {
906 const char ch = C0_ESC; 867 const char ch = C0_ESC;
907 tt_write (&ch, 1); 868 tt_write (&ch, 1);
908 } 869 }
909 870
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); 871 tt_write (kbuf, (unsigned int)len);
921} 872}
922/*}}} */
923 873
874void
875rxvt_term::key_release (XKeyEvent &ev)
876{
877#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
878 KeySym keysym;
879
880 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
881#endif
882
883#if ENABLE_FRILLS || ISO_14755
884 // ISO 14755 support
885 if (iso14755buf)
886 if (iso14755buf & ISO_14755_52)
887 {
888# if ISO_14755
889 scr_overlay_off ();
890# endif
891# if ISO_14755
892 // iso14755 part 5.2 handling: release time
893 // first: controls
894 if ((ev.state & ControlMask)
895 && ((keysym >= 0x40 && keysym <= 0x5f)
896 || (keysym >= 0x61 && keysym <= 0x7f)))
897 {
898 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
899 commit_iso14755 ();
900
901 return;
902 }
903
904 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
905 if (i[0] == keysym)
906 {
907 iso14755buf = ISO_14755_51 | i[1];
908 commit_iso14755 ();
909
910 return;
911 }
912
913 scr_bell ();
914# endif
915 iso14755buf = 0;
916
917 return;
918 }
919 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
920 {
921# if ISO_14755
922 scr_overlay_off ();
923# endif
924 if (iso14755buf & ISO_14755_51)
925 commit_iso14755 ();
926#if ISO_14755
927 else if (option (Opt_iso14755_52) && iso14755buf & ISO_14755_STARTED)
928 {
929 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
930
931 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
932 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
933 }
934# endif
935 else
936 iso14755buf = 0;
937 }
938#endif
939
940 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
941 return;
942
943#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
944 if (!(ev.state & ControlMask))
945 slip_wheel_ev.stop ();
946 else if (keysym == XK_Control_L || keysym == XK_Control_R)
947 mouse_slip_wheel_speed = 0;
948#endif
949}
950
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 951#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 952unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 953rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 954{
930 unsigned int n, s; 955 unsigned int n, s;
931 956
… …
959void 984void
960rxvt_term::flush () 985rxvt_term::flush ()
961{ 986{
962 flush_ev.stop (); 987 flush_ev.stop ();
963 988
964#ifdef TRANSPARENT 989#ifdef HAVE_BG_PIXMAP
965 if (want_full_refresh) 990 if (bgPixmap.check_clearChanged ())
966 { 991 {
967 want_full_refresh = 0; 992// scr_clear (true); This needs to be researched further!
968 scr_clear ();
969 scr_touch (false); 993 scr_touch (false);
970 } 994 }
971#endif 995#endif
972 996
973 if (want_refresh) 997 if (want_refresh)
974 { 998 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 999 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 1000 {
977 int row = -view_start; 1001 int row = view_start;
1002 int end_row = row + nrow;
978 1003
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 1004 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 1005 --row;
981 1006
982 while (row < -view_start + nrow) 1007 do
983 { 1008 {
984 int start_row = row; 1009 int start_row = row;
985 line_t *l; 1010 line_t *l;
986 1011
987 do 1012 do
988 { 1013 {
989 l = &ROW (row); 1014 l = &ROW (row++);
990 1015
991 if (!(l->f & LINE_FILTERED)) 1016 if (!(l->f & LINE_FILTERED))
992 { 1017 {
993 // line not filtered, mark it as filtered 1018 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 1019 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 1020 while (l->is_longer ())
996 { 1021 {
997 l = &ROW (++row); 1022 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 1023 l->f |= LINE_FILTERED;
999 } 1024 }
1000 1025
1001 // and filter it 1026 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1027 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 1028
1004 break; 1029 break;
1005 } 1030 }
1006 } 1031 }
1007 while (l->is_longer ()); 1032 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 1033 }
1034 while (row < end_row);
1011 1035 }
1012 }
1013 1036
1014 scr_refresh (refresh_type); 1037 scr_refresh ();
1015 scrollbar_show (1); 1038 scrollbar_show (1);
1016#ifdef USE_XIM 1039#ifdef USE_XIM
1017 IMSendSpot (); 1040 IMSendSpot ();
1018#endif 1041#endif
1019 } 1042 }
1020 1043
1021 display->flush (); 1044 display->flush ();
1022} 1045}
1023 1046
1047/* checks wether a refresh is requested and starts the refresh timer */
1024void 1048void
1025rxvt_term::check_cb (check_watcher &w) 1049rxvt_term::refresh_check ()
1026{ 1050{
1027 SET_R (this); 1051 if (want_refresh && !flush_ev.is_active ())
1028 SET_LOCALE (locale); 1052 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1029 1053
1030 display->flush (); 1054 display->flush ();
1031
1032 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 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 1072 refresh_check ();
1054 w.start (w.at + BLINK_INTERVAL);
1055} 1073}
1056#endif 1074#endif
1057 1075
1058#ifdef TEXT_BLINK 1076#ifdef TEXT_BLINK
1059void 1077void
1060rxvt_term::text_blink_cb (time_watcher &w) 1078rxvt_term::text_blink_cb (ev::timer &w, int revents)
1061{ 1079{
1062 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1080 if (scr_refresh_rend (RS_Blink, RS_Blink))
1063 { 1081 {
1064 hidden_text = !hidden_text; 1082 hidden_text = !hidden_text;
1065 want_refresh = 1; 1083 want_refresh = 1;
1066 w.start (w.at + TEXT_BLINK_INTERVAL); 1084 refresh_check ();
1067 } 1085 }
1086 else
1087 w.stop ();
1068} 1088}
1069#endif 1089#endif
1070 1090
1071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1091#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1072void 1092void
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1093rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1074{ 1094{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1095 if ((scrollbar_isUp () || scrollbar_isDn ())
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1096 && scr_page (scrollbar_isUp () ? UP : DN, 1))
1077 { 1097 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1098 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1099 refresh_check ();
1081 } 1100 }
1101 else
1102 w.stop ();
1082} 1103}
1083#endif 1104#endif
1084 1105
1085#ifdef SELECTION_SCROLLING 1106#ifdef SELECTION_SCROLLING
1086void 1107void
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1108rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1088{ 1109{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1110 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1111 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1112 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1113 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 refresh_check ();
1095 } 1115 }
1116 else
1117 w.stop ();
1096} 1118}
1097#endif 1119#endif
1098 1120
1099#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1121#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1100void 1122void
1101rxvt_term::slip_wheel_cb (time_watcher &w) 1123rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1102{ 1124{
1103 if (mouse_slip_wheel_speed == 0 1125 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1126 {
1107 if (view_start == nsaved ||
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0;
1110
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1127 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1128 refresh_check ();
1129 }
1130
1131 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1114 } 1132 {
1133 mouse_slip_wheel_speed = 0;
1134 w.stop ();
1135 }
1115} 1136}
1116#endif 1137#endif
1117 1138
1118#if HAVE_SCHED_YIELD 1139#if LINUX_YIELD_HACK
1119static struct event_handler 1140static struct event_handler
1120{ 1141{
1121 check_watcher cw_yield; 1142 ev::prepare yield_ev;
1122 1143
1123 void yield (check_watcher &w) 1144 void yield_cb (ev::prepare &w, int revents)
1124 { 1145 {
1125 sched_yield (); 1146 // this should really be sched_yield(), but the linux guys thought
1147 // that giving a process calling sched_yield () less cpu time than
1148 // ones with high nice levels is a useful thing to do. It surely is is
1149 // allowed by the sus... as is returning ENOSYS.
1150
1151 struct timespec ts = { 0, 0 };
1152 nanosleep (&ts, 0);
1153
1126 w.stop (); 1154 w.stop ();
1127 } 1155 }
1128 1156
1129 event_handler () 1157 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1158 : yield_ev (this, &event_handler::yield_cb)
1131 { 1159 {
1132 } 1160 }
1133} event_handler; 1161} event_handler;
1134#endif 1162#endif
1135 1163
… …
1146 1174
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1175 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1176 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1177 cmdbuf_endp = cmdbuf_ptr + n;
1150 1178
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1179 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1180
1153 if (r > 0) 1181 if (r > 0)
1154 { 1182 {
1155 cmdbuf_endp += r; 1183 cmdbuf_endp += r;
1156 return true; 1184 return true;
1157 } 1185 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1186 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1187 {
1160#if HAVE_SCHED_YIELD 1188#if LINUX_YIELD_HACK
1161 if (display->is_local) 1189 if (display->is_local)
1162 event_handler.cw_yield.start (); 1190 event_handler.yield_ev.start ();
1163#endif 1191#endif
1164 } 1192 }
1165 else 1193 else
1166 { 1194 {
1167 pty_ev.stop (); 1195 pty_ev.stop ();
1168 1196
1169 if (!OPTION (Opt_hold)) 1197 if (!option (Opt_hold))
1170 destroy (); 1198 destroy ();
1171 } 1199 }
1172 1200
1173 return false; 1201 return false;
1174} 1202}
1175 1203
1176void 1204void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1205rxvt_term::pty_cb (ev::io &w, int revents)
1178{ 1206{
1179 SET_R (this); 1207 make_current ();
1180 SET_LOCALE (locale);
1181 1208
1182 if (revents & EVENT_READ) 1209 if (revents & ev::READ)
1183 // loop, but don't allow a single term to monopolize us 1210 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1211 while (pty_fill ())
1185 if (cmd_parse ()) 1212 if (cmd_parse ())
1186 break; 1213 break;
1187 1214
1188 if (revents & EVENT_WRITE) 1215 if (revents & ev::WRITE)
1189 pty_write (); 1216 pty_write ();
1217
1218 refresh_check ();
1190} 1219}
1191 1220
1192void 1221void
1193rxvt_term::pointer_unblank () 1222rxvt_term::pointer_unblank ()
1194{ 1223{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1224 XDefineCursor (dpy, vt, TermWin_cursor);
1196 recolour_cursor (); 1225 recolour_cursor ();
1197 1226
1198#ifdef POINTER_BLANK 1227#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1228 hidden_pointer = 0;
1200 1229
1201 if (OPTION (Opt_pointerBlank)) 1230 if (option (Opt_pointerBlank))
1202 pointer_ev.start (NOW + pointerBlankDelay); 1231 pointer_ev.start (pointerBlankDelay);
1203#endif 1232#endif
1204} 1233}
1205 1234
1206#ifdef POINTER_BLANK 1235#ifdef POINTER_BLANK
1207void 1236void
1208rxvt_term::pointer_blank () 1237rxvt_term::pointer_blank ()
1209{ 1238{
1210 if (!OPTION (Opt_pointerBlank)) 1239 if (!option (Opt_pointerBlank))
1211 return; 1240 return;
1212 1241
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1242 XDefineCursor (dpy, vt, display->blank_cursor);
1214 XFlush (display->display); 1243 XFlush (dpy);
1215 1244
1216 hidden_pointer = 1; 1245 hidden_pointer = 1;
1217} 1246}
1218 1247
1219void 1248void
1220rxvt_term::pointer_cb (time_watcher &w) 1249rxvt_term::pointer_cb (ev::timer &w, int revents)
1221{ 1250{
1222 SET_R (this); 1251 make_current ();
1223 SET_LOCALE (locale);
1224 1252
1225 pointer_blank (); 1253 pointer_blank ();
1226} 1254}
1227#endif 1255#endif
1228 1256
1229void 1257void
1230rxvt_term::mouse_report (XButtonEvent &ev) 1258rxvt_term::mouse_report (XButtonEvent &ev)
1231{ 1259{
1232 int button_number, key_state = 0; 1260 int button_number, key_state = 0;
1233 int x, y; 1261 int x, y;
1262 int code = 32;
1234 1263
1235 x = ev.x; 1264 x = Pixel2Col (ev.x);
1236 y = ev.y; 1265 y = Pixel2Row (ev.y);
1237 pixel_position (&x, &y); 1266 if (ev.type == MotionNotify)
1267 {
1268 if (x == mouse_row && y == mouse_col)
1269 return;
1270 mouse_row = x;
1271 mouse_col = y;
1272 code += 32;
1273 }
1238 1274
1239 if (MEvent.button == AnyButton) 1275 if (MEvent.button == AnyButton)
1240 button_number = 3; 1276 button_number = 3;
1241 else 1277 else
1242 { 1278 {
… …
1288 x + 1, 1324 x + 1,
1289 y + 1); 1325 y + 1);
1290#endif 1326#endif
1291 1327
1292 tt_printf ("\033[M%c%c%c", 1328 tt_printf ("\033[M%c%c%c",
1293 (32 + button_number + key_state), 1329 (code + button_number + key_state),
1294 (32 + x + 1), 1330 (32 + x + 1),
1295 (32 + y + 1)); 1331 (32 + y + 1));
1296} 1332}
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 1333
1308/*{{{ process an X event */ 1334/*{{{ process an X event */
1309void 1335void
1310rxvt_term::x_cb (XEvent &ev) 1336rxvt_term::x_cb (XEvent &ev)
1311{ 1337{
1312 dDisp; 1338 make_current ();
1313 1339
1314 SET_R (this); 1340 dLocal (Display *, dpy);
1315 SET_LOCALE (locale);
1316 1341
1317#if defined(CURSOR_BLINK) 1342 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1343 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1344 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1345 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1346
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1347 // 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; 1348 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1349 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1350 unsigned int unused_mask;
1347 1351
1348 switch (ev.type) 1352 switch (ev.type)
1349 { 1353 {
1350 case KeyPress: 1354 case KeyPress:
1351#if ISO_14755 1355 key_press (ev.xkey);
1352 if (!(iso14755buf & ISO_14755_52))
1353#endif
1354 lookup_key (ev.xkey);
1355
1356 break; 1356 break;
1357 1357
1358 case KeyRelease: 1358 case KeyRelease:
1359 { 1359 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; 1360 break;
1431 }
1432 1361
1433 case ButtonPress: 1362 case ButtonPress:
1434 button_press (ev.xbutton); 1363 button_press (ev.xbutton);
1435 break; 1364 break;
1436 1365
… …
1438 button_release (ev.xbutton); 1367 button_release (ev.xbutton);
1439 break; 1368 break;
1440 1369
1441 case ClientMessage: 1370 case ClientMessage:
1442 if (ev.xclient.format == 32 1371 if (ev.xclient.format == 32
1443 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1372 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1444 { 1373 {
1374 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1375 {
1376 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1377 {
1445 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1378 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1379 {
1380 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1446 destroy (); 1381 destroy ();
1382 }
1447#if ENABLE_EWMH 1383#if ENABLE_EWMH
1448 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1384 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1449 XSendEvent (disp, ev.xclient.window = display->root, 1385 XSendEvent (dpy, ev.xclient.window = display->root,
1450 False, SubstructureRedirectMask | SubstructureNotifyMask, 1386 False, SubstructureRedirectMask | SubstructureNotifyMask,
1451 &ev); 1387 &ev);
1388#endif
1389 }
1390 }
1391#if ENABLE_XEMBED
1392 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1393 {
1394 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1395 focus_in ();
1396 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1397 focus_out ();
1398 }
1452#endif 1399#endif
1453 } 1400 }
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; 1401 break;
1494 1402
1495 /* 1403 /*
1496 * XXX: this is not the _current_ arrangement 1404 * XXX: this is not the _current_ arrangement
1497 * Here's my conclusion: 1405 * Here's my conclusion:
… …
1516 break; 1424 break;
1517 } 1425 }
1518 break; 1426 break;
1519 1427
1520 case FocusIn: 1428 case FocusIn:
1429 if (ev.xfocus.detail != NotifyInferior
1430 && ev.xfocus.detail != NotifyPointer
1431 && ev.xfocus.mode != NotifyGrab)
1521 focus_in (); 1432 focus_in ();
1522 break; 1433 break;
1523 1434
1524 case FocusOut: 1435 case FocusOut:
1436 if (ev.xfocus.detail != NotifyInferior
1437 && ev.xfocus.detail != NotifyPointer
1438 && ev.xfocus.mode != NotifyGrab)
1525 focus_out (); 1439 focus_out ();
1526 break; 1440 break;
1527 1441
1528 case ConfigureNotify: 1442 case ConfigureNotify:
1443 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1444 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1445 szHint.width, szHint.height); */
1529 if (ev.xconfigure.window == parent[0]) 1446 if (ev.xconfigure.window == parent[0])
1530 { 1447 {
1531 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1448 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1532 ; 1449 ;
1533 1450
1534 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1451 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1535 { 1452 {
1536 seen_resize = 1; 1453 seen_resize = 1;
1537 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1454 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1538 } 1455 }
1539 1456 else
1540#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1457 {
1541 if (OPTION (Opt_transparent)) 1458#ifdef HAVE_BG_PIXMAP
1542 check_our_parents (); 1459 if (bgPixmap.window_position_sensitive ())
1460 {
1461 if (mapped)
1462 update_background ();
1463 else
1464 bgPixmap.invalidate ();
1465 }
1543#endif 1466#endif
1467 }
1468
1469 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 } 1470 }
1545 break; 1471 break;
1546 1472
1547 case PropertyNotify: 1473 case PropertyNotify:
1474 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1548 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1475 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1549 && ev.xproperty.state == PropertyNewValue) 1476 && ev.xproperty.state == PropertyNewValue)
1550 selection_property (ev.xproperty.window, ev.xproperty.atom); 1477 selection_property (ev.xproperty.window, ev.xproperty.atom);
1551 1478
1552 break; 1479 break;
1553 1480
1554 case SelectionClear: 1481 case SelectionClear:
1555 selection_clear (); 1482 selection_clear ();
… …
1563 case SelectionRequest: 1490 case SelectionRequest:
1564 selection_send (ev.xselectionrequest); 1491 selection_send (ev.xselectionrequest);
1565 break; 1492 break;
1566 1493
1567 case MapNotify: 1494 case MapNotify:
1495#ifdef HAVE_BG_PIXMAP
1496 /* This is needed spcifically to fix the case of no window manager or a
1497 * non-reparenting window manager. In those cases we never get first
1498 * ConfigureNotify. Also that speeds startup under normal WM, by taking
1499 * care of multiplicity of ConfigureNotify events arriwing while WM does
1500 * reparenting.
1501 * We should not render background immidiately, as there could be several
1502 * ConfigureNotify's to follow. Lets take care of all of them in one scoop
1503 * by scheduling background redraw as soon as we can, but giving a short
1504 * bit of time for ConfigureNotifies to arrive.
1505 * We should render background PRIOR to drawing any text, but AFTER all
1506 * of ConfigureNotifys for the best results.
1507 */
1508 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1509 update_background_ev.start (0.025);
1510#endif
1568 mapped = 1; 1511 mapped = 1;
1569#ifdef TEXT_BLINK 1512#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1513 text_blink_ev.start ();
1571#endif 1514#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1515 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break; 1516 break;
1574 1517
1575 case UnmapNotify: 1518 case UnmapNotify:
… …
1577#ifdef TEXT_BLINK 1520#ifdef TEXT_BLINK
1578 text_blink_ev.stop (); 1521 text_blink_ev.stop ();
1579#endif 1522#endif
1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1523 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1581 break; 1524 break;
1582
1583#ifdef TRANSPARENT
1584 case ReparentNotify:
1585 rootwin_cb (ev);
1586 break;
1587#endif /* TRANSPARENT */
1588 1525
1589 case GraphicsExpose: 1526 case GraphicsExpose:
1590 case Expose: 1527 case Expose:
1591 if (ev.xany.window == vt) 1528 if (ev.xany.window == vt)
1592 { 1529 {
1593 do 1530 do
1531 {
1594 scr_expose (ev.xexpose.x, ev.xexpose.y, 1532 scr_expose (ev.xexpose.x, ev.xexpose.y,
1595 ev.xexpose.width, ev.xexpose.height, False); 1533 ev.xexpose.width, ev.xexpose.height, False);
1534 }
1596 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1597 1536
1598 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1599 1538
1600 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1540 {
1601 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1602 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1543 }
1603 1544
1604 scr_refresh (refresh_type); 1545 want_refresh = 1;
1605 } 1546 }
1606 else 1547 else
1607 { 1548 {
1608 XEvent unused_event; 1549 XEvent unused_event;
1609 1550
1610 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1551 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1611 ; 1552 ;
1612 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1553 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1613 ; 1554 ;
1614 1555
1615 if (isScrollbarWindow (ev.xany.window)) 1556 if (scrollBar.state && ev.xany.window == scrollBar.win)
1616 { 1557 {
1617 scrollBar.setIdle (); 1558 scrollBar.setIdle ();
1618 scrollbar_show (0); 1559 scrollbar_show (0);
1619 } 1560 }
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 } 1561 }
1630 break; 1562 break;
1631 1563
1632 case MotionNotify: 1564 case MotionNotify:
1633#ifdef POINTER_BLANK 1565#ifdef POINTER_BLANK
1634 if (hidden_pointer) 1566 if (hidden_pointer)
1635 pointer_unblank (); 1567 pointer_unblank ();
1636#endif 1568#endif
1637#if MENUBAR 1569 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1638 if (isMenuBarWindow (ev.xany.window)) 1570 || priv_modes & PrivMode_MouseAnyEvent)
1639 {
1640 menubar_control (ev.xbutton); 1571 mouse_report (ev.xbutton);
1641 break;
1642 }
1643#endif
1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1645 break; 1573 break;
1646 1574
1647 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1648 { 1576 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop 1579 ; // nop
1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1652 { 1581 {
1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1654 ; 1583 ;
1655 1584
1656 XQueryPointer (disp, vt, 1585 XQueryPointer (dpy, vt,
1657 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1658 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1659 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1660 &ev.xbutton.state); 1589 &ev.xbutton.state);
1661#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1681 int dist; 1610 int dist;
1682 1611
1683 /* don't clobber the current delay if we are 1612 /* don't clobber the current delay if we are
1684 * already in the middle of scrolling. 1613 * already in the middle of scrolling.
1685 */ 1614 */
1686 if (!sel_scroll_ev.active) 1615 if (!sel_scroll_ev.is_active ())
1687 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1616 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1688 1617
1689 /* save the event params so we can highlight 1618 /* save the event params so we can highlight
1690 * the selection in the pending-scroll loop 1619 * the selection in the pending-scroll loop
1691 */ 1620 */
1692 selection_save_x = ev.xbutton.x; 1621 selection_save_x = ev.xbutton.x;
… …
1714 else 1643 else
1715 { 1644 {
1716 /* we are within the text window, so we 1645 /* we are within the text window, so we
1717 * shouldn't be scrolling 1646 * shouldn't be scrolling
1718 */ 1647 */
1719 if (sel_scroll_ev.active)
1720 sel_scroll_ev.stop(); 1648 sel_scroll_ev.stop();
1721 } 1649 }
1722#endif 1650#endif
1723#ifdef MOUSE_THRESHOLD 1651#ifdef MOUSE_THRESHOLD
1724 } 1652 }
1725#endif 1653#endif
1726 } 1654 }
1727 } 1655 }
1728 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1656 else if (scrollbar_isMotion () && ev.xany.window == scrollBar.win)
1729 { 1657 {
1730 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1658 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1731 MotionNotify, &ev)) 1659 MotionNotify, &ev))
1732 ; 1660 ;
1733 1661
1734 XQueryPointer (disp, scrollBar.win, 1662 XQueryPointer (dpy, scrollBar.win,
1735 &unused_root, &unused_child, 1663 &unused_root, &unused_child,
1736 &unused_root_x, &unused_root_y, 1664 &unused_root_x, &unused_root_y,
1737 &ev.xbutton.x, &ev.xbutton.y, 1665 &ev.xbutton.x, &ev.xbutton.y,
1738 &unused_mask); 1666 &unused_mask);
1739 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1667 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1740 scrollbar_size ()); 1668 scrollbar_size ());
1741 scr_refresh (refresh_type);
1742 refresh_limit = 0; 1669 want_refresh = 1;
1743 scrollbar_show (1); 1670 scrollbar_show (1);
1744 } 1671 }
1745 break; 1672 break;
1746 } 1673 }
1674
1675#if defined(CURSOR_BLINK)
1676 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1677 {
1678 if (hidden_cursor)
1679 {
1680 hidden_cursor = 0;
1681 want_refresh = 1;
1682 }
1683
1684 cursor_blink_ev.again ();
1685 }
1686#endif
1687
1688#if defined(POINTER_BLANK)
1689 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1690 {
1691 if (ev.type == MotionNotify
1692 || ev.type == ButtonPress
1693 || ev.type == ButtonRelease)
1694 if (hidden_pointer)
1695 pointer_unblank ();
1696
1697 if (ev.type == KeyPress && hidden_pointer == 0)
1698 pointer_blank ();
1699 }
1700#endif
1701
1702 refresh_check ();
1747} 1703}
1748 1704
1749void 1705void
1750rxvt_term::focus_in () 1706rxvt_term::focus_in ()
1751{ 1707{
1752 if (!focus) 1708 if (!focus)
1753 { 1709 {
1754 focus = 1; 1710 focus = 1;
1755 want_refresh = 1; 1711 want_refresh = 1;
1756 1712
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1713 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1758 1714
1759#if USE_XIM 1715#if USE_XIM
1760 if (Input_Context != NULL) 1716 if (Input_Context != NULL)
1761 { 1717 {
1762 IMSetStatusPosition (); 1718 IMSetPosition ();
1763 XSetICFocus (Input_Context); 1719 XSetICFocus (Input_Context);
1764 } 1720 }
1765#endif 1721#endif
1766#if CURSOR_BLINK 1722#if CURSOR_BLINK
1767 if (OPTION (Opt_cursorBlink)) 1723 if (option (Opt_cursorBlink))
1768 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1724 cursor_blink_ev.again ();
1769#endif 1725#endif
1770#if OFF_FOCUS_FADING 1726#if OFF_FOCUS_FADING
1771 if (rs[Rs_fade]) 1727 if (rs[Rs_fade])
1772 { 1728 {
1773 pix_colors = pix_colors_focused; 1729 pix_colors = pix_colors_focused;
1774 scr_recolour (); 1730 scr_recolour ();
1775 } 1731 }
1776#endif 1732#endif
1733#if ENABLE_FRILLS
1734 if (option (Opt_urgentOnBell))
1735 {
1736 if (XWMHints *h = XGetWMHints(dpy, parent[0]))
1737 {
1738 h->flags &= ~XUrgencyHint;
1739 XSetWMHints (dpy, parent[0], h);
1740 }
1741 }
1742#endif
1777 } 1743 }
1778} 1744}
1779 1745
1780void 1746void
1781rxvt_term::focus_out () 1747rxvt_term::focus_out ()
… …
1789 1755
1790#if ENABLE_FRILLS || ISO_14755 1756#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf) 1757 if (iso14755buf)
1792 { 1758 {
1793 iso14755buf = 0; 1759 iso14755buf = 0;
1794# if ENABLE_OVERLAY 1760# if ISO_14755
1795 scr_overlay_off (); 1761 scr_overlay_off ();
1796# endif 1762# endif
1797 } 1763 }
1798#endif 1764#endif
1799#if USE_XIM 1765#if USE_XIM
1800 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1801 XUnsetICFocus (Input_Context); 1767 XUnsetICFocus (Input_Context);
1802#endif 1768#endif
1803#if CURSOR_BLINK 1769#if CURSOR_BLINK
1804 if (OPTION (Opt_cursorBlink)) 1770 if (option (Opt_cursorBlink))
1805 cursor_blink_ev.stop (); 1771 cursor_blink_ev.stop ();
1772
1806 hidden_cursor = 0; 1773 hidden_cursor = 0;
1807#endif 1774#endif
1808#if OFF_FOCUS_FADING 1775#if OFF_FOCUS_FADING
1809 if (rs[Rs_fade]) 1776 if (rs[Rs_fade])
1810 { 1777 {
… …
1813 } 1780 }
1814#endif 1781#endif
1815 } 1782 }
1816} 1783}
1817 1784
1818#if TRANSPARENT 1785void
1786rxvt_term::update_fade_color (unsigned int idx)
1787{
1788#if OFF_FOCUS_FADING
1789 if (rs[Rs_fade])
1790 {
1791 rgba c;
1792 pix_colors [Color_fade].get (c);
1793 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1794 }
1795#endif
1796}
1797
1798#if ENABLE_TRANSPARENCY || ENABLE_PERL
1819void 1799void
1820rxvt_term::rootwin_cb (XEvent &ev) 1800rxvt_term::rootwin_cb (XEvent &ev)
1821{ 1801{
1822 SET_R (this); 1802 make_current ();
1823 SET_LOCALE (locale);
1824 1803
1804 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1805 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1806 return;
1807
1808# if ENABLE_TRANSPARENCY
1825 switch (ev.type) 1809 switch (ev.type)
1826 { 1810 {
1827 case PropertyNotify: 1811 case PropertyNotify:
1828 /* 1812 /*
1829 * if user used some Esetroot compatible prog to set the root bg, 1813 * 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. 1814 * use the property to determine the pixmap. We use it later on.
1831 */ 1815 */
1832 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1816 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1833 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1817 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1834 return; 1818 {
1819 bgPixmap.set_root_pixmap ();
1820 update_background ();
1821 }
1835 1822
1836 /* FALLTHROUGH */
1837 case ReparentNotify:
1838 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1839 want_refresh = want_full_refresh = 1;
1840 break; 1823 break;
1841 } 1824 }
1825# endif
1826
1827 refresh_check ();
1842} 1828}
1843#endif 1829#endif
1844 1830
1845void 1831void
1846rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1855 /* 1841 /*
1856 * VT window processing of button press 1842 * VT window processing of button press
1857 */ 1843 */
1858 if (ev.window == vt) 1844 if (ev.window == vt)
1859 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1860#if ISO_14755 1849#if ISO_14755
1861 // 5.4 1850 // 5.4
1862 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1863 { 1852 {
1864 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1898 mouse_report (ev); 1887 mouse_report (ev);
1899 } 1888 }
1900#else 1889#else
1901 MEvent.button = ev.button; 1890 MEvent.button = ev.button;
1902 mouse_report (ev); 1891 mouse_report (ev);
1903#endif /* MOUSE_REPORT_DOUBLECLICK */ 1892#endif /* MOUSE_REPORT_DOUBLECLICK */
1904 1893
1905 } 1894 }
1906 else 1895 else
1907 { 1896 {
1908 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1909 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1910 1899
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1912 switch (ev.button) 1900 switch (ev.button)
1913 { 1901 {
1914 case Button1: 1902 case Button1:
1915 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1916 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1917#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1918 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1919#else 1907#else
1920 selection.rect = false; 1908 selection.rect = false;
1921#endif 1909#endif
1922 1910
1923 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1925 { 1913 {
1926 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1927 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1928 else 1916 else
1929 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1930 } 1918 }
1931 else 1919 else
1932 { 1920 {
1933 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1934 MEvent.clicks++; 1922 MEvent.clicks++;
1935 else 1923 else
1936 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1937 1925
1938 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1939 } 1927 }
1940 1928
1941 MEvent.button = Button1; 1929 MEvent.button = Button1;
1942 break; 1930 break;
1943 1931
1944 case Button3: 1932 case Button3:
1945 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1946 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1947 else 1935 else
1948 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1949 1937
1950 MEvent.button = Button3; 1938 MEvent.button = Button3;
1951 break; 1939 break;
1952 } 1940 }
1953 } 1941 }
1954 1942
1955 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1956 return; 1944 return;
1957 } 1945 }
1958 1946
1959 /* 1947 /*
1960 * Scrollbar window processing of button press 1948 * Scrollbar window processing of button press
1961 */ 1949 */
1962 if (isScrollbarWindow (ev.window)) 1950 if (scrollBar.state && ev.window == scrollBar.win)
1963 { 1951 {
1964 scrollBar.setIdle (); 1952 scrollBar.setIdle ();
1965 /* 1953 /*
1966 * Rxvt-style scrollbar: 1954 * Rxvt-style scrollbar:
1967 * move up if mouse is above slider 1955 * move up if mouse is above slider
… …
2003 tt_printf ("\033[5~"); 1991 tt_printf ("\033[5~");
2004 break; 1992 break;
2005 } 1993 }
2006 } 1994 }
2007 else 1995 else
2008#endif /* NO_SCROLLBAR_REPORT */ 1996#endif /* NO_SCROLLBAR_REPORT */
2009 1997
2010 { 1998 {
2011 char upordown = 0; 1999 char upordown = 0;
2012 2000
2013 if (scrollBar.style == R_SB_NEXT) 2001 if (scrollBar.style == R_SB_NEXT)
2014 { 2002 {
2015 if (scrollbarnext_upButton (ev.y)) 2003 if (scrollbarnext_upButton (ev.y))
2016 upordown = -1; /* up */ 2004 upordown = -1; /* up */
… …
2022 if (scrollbarrxvt_upButton (ev.y)) 2010 if (scrollbarrxvt_upButton (ev.y))
2023 upordown = -1; /* up */ 2011 upordown = -1; /* up */
2024 else if (scrollbarrxvt_dnButton (ev.y)) 2012 else if (scrollbarrxvt_dnButton (ev.y))
2025 upordown = 1; /* down */ 2013 upordown = 1; /* down */
2026 } 2014 }
2015
2027 if (upordown) 2016 if (upordown)
2028 { 2017 {
2029#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 2018#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2019 if (!cont_scroll_ev.is_active ())
2030 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2020 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2031#endif 2021#endif
2032 if (scr_page (upordown < 0 ? UP : DN, 1)) 2022 if (scr_page (upordown < 0 ? UP : DN, 1))
2033 { 2023 {
2034 if (upordown < 0) 2024 if (upordown < 0)
2035 scrollBar.setUp (); 2025 scrollBar.setUp ();
… …
2039 } 2029 }
2040 else 2030 else
2041 switch (ev.button) 2031 switch (ev.button)
2042 { 2032 {
2043 case Button2: 2033 case Button2:
2044 switch (scrollbar_align) 2034 switch (scrollBar.align)
2045 { 2035 {
2046 case R_SB_ALIGN_TOP: 2036 case R_SB_ALIGN_TOP:
2047 csrO = 0; 2037 csrO = 0;
2048 break; 2038 break;
2049 case R_SB_ALIGN_CENTRE: 2039 case R_SB_ALIGN_CENTRE:
… …
2061 2051
2062 scrollBar.setMotion (); 2052 scrollBar.setMotion ();
2063 break; 2053 break;
2064 2054
2065 case Button1: 2055 case Button1:
2066 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2056 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2067 csrO = ev.y - scrollBar.top; 2057 csrO = ev.y - scrollBar.top;
2068 /* FALLTHROUGH */ 2058 /* FALLTHROUGH */
2069 2059
2070 case Button3: 2060 case Button3:
2071 if (scrollBar.style != R_SB_XTERM) 2061 if (scrollBar.style != R_SB_XTERM)
… …
2097 } 2087 }
2098 } 2088 }
2099 2089
2100 return; 2090 return;
2101 } 2091 }
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} 2092}
2111 2093
2112void 2094void
2113rxvt_term::button_release (XButtonEvent &ev) 2095rxvt_term::button_release (XButtonEvent &ev)
2114{ 2096{
… …
2120 2102
2121 if (scrollbar_isUpDn ()) 2103 if (scrollbar_isUpDn ())
2122 { 2104 {
2123 scrollBar.setIdle (); 2105 scrollBar.setIdle ();
2124 scrollbar_show (0); 2106 scrollbar_show (0);
2125#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2126 refresh_type &= ~SMOOTH_REFRESH;
2127#endif
2128 } 2107 }
2129 2108
2130#ifdef SELECTION_SCROLLING 2109#ifdef SELECTION_SCROLLING
2131 if (sel_scroll_ev.active)
2132 sel_scroll_ev.stop(); 2110 sel_scroll_ev.stop();
2133#endif 2111#endif
2134 2112
2135 if (ev.window == vt) 2113 if (ev.window == vt)
2136 { 2114 {
2115 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2116 return;
2117
2137#if ISO_14755 2118#if ISO_14755
2138 // 5.4 2119 // 5.4
2139 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2120 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2140 return; 2121 return;
2141#endif 2122#endif
2123
2142 if (reportmode) 2124 if (reportmode)
2143 { 2125 {
2144 /* mouse report from vt window */ 2126 /* mouse report from vt window */
2145 /* don't report release of wheel "buttons" */ 2127 /* don't report release of wheel "buttons" */
2146 if (ev.button >= 4) 2128 if (ev.button >= 4)
… …
2157 mouse_report (ev); 2139 mouse_report (ev);
2158 } 2140 }
2159#else /* MOUSE_REPORT_DOUBLECLICK */ 2141#else /* MOUSE_REPORT_DOUBLECLICK */
2160 MEvent.button = AnyButton; 2142 MEvent.button = AnyButton;
2161 mouse_report (ev); 2143 mouse_report (ev);
2162#endif /* MOUSE_REPORT_DOUBLECLICK */ 2144#endif /* MOUSE_REPORT_DOUBLECLICK */
2163 return; 2145 return;
2164 } 2146 }
2165 2147
2166 /* 2148 /*
2167 * dumb hack to compensate for the failure of click-and-drag 2149 * dumb hack to compensate for the failure of click-and-drag
… …
2170 if (priv_modes & PrivMode_mouse_report 2152 if (priv_modes & PrivMode_mouse_report
2171 && bypass_keystate 2153 && bypass_keystate
2172 && ev.button == Button1 && MEvent.clicks <= 1) 2154 && ev.button == Button1 && MEvent.clicks <= 1)
2173 selection_extend (ev.x, ev.y, 0); 2155 selection_extend (ev.x, ev.y, 0);
2174 2156
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2177
2178 switch (ev.button) 2157 switch (ev.button)
2179 { 2158 {
2180 case Button1: 2159 case Button1:
2181 case Button3: 2160 case Button3:
2182 selection_make (ev.time); 2161 selection_make (ev.time);
2183 break; 2162 break;
2163
2184 case Button2: 2164 case Button2:
2185 selection_request (ev.time, ev.x, ev.y); 2165 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2166 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2186 break; 2167 break;
2168
2187#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2188 case Button4: 2170 case Button4:
2189 case Button5: 2171 case Button5:
2190 { 2172 {
2191 int i; 2173 int i;
… …
2193 2175
2194 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2195 2177
2196 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2197 i = 1; 2179 i = 1;
2198 else if (OPTION (Opt_mouseWheelScrollPage)) 2180 else if (option (Opt_mouseWheelScrollPage))
2199 i = nrow - 1; 2181 i = nrow - 1;
2200 else 2182 else
2201 i = 5; 2183 i = 5;
2202 2184
2203# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
… …
2205 { 2187 {
2206 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2207 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2208 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2209 2191
2210 if (slip_wheel_ev.at < NOW) 2192 if (!slip_wheel_ev.is_active ())
2211 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2212
2213 slip_wheel_ev.start ();
2214 } 2194 }
2215 else 2195 else
2196# endif
2216 { 2197 {
2217# endif
2218# ifdef JUMP_MOUSE_WHEEL
2219 scr_page (v, i); 2198 scr_page (v, i);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1); 2199 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
2231 } 2200 }
2232#endif
2233 } 2201 }
2234 break; 2202 break;
2235#endif 2203#endif
2236 } 2204 }
2237 } 2205 }
2238#ifdef MENUBAR
2239 else if (isMenuBarWindow (ev.window))
2240 menubar_control (ev);
2241#endif
2242} 2206}
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 2207
2725/*}}} */ 2208/*}}} */
2726 2209
2727bool 2210bool
2728rxvt_term::cmd_parse () 2211rxvt_term::cmd_parse ()
… …
2777 if (ch == C0_LF) 2260 if (ch == C0_LF)
2778 nlines++; 2261 nlines++;
2779 2262
2780 refresh_count++; 2263 refresh_count++;
2781 2264
2782 if (!OPTION (Opt_jumpScroll) 2265 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2784 { 2266 {
2785 refreshnow = true;
2786 refresh_count = 0; 2267 refresh_count = 0;
2268
2269 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2270 {
2271 refreshnow = true;
2787 ch = NOCHAR; 2272 ch = NOCHAR;
2788 break; 2273 break;
2274 }
2789 } 2275 }
2790 2276
2791 // scr_add_lines only works for nlines <= nrow - 1. 2277 // scr_add_lines only works for nlines <= nrow - 1.
2792 if (nlines >= nrow - 1) 2278 if (nlines >= nrow - 1)
2793 { 2279 {
2280 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2281 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2795 scr_add_lines (buf, str - buf, nlines); 2282 scr_add_lines (buf, str - buf, nlines);
2796 2283
2797 nlines = 0; 2284 nlines = 0;
2798 str = buf; 2285 str = buf;
2799 eol = str + min (ncol, UBUFSIZ); 2286 eol = str + min (ncol, UBUFSIZ);
… …
2814 2301
2815 seq_begin = cmdbuf_ptr; 2302 seq_begin = cmdbuf_ptr;
2816 ch = next_char (); 2303 ch = next_char ();
2817 } 2304 }
2818 2305
2306 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) 2307 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2820 scr_add_lines (buf, str - buf, nlines); 2308 scr_add_lines (buf, str - buf, nlines);
2821 2309
2822 /* 2310 /*
2823 * If there have been a lot of new lines, then update the screen 2311 * 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. 2312 * 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 2313 * if skipScroll is enabled.
2826 * is incremented here because we must be doing flat-out scrolling.
2827 */ 2314 */
2828 if (refreshnow) 2315 if (refreshnow)
2829 { 2316 {
2830 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2831 refresh_limit++;
2832 else
2833 {
2834 flag = true; 2317 flag = true;
2835 scr_refresh (refresh_type); 2318 scr_refresh ();
2836 flush_ev.stop (); 2319 want_refresh = 1;
2837 }
2838 } 2320 }
2839 2321
2840 } 2322 }
2841 else 2323 else
2842 { 2324 {
… …
2858 return flag; 2340 return flag;
2859} 2341}
2860 2342
2861// read the next character 2343// read the next character
2862wchar_t 2344wchar_t
2863rxvt_term::next_char () 2345rxvt_term::next_char () NOTHROW
2864{ 2346{
2865 while (cmdbuf_ptr < cmdbuf_endp) 2347 while (cmdbuf_ptr < cmdbuf_endp)
2866 { 2348 {
2867 // assume 7-bit to be ascii ALWAYS 2349 // assume 7-bit to be ascii ALWAYS
2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2350 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2889 return NOCHAR; 2371 return NOCHAR;
2890} 2372}
2891 2373
2892// read the next octet 2374// read the next octet
2893uint32_t 2375uint32_t
2894rxvt_term::next_octet () 2376rxvt_term::next_octet () NOTHROW
2895{ 2377{
2896 return cmdbuf_ptr < cmdbuf_endp 2378 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++ 2379 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR; 2380 : NOCHAR;
2899} 2381}
2382
2383static class out_of_input out_of_input;
2900 2384
2901/* rxvt_cmd_getc () - Return next input character */ 2385/* rxvt_cmd_getc () - Return next input character */
2902/* 2386/*
2903 * Return the next input character after first passing any keyboard input 2387 * Return the next input character after first passing any keyboard input
2904 * to the command. 2388 * to the command.
2905 */ 2389 */
2906wchar_t 2390wchar_t
2907rxvt_term::cmd_getc () 2391rxvt_term::cmd_getc () THROW ((class out_of_input))
2908{ 2392{
2909 wchar_t c = next_char (); 2393 wchar_t c = next_char ();
2910 2394
2911 if (c == NOCHAR) 2395 if (c == NOCHAR)
2912 throw out_of_input; 2396 throw out_of_input;
2913 2397
2914 return c; 2398 return c;
2915} 2399}
2916 2400
2917uint32_t 2401uint32_t
2918rxvt_term::cmd_get8 () 2402rxvt_term::cmd_get8 () THROW ((class out_of_input))
2919{ 2403{
2920 uint32_t c = next_octet (); 2404 uint32_t c = next_octet ();
2921 2405
2922 if (c == NOCHAR) 2406 if (c == NOCHAR)
2923 throw out_of_input; 2407 throw out_of_input;
… …
2989 { 2473 {
2990 if ((buf[len++] = cmd_getc ()) == 'i') 2474 if ((buf[len++] = cmd_getc ()) == 'i')
2991 break; /* done = 1 */ 2475 break; /* done = 1 */
2992 } 2476 }
2993 } 2477 }
2994 2478
2995 for (i = 0; i < len; i++) 2479 for (i = 0; i < len; i++)
2996 if (putc (buf[i], fd) == EOF) 2480 if (putc (buf[i], fd) == EOF)
2997 { 2481 {
2998 done = 1; 2482 done = 1;
2999 break; 2483 break;
… …
3001 } 2485 }
3002 } 2486 }
3003 2487
3004 pclose_printer (fd); 2488 pclose_printer (fd);
3005} 2489}
3006#endif /* PRINTPIPE */ 2490#endif /* PRINTPIPE */
3007/*}}} */ 2491/*}}} */
3008 2492
3009/* *INDENT-OFF* */ 2493/* *INDENT-OFF* */
3010enum { 2494enum {
3011 C1_40 = 0x40, 2495 C1_40 = 0x40,
… …
3061 process_dcs_seq (); 2545 process_dcs_seq ();
3062 break; 2546 break;
3063 case 0x9b: /* CSI */ 2547 case 0x9b: /* CSI */
3064 process_csi_seq (); 2548 process_csi_seq ();
3065 break; 2549 break;
3066 case 0x9d: /* CSI */ 2550 case 0x9d: /* OSC */
3067 process_osc_seq (); 2551 process_osc_seq ();
3068 break; 2552 break;
3069#endif 2553#endif
3070 } 2554 }
3071} 2555}
… …
3161 scr_charset_set (2, (unsigned int)cmd_getc ()); 2645 scr_charset_set (2, (unsigned int)cmd_getc ());
3162 break; 2646 break;
3163 case '+': 2647 case '+':
3164 scr_charset_set (3, (unsigned int)cmd_getc ()); 2648 scr_charset_set (3, (unsigned int)cmd_getc ());
3165 break; 2649 break;
3166#if ENABLE_FRILLS 2650#if !ENABLE_MINIMAL
3167 case '6': 2651 case '6':
3168 scr_backindex (); 2652 scr_backindex ();
3169 break; 2653 break;
3170#endif 2654#endif
3171 case '7': 2655 case '7':
3172 scr_cursor (SAVE); 2656 scr_cursor (SAVE);
3173 break; 2657 break;
3174 case '8': 2658 case '8':
3175 scr_cursor (RESTORE); 2659 scr_cursor (RESTORE);
3176 break; 2660 break;
3177#if ENABLE_FRILLS 2661#if !ENABLE_MINIMAL
3178 case '9': 2662 case '9':
3179 scr_forwardindex (); 2663 scr_forwardindex ();
3180 break; 2664 break;
3181#endif 2665#endif
3182 case '=': 2666 case '=':
… …
3297rxvt_term::process_csi_seq () 2781rxvt_term::process_csi_seq ()
3298{ 2782{
3299 unicode_t ch, priv, i; 2783 unicode_t ch, priv, i;
3300 unsigned int nargs, p; 2784 unsigned int nargs, p;
3301 int n, ndef; 2785 int n, ndef;
3302 int arg[ESC_ARGS]; 2786 int arg[ESC_ARGS] = { };
3303 2787
3304 for (nargs = ESC_ARGS; nargs > 0;) 2788 nargs = 0;
3305 arg[--nargs] = 0;
3306 2789
3307 priv = 0; 2790 priv = 0;
3308 ch = cmd_getc (); 2791 ch = cmd_getc ();
3309 if (ch >= '<' && ch <= '?') 2792 if (ch >= '<' && ch <= '?')
2793 {
3310 { /* '<' '=' '>' '?' */ 2794 /* '<' '=' '>' '?' */
3311 priv = ch; 2795 priv = ch;
3312 ch = cmd_getc (); 2796 ch = cmd_getc ();
3313 } 2797 }
3314 2798
3315 /* read any numerical arguments */ 2799 /* read any numerical arguments */
… …
3344 ndef = get_byte_array_bit (csi_defaults, i); 2828 ndef = get_byte_array_bit (csi_defaults, i);
3345 for (p = 0; p < nargs; p++) 2829 for (p = 0; p < nargs; p++)
3346 if (arg[p] == -1) 2830 if (arg[p] == -1)
3347 arg[p] = ndef; 2831 arg[p] = ndef;
3348 2832
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 /* 2833 /*
3357 * private mode handling 2834 * private mode handling
3358 */ 2835 */
3359 if (priv) 2836 if (priv)
3360 { 2837 {
3361 switch (priv) 2838 switch (priv)
3362 { 2839 {
3363 case '>': 2840 case '>':
3364 if (ch == CSI_DA) /* secondary device attributes */ 2841 if (ch == CSI_DA) /* secondary device attributes */
3365 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 2842 {
2843 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
2844 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
2845 //
2846 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
2847 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
2848 // versions.
2849 //
2850 tt_printf ("\033[>%d;95;0c", 'U');
2851 }
3366 break; 2852 break;
3367 case '?': 2853 case '?':
3368 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2854 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3369 process_terminal_mode (ch, priv, nargs, arg); 2855 process_terminal_mode (ch, priv, nargs, arg);
3370 break; 2856 break;
… …
3496 break; 2982 break;
3497 case 6: /* CPR requested */ 2983 case 6: /* CPR requested */
3498 scr_report_position (); 2984 scr_report_position ();
3499 break; 2985 break;
3500 case 7: /* unofficial extension */ 2986 case 7: /* unofficial extension */
3501 if (OPTION (Opt_insecure)) 2987 if (option (Opt_insecure))
3502 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2988 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3503 break; 2989 break;
3504 case 8: /* unofficial extension */ 2990 case 8: /* unofficial extension */
3505 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2991 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3506 break; 2992 break;
… …
3573 break; 3059 break;
3574 case CSI_75: 3060 case CSI_75:
3575 scr_cursor (RESTORE); 3061 scr_cursor (RESTORE);
3576 break; 3062 break;
3577 3063
3578#if ENABLE_FRILLS 3064#if !ENABLE_MINIMAL
3579 case CSI_74: 3065 case CSI_74:
3580 process_window_ops (arg, nargs); 3066 process_window_ops (arg, nargs);
3581 break; 3067 break;
3582#endif 3068#endif
3583 3069
… …
3590 break; 3076 break;
3591 } 3077 }
3592} 3078}
3593/*}}} */ 3079/*}}} */
3594 3080
3595#if ENABLE_FRILLS 3081#if !ENABLE_MINIMAL
3596/* ARGSUSED */ 3082/* ARGSUSED */
3597void 3083void
3598rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3084rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3599{ 3085{
3600 int x, y; 3086 int x, y;
3601 XWindowAttributes wattr; 3087 XWindowAttributes wattr;
3602 Window wdummy; 3088 Window wdummy;
3603 dDisp; 3089
3090 dLocal (Display *, dpy);
3604 3091
3605 if (nargs == 0) 3092 if (nargs == 0)
3606 return; 3093 return;
3607 3094
3608 switch (args[0]) 3095 switch (args[0])
3609 { 3096 {
3610 /* 3097 /*
3611 * commands 3098 * commands
3612 */ 3099 */
3613 case 1: /* deiconify window */ 3100 case 1: /* deiconify window */
3614 XMapWindow (disp, parent[0]); 3101 XMapWindow (dpy, parent[0]);
3615 break; 3102 break;
3616 case 2: /* iconify window */ 3103 case 2: /* iconify window */
3617 XIconifyWindow (disp, parent[0], display->screen); 3104 XIconifyWindow (dpy, parent[0], display->screen);
3618 break; 3105 break;
3619 case 3: /* set position (pixels) */ 3106 case 3: /* set position (pixels) */
3620 XMoveWindow (disp, parent[0], args[1], args[2]); 3107 XMoveWindow (dpy, parent[0], args[1], args[2]);
3621 break; 3108 break;
3622 case 4: /* set size (pixels) */ 3109 case 4: /* set size (pixels) */
3623 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3110 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3624 break; 3111 break;
3625 case 5: /* raise window */ 3112 case 5: /* raise window */
3626 XRaiseWindow (disp, parent[0]); 3113 XRaiseWindow (dpy, parent[0]);
3627 break; 3114 break;
3628 case 6: /* lower window */ 3115 case 6: /* lower window */
3629 XLowerWindow (disp, parent[0]); 3116 XLowerWindow (dpy, parent[0]);
3630 break; 3117 break;
3631 case 7: /* refresh window */ 3118 case 7: /* refresh window */
3632 scr_touch (true); 3119 scr_touch (true);
3633 break; 3120 break;
3634 case 8: /* set size (chars) */ 3121 case 8: /* set size (chars) */
… …
3641 if (args[0] >= 24) /* set height (chars) */ 3128 if (args[0] >= 24) /* set height (chars) */
3642 set_widthheight ((unsigned int)width, 3129 set_widthheight ((unsigned int)width,
3643 (unsigned int) (args[1] * fheight)); 3130 (unsigned int) (args[1] * fheight));
3644 break; 3131 break;
3645 3132
3646
3647 /* 3133 /*
3648 * reports - some output format copied from XTerm 3134 * reports - some output format copied from XTerm
3649 */ 3135 */
3650 case 11: /* report window state */ 3136 case 11: /* report window state */
3651 XGetWindowAttributes (disp, parent[0], &wattr); 3137 XGetWindowAttributes (dpy, parent[0], &wattr);
3652 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3138 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3653 break; 3139 break;
3654 case 13: /* report window position */ 3140 case 13: /* report window position */
3655 XGetWindowAttributes (disp, parent[0], &wattr); 3141 XGetWindowAttributes (dpy, parent[0], &wattr);
3656 XTranslateCoordinates (disp, parent[0], wattr.root, 3142 XTranslateCoordinates (dpy, parent[0], wattr.root,
3657 -wattr.border_width, -wattr.border_width, 3143 -wattr.border_width, -wattr.border_width,
3658 &x, &y, &wdummy); 3144 &x, &y, &wdummy);
3659 tt_printf ("\033[3;%d;%dt", x, y); 3145 tt_printf ("\033[3;%d;%dt", x, y);
3660 break; 3146 break;
3661 case 14: /* report window size (pixels) */ 3147 case 14: /* report window size (pixels) */
3662 XGetWindowAttributes (disp, parent[0], &wattr); 3148 XGetWindowAttributes (dpy, parent[0], &wattr);
3663 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3149 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3664 break; 3150 break;
3665 case 18: /* report text area size (chars) */ 3151 case 18: /* report text area size (chars) */
3666 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3152 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3667 break; 3153 break;
… …
3669 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3155 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3670 break; 3156 break;
3671 case 20: /* report icon label */ 3157 case 20: /* report icon label */
3672 { 3158 {
3673 char *s; 3159 char *s;
3674 XGetIconName (disp, parent[0], &s); 3160 XGetIconName (dpy, parent[0], &s);
3675 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3161 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3676 XFree (s); 3162 XFree (s);
3677 } 3163 }
3678 break; 3164 break;
3679 case 21: /* report window title */ 3165 case 21: /* report window title */
3680 { 3166 {
3681 char *s; 3167 char *s;
3682 XFetchName (disp, parent[0], &s); 3168 XFetchName (dpy, parent[0], &s);
3683 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3169 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3684 XFree (s); 3170 XFree (s);
3685 } 3171 }
3686 break; 3172 break;
3687 } 3173 }
3688} 3174}
… …
3715 seen_esc = true; 3201 seen_esc = true;
3716 continue; 3202 continue;
3717 } 3203 }
3718 else if (ch == C0_BEL || ch == CHAR_ST) 3204 else if (ch == C0_BEL || ch == CHAR_ST)
3719 break; 3205 break;
3206 else if (ch == C0_SYN)
3207 ch = cmd_get8 ();
3720 else if (ch < 0x20) 3208 else if (ch < 0x20)
3721 return NULL; /* other control character - exit */ 3209 return NULL; /* other control character - exit */
3722 3210
3723 seen_esc = false; 3211 seen_esc = false;
3724 3212
3725 if (n >= STRING_MAX - 1) 3213 if (n >= STRING_MAX - 1)
3726 // stop at some sane length 3214 // stop at some sane length
3727 return NULL; 3215 return NULL;
3728 3216
3729 if (ch == C0_SYN)
3730 string[n++] = cmd_get8 ();
3731 else
3732 string[n++] = ch; 3217 string[n++] = ch;
3733 } 3218 }
3734 3219
3735 string[n++] = '\0'; 3220 string[n++] = '\0';
3736 3221
3737 ends_how = (ch == 0x5c ? C0_ESC : ch); 3222 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3788void 3273void
3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3274rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3790{ 3275{
3791 if (str[0] == '?' && !str[1]) 3276 if (str[0] == '?' && !str[1])
3792 { 3277 {
3793 unsigned short r, g, b; 3278 rgba c;
3794 pix_colors_focused[color].get (display, r, g, b); 3279 pix_colors_focused[color].get (c);
3280
3281#if XFT
3282 if (c.a != rgba::MAX_CC)
3283 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3284 else
3285#endif
3795 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3286 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3796 } 3287 }
3797 else 3288 else
3798 set_window_color (color, str); 3289 set_window_color (color, str);
3799} 3290}
3800 3291
… …
3802 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3293 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3803 */ 3294 */
3804void 3295void
3805rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3296rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3806{ 3297{
3807 int changed = 0;
3808 int color; 3298 int color;
3809 char *buf, *name; 3299 char *buf, *name;
3810 bool query = str[0] == '?' && !str[1]; 3300 bool query = str[0] == '?' && !str[1];
3811 int saveop = op; 3301 int saveop = op;
3812 dDisp; 3302
3303 dLocal (Display *, dpy);
3813 3304
3814 assert (str != NULL); 3305 assert (str != NULL);
3306
3307 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3308 return;
3309
3815 switch (op) 3310 switch (op)
3816 { 3311 {
3817 case XTerm_name: 3312 case XTerm_name:
3818 set_title (str); 3313 set_title (str);
3819 /* FALLTHROUGH */ 3314 /* FALLTHROUGH */
… …
3833 unsigned long bytes_after; 3328 unsigned long bytes_after;
3834 unsigned char *value = 0; 3329 unsigned char *value = 0;
3835 const char *str = ""; 3330 const char *str = "";
3836 3331
3837 if (prop 3332 if (prop
3838 && XGetWindowProperty (disp, parent[0], 3333 && XGetWindowProperty (dpy, parent[0],
3839 prop, 0, 1<<16, 0, AnyPropertyType, 3334 prop, 0, 1<<16, 0, AnyPropertyType,
3840 &actual_type, &actual_format, 3335 &actual_type, &actual_format,
3841 &nitems, &bytes_after, &value) == Success 3336 &nitems, &bytes_after, &value) == Success
3842 && actual_type != None 3337 && actual_type != None
3843 && actual_format == 8) 3338 && actual_format == 8)
3844 str = (const char *)(value); 3339 str = (const char *)(value);
3845 3340
3846 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3341 tt_printf ("\033]%d;%s%c", op, str, resp);
3847 3342
3848 XFree (value); 3343 XFree (value);
3849 } 3344 }
3850 else 3345 else
3851 { 3346 {
… …
3855 { 3350 {
3856 *eq = 0; 3351 *eq = 0;
3857 set_utf8_property (display->atom (str), eq + 1); 3352 set_utf8_property (display->atom (str), eq + 1);
3858 } 3353 }
3859 else 3354 else
3860 XDeleteProperty (disp, parent[0], 3355 XDeleteProperty (dpy, parent[0],
3861 display->atom (str)); 3356 display->atom (str));
3862 } 3357 }
3863 break; 3358 break;
3864 3359
3865 case XTerm_Color: 3360 case XTerm_Color:
… …
3867 { 3362 {
3868 if ((name = strchr (buf, ';')) == NULL) 3363 if ((name = strchr (buf, ';')) == NULL)
3869 break; 3364 break;
3870 3365
3871 *name++ = '\0'; 3366 *name++ = '\0';
3872 color = atoi (buf); 3367 color = atoi (buf) + minCOLOR;
3873 3368
3874 if (color < 0 || color >= TOTAL_COLORS) 3369 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3875 break; 3370 break;
3876 3371
3877 if ((buf = strchr (name, ';')) != NULL) 3372 if ((buf = strchr (name, ';')) != NULL)
3878 *buf++ = '\0'; 3373 *buf++ = '\0';
3879 3374
3880 if (name[0] == '?' && !name[1]) 3375 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 } 3376 }
3889 break; 3377 break;
3378 case Rxvt_restoreFG:
3890 case XTerm_Color00: 3379 case XTerm_Color00:
3891 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3380 process_color_seq (op, Color_fg, str, resp);
3892 break; 3381 break;
3382 case Rxvt_restoreBG:
3893 case XTerm_Color01: 3383 case XTerm_Color01:
3894 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3384 process_color_seq (op, Color_bg, str, resp);
3895 break; 3385 break;
3896#ifndef NO_CURSORCOLOR 3386#ifndef NO_CURSORCOLOR
3897 case XTerm_Color_cursor: 3387 case XTerm_Color_cursor:
3898 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3388 process_color_seq (op, Color_cursor, str, resp);
3899 break; 3389 break;
3900#endif 3390#endif
3901 case XTerm_Color_pointer_fg: 3391 case XTerm_Color_pointer_fg:
3902 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3392 process_color_seq (op, Color_pointer_fg, str, resp);
3903 break; 3393 break;
3904 case XTerm_Color_pointer_bg: 3394 case XTerm_Color_pointer_bg:
3905 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3395 process_color_seq (op, Color_pointer_bg, str, resp);
3906 break; 3396 break;
3907#ifndef NO_BOLD_UNDERLINE_REVERSE 3397#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: 3398 case XTerm_Color_RV:
3915 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3399 process_color_seq (op, Color_RV, str, resp);
3400 break;
3401 case Rxvt_Color_BD:
3402 case URxvt_Color_BD:
3403 process_color_seq (op, Color_BD, str, resp);
3404 break;
3405 case Rxvt_Color_UL:
3406 case URxvt_Color_UL:
3407 process_color_seq (op, Color_UL, str, resp);
3916 break; 3408 break;
3917 case URxvt_Color_IT: 3409 case URxvt_Color_IT:
3918 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3410 process_color_seq (op, Color_IT, str, resp);
3919 break; 3411 break;
3920#endif 3412#endif
3921#if TRANSPARENT && TINTING 3413#if ENABLE_TRANSPARENCY
3922 case URxvt_Color_tint: 3414 case URxvt_Color_tint:
3923 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3415 process_color_seq (op, Color_tint, str, resp);
3924 check_our_parents (); 3416 {
3925 if (am_transparent) 3417 bool changed = false;
3926 want_full_refresh = want_refresh = 1;
3927 break;
3928#endif
3929 3418
3419 if (ISSET_PIXCOLOR (Color_tint))
3420 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]);
3421 else
3422 changed = bgPixmap.unset_tint ();
3423
3424 if (changed)
3425 update_background ();
3426 }
3427
3428 break;
3429#endif
3430
3431#if BG_IMAGE_FROM_FILE
3930 case XTerm_Pixmap: 3432 case Rxvt_Pixmap:
3931 if (*str != ';') 3433 if (!strcmp (str, "?"))
3932 { 3434 {
3933#if XPM_BACKGROUND 3435 char str[256];
3934 scale_pixmap (""); /* reset to default scaling */ 3436
3935 set_bgPixmap (str); /* change pixmap */ 3437 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3936#endif 3438 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3937 scr_touch (true); 3439 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3440 process_xterm_seq (XTerm_title, str, CHAR_ST);
3938 } 3441 }
3939 while ((str = strchr (str, ';')) != NULL) 3442 else
3940 { 3443 {
3444 int changed = 0;
3445
3446 if (*str != ';')
3447 {
3448 /* reset to default scaling :*/
3449 bgPixmap.unset_geometry ();
3450 if (bgPixmap.set_file (str)) /* change pixmap */
3451 changed++;
3452 str = strchr (str, ';');
3453 if (str == NULL)
3454 bgPixmap.set_defaultGeometry ();
3455 }
3456
3457 while (str)
3458 {
3941 str++; 3459 str++;
3942#if XPM_BACKGROUND 3460 if (bgPixmap.set_geometry (str))
3943 changed += scale_pixmap (str); 3461 changed++;
3944#endif 3462 str = strchr (str, ';');
3463 }
3464
3465 if (changed)
3466 update_background ();
3945 } 3467 }
3946
3947 if (changed)
3948 {
3949#ifdef XPM_BACKGROUND
3950 resize_pixmap ();
3951#endif
3952 scr_touch (true);
3953 }
3954 break; 3468 break;
3955 3469#endif
3956 case XTerm_restoreFG:
3957 set_window_color (Color_fg, str);
3958 break;
3959 case XTerm_restoreBG:
3960 set_window_color (Color_bg, str);
3961 break;
3962 3470
3963 case XTerm_logfile: 3471 case XTerm_logfile:
3964 // TODO, when secure mode? 3472 // TODO, when secure mode?
3965 break; 3473 break;
3966 3474
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 3475#if 0
3974 case XTerm_dumpscreen: /* no error notices */ 3476 case Rxvt_dumpscreen: /* no error notices */
3975 { 3477 {
3976 int fd; 3478 int fd;
3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3479 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3978 { 3480 {
3979 scr_dump (fd); 3481 scr_dump (fd);
… …
3990 case URxvt_italicFont: 3492 case URxvt_italicFont:
3991 case URxvt_boldItalicFont: 3493 case URxvt_boldItalicFont:
3992#endif 3494#endif
3993 if (query) 3495 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", saveop, 3496 tt_printf ("\33]%d;%-.250s%c", saveop,
3995 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3497 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3996 ? fontset[op - URxvt_font]->fontdesc : "", 3498 ? fontset[op - URxvt_font]->fontdesc : "",
3997 resp); 3499 resp);
3998 else 3500 else
3999 { 3501 {
4000 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3502 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
4003 allocated.push_back ((void *)res); 3505 allocated.push_back ((void *)res);
4004 set_fonts (); 3506 set_fonts ();
4005 } 3507 }
4006 break; 3508 break;
4007 3509
4008#if ENABLE_FRILLS 3510 case URxvt_version:
3511 if (query)
3512 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3513 op,
3514 rs[Rs_name], VERSION[0], VERSION[2],
3515 resp);
3516 break;
3517
3518#if !ENABLE_MINIMAL
4009 case URxvt_locale: 3519 case URxvt_locale:
4010 if (query) 3520 if (query)
4011 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3521 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
4012 else 3522 else
4013 { 3523 {
4014 set_locale (str); 3524 set_locale (str);
4015 pty.set_utf8_mode (enc_utf8); 3525 pty->set_utf8_mode (enc_utf8);
4016 init_xlocale (); 3526 init_xlocale ();
4017 } 3527 }
4018 break; 3528 break;
4019 3529
4020 case URxvt_view_up: 3530 case URxvt_view_up:
… …
4031 break; 3541 break;
4032#endif 3542#endif
4033 3543
4034#if ENABLE_PERL 3544#if ENABLE_PERL
4035 case URxvt_perl: 3545 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3546 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4037 ; // no responses yet 3547 ; // no responses yet
4038 break; 3548 break;
4039#endif 3549#endif
4040 } 3550 }
4041} 3551}
… …
4073 return state; 3583 return state;
4074} 3584}
4075 3585
4076/* we're not using priv _yet_ */ 3586/* we're not using priv _yet_ */
4077void 3587void
4078rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3588rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4079{ 3589{
4080 unsigned int i, j; 3590 unsigned int i, j;
4081 int state; 3591 int state;
4082 3592
4083 static const struct 3593 static const struct
4084 { 3594 {
4085 const int argval; 3595 const int argval;
4086 const unsigned long bit; 3596 const unsigned long bit;
4087 }
4088
4089 argtopriv[] = { 3597 } argtopriv[] = {
4090 { 1, PrivMode_aplCUR }, 3598 { 1, PrivMode_aplCUR },
4091 { 2, PrivMode_vt52 }, 3599 { 2, PrivMode_vt52 },
4092 { 3, PrivMode_132 }, 3600 { 3, PrivMode_132 },
4093 { 4, PrivMode_smoothScroll }, 3601 { 4, PrivMode_smoothScroll },
4094 { 5, PrivMode_rVideo }, 3602 { 5, PrivMode_rVideo },
4095 { 6, PrivMode_relOrigin }, 3603 { 6, PrivMode_relOrigin },
4096 { 7, PrivMode_Autowrap }, 3604 { 7, PrivMode_Autowrap },
4097 // 8, bi-directional support mode 3605 // 8, bi-directional support mode
4098 { 9, PrivMode_MouseX10 }, 3606 { 9, PrivMode_MouseX10 },
4099#ifdef menuBar_esc
4100 { menuBar_esc, PrivMode_menuBar },
4101#endif
4102 // 18, 19 printing-related 3607 // 18, 19 printing-related
4103 { 25, PrivMode_VisibleCursor }, 3608 { 25, PrivMode_VisibleCursor },
4104#ifdef scrollBar_esc 3609#ifdef scrollBar_esc
4105 { scrollBar_esc, PrivMode_scrollBar }, 3610 { scrollBar_esc, PrivMode_scrollBar },
4106#endif 3611#endif
… …
4113 { 66, PrivMode_aplKP }, 3618 { 66, PrivMode_aplKP },
4114#ifndef NO_BACKSPACE_KEY 3619#ifndef NO_BACKSPACE_KEY
4115 { 67, PrivMode_BackSpace }, 3620 { 67, PrivMode_BackSpace },
4116#endif 3621#endif
4117 { 1000, PrivMode_MouseX11 }, 3622 { 1000, PrivMode_MouseX11 },
4118 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3623 { 1002, PrivMode_MouseBtnEvent },
4119 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3624 { 1003, PrivMode_MouseAnyEvent },
4120 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4121 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3625 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4122 { 1011, PrivMode_Keypress }, // rxvt extension 3626 { 1011, PrivMode_Keypress }, // rxvt extension
4123 // 1035 enable modifiers for alt, numlock NYI 3627 // 1035 enable modifiers for alt, numlock NYI
4124 // 1036 send ESC for meta keys NYI 3628 // 1036 send ESC for meta keys NYI
4125 // 1037 send DEL for keypad delete NYI 3629 // 1037 send DEL for keypad delete NYI
… …
4153 /* extra handling for values with state unkept */ 3657 /* extra handling for values with state unkept */
4154 switch (arg[i]) 3658 switch (arg[i])
4155 { 3659 {
4156#if ENABLE_STYLES 3660#if ENABLE_STYLES
4157 case 1021: 3661 case 1021:
4158 if (mode) 3662 set_option (Opt_intensityStyles, mode);
4159 SET_OPTION (Opt_intensityStyles);
4160 else
4161 CLR_OPTION (Opt_intensityStyles);
4162 3663
4163 scr_touch (true); 3664 scr_touch (true);
4164 break; 3665 break;
4165#endif 3666#endif
4166 case 1048: /* alternative cursor save */ 3667 case 1048: /* alternative cursor save */
4167 case 1049: 3668 case 1049:
4168 if (OPTION (Opt_secondaryScreen)) 3669 if (option (Opt_secondaryScreen))
4169 if (mode == 0) 3670 if (mode == 0)
4170 scr_cursor (RESTORE); 3671 scr_cursor (RESTORE);
4171 else if (mode == 1) 3672 else if (mode == 1)
4172 scr_cursor (SAVE); 3673 scr_cursor (SAVE);
4173 break; 3674 break;
… …
4185 */ 3686 */
4186 PrivMode (1, PrivMode_vt52); 3687 PrivMode (1, PrivMode_vt52);
4187 break; 3688 break;
4188 case 3: /* 80/132 */ 3689 case 3: /* 80/132 */
4189 if (priv_modes & PrivMode_132OK) 3690 if (priv_modes & PrivMode_132OK)
3691 {
3692 scr_poweron ();
4190 set_widthheight (((state ? 132 : 80) * fwidth), height); 3693 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3694 }
4191 break; 3695 break;
4192 case 4: /* smooth scrolling */ 3696 case 4: /* smooth scrolling */
4193 if (!state) 3697 set_option (Opt_jumpScroll, !state);
4194 SET_OPTION (Opt_jumpScroll);
4195 else
4196 CLR_OPTION (Opt_jumpScroll);
4197 break; 3698 break;
4198 case 5: /* reverse video */ 3699 case 5: /* reverse video */
4199 scr_rvideo_mode (state); 3700 scr_rvideo_mode (state);
4200 break; 3701 break;
4201 case 6: /* relative/absolute origins */ 3702 case 6: /* relative/absolute origins */
… …
4205 scr_autowrap (state); 3706 scr_autowrap (state);
4206 break; 3707 break;
4207 /* case 8: - auto repeat, can't do on a per window basis */ 3708 /* case 8: - auto repeat, can't do on a per window basis */
4208 case 9: /* X10 mouse reporting */ 3709 case 9: /* X10 mouse reporting */
4209 if (state) /* orthogonal */ 3710 if (state) /* orthogonal */
4210 priv_modes &= ~PrivMode_MouseX11; 3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4211 break; 3712 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 3713#ifdef scrollBar_esc
4220 case scrollBar_esc: 3714 case scrollBar_esc:
4221 if (scrollbar_mapping (state)) 3715 if (scrollbar_mapping (state))
4222 { 3716 {
4223 resize_all_windows (0, 0, 0); 3717 resize_all_windows (0, 0, 0);
… …
4235 break; 3729 break;
4236 /* case 66: - application key pad */ 3730 /* case 66: - application key pad */
4237 /* case 67: - backspace key */ 3731 /* case 67: - backspace key */
4238 case 1000: /* X11 mouse reporting */ 3732 case 1000: /* X11 mouse reporting */
4239 if (state) /* orthogonal */ 3733 if (state) /* orthogonal */
4240 priv_modes &= ~PrivMode_MouseX10; 3734 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4241 break; 3735 break;
4242#if 0
4243 case 1001: 3736 case 1002:
4244 break; /* X11 mouse highlighting */ 3737 case 1003:
4245#endif 3738 if (state)
3739 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3742 vt_emask_mouse = PointerMotionMask;
3743 }
3744 else
3745 vt_emask_mouse = NoEventMask;
3746 vt_select_input ();
3747 break;
4246 case 1010: /* scroll to bottom on TTY output inhibit */ 3748 case 1010: /* scroll to bottom on TTY output inhibit */
4247 if (!state) 3749 set_option (Opt_scrollTtyOutput, !state);
4248 SET_OPTION (Opt_scrollTtyOutput);
4249 else
4250 CLR_OPTION (Opt_scrollTtyOutput);
4251 break; 3750 break;
4252 case 1011: /* scroll to bottom on key press */ 3751 case 1011: /* scroll to bottom on key press */
4253 if (state) 3752 set_option (Opt_scrollTtyKeypress, state);
4254 SET_OPTION (Opt_scrollTtyKeypress);
4255 else
4256 CLR_OPTION (Opt_scrollTtyKeypress);
4257 break; 3753 break;
4258 case 1047: /* secondary screen w/ clearing last */ 3754 case 1047: /* secondary screen w/ clearing last */
4259 if (OPTION (Opt_secondaryScreen)) 3755 if (option (Opt_secondaryScreen))
4260 if (current_screen != PRIMARY) 3756 if (current_screen != PRIMARY)
4261 scr_erase_screen (2); 3757 scr_erase_screen (2);
4262 scr_change_screen (state); 3758 scr_change_screen (state);
4263 break; 3759 break;
4264 case 1049: /* secondary screen w/ clearing first */ 3760 case 1049: /* secondary screen w/ clearing first */
4265 scr_change_screen (state); 3761 scr_change_screen (state);
4266 if (OPTION (Opt_secondaryScreen)) 3762 if (option (Opt_secondaryScreen))
4267 if (current_screen != PRIMARY) 3763 if (current_screen != PRIMARY)
4268 scr_erase_screen (2); 3764 scr_erase_screen (2);
4269 break; 3765 break;
4270 default: 3766 default:
4271 break; 3767 break;
… …
4399 scr_color (Color_bg, Color_bg); 3895 scr_color (Color_bg, Color_bg);
4400 break; 3896 break;
4401 3897
4402 //case 50: // not variable spacing 3898 //case 50: // not variable spacing
4403 3899
4404#if ENABLE_FRILLS 3900#if !ENABLE_MINIMAL
4405 case 90: 3901 case 90:
4406 case 91: /* set bright fg color */ 3902 case 91: /* set bright fg color */
4407 case 92: 3903 case 92:
4408 case 93: 3904 case 93:
4409 case 94: 3905 case 94:
… …
4433rxvt_term::process_graphics () 3929rxvt_term::process_graphics ()
4434{ 3930{
4435 unicode_t ch, cmd = cmd_getc (); 3931 unicode_t ch, cmd = cmd_getc ();
4436 3932
4437 if (cmd == 'Q') 3933 if (cmd == 'Q')
3934 {
4438 { /* query graphics */ 3935 /* query graphics */
4439 tt_printf ("\033G0\012"); /* no graphics */ 3936 tt_printf ("\033G0\012"); /* no graphics */
4440 return; 3937 return;
4441 } 3938 }
4442 /* swallow other graphics sequences until terminating ':' */ 3939 /* swallow other graphics sequences until terminating ':' */
4443 do 3940 do
… …
4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 3968const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4472 3969
4473void 3970void
4474rxvt_term::tt_write (const char *data, unsigned int len) 3971rxvt_term::tt_write (const char *data, unsigned int len)
4475{ 3972{
4476 if (pty.pty < 0) 3973 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4477 return; 3974 return;
4478 3975
3976 if (pty->pty < 0)
3977 return;
3978
4479 if (v_buflen == 0) 3979 if (v_buflen == 0)
4480 { 3980 {
4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 3981 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4482 3982
4483 if ((unsigned int)written == len) 3983 if ((unsigned int)written == len)
4484 return; 3984 return;
4485 3985
4486 data += written; 3986 data += written;
… …
4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3990 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4491 3991
4492 memcpy (v_buffer + v_buflen, data, len); 3992 memcpy (v_buffer + v_buflen, data, len);
4493 v_buflen += len; 3993 v_buflen += len;
4494 3994
4495 pty_ev.set (EVENT_READ | EVENT_WRITE); 3995 pty_ev.set (ev::READ | ev::WRITE);
4496} 3996}
4497 3997
4498void rxvt_term::pty_write () 3998void rxvt_term::pty_write ()
4499{ 3999{
4500 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4000 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4501 4001
4502 if (written > 0) 4002 if (written > 0)
4503 { 4003 {
4504 v_buflen -= written; 4004 v_buflen -= written;
4505 4005
4506 if (v_buflen == 0) 4006 if (v_buflen == 0)
4507 { 4007 {
4508 free (v_buffer); 4008 free (v_buffer);
4509 v_buffer = 0; 4009 v_buffer = 0;
4510 v_buflen = 0;
4511 4010
4512 pty_ev.set (EVENT_READ); 4011 pty_ev.set (ev::READ);
4513 return; 4012 return;
4514 } 4013 }
4515 4014
4516 memmove (v_buffer, v_buffer + written, v_buflen); 4015 memmove (v_buffer, v_buffer + written, v_buflen);
4517 } 4016 }
4518 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4017 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4519 pty_ev.set (EVENT_READ); 4018 pty_ev.set (ev::READ);
4520} 4019}
4521 4020
4522/*----------------------- end-of-file (C source) -----------------------*/ 4021/*----------------------- end-of-file (C source) -----------------------*/
4523 4022

Diff Legend

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