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.283 by root, Tue Jan 24 19:40:12 2006 UTC vs.
Revision 1.407 by ayin, Fri Feb 15 10:56:29 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>
60
61#if LINUX_YIELD_HACK
62# include <ctime>
63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68 68
… …
96 XK_Shift_L, 0x21e7, 96 XK_Shift_L, 0x21e7,
97 XK_Shift_R, 0x21e7, 97 XK_Shift_R, 0x21e7,
98 98
99 XK_Shift_Lock, 0x21eb, 99 XK_Shift_Lock, 0x21eb,
100 XK_ISO_Lock, 0x21eb, 100 XK_ISO_Lock, 0x21eb,
101 XK_ISO_Lock, 0x21eb,
102 XK_Caps_Lock, 0x21ec, 101 XK_Caps_Lock, 0x21ec,
103 XK_Num_Lock, 0x21ed, 102 XK_Num_Lock, 0x21ed,
104 XK_ISO_Level3_Shift, 0x21ee, 103 XK_ISO_Level3_Shift, 0x21ee,
105 XK_ISO_Level3_Lock, 0x21ef, 104 XK_ISO_Level3_Lock, 0x21ef,
106 XK_ISO_Group_Lock, 0x21f0, 105 XK_ISO_Group_Lock, 0x21f0,
… …
200 r & RS_Uline ? " uline" : "", 199 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : ""); 200 r & RS_Careful ? " careful" : "");
202 201
203 int width = wcswidth (fname, wcslen (fname)); 202 int width = wcswidth (fname, wcslen (fname));
204 203
205 max_it (width, 8+5); // for char + hey 204 max_it (width, 8+5); // for char + hex
206 max_it (width, strlen (attr)); 205 max_it (width, strlen (attr));
207 206
208 if (y >= 0) 207 if (y >= 0)
209 { 208 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 209 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
… …
222 ch = *chr++; 221 ch = *chr++;
223 222
224 sprintf (buf, "%8x", ch); 223 sprintf (buf, "%8x", ch);
225 scr_overlay_set (0, y, buf); 224 scr_overlay_set (0, y, buf);
226 scr_overlay_set (9, y, '='); 225 scr_overlay_set (9, y, '=');
227# if !UNICODE3 226# if !UNICODE_3
228 if (ch >= 0x10000) 227 if (ch >= 0x10000)
229 ch = 0xfffd; 228 ch = 0xfffd;
230# endif 229# endif
231 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
232 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
233 } 234 }
234 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// }
235 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
236 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
237 243
238 free (fname); 244 free (fname);
239 245
… …
273 } 279 }
274 280
275 iso14755buf = 0; 281 iso14755buf = 0;
276} 282}
277 283
278int 284static int
279rxvt_term::hex_keyval (XKeyEvent &ev) 285hex_keyval (XKeyEvent &ev)
280{ 286{
281 // check wether this event corresponds to a hex digit 287 // check wether this event corresponds to a hex digit
282 // if the modifiers had not been pressed. 288 // if the modifiers had not been pressed.
283 for (int index = 0; index < 8; index++) 289 for (int index = 0; index < 8; index++)
284 { 290 {
… …
292 298
293 return -1; 299 return -1;
294} 300}
295#endif 301#endif
296 302
297/*{{{ Convert the keypress event into a string */
298void 303void
299rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
300{ 305{
301 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
302 unsigned int newlen;
303 KeySym keysym; 307 KeySym keysym;
304 int valid_keysym; 308 int valid_keysym;
305 char kbuf[KBUFSZ]; 309 char kbuf[KBUFSZ];
310
311#if ISO_14755
312 if (iso14755buf & ISO_14755_52)
313 return;
314#endif
306 315
307 /* 316 /*
308 * 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
309 * escape sequence to toggle the Keypad. 318 * escape sequence to toggle the Keypad.
310 * 319 *
… …
490# if ISO_14755 499# if ISO_14755
491 iso14755_51 (0); 500 iso14755_51 (0);
492# endif 501# endif
493 return; 502 return;
494 } 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);
509# endif
510 return;
511 }
495 else if ((hv = hex_keyval (ev)) >= 0) 512 else if ((hv = hex_keyval (ev)) >= 0)
496 { 513 {
497 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK) 514 iso14755buf = ((iso14755buf << 4) & ISO_14755_MASK)
498 | hv | ISO_14755_51; 515 | hv | ISO_14755_51;
499# if ISO_14755 516# if ISO_14755
… …
501# endif 518# endif
502 return; 519 return;
503 } 520 }
504 else 521 else
505 { 522 {
506# if ENABLE_OVERLAY 523# if ISO_14755
507 scr_overlay_off (); 524 scr_overlay_off ();
508# endif 525# endif
509 iso14755buf = 0; 526 iso14755buf = 0;
510 } 527 }
511 } 528 }
512 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R)) 529 else if ((ctrl && (keysym == XK_Shift_L || keysym == XK_Shift_R))
513 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R))) 530 || (shft && (keysym == XK_Control_L || keysym == XK_Control_R)))
514 if (!(iso14755buf & ISO_14755_STARTED)) 531 if (!(iso14755buf & ISO_14755_STARTED))
515 { 532 {
516 iso14755buf |= ISO_14755_STARTED; 533 iso14755buf |= ISO_14755_STARTED;
517# if ENABLE_OVERLAY 534# if ISO_14755
518 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1); 535 scr_overlay_new (0, -1, sizeof ("ISO 14755 mode") - 1, 1);
519 scr_overlay_set (0, 0, "ISO 14755 mode"); 536 scr_overlay_set (0, 0, "ISO 14755 mode");
520# endif 537# endif
521 } 538 }
522#endif 539#endif
523 540
524#ifdef PRINTPIPE 541#ifdef PRINTPIPE
525 if (keysym == XK_Print) 542 if (keysym == XK_Print)
526 { 543 {
527 scr_printscreen (ctrl | shft); 544 scr_printscreen (ctrl | shft);
528 return; 545 return;
529 } 546 }
530#endif 547#endif
531 548
532 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 549 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
533 { 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))
534 { 572 {
535 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
536 switch (keysym) 583 switch (keysym)
537 { 584 {
538#ifndef NO_BACKSPACE_KEY 585#ifndef NO_BACKSPACE_KEY
539 case XK_BackSpace: 586 case XK_BackSpace:
540 if (priv_modes & PrivMode_HaveBackSpace) 587 if (priv_modes & PrivMode_HaveBackSpace)
… …
542 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace) 589 kbuf[0] = (!! (priv_modes & PrivMode_BackSpace)
543 ^ !!ctrl) ? '\b' : '\177'; 590 ^ !!ctrl) ? '\b' : '\177';
544 kbuf[1] = '\0'; 591 kbuf[1] = '\0';
545 } 592 }
546 else 593 else
547 strcpy (kbuf, key_backspace); 594 strcpy (kbuf, rs[Rs_backspace_key]);
548 break; 595 break;
549#endif 596#endif
550#ifndef NO_DELETE_KEY 597#ifndef NO_DELETE_KEY
551# ifdef XK_KP_Prior
552 case XK_KP_Delete:
553 /* allow shift to override */
554 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
555 {
556 strcpy (kbuf, "\033On");
557 break;
558 }
559 /* FALLTHROUGH */
560# endif
561 case XK_Delete: 598 case XK_Delete:
562 strcpy (kbuf, key_delete); 599 strcpy (kbuf, rs[Rs_delete_key]);
563 break; 600 break;
564#endif 601#endif
565 case XK_Tab: 602 case XK_Tab:
566 if (shft) 603 if (shft)
567 strcpy (kbuf, "\033[Z"); 604 strcpy (kbuf, "\033[Z");
… …
577#endif 614#endif
578 newlen = 0; 615 newlen = 0;
579 } 616 }
580 break; 617 break;
581 618
582#ifdef XK_KP_Left
583 case XK_KP_Up: /* \033Ox or standard */
584 case XK_KP_Down: /* \033Or or standard */
585 case XK_KP_Right: /* \033Ov or standard */
586 case XK_KP_Left: /* \033Ot or standard */
587 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
588 {
589 strcpy (kbuf, "\033OZ");
590 kbuf[2] = "txvr"[keysym - XK_KP_Left];
591 break;
592 }
593 else
594 /* translate to std. cursor key */
595 keysym = XK_Left + (keysym - XK_KP_Left);
596 /* FALLTHROUGH */
597#endif
598 case XK_Up: /* "\033[A" */ 619 case XK_Up: /* "\033[A" */
599 case XK_Down: /* "\033[B" */ 620 case XK_Down: /* "\033[B" */
600 case XK_Right: /* "\033[C" */ 621 case XK_Right: /* "\033[C" */
601 case XK_Left: /* "\033[D" */ 622 case XK_Left: /* "\033[D" */
602 strcpy (kbuf, "\033[Z"); 623 strcpy (kbuf, "\033[Z");
… …
612 else if (priv_modes & PrivMode_aplCUR) 633 else if (priv_modes & PrivMode_aplCUR)
613 kbuf[1] = 'O'; 634 kbuf[1] = 'O';
614 break; 635 break;
615 636
616#ifndef UNSHIFTED_SCROLLKEYS 637#ifndef UNSHIFTED_SCROLLKEYS
617# ifdef XK_KP_Prior
618 case XK_KP_Prior:
619 /* allow shift to override */
620 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
621 {
622 strcpy (kbuf, "\033Oy");
623 break;
624 }
625 /* FALLTHROUGH */
626# endif
627 case XK_Prior: 638 case XK_Prior:
628 strcpy (kbuf, "\033[5~"); 639 strcpy (kbuf, "\033[5~");
629 break; 640 break;
630# ifdef XK_KP_Next
631 case XK_KP_Next:
632 /* allow shift to override */
633 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
634 {
635 strcpy (kbuf, "\033Os");
636 break;
637 }
638 /* FALLTHROUGH */
639# endif
640 case XK_Next: 641 case XK_Next:
641 strcpy (kbuf, "\033[6~"); 642 strcpy (kbuf, "\033[6~");
642 break; 643 break;
643#endif 644#endif
644 case XK_KP_Enter: 645 case XK_KP_Enter:
645 /* allow shift to override */ 646 /* allow shift to override */
646 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 647 if (kp)
647 { 648 {
648 strcpy (kbuf, "\033OM"); 649 strcpy (kbuf, "\033OM");
649 break; 650 break;
650 } 651 }
651 652
… …
663 kbuf[0] = '\015'; 664 kbuf[0] = '\015';
664 kbuf[1] = '\0'; 665 kbuf[1] = '\0';
665 } 666 }
666 break; 667 break;
667 668
668#ifdef XK_KP_Begin
669 case XK_KP_Begin:
670 strcpy (kbuf, "\033Ou");
671 break;
672
673#endif
674 case XK_KP_F1: /* "\033OP" */ 669 case XK_KP_F1: /* "\033OP" */
675 case XK_KP_F2: /* "\033OQ" */ 670 case XK_KP_F2: /* "\033OQ" */
676 case XK_KP_F3: /* "\033OR" */ 671 case XK_KP_F3: /* "\033OR" */
677 case XK_KP_F4: /* "\033OS" */ 672 case XK_KP_F4: /* "\033OS" */
678 strcpy (kbuf, "\033OP"); 673 strcpy (kbuf, "\033OP");
… …
694 case XK_KP_6: /* "\033Ov" : "6" */ 689 case XK_KP_6: /* "\033Ov" : "6" */
695 case XK_KP_7: /* "\033Ow" : "7" */ 690 case XK_KP_7: /* "\033Ow" : "7" */
696 case XK_KP_8: /* "\033Ox" : "8" */ 691 case XK_KP_8: /* "\033Ox" : "8" */
697 case XK_KP_9: /* "\033Oy" : "9" */ 692 case XK_KP_9: /* "\033Oy" : "9" */
698 /* allow shift to override */ 693 /* allow shift to override */
699 if ((priv_modes & PrivMode_aplKP) ? !shft : shft) 694 if (kp)
700 { 695 {
701 strcpy (kbuf, "\033Oj"); 696 strcpy (kbuf, "\033Oj");
702 kbuf[2] += (keysym - XK_KP_Multiply); 697 kbuf[2] += (keysym - XK_KP_Multiply);
703 } 698 }
704 else 699 else
… …
710 705
711 case XK_Find: 706 case XK_Find:
712 strcpy (kbuf, "\033[1~"); 707 strcpy (kbuf, "\033[1~");
713 break; 708 break;
714 709
715#ifdef XK_KP_End
716 case XK_KP_Insert:
717 /* allow shift to override */
718 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
719 {
720 strcpy (kbuf, "\033Op");
721 break;
722 }
723 /* FALLTHROUGH */
724#endif
725 case XK_Insert: 710 case XK_Insert:
726 strcpy (kbuf, "\033[2~"); 711 strcpy (kbuf, "\033[2~");
727 break; 712 break;
728#ifdef DXK_Remove /* support for DEC remove like key */ 713#ifdef DXK_Remove /* support for DEC remove like key */
729 case DXK_Remove: 714 case DXK_Remove:
… …
733 strcpy (kbuf, "\033[3~"); 718 strcpy (kbuf, "\033[3~");
734 break; 719 break;
735 case XK_Select: 720 case XK_Select:
736 strcpy (kbuf, "\033[4~"); 721 strcpy (kbuf, "\033[4~");
737 break; 722 break;
738#ifdef XK_KP_End
739 case XK_KP_End:
740 /* allow shift to override */
741 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
742 {
743 strcpy (kbuf, "\033Oq");
744 break;
745 }
746 /* FALLTHROUGH */
747#endif
748 case XK_End: 723 case XK_End:
749 strcpy (kbuf, KS_END); 724 strcpy (kbuf, KS_END);
750 break; 725 break;
751#ifdef XK_KP_Home
752 case XK_KP_Home:
753 /* allow shift to override */
754 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
755 {
756 strcpy (kbuf, "\033Ow");
757 break;
758 }
759 /* FALLTHROUGH */
760#endif
761 case XK_Home: 726 case XK_Home:
762 strcpy (kbuf, KS_HOME); 727 strcpy (kbuf, KS_HOME);
763 break; 728 break;
764 729
765#define FKEY(n, fkey) \ 730#define FKEY(n, fkey) \
… …
822 break; 787 break;
823 } 788 }
824 789
825 if (newlen) 790 if (newlen)
826 len = strlen (kbuf); 791 len = strlen (kbuf);
827 }
828 792
829 /* 793 /*
830 * Pass meta for all function keys, if 'meta' option set 794 * Pass meta for all function keys, if 'meta' option set
831 */ 795 */
832#ifdef META8_OPTION 796#ifdef META8_OPTION
… …
867 return; 831 return;
868 832
869 if (len <= 0) 833 if (len <= 0)
870 return; /* not mapped */ 834 return; /* not mapped */
871 835
872 if (OPTION (Opt_scrollTtyKeypress)) 836 if (option (Opt_scrollTtyKeypress))
873 if (view_start) 837 if (view_start)
874 { 838 {
875 view_start = 0; 839 view_start = 0;
876 want_refresh = 1; 840 want_refresh = 1;
877 } 841 }
… …
901 tt_write (&ch, 1); 865 tt_write (&ch, 1);
902 } 866 }
903 867
904 tt_write (kbuf, (unsigned int)len); 868 tt_write (kbuf, (unsigned int)len);
905} 869}
906/*}}} */ 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}
907 947
908#if defined (KEYSYM_RESOURCE) 948#if defined (KEYSYM_RESOURCE)
909unsigned int 949unsigned int
910rxvt_term::cmd_write (const char *str, unsigned int count) 950rxvt_term::cmd_write (const char *str, unsigned int count)
911{ 951{
… …
941void 981void
942rxvt_term::flush () 982rxvt_term::flush ()
943{ 983{
944 flush_ev.stop (); 984 flush_ev.stop ();
945 985
946#ifdef TRANSPARENT 986#ifdef HAVE_BG_PIXMAP
947 if (want_full_refresh) 987 if (bgPixmap.check_clearChanged ())
948 { 988 {
949 want_full_refresh = 0; 989// scr_clear (true); This needs to be researched further!
950 scr_clear ();
951 scr_touch (false); 990 scr_touch (false);
952 } 991 }
953#endif 992#endif
954 993
955 if (want_refresh) 994 if (want_refresh)
… …
1000 } 1039 }
1001 1040
1002 display->flush (); 1041 display->flush ();
1003} 1042}
1004 1043
1044/* checks wether a refresh is requested and starts the refresh timer */
1005void 1045void
1006rxvt_term::check_cb (check_watcher &w) 1046rxvt_term::refresh_check ()
1047{
1048 if (want_refresh && !flush_ev.is_active ())
1049 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1050
1051 display->flush ();
1052}
1053
1054void
1055rxvt_term::flush_cb (ev::timer &w, int revents)
1007{ 1056{
1008 make_current (); 1057 make_current ();
1009 1058
1010 display->flush ();
1011
1012 if (want_refresh && !flush_ev.active)
1013 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1014}
1015
1016void
1017rxvt_term::flush_cb (time_watcher &w)
1018{
1019 make_current ();
1020
1021 refresh_limit = 1;
1022 refresh_count = 0; 1059 refresh_count = 0;
1023 flush (); 1060 flush ();
1024} 1061}
1025 1062
1026#ifdef CURSOR_BLINK 1063#ifdef CURSOR_BLINK
1027void 1064void
1028rxvt_term::cursor_blink_cb (time_watcher &w) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1029{ 1066{
1030 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1031 want_refresh = 1; 1068 want_refresh = 1;
1032 1069 refresh_check ();
1033 w.start (w.at + CURSOR_BLINK_INTERVAL);
1034} 1070}
1035#endif 1071#endif
1036 1072
1037#ifdef TEXT_BLINK 1073#ifdef TEXT_BLINK
1038void 1074void
1039rxvt_term::text_blink_cb (time_watcher &w) 1075rxvt_term::text_blink_cb (ev::timer &w, int revents)
1040{ 1076{
1041 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1077 if (scr_refresh_rend (RS_Blink, RS_Blink))
1042 { 1078 {
1043 hidden_text = !hidden_text; 1079 hidden_text = !hidden_text;
1044 want_refresh = 1; 1080 want_refresh = 1;
1045 w.start (w.at + TEXT_BLINK_INTERVAL); 1081 refresh_check ();
1046 } 1082 }
1083 else
1084 w.stop ();
1047} 1085}
1048#endif 1086#endif
1049 1087
1050#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1051void 1089void
1052rxvt_term::cont_scroll_cb (time_watcher &w) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1053{ 1091{
1054 if ((scrollbar_isUp() || scrollbar_isDn()) && 1092 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
1055 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1))
1056 { 1094 {
1057 want_refresh = 1; 1095 want_refresh = 1;
1058 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1096 refresh_check ();
1059 } 1097 }
1098 else
1099 w.stop ();
1060} 1100}
1061#endif 1101#endif
1062 1102
1063#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1064void 1104void
1065rxvt_term::sel_scroll_cb (time_watcher &w) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1106{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1068 { 1108 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1110 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1111 refresh_check ();
1072 } 1112 }
1113 else
1114 w.stop ();
1073} 1115}
1074#endif 1116#endif
1075 1117
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1119void
1078rxvt_term::slip_wheel_cb (time_watcher &w) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1121{
1080 if (mouse_slip_wheel_speed == 0 1122 if (scr_changeview (view_start - mouse_slip_wheel_speed))
1081 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1082 : scr_page (UP, mouse_slip_wheel_speed))
1083 { 1123 {
1084 if (view_start == top_row || view_start == 0)
1085 mouse_slip_wheel_speed = 0;
1086
1087 want_refresh = 1; 1124 want_refresh = 1;
1088 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)
1089 } 1129 {
1130 mouse_slip_wheel_speed = 0;
1131 w.stop ();
1132 }
1090} 1133}
1091#endif 1134#endif
1092 1135
1093#if HAVE_SCHED_YIELD 1136#if LINUX_YIELD_HACK
1094static struct event_handler 1137static struct event_handler
1095{ 1138{
1096 check_watcher cw_yield; 1139 ev::prepare yield_ev;
1097 1140
1098 void yield (check_watcher &w) 1141 void yield_cb (ev::prepare &w, int revents)
1099 { 1142 {
1100 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
1101 w.stop (); 1151 w.stop ();
1102 } 1152 }
1103 1153
1104 event_handler () 1154 event_handler ()
1105 : cw_yield (this, &event_handler::yield) 1155 : yield_ev (this, &event_handler::yield_cb)
1106 { 1156 {
1107 } 1157 }
1108} event_handler; 1158} event_handler;
1109#endif 1159#endif
1110 1160
… …
1130 cmdbuf_endp += r; 1180 cmdbuf_endp += r;
1131 return true; 1181 return true;
1132 } 1182 }
1133 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1183 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1134 { 1184 {
1135#if HAVE_SCHED_YIELD 1185#if LINUX_YIELD_HACK
1136 if (display->is_local) 1186 if (display->is_local)
1137 event_handler.cw_yield.start (); 1187 event_handler.yield_ev.start ();
1138#endif 1188#endif
1139 } 1189 }
1140 else 1190 else
1141 { 1191 {
1142 pty_ev.stop (); 1192 pty_ev.stop ();
1143 1193
1144 if (!OPTION (Opt_hold)) 1194 if (!option (Opt_hold))
1145 destroy (); 1195 destroy ();
1146 } 1196 }
1147 1197
1148 return false; 1198 return false;
1149} 1199}
1150 1200
1151void 1201void
1152rxvt_term::pty_cb (io_watcher &w, short revents) 1202rxvt_term::pty_cb (ev::io &w, int revents)
1153{ 1203{
1154 make_current (); 1204 make_current ();
1155 1205
1156 if (revents & EVENT_READ) 1206 if (revents & ev::READ)
1157 // loop, but don't allow a single term to monopolize us 1207 // loop, but don't allow a single term to monopolize us
1158 while (pty_fill ()) 1208 while (pty_fill ())
1159 if (cmd_parse ()) 1209 if (cmd_parse ())
1160 break; 1210 break;
1161 1211
1162 if (revents & EVENT_WRITE) 1212 if (revents & ev::WRITE)
1163 pty_write (); 1213 pty_write ();
1214
1215 refresh_check ();
1164} 1216}
1165 1217
1166void 1218void
1167rxvt_term::pointer_unblank () 1219rxvt_term::pointer_unblank ()
1168{ 1220{
1169 XDefineCursor (display->display, vt, TermWin_cursor); 1221 XDefineCursor (dpy, vt, TermWin_cursor);
1170 recolour_cursor (); 1222 recolour_cursor ();
1171 1223
1172#ifdef POINTER_BLANK 1224#ifdef POINTER_BLANK
1173 hidden_pointer = 0; 1225 hidden_pointer = 0;
1174 1226
1175 if (OPTION (Opt_pointerBlank)) 1227 if (option (Opt_pointerBlank))
1176 pointer_ev.start (NOW + pointerBlankDelay); 1228 pointer_ev.start (pointerBlankDelay);
1177#endif 1229#endif
1178} 1230}
1179 1231
1180#ifdef POINTER_BLANK 1232#ifdef POINTER_BLANK
1181void 1233void
1182rxvt_term::pointer_blank () 1234rxvt_term::pointer_blank ()
1183{ 1235{
1184 if (!OPTION (Opt_pointerBlank)) 1236 if (!option (Opt_pointerBlank))
1185 return; 1237 return;
1186 1238
1187 XDefineCursor (display->display, vt, display->blank_cursor); 1239 XDefineCursor (dpy, vt, display->blank_cursor);
1188 XFlush (display->display); 1240 XFlush (dpy);
1189 1241
1190 hidden_pointer = 1; 1242 hidden_pointer = 1;
1191} 1243}
1192 1244
1193void 1245void
1194rxvt_term::pointer_cb (time_watcher &w) 1246rxvt_term::pointer_cb (ev::timer &w, int revents)
1195{ 1247{
1196 make_current (); 1248 make_current ();
1197 1249
1198 pointer_blank (); 1250 pointer_blank ();
1199} 1251}
… …
1202void 1254void
1203rxvt_term::mouse_report (XButtonEvent &ev) 1255rxvt_term::mouse_report (XButtonEvent &ev)
1204{ 1256{
1205 int button_number, key_state = 0; 1257 int button_number, key_state = 0;
1206 int x, y; 1258 int x, y;
1259 int code = 32;
1207 1260
1208 x = ev.x; 1261 x = Pixel2Col (ev.x);
1209 y = ev.y; 1262 y = Pixel2Row (ev.y);
1210 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 }
1211 1271
1212 if (MEvent.button == AnyButton) 1272 if (MEvent.button == AnyButton)
1213 button_number = 3; 1273 button_number = 3;
1214 else 1274 else
1215 { 1275 {
… …
1261 x + 1, 1321 x + 1,
1262 y + 1); 1322 y + 1);
1263#endif 1323#endif
1264 1324
1265 tt_printf ("\033[M%c%c%c", 1325 tt_printf ("\033[M%c%c%c",
1266 (32 + button_number + key_state), 1326 (code + button_number + key_state),
1267 (32 + x + 1), 1327 (32 + x + 1),
1268 (32 + y + 1)); 1328 (32 + y + 1));
1269} 1329}
1270
1271#ifdef USING_W11LIB
1272void
1273rxvt_W11_process_x_event (XEvent *ev)
1274{
1275 rxvt_t *r = rxvt_get_r ();
1276
1277 x_cb (*ev);
1278}
1279#endif
1280 1330
1281/*{{{ process an X event */ 1331/*{{{ process an X event */
1282void 1332void
1283rxvt_term::x_cb (XEvent &ev) 1333rxvt_term::x_cb (XEvent &ev)
1284{ 1334{
1285 make_current (); 1335 make_current ();
1286 1336
1287 dDisp; 1337 dLocal (Display *, dpy);
1288 1338
1289 if (ev.xany.window == vt 1339 if (ev.xany.window == vt
1290 && SHOULD_INVOKE (HOOK_X_EVENT) 1340 && SHOULD_INVOKE (HOOK_X_EVENT)
1291 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) 1341 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1292 return; 1342 return;
… …
1297 unsigned int unused_mask; 1347 unsigned int unused_mask;
1298 1348
1299 switch (ev.type) 1349 switch (ev.type)
1300 { 1350 {
1301 case KeyPress: 1351 case KeyPress:
1302#if ISO_14755 1352 key_press (ev.xkey);
1303 if (!(iso14755buf & ISO_14755_52))
1304#endif
1305 lookup_key (ev.xkey);
1306
1307 break; 1353 break;
1308 1354
1309 case KeyRelease: 1355 case KeyRelease:
1310 { 1356 key_release (ev.xkey);
1311#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1312 KeySym keysym;
1313
1314 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1315#endif
1316
1317#if ENABLE_FRILLS || ISO_14755
1318 // ISO 14755 support
1319 if (iso14755buf)
1320 if (iso14755buf & ISO_14755_52)
1321 {
1322# if ENABLE_OVERLAY
1323 scr_overlay_off ();
1324# endif
1325# if ISO_14755
1326 // iso14755 part 5.2 handling: release time
1327 // first: controls
1328 if ((ev.xkey.state & ControlMask)
1329 && ((keysym >= 0x40 && keysym <= 0x5f)
1330 || (keysym >= 0x61 && keysym <= 0x7f)))
1331 {
1332 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1333 commit_iso14755 ();
1334 goto skip_switch;
1335 }
1336
1337 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1338 if (i[0] == keysym)
1339 {
1340 iso14755buf = ISO_14755_51 | i[1];
1341 commit_iso14755 ();
1342 goto skip_switch;
1343 }
1344
1345 scr_bell ();
1346# endif
1347 iso14755buf = 0;
1348 break;
1349 }
1350 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1351 {
1352# if ENABLE_OVERLAY
1353 scr_overlay_off ();
1354# endif
1355 if (iso14755buf & ISO_14755_51)
1356 commit_iso14755 ();
1357#if ISO_14755
1358 else if (iso14755buf & ISO_14755_STARTED)
1359 {
1360 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1361
1362 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1363 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1364 }
1365# endif
1366 else
1367 iso14755buf = 0;
1368 }
1369#endif
1370
1371 if (ev.xany.window == vt
1372 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1373 break;
1374
1375#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1376 if (!(ev.xkey.state & ControlMask))
1377 slip_wheel_ev.stop ();
1378 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1379 mouse_slip_wheel_speed = 0;
1380#endif
1381 break; 1357 break;
1382 }
1383 1358
1384 case ButtonPress: 1359 case ButtonPress:
1385 button_press (ev.xbutton); 1360 button_press (ev.xbutton);
1386 break; 1361 break;
1387 1362
… …
1402 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END))) 1377 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1403 destroy (); 1378 destroy ();
1404 } 1379 }
1405#if ENABLE_EWMH 1380#if ENABLE_EWMH
1406 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])
1407 XSendEvent (disp, ev.xclient.window = display->root, 1382 XSendEvent (dpy, ev.xclient.window = display->root,
1408 False, SubstructureRedirectMask | SubstructureNotifyMask, 1383 False, SubstructureRedirectMask | SubstructureNotifyMask,
1409 &ev); 1384 &ev);
1410#endif 1385#endif
1411 } 1386 }
1412 } 1387 }
… …
1418 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT) 1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1419 focus_out (); 1394 focus_out ();
1420 } 1395 }
1421#endif 1396#endif
1422 } 1397 }
1423 break;
1424
1425 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1398 break;
1428 1399
1429 /* 1400 /*
1430 * XXX: this is not the _current_ arrangement 1401 * XXX: this is not the _current_ arrangement
1431 * Here's my conclusion: 1402 * Here's my conclusion:
… …
1450 break; 1421 break;
1451 } 1422 }
1452 break; 1423 break;
1453 1424
1454 case FocusIn: 1425 case FocusIn:
1426 if (ev.xfocus.detail != NotifyInferior
1427 && ev.xfocus.detail != NotifyPointer
1428 && ev.xfocus.mode != NotifyGrab)
1455 focus_in (); 1429 focus_in ();
1456 break; 1430 break;
1457 1431
1458 case FocusOut: 1432 case FocusOut:
1433 if (ev.xfocus.detail != NotifyInferior
1434 && ev.xfocus.detail != NotifyPointer
1435 && ev.xfocus.mode != NotifyGrab)
1459 focus_out (); 1436 focus_out ();
1460 break; 1437 break;
1461 1438
1462 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);*/
1463 if (ev.xconfigure.window == parent[0]) 1443 if (ev.xconfigure.window == parent[0])
1464 { 1444 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1445 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1446 ;
1467 1447
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1448 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1449 {
1470 seen_resize = 1; 1450 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1451 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1452 }
1453 else
1454 {
1455#ifdef HAVE_BG_PIXMAP
1456 if (bgPixmap.window_position_sensitive ())
1457 {
1458 if (mapped)
1459 update_background ();
1460 else
1461 bgPixmap.invalidate ();
1462 }
1463#endif
1464 }
1473 1465
1474 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1475
1476#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1477 if (OPTION (Opt_transparent))
1478 check_our_parents ();
1479#endif
1480 } 1467 }
1481 break; 1468 break;
1482 1469
1483 case PropertyNotify: 1470 case PropertyNotify:
1484 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1471 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
… …
1500 case SelectionRequest: 1487 case SelectionRequest:
1501 selection_send (ev.xselectionrequest); 1488 selection_send (ev.xselectionrequest);
1502 break; 1489 break;
1503 1490
1504 case MapNotify: 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
1505 mapped = 1; 1508 mapped = 1;
1506#ifdef TEXT_BLINK 1509#ifdef TEXT_BLINK
1507 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); 1510 text_blink_ev.start ();
1508#endif 1511#endif
1509 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1510 break; 1513 break;
1511 1514
1512 case UnmapNotify: 1515 case UnmapNotify:
… …
1514#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1515 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1516#endif 1519#endif
1517 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1521 break;
1519
1520#ifdef TRANSPARENT
1521 case ReparentNotify:
1522 rootwin_cb (ev);
1523 break;
1524#endif /* TRANSPARENT */
1525 1522
1526 case GraphicsExpose: 1523 case GraphicsExpose:
1527 case Expose: 1524 case Expose:
1528 if (ev.xany.window == vt) 1525 if (ev.xany.window == vt)
1529 { 1526 {
1530 do 1527 do
1528 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1529 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1530 ev.xexpose.width, ev.xexpose.height, False);
1531 }
1533 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1532 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1534 1533
1535 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1534 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1536 1535
1537 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1537 {
1538 scr_expose (ev.xexpose.x, ev.xexpose.y, 1538 scr_expose (ev.xexpose.x, ev.xexpose.y,
1539 ev.xexpose.width, ev.xexpose.height, False); 1539 ev.xexpose.width, ev.xexpose.height, False);
1540 }
1540 1541
1541 want_refresh = 1; 1542 want_refresh = 1;
1542 } 1543 }
1543 else 1544 else
1544 { 1545 {
1545 XEvent unused_event; 1546 XEvent unused_event;
1546 1547
1547 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1548 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1548 ; 1549 ;
1549 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1550 ; 1551 ;
1551 1552
1552 if (isScrollbarWindow (ev.xany.window)) 1553 if (scrollBar.state && ev.xany.window == scrollBar.win)
1553 { 1554 {
1554 scrollBar.setIdle (); 1555 scrollBar.state = STATE_IDLE;
1555 scrollbar_show (0); 1556 scrollbar_show (0);
1556 } 1557 }
1557
1558#ifdef TRANSPARENT
1559 if (am_transparent && ev.xany.window == parent[0])
1560 XClearWindow (disp, ev.xany.window);
1561#endif
1562 } 1558 }
1563 break; 1559 break;
1564 1560
1565 case MotionNotify: 1561 case MotionNotify:
1566#ifdef POINTER_BLANK 1562#ifdef POINTER_BLANK
1567 if (hidden_pointer) 1563 if (hidden_pointer)
1568 pointer_unblank (); 1564 pointer_unblank ();
1569#endif 1565#endif
1566 if ((priv_modes & PrivMode_MouseBtnEvent && ev.xbutton.state & (Button1Mask|Button2Mask|Button3Mask))
1567 || priv_modes & PrivMode_MouseAnyEvent)
1568 mouse_report (ev.xbutton);
1570 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1569 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1571 break; 1570 break;
1572 1571
1573 if (ev.xany.window == vt) 1572 if (ev.xany.window == vt)
1574 { 1573 {
1575 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY) 1574 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1576 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1575 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1577 ; // nop 1576 ; // nop
1578 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1577 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1579 { 1578 {
1580 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1579 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1581 ; 1580 ;
1582 1581
1583 XQueryPointer (disp, vt, 1582 XQueryPointer (dpy, vt,
1584 &unused_root, &unused_child, 1583 &unused_root, &unused_child,
1585 &unused_root_x, &unused_root_y, 1584 &unused_root_x, &unused_root_y,
1586 &ev.xbutton.x, &ev.xbutton.y, 1585 &ev.xbutton.x, &ev.xbutton.y,
1587 &ev.xbutton.state); 1586 &ev.xbutton.state);
1588#ifdef MOUSE_THRESHOLD 1587#ifdef MOUSE_THRESHOLD
… …
1608 int dist; 1607 int dist;
1609 1608
1610 /* don't clobber the current delay if we are 1609 /* don't clobber the current delay if we are
1611 * already in the middle of scrolling. 1610 * already in the middle of scrolling.
1612 */ 1611 */
1613 if (!sel_scroll_ev.active) 1612 if (!sel_scroll_ev.is_active ())
1614 sel_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 1613 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1615 1614
1616 /* save the event params so we can highlight 1615 /* save the event params so we can highlight
1617 * the selection in the pending-scroll loop 1616 * the selection in the pending-scroll loop
1618 */ 1617 */
1619 selection_save_x = ev.xbutton.x; 1618 selection_save_x = ev.xbutton.x;
… …
1641 else 1640 else
1642 { 1641 {
1643 /* we are within the text window, so we 1642 /* we are within the text window, so we
1644 * shouldn't be scrolling 1643 * shouldn't be scrolling
1645 */ 1644 */
1646 if (sel_scroll_ev.active)
1647 sel_scroll_ev.stop(); 1645 sel_scroll_ev.stop();
1648 } 1646 }
1649#endif 1647#endif
1650#ifdef MOUSE_THRESHOLD 1648#ifdef MOUSE_THRESHOLD
1651 } 1649 }
1652#endif 1650#endif
1653 } 1651 }
1654 } 1652 }
1655 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1653 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win)
1656 { 1654 {
1657 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1655 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1658 MotionNotify, &ev)) 1656 MotionNotify, &ev))
1659 ; 1657 ;
1660 1658
1661 XQueryPointer (disp, scrollBar.win, 1659 XQueryPointer (dpy, scrollBar.win,
1662 &unused_root, &unused_child, 1660 &unused_root, &unused_child,
1663 &unused_root_x, &unused_root_y, 1661 &unused_root_x, &unused_root_y,
1664 &ev.xbutton.x, &ev.xbutton.y, 1662 &ev.xbutton.x, &ev.xbutton.y,
1665 &unused_mask); 1663 &unused_mask);
1666 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1664 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1667 scrollbar_size ()); 1665 scrollbar_size ());
1668 want_refresh = 1; 1666 want_refresh = 1;
1669 refresh_limit = 0;
1670 scrollbar_show (1); 1667 scrollbar_show (1);
1671 } 1668 }
1672 break; 1669 break;
1673 } 1670 }
1674 1671
1675skip_switch: ;
1676
1677#if defined(CURSOR_BLINK) 1672#if defined(CURSOR_BLINK)
1678 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1673 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1679 { 1674 {
1680 if (hidden_cursor) 1675 if (hidden_cursor)
1681 { 1676 {
1682 hidden_cursor = 0; 1677 hidden_cursor = 0;
1683 want_refresh = 1; 1678 want_refresh = 1;
1684 } 1679 }
1685 1680
1686 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1681 cursor_blink_ev.again ();
1687 } 1682 }
1688#endif 1683#endif
1689 1684
1690#if defined(POINTER_BLANK) 1685#if defined(POINTER_BLANK)
1691 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) 1686 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1692 { 1687 {
1693 if (ev.type == MotionNotify 1688 if (ev.type == MotionNotify
1694 || ev.type == ButtonPress 1689 || ev.type == ButtonPress
1695 || ev.type == ButtonRelease) 1690 || ev.type == ButtonRelease)
1696 if (hidden_pointer) 1691 if (hidden_pointer)
… …
1698 1693
1699 if (ev.type == KeyPress && hidden_pointer == 0) 1694 if (ev.type == KeyPress && hidden_pointer == 0)
1700 pointer_blank (); 1695 pointer_blank ();
1701 } 1696 }
1702#endif 1697#endif
1698
1699 refresh_check ();
1703} 1700}
1704 1701
1705void 1702void
1706rxvt_term::focus_in () 1703rxvt_term::focus_in ()
1707{ 1704{
1708 if (!focus) 1705 if (!focus)
1709 { 1706 {
1710 focus = 1; 1707 focus = 1;
1711 want_refresh = 1; 1708 want_refresh = 1;
1712 1709
1713 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1710 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1714 1711
1715#if USE_XIM 1712#if USE_XIM
1716 if (Input_Context != NULL) 1713 if (Input_Context != NULL)
1717 { 1714 {
1718 IMSetStatusPosition (); 1715 IMSetPosition ();
1719 XSetICFocus (Input_Context); 1716 XSetICFocus (Input_Context);
1720 } 1717 }
1721#endif 1718#endif
1722#if CURSOR_BLINK 1719#if CURSOR_BLINK
1723 if (OPTION (Opt_cursorBlink)) 1720 if (option (Opt_cursorBlink))
1724 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL); 1721 cursor_blink_ev.again ();
1725#endif 1722#endif
1726#if OFF_FOCUS_FADING 1723#if OFF_FOCUS_FADING
1727 if (rs[Rs_fade]) 1724 if (rs[Rs_fade])
1728 { 1725 {
1729 pix_colors = pix_colors_focused; 1726 pix_colors = pix_colors_focused;
1730 scr_recolour (); 1727 scr_recolour ();
1731 } 1728 }
1732#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
1733 } 1740 }
1734} 1741}
1735 1742
1736void 1743void
1737rxvt_term::focus_out () 1744rxvt_term::focus_out ()
… …
1745 1752
1746#if ENABLE_FRILLS || ISO_14755 1753#if ENABLE_FRILLS || ISO_14755
1747 if (iso14755buf) 1754 if (iso14755buf)
1748 { 1755 {
1749 iso14755buf = 0; 1756 iso14755buf = 0;
1750# if ENABLE_OVERLAY 1757# if ISO_14755
1751 scr_overlay_off (); 1758 scr_overlay_off ();
1752# endif 1759# endif
1753 } 1760 }
1754#endif 1761#endif
1755#if USE_XIM 1762#if USE_XIM
1756 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1757 XUnsetICFocus (Input_Context); 1764 XUnsetICFocus (Input_Context);
1758#endif 1765#endif
1759#if CURSOR_BLINK 1766#if CURSOR_BLINK
1760 if (OPTION (Opt_cursorBlink)) 1767 if (option (Opt_cursorBlink))
1761 cursor_blink_ev.stop (); 1768 cursor_blink_ev.stop ();
1769
1762 hidden_cursor = 0; 1770 hidden_cursor = 0;
1763#endif 1771#endif
1764#if OFF_FOCUS_FADING 1772#if OFF_FOCUS_FADING
1765 if (rs[Rs_fade]) 1773 if (rs[Rs_fade])
1766 { 1774 {
… …
1769 } 1777 }
1770#endif 1778#endif
1771 } 1779 }
1772} 1780}
1773 1781
1774#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
1775void 1796void
1776rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1777{ 1798{
1778 make_current (); 1799 make_current ();
1779 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
1780 switch (ev.type) 1806 switch (ev.type)
1781 { 1807 {
1782 case PropertyNotify: 1808 case PropertyNotify:
1783 /* 1809 /*
1784 * 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,
1785 * 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.
1786 */ 1812 */
1787 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID] 1813 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1788 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1814 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1789 return; 1815 {
1816 bgPixmap.set_root_pixmap ();
1817 update_background ();
1818 }
1790 1819
1791 /* FALLTHROUGH */
1792 case ReparentNotify:
1793 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1794 want_refresh = want_full_refresh = 1;
1795 break; 1820 break;
1796 } 1821 }
1822# endif
1823
1824 refresh_check ();
1797} 1825}
1798#endif 1826#endif
1799 1827
1800void 1828void
1801rxvt_term::button_press (XButtonEvent &ev) 1829rxvt_term::button_press (XButtonEvent &ev)
… …
1856 mouse_report (ev); 1884 mouse_report (ev);
1857 } 1885 }
1858#else 1886#else
1859 MEvent.button = ev.button; 1887 MEvent.button = ev.button;
1860 mouse_report (ev); 1888 mouse_report (ev);
1861#endif /* MOUSE_REPORT_DOUBLECLICK */ 1889#endif /* MOUSE_REPORT_DOUBLECLICK */
1862 1890
1863 } 1891 }
1864 else 1892 else
1865 { 1893 {
1866 if (ev.button != MEvent.button) 1894 if (ev.button != MEvent.button)
… …
1914 } 1942 }
1915 1943
1916 /* 1944 /*
1917 * Scrollbar window processing of button press 1945 * Scrollbar window processing of button press
1918 */ 1946 */
1919 if (isScrollbarWindow (ev.window)) 1947 if (scrollBar.state && ev.window == scrollBar.win)
1920 { 1948 {
1921 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;
1922 /* 1957 /*
1923 * Rxvt-style scrollbar: 1958 * Rxvt-style scrollbar:
1924 * move up if mouse is above slider 1959 * move up if mouse is above slider
1925 * move dn if mouse is below slider 1960 * move dn if mouse is below slider
1926 * 1961 *
… …
1935 /* 1970 /*
1936 * Mouse report disabled scrollbar: 1971 * Mouse report disabled scrollbar:
1937 * arrow buttons - send up/down 1972 * arrow buttons - send up/down
1938 * click on scrollbar - send pageup/down 1973 * click on scrollbar - send pageup/down
1939 */ 1974 */
1940 if ((scrollBar.style == R_SB_NEXT 1975 if (direction == UP)
1941 && scrollbarnext_upButton (ev.y))
1942 || (scrollBar.style == R_SB_RXVT
1943 && scrollbarrxvt_upButton (ev.y)))
1944 tt_printf ("\033[A"); 1976 tt_printf ("\033[A");
1945 else if ((scrollBar.style == R_SB_NEXT 1977 else if (direction == DN)
1946 && scrollbarnext_dnButton (ev.y))
1947 || (scrollBar.style == R_SB_RXVT
1948 && scrollbarrxvt_dnButton (ev.y)))
1949 tt_printf ("\033[B"); 1978 tt_printf ("\033[B");
1950 else 1979 else
1951 switch (ev.button) 1980 switch (ev.button)
1952 { 1981 {
1953 case Button2: 1982 case Button2:
… …
1960 tt_printf ("\033[5~"); 1989 tt_printf ("\033[5~");
1961 break; 1990 break;
1962 } 1991 }
1963 } 1992 }
1964 else 1993 else
1965#endif /* NO_SCROLLBAR_REPORT */ 1994#endif /* NO_SCROLLBAR_REPORT */
1966
1967 {
1968 char upordown = 0;
1969
1970 if (scrollBar.style == R_SB_NEXT)
1971 { 1995 {
1972 if (scrollbarnext_upButton (ev.y)) 1996 if (direction != NO_DIR)
1973 upordown = -1; /* up */
1974 else if (scrollbarnext_dnButton (ev.y))
1975 upordown = 1; /* down */
1976 }
1977 else if (scrollBar.style == R_SB_RXVT)
1978 {
1979 if (scrollbarrxvt_upButton (ev.y))
1980 upordown = -1; /* up */
1981 else if (scrollbarrxvt_dnButton (ev.y))
1982 upordown = 1; /* down */
1983 }
1984 if (upordown)
1985 { 1997 {
1986#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1998#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1999 if (!cont_scroll_ev.is_active ())
1987 cont_scroll_ev.start (NOW + SCROLLBAR_INITIAL_DELAY); 2000 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1988#endif 2001#endif
1989 if (scr_page (upordown < 0 ? UP : DN, 1)) 2002 if (scr_page (direction, 1))
1990 { 2003 {
1991 if (upordown < 0) 2004 if (direction == UP)
1992 scrollBar.setUp (); 2005 scrollBar.state = STATE_UP;
1993 else 2006 else
1994 scrollBar.setDn (); 2007 scrollBar.state = STATE_DOWN;
1995 } 2008 }
1996 } 2009 }
1997 else 2010 else
1998 switch (ev.button) 2011 switch (ev.button)
1999 { 2012 {
2000 case Button2: 2013 case Button2:
2001 switch (scrollbar_align) 2014 switch (scrollBar.align)
2002 { 2015 {
2003 case R_SB_ALIGN_TOP: 2016 case R_SB_ALIGN_TOP:
2004 csrO = 0; 2017 csrO = 0;
2005 break; 2018 break;
2006 case R_SB_ALIGN_CENTRE: 2019 case R_SB_ALIGN_CENTRE:
… …
2014 if (scrollBar.style == R_SB_XTERM 2027 if (scrollBar.style == R_SB_XTERM
2015 || scrollbar_above_slider (ev.y) 2028 || scrollbar_above_slider (ev.y)
2016 || scrollbar_below_slider (ev.y)) 2029 || scrollbar_below_slider (ev.y))
2017 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ()); 2030 scr_move_to (scrollbar_position (ev.y) - csrO, scrollbar_size ());
2018 2031
2019 scrollBar.setMotion (); 2032 scrollBar.state = STATE_MOTION;
2020 break; 2033 break;
2021 2034
2022 case Button1: 2035 case Button1:
2023 if (scrollbar_align == R_SB_ALIGN_CENTRE) 2036 if (scrollBar.align == R_SB_ALIGN_CENTRE)
2024 csrO = ev.y - scrollBar.top; 2037 csrO = ev.y - scrollBar.top;
2025 /* FALLTHROUGH */ 2038 /* FALLTHROUGH */
2026 2039
2027 case Button3: 2040 case Button3:
2028 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
… …
2038 scr_page (DN, nrow - 1); 2051 scr_page (DN, nrow - 1);
2039# else 2052# else
2040 scr_page (DN, nrow / 4); 2053 scr_page (DN, nrow / 4);
2041# endif 2054# endif
2042 else 2055 else
2043 scrollBar.setMotion (); 2056 scrollBar.state = STATE_MOTION;
2044 } 2057 }
2045 else 2058 else
2046 { 2059 {
2047 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
2048 (nrow 2061 (nrow
… …
2065 2078
2066 csrO = 0; /* reset csr Offset */ 2079 csrO = 0; /* reset csr Offset */
2067 if (!bypass_keystate) 2080 if (!bypass_keystate)
2068 reportmode = !! (priv_modes & PrivMode_mouse_report); 2081 reportmode = !! (priv_modes & PrivMode_mouse_report);
2069 2082
2070 if (scrollbar_isUpDn ()) 2083 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN)
2071 { 2084 {
2072 scrollBar.setIdle (); 2085 scrollBar.state = STATE_IDLE;
2073 scrollbar_show (0); 2086 scrollbar_show (0);
2074 } 2087 }
2075 2088
2076#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2090 sel_scroll_ev.stop();
2079#endif 2091#endif
2080 2092
2081 if (ev.window == vt) 2093 if (ev.window == vt)
2082 { 2094 {
2083 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2095 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2107 mouse_report (ev); 2119 mouse_report (ev);
2108 } 2120 }
2109#else /* MOUSE_REPORT_DOUBLECLICK */ 2121#else /* MOUSE_REPORT_DOUBLECLICK */
2110 MEvent.button = AnyButton; 2122 MEvent.button = AnyButton;
2111 mouse_report (ev); 2123 mouse_report (ev);
2112#endif /* MOUSE_REPORT_DOUBLECLICK */ 2124#endif /* MOUSE_REPORT_DOUBLECLICK */
2113 return; 2125 return;
2114 } 2126 }
2115 2127
2116 /* 2128 /*
2117 * dumb hack to compensate for the failure of click-and-drag 2129 * dumb hack to compensate for the failure of click-and-drag
… …
2129 selection_make (ev.time); 2141 selection_make (ev.time);
2130 break; 2142 break;
2131 2143
2132 case Button2: 2144 case Button2:
2133 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2145 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2134 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary); 2146 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2135 break; 2147 break;
2136 2148
2137#ifdef MOUSE_WHEEL 2149#ifdef MOUSE_WHEEL
2138 case Button4: 2150 case Button4:
2139 case Button5: 2151 case Button5:
… …
2143 2155
2144 v = ev.button == Button4 ? UP : DN; 2156 v = ev.button == Button4 ? UP : DN;
2145 2157
2146 if (ev.state & ShiftMask) 2158 if (ev.state & ShiftMask)
2147 i = 1; 2159 i = 1;
2148 else if (OPTION (Opt_mouseWheelScrollPage)) 2160 else if (option (Opt_mouseWheelScrollPage))
2149 i = nrow - 1; 2161 i = nrow - 1;
2150 else 2162 else
2151 i = 5; 2163 i = 5;
2152 2164
2153# ifdef MOUSE_SLIP_WHEELING 2165# ifdef MOUSE_SLIP_WHEELING
… …
2155 { 2167 {
2156 mouse_slip_wheel_speed += v ? -1 : 1; 2168 mouse_slip_wheel_speed += v ? -1 : 1;
2157 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2169 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2158 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2170 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2159 2171
2160 if (slip_wheel_ev.at < NOW) 2172 if (!slip_wheel_ev.is_active ())
2161 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2173 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2162
2163 slip_wheel_ev.start ();
2164 } 2174 }
2165 else 2175 else
2176# endif
2166 { 2177 {
2167# endif
2168 scr_page (v, i); 2178 scr_page (v, i);
2169 scrollbar_show (1); 2179 scrollbar_show (1);
2170# ifdef MOUSE_SLIP_WHEELING
2171 } 2180 }
2172# endif
2173 } 2181 }
2174 break; 2182 break;
2175#endif 2183#endif
2176 } 2184 }
2177 } 2185 }
2178} 2186}
2179
2180#ifdef TRANSPARENT
2181#if TINTING
2182/* taken from aterm-0.4.2 */
2183
2184typedef uint32_t RUINT32T;
2185
2186void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm)
2187{
2188 int sh_r, sh_g, sh_b;
2189 RUINT32T mask_r, mask_g, mask_b;
2190 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2191 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2192 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2193 int i;
2194
2195 Visual *visual = display->visual;
2196
2197 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2198
2199 /* for convenience */
2200 mask_r = visual->red_mask;
2201 mask_g = visual->green_mask;
2202 mask_b = visual->blue_mask;
2203
2204 /* boring lookup table pre-initialization */
2205 switch (srcImage->bits_per_pixel) {
2206 case 15:
2207 if ((mask_r != 0x7c00) ||
2208 (mask_g != 0x03e0) ||
2209 (mask_b != 0x001f))
2210 return;
2211 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32));
2212 lookup_r = lookup;
2213 lookup_g = lookup+32;
2214 lookup_b = lookup+32+32;
2215 sh_r = 10;
2216 sh_g = 5;
2217 sh_b = 0;
2218 break;
2219 case 16:
2220 if ((mask_r != 0xf800) ||
2221 (mask_g != 0x07e0) ||
2222 (mask_b != 0x001f))
2223 return;
2224 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32));
2225 lookup_r = lookup;
2226 lookup_g = lookup+32;
2227 lookup_b = lookup+32+64;
2228 sh_r = 11;
2229 sh_g = 5;
2230 sh_b = 0;
2231 break;
2232 case 24:
2233 if ((mask_r != 0xff0000) ||
2234 (mask_g != 0x00ff00) ||
2235 (mask_b != 0x0000ff))
2236 return;
2237 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2238 lookup_r = lookup;
2239 lookup_g = lookup+256;
2240 lookup_b = lookup+256+256;
2241 sh_r = 16;
2242 sh_g = 8;
2243 sh_b = 0;
2244 break;
2245 case 32:
2246 if ((mask_r != 0xff0000) ||
2247 (mask_g != 0x00ff00) ||
2248 (mask_b != 0x0000ff))
2249 return;
2250 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256));
2251 lookup_r = lookup;
2252 lookup_g = lookup+256;
2253 lookup_b = lookup+256+256;
2254 sh_r = 16;
2255 sh_g = 8;
2256 sh_b = 0;
2257 break;
2258 default:
2259 return; /* we do not support this color depth */
2260 }
2261
2262 /* prepare limits for color transformation (each channel is handled separately) */
2263 if (shade < 0) {
2264 shade = -shade;
2265 if (shade < 0) shade = 0;
2266 if (shade > 100) shade = 100;
2267
2268 lower_lim_r = 65535-rm;
2269 lower_lim_g = 65535-gm;
2270 lower_lim_b = 65535-bm;
2271
2272 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100);
2273 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
2274 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
2275
2276 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
2277 } else {
2278 if (shade < 0) shade = 0;
2279 if (shade > 100) shade = 100;
2280
2281 lower_lim_r = lower_lim_g = lower_lim_b = 0;
2282
2283 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
2284 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
2285 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
2286 }
2287
2288 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
2289 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
2290 {
2291 unsigned int tmp;
2292
2293 tmp = lower_lim_r;
2294 lower_lim_r = lower_lim_b;
2295 lower_lim_b = tmp;
2296
2297 tmp = upper_lim_r;
2298 upper_lim_r = upper_lim_b;
2299 upper_lim_b = tmp;
2300 }
2301
2302 /* fill our lookup tables */
2303 for (i = 0; i <= mask_r>>sh_r; i++)
2304 {
2305 RUINT32T tmp;
2306 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r));
2307 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r);
2308 lookup_r[i] = (tmp/65535)<<sh_r;
2309 }
2310 for (i = 0; i <= mask_g>>sh_g; i++)
2311 {
2312 RUINT32T tmp;
2313 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g));
2314 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g);
2315 lookup_g[i] = (tmp/65535)<<sh_g;
2316 }
2317 for (i = 0; i <= mask_b>>sh_b; i++)
2318 {
2319 RUINT32T tmp;
2320 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b));
2321 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b);
2322 lookup_b[i] = (tmp/65535)<<sh_b;
2323 }
2324
2325 /* apply table to input image (replacing colors by newly calculated ones) */
2326 switch (srcImage->bits_per_pixel)
2327 {
2328 case 15:
2329 {
2330 unsigned short *p1, *pf, *p, *pl;
2331 p1 = (unsigned short *) srcImage->data;
2332 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2333 while (p1 < pf)
2334 {
2335 p = p1;
2336 pl = p1 + srcImage->width;
2337 for (; p < pl; p++)
2338 {
2339 *p = lookup_r[(*p & 0x7c00)>>10] |
2340 lookup_g[(*p & 0x03e0)>> 5] |
2341 lookup_b[(*p & 0x001f)];
2342 }
2343 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2344 }
2345 break;
2346 }
2347 case 16:
2348 {
2349 unsigned short *p1, *pf, *p, *pl;
2350 p1 = (unsigned short *) srcImage->data;
2351 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2352 while (p1 < pf)
2353 {
2354 p = p1;
2355 pl = p1 + srcImage->width;
2356 for (; p < pl; p++)
2357 {
2358 *p = lookup_r[(*p & 0xf800)>>11] |
2359 lookup_g[(*p & 0x07e0)>> 5] |
2360 lookup_b[(*p & 0x001f)];
2361 }
2362 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
2363 }
2364 break;
2365 }
2366 case 24:
2367 {
2368 unsigned char *p1, *pf, *p, *pl;
2369 p1 = (unsigned char *) srcImage->data;
2370 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2371 while (p1 < pf)
2372 {
2373 p = p1;
2374 pl = p1 + srcImage->width * 3;
2375 for (; p < pl; p += 3)
2376 {
2377 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
2378 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
2379 p[2] = lookup_r[(p[2] & 0x0000ff)];
2380 }
2381 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
2382 }
2383 break;
2384 }
2385 case 32:
2386 {
2387 RUINT32T *p1, *pf, *p, *pl;
2388 p1 = (RUINT32T *) srcImage->data;
2389 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
2390
2391 while (p1 < pf)
2392 {
2393 p = p1;
2394 pl = p1 + srcImage->width;
2395 for (; p < pl; p++)
2396 {
2397 *p = lookup_r[(*p & 0xff0000)>>16] |
2398 lookup_g[(*p & 0x00ff00)>> 8] |
2399 lookup_b[(*p & 0x0000ff)] |
2400 (*p & ~0xffffff);
2401 }
2402 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
2403 }
2404 break;
2405 }
2406 }
2407
2408 free (lookup);
2409}
2410#endif
2411
2412/*
2413 * Check our parents are still who we think they are.
2414 * Do transparency updates if required
2415 */
2416int
2417rxvt_term::check_our_parents ()
2418{
2419 int i, pchanged, aformat, have_pixmap, rootdepth;
2420 unsigned long nitems, bytes_after;
2421 Atom atype;
2422 unsigned char *prop = NULL;
2423 Window root, oldp, *list;
2424 Pixmap rootpixmap = None;
2425 XWindowAttributes wattr, wrootattr;
2426 dDisp;
2427
2428 pchanged = 0;
2429
2430 if (!OPTION (Opt_transparent))
2431 return pchanged; /* Don't try any more */
2432
2433 XGetWindowAttributes (disp, display->root, &wrootattr);
2434 rootdepth = wrootattr.depth;
2435
2436 XGetWindowAttributes (disp, parent[0], &wattr);
2437
2438 if (rootdepth != wattr.depth)
2439 {
2440 if (am_transparent)
2441 {
2442 pchanged = 1;
2443 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2444 am_transparent = am_pixmap_trans = 0;
2445 }
2446
2447 return pchanged; /* Don't try any more */
2448 }
2449
2450 /* Get all X ops out of the queue so that our information is up-to-date. */
2451 XSync (disp, False);
2452
2453 /*
2454 * Make the frame window set by the window manager have
2455 * the root background. Some window managers put multiple nested frame
2456 * windows for each client, so we have to take care about that.
2457 */
2458 i = (xa[XA_XROOTPMAP_ID]
2459 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2460 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2461 &nitems, &bytes_after, &prop) == Success);
2462
2463 if (!i || prop == NULL)
2464 i = (xa[XA_ESETROOT_PMAP_ID]
2465 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2466 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2467 &nitems, &bytes_after, &prop) == Success);
2468
2469 if (!i || prop == NULL
2470#if TINTING
2471 || !rs[Rs_color + Color_tint]
2472#endif
2473 )
2474 have_pixmap = 0;
2475 else
2476 {
2477 have_pixmap = 1;
2478 rootpixmap = *(Pixmap *)prop;
2479 XFree (prop);
2480 }
2481
2482 if (have_pixmap)
2483 {
2484 /*
2485 * Copy display->root pixmap transparency
2486 */
2487 int sx, sy, nx, ny;
2488 unsigned int nw, nh;
2489 Window cr;
2490 XImage *image;
2491 GC gc;
2492 XGCValues gcvalue;
2493
2494 XTranslateCoordinates (disp, parent[0], display->root,
2495 0, 0, &sx, &sy, &cr);
2496 nw = (unsigned int)szHint.width;
2497 nh = (unsigned int)szHint.height;
2498 nx = ny = 0;
2499
2500 if (sx < 0)
2501 {
2502 nw += sx;
2503 nx = -sx;
2504 sx = 0;
2505 }
2506
2507 if (sy < 0)
2508 {
2509 nh += sy;
2510 ny = -sy;
2511 sy = 0;
2512 }
2513
2514 min_it (nw, (unsigned int) (wrootattr.width - sx));
2515 min_it (nh, (unsigned int) (wrootattr.height - sy));
2516
2517 XSync (disp, False);
2518 allowedxerror = -1;
2519 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2520
2521 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2522 /* XXX: may need a delay here? */
2523 allowedxerror = 0;
2524
2525 if (image == NULL)
2526 {
2527 if (am_transparent && am_pixmap_trans)
2528 {
2529 pchanged = 1;
2530 if (pixmap != None)
2531 {
2532 XFreePixmap (disp, pixmap);
2533 pixmap = None;
2534 }
2535 }
2536
2537 am_pixmap_trans = 0;
2538 }
2539 else
2540 {
2541 if (pixmap != None)
2542 XFreePixmap (disp, pixmap);
2543
2544#if TINTING
2545 if (ISSET_PIXCOLOR (Color_tint))
2546 {
2547 unsigned short rm, gm, bm;
2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2549
2550 pix_colors_focused[Color_tint].get (display, rm, gm, bm);
2551
2552 ShadeXImage (display, image, shade, rm, gm, bm);
2553 }
2554#endif
2555
2556 pixmap = XCreatePixmap (disp, vt,
2557 szHint.width, szHint.height, image->depth);
2558 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2559 XPutImage (disp, pixmap, gc, image, 0, 0,
2560 nx, ny, image->width, image->height);
2561 XFreeGC (disp, gc);
2562 XDestroyImage (image);
2563 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2564 XClearWindow (disp, parent[0]);
2565
2566 if (!am_transparent || !am_pixmap_trans)
2567 pchanged = 1;
2568
2569 am_transparent = am_pixmap_trans = 1;
2570 }
2571 }
2572
2573 if (am_pixmap_trans)
2574 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2575 else
2576 {
2577 unsigned int n;
2578 /*
2579 * InheritPixmap transparency
2580 */
2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2582 {
2583 oldp = parent[i];
2584 XQueryTree (disp, parent[i - 1], &root,
2585 &parent[i], &list, &n);
2586 XFree (list);
2587
2588 if (parent[i] == display->root)
2589 {
2590 if (oldp != None)
2591 pchanged = 1;
2592
2593 break;
2594 }
2595
2596 if (oldp != parent[i])
2597 pchanged = 1;
2598 }
2599
2600 n = 0;
2601
2602 if (pchanged)
2603 {
2604 for (; n < (unsigned int)i; n++)
2605 {
2606 XGetWindowAttributes (disp, parent[n], &wattr);
2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2608 {
2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2610 break;
2611 }
2612 }
2613 }
2614
2615 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2616 {
2617 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2618 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2619 am_transparent = 0;
2620 /* XXX: also turn off Opt_transparent? */
2621 }
2622 else
2623 {
2624 for (n = 0; n < (unsigned int)i; n++)
2625 {
2626 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2627 XClearWindow (disp, parent[n]);
2628 }
2629
2630 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2631 am_transparent = 1;
2632 }
2633
2634 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2635 parent[i] = None;
2636 }
2637
2638 if (scrollBar.win)
2639 {
2640 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2641 scrollBar.setIdle ();
2642 scrollbar_show (0);
2643 }
2644
2645 if (am_transparent)
2646 {
2647 want_refresh = want_full_refresh = 1;
2648 if (am_pixmap_trans)
2649 flush ();
2650 }
2651
2652 return pchanged;
2653}
2654#endif
2655 2187
2656/*}}} */ 2188/*}}} */
2657 2189
2658bool 2190bool
2659rxvt_term::cmd_parse () 2191rxvt_term::cmd_parse ()
… …
2708 if (ch == C0_LF) 2240 if (ch == C0_LF)
2709 nlines++; 2241 nlines++;
2710 2242
2711 refresh_count++; 2243 refresh_count++;
2712 2244
2713 if (!OPTION (Opt_jumpScroll) 2245 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2714 || (refresh_count >= refresh_limit * (nrow - 1)))
2715 { 2246 {
2716 refreshnow = true;
2717 refresh_count = 0; 2247 refresh_count = 0;
2248
2249 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2250 {
2251 refreshnow = true;
2718 ch = NOCHAR; 2252 ch = NOCHAR;
2719 break; 2253 break;
2254 }
2720 } 2255 }
2721 2256
2722 // scr_add_lines only works for nlines <= nrow - 1. 2257 // scr_add_lines only works for nlines <= nrow - 1.
2723 if (nlines >= nrow - 1) 2258 if (nlines >= nrow - 1)
2724 { 2259 {
… …
2752 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))) 2287 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2753 scr_add_lines (buf, str - buf, nlines); 2288 scr_add_lines (buf, str - buf, nlines);
2754 2289
2755 /* 2290 /*
2756 * 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
2757 * 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.
2758 * the number of pages between refreshes is refresh_limit, which 2293 * if skipScroll is enabled.
2759 * is incremented here because we must be doing flat-out scrolling.
2760 */ 2294 */
2761 if (refreshnow) 2295 if (refreshnow)
2762 { 2296 {
2763 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2764 refresh_limit++;
2765 else
2766 {
2767 flag = true; 2297 flag = true;
2768 scr_refresh (); 2298 scr_refresh ();
2769 want_refresh = 1; 2299 want_refresh = 1;
2770 }
2771 } 2300 }
2772 2301
2773 } 2302 }
2774 else 2303 else
2775 { 2304 {
… …
2924 { 2453 {
2925 if ((buf[len++] = cmd_getc ()) == 'i') 2454 if ((buf[len++] = cmd_getc ()) == 'i')
2926 break; /* done = 1 */ 2455 break; /* done = 1 */
2927 } 2456 }
2928 } 2457 }
2929 2458
2930 for (i = 0; i < len; i++) 2459 for (i = 0; i < len; i++)
2931 if (putc (buf[i], fd) == EOF) 2460 if (putc (buf[i], fd) == EOF)
2932 { 2461 {
2933 done = 1; 2462 done = 1;
2934 break; 2463 break;
… …
2936 } 2465 }
2937 } 2466 }
2938 2467
2939 pclose_printer (fd); 2468 pclose_printer (fd);
2940} 2469}
2941#endif /* PRINTPIPE */ 2470#endif /* PRINTPIPE */
2942/*}}} */ 2471/*}}} */
2943 2472
2944/* *INDENT-OFF* */ 2473/* *INDENT-OFF* */
2945enum { 2474enum {
2946 C1_40 = 0x40, 2475 C1_40 = 0x40,
… …
2996 process_dcs_seq (); 2525 process_dcs_seq ();
2997 break; 2526 break;
2998 case 0x9b: /* CSI */ 2527 case 0x9b: /* CSI */
2999 process_csi_seq (); 2528 process_csi_seq ();
3000 break; 2529 break;
3001 case 0x9d: /* CSI */ 2530 case 0x9d: /* OSC */
3002 process_osc_seq (); 2531 process_osc_seq ();
3003 break; 2532 break;
3004#endif 2533#endif
3005 } 2534 }
3006} 2535}
… …
3096 scr_charset_set (2, (unsigned int)cmd_getc ()); 2625 scr_charset_set (2, (unsigned int)cmd_getc ());
3097 break; 2626 break;
3098 case '+': 2627 case '+':
3099 scr_charset_set (3, (unsigned int)cmd_getc ()); 2628 scr_charset_set (3, (unsigned int)cmd_getc ());
3100 break; 2629 break;
3101#if ENABLE_FRILLS 2630#if !ENABLE_MINIMAL
3102 case '6': 2631 case '6':
3103 scr_backindex (); 2632 scr_backindex ();
3104 break; 2633 break;
3105#endif 2634#endif
3106 case '7': 2635 case '7':
3107 scr_cursor (SAVE); 2636 scr_cursor (SAVE);
3108 break; 2637 break;
3109 case '8': 2638 case '8':
3110 scr_cursor (RESTORE); 2639 scr_cursor (RESTORE);
3111 break; 2640 break;
3112#if ENABLE_FRILLS 2641#if !ENABLE_MINIMAL
3113 case '9': 2642 case '9':
3114 scr_forwardindex (); 2643 scr_forwardindex ();
3115 break; 2644 break;
3116#endif 2645#endif
3117 case '=': 2646 case '=':
… …
3232rxvt_term::process_csi_seq () 2761rxvt_term::process_csi_seq ()
3233{ 2762{
3234 unicode_t ch, priv, i; 2763 unicode_t ch, priv, i;
3235 unsigned int nargs, p; 2764 unsigned int nargs, p;
3236 int n, ndef; 2765 int n, ndef;
3237 int arg[ESC_ARGS]; 2766 int arg[ESC_ARGS] = { };
3238 2767
3239 for (nargs = ESC_ARGS; nargs > 0;) 2768 nargs = 0;
3240 arg[--nargs] = 0;
3241 2769
3242 priv = 0; 2770 priv = 0;
3243 ch = cmd_getc (); 2771 ch = cmd_getc ();
3244 if (ch >= '<' && ch <= '?') 2772 if (ch >= '<' && ch <= '?')
2773 {
3245 { /* '<' '=' '>' '?' */ 2774 /* '<' '=' '>' '?' */
3246 priv = ch; 2775 priv = ch;
3247 ch = cmd_getc (); 2776 ch = cmd_getc ();
3248 } 2777 }
3249 2778
3250 /* read any numerical arguments */ 2779 /* read any numerical arguments */
… …
3289 switch (priv) 2818 switch (priv)
3290 { 2819 {
3291 case '>': 2820 case '>':
3292 if (ch == CSI_DA) /* secondary device attributes */ 2821 if (ch == CSI_DA) /* secondary device attributes */
3293 { 2822 {
3294 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt, 2823 // first parameter is normally 0 for vt100, 1 for vt220, 'R' for rxvt,
3295 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions. 2824 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3296 // 2825 //
3297 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt 2826 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3298 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify 2827 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, 94 for urxvt <= 8.3, and 95 for later
3299 // that we do not support xterm mouse reporting (should be 95 when we do). 2828 // versions.
3300 // 2829 //
3301 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]); 2830 tt_printf ("\033[>%d;95;0c", 'U');
3302 } 2831 }
3303 break; 2832 break;
2833
3304 case '?': 2834 case '?':
3305 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 2835 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3306 process_terminal_mode (ch, priv, nargs, arg); 2836 process_terminal_mode (ch, priv, nargs, arg);
3307 break; 2837 break;
3308 } 2838 }
… …
3433 break; 2963 break;
3434 case 6: /* CPR requested */ 2964 case 6: /* CPR requested */
3435 scr_report_position (); 2965 scr_report_position ();
3436 break; 2966 break;
3437 case 7: /* unofficial extension */ 2967 case 7: /* unofficial extension */
3438 if (OPTION (Opt_insecure)) 2968 if (option (Opt_insecure))
3439 tt_printf ("%-.250s\012", rs[Rs_display_name]); 2969 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3440 break; 2970 break;
3441 case 8: /* unofficial extension */ 2971 case 8: /* unofficial extension */
3442 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 2972 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3443 break; 2973 break;
… …
3510 break; 3040 break;
3511 case CSI_75: 3041 case CSI_75:
3512 scr_cursor (RESTORE); 3042 scr_cursor (RESTORE);
3513 break; 3043 break;
3514 3044
3515#if ENABLE_FRILLS 3045#if !ENABLE_MINIMAL
3516 case CSI_74: 3046 case CSI_74:
3517 process_window_ops (arg, nargs); 3047 process_window_ops (arg, nargs);
3518 break; 3048 break;
3519#endif 3049#endif
3520 3050
… …
3527 break; 3057 break;
3528 } 3058 }
3529} 3059}
3530/*}}} */ 3060/*}}} */
3531 3061
3532#if ENABLE_FRILLS 3062#if !ENABLE_MINIMAL
3533/* ARGSUSED */ 3063/* ARGSUSED */
3534void 3064void
3535rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3065rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3536{ 3066{
3537 int x, y; 3067 int x, y;
3538 XWindowAttributes wattr; 3068 XWindowAttributes wattr;
3539 Window wdummy; 3069 Window wdummy;
3540 dDisp; 3070
3071 dLocal (Display *, dpy);
3541 3072
3542 if (nargs == 0) 3073 if (nargs == 0)
3543 return; 3074 return;
3544 3075
3545 switch (args[0]) 3076 switch (args[0])
3546 { 3077 {
3547 /* 3078 /*
3548 * commands 3079 * commands
3549 */ 3080 */
3550 case 1: /* deiconify window */ 3081 case 1: /* deiconify window */
3551 XMapWindow (disp, parent[0]); 3082 XMapWindow (dpy, parent[0]);
3552 break; 3083 break;
3553 case 2: /* iconify window */ 3084 case 2: /* iconify window */
3554 XIconifyWindow (disp, parent[0], display->screen); 3085 XIconifyWindow (dpy, parent[0], display->screen);
3555 break; 3086 break;
3556 case 3: /* set position (pixels) */ 3087 case 3: /* set position (pixels) */
3557 XMoveWindow (disp, parent[0], args[1], args[2]); 3088 XMoveWindow (dpy, parent[0], args[1], args[2]);
3558 break; 3089 break;
3559 case 4: /* set size (pixels) */ 3090 case 4: /* set size (pixels) */
3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3091 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3561 break; 3092 break;
3562 case 5: /* raise window */ 3093 case 5: /* raise window */
3563 XRaiseWindow (disp, parent[0]); 3094 XRaiseWindow (dpy, parent[0]);
3564 break; 3095 break;
3565 case 6: /* lower window */ 3096 case 6: /* lower window */
3566 XLowerWindow (disp, parent[0]); 3097 XLowerWindow (dpy, parent[0]);
3567 break; 3098 break;
3568 case 7: /* refresh window */ 3099 case 7: /* refresh window */
3569 scr_touch (true); 3100 scr_touch (true);
3570 break; 3101 break;
3571 case 8: /* set size (chars) */ 3102 case 8: /* set size (chars) */
… …
3578 if (args[0] >= 24) /* set height (chars) */ 3109 if (args[0] >= 24) /* set height (chars) */
3579 set_widthheight ((unsigned int)width, 3110 set_widthheight ((unsigned int)width,
3580 (unsigned int) (args[1] * fheight)); 3111 (unsigned int) (args[1] * fheight));
3581 break; 3112 break;
3582 3113
3583
3584 /* 3114 /*
3585 * reports - some output format copied from XTerm 3115 * reports - some output format copied from XTerm
3586 */ 3116 */
3587 case 11: /* report window state */ 3117 case 11: /* report window state */
3588 XGetWindowAttributes (disp, parent[0], &wattr); 3118 XGetWindowAttributes (dpy, parent[0], &wattr);
3589 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3119 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3590 break; 3120 break;
3591 case 13: /* report window position */ 3121 case 13: /* report window position */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3122 XGetWindowAttributes (dpy, parent[0], &wattr);
3593 XTranslateCoordinates (disp, parent[0], wattr.root, 3123 XTranslateCoordinates (dpy, parent[0], wattr.root,
3594 -wattr.border_width, -wattr.border_width, 3124 -wattr.border_width, -wattr.border_width,
3595 &x, &y, &wdummy); 3125 &x, &y, &wdummy);
3596 tt_printf ("\033[3;%d;%dt", x, y); 3126 tt_printf ("\033[3;%d;%dt", x, y);
3597 break; 3127 break;
3598 case 14: /* report window size (pixels) */ 3128 case 14: /* report window size (pixels) */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3129 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3130 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3601 break; 3131 break;
3602 case 18: /* report text area size (chars) */ 3132 case 18: /* report text area size (chars) */
3603 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3133 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3604 break; 3134 break;
… …
3606 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3136 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3607 break; 3137 break;
3608 case 20: /* report icon label */ 3138 case 20: /* report icon label */
3609 { 3139 {
3610 char *s; 3140 char *s;
3611 XGetIconName (disp, parent[0], &s); 3141 XGetIconName (dpy, parent[0], &s);
3612 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 */
3613 XFree (s); 3143 XFree (s);
3614 } 3144 }
3615 break; 3145 break;
3616 case 21: /* report window title */ 3146 case 21: /* report window title */
3617 { 3147 {
3618 char *s; 3148 char *s;
3619 XFetchName (disp, parent[0], &s); 3149 XFetchName (dpy, parent[0], &s);
3620 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 */
3621 XFree (s); 3151 XFree (s);
3622 } 3152 }
3623 break; 3153 break;
3624 } 3154 }
3625} 3155}
… …
3652 seen_esc = true; 3182 seen_esc = true;
3653 continue; 3183 continue;
3654 } 3184 }
3655 else if (ch == C0_BEL || ch == CHAR_ST) 3185 else if (ch == C0_BEL || ch == CHAR_ST)
3656 break; 3186 break;
3187 else if (ch == C0_SYN)
3188 ch = cmd_get8 ();
3657 else if (ch < 0x20) 3189 else if (ch < 0x20)
3658 return NULL; /* other control character - exit */ 3190 return NULL; /* other control character - exit */
3659 3191
3660 seen_esc = false; 3192 seen_esc = false;
3661 3193
3662 if (n >= STRING_MAX - 1) 3194 if (n >= STRING_MAX - 1)
3663 // stop at some sane length 3195 // stop at some sane length
3664 return NULL; 3196 return NULL;
3665 3197
3666 if (ch == C0_SYN)
3667 string[n++] = cmd_get8 ();
3668 else
3669 string[n++] = ch; 3198 string[n++] = ch;
3670 } 3199 }
3671 3200
3672 string[n++] = '\0'; 3201 string[n++] = '\0';
3673 3202
3674 ends_how = (ch == 0x5c ? C0_ESC : ch); 3203 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3725void 3254void
3726rxvt_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)
3727{ 3256{
3728 if (str[0] == '?' && !str[1]) 3257 if (str[0] == '?' && !str[1])
3729 { 3258 {
3730 unsigned short r, g, b; 3259 rgba c;
3731 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
3732 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);
3733 } 3268 }
3734 else 3269 else
3735 set_window_color (color, str); 3270 set_window_color (color, str);
3736} 3271}
3737 3272
… …
3743{ 3278{
3744 int color; 3279 int color;
3745 char *buf, *name; 3280 char *buf, *name;
3746 bool query = str[0] == '?' && !str[1]; 3281 bool query = str[0] == '?' && !str[1];
3747 int saveop = op; 3282 int saveop = op;
3748 dDisp; 3283
3284 dLocal (Display *, dpy);
3749 3285
3750 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
3751 switch (op) 3291 switch (op)
3752 { 3292 {
3753 case XTerm_name: 3293 case XTerm_name:
3754 set_title (str); 3294 set_title (str);
3755 /* FALLTHROUGH */ 3295 /* FALLTHROUGH */
… …
3769 unsigned long bytes_after; 3309 unsigned long bytes_after;
3770 unsigned char *value = 0; 3310 unsigned char *value = 0;
3771 const char *str = ""; 3311 const char *str = "";
3772 3312
3773 if (prop 3313 if (prop
3774 && XGetWindowProperty (disp, parent[0], 3314 && XGetWindowProperty (dpy, parent[0],
3775 prop, 0, 1<<16, 0, AnyPropertyType, 3315 prop, 0, 1<<16, 0, AnyPropertyType,
3776 &actual_type, &actual_format, 3316 &actual_type, &actual_format,
3777 &nitems, &bytes_after, &value) == Success 3317 &nitems, &bytes_after, &value) == Success
3778 && actual_type != None 3318 && actual_type != None
3779 && actual_format == 8) 3319 && actual_format == 8)
3780 str = (const char *)(value); 3320 str = (const char *)(value);
3781 3321
3782 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3322 tt_printf ("\033]%d;%s%c", op, str, resp);
3783 3323
3784 XFree (value); 3324 XFree (value);
3785 } 3325 }
3786 else 3326 else
3787 { 3327 {
… …
3791 { 3331 {
3792 *eq = 0; 3332 *eq = 0;
3793 set_utf8_property (display->atom (str), eq + 1); 3333 set_utf8_property (display->atom (str), eq + 1);
3794 } 3334 }
3795 else 3335 else
3796 XDeleteProperty (disp, parent[0], 3336 XDeleteProperty (dpy, parent[0],
3797 display->atom (str)); 3337 display->atom (str));
3798 } 3338 }
3799 break; 3339 break;
3800 3340
3801 case XTerm_Color: 3341 case XTerm_Color:
… …
3811 break; 3351 break;
3812 3352
3813 if ((buf = strchr (name, ';')) != NULL) 3353 if ((buf = strchr (name, ';')) != NULL)
3814 *buf++ = '\0'; 3354 *buf++ = '\0';
3815 3355
3816 if (name[0] == '?' && !name[1]) 3356 process_color_seq (op, color, name, resp);
3817 {
3818 unsigned short r, g, b;
3819 pix_colors_focused[color].get (display, r, g, b);
3820 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3821 }
3822 else
3823 set_window_color (color, name);
3824 } 3357 }
3825 break; 3358 break;
3359 case Rxvt_restoreFG:
3826 case XTerm_Color00: 3360 case XTerm_Color00:
3827 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3361 process_color_seq (op, Color_fg, str, resp);
3828 break; 3362 break;
3363 case Rxvt_restoreBG:
3829 case XTerm_Color01: 3364 case XTerm_Color01:
3830 process_color_seq (XTerm_Color01, Color_bg, str, resp); 3365 process_color_seq (op, Color_bg, str, resp);
3831 break; 3366 break;
3832#ifndef NO_CURSORCOLOR 3367#ifndef NO_CURSORCOLOR
3833 case XTerm_Color_cursor: 3368 case XTerm_Color_cursor:
3834 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3369 process_color_seq (op, Color_cursor, str, resp);
3835 break; 3370 break;
3836#endif 3371#endif
3837 case XTerm_Color_pointer_fg: 3372 case XTerm_Color_pointer_fg:
3838 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3373 process_color_seq (op, Color_pointer_fg, str, resp);
3839 break; 3374 break;
3840 case XTerm_Color_pointer_bg: 3375 case XTerm_Color_pointer_bg:
3841 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3376 process_color_seq (op, Color_pointer_bg, str, resp);
3842 break; 3377 break;
3843#ifndef NO_BOLD_UNDERLINE_REVERSE 3378#ifndef NO_BOLD_UNDERLINE_REVERSE
3844 case XTerm_Color_RV: 3379 case XTerm_Color_RV:
3845 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3380 process_color_seq (op, Color_RV, str, resp);
3846 break; 3381 break;
3847 case Rxvt_Color_BD: 3382 case Rxvt_Color_BD:
3848 case URxvt_Color_BD: 3383 case URxvt_Color_BD:
3849 process_color_seq (op, Color_BD, str, resp); 3384 process_color_seq (op, Color_BD, str, resp);
3850 break; 3385 break;
3851 case Rxvt_Color_UL: 3386 case Rxvt_Color_UL:
3852 case URxvt_Color_UL: 3387 case URxvt_Color_UL:
3853 process_color_seq (op, Color_UL, str, resp); 3388 process_color_seq (op, Color_UL, str, resp);
3854 break; 3389 break;
3855 case URxvt_Color_IT: 3390 case URxvt_Color_IT:
3856 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3391 process_color_seq (op, Color_IT, str, resp);
3857 break; 3392 break;
3858#endif 3393#endif
3859#if TRANSPARENT && TINTING 3394#if ENABLE_TRANSPARENCY
3860 case URxvt_Color_tint: 3395 case URxvt_Color_tint:
3861 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3396 process_color_seq (op, Color_tint, str, resp);
3862 check_our_parents (); 3397 {
3863 if (am_transparent) 3398 bool changed = false;
3864 want_full_refresh = want_refresh = 1;
3865 break;
3866#endif
3867 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
3868 case Rxvt_Pixmap: 3413 case Rxvt_Pixmap:
3869 { 3414 if (!strcmp (str, "?"))
3870 if (*str != ';')
3871 { 3415 {
3872#if XPM_BACKGROUND 3416 char str[256];
3873 scale_pixmap (""); /* reset to default scaling */ 3417
3874 set_bgPixmap (str); /* change pixmap */ 3418 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
3875 scr_touch (true); 3419 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767),
3876#endif 3420 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767));
3421 process_xterm_seq (XTerm_title, str, CHAR_ST);
3877 } 3422 }
3878 3423 else
3424 {
3879 int changed = 0; 3425 int changed = 0;
3880 3426
3881 while ((str = strchr (str, ';')) != NULL) 3427 if (*str != ';')
3882 { 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 {
3883 str++; 3440 str++;
3884#if XPM_BACKGROUND 3441 if (bgPixmap.set_geometry (str))
3885 changed += scale_pixmap (str); 3442 changed++;
3886#endif 3443 str = strchr (str, ';');
3887 } 3444 }
3888 3445
3889 if (changed) 3446 if (changed)
3890 { 3447 update_background ();
3891#ifdef XPM_BACKGROUND
3892 resize_pixmap ();
3893 scr_touch (true);
3894#endif
3895 } 3448 }
3896 }
3897 break; 3449 break;
3898 3450#endif
3899 case Rxvt_restoreFG:
3900 set_window_color (Color_fg, str);
3901 break;
3902 case Rxvt_restoreBG:
3903 set_window_color (Color_bg, str);
3904 break;
3905 3451
3906 case XTerm_logfile: 3452 case XTerm_logfile:
3907 // TODO, when secure mode? 3453 // TODO, when secure mode?
3908 break; 3454 break;
3909 3455
… …
3927 case URxvt_italicFont: 3473 case URxvt_italicFont:
3928 case URxvt_boldItalicFont: 3474 case URxvt_boldItalicFont:
3929#endif 3475#endif
3930 if (query) 3476 if (query)
3931 tt_printf ("\33]%d;%-.250s%c", saveop, 3477 tt_printf ("\33]%d;%-.250s%c", saveop,
3932 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3478 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3933 ? fontset[op - URxvt_font]->fontdesc : "", 3479 ? fontset[op - URxvt_font]->fontdesc : "",
3934 resp); 3480 resp);
3935 else 3481 else
3936 { 3482 {
3937 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3483 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3940 allocated.push_back ((void *)res); 3486 allocated.push_back ((void *)res);
3941 set_fonts (); 3487 set_fonts ();
3942 } 3488 }
3943 break; 3489 break;
3944 3490
3945#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
3946 case URxvt_locale: 3500 case URxvt_locale:
3947 if (query) 3501 if (query)
3948 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);
3949 else 3503 else
3950 { 3504 {
3951 set_locale (str); 3505 set_locale (str);
3952 pty->set_utf8_mode (enc_utf8); 3506 pty->set_utf8_mode (enc_utf8);
3953 init_xlocale (); 3507 init_xlocale ();
… …
3968 break; 3522 break;
3969#endif 3523#endif
3970 3524
3971#if ENABLE_PERL 3525#if ENABLE_PERL
3972 case URxvt_perl: 3526 case URxvt_perl:
3973 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) 3527 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3974 ; // no responses yet 3528 ; // no responses yet
3975 break; 3529 break;
3976#endif 3530#endif
3977 } 3531 }
3978} 3532}
… …
4016{ 3570{
4017 unsigned int i, j; 3571 unsigned int i, j;
4018 int state; 3572 int state;
4019 3573
4020 static const struct 3574 static const struct
4021 { 3575 {
4022 const int argval; 3576 const int argval;
4023 const unsigned long bit; 3577 const unsigned long bit;
4024 }
4025
4026 argtopriv[] = { 3578 } argtopriv[] = {
4027 { 1, PrivMode_aplCUR }, 3579 { 1, PrivMode_aplCUR },
4028 { 2, PrivMode_vt52 }, 3580 { 2, PrivMode_vt52 },
4029 { 3, PrivMode_132 }, 3581 { 3, PrivMode_132 },
4030 { 4, PrivMode_smoothScroll }, 3582 { 4, PrivMode_smoothScroll },
4031 { 5, PrivMode_rVideo }, 3583 { 5, PrivMode_rVideo },
… …
4047 { 66, PrivMode_aplKP }, 3599 { 66, PrivMode_aplKP },
4048#ifndef NO_BACKSPACE_KEY 3600#ifndef NO_BACKSPACE_KEY
4049 { 67, PrivMode_BackSpace }, 3601 { 67, PrivMode_BackSpace },
4050#endif 3602#endif
4051 { 1000, PrivMode_MouseX11 }, 3603 { 1000, PrivMode_MouseX11 },
4052 // 1001 Use Hilite Mouse Tracking. NYI, TODO 3604 { 1002, PrivMode_MouseBtnEvent },
4053 // 1002 Use Cell Motion Mouse Tracking. NYI, TODO 3605 { 1003, PrivMode_MouseAnyEvent },
4054 // 1003 Use All Motion Mouse Tracking. NYI, TODO
4055 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3606 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
4056 { 1011, PrivMode_Keypress }, // rxvt extension 3607 { 1011, PrivMode_Keypress }, // rxvt extension
4057 // 1035 enable modifiers for alt, numlock NYI 3608 // 1035 enable modifiers for alt, numlock NYI
4058 // 1036 send ESC for meta keys NYI 3609 // 1036 send ESC for meta keys NYI
4059 // 1037 send DEL for keypad delete NYI 3610 // 1037 send DEL for keypad delete NYI
4060 { 1047, PrivMode_Screen }, 3611 { 1047, PrivMode_Screen },
4061 // 1048 save and restore cursor 3612 // 1048 save and restore cursor
4062 { 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 */
4063 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3614 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3615 { 2004, PrivMode_BracketPaste },
4064 }; 3616 };
4065 3617
4066 if (nargs == 0) 3618 if (nargs == 0)
4067 return; 3619 return;
4068 3620
… …
4094 scr_touch (true); 3646 scr_touch (true);
4095 break; 3647 break;
4096#endif 3648#endif
4097 case 1048: /* alternative cursor save */ 3649 case 1048: /* alternative cursor save */
4098 case 1049: 3650 case 1049:
4099 if (OPTION (Opt_secondaryScreen)) 3651 if (option (Opt_secondaryScreen))
4100 if (mode == 0) 3652 if (mode == 0)
4101 scr_cursor (RESTORE); 3653 scr_cursor (RESTORE);
4102 else if (mode == 1) 3654 else if (mode == 1)
4103 scr_cursor (SAVE); 3655 scr_cursor (SAVE);
4104 break; 3656 break;
… …
4116 */ 3668 */
4117 PrivMode (1, PrivMode_vt52); 3669 PrivMode (1, PrivMode_vt52);
4118 break; 3670 break;
4119 case 3: /* 80/132 */ 3671 case 3: /* 80/132 */
4120 if (priv_modes & PrivMode_132OK) 3672 if (priv_modes & PrivMode_132OK)
3673 {
3674 scr_poweron ();
4121 set_widthheight (((state ? 132 : 80) * fwidth), height); 3675 set_widthheight (((state ? 132 : 80) * fwidth), 24 * fheight);
3676 }
4122 break; 3677 break;
4123 case 4: /* smooth scrolling */ 3678 case 4: /* smooth scrolling */
4124 set_option (Opt_jumpScroll, !state); 3679 set_option (Opt_jumpScroll, !state);
4125 break; 3680 break;
4126 case 5: /* reverse video */ 3681 case 5: /* reverse video */
… …
4133 scr_autowrap (state); 3688 scr_autowrap (state);
4134 break; 3689 break;
4135 /* 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 */
4136 case 9: /* X10 mouse reporting */ 3691 case 9: /* X10 mouse reporting */
4137 if (state) /* orthogonal */ 3692 if (state) /* orthogonal */
4138 priv_modes &= ~PrivMode_MouseX11; 3693 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4139 break; 3694 break;
4140#ifdef scrollBar_esc 3695#ifdef scrollBar_esc
4141 case scrollBar_esc: 3696 case scrollBar_esc:
4142 if (scrollbar_mapping (state)) 3697 if (scrollbar_mapping (state))
4143 { 3698 {
… …
4156 break; 3711 break;
4157 /* case 66: - application key pad */ 3712 /* case 66: - application key pad */
4158 /* case 67: - backspace key */ 3713 /* case 67: - backspace key */
4159 case 1000: /* X11 mouse reporting */ 3714 case 1000: /* X11 mouse reporting */
4160 if (state) /* orthogonal */ 3715 if (state) /* orthogonal */
4161 priv_modes &= ~PrivMode_MouseX10; 3716 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
4162 break; 3717 break;
4163#if 0
4164 case 1001: 3718 case 1002:
4165 break; /* X11 mouse highlighting */ 3719 case 1003:
4166#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;
4167 case 1010: /* scroll to bottom on TTY output inhibit */ 3730 case 1010: /* scroll to bottom on TTY output inhibit */
4168 set_option (Opt_scrollTtyOutput, !state); 3731 set_option (Opt_scrollTtyOutput, !state);
4169 break; 3732 break;
4170 case 1011: /* scroll to bottom on key press */ 3733 case 1011: /* scroll to bottom on key press */
4171 set_option (Opt_scrollTtyKeypress, state); 3734 set_option (Opt_scrollTtyKeypress, state);
4172 break; 3735 break;
4173 case 1047: /* secondary screen w/ clearing last */ 3736 case 1047: /* secondary screen w/ clearing last */
4174 if (OPTION (Opt_secondaryScreen)) 3737 if (option (Opt_secondaryScreen))
4175 if (current_screen != PRIMARY) 3738 if (current_screen != PRIMARY)
4176 scr_erase_screen (2); 3739 scr_erase_screen (2);
4177 scr_change_screen (state); 3740 scr_change_screen (state);
4178 break; 3741 break;
4179 case 1049: /* secondary screen w/ clearing first */ 3742 case 1049: /* secondary screen w/ clearing first */
4180 scr_change_screen (state); 3743 scr_change_screen (state);
4181 if (OPTION (Opt_secondaryScreen)) 3744 if (option (Opt_secondaryScreen))
4182 if (current_screen != PRIMARY) 3745 if (current_screen != PRIMARY)
4183 scr_erase_screen (2); 3746 scr_erase_screen (2);
4184 break; 3747 break;
4185 default: 3748 default:
4186 break; 3749 break;
… …
4314 scr_color (Color_bg, Color_bg); 3877 scr_color (Color_bg, Color_bg);
4315 break; 3878 break;
4316 3879
4317 //case 50: // not variable spacing 3880 //case 50: // not variable spacing
4318 3881
4319#if ENABLE_FRILLS 3882#if !ENABLE_MINIMAL
4320 case 90: 3883 case 90:
4321 case 91: /* set bright fg color */ 3884 case 91: /* set bright fg color */
4322 case 92: 3885 case 92:
4323 case 93: 3886 case 93:
4324 case 94: 3887 case 94:
… …
4348rxvt_term::process_graphics () 3911rxvt_term::process_graphics ()
4349{ 3912{
4350 unicode_t ch, cmd = cmd_getc (); 3913 unicode_t ch, cmd = cmd_getc ();
4351 3914
4352 if (cmd == 'Q') 3915 if (cmd == 'Q')
3916 {
4353 { /* query graphics */ 3917 /* query graphics */
4354 tt_printf ("\033G0\012"); /* no graphics */ 3918 tt_printf ("\033G0\012"); /* no graphics */
4355 return; 3919 return;
4356 } 3920 }
4357 /* swallow other graphics sequences until terminating ':' */ 3921 /* swallow other graphics sequences until terminating ':' */
4358 do 3922 do
… …
4408 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 3972 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4409 3973
4410 memcpy (v_buffer + v_buflen, data, len); 3974 memcpy (v_buffer + v_buflen, data, len);
4411 v_buflen += len; 3975 v_buflen += len;
4412 3976
4413 pty_ev.set (EVENT_READ | EVENT_WRITE); 3977 pty_ev.set (ev::READ | ev::WRITE);
4414} 3978}
4415 3979
4416void rxvt_term::pty_write () 3980void rxvt_term::pty_write ()
4417{ 3981{
4418 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));
… …
4423 3987
4424 if (v_buflen == 0) 3988 if (v_buflen == 0)
4425 { 3989 {
4426 free (v_buffer); 3990 free (v_buffer);
4427 v_buffer = 0; 3991 v_buffer = 0;
4428 v_buflen = 0;
4429 3992
4430 pty_ev.set (EVENT_READ); 3993 pty_ev.set (ev::READ);
4431 return; 3994 return;
4432 } 3995 }
4433 3996
4434 memmove (v_buffer, v_buffer + written, v_buflen); 3997 memmove (v_buffer, v_buffer + written, v_buflen);
4435 } 3998 }
4436 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 3999 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4437 pty_ev.set (EVENT_READ); 4000 pty_ev.set (ev::READ);
4438} 4001}
4439 4002
4440/*----------------------- end-of-file (C source) -----------------------*/ 4003/*----------------------- end-of-file (C source) -----------------------*/
4441 4004

Diff Legend

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