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

Diff Legend

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